From 798b1d9c221eee417d4519a40e700dc19189e9cc Mon Sep 17 00:00:00 2001
From: wpf <2187978347@qq.com>
Date: Thu, 7 Mar 2024 16:26:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                    | 11 +++--------
 pages/payment/get_payment.vue    |  5 ++++-
 pages/payment/settlement.vue     |  5 ++++-
 pages/store/settled/index.vue    |  2 +-
 pages/store/settled/unit.vue     |  2 +-
 pages/users/login/login_copy.vue |  9 ++++++++-
 6 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/manifest.json b/manifest.json
index e947dab..647b95a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -30,14 +30,14 @@
             "Geolocation" : {},
             "Payment" : {},
             "Share" : {},
-            "OAuth" : {},
             "UniMP" : {
                 "description" : "uni小程序"
             },
             "Maps" : {},
             "Push" : {},
             "LivePusher" : {},
-            "Record" : {}
+            "Record" : {},
+            "OAuth" : {}
         },
         "safearea" : {
             "bottom" : {
@@ -132,12 +132,7 @@
                         "name" : "amapIvoVHpJR"
                     }
                 },
-                "oauth" : {
-                    "weixin" : {
-                        "appid" : "wx9d68c92b550ddd1e",
-                        "UniversalLinks" : "https://shop.lihaink.cn/"
-                    }
-                },
+                "oauth" : {},
                 "ad" : {},
                 "push" : {},
                 "speech" : {}
diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue
index b72e754..1cae073 100644
--- a/pages/payment/get_payment.vue
+++ b/pages/payment/get_payment.vue
@@ -69,6 +69,7 @@
 		mapGetters
 	} from "vuex";
 	import authorize from '@/components/Authorize';
+import { Toast } from "../../libs/uniApi";
 	export default {
 		components: {
 			authorize
@@ -166,7 +167,9 @@
 								res.eventChannel.emit('datas', res1.data.platformConsumption);
 							}
 						})
-					});
+					}).catch(err=>{
+            Toast(err.message || err)
+          });
 				}).catch((err) => {
 					this.$util.Tips({
 						title: err.message || err.msg || err
diff --git a/pages/payment/settlement.vue b/pages/payment/settlement.vue
index b6a2c40..3577856 100644
--- a/pages/payment/settlement.vue
+++ b/pages/payment/settlement.vue
@@ -235,6 +235,7 @@
         payForm: {
           cart_id: '',
           address_id: '',
+          consumption_id: '',
           use_coupon: '',
           takes: '',
           use_integral: '',
@@ -324,8 +325,10 @@
                 ...this.checkForm,
                 consumption_id: this.consumption_id
               }).then(res=>{
-                this.total_coupon = res.data.total_coupon;
+                this.total_coupon = res.data.order_price;
                 this.consumption_money = res.data.consumption_money;
+                this.payForm.consumption_id = this.consumption_id;
+                // this.payForm.money = res.data.order_price;
               })
             })
           }
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index c404073..e170131 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -241,7 +241,7 @@
             <view class="item no-border" v-if="nature_business==2">
             	<view class='acea-row row-middle'>
             		<text class="item-title" style="margin-right: 20rpx;">请上传银行卡正面照片</text>
-            		<text class="item-desc">(图片格式支持JPG、PNG、JPEG)</text>
+            		<text class="item-desc">(支持JPG、PNG、JPEG)</text>
             		<view class="upload">
             			<view v-if="bank_front" class='pictrue' @click='uploadpicBack'>
             				<image :src='bank_front'></image>
diff --git a/pages/store/settled/unit.vue b/pages/store/settled/unit.vue
index 23b7168..507bd38 100644
--- a/pages/store/settled/unit.vue
+++ b/pages/store/settled/unit.vue
@@ -133,7 +133,7 @@
             <view class="item no-border">
             	<view class='acea-row row-middle'>
             		<text class="item-title" style="margin-right: 20rpx;">请上传银行卡正面照片</text>
-            		<text class="item-desc">(图片格式支持JPG、PNG、JPEG)</text>
+            		<text class="item-desc">(支持JPG、PNG、JPEG)</text>
             		<view class="upload">
             			<view v-if="bank_front" class='pictrue' @click='uploadpicBack'>
             				<image :src='bank_front'></image>
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index 36f396f..dd2b1d8 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -12,6 +12,13 @@
           <div class="logon" style="display: flex;align-items: center;justify-content: center;" @click="wxLogin"> 
             <u-icon name="weixin-fill" color="#fff" size="30"></u-icon> 微信一键登录
           </div>
+          
+          <checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
+          	<checkbox class="checkbox" :checked="isAgree ? true : false" />
+          	<text class="protocol_text">我已同意<text @click="userAgree"
+          			class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree"
+          			class="font_pro">《隐私政策》</text></text>
+          </checkbox-group>
         </div>
 				<div class="whiteBg" v-else-if="formItem === 1">
 					<div class="title acea-row row-center-wrapper">
@@ -528,7 +535,7 @@ import { Toast } from "../../../libs/uniApi";
 				})
 				uni.login({
 					provider: 'weixin',
-					// onlyAuthorize: true,
+					onlyAuthorize: true,
 					success: function(loginRes) {
             console.log(loginRes);
 						self.appUserInfo = loginRes;