update 更新支付

xuxy

2024-10-05 f63307c52e66f3463cf3c2517c80d5c5b0f60140

 pages/order/order.vue

@@ -92,9 +92,22 @@
         await this.getList()
         uni.stopPullDownRefresh()
      },
      async onShow() {
         // 支付回调
         // #ifdef PUB_CUSTOMER_DEV
         let options = wx.getEnterOptionsSync();
         if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3') {
            // 代表从收银台小程序返回
            let extraData = options.referrerInfo.extraData;
            this.$store.dispatch('sign_add', 'order')
            this.refreshList()
            return
         }
         // #endif
      },
      methods: {
			
			


         openbrand(item) {
            console.log(item)
            //也要判断一下是否重复进入
@@ -118,7 +131,7 @@
                  return
               }
            }
			

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

         },
         toFlowerDetail(item) {
            uni.navigateTo({
@@ -166,8 +179,8 @@
               url: '/pages/order/order-detail?id=' + item.id
            })
         },
			
         async copyOrder(item){

         async copyOrder(item) {
            console.log(item)
            await this.$message.confirm('是否确定再来一单')
            // 发送请求
@@ -184,13 +197,13 @@
            this.$message.hideLoading()
            if (code === 0) {
               //微信接口
               if(msg&&msg!=""){
               if (msg && msg != "") {
                  this.$message.showToast(msg)
               }
				

            }
         },
			

         toDetailSaleInfo(dto, flower) {
            console.log('flower', dto, flower)
            uni.navigateTo({
@@ -234,29 +247,37 @@
                        extraData: {
                           // merchant_id: '1230000109',
                           // merchant_trade_no: '1234323JKHDFE1243252',
                           merchant_id: '1661512517',
                           merchant_trade_no: item.orderId || item.id || '',
                           // merchant_id: '1661512517',
                           // merchant_trade_no: item.orderId || item.id || '',
                           transaction_id: item.paymentTrId
                        },
                        async success(info) {
                           console.log('确认收货 info success', info)
                           //dosomething
                           // 发送请求
                           tmp.$message.showLoading()
                           const {
                              code
                           } = await tmp.$http.request('get',
                              '/api/customer/order/receive/confirm', {
                                 params: {
                                    id: item.id,
                                 }
                              })
                           tmp.$message.hideLoading()
                           if (code === 0) {
                              tmp.refreshList()
                              //刷新积分
                              tmp.$store.dispatch('getCurrentInfo')
                              tmp.$message.showToast('收货成功')
                           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: item.id,
                                    }
                                 })
                              tmp.$message.hideLoading()
                              if (code === 0) {
                                 tmp.refreshList()
                                 //刷新积分
                                 tmp.$store.dispatch('getCurrentInfo')
                                 tmp.$message.showToast('收货成功')
                              }
                           }
                        },
                        fail(e) {
@@ -322,6 +343,40 @@
                           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

                  }

@@ -478,22 +533,22 @@
            <view class="flower-info m-b-5 m-t-8 br-4" v-for="(item,j) of dto.items" :key="j">
               <!-- <view class="line-gray"></view> -->

               <view class="supplier-name " @click.stop="openbrand(item)" >
               <view class="supplier-name w-fit m-l-0 m-r-a" @click.stop="openbrand(item)">
                  <image class="icon-dp br-4" src="/static/common/icon-dp.png"></image>
                  {{ item.supplierName }}
                  {{ item.supplierName|| '' }} >
               </view>
               <view class="flex m-t-12 flex-wrap-normal" >
                  <image class="flower-img img100 m-r-6" :src="item.flowerCover"
                     @click="previewImg(item.flowerCover)">
               <view class="flex m-t-12 flex-wrap-normal">
                  <!-- @click="previewImg(item.flowerCover)" -->
                  <image class="flower-img img100 m-r-6" :src="item.flowerCover" @click.stop="toDetail(dto)">
                  </image>
                  <!-- <view class="flex1" @click.stop="toFlowerDetail(item)"> -->
                  <view class="flex1" @click.stop="toDetail(dto)">
							
                  <view class="flex1">

                     <view class=" flex">
                        <view class="title flex flex1">
                           <!-- <span class="level">{{ item.flowerCategory }}</span> -->
                           <span class="m-r-10">{{ item.flowerName }}</span>
                           <span class="level">{{ item.flowerLevelStr }}</span>
                           <span class="m-r-10" @click.stop="toDetail(dto)">{{ item.flowerName }}</span>
                           <span class="level" @click.stop="toDetail(dto)">{{ item.flowerLevelStr }}</span>
                           <view class="m-l-a m-r-10 flex">
                              <view class="m-r-10 button-icon" @click="toOrderItemDetail(item,'lack','缺货')"
                                 v-if="item.lackNum">
@@ -506,7 +561,7 @@
                           </view>
                        </view>
                     </view>
                     <view class="each-list">
                     <view class="each-list" @click.stop="toDetail(dto)">
                        <view class="each-item">
                           <view class="label">颜色</view>
                           <view class="value">{{ item.flowerColor || '-' }}</view>