update 订单支付-确认收货

xuxueyang

2024-10-09 6dd1a191d22e8c3dd5ec985e356c495f6332a1ea

 pages/order/order-detail.vue

@@ -14,7 +14,22 @@
            // #ifdef PUB_PARTNER
            type: 'partner',
            // #endif
            salesTypeDef: 0,
            salesTypeList: [],
         };
      },
		
      async onShow() {
         // 支付回调
         // #ifdef PUB_CUSTOMER_DEV
         let options = wx.getEnterOptionsSync();
         if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3') {
            // 代表从收银台小程序返回
            let extraData = options.referrerInfo.extraData;
            this.getDetail()
            return
         }
         // #endif
      },
      onUnload() {
         this.timer && clearTimeout(this.timer)
@@ -31,6 +46,7 @@
               orderId: this.id,
               // imageList: [],
               videoList: [],
               salesType: '',
               reason: '',
               // orderItems: [],
               orderItemId: options.flowerId || '',
@@ -39,8 +55,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 +100,83 @@


         }

         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: {
         // 商品评论
         commentButtonClick(){
            // 跳转的到评论列表
            uni.navigateTo({
               url: '/pages/order/comment/order-comment?orderId='+this.id
            })
         },

         openbrand(item) {
            //也要判断一下是否重复进入
            //判断堆栈，如果是店铺，就直接返回
            //或者是：从商铺到列表再到详情，再到商铺，这种也不行
            const pages = getCurrentPages();
            console.log('toShopping', pages)
            if (pages && pages.length >= 2) {
               if (pages[pages.length - 2].route === "sub_pages/customer/shop/shop") {
                  uni.navigateBack()
                  return
               }
            }
            if (pages && pages.length >= 3) {
               if (pages[pages.length - 3].route === "sub_pages/customer/shop/shop" &&
                  pages[pages.length - 2].route === "sub_pages/customer/trade/list"
               ) {
                  uni.navigateBack({
                     delta: 2
                  })
                  return
               }
            }

            if (pages.length >= 10) {
               //直接强制购物车
               uni.reLaunch({
                  url: '/sub_pages/customer/shop/shop?id=' + (item.supplierId || '')
               })
            } else {
               uni.navigateTo({
                  url: '/sub_pages/customer/shop/shop?id=' + (item.supplierId || '')
               })
            }

         },

         toFlowerDetail(item) {
            console.log(item)
            uni.navigateTo({
               url: `/sub_pages/customer/trade/detail?id=${item.flowerId}`
            })
         },
         salesTypeChange(e) {
            this.submitForm.salesType = e.value
         },

         async getDetail() {
            this.$message.showLoading()
@@ -101,8 +193,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() {
@@ -151,7 +264,7 @@
                  await this.$message.confirm('是否确定收货')

                  var tryCallWx = false
                  // #ifdef MP
                  // #ifdef MPOLD
                  let tmp = this
                  if (wx.openBusinessView && tmp.dto && tmp.dto.paymentTrId) {
                     tryCallWx = true
@@ -160,24 +273,37 @@
                        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()
                           const {
                              code
                           } = await tmp.$http.request('get',
                              '/api/customer/order/receive/confirm', {
                                 params: {
                                    id: tmp.id,
                                 }
                              })
                           tmp.$message.hideLoading()
                           if (code === 0) {
                              tmp.getDetail()
                           if (info.extraData && info.extraData.status === 'fail') {
                              tmp.$message.showToast('支付和确认收货需要是同一微信号，请联系实际支付人登录确认')

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

                           } else {
                              tmp.$message.showLoading()
                              const {
                                 code
                              } = await tmp.$http.request('get',
                                 '/api/customer/order/receive/confirm', {
                                    params: {
                                       id: tmp.id,
                                    }
                                 })
                              tmp.$message.hideLoading()
                              if (code === 0) {
                                 tmp.getDetail()
                                 tmp.$store.dispatch('getCurrentInfo')
                              }

                           }

                        },
                        fail(e) {
                           //dosomething
@@ -206,6 +332,8 @@
                     this.$message.hideLoading()
                     if (code === 0) {
                        this.getDetail()
                        this.$store.dispatch('getCurrentInfo')
                        this.$message.showToast('收货成功')
                     }
                  }

@@ -223,10 +351,13 @@
                        id: this.id,
                     }
                  })

                  this.$message.hideLoading()
                  if (code === 0) {
                     //微信接口
                     let that = this
                     // #ifndef PUB_CUSTOMER_DEV
							
                     wx.requestPayment({
                        ...data,
                        async success(res) {
@@ -239,6 +370,32 @@
                           that.$message.showToast('支付失败')
                        }
                     })
                     // #endif
                     // #ifdef PUB_CUSTOMER_DEV
                     var param = {
                        // cusid: "平台分配的商户号",
                        // appid: "平台分配的appid",
                        // orgid: "平台分配的机构号",
                        // version: "12",
                        // trxamt: "1",
                        // reqsn: "商户唯一订单号",
                        // notify_url: "服务器异步通知页面路径",
                        // body: "标题",
                        // remark: "备注",
                        // validtime: "订单有效时间",
                        // limit_pay: "no_credit",
                        // randomstr: "随机字符串",
                        // paytype: "W06",
                        // signtype: "签名方式",
                        // sign: "签名，参考2.1",
                        ...data
                     }
                     wx.openEmbeddedMiniProgram({
                        appId: 'wxef277996acc166c3',
                        extraData: param
                     })
                     // #endif
							

                  }

@@ -369,8 +526,15 @@
            //    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
            }
            if (!this.submitForm.reason) {
@@ -398,7 +562,7 @@
               // this.showSales = false
               // this.$forceUpdate()
               // setTimeout(() => {
                  // uni.navigateBack()
               // uni.navigateBack()
               // }, 1200)
            }
         },
@@ -435,10 +599,13 @@
         </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="supplier-name ">
               <image class="icon-dp" src="/static/common/icon-dp.png"></image>
               {{ item.supplierName || ''}}
         <view class="flower-info m-b-20 m-t-12 br-4"
            v-if="!showSales||showSales&&(submitForm.orderItemId == item.id)">
            <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}} -->
@@ -447,10 +614,9 @@
               <!-- @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">
               <!-- <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
                           class="level">{{ item.flowerLevelStr || ''}}</span>{{ item.flowerName || ''}}
@@ -493,6 +659,7 @@

         </view>
      </view>

      <view class="info-container bg-white br-4" v-if="!showSales">
         <view class="form-item">
            <view class="label">订单编号:</view>
@@ -508,7 +675,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 +721,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 +751,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 +837,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">
               理由
@@ -658,8 +900,8 @@
         <view class="button button-1" @click="buttonClick('payAgain')" v-if=" dto.status === 'PENDING'"> 重新支付<span
               v-if="dto.bctime">({{dto.bctime}})</span>
         </view>
         <view class="button button-1" @click="buttonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价
         </view>
         <!-- <view class="button button-1" @click="commentButtonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价 </view> -->
         <!-- <view class="button button-1" @click="buttonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价 </view> -->
         <!-- ||dto.status=='COMPLETED' -->
         <!-- 在外面申请了，里面不允许了 -->
         <!--    <view class="button button-1" @click="buttonClick('sales')" v-if=" dto.status === 'RECEIVE'"> 申请售后