新增4.19

src/router/index.js

@@ -1,10 +1,10 @@
-import VueRouter from 'vue-router';
-
-const routes = [
-	// 登录
-	{
-		path: '/login',
-		component: () => import('../views/login.vue'),
+import VueRouter from 'vue-router';
+
+const routes = [
+	// 登录
+	{
+		path: '/login',
+		component: () => import('../views/login.vue'),
 	},
 	// 注册
 	{
@@ -295,11 +295,11 @@ const routes = [
 	{
 		path: '/health-encyclopedia/consultation-results-details',
 		component: () => import('../views/health-encyclopedia/consultation-results-details.vue'),
-	},
-];
-
-const router = new VueRouter({
-	mode: 'history',
-	routes,
-});
+	},
+];
+
+const router = new VueRouter({
+	mode: 'history',
+	routes,
+});
 export default router;

src/service/service.js

@@ -114,4 +114,18 @@ export function userManageGetDeliveryAddressDetail(data) {
  */
  export function userCenterCancelUserInfo(data) {
 	return request.post('/api/User_center/cancelUserInfo', data);
+}
+
+/**
+ * 绑定手机号
+ */
+export function userCenterModifyPhone(data) {
+	return request.post('/api/User_center/modifyPhone', data);
+}
+
+/**
+ * 更换或设置密码
+ */
+ export function userCenterModifyPassword(data) {
+	return request.post('/api/User_center/modifyPassword', data);
 }

src/views/forgot-password.vue

@@ -11,7 +11,7 @@
 					<span class="label">手机号码</span>
 					<div class="form-right-sidebar">
 						<div class="form-right-row">
-							<input type="" placeholder="请输入手机号" class="input" name="" id="" value="" />
+							<input v-model="params.phone" placeholder="请输入手机号" class="input" name="" id="" value="" />
 						</div>
 					</div>
 				</div>
@@ -19,8 +19,9 @@
 					<span class="label">验证码</span>
 					<div class="form-right-sidebar">
 						<div class="form-right-row">
-							<input type="" placeholder="请输入验证码" class="input" name="" id="" value="" />
-							<button type="button" class="btn">获取验证码</button>
+							<input v-model="params.code" class="input" placeholder="请输入验证码" />
+							<button v-if="countDown <= 0" @click="sendSms()" type="button" class="btn">获取验证码</button>
+							<button v-else type="button" class="btn">{{countDown}}秒后重发</button>
 						</div>
 					</div>
 				</div>
@@ -28,8 +29,10 @@
 					<span class="label">图形验证码</span>
 					<div class="form-right-sidebar">
 						<div class="form-right-row">
-							<input type="" placeholder="请输入图形验证码" class="input" name="" id="" value="" />
-							<button type="button" class="num-code">42342</button>
+							<input v-model="params.verify" placeholder="请输入图形验证码" class="input" name="" id="" value="" />
+							<button type="button" class="num-code">
+								<img style="width: 100%" :src="captcha.image" @click="getCaptcha()" alt="">
+							</button>
 						</div>
 					</div>
 				</div>
@@ -37,7 +40,7 @@
 					<span class="label">新密码</span>
 					<div class="form-right-sidebar">
 						<div class="form-right-row">
-							<input type="" placeholder="请输入密码" class="input" name="" id="" value="" />
+							<input type="password" v-model="params.password" placeholder="请输入8-12位数字加字母的密码" class="input" name="" id="" value="" />
 						</div>
 					</div>
 				</div>
@@ -45,12 +48,12 @@
 					<span class="label">确认新密码</span>
 					<div class="form-right-sidebar">
 						<div class="form-right-row">
-							<input type="" placeholder="请输入确认密码" class="input" name="" id="" value="" />
+							<input type="password" v-model="params.con_password" placeholder="请输入确认密码" class="input" name="" id="" value="" />
 						</div>
 					</div>
 				</div>
 				<div class="btn-box">
-					<button type="button" class="active">提交</button>
+					<button type="button" class="active" @click="resetPassword()">提交</button>
 				</div>
 			</div>
 		</div>
@@ -64,6 +67,9 @@
 <script>
 	import Header from '../components/header.vue';
 	import Footer from '../components/footer.vue';
+	import { validatorFun } from '../utils/util';
+	import { loginGetCaptcha, loginResetPassword, generalSendSms } from '../service/service';
+
 	export default {
 		components: {
 			Header,
@@ -72,10 +78,86 @@
 		data() {
 			return {
 
+				captcha: {
+					image: '',
+					uniqid: '',
+				},
+				params: {
+					phone: '',  // 手机号
+					code: '',  // 手机验证码
+					verify: '',  // 图形验证码
+					uniqid: '',  // 生成验证码图形时返回的uniqid
+					password: '',  // 密码
+					con_password: '',  // 确认密码
+				},
+				countDown: 0,
 			};
 		},
+		mounted() {
+			this.getCaptcha();
+		},
 		methods: {
-
+			resetPassword() {
+				const params = this.params;
+				const errList = validatorFun(params, [
+					['phone', ['notNull', '请输入手机号'], ['isMobile', '请输入正确手机号']],
+					['verify', ['notNull', '请输入图形验证码']],
+					['code', ['notNull', '请输入验证码']],
+					['password', ['notNull', '请输入密码']],
+					['con_password', ['notNull', '请输入确认密码'], [(val, data) => val == data.password, '确认密码错误']],
+				]);
+				if (errList.length > 0) {
+					return this.$message.error(errList[0].errMsg);
+				}
+				loginResetPassword(params).then(({code, msg, data}) => {
+					if (code == 1) {
+						setTimeout(() => {
+							this.$router.push('/login');
+						}, 1000);
+						this.$message.success(errList[0].errMsg);
+					} else {
+						this.$message.error(errList[0].errMsg);
+					}
+				});
+			},
+			getCaptcha() {
+				loginGetCaptcha().then(({code, msg, data}) => {
+					if (code == 1) {
+						this.captcha = data;
+						this.params.uniqid = data.uniqid;
+					} else {
+						this.$message.error(errList[0].errMsg);
+					}
+				});
+			},
+			sendSms() {
+				const params = this.params;
+				const errList = validatorFun(params, [
+					['phone', ['notNull', '请输入手机号'], ['isMobile', '请输入正确手机号']],
+				]);
+				if (errList.length > 0) {
+					return this.$message.error(errList[0].errMsg);
+				}
+				generalSendSms({
+					phone: params.phone,
+				}).then(({code, msg, data}) => {
+					if (code == 1) {
+						this.countDownFn();
+						this.$message.success(msg);
+					} else {
+						this.$message.error(msg);
+					}
+				});
+			},
+			countDownFn() {
+				let num = 60;
+				const fn = () => {
+					if (num == 0) return;
+					this.countDown = --num;
+					setTimeout(() => fn(), 1000);
+				};
+				fn();
+			},
 		}
 	}
 </script>
@@ -210,4 +292,4 @@
 		color: #BF0F0D;
 		font-size: 22px;
 	}
-</style>
+</style>

src/views/index/payment-order.vue

@@ -4,7 +4,7 @@
 
 		<Header backgroundColor="#F2F2F2"></Header>
 
-		<Subheader title="购物车" :hide="false"></Subheader>
+		<Subheader title="购物车" :hide="false" :hideAlert="true" :hideStep="false"></Subheader>
 
 		<div class="box">
 			<div class="recipient-information-wrap">

src/views/login.vue

@@ -9,16 +9,17 @@
 				<div class="form-row">
 					<input v-model="params.phone" class="input" placeholder="请输入电话号码" />
 				</div>
-				<div class="form-row">
+				<div class="form-row" v-if="!accountLogin">
 					<input v-model="params.code" class="input" placeholder="请输入验证码" />
 					<button v-if="countDown <= 0" @click="sendSms()" type="button" class="btn">获取验证码</button>
 					<button v-else type="button" class="btn">{{countDown}}秒后重发</button>
 				</div>
 				<div class="form-row" v-if="accountLogin">
-					<input type="password" class="input" placeholder="请输入8-12位数字加字母的密码" />
+					<input type="password" v-model="params.password" class="input" placeholder="请输入8-12位数字加字母的密码" />
 				</div>
 				<div class="btn-box">
-					<button type="button" class="active" @click="phoneCodeLogin()">立即登录</button>
+					<button v-if="accountLogin" type="button" class="active" @click="login()">立即登录</button>
+					<button v-else type="button" class="active" @click="phoneCodeLogin()">立即登录</button>
 				</div>
 			</div>
 			<div class="bottom">
@@ -31,9 +32,9 @@
 					</a>
 				</div>
 				<p class="login-row">
-					<a href="javascript:void(0)">验证码登录</a>
+					<a href="javascript:void(0)" @click="accountLogin = false">验证码登录</a>
 					<a href="javascript:void(0)" class="red-color">忘记密码</a>
-					<a href="javascript:void(0)">密码登录</a>
+					<a href="javascript:void(0)" @click="accountLogin = true">密码登录</a>
 					<a href="javascript:void(0)">去注册</a>
 				</p>
 			</div>
@@ -52,7 +53,7 @@
 
 <script>
 	import Header from '../components/header.vue';
-	import { generalSendSms, loginPhoneCodeLogin } from '../service/service';
+	import { generalSendSms, loginPasswordLogin, loginPhoneCodeLogin } from '../service/service';
 	import { validatorFun } from '../utils/util';
 
 	export default {
@@ -66,11 +67,30 @@
 				params: {
 					phone: '',
 					code: '',
+					password: '',  // 密码
 				},
 				countDown: 0,
 			};
 		},
 		methods: {
+			login() {
+				const params = this.params;
+				const errList = validatorFun(params, [
+					['phone', ['notNull', '请输入手机号'], ['isMobile', '请输入正确手机号']],
+					['password', ['notNull', '请输入密码']],
+				]);
+				if (errList.length > 0) {
+					return this.$message.error(errList[0].errMsg);
+				}
+				loginPasswordLogin(params).then(({code, msg, data}) => {
+					if (code == 1) {
+						localStorage.setItem('session_key', data.token);
+						this.$router.push('/');
+					} else {
+						this.$message.error(msg);
+					}
+				});
+			},
 			phoneCodeLogin () {
 				const params = this.params;
 				const errList = validatorFun(params, [

src/views/my/bind-mobile-phone-number.vue

@@ -39,25 +39,25 @@
 					<p class="box-label">
 						绑定手机号
 					</p>
-					<el-form ref="form" :model="form" label-width="80px" size="mini">
-						
-						<div class="form-row">
-							<span class="form-label"><span>*</span>已绑定手机号</span>
-							<div class="right-sidebar">
-								<div class="small-box">
-									<el-form-item style="width: 100%;">
-										<el-input v-model="form.now_number" placeholder="请输入手机号"></el-input>
-									</el-form-item>
-								</div>
-							</div>
-						</div>
+					<el-form ref="form" label-width="80px" size="mini">
+						
+						<div class="form-row">
+							<span class="form-label"><span>*</span>已绑定手机号</span>
+							<div class="right-sidebar">
+								<div class="small-box">
+									<el-form-item style="width: 100%;">
+										<el-input v-model="info.showPhone" disabled placeholder="请输入手机号"></el-input>
+									</el-form-item>
+								</div>
+							</div>
+						</div>
 						
 						<div class="form-row">
 							<span class="form-label"><span>*</span>手机号</span>
 							<div class="right-sidebar">
 								<div class="small-box">
 									<el-form-item style="width: 100%;">
-										<el-input v-model="form.number" placeholder="请输入手机号"></el-input>
+										<el-input v-model="params.phone" placeholder="请输入手机号"></el-input>
 									</el-form-item>
 								</div>
 							</div>
@@ -68,15 +68,16 @@
 							<div class="right-sidebar">
 								<div class="small-box">
 									<el-form-item style="width: 100%;">
-										<el-input v-model="form.num" placeholder="验证码"></el-input>
+										<el-input v-model="params.code" placeholder="验证码"></el-input>
 									</el-form-item>
 								</div>
-								<button type="button" class="get-code">获取验证码</button>
+								<button v-if="countDown <= 0" @click="sendSms()" type="button" class="get-code">获取验证码</button>
+								<button v-else type="button" class="get-code">{{countDown}}秒后重发</button>
 							</div>
 						</div>
 
 						<div class="btn-box">
-							<button type="button" class="active">绑定</button>
+							<button type="button" class="active" @click="modifyPhone()">绑定</button>
 							<button type="button" class="border-btn">取消</button>
 						</div>
 
@@ -94,6 +95,8 @@
 <script>
 	import Header from '../../components/header.vue';
 	import Footer from '../../components/footer.vue';
+	import { validatorFun } from '../../utils/util';
+	import { generalSendSms, userCenterModifyPhone } from '../../service/service';
 	export default {
 		components: {
 			Header,
@@ -101,15 +104,84 @@
 		},
 		data() {
 			return {
-				form: {
+				form: {
 					now_number:'16634567866',
 					number: '',
 					num: '',
-				}
+				},
+				info: {},
+				params: {
+					phone: '',
+					code: '',
+				},
+				countDown: 0,
 			};
 		},
+		mounted() {
+			this.info = JSON.parse(localStorage.getItem('USER_INFO') || '{}');
+			this.info.showPhone = this.info.phone.split('').map((n, i) => i > 2 && i < 7 ? '*' : n).join('');
+		},
 		methods: {
-
+			modifyPhone() {
+				const params = this.params;
+				const errList = validatorFun(params, [
+					['phone', ['notNull', '请输入手机号'], ['isMobile', '请输入正确手机号']],
+					['code', ['notNull', '请输入验证码']],
+				]);
+				if (errList.length > 0) {
+					return this.$message.error(errList[0].errMsg);
+				}
+				userCenterModifyPhone(params).then(({code, msg, data}) => {
+					if (code == 1) {
+						this.info.phone = params.phone;
+						localStorage.setItem('USER_INFO', JSON.stringify(info));
+						this.params = {
+							phone: '',
+							code: '',
+						};
+						this.$confirm('修改成功，请重新登录', '提示', {
+							confirmButtonText: '确定',
+							cancelButtonText: '取消',
+							showCancelButton: false,
+							type: 'warning',
+						}).then(() => {
+							localStorage.removeItem('session_key');
+							localStorage.removeItem('USER_INFO');
+							this.$router.push('/login');
+						});
+					} else {
+						this.$message.error(msg);
+					}
+				});
+			},
+			sendSms() {
+				const params = this.params;
+				const errList = validatorFun(params, [
+					['phone', ['notNull', '请输入手机号'], ['isMobile', '请输入正确手机号']],
+				]);
+				if (errList.length > 0) {
+					return this.$message.error(errList[0].errMsg);
+				}
+				generalSendSms({
+					phone: params.phone,
+				}).then(({code, msg, data}) => {
+					if (code == 1) {
+						this.countDownFn();
+						this.$message.success(msg);
+					} else {
+						this.$message.error(msg);
+					}
+				});
+			},
+			countDownFn() {
+				let num = 60;
+				const fn = () => {
+					if (num == 0) return;
+					this.countDown = --num;
+					setTimeout(() => fn(), 1000);
+				};
+				fn();
+			},
 		}
 	}
 </script>
@@ -401,4 +473,4 @@
 		color: #434849;
 		font-size: 16px;
 	}
-</style>
+</style>

src/views/my/change-password.vue

@@ -39,14 +39,14 @@
 					<p class="box-label">
 						修改密码
 					</p>
-					<el-form ref="form" :model="form" label-width="80px" size="mini">
+					<el-form ref="form" label-width="80px" size="mini">
 
 						<div class="form-row">
 							<span class="form-label"><span>*</span>手机号</span>
 							<div class="right-sidebar">
 								<div class="small-box">
 									<el-form-item style="width: 100%;">
-										<el-input v-model="form.number" placeholder="请输入手机号"></el-input>
+										<el-input v-model="params.phone" placeholder="请输入手机号"></el-input>
 									</el-form-item>
 								</div>
 							</div>
@@ -57,10 +57,11 @@
 							<div class="right-sidebar">
 								<div class="small-box">
 									<el-form-item style="width: 100%;">
-										<el-input v-model="form.num" placeholder="验证码"></el-input>
+										<el-input v-model="params.code" placeholder="验证码"></el-input>
 									</el-form-item>
 								</div>
-								<button type="button" class="get-code">获取验证码</button>
+								<button v-if="countDown <= 0" @click="sendSms()" type="button" class="get-code">获取验证码</button>
+								<button v-else type="button" class="get-code">{{countDown}}秒后重发</button>
 							</div>
 						</div>
 
@@ -69,14 +70,14 @@
 							<div class="right-sidebar">
 								<div class="small-box">
 									<el-form-item style="width: 100%;">
-										<el-input v-model="form.password" placeholder="请输入新密码"></el-input>
+										<el-input type="password" v-model="params.password" placeholder="请输入新密码"></el-input>
 									</el-form-item>
 								</div>
 							</div>
 						</div>
 
 						<div class="btn-box">
-							<button type="button" class="active">修改</button>
+							<button type="button" class="active" @click="modifyPassword()">修改</button>
 							<button type="button" class="border-btn">取消</button>
 						</div>
 
@@ -94,6 +95,8 @@
 <script>
 	import Header from '../../components/header.vue';
 	import Footer from '../../components/footer.vue';
+	import { validatorFun } from '../../utils/util';
+	import { generalSendSms, userCenterModifyPassword } from '../../service/service';
 	export default {
 		components: {
 			Header,
@@ -101,15 +104,79 @@
 		},
 		data() {
 			return {
-				form: {
-					number: '',
-					num: '',
+				params: {
+					phone: '',
+					code: '',
 					password: '',
-				}
+				},
+				countDown: 0,
 			};
 		},
 		methods: {
-
+			modifyPassword() {
+				const params = this.params;
+				const errList = validatorFun(params, [
+					['phone', ['notNull', '请输入手机号'], ['isMobile', '请输入正确手机号']],
+					['code', ['notNull', '请输入验证码']],
+					['password', ['notNull', '请输入新密码']],
+				]);
+				if (errList.length > 0) {
+					return this.$message.error(errList[0].errMsg);
+				}
+				userCenterModifyPassword(params).then(({code, msg, data}) => {
+					if (code == 1) {
+						this.params = {
+							phone: '',
+							code: '',
+							password: '',
+						};
+						
+						this.$confirm('修改成功，请重新登录', '提示', {
+							confirmButtonText: '确定',
+							cancelButtonText: '取消',
+							showCancelButton: false,
+							type: 'warning',
+						}).then(() => {
+							localStorage.removeItem('session_key');
+							localStorage.removeItem('USER_INFO');
+							this.$router.push('/login');
+						});
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: msg,
+						});
+					}
+				});
+			},
+			sendSms() {
+				const params = this.params;
+				const errList = validatorFun(params, [
+					['phone', ['notNull', '请输入手机号'], ['isMobile', '请输入正确手机号']],
+				]);
+				if (errList.length > 0) {
+					return this.$message.error(errList[0].errMsg);
+				}
+				generalSendSms({
+					phone: params.phone,
+				}).then(({code, msg, data}) => {
+					if (code == 1) {
+						this.countDownFn();
+						this.$message.success(msg);
+					} else {
+						this.$message.error(msg);
+					}
+				});
+			},
+			countDownFn() {
+				let num = 60;
+				const fn = () => {
+					if (num == 0) return;
+					this.countDown = --num;
+					setTimeout(() => fn(), 1000);
+				};
+				fn();
+			},
 		}
 	}
 </script>
@@ -401,4 +468,4 @@
 		color: #434849;
 		font-size: 16px;
 	}
-</style>
+</style>

src/views/my/set-up.vue

@@ -97,7 +97,7 @@
 							<div class="row-between-leftsidebar">
 								<span class="font-1">收货地址</span>
 							</div>
-							<span class="manage-all-addresses">管理全部地址</span>
+							<span class="manage-all-addresses" @click="dialogFormVisible = true">管理全部地址</span>
 						</div>
 						<ul class="select-address-list">
 							<li :class="{active: item.is_mr == 1}" v-for="(item, index) in addressList" :key="index">
@@ -154,42 +154,34 @@
 								<div
 									style="width: 548px;display: flex;align-items: center;justify-content: space-between;">
 									<div class="select-item">
-										<el-select v-model="addressPickerValue[0]" @change="bindColumnchange(0, $event)" placeholder="请选择省份">
-											<el-option
-												v-for="(item, index) in addressPickerData[0]"
-												:key="index"
-												:label="item.name"
-												:value="index">
+										<el-select v-model="addressPickerValue[0]" @change="bindColumnchange(0, $event)"
+											placeholder="请选择省份">
+											<el-option v-for="(item, index) in addressPickerData[0]" :key="index"
+												:label="item.name" :value="index">
 											</el-option>
 										</el-select>
 									</div>
 									<div class="select-item">
-										<el-select v-model="addressPickerValue[1]" @change="bindColumnchange(1, $event)" placeholder="请选择城市">
-											<el-option
-												v-for="(item, index) in addressPickerData[1]"
-												:key="index"
-												:label="item.name"
-												:value="index">
+										<el-select v-model="addressPickerValue[1]" @change="bindColumnchange(1, $event)"
+											placeholder="请选择城市">
+											<el-option v-for="(item, index) in addressPickerData[1]" :key="index"
+												:label="item.name" :value="index">
 											</el-option>
 										</el-select>
 									</div>
 									<div class="select-item">
-										<el-select v-model="addressPickerValue[2]" @change="bindColumnchange(2, $event)" placeholder="请选择区/县">
-											<el-option
-												v-for="(item, index) in addressPickerData[2]"
-												:key="index"
-												:label="item.name"
-												:value="index">
+										<el-select v-model="addressPickerValue[2]" @change="bindColumnchange(2, $event)"
+											placeholder="请选择区/县">
+											<el-option v-for="(item, index) in addressPickerData[2]" :key="index"
+												:label="item.name" :value="index">
 											</el-option>
 										</el-select>
 									</div>
 									<div class="select-item">
-										<el-select v-model="addressPickerValue[3]" @change="bindColumnchange(3, $event)" placeholder="请选择街道">
-											<el-option
-												v-for="(item, index) in addressPickerData[3]"
-												:key="index"
-												:label="item.name"
-												:value="index">
+										<el-select v-model="addressPickerValue[3]" @change="bindColumnchange(3, $event)"
+											placeholder="请选择街道">
+											<el-option v-for="(item, index) in addressPickerData[3]" :key="index"
+												:label="item.name" :value="index">
 											</el-option>
 										</el-select>
 									</div>
@@ -200,7 +192,8 @@
 							<div class="flex-end-box">
 								<div
 									style="width: 548px;display: flex;align-items: center;justify-content: space-between;">
-									<el-input type="textarea" placeholder="请填写详细地址~" class="textarea" v-model="addressParams.detail">
+									<el-input type="textarea" placeholder="请填写详细地址~" class="textarea"
+										v-model="addressParams.detail">
 									</el-input>
 								</div>
 							</div>
@@ -210,7 +203,8 @@
 								<div
 									style="width: 548px;display: flex;align-items: center;justify-content: space-between;">
 									<label for="c12" class="form-bottom">
-										<input id="c12" name="pass" type="checkbox" checked ref="is_mr" @change="addressParams.is_mr = ($refs['is_mr'].checked ? 1 : 0)"/>
+										<input id="c12" name="pass" type="checkbox" checked ref="is_mr"
+											@change="addressParams.is_mr = ($refs['is_mr'].checked ? 1 : 0)" />
 										<span>设为默认地址</span>
 									</label>
 								</div>
@@ -258,7 +252,7 @@
 						<li>将解除与其它网站、其他APP的授权或绑定关系</li>
 					</ul>
 					<label for="c1" class="logout-bottom">
-						<input id="c1" name="pass" type="checkbox" checked ref="CancelUserInfo"/>
+						<input id="c1" name="pass" type="checkbox" checked ref="CancelUserInfo" />
 						<span style="flex: 1;">申请提交即表示您自愿放弃账户内所有虚拟财产并同意<span class="red-color">《注销须知》</span></span>
 					</label>
 					<div class="logout-btn-box">
@@ -272,6 +266,79 @@
 
 		<Footer></Footer>
 
+		<!-- 添加新地址弹窗 -->
+		<el-dialog title="收货信息" :visible.sync="dialogFormVisible" ref="form" :model="form">
+			<div class="form-row-start">
+				<label class="form-row-start-label"><span class="red-color">*</span>收货人</label>
+				<div class="form-row-sidebar" style="flex-direction: column;align-items: flex-start;">
+					<div style="min-width: 234px;display: flex;align-items: center;">
+						<el-input v-model="form.username" placeholder="收货人姓名"></el-input>
+					</div>
+				</div>
+			</div>
+			<div class="form-row-start">
+				<label class="form-row-start-label"><span class="red-color">*</span>手机号</label>
+				<div class="form-row-sidebar" style="flex-direction: column;align-items: flex-start;">
+					<div style="min-width: 234px;display: flex;align-items: center;">
+						<el-input v-model="form.phone_number" placeholder="收货人手机号"></el-input>
+					</div>
+				</div>
+			</div>
+			<div class="form-row-start">
+				<span class="form-row-start-label"><span class="red-color">*</span>所在地区</span>
+				<div class="form-row-sidebar" style="flex-direction: column;align-items: flex-start;">
+					<div style="width: 550px;display: flex;align-items: center;justify-content: space-between;">
+						<div class="select-item-2">
+							<el-select v-model="form.region" placeholder="请选择省份">
+								<el-option label="山东省" value="shanghai"></el-option>
+								<el-option label="区域二" value="beijing"></el-option>
+							</el-select>
+						</div>
+						<div class="select-item-2">
+							<el-select v-model="form.region2" placeholder="请选择城市">
+								<el-option label="临沂市" value="shanghai"></el-option>
+								<el-option label="区域二" value="beijing"></el-option>
+							</el-select>
+						</div>
+						<div class="select-item-2">
+							<el-select v-model="form.region3" placeholder="区/县/街道">
+								<el-option label="河东区" value="shanghai"></el-option>
+								<el-option label="兰山区" value="beijing"></el-option>
+							</el-select>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="form-row-start">
+				<span class="form-row-start-label"><span class="red-color">*</span>详细地址</span>
+				<div class="form-row-sidebar" style="flex-direction: column;align-items: flex-start;">
+					<div style="width: 605px;display: flex;align-items: center;justify-content: space-between;">
+						<el-input v-model="form.desc" placeholder="请填写详细地址"></el-input>
+					</div>
+				</div>
+			</div>
+			<div class="form-row-start">
+				<div class="form-flex-end-box">
+					<div style="width: 548px;display: flex;align-items: center;justify-content: space-between;">
+						<label for="c1" class="form-bottom-2">
+							<input id="c1" name="pass" type="checkbox" checked />
+							<span>设为默认地址</span>
+						</label>
+					</div>
+				</div>
+			</div>
+			<div class="form-row-start">
+				<div class="form-flex-end-box">
+					<div style="width: 548px;display: flex;align-items: center;justify-content: space-between;">
+						<div class="form-btnBox-2">
+							<button type="button" class="active">保存</button>
+							<button type="button" class="active">取消</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</el-dialog>
+
 	</div>
 </template>
 
@@ -287,7 +354,9 @@
 		userManageGetDeliveryAddressList,
 		userCenterCancelUserInfo,
 	} from '../../service/service';
-	import { validatorFun } from '../../utils/util';
+	import {
+		validatorFun
+	} from '../../utils/util';
 
 	export default {
 		components: {
@@ -330,22 +399,42 @@
 
 				addressList: [],
 				addressParams: {
-					id: 0,  // 收货地址记录id（不传值是添加）
-					pro_name: '',  // 省名
-					city_name: '',  // 市名
-					county_name: '',  // 县区名
-					street_name: '',  // 街道
-					detail: '',  // 详细地址
-					phone: '',  // 联系电话
-					name: '',  // 联系人
-					is_mr: 0,  // 是否是默认（0不默认，1默认）
+					id: 0, // 收货地址记录id（不传值是添加）
+					pro_name: '', // 省名
+					city_name: '', // 市名
+					county_name: '', // 县区名
+					street_name: '', // 街道
+					detail: '', // 详细地址
+					phone: '', // 联系电话
+					name: '', // 联系人
+					is_mr: 0, // 是否是默认（0不默认，1默认）
 				},
 
 				// 地址
-				addressPickerData: [[], [], [], []],
-				addressPickerDataNames: [[], [], [], []],
+				addressPickerData: [
+					[],
+					[],
+					[],
+					[]
+				],
+				addressPickerDataNames: [
+					[],
+					[],
+					[],
+					[]
+				],
 				addressPickerValue: [0, 0, 0, 0],
 				addressPickerValueStr: '',
+
+				dialogFormVisible: false, //弹窗
+				form: {
+					username: '',
+					phone_number: '',
+					region: '',
+					region2: '',
+					region3: '',
+					desc: '',
+				}
 			};
 		},
 		mounted() {
@@ -355,19 +444,29 @@
 		methods: {
 			initAddress() {
 				this.addressParams = {
-					id: 0,  // 收货地址记录id（不传值是添加）
-					pro_name: '',  // 省名
-					city_name: '',  // 市名
-					county_name: '',  // 县区名
-					street_name: '',  // 街道
-					detail: '',  // 详细地址
-					phone: '',  // 联系电话
-					name: '',  // 联系人
-					is_mr: 0,  // 是否是默认（0不默认，1默认）
+					id: 0, // 收货地址记录id（不传值是添加）
+					pro_name: '', // 省名
+					city_name: '', // 市名
+					county_name: '', // 县区名
+					street_name: '', // 街道
+					detail: '', // 详细地址
+					phone: '', // 联系电话
+					name: '', // 联系人
+					is_mr: 0, // 是否是默认（0不默认，1默认）
 				};
 				// 地址
-				this.addressPickerData = [[], [], [], []];
-				this.addressPickerDataNames = [[], [], [], []];
+				this.addressPickerData = [
+					[],
+					[],
+					[],
+					[]
+				];
+				this.addressPickerDataNames = [
+					[],
+					[],
+					[],
+					[]
+				];
 				this.addressPickerValue = [0, 0, 0, 0];
 				this.addressPickerValueStr = '';
 				this.getAreaChildrenByID();
@@ -403,7 +502,9 @@
 				console.log(params);
 				const errList = validatorFun(params, [
 					['name', ['notNull', '请输入收货人']],
-					['phone', ['notNull', '请输入手机号码'], ['isMobile', '请输入正确手机号']],
+					['phone', ['notNull', '请输入手机号码'],
+						['isMobile', '请输入正确手机号']
+					],
 					['pro_name', ['notNull', '请输入选择所在地区']],
 					['city_name', ['notNull', '请输入选择所在地区']],
 					['county_name', ['notNull', '请输入选择所在地区']],
@@ -411,9 +512,13 @@
 					['detail', ['notNull', '请输入详细地址']],
 				]);
 				if (errList.length > 0) {
-					return this.$message.warning(errList[0].errMsg);
+					return this.$message.error(errList[0].errMsg);
 				}
-				userManageSetDeliveryAddress(params).then(({code, msg, data}) => {
+				userManageSetDeliveryAddress(params).then(({
+					code,
+					msg,
+					data
+				}) => {
 					if (code == 1) {
 						this.getAddressList();
 						this.initAddress();
@@ -421,12 +526,18 @@
 					} else {
 						this.$message.error(msg);
 					}
-					
+
 				});
 			},
 			// 获取地址详情
 			getAddressDetail() {
-				userManageGetDeliveryAddressDetail({ id: this.addressParams.id }).then(({code, msg, data})=> {
+				userManageGetDeliveryAddressDetail({
+					id: this.addressParams.id
+				}).then(({
+					code,
+					msg,
+					data
+				}) => {
 					if (code == 1) {
 						const {
 							id,
@@ -465,7 +576,7 @@
 							const name = arr.splice(0, 1)[0];
 							this.getAreaChildrenByID(id2, idx2, level, level, () => {
 								const idx = this.addressPickerDataNames[level - 1].indexOf(name);
-								if ( arr.length > 0 ) {
+								if (arr.length > 0) {
 									let id3 = this.addressPickerData[level - 1][idx].id;
 									fn(id3, idx, level + 1);
 								} else {
@@ -493,7 +604,13 @@
 						callback && callback();
 						return;
 					}
-					areaGetAreaChildrenByID({id}).then(({code, msg, data}) => {
+					areaGetAreaChildrenByID({
+						id
+					}).then(({
+						code,
+						msg,
+						data
+					}) => {
 						if (code == 1) {
 							list[level2 - 1] = data.list;
 							listIds[level2 - 1] = data.list.map(item => item.name);
@@ -515,7 +632,13 @@
 					cancelButtonText: '取消',
 					type: 'warning',
 				}).then(() => {
-					userManageChangeApproveDelivery({ id }).then(({code, msg, data}) => {
+					userManageChangeApproveDelivery({
+						id
+					}).then(({
+						code,
+						msg,
+						data
+					}) => {
 						if (code == 1) {
 							this.getAddressList();
 							this.$message.success(msg);
@@ -532,7 +655,13 @@
 					cancelButtonText: '取消',
 					type: 'warning',
 				}).then(() => {
-					userManageDelDeliveryAddress({ id }).then(({code, msg, data}) => {
+					userManageDelDeliveryAddress({
+						id
+					}).then(({
+						code,
+						msg,
+						data
+					}) => {
 						if (code == 1) {
 							this.getAddressList();
 							this.$message.success(msg);
@@ -545,11 +674,12 @@
 			bindPickerChange() {
 				const [pIdx, cIdx, aIdx, sIdx] = this.addressPickerValue;
 				const [province, city, area, street] = this.addressPickerData;
-				this.addressPickerValueStr = `${province[pIdx].name} ${city[cIdx].name} ${area[aIdx].name} ${street[sIdx].name}`;
+				this.addressPickerValueStr =
+					`${province[pIdx].name} ${city[cIdx].name} ${area[aIdx].name} ${street[sIdx].name}`;
 				this.addressParams.pro_name = province[pIdx].name;
 				this.addressParams.city_name = city[cIdx].name;
 				this.addressParams.county_name = area[aIdx].name;
-				this.addressParams.street_name= street[sIdx].name;
+				this.addressParams.street_name = street[sIdx].name;
 				console.log(this.addressParams);
 			},
 			bindColumnchange(column, value) {
@@ -559,19 +689,22 @@
 			active(index) {
 				this.active = index
 			},
-			
+
 			// 注销账户
 			cancelUserInfo() {
 				if (!this.$refs['CancelUserInfo'].checked) {
 					return this.$message.warning('请阅读并同意《注销须知》');
 				}
-				
+
 				this.$confirm('确定注销账户吗?', '提示', {
 					confirmButtonText: '确定',
 					cancelButtonText: '取消',
 					type: 'warning',
 				}).then(() => {
-					userCenterCancelUserInfo().then(({code, msg}) => {
+					userCenterCancelUserInfo().then(({
+						code,
+						msg
+					}) => {
 						if (code == 1) {
 							this.$message.success(msg);
 						} else {
@@ -770,7 +903,7 @@
 		align-items: center;
 	}
 
-	>>> .el-input__inner {
+	>>>.el-input__inner {
 		height: 30px !important;
 		line-height: 30px !important;
 		border: 1px solid #BBBBBB !important;
@@ -778,7 +911,7 @@
 		font-size: 16px !important;
 	}
 
-	>>> .el-input__icon {
+	>>>.el-input__icon {
 		line-height: 30px !important;
 	}
 
@@ -1236,4 +1369,112 @@
 		width: 280px;
 		margin-bottom: 7px;
 	}
+
+	>>>.el-dialog__header {
+		padding: 15px 17px 15px !important;
+		background-color: #F9F9F9 !important;
+	}
+
+	.el-dialog__headerbtn>>>.el-dialog__close {
+		color: #777777 !important;
+	}
+
+	>>>.el-dialog {
+		width: 812px !important;
+		position: fixed !important;
+		left: 50% !important;
+		top: 50% !important;
+		transform: translate(-50%, -50%) !important;
+		margin: 0 !important;
+		border-radius: 8px !important;
+		overflow: hidden !important;
+	}
+
+	>>>.el-dialog__body {
+		padding: 36px 0 41px !important;
+	}
+
+	.form-row-start {
+		width: 100%;
+		display: flex;
+		align-items: flex-start;
+		margin-bottom: 15px;
+	}
+
+	.form-row-start-label {
+		width: 141px;
+		text-align: right;
+		line-height: 30px;
+		color: #111111;
+		font-size: 18px;
+		padding-right: 16px;
+		box-sizing: border-box;
+	}
+
+	.form-row-start-label>span {
+		margin-right: 6px;
+	}
+
+	.form-row-sidebar {
+		width: 205px;
+		display: flex;
+		align-items: center;
+	}
+
+	.select-item-2 {
+		width: 174px;
+	}
+
+	.form-flex-end-box {
+		margin-left: 141px;
+	}
+
+	.form-bottom-2 {
+		display: flex;
+		align-items: center;
+		color: #777777;
+		font-size: 15px;
+	}
+
+	.form-bottom-2 input[type="checkbox"] {
+		width: 14px !important;
+		height: 14px !important;
+		vertical-align: middle;
+		-webkit-appearance: none;
+		background: url(../../assets/circle.png) no-repeat center center;
+		background-size: 100% 100%;
+		margin-right: 13px;
+		margin-top: 1.5px;
+	}
+
+	.form-bottom-2 input[type="checkbox"]:checked {
+		background: url(../../assets/circle-active.png) no-repeat center center;
+		background-size: 100% 100%;
+	}
+
+	.form-btnBox-2 {
+		width: 100%;
+		display: flex;
+		align-items: center;
+	}
+
+	.form-btnBox-2>button {
+		width: 104px;
+		height: 34px;
+		line-height: 34px;
+		background-color: #F2501A;
+		border-radius: 8px;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 18px;
+		color: #FFFFFF;
+		margin-right: 14px;
+	}
+
+	.form-btnBox-2>button:last-child {
+		border: 1px solid #DCDCDC;
+		background-color: #FFFFFF;
+		color: #777777;
+	}
 </style>

src/views/register.vue

@@ -63,7 +63,7 @@
 					<span style="flex: 1;">登录即同意《中国移动认证服务条款》和<span class="red-color">《携手熊猫用户协议》</span></span>
 				</label>
 				<div class="btn-box">
-					<button type="button" class="active" @click="resetPassword()">注册</button>
+					<button type="button" class="active" @click="register()">注册</button>
 				</div>
 			</div>
 		</div>
@@ -76,8 +76,8 @@
 <script>
 	import Header from '../components/header.vue';
 	import Footer from '../components/footer.vue';
-import { validatorFun } from '../utils/util';
-import { loginGetCaptcha, loginResetPassword } from '../service/service';
+	import { validatorFun } from '../utils/util';
+	import { loginGetCaptcha, loginPhoneCodeRegister, generalSendSms } from '../service/service';
 	export default {
 		components: {
 			Header,
@@ -93,6 +93,7 @@ import { loginGetCaptcha, loginResetPassword } from '../service/service';
 				params: {
 					phone: '',  // 手机号
 					code: '',  // 手机验证码
+					pid: '', // 推荐人id
 					verify: '',  // 图形验证码
 					uniqid: '',  // 生成验证码图形时返回的uniqid
 					password: '',  // 密码
@@ -105,7 +106,7 @@ import { loginGetCaptcha, loginResetPassword } from '../service/service';
 			this.getCaptcha();
 		},
 		methods: {
-			resetPassword() {
+			register() {
 				const params = this.params;
 				const errList = validatorFun(params, [
 					['phone', ['notNull', '请输入手机号'], ['isMobile', '请输入正确手机号']],
@@ -117,7 +118,7 @@ import { loginGetCaptcha, loginResetPassword } from '../service/service';
 				if (errList.length > 0) {
 					return this.$message.error(errList[0].errMsg);
 				}
-				loginResetPassword(params).then(({code, msg, data}) => {
+				loginPhoneCodeRegister(params).then(({code, msg, data}) => {
 					if (code == 1) {
 						setTimeout(() => {
 							this.$router.push('/login');