update 细节和订单确认收货（写死了商户号）

xuxueyang

2024-09-24 056997b07e61fc99d5c311d0c5489b9de48fd9bc

 pages/order/order-detail.vue

@@ -14,6 +14,8 @@
            // #ifdef PUB_PARTNER
            type: 'partner',
            // #endif
            salesTypeDef: 0,
            salesTypeList: [],
         };
      },
      onUnload() {
@@ -31,6 +33,7 @@
               orderId: this.id,
               // imageList: [],
               videoList: [],
               salesType: '',
               reason: '',
               // orderItems: [],
               orderItemId: options.flowerId || '',
@@ -39,8 +42,9 @@
            }
            this.showSales = options.showsales && true || false

            if (this.dto.statusBackend === 'PENDING' || this.dto.status === 'PENDING') {

            if (this.dto.statusBackend === 'PENDING') {

               this.timer = setInterval(() => {
                  //倒计时
                  var nowdate = new Date().getTime() - 1000 * 60 * 5
@@ -83,8 +87,33 @@


         }

         this.$http.request('get', '/api/code/value', {
            params: {
               type: 'after_sale_type'
            }
         }).then(res => {
            var data = res.data;

            let tmpData = data.map(item => ({
               value: item.value,
               label: item.label
            }));

            // 将 '全部' 选项插入到 tmpData 的开头
            this.salesTypeList = tmpData;
            this.salesTypeList.unshift({
               label: '全部',
               value: ''
            });

         })

      },
      methods: {
         salesTypeChange(e) {
            this.submitForm.salesType = e.value
         },

         async getDetail() {
            this.$message.showLoading()
@@ -101,8 +130,29 @@
            if (code === 0) {
               this.dto = {
                  ...this.dto,
                  ...data
                  ...data,
                  // pointGoodsList: [{
                  //    name: '1',
                  //    num: 1,
                  //    description: 'descriptiondescriptiondescriptiondescriptiondescription'
                  // }]
               }
               if (this.dto.statusBackend === 'PENDING') {
                  //先判断要不要字节变成已取消
                  var nowdate = new Date().getTime() - 1000 * 60 * 5
                  var diff = new Date(this.dto.createTime).getTime() - nowdate

                  if (diff <= 2000 && true) {
                     //超过了5分钟
                     this.dto.statusBackend = 'CANCEL'
                     this.dto.statusBackendStr = '已取消'
                     this.dto.status = 'CANCEL'
                     this.dto.statusStr = '已取消'
                     this.dto.bctime = ''
                     this.$forceUpdate()
                  }
               }

            }
         },
         async callTel() {
@@ -160,9 +210,12 @@
                        extraData: {
                           // merchant_id: '',
                           // merchant_trade_no: '',
                           merchant_id: '1661512517',
                           merchant_trade_no: tmp.id || '',
                           transaction_id: tmp.dto && tmp.dto.paymentTrId || ''
                        },
                        async success() {
                        async success(info) {
                           console.log('info', info)
                           //dosomething
                           // 发送请求
                           tmp.$message.showLoading()
@@ -177,6 +230,7 @@
                           tmp.$message.hideLoading()
                           if (code === 0) {
                              tmp.getDetail()
                              tmp.$store.dispatch('getCurrentInfo')
                           }
                        },
                        fail(e) {
@@ -223,6 +277,7 @@
                        id: this.id,
                     }
                  })

                  this.$message.hideLoading()
                  if (code === 0) {
                     //微信接口
@@ -373,6 +428,10 @@
               this.$message.showToast('售后数量需要大于0')
               return
            }
            if (!this.submitForm.salesType) {
               this.$message.showToast('未填写售后类型')
               return
            }
            if (!this.submitForm.reason) {
               this.$message.showToast('未填写理由')
               return
@@ -398,7 +457,7 @@
               // this.showSales = false
               // this.$forceUpdate()
               // setTimeout(() => {
                  // uni.navigateBack()
               // uni.navigateBack()
               // }, 1200)
            }
         },
@@ -435,7 +494,8 @@
         </view>
      </view>
      <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="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 || ''}}
@@ -493,6 +553,7 @@

         </view>
      </view>

      <view class="info-container bg-white br-4" v-if="!showSales">
         <view class="form-item">
            <view class="label">订单编号:</view>
@@ -508,7 +569,7 @@
         </view>
         <view class="form-item">
            <view class="label">下单日期:</view>
            <view class="value">{{ dto.paymentTime || '-' }}</view>
            <view class="value">{{ dto.createTime || '-' }}</view>
         </view>
         <view class="form-item" v-if="dto.cancelTime&&(dto.status==='CANCEL'||dto.status==='REFUND')">
            <view class="label">取消时间:</view>
@@ -554,11 +615,29 @@
         </view>
      </view>
      <view class="info-container bg-white br-4 m-t-12" v-if="!showSales">
         <view class="form-item">
            <view class="label">订单金额:</view>
            <view class="value">{{ dto.totalAmount || '-' }}</view>
         <view class="form-item flex">
            <view class="label">商品金额:</view>
            <view class="value m-l-a m-r-0 text-right">+{{ dto.flowerAmount || '0' }}</view>
         </view>
         <view class="form-item">
         <view class="form-item flex">
            <view class="label">运费:</view>
            <view class="value  m-l-a m-r-0 text-right">+{{ dto.transportFee || '0' }}</view>
         </view>
         <view class="form-item flex">
            <view class="label">打包费:</view>
            <view class="value  m-l-a m-r-0 text-right">+{{ dto.packingFee || '0' }}</view>
         </view>
         <view class="form-item flex t-red">
            <view class="label">优惠:</view>
            <view class="value  m-l-a m-r-0 text-right">-{{ dto.memberCouponAmount || '0' }}</view>
         </view>
         <view class="form-item flex t-red">
            <view class="label">实际支付:</view>
            <view class="value  m-l-a m-r-0 text-right">￥{{ dto.paymentAmount || '0' }}</view>
         </view>


         <!--    <view class="form-item">
            <view class="label">支付金额:</view>
            <view class="value">{{ dto.paymentAmount || '-' }}</view>
         </view>
@@ -566,10 +645,56 @@
            <view class="label">商品金额:</view>
            <view class="value">{{ dto.flowerAmount || '-' }}</view>
         </view>
		
         <view class="form-item">
            <view class="label">运费:</view>
            <view class="value">{{ dto.transportFee || '-' }}</view>
            <view class="label">折扣类型:</view>
            <view class="value">{{ dto.memberDiscountTypeStr || '-' }}</view>
         </view>
         <view class="form-item">
            <view class="label">优惠金额（每扎）:</view>
            <view class="value">￥{{ dto.memberDiscountAmount || '-' }}</view>
         </view>
         <view class="form-item">
            <view class="label">优惠券:</view>
            <view class="value">{{ dto.memberCouponName || '-' }}</view>
         </view> -->
         <!--    <view class="form-item">
            <view class="label">优惠金额:</view>
            <view class="value">{{ dto.memberCouponAmount || '-' }}</view>
         </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>

@@ -606,6 +731,17 @@
                  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">
               理由