xigai

ruoyi-ui-app/package-a/ai-assistant/index.vue

@@ -50,7 +50,13 @@
               <view v-if="!isUserMessage(m)" class="bubble-avatar bubble-avatar--ai">
                 <up-icon name="star-fill" color="#22C55E" :size="18" />
               </view>
-              <view class="bubble" :class="isUserMessage(m) ? 'bubble--user' : 'bubble--bot'">
+              <view
+                class="bubble"
+                :class="[
+                  isUserMessage(m) ? 'bubble--user' : 'bubble--bot',
+                  m.msgType === 2 ? 'bubble--image' : ''
+                ]"
+              >
                 <text v-if="!isUserMessage(m)" class="text-body bubble__who">{{ $t('aiAssistantPage.assistantBubble') }}</text>
                 <text v-else class="text-body bubble__who">{{ $t('aiAssistantPage.userBubble') }}</text>
 
@@ -158,9 +164,9 @@
           >
             <image
               v-if="a.kind === 'image'"
-              class="composer-pending__thumb"
+              class="composer-pending__thumb composer-pending__thumb--image"
               :src="a.localPath"
-              mode="aspectFill"
+              mode="widthFix"
             />
             <view v-else-if="a.kind === 'video'" class="composer-pending__thumb composer-pending__thumb--video">
               <image
@@ -1637,6 +1643,10 @@ export default {
   border: 1rpx solid #86efac;
 }
 
+.bubble--image {
+  max-width: 85%;
+}
+
 .bubble--thinking {
   min-width: 120rpx;
 }
