新建分支前最后一次提交

pages/user/login.vue

@@ -40,7 +40,7 @@
 			<view class="protocol_box">
 				<view class="select" :class="{active: agree}" @click="agree = !agree"></view>
 				我已同意
-				<!-- <a href="https://main.nuttyreading.com/agreement.html">《用户协议》</a> -->
+				<!-- <text @click="plus.runtime.openURL('https://main.nuttyreading.com/agreement.html')">《用户协议》</text> -->
 				<!-- <text @click="onPageJump('/pages/user/protocol')">《用户协议》</text> -->
 				<span class="highlight" @click="showXieyi('user')">《用户协议》</span>
 				和
@@ -114,10 +114,10 @@
 			
 			<u-popup :show="xieyiShow" :round="10" @close="xieyiShow=false">
 				<view class="tanchu">
-					<view class="dp_title">{{xieyi.title}}</view>
-					<view style="max-height: 1000rpx;overflow-y: scroll;">
-						<view v-html="xieyi.content"></view>
-					</view>				
+					<view class="dp_title">{{xieyi.title}}</view> 
+					 <view style="max-height: 1000rpx;overflow-y: scroll;">
+						<view v-html="xieyi.Content"></view>
+					</view>						
 				</view>
 			</u-popup>
 		</view>
@@ -128,6 +128,9 @@
 <script>
 	import $http from '@/config/requestConfig.js';
 	import md5 from '@/plugins/md5';
+	
+	import localuserxieyi from '@/static/json/userAndyinsiP.json'
+	import localyinsixieyi from '@/static/json/yinsiP.json'
 	var clear;
 	import {
 		mapState,
@@ -155,14 +158,16 @@
 				system: 13,
 				clearTime: null,
 				HealthOpen: false,
-				health_phone: '13333333333',
-				health_password: '123456',
+				// health_phone: '13333333333',
+				// health_password: '123456',
+				health_phone: '',
+				health_password: '',
 				isSee_H: false,
 				xieyiShow : false,
 				xieyi:{
 					title:'',
-					content:''
-				},
+					Content:''
+				}
 			};
 		},
 		//第一次加载
@@ -185,17 +190,14 @@
 			...mapMutations(['setHealthMes']),
 			// 显示协议
 			showXieyi(str){	
-				this.xieyi = {}
-				this.$http
-					.get(`sys/agreement/list?key=${str}`)
-					.then(res => {	
-						
-						this.xieyi = res.page.list[0]
-						this.xieyiShow = true
-					}).catch((e)=>{
-						console.log(e)
-					})
-				
+				if(str == 'user'){
+					this.xieyi = localuserxieyi
+				}else{
+					this.xieyi = localyinsixieyi
+				}
+				//console.log(localuserxieyi)				
+				this.xieyiShow = true
+								
 			},
 			onPageJump(url) {
 				uni.navigateTo({