qukaidi 4 роки тому
батько
коміт
69e060921a

+ 11 - 12
pages/login/register_3.vue

@@ -176,16 +176,15 @@
 		},
 		methods: {
 			openPdf(x) {
-				if(x==1){
+				if (x == 1) {
 					uni.openDocument({
-						filePath: '../../static/pdf/xy.pdf',
+						filePath: '../../static/pdf/agreement.pdf',
 					});
-				}else{
+				} else {
 					uni.openDocument({
-						filePath: '../../static/pdf/zc.pdf',
+						filePath: '../../static/pdf/policy.pdf',
 					});
 				}
-				
 			},
 			getAgentArea() {
 				uni.showLoading({
@@ -239,7 +238,7 @@
 					}
 					return this.agentList
 				}).catch(err => {
-					
+
 				}).finally(() => {
 					uni.hideLoading()
 				})
@@ -257,7 +256,7 @@
 						this.$u.toast(res.data.msg);
 					}
 				}).catch(err => {
-					
+
 				}).finally(() => {
 
 				})
@@ -276,7 +275,7 @@
 						this.$u.toast(res.data.msg);
 					}
 				}).catch(err => {
-					
+
 				}).finally(() => {
 
 				})
@@ -297,7 +296,7 @@
 						this.$u.toast(res.data.msg);
 					}
 				}).catch(err => {
-					
+
 				}).finally(() => {
 
 				})
@@ -349,7 +348,7 @@
 					this.getQuerybrand()
 					this.brandShow = false
 				} else {
-					
+
 				}
 			},
 			getTaskconfirm(e) {
@@ -368,7 +367,7 @@
 						if (!this.protocol) return this.$u.toast('请阅读并同意用户协议和隐私协议');
 						this.setData()
 					} else {
-						
+
 					}
 				});
 			},
@@ -424,7 +423,7 @@
 						this.$u.toast(res.data.msg);
 					}
 				}).catch(err => {
-					
+
 				}).finally(() => {
 					setTimeout(() => {
 						this.loading = false

+ 59 - 47
pages/me/setting/setting.vue

@@ -6,7 +6,8 @@
 			<view slot="body">
 				<view class="u-flex u-row-between">
 					<view class="">
-						<u-image width="130rpx" height="130rpx" :src="userInfo.storeImageUrl" :lazy-load="true" shape="circle" :show-loading="true">
+						<u-image width="130rpx" height="130rpx" :src="userInfo.storeImageUrl" :lazy-load="true" shape="circle"
+						 :show-loading="true">
 							<u-loading slot="loading"></u-loading>
 							<view slot="error" style="font-size: 24rpx" :fade="true" duration="450">加载失败
 							</view>
@@ -36,10 +37,10 @@
 						<u-cell-item title="联系电话" :value="userInfo.storePhone" :arrow="false">
 							<u-icon slot="icon" size="42" name="phone-o" custom-prefix="van-icon" color="#0095FF" style="margin-right: 10rpx"></u-icon>
 						</u-cell-item>
-						<u-cell-item title="用户协议">
+						<u-cell-item title="用户协议" @click="openPdf(1)">
 							<u-icon slot="icon" size="42" name="friends-o" custom-prefix="van-icon" color="#0095FF" style="margin-right: 10rpx"></u-icon>
 						</u-cell-item>
-						<u-cell-item title="隐私政策">
+						<u-cell-item title="隐私政策" @click="openPdf(2)">
 							<u-icon slot="icon" size="42" name="info-o" custom-prefix="van-icon" color="#0095FF" style="margin-right: 10rpx"></u-icon>
 						</u-cell-item>
 						<u-cell-item title="版本检测" :value="edition_s" :arrow="false" :border-bottom="false" @click="edition">
@@ -75,8 +76,8 @@
 		},
 		created() {
 			this.getMyinfo();
-			plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {			
-				 //版本号
+			plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
+				//版本号
 				this.edition_s = wgtinfo.version
 			})
 
@@ -90,22 +91,33 @@
 					type: "reLaunch",
 				});
 			},
+			openPdf(x) {
+				if (x == 1) {
+					uni.openDocument({
+						filePath: '../../../static/pdf/agreement.pdf',
+					});
+				} else {
+					uni.openDocument({
+						filePath: '../../../static/pdf/policy.pdf',
+					});
+				}
+			},
 			edition() {
 				uni.getSystemInfo({
 					success: res => {
-						
+
 					},
 					complete: err => {
 						if (err.platform == 'android') {
 							this.onLaunch_s()
 						} else if (err.platform == 'ios') {
-							
+
 							this.iosstartup()
 						}
 					}
 				});
 			},
