Merge branch 'v2' of http://47.96.225.205:8888/r/hmy_farmer-main into remot...

xuxueyang

2024-09-11 e3c0ebbd9f9ee111f29be9f76979edd97f1d6f3a

 pages/order/order-detail.vue

@@ -14,6 +14,21 @@
            // #ifdef PUB_PARTNER
            type: 'partner',
            // #endif
            salesTypeDef:0,
            salesTypeList:[
               {
                  label: '请选择售后类型',
                  value: '',
               },
               {
                  label: '换货',
                  value: 'barters',
               },
               {
                  label: '退货',
                  value: 'returns',
               },
            ],
         };
      },
      onUnload() {
@@ -31,6 +46,7 @@
               orderId: this.id,
               // imageList: [],
               videoList: [],
               salesType:'',
               reason: '',
               // orderItems: [],
               orderItemId: options.flowerId || '',
@@ -85,6 +101,9 @@
         }
      },
      methods: {
         salesTypeChange(e){
            this.submitForm.salesType = e.value
         },

         async getDetail() {
            this.$message.showLoading()
@@ -101,7 +120,12 @@
            if (code === 0) {
               this.dto = {
                  ...this.dto,
                  ...data
                  ...data,
                  // pointGoodsList: [{
                  //    name: '1',
                  //    num: 1,
                  //    description: 'descriptiondescriptiondescriptiondescriptiondescription'
                  // }]
               }
            }
         },
@@ -168,11 +192,12 @@
                           tmp.$message.showLoading()
                           const {
                              code
                           } = await tmp.$http.request('get', '/api/customer/order/receive/confirm', {
                              params: {
                                 id: tmp.id,
                              }
                           })
                           } = await tmp.$http.request('get',
                              '/api/customer/order/receive/confirm', {
                                 params: {
                                    id: tmp.id,
                                 }
                              })
                           tmp.$message.hideLoading()
                           if (code === 0) {
                              tmp.getDetail()
@@ -222,6 +247,7 @@
                        id: this.id,
                     }
                  })

                  this.$message.hideLoading()
                  if (code === 0) {
                     //微信接口
@@ -230,10 +256,8 @@
                        ...data,
                        async success(res) {
                           console.log('pay success', res)
                           that.$message.showToast('支付成功')
                           setTimeout(() => {
                              that.getDetail()
                           }, 200)
                           await that.$message.showToast('支付成功')
                           that.getDetail()
                        },
                        fail(err) {
                           console.error('pay fail', err)
@@ -374,6 +398,10 @@
               this.$message.showToast('售后数量需要大于0')
               return
            }
            if (!this.submitForm.salesType) {
               this.$message.showToast('未填写售后类型')
               return
            }
            if (!this.submitForm.reason) {
               this.$message.showToast('未填写理由')
               return
@@ -394,12 +422,13 @@
            })
            this.$message.hideLoading()
            if (code == 0) {
               this.$message.showToast('提交成功')
               this.showSales = false
               this.$forceUpdate()
               setTimeout(() => {
                  uni.navigateBack()
               }, 1200)
               await this.$message.showToast('提交成功')
               uni.navigateBack()
               // this.showSales = false
               // this.$forceUpdate()
               // setTimeout(() => {
               // uni.navigateBack()
               // }, 1200)
            }
         },
      },
