Merge remote-tracking branch 'origin/main'

xuxueyang

2024-08-11 7f693ebe71d34fd84b3618ff0d5a66f004e46db5

 pages/order/order-sale/order-sale-detail.vue

@@ -74,7 +74,8 @@
            {{ item.supplierName }}
         </view>
         <view class="flex m-t-12 flex-wrap-normal">
            <image class="flower-img img100 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)">
            <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover"
               @click="previewImg(item.flowerCover)">
            </image>
            <view class="flex1">
               <view class=" flex">
@@ -112,10 +113,7 @@
                     <view class="label">责任方</view>
                     <view class="value">{{ item.personInChargeStr || '-' }}</view>
                  </view>
                  <view class="each-item">
                     <view class="label">备注</view>
                     <view class="value">{{ item.remarks || '-' }}</view>
                  </view>

                  <view class="each-item">
                     <view class="label">赔付金额</view>
                     <view class="value t-red">￥{{ item.amount || '-' }}</view>
@@ -123,8 +121,17 @@
               </view>
            </view>
         </view>
         <view class=" m-t-12 flex-wrap-normal" v-if="item.remarks">
            <view class="each-list">
               <view class="each-item" style="max-width: 90%;text-align: left;">
                  <view class="label">备注</view>
                  <view class="value">{{ item.remarks || '-' }}</view>
               </view>
            </view>
         </view>

      </view>


      <view class="info-container bg-white br-4">
         <view class="form-item">
@@ -188,6 +195,34 @@
      </view>


      <view class="info-container bg-white m-t-12 br-4">
         <view v-if="dto.imageList&&dto.imageList.length>0">
            <view class="form-item">
               <view class="label">图片:
               </view>
            </view>
            <view class="flex p20">
               <view class="m-t-12 m-r-10 " v-for="(timg,index) of dto.imageList" :key="index">
                  <image class="check-img" :src="timg" @click.stop="previewImg(timg)">
                  </image>
               </view>
            </view>
         </view>
         <view v-if="dto.imageList&&dto.imageList.length>0">
            <view class="form-item">
               <view class="label">视频:
               </view>
            </view>
            <view class="flex p20">
               <view class="m-t-12 m-r-10 " v-for="(timg,index) of dto.videoList" :key="index">
                  <video :src="timg" style="display: block;margin: 0 auto;"></video>

               </view>
            </view>
         </view>

      </view>


   </view>
</template>
@@ -245,6 +280,13 @@
      .info-container {
         padding: 28rpx;

         .check-img {
            width: 96rpx;
            height: 96rpx;
            border-radius: 4rpx;
            border: 2rpx dashed #CECECE;
         }

         .form-item {
            font-weight: 400;
            font-size: 28rpx;