From b0afaeef0f8f0b5aa116c6c6d772f211e6908368 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 13 八月 2024 15:28:36 +0800
Subject: [PATCH] update 用户协议

---
 manifest.json                |    2 +-
 pages/login/supplier-reg.vue |   42 +++++++++++++++++++++++++++++++++---------
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/manifest.json b/manifest.json
index 782394c..2848179 100644
--- a/manifest.json
+++ b/manifest.json
@@ -49,7 +49,7 @@
     "quickapp" : {},
     /* 快应用特有相关 */
     "mp-weixin" : {
-        "appid" : "wx6d0ecc4e18710458",
+        "appid" : "wx1441324401626290",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,
diff --git a/pages/login/supplier-reg.vue b/pages/login/supplier-reg.vue
index e8d03b4..7af59c7 100644
--- a/pages/login/supplier-reg.vue
+++ b/pages/login/supplier-reg.vue
@@ -86,13 +86,33 @@
 
 						</view>
 						<view class="flex flex-wrap-normal"
-							style="position: fixed;bottom: 40rpx;left: 40rpx;right: 40rpx;" v-if="false">
+							style="position: fixed;bottom: 40rpx;left: 40rpx;right: 40rpx;" v-if="true">
 							<view :style="{'margin-top': '8rpx','margin-right': '12rpx','font-size':'24rpx'}"
 								@click="protocal=!protocal" class="component-radio" :class="[protocal?'cur':'']">
 
 							</view>
-							<view class="topic-gray" @click="toProtocol">请仔细阅读《花满芫合伙人供应商入口小程序隐私保护指引》如您同意该指引,请勾选开始使用本小程序
+							<!-- /pages/help/content?id=新手帮助 -->
+							<!-- 用户协议,隐私政策、卖家入驻协议、合伙人入驻协议 -->
+
+							<!-- #ifdef PUB_PARTNER -->
+							<view class="topic-gray" @click="goto('/pages/help/content?id=合伙人入驻协议',false)">
+								请仔细阅读《合伙人入驻协议》如您同意该指引,请勾选开始使用本小程序
 							</view>
+							<!-- #endif -->
+							<!-- #ifdef PUB_SUPPLIER -->
+							<view class="topic-gray" @click="goto('/pages/help/content?id=卖家入驻协议',false)">
+								请仔细阅读《卖家入驻协议》如您同意该指引,请勾选开始使用本小程序
+							</view>
+							<!-- #endif -->
+							<!-- #ifdef PUB_CUSTOMER -->
+							<view class="topic-gray">
+								请仔细阅读<span class="t-red"
+									@click="goto('/pages/help/content?id=用户协议',false)">《用户协议》</span>和 <span class="t-red"
+									@click="goto('/pages/help/content?id=隐私政策',false)">《隐私政策》</span>
+								如您同意该指引,请勾选开始使用本小程序
+							</view>
+							<!-- #endif -->
+
 						</view>
 					</form>
 				</view>
@@ -309,6 +329,10 @@
 			//   })
 			// },
 			wxreg(e) {
+				if (!this.protocal) {
+					this.$message.showToast('请同意协议')
+					return;
+				}
 				let tmp = this
 				wx.login({
 					success: async res => {
@@ -365,10 +389,10 @@
 					return
 				}
 				// #endif
-				// if (this.pcfvalue == undefined) {
-				// 	util.showMyToast('必须勾选《用户服务协议》及《隐私政策》');
-				// 	return;
-				// }
+				if (!this.protocal) {
+					this.$message.showToast('请同意协议')
+					return;
+				}
 				let post = {
 					tel: this.phoneNumber,
 					smsCode: this.smsCode,
@@ -398,19 +422,19 @@
 					var dto = {}
 					dto.partnerUserId = this.partnerId || undefined
 					//如果没有绑定,有商品详情的分享合伙人id的话缓存的话,尝试用这个
-					if(!dto.partnerUserId){
+					if (!dto.partnerUserId) {
 						try {
 							var sharePartnerUserId = this.$storage.getItem('cache_sharePartnerUserId')
 							if (sharePartnerUserId) {
 								//试图绑定
 								this.$storage.removeItem('cache_sharePartnerUserId')
-								dto.partnerUserId = sharePartnerUserId						
+								dto.partnerUserId = sharePartnerUserId
 							}
 						} catch (e) {
 							console.error('reg bind ', e)
 						}
 					}
-										
+
 					dto.name = this.regCustomerName || ''
 					post.dto = dto
 					// #endif

--
Gitblit v1.9.3