@@ -1680,8 +1690,11 @@ export default {
 
 .bubble__img {
   display: block;
-  max-width: 360rpx;
-  border-radius: 12rpx;
+  width: 200rpx;
+  max-width: 100%;
+  height: auto;
+  border-radius: 8rpx;
+  overflow: hidden;
 }
 
 .bubble__video {
@@ -1866,8 +1879,7 @@ export default {
 .composer-pending__item {
   position: relative;
   flex-shrink: 0;
-  width: 120rpx;
-  height: 120rpx;
+  width: 200rpx;
   border-radius: 12rpx;
   overflow: hidden;
   background: $morandi-bg-muted;
@@ -1875,13 +1887,22 @@ export default {
 }
 
 .composer-pending__thumb {
-  width: 100%;
-  height: 100%;
   display: block;
 }
 
+.composer-pending__thumb--image {
+  width: 200rpx;
+  max-width: 100%;
+  height: auto;
+}
+
 .composer-pending__thumb--video {
   position: relative;
+  width: 200rpx;
+  height: 200rpx;
+}
+
+.composer-pending__thumb--video > .composer-pending__thumb {
   width: 100%;
   height: 100%;
 }
@@ -1904,6 +1925,8 @@ export default {
   align-items: center;
   justify-content: center;
   gap: 8rpx;
+  width: 200rpx;
+  height: 200rpx;
   padding: 8rpx;
   box-sizing: border-box;
 }

ruoyi-ui-app/package-a/booking-expert/index.vue

@@ -683,8 +683,8 @@ export default {
 @import '@/styles/tab-page.scss';
 
 .be-page {
-  display: flex;
-  flex-direction: column;
+  // display: flex;
+  // flex-direction: column;
   min-width: 0;
   width: 100%;
   height: 100%;
@@ -695,10 +695,11 @@ export default {
 }
 
 .be-scroll {
-  flex: 1;
-  min-height: 0;
+  // flex: 1;
+  // min-height: 0;
   min-width: 0;
-  height: 0;
+  // height: 0;
+  height: 100%;
   box-sizing: border-box;
   padding: 20rpx 24rpx 24rpx;
 }

ruoyi-ui-app/package-a/booking-org/index.vue

@@ -493,8 +493,8 @@ export default {
 @import '@/styles/tab-page.scss';
 
 .bgo-page {
-  display: flex;
-  flex-direction: column;
+  // display: flex;
+  // flex-direction: column;
   min-width: 0;
   width: 100%;
   height: 100%;
@@ -505,10 +505,11 @@ export default {
 }
 
 .bgo-scroll {
-  flex: 1;
-  min-height: 0;
-  min-width: 0;
-  height: 0;
+  // flex: 1;
+  // min-height: 0;
+  // min-width: 0;
+  // height: 0;
+  height: 100%;
   box-sizing: border-box;
   padding: 20rpx 24rpx 24rpx;
 }

ruoyi-ui-app/package-a/booking-vet/index.vue

@@ -641,8 +641,8 @@ export default {
 @import '@/styles/tab-page.scss';
 
 .bv-page {
-  display: flex;
-  flex-direction: column;
+  // display: flex;
+  // flex-direction: column;
   min-width: 0;
   width: 100%;
   height: 100%;
@@ -653,10 +653,11 @@ export default {
 }
 
 .bv-scroll {
+  height: 100%;
   flex: 1;
-  min-height: 0;
+  // min-height: 0;
   min-width: 0;
-  height: 0;
+  // height: 0;
   box-sizing: border-box;
   padding: 20rpx 24rpx 24rpx;
 }

ruoyi-ui-app/package-a/consult-detail/index.vue

@@ -47,7 +47,13 @@
               <view v-if="!isUserMessage(m)" class="cd-avatar cd-avatar--vet">
                 <up-icon name="account-fill" color="#2563eb" :size="18" />
               </view>
-              <view class="cd-bubble" :class="isUserMessage(m) ? 'cd-bubble--user' : 'cd-bubble--bot'">
+              <view
+                class="cd-bubble"
+                :class="[
+                  isUserMessage(m) ? 'cd-bubble--user' : 'cd-bubble--bot',
+                  m.msgType === 2 ? 'cd-bubble--image' : ''
+                ]"
+              >
                 <text v-if="!isUserMessage(m)" class="text-body cd-bubble__who">{{ peerName }}</text>
                 <text v-else class="text-body cd-bubble__who">{{ $t('consultDetailPage.userBubble') }}</text>
 
@@ -102,7 +108,7 @@
           v-if="pendingMedia.kind === 'image'"
           class="cd-preview__img"
           :src="pendingMedia.path"
-          mode="aspectFill"
+          mode="widthFix"
         />
         <view v-else class="cd-preview__video-wrap">
           <image
@@ -900,6 +906,10 @@ export default {
   box-shadow: 0 2rpx 6rpx rgba(74, 69, 66, 0.05);
 }
 
+.cd-bubble--image {
+  max-width: 85%;
+}
+
 .cd-bubble__who {
   font-size: 22rpx;
   font-weight: 600;
@@ -918,8 +928,9 @@ export default {
 
 .cd-bubble__img {
   display: block;
-  width: 100%;
-  max-width: 420rpx;
+  width: 200rpx;
+  max-width: 100%;
+  height: auto;
   border-radius: 8rpx;
   overflow: hidden;
 }
@@ -984,22 +995,23 @@ export default {
 .cd-preview {
   position: relative;
   align-self: flex-start;
-  width: 120rpx;
-  height: 120rpx;
+  width: 200rpx;
   border-radius: 12rpx;
   overflow: hidden;
   background: $morandi-bg-muted;
 }
 
 .cd-preview__img {
-  width: 100%;
-  height: 100%;
+  display: block;
+  width: 200rpx;
+  max-width: 100%;
+  height: auto;
 }
 
 .cd-preview__video-wrap {
   position: relative;
-  width: 100%;
-  height: 100%;
+  width: 200rpx;
+  height: 200rpx;
 }
 
 .cd-preview__video-ph {

ruoyi-ui/src/views/diseaseTreatment/myAppointment/vet/index.vue

@@ -163,7 +163,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancelReject">{{ dtCommon("cancel") }}</el-button>
-        <el-button type="primary" :loading="rejectSubmitting" @click="submitReject">{{ dtCommon("confirm") }}</el-button>
+        <el-button type="primary" :loading="rejectSubmitting" @click="submitReject">{{ dtCommon("ok") }}</el-button>
       </div>
     </el-dialog>
   </div>

ruoyi-ui/src/views/tradeMarket/entryIsolation/index.vue

@@ -125,7 +125,7 @@
             <el-button size="mini" type="primary">{{ tmT("btnPickCert") }}</el-button>
           </el-upload>
           <div class="el-upload__tip">{{ tmT("tipCertFile") }}</div>
-          <div class="el-upload__tip text-muted">{{ tmT("tipOcrLater") }}</div>
+          <!-- <div class="el-upload__tip text-muted">{{ tmT("tipOcrLater") }}</div> -->
           <ul v-if="form.certFilePath" class="upload-file-list">
             <li class="upload-file-item">
               <el-link :href="form.certFileUrl || '#'" :underline="false" target="_blank">