@@ -434,60 +463,67 @@
            </view>
         </view>
      </view>
      <view class="flower-info m-b-20 m-t-12 br-4" v-for="(item,index) of list" :key="index">
         <view class="supplier-name ">
            <image class="icon-dp" src="/static/common/icon-dp.png"></image>
            {{ item.supplierName || ''}}
         </view>
         <view class="flex m-t-12">
            <radio v-if="showSales" disabled :checked="submitForm.orderItemId == item.id"></radio>
            <!-- @click="changeSalesOrderItem(item)" -->
            <!-- :checked="submitForm.orderItems.indexOf(item.id)>=0" -->
      <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 ">
               <image class="icon-dp" src="/static/common/icon-dp.png"></image>
               {{ item.supplierName || ''}}
            </view>
            <!-- submitForm.orderItemId:{{submitForm.orderItemId}} -->
            <!-- itemId:{{item.id}} -->
            <view class="flex m-t-12">
               <!-- <radio v-if="showSales" disabled :checked="submitForm.orderItemId == item.id"></radio> -->
               <!-- @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>
            <view class="flex1">
               <view class=" flex">
                  <view class="title"><span class="level">{{ item.flowerCategory || ''}}</span><span
                        class="level">{{ item.flowerLevelStr || ''}}</span>{{ item.flowerName || ''}}
                  </view>
               </view>
               <view class="each-list">
                  <view class="each-item">
                     <view class="label">货位号</view>
                     <view class="value">{{ item.warehouseLocationCode || dto.warehouseLocationCode  || '-' }}
               <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover"
                  @click="previewImg(item.flowerCover)">
               </image>
               <view class="flex1">
                  <view class=" flex">
                     <view class="title"><span class="level">{{ item.flowerCategory || ''}}</span><span
                           class="level">{{ item.flowerLevelStr || ''}}</span>{{ item.flowerName || ''}}
                     </view>
                  </view>
                  <view class="each-list">
                     <view class="each-item">
                        <view class="label">货位号</view>
                        <view class="value">
                           {{ item.warehouseLocationCode || dto.warehouseLocationCode  || '-' }}
                        </view>
                     </view>

                  <view class="each-item">
                     <view class="label">颜色</view>
                     <view class="value">{{ item.flowerColor || '-' }}</view>
                     <view class="each-item">
                        <view class="label">颜色</view>
                        <view class="value">{{ item.flowerColor || '-' }}</view>

                  </view>
                  <view class="each-item">
                     <view class="label">规格</view>
                     <view class="value">{{ item.flowerUnit || '-' }}</view>
                  </view>
                     </view>
                     <view class="each-item">
                        <view class="label">规格</view>
                        <view class="value">{{ item.flowerUnit || '-' }}</view>
                     </view>

                  <view class="each-item">
                     <view class="label">数量</view>
                     <view class="value">{{ item.num || 0 }}</view>
                     <view class="each-item">
                        <view class="label">数量</view>
                        <view class="value">{{ item.num || 0 }}</view>

                  </view>
                  <view class="each-item">
                     <view class="label">售价</view>
                     <view class="value">￥{{ item.price || '-' }}</view>
                  </view>
                  <view class="each-item">
                     <view class="label">总金额</view>
                     <view class="value t-red">￥{{ item.total || '-' }}</view>
                     </view>
                     <view class="each-item">
                        <view class="label">售价</view>
                        <view class="value">￥{{ item.price || '-' }}</view>
                     </view>
                     <view class="each-item">
                        <view class="label">总金额</view>
                        <view class="value t-red">￥{{ item.total || '-' }}</view>
                     </view>
                  </view>
               </view>
            </view>
         </view>

         </view>
      </view>

      <view class="info-container bg-white br-4" v-if="!showSales">
         <view class="form-item">
            <view class="label">订单编号:</view>
@@ -567,6 +603,39 @@
         </view>

      </view>
      <view class="info-container bg-white br-4 m-t-12"
         v-if="!showSales&& dto.pointGoodsList&& dto.pointGoodsList.length>0">
         <view v-for="(item,j) of dto.pointGoodsList" :key="j" class="m-b-12">
            <view class="flower-info  br-4">
               <view class="flex flex-wrap-normal">
                  <image class="flower-img img100 br-4 m-r-6" :src="item.cover" @click="previewImg(item.cover)">
                  </image>
                  <view class="flex1">
                     <view class=" flex">
                        <view class="title">
                           {{ item.name || ''}}
                        </view>
                     </view>
                     <view class="each-list" style="display: contents;">
                        <view class="each-item">
                           <view class="label">数量</view>
                           <view class="value">{{ item.num || 0 }}</view>

                        </view>
                        <view class="each-item" style="min-width: unset;max-width: unset;">
                           <view class="label" style="min-width: 55rpx;">描述</view>
                           <view class="value" style="word-break: break-all;text-align: left;">{{ item.description || '-' }}
                           </view>
                        </view>
                     </view>
                  </view>
               </view>

            </view>
         </view>


      </view>

      <view class="info-container bg-white br-4 m-t-12" v-if="!showSales">
         <view class="icon-view">
@@ -601,6 +670,16 @@
                  class="form-input"></input>
            </view>
         </view>
			
         <view class="form-item">
            <view class="form-item-label require">
               售后类型
            </view>
            <view class="form-item-value">
               <um-dropdown @change="salesTypeChange" :defaultIndex="salesTypeDef" rangeKey="label" :optionList="salesTypeList" placeholder="售后类型"></um-dropdown>
            </view>
         </view>
			
         <view class="form-item">
            <view class="form-item-label require">
               理由