Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-huozhuapp

# Conflicts:
#	pages/public/login.vue

pages.json

@@ -625,6 +625,24 @@
             }
             
         }
+        ,{
+            "path" : "pages/public/serviceAgreement/serviceAgreement",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "服务协议",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/public/cytScrectAgreement/cytScrectAgreement",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "隐私声明",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/public/cytScrectAgreement/cytScrectAgreement.vue

@@ -0,0 +1,23 @@
+<template>
+	<web-view :src="url"></web-view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				url: ""
+			}
+		},
+		onLoad: function(option) {
+			this.url = option.url;
+		},
+		methods: {}
+	}
+</script>
+
+
+
+<style>
+
+</style>

pages/public/login.vue

@@ -15,7 +15,7 @@
 			<view style='margin-top:20px;border-bottom:1px solid #E8E9ED;position:relative;height:40px'>
 				<view style='position:relative;'>
 					<input class='password' v-model='password' v-if="isShowPassword=='password'" placeholder="请输入密码" type="password">
-					<input class='password' v-model='password' v-else type="text" placeholder="请输入密码">
+					<input maxlength='16' class='password' v-model='password' v-else type="text" placeholder="请输入密码">
 					<image class='yanjingicon' style='width:22px;height:22px;' @click="passWordStatus(1)" v-if="isShowPassword=='password'" src="../../static/yioncang.png" mode=""></image>
 					<image class='yanjingicon' style='width:22px;height:22px;' @click="passWordStatus(2)" v-else src="../../static/xianshi.png" mode=""></image>
 				</view>

pages/public/register.vue

@@ -23,7 +23,7 @@
 						placeholder="请输入验证码" type="number" class="Regular" />
 				</view>
 				<!--  -->
-				<button :class='codestatus?"activeCode":""' @click='getcode' 
+				<button :class='codestatus?"activeCode":""' @click='getcode'
 					class='getcode Regular'>{{sendText}}</button>
 			</view>
 			<view style='border-bottom:1px solid #E8E9ED;padding:10px 0;position:relative;'>
@@ -44,9 +44,9 @@
 					width="17px" height="17px"></u--image>
 				已阅读并同意
 				<navigator
-					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"
+					url="/pages/public/serviceAgreement/serviceAgreement?url=http://liangxin.zthymaoyi.com/cytUserAgreement.html"
 					class="path" hover-class="navigator-hover">《服务协议》</navigator>和<navigator
-					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/screctAgreement.html"
+					url="/pages/public/cytScrectAgreement/cytScrectAgreement?url=http://liangxin.zthymaoyi.com/cytScrectAgreement.html"
 					class="path" hover-class="navigator-hover">《隐私政策》</navigator>
 			</view>
 		</view>
@@ -164,12 +164,13 @@
 			},
 			getcode() {
 				var that = this
-				if(this.sendText != "获取验证码" ){
+				if (this.sendText != "获取验证码") {
 					return
 				}
 				if (/^0?1[3|4|5|6|7|8][0-9]\d{8}$/.test(this.phone)) {
 					that.$request.baseRequest('get', '/commonUser/sendVerifyCode', {
-							phone: this.phone
+							phone: this.phone,
+							flag: 3
 						}).then(res => {
 							if (res.code == 200) {
 								that.codestatus = false
@@ -252,7 +253,7 @@
 				}
 				if (this.password.length < 6) {
 					uni.showToast({
-						title: '密码请输入6-16字符格式',
+						title: '密码输入错误',
 						icon: 'none',
 						duration: 2000
 					})

pages/public/serviceAgreement/serviceAgreement.vue

@@ -0,0 +1,23 @@
+<template>
+	<web-view :src="url"></web-view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				url: ""
+			}
+		},
+		onLoad: function(option) {
+			this.url = option.url;
+		},
+		methods: {}
+	}
+</script>
+
+
+
+<style>
+
+</style>

pages/release/addAddress.vue

@@ -15,20 +15,20 @@
 				<u--form labelPosition="left" :model="addressInfo" ref="form1" labelWidth='100'>
 					<u-form-item label="所属区域" ref="item1" borderBottom>
 						<view style='width:100%;flex-direction:row-reverse;' class='flex align-center' @click='toMap' :class="addressInfo.area?'':'select-color'">
-							<image src="../../static/right.png" style="width: 22rpx;height: 22rpx;"></image>
+							<image src="../../static/right.png" style="width: 12px;height: 12px;margin-top: 2px;"></image>
 							<view>{{addressInfo.area?(addressInfo.province+addressInfo.city+addressInfo.area):'选择所属区域 '}}</view>
 						</view>
 					</u-form-item>
 					<u-form-item label="详细地址" prop="addressInfo.detailedAddress" ref="item1" borderBottom>
 						<!-- <u--input v-model="addressInfo.detailedAddress" border="none" inputAlign="left"  placeholder="详细地址"></u--input> -->
-						<u--textarea v-model="addressInfo.detailedAddress" border="none" inputAlign="left" placeholder="详细地址" autoHeight  maxlength="15"></u--textarea>
+						<u--textarea v-model="addressInfo.detailedAddress" border="none" inputAlign="left" placeholder="请输入详细地址" autoHeight  maxlength="15"></u--textarea>
 						<!-- <u--input v-model="addressInfo.detailedAddress" border="none" placeholder="详细地址"></u--input> -->
 					</u-form-item>
 					<u-form-item label="联系人" prop="addressInfo.contacts" ref="item1" borderBottom>
-						<u--input v-model="addressInfo.contacts"  maxlength="10" inputAlign="right" border="none" placeholder="联系人">></u--input>
+						<u--input v-model="addressInfo.contacts"  maxlength="10" inputAlign="right" border="none" placeholder="请输入联系人">></u--input>
 					</u-form-item>
 					<u-form-item label="联系电话" prop="addressInfo.contactPhone" ref="item1">
-						<u--input v-model="addressInfo.contactPhone" inputAlign="right" border="none" placeholder="联系电话" maxlength="11">>
+						<u--input v-model="addressInfo.contactPhone" inputAlign="right" border="none" placeholder="请输入联系电话" maxlength="11">>
 						</u--input>
 					</u-form-item>
 				</u--form>
@@ -170,6 +170,13 @@
 					})
 					return true
 				}
+				if (this.addressInfo.contactPhone.length<7) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "联系人电话输入错误！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.addressInfo.contactPhone)) {
 					this.$refs.uToast.show({
 						type: 'error',