From db4dc959d4137d820b5cfc1010a39e82c47d218f Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Thu, 12 Sep 2024 11:15:24 +0800
Subject: [PATCH] =?UTF-8?q?Fix(=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8)?=
 =?UTF-8?q?=EF=BC=9A=E3=80=90=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E3=80=91=E5=BE=85=E4=BB=98=E6=AC=BE=E8=AE=A2=E5=8D=95=E2=80=94?=
 =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E4=BB=98=E6=AC=BE=EF=BC=8C=E5=BA=94=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E8=B7=B3=E5=87=BA=E8=BE=93=E5=85=A5=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=BC=B9=E7=AA=97=E8=80=8C=E4=B8=8D=E6=98=AF?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yzc-paykeyboard/yzc-paykeyboard.vue       |  2 +-
 pages/order/MyOrder/index.vue                 | 72 ++++++++++++++++---
 2 files changed, 63 insertions(+), 11 deletions(-)

diff --git a/components/yzc-paykeyboard/yzc-paykeyboard.vue b/components/yzc-paykeyboard/yzc-paykeyboard.vue
index 0995954..2258dff 100644
--- a/components/yzc-paykeyboard/yzc-paykeyboard.vue
+++ b/components/yzc-paykeyboard/yzc-paykeyboard.vue
@@ -100,7 +100,7 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	input {
 		display: none;
 	}
diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index c834027..7543870 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -130,7 +130,7 @@
             <template v-if="order._status._type == 0">
               <view class="bnt cancelBnt v12-dark-text v12-dark-border" @click="cancelOrder(order)">取消订单</view>
               <view class="bnt cancelBnt v12-dark-text v12-dark-border" @click="addressTap(order)">修改地址</view>
-              <view class="bnt bg-color-lightred  v12-white v12-primary-text v12-primary-border v12-radius-40" @click="goOrderDetails(order)">立即付款</view>
+              <view class="bnt bg-color-lightred  v12-white v12-primary-text v12-primary-border v12-radius-40" @click="subscribePay(order)">立即付款</view>
             </template>
             <template v-if="(order._status._type == 1 || order._status._type == 9) && order.isTickets==0">
               <view class="bnt bg-color-lightred v12-white v12-primary-text v12-primary-border v12-radius-40" @click="goOrderDetails(order)">查看详情</view>
@@ -159,9 +159,14 @@
       </view>
     </view>
 
-    <u-modal :show="showExtend" title="确认延长收货时间？" content='每笔订单只能延长一次哦' showCancelButton
-             @cancel="showExtend=false" @confirm="doneDelay"></u-modal>
-
+    <u-modal 
+      :show="showExtend" 
+      title="确认延长收货时间？" 
+      content='每笔订单只能延长一次哦' 
+      showCancelButton
+      @cancel="showExtend=false" 
+      @confirm="doneDelay">
+    </u-modal>
     <view class="noCart" v-if="orderList.length === 0 && page > 1">
       <view class="pictrue">
         <image :src="webUrl+'/20240102232734472795.png'"/>
@@ -169,11 +174,20 @@
     </view>
     <Loading :loaded="loaded" :loading="loading"></Loading>
     <Payment v-model="pay" :types="payType" @checked="toPay" :balance="userInfo.nowMoney"></Payment>
+    <passkeyborad 
+      :money="orderInfo.payPrice" 
+      showMoney 
+      :show="isShowPayPwdPop" 
+      ref='payPwdPop' 
+      @close="pwdPopClose"
+      @finish="pwdPopFinish"
+    ></passkeyborad>
   </view>
 </template>
 <script>
+import passkeyborad from '@/components/yzc-paykeyboard/yzc-paykeyboard'
 import {getOrderData, getOrderList, orderDelay, editAddress} from "@/api/order";
-import {cancelOrderHandle, payOrderHandle, takeOrderHandle} from "@/libs/order";
+import {cancelOrderHandle, payOrderHandle, takeOrderHandle, yuePayOrderHandle} from "@/libs/order";
 import Loading from "@/components/Loading";
 import Payment from "@/components/Payment";
 import {mapGetters} from "vuex";
@@ -184,6 +198,7 @@ export default {
   mixins: [pageListenMixins],
   data() {
     return {
+      isShowPayPwdPop: false,
       inputStyle: {
         height: '64rpx',
       },
@@ -223,18 +238,19 @@ export default {
       pay: false,
       payType: ["yue", "weixin"],
       from: this.$deviceType,
-
+      orderInfo: {},
       showExtend: false,
       delayId: null,
       pageKeyId: Object.freeze('userOrderIndex'),
       keyword: '',
       _orderId: '',
-      addressId: ''
+      addressId: '',
     };
   },
   components: {
     Loading,
-    Payment
+    Payment,
+    passkeyborad
   },
   computed: mapGetters(["userInfo"]),
   onShow: function () {
@@ -288,6 +304,30 @@ export default {
     }
   },
   methods: {
+    async toYuePay(payPwd) {
+      const that = this;
+      //网络请求
+      await yuePayOrderHandle(this.orderInfo.orderId, "yue", that.from, payPwd);
+      that.changeType();
+      this.payPassword = "";
+    },
+    pwdPopClose() {
+      this.isShowPayPwdPop = false;
+    },
+    pwdPopFinish(payPwd) {
+      this.payPassword = payPwd;
+
+      this.toYuePay(payPwd);
+
+      this.isShowPayPwdPop = false;
+    },
+    subscribePay(order) {
+      this.orderInfo = order
+      uni.requestSubscribeMessage({
+        tmplIds: ['7O3wKw7_D4t7yfSOlvecKuOQP8QEPY88uBx2FJg43HE', 'TSmTnGibZ8IxWCiRWOvLxha6-0u7tE-V1-WbDCiPkKU', '9Q6xLHe6HyjkU5Zn5k_2zxYPf2y4MxVyUbOSW8pcZRU'],
+        complete: () => this.pay = true
+      })
+    },
     addressTap(order) {
       this._orderId = order.orderId
       this.$yrouter.push({
@@ -459,6 +499,9 @@ export default {
         this.page++;
         this.loaded = res.data.length < this.limit;
         this.loading = false;
+      }).finally(() => {
+        this.loading = false;
+        // console.log('???',this.loading);
       });
     },
     tapShowMore(order, index) {
@@ -512,7 +555,7 @@ export default {
           });
     },
     paymentTap: function (order) {
-      var that = this;
+      const that = this;
       if (
           !(order.combinationId > 0 || order.bargainId > 0 || order.seckillId > 0)
       ) {
@@ -533,7 +576,16 @@ export default {
             });
       };
     },
-    toPay() {
+    toPay(type) {
+      const that = this;
+      console.log(type, "支付方式");
+      //余额支付需要输入支付密码
+      if (type == "yue") {
+        this.isShowPayPwdPop = true;
+        return;
+      } else {
+        payOrderHandle(this.orderInfo.orderId, type, that.from);
+      }
     },
 
     toDelay(id) {