update 更新支付

xuxy

2024-10-05 f63307c52e66f3463cf3c2517c80d5c5b0f60140

 pages/order/order-detail.vue

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

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

                           } else {
@@ -346,6 +359,41 @@
                           that.$message.showToast('支付失败')
                        }
                     })
                     // #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
                     }
                     if (compareVersion(version, '2.26.2') >= 0) {
							
                        wx.openEmbeddedMiniProgram({
                           appId: 'wxef277996acc166c3',
                           extraData: param
                        })
							
                     } else {
                        wx.navigateToMiniProgram({
                           appId: 'wxef277996acc166c3',
                           extraData: param
                        })
							
                     }
                     // #endif
							

                  }

@@ -476,10 +524,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 +599,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 +612,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