Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0

xuxueyang

2024-09-29 ce4b9391a433cad82a636ec8a66071880022db42

 pages/order/order-detail.vue

@@ -263,7 +263,7 @@
                           // 发送请求
                           if (info.extraData && info.extraData.status === 'fail') {
                              tmp.$message.showToast('支付和确认收货需要是同一微信号，请联系实际支付人登录确认')
										

                           } else if (info.extraData && info.extraData.status === 'cancel') {

                           } else {
@@ -476,10 +476,13 @@
            //    this.$message.showToast('未选择需要售后的商品')
            //    return
            // }
            if (isNaN(parseFloat(this.submitForm.num)) || this.submitForm.num <= 0) {
            if (isNaN(parseInt(this.submitForm.num)) || this.submitForm.num <= 0 || parseInt(this.submitForm
               .num) <= 0) {
               this.$message.showToast('售后数量需要大于0')
               return
            }
            this.submitForm.num = parseInt(this.submitForm.num) || 1

            if (!this.submitForm.salesType) {
               this.$message.showToast('未填写售后类型')
               return
@@ -548,9 +551,11 @@
      <view v-for="(item,index) of list" :key="index">
         <view class="flower-info m-b-20 m-t-12 br-4"
            v-if="!showSales||showSales&&(submitForm.orderItemId == item.id)">
            <view class="supplier-name " @click.stop="openbrand(item)">
               <image class="icon-dp" src="/static/common/icon-dp.png"></image>
               {{ item.supplierName || ''}}
            <view class="supplier-name " >
               <view  @click.stop="openbrand(item)" style="display: inline-block;">
                  <image class="icon-dp br-4" src="/static/common/icon-dp.png"></image>
                  {{ item.supplierName|| '' }} > 
               </view>
            </view>
            <!-- submitForm.orderItemId:{{submitForm.orderItemId}} -->
            <!-- itemId:{{item.id}} -->
@@ -559,9 +564,8 @@
               <!-- @click="changeSalesOrderItem(item)" -->
               <!-- :checked="submitForm.orderItems.indexOf(item.id)>=0" -->

               <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover"
                  @click="previewImg(item.flowerCover)">
               </image>
               <!-- <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)"></image> -->
               <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover" @click="toFlowerDetail(item)"></image>
               <view class="flex1" @click.stop="toFlowerDetail(item)">
                  <view class=" flex">
                     <view class="title"><span class="level">{{ item.flowerCategory || ''}}</span><span