-			iosstartup(){
+			iosstartup() {
 				request({
 						url: '/baseReq/apkUpgrade',
 						method: 'get',
@@ -113,15 +125,15 @@
 							osType: 1
 						}
 					}).then(res => {
-						
-						
-						 //最低版本
-						 //更新文案
-						 //最新版本
-				
+
+
+						//最低版本
+						//更新文案
+						//最新版本
+
 						plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
-							
-							 //版本号
+
+							//版本号
 							if (wgtinfo.version == res.data.version) {
 								this.show_s = true
 								uni.showToast({
@@ -129,10 +141,10 @@
 									title: '已是最新版本',
 									position: "bottom"
 								})
-								
+
 							} else if (wgtinfo.version != res.data.forceVersion) {
-								
-								res.data.msg = res.data.msg.replace(/\\n/g,"\n")
+
+								res.data.msg = res.data.msg.replace(/\\n/g, "\n")
 								uni.showModal({
 									title: "发现新版本",
 									content: res.data.msg,
@@ -140,46 +152,46 @@
 									confirmText: "立即去AppStore更新",
 									success: function(res) {
 										if (res.confirm) {
-											
+
 											let appleId = 1518555723
 											plus.runtime.launchApplication({
 												action: `itms-apps://itunes.apple.com/cn/app/id${appleId}?mt=8`
 											}, function(e) {
-												
+
 											});
 										} else if (res.cancel) {
-											
+
 										}
 									}
 								})
 							} else if (wgtinfo.version == res.data.forceVersion) {
-								
-								res.data.msg = res.data.msg.replace(/\\n/g,"\n")
+
+								res.data.msg = res.data.msg.replace(/\\n/g, "\n")
 								uni.showModal({
 									title: "发现新版本",
 									content: res.data.msg,
 									showCancel: true,
 									confirmText: "立即去AppStore更新",
 									success: function(res) {
-										if (res.confirm) { 
-											
+										if (res.confirm) {
+
 											let appleId = 1518555723
 											plus.runtime.launchApplication({
 												action: `itms-apps://itunes.apple.com/cn/app/id${appleId}?mt=8`
 											}, function(e) {
-												
+
 											});
 										} else if (res.cancel) {
-											
+
 										}
 									}
 								})
 							}
-				
+
 						})
-				
+
 					}).catch(err => {
-						
+
 					})
 					.finally(() => {
 						// Loading.close()
@@ -190,7 +202,7 @@
 				if (this.show_s == true) {
 					this.show_s = false
 				}
-				
+
 				request({
 						url: '/baseReq/apkUpgrade',
 						method: 'get',
@@ -198,15 +210,15 @@
 							osType: 0
 						}
 					}).then(res => {
-						
-						 //最低版本
-						 //更新文案
-						 //下载最新版地址
-						 //最新版本
+
+						//最低版本
+						//更新文案
+						//下载最新版地址
+						//最新版本
 
 						plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
-							
-							 //版本号
+
+							//版本号
 							if (wgtinfo.version == res.data.version) {
 								this.show_s = false
 								uni.showToast({
@@ -215,28 +227,28 @@
 									position: "bottom"
 								})
 								this.closeModal();
-								
+
 							} else if (wgtinfo.version != res.data.forceVersion) {
-								
+
 								this.Copywriting = res.data.msg
 								this.show_s = true
-								
+
 								this.url = res.data.url
 								this.is_force = true
 							} else if (wgtinfo.version == res.data.forceVersion) {
-								
+
 								this.Copywriting = res.data.msg
-								
+
 								this.is_force = false
 								this.show_s = true
-								
+
 								this.url = res.data.url
 							}
 
 						})
 
 					}).catch(err => {
-						
+
 					})
 					.finally(() => {
 						// Loading.close()
@@ -255,7 +267,7 @@
 						this.userInfo = res.data.data;
 					})
 					.catch((err) => {
-						
+
 					})
 					.finally(() => {
 						this.loading = false;

+ 0 - 0
static/pdf/xy.pdf → static/pdf/agreement.pdf


+ 0 - 0
static/pdf/zc.pdf → static/pdf/policy.pdf