update 测试支付新接口（todo 提交体验版测试）

xuxueyang

2024-10-08 b4ccdd63e945417f3bd25e584d93a3dd5af1c666

 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)
      },
@@ -111,7 +124,14 @@

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

         openbrand(item) {
            //也要判断一下是否重复进入
            //判断堆栈，如果是店铺，就直接返回
@@ -134,7 +154,7 @@
                  return
               }
            }
			 

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

         },

         toFlowerDetail(item) {
            console.log(item)
            uni.navigateTo({
@@ -253,25 +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()
                              tmp.$store.dispatch('getCurrentInfo')
                           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
@@ -322,6 +354,8 @@
                  if (code === 0) {
                     //微信接口
                     let that = this
                     // #ifndef PUB_CUSTOMER_DEV
							
                     wx.requestPayment({
                        ...data,
                        async success(res) {
@@ -334,6 +368,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
							

                  }

@@ -464,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
@@ -536,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}} -->
@@ -547,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
@@ -834,8 +898,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'"> 申请售后