From fb0e6a33c6279ff7a796262c62b14e38c0435180 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 4 Mar 2024 16:33:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/payment/get_payment.vue     |  1 +
 pages/payment/settlement.vue      | 11 +++++++----
 pages/users/invite_code/index.vue | 11 ++++++++++-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue
index e393cb4..53fb728 100644
--- a/pages/payment/get_payment.vue
+++ b/pages/payment/get_payment.vue
@@ -116,6 +116,7 @@
 				this.isAuto = true;
 				this.isShowAuth = true;
 			} else {
+        this.checkForm.cart_id = [];
 				this.getProductInfoByMerid(this.mer_id);
 			}
 		},
diff --git a/pages/payment/settlement.vue b/pages/payment/settlement.vue
index f60f603..b6a2c40 100644
--- a/pages/payment/settlement.vue
+++ b/pages/payment/settlement.vue
@@ -73,7 +73,7 @@
           <view class='money'>￥{{payForm.money}}</view>
         </view>
 
-        <view class='item acea-row row-between-wrapper' v-if="false">
+        <view class='item acea-row row-between-wrapper'>
           <view>补贴抵扣</view>
           <block v-if="platformConsumption.length > 0" >
             <view class='discount money red_packet' @click="couponTap3()">
@@ -94,7 +94,7 @@
           <view>
             合计:
             <text class='pColor' v-if="cartArr[4].payStatus == 1 && active == 4">￥0.00</text>
-            <text class='pColor' v-else>￥{{payForm.money }}</text>
+            <text class='pColor' v-else>￥{{ total_coupon }}</text>
           </view>
         </view>
         <view class='settlement' :class='couponData.status != "noAddress" ? "" : "disabled"' style='z-index:100'
@@ -231,6 +231,7 @@
         type_id: '', //店铺类型
         consumption_id: '', //补贴id
         consumption_money: '', //补贴抵扣金额
+        total_coupon: '', //合计
         payForm: {
           cart_id: '',
           address_id: '',
@@ -266,11 +267,12 @@
       }
     },
     onLoad: function(options) {
+      options.money = parseFloat(options.money).toFixed(2);
       this.payForm.cart_id = options.cartId;
       this.payForm.money = options.money;
       this.payForm.merName = options.merName;
       this.checkForm.cart_id = options.cartId.split(',');
-      
+      this.total_coupon = options.money;
       
       // this.platformConsumption = [{
       //   balance: "39000.00",
@@ -322,7 +324,8 @@
                 ...this.checkForm,
                 consumption_id: this.consumption_id
               }).then(res=>{
-                this.payForm.money = this.cartForm.total_price;
+                this.total_coupon = res.data.total_coupon;
+                this.consumption_money = res.data.consumption_money;
               })
             })
           }
diff --git a/pages/users/invite_code/index.vue b/pages/users/invite_code/index.vue
index 972861e..4abc133 100644
--- a/pages/users/invite_code/index.vue
+++ b/pages/users/invite_code/index.vue
@@ -51,6 +51,7 @@
 		qrcode,
 		merchantRecord
 	} from "@/api/activity.js";
+import { Toast } from '../../../libs/uniApi';
 
 	export default {
 		components: {
@@ -87,7 +88,15 @@
 			getQrcode() {
 				qrcode().then(res => {
 					this.qrcodeUrl = res.data.url;
-				})
+				}).catch(err=>{
+          uni.showModal({
+            content:'暂未开通邀请码，需开通邀请码请联系管理员',
+            showCancel: false,
+            success: (res)=>{
+              uni.navigateBack();
+            }
+          })
+        })
 			},
 			// 获取好友列表
 			getList() {