From 5f86c6425b5c25587d28b473e3e8f9604caeca49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Fri, 24 Sep 2021 12:04:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=AE=8C=E6=88=90=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=AF=86=E7=A0=81=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E5=AE=8C=E6=88=90=E6=90=9C=E7=B4=A2=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E6=8E=A5=E5=85=B3=E4=BA=8E=E6=88=91=E4=BB=AC?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=AF=B9=E6=8E=A5=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E4=BF=AE=E6=94=B9=E4=BC=9A=E5=91=98=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3(=E8=8E=B7=E5=8F=96=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BE=85=E5=AF=B9=E6=8E=A5)=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E7=BD=AE=E6=96=B0=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7=E9=A1=B5=E9=9D=A2=E5=B9=B6=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/config.js                          |   2 +-
 components/lf-payPassword/lf-payPassword.vue |  18 +-
 pages.json                                   |   7 +
 pages/recharge/balance/balance.vue           |   4 +-
 pages/shop/search.vue                        |   6 +-
 pages/shop/searchList.vue                    | 158 +++++++++++------
 pages/user/agreement/agreement.vue           |   7 +-
 pages/user/my/newPhone.vue                   | 168 +++++++++++++++++++
 pages/user/my/setPassword.vue                |  91 +++++++++-
 pages/user/my/verificationPhone.vue          |  54 +++++-
 pages/user/my/vipinfo.vue                    |  48 +++++-
 11 files changed, 475 insertions(+), 88 deletions(-)
 create mode 100644 pages/user/my/newPhone.vue

diff --git a/common/js/config.js b/common/js/config.js
index 8c40c53..4279dca 100644
--- a/common/js/config.js
+++ b/common/js/config.js
@@ -16,7 +16,7 @@ export default  {
 		//https://demo-guojiang-ec-api.guojiang.club/
 		
 		baseUrl: process.env.NODE_ENV === 'development' ? 
-		'http://192.168.3.29/' : 'https://v3-ec-admin-dev.guojiang.club/', // 运行时自动替换变量
+		'http://192.168.3.81/' : 'https://v3-ec-admin-dev.guojiang.club/', // 运行时自动替换变量
     },
 	 PACKAGES: {
         activity: false,
diff --git a/components/lf-payPassword/lf-payPassword.vue b/components/lf-payPassword/lf-payPassword.vue
index 9f82399..22346d0 100644
--- a/components/lf-payPassword/lf-payPassword.vue
+++ b/components/lf-payPassword/lf-payPassword.vue
@@ -1,11 +1,11 @@
 <template>
 	<view class="page">
 		<view class="content">
-			<view class="title">请设置6位支付密码</view>
+			<view class="title">{{ title }}</view>
 			<view class="password">
 				<lf-jp-coded :width="686" @inputVal="inputVal"></lf-jp-coded>
 			</view>
-			<view class="lf-flex lf-m-t-45 lf-row-center">
+			<view class="lf-flex lf-m-t-45 lf-row-center" v-if="showCountdown">
 				<view class="lf-font-24 lf-m-r-10" style="color:#FF9D9D">
 					剩余支付时间
 				</view>
@@ -33,9 +33,19 @@
 			lfJpCoded,
 			countdownTimer
 		},
+		props: {
+			title: {
+				type: String,
+				default: '请输入支付密码'
+			},
+			showCountdown: {
+				type: Boolean,
+				default: false
+			}
+		},
 		data(){
 			return {
-				code: '',
+				code: '', // 密码
 				time: new Date('2021/09/8 14:15:00').getTime() - new Date('2021/09/8 14:10:00').getTime()
 			}
 		},
@@ -44,7 +54,7 @@
 		},
 		methods: {
 			dateFinish(){
-				console.log("倒计时结束");
+				this.$emit('dateFinish');
 			},
 			inputVal(event){
 				this.code = event;
diff --git a/pages.json b/pages.json
index 02936c9..d786023 100644
--- a/pages.json
+++ b/pages.json
@@ -238,6 +238,13 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path" : "pages/user/my/newPhone",
+			"style" : {
+				"navigationBarTitleText": "设置新手机号",
+				"navigationStyle": "custom"
+			}
+		},
 		{
 			"path" : "pages/user/my/setPassword",
 			"style" : {
diff --git a/pages/recharge/balance/balance.vue b/pages/recharge/balance/balance.vue
index 11d70a1..e373f81 100644
--- a/pages/recharge/balance/balance.vue
+++ b/pages/recharge/balance/balance.vue
@@ -28,12 +28,12 @@
 				<view class="lf-row-between">
 					<view class="lf-font-36 lf-color-black lf-font-bold" 
 						:class="{'lf-color-price': item.value < 0}"
-						style="width: 70%;">{{ item.value }}
+						style="width: 70%;">{{ item.balance }}
 					</view>
 					<view class="lf-font-24 lf-color-555">{{ item.note }}</view>
 				</view>
 				<view class="lf-row-between lf-m-t-20">
-					<view class="lf-font-24 lf-color-555">¥{{ item.current_balance }}</view>
+					<view class="lf-font-24 lf-color-555">¥{{ item.current }}</view>
 					<view class="lf-font-24 lf-color-777">{{ item.created_at }}</view>
 				</view>
 			</view>
diff --git a/pages/shop/search.vue b/pages/shop/search.vue
index 17e9e15..e2a145f 100644
--- a/pages/shop/search.vue
+++ b/pages/shop/search.vue
@@ -10,8 +10,8 @@
 			</u-search>
 		</view>
 		<view class="content">
-			<!-- 大家都在搜 -->
-			<block v-if="hot_list.length">
+			<!-- 大家都在搜 TODO 暂时不需要做 -->
+			<!-- <block v-if="hot_list.length">
 				<view>
 					<text class="title">大家都在搜</text>
 				</view>
@@ -22,7 +22,7 @@
 						:key="index">{{ item }}
 					</view>
 				</view>
-			</block>
+			</block> -->
 			<!-- 我搜过的 -->
 			<block v-if="history_list.length">
 				<view class="lf-row-between">
diff --git a/pages/shop/searchList.vue b/pages/shop/searchList.vue
index 736e455..6d2ac40 100644
--- a/pages/shop/searchList.vue
+++ b/pages/shop/searchList.vue
@@ -2,25 +2,34 @@
 	<view>
 		<lf-nav title="搜索" :showIcon="true" @changeHeight="e => nav_height = e"></lf-nav>
 		<view class="head">
-			<u-search placeholder="请输入商品名或商户名" action-text="取消" v-model="value" @custom="customClick"></u-search>
+			<u-search placeholder="请输入商品名或商户名" 
+				action-text="取消" 
+				v-model="value" 
+				@custom="customClick"
+				@search="search">
+			</u-search>
 		</view>
 		<view>
 			<u-tabs :list="tab_list" active-color="#15716E" inactive-color='#777777' :is-scroll="false" :current="tab_current" @change="tabChange"></u-tabs>
 		</view>
 		<swiper :current="tab_current" @change="swiperChange" :style="{height: autoHeight}">
 			<swiper-item v-for="(tab_item, tab_index) in tab_list" :key="tab_index">
-				<scroll-view :scroll-y="true" :style="{height: autoHeight}">
+				<scroll-view :scroll-y="true" :style="{height: autoHeight}" @scrolltolower="scrolltolower">
 					<view class="scroll-content" v-if="tab_index == 0">
-						<lf-waterfall :list="goods_list"></lf-waterfall>
+						<lf-waterfall :list="goods_list" ref="searchWaterfall"></lf-waterfall>
+						<lf-nocontent src="/static/images/empty.png" v-if="goods_list.length <= 0"></lf-nocontent>
 					</view>
 					<view class="scroll-content" v-else>
-						<view class="shop-box" v-for="(item, index) in 3" :key="index">
-							<image class="shop-img"></image>
+						<view class="shop-box" 
+							v-for="(item, index) in brand_list" :key="index"
+							@click="$url('/pages/shop/shopdetail?id='+ item.id)">
+							<image class="shop-img" :src="item.logo"></image>
 							<view class="shop-info">
-								<view class="lf-line-1">luckin coffee 瑞幸咖啡</view>
-								<view>餐饮·美食</view>
+								<view class="lf-line-1">{{ item.name }}</view>
+								<view>{{ item.category }}</view>
 							</view>
 						</view>
+						<lf-nocontent src="/static/images/empty.png" v-if="brand_list.length <= 0"></lf-nocontent>
 					</view>
 				</scroll-view>
 			</swiper-item>
@@ -39,54 +48,16 @@
 				value: '',
 				tab_current: 0,
 				tab_list: [{
-					name: '商品(8)'
+					name: '商品'
 				},{
-					name: '商户(1)'
+					name: '商户'
 				}],
 				scrollH: 0,
 				nav_height: 0,
-				goods_list: [
-					{
-						id: 10,
-						original_price: "4111.00",
-						picture: "https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png",
-						pictures: ["https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png"],
-						price: "2412.00",
-						product_id: 1008,
-						sale: 0,
-						title: "三亚悦榕庄(Banyan Tree Sanya Resort and Spa)"
-					},
-					{
-						id: 10,
-						original_price: "4111.00",
-						picture: "https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png",
-						pictures: ["https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png"],
-						price: "2412.00",
-						product_id: 1008,
-						sale: 0,
-						title: "三亚悦榕庄(Banyan Tree Sanya Resort and Spa)"
-					},
-					{
-						id: 10,
-						original_price: "4111.00",
-						picture: "https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png",
-						pictures: ["https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png"],
-						price: "2412.00",
-						product_id: 1008,
-						sale: 0,
-						title: "三亚悦榕庄(Banyan Tree Sanya Resort and Spa)"
-					},
-					{
-						id: 10,
-						original_price: "4111.00",
-						picture: "https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png",
-						pictures: ["https://hainan.lanzulive.com/storage/images/v2-deb89623e0ee2a2dad34bcded6dfd1ed_1440w.png"],
-						price: "2412.00",
-						product_id: 1008,
-						sale: 0,
-						title: "三亚悦榕庄(Banyan Tree Sanya Resort and Spa)"
-					}
-				]
+				goods_list: [],
+				brand_list: [],
+				page: 1,
+				isPage: true
 			}
 		},
 		computed: {
@@ -98,16 +69,101 @@
 			let info = uni.getSystemInfoSync();
 			this.scrollH = info.screenHeight;
 			this.value = options.value || '';
+			if(options.value){
+				this.getSearchList(options.value);
+			}
 		},
 		methods: {
+			// 点击取消，返回上一个页面
 			customClick(){
 				this.$toBack();
 			},
+			// 开始搜索
+			search(value){
+				if(!value || !value.trim()) return this.$msg('搜索内容不能为空');
+				// 重置页面请求值
+				this.page = 1;
+				this.isPage = true;
+				this.$refs.searchWaterfall[0].clear();
+				// 执行上一个页面的保存搜索历史
+				let pages = getCurrentPages();
+				let beforePage = pages[pages.length - 2]; // 上个页面
+				if(beforePage){
+					beforePage.$vm.updateHistory(value).then(() => {
+						beforePage.$vm.setHistorySearch();
+					})
+					this.getSearchList(value);
+				}else{
+					this.$msg('页面路径出错，当前搜索值将不被记录搜索历史').then(() => {
+						this.getSearchList(value);
+					})
+				}
+			},
+			// 获取搜索列表
+			getSearchList(value){
+				uni.showLoading({
+					title: '正在搜索中'
+				})
+				this.$http.get({
+					api: 'api/store/list',
+					data: {
+						keyword: value,
+						page: this.page
+					}
+				}).then(res => {
+					if(res.data.code == 200){
+						let goods = res.data.data.goods;
+						let brand = res.data.data.brand;
+						let isPage = this.$isRight(goods.next_page_url);
+						this.isPage = isPage;
+						
+						let list = goods.data.map(item => {
+							return {
+								id: item.id,
+								original_price: item.min_market_price,
+								picture: item.img,
+								pictures: [item.img],
+								price: item.min_price,
+								sale: item.sale_count,
+								title: item.name
+							}
+						})
+						
+						if(this.page == 1){
+							this.goods_list = list;
+						}else{
+							this.goods_list.push(...list);
+						}
+						this.brand_list = brand;
+						this.tab_list[1].name = `商户(${brand.length})`;
+						this.tab_list[0].name = `商品(${this.goods_list.length})`;
+					}else{
+						this.$msg(res.data.message || '服务器错误，请稍后再试');
+					}
+					uni.hideLoading();
+				}).catch(err => uni.hideLoading());
+			},
+			// 切换tab
 			tabChange(event){
 				this.tab_current = event;
 			},
+			// 切换swiper
 			swiperChange(event){
 				this.tab_current = event.detail.current;
+			},
+			// 商品scroll滚动到底部
+			scrolltolower(){
+				// 只做商品加载下一页，品牌不做
+				if(this.tab_current == 0){
+					if(this.isPage){
+						this.page++;
+						this.getSearchList(this.value);
+					}else{
+						this.$msg('没有更多啦~');
+					}
+				}else{
+					this.$msg('没有更多啦~');
+				}
 			}
 		}
 	}
diff --git a/pages/user/agreement/agreement.vue b/pages/user/agreement/agreement.vue
index f8b05d7..5ca18a8 100644
--- a/pages/user/agreement/agreement.vue
+++ b/pages/user/agreement/agreement.vue
@@ -2,11 +2,11 @@
 	<view class="agreement_index">
 		<lf-nav title="关于我们" :showIcon="true"></lf-nav>
 		<image src="https://picsum.photos/seed/picsum/200/300" class="logo"></image>
-		<view class="item" @tap="chageAgreement('privite')">
+		<view class="item" @tap="chageAgreement('privite')" v-if="agreement.privacy_agreement">
 			<view class="txt">隐私协议</view>
 			<view class="rigth lf-iconfont icon-xiangyou lf-font-24"></view>
 		</view>
-		<view class="item" @tap="chageAgreement('serve')">
+		<view class="item" @tap="chageAgreement('serve')" v-if="agreement.service_agreement">
 			<view class="txt">服务协议</view>
 			<view class="rigth lf-iconfont icon-xiangyou lf-font-24"></view>
 		</view>
@@ -44,7 +44,8 @@
 			return{
 				showAgreement:false,
 				message:'隐私协议',
-				contents:''
+				contents:'',
+				agreement: {}
 			}
 			
 		},
diff --git a/pages/user/my/newPhone.vue b/pages/user/my/newPhone.vue
new file mode 100644
index 0000000..2acfba7
--- /dev/null
+++ b/pages/user/my/newPhone.vue
@@ -0,0 +1,168 @@
+<template>
+	<view>
+		<lf-nav title="设置新手机号" :showIcon="true"></lf-nav>
+		<view class="content">
+			<view class="list">
+				<view class="lf-flex">
+					<view class="lf-font-28 lf-color-black" style="width: 140rpx;">新手机号</view>
+					<input class="input" placeholder="请输入新手机号" v-model="phone" maxlength="11" />
+				</view>
+				<view class="clear" v-if="phone.length" @click="phone = ''">
+					<text class="lf-iconfont icon-status-error"></text>
+				</view>
+			</view>
+			<view class="list">
+				<view class="lf-flex">
+					<view class="lf-font-28 lf-color-black" style="width: 140rpx;">验证码</view>
+					<input class="input input-code" placeholder="请输入验证码" maxlength="8" v-model="code" />
+				</view>
+				<view class="code" :class="{'active-bg': is_code}" @click="getCode">
+					<text>{{ is_code ? num +'秒后重新获取' : '获取验证码' }}</text>
+				</view>
+			</view>
+		</view>
+		<button class="next-btn" hover-class="lf-opacity" @click="submit">立即更换</button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return {
+				phone: '',
+				code: '',
+				is_code: false,
+				timer: null,
+				num: 10,
+				token: ''
+			}
+		},
+		onLoad(){
+			var token = this.$cookieStorage.get('user_token');
+			this.token = token;
+		},
+		onUnload(){
+			if(this.timer){
+				clearInterval(this.timer);
+				this.timer = null;
+			}
+		},
+		methods: {
+			getCode(){
+				let phone = this.phone;
+				if(!phone) return this.$msg('请输入手机号');
+				if(!this.$check(phone, 'mobile')) return this.$msg('请输入正确的手机号');
+				if(this.is_code) return;
+				this.is_code = true;
+				if(this.timer){
+					clearInterval(this.timer);
+					this.timer = null;
+				}
+				this.getVerifyCode();
+				this.timer = setInterval(() => {
+					this.num--;
+					if(this.num <= 0){
+						clearInterval(this.timer);
+						this.timer = null;
+						this.num = 10;
+						this.is_code = false;
+					}
+				}, 1000);
+			},
+			getVerifyCode(){
+				this.$http.post({
+					api: 'api/sms/verify-code',
+					data: {
+						mobile: this.phone
+					},
+					header: {
+						'Content-Type': 'application/x-www-form-urlencoded',
+						Authorization: this.token
+					}
+				}).then(res => {
+					console.log("-------", res);
+					if(res.data.code == 200){
+						this.$msg(res.data.message, {icon: 'success'});
+					}
+				})
+			},
+			submit(){
+				let phone = this.phone;
+				if(!phone) return this.$msg('请输入手机号');
+				if(!this.$check(phone, 'mobile')) return this.$msg('请输入正确的手机号');
+				if(!this.code) return this.$msg('请输入验证码');
+				
+				this.$http.post({
+					api: 'api/users/update/mobile',
+					data: {
+						code: this.code,
+						mobile: this.phone
+					},
+					header: {
+						Authorization: this.token
+					}
+				}).then(res => {
+					this.$msg('更改手机号成功', {icon: 'success'}).then(() => {
+						uni.navigateBack({delta: 2}); // 返回前两个页面
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped="scoped">
+	.content{
+		padding: 0 32rpx;
+	}
+	.next-btn{
+		width: 550rpx;
+		height: 100rpx;
+		background: #15716E;
+		border-radius: 50rpx;
+		position: fixed;
+		bottom: 10vh;
+		left: calc(50% - 275rpx);
+		line-height: 100rpx;
+		color: #FFFFFF;
+	}
+	.list{
+		height: 106rpx;
+		width: 100%;
+		border-bottom: 1rpx solid #e5e5e5;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		&:nth-child(2n){
+			margin-top: 30rpx;
+		}
+		.input{
+			width: 380rpx;
+			height: 80rpx;
+			font-size: 32rpx;
+			margin-left: 50rpx;
+		}
+		.input-code{
+			width: 290rpx;
+		}
+		.clear{
+			padding: 20rpx;
+		}
+		.code{
+			min-width: 180rpx;
+			max-width: 220rpx;
+			height: 64rpx;
+			padding: 0 4rpx;
+			font-size: 24rpx;
+			color: #15716E;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 32rpx;
+			border: 2rpx solid #15716E;
+		}
+		.active-bg{
+			background: #efefef;
+		}
+	}
+</style>
diff --git a/pages/user/my/setPassword.vue b/pages/user/my/setPassword.vue
index ca29961..cce1c69 100644
--- a/pages/user/my/setPassword.vue
+++ b/pages/user/my/setPassword.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<lf-nav title="设置密码" :showIcon="true"></lf-nav>
+		<lf-nav :title="title" :showIcon="true"></lf-nav>
 		<view class="content">
 			<view class="list">
 				<view class="lf-flex">
@@ -20,7 +20,8 @@
 			</view>
 		</view>
 		<button class="next-btn" hover-class="lf-opacity" @click="next">下一步</button>
-		<lf-pay-password v-if="show_pay" @comfirm="payComfirm"></lf-pay-password>
+		<lf-pay-password v-if="show_pay" @comfirm="payComfirm" title="请设置6位支付密码"></lf-pay-password>
+		<lf-pay-password v-else-if="show_again_pay" @comfirm="againPayComfirm" title="请再次输入密码"></lf-pay-password>
 	</view>
 </template>
 
@@ -37,11 +38,16 @@
 				is_code: false,
 				timer: null,
 				num: 10,
-				show_pay: false
+				show_pay: false,
+				show_again_pay: false,
+				token: '',
+				title: '验证手机号',
+				password: ''
 			}
 		},
 		onLoad(){
-			
+			var token = this.$cookieStorage.get('user_token');
+			this.token = token;
 		},
 		onUnload(){
 			if(this.timer){
@@ -51,14 +57,16 @@
 		},
 		methods: {
 			getCode(){
+				let phone = this.phone;
+				if(!phone) return this.$msg('请输入手机号');
+				if(!this.$check(phone, 'mobile')) return this.$msg('请输入正确的手机号');
 				if(this.is_code) return;
 				this.is_code = true;
 				if(this.timer){
 					clearInterval(this.timer);
 					this.timer = null;
 				}
-				console.log("测试重复点击", Math.random())
-				// TODO 在此发送网络请求
+				this.getVerifyCode();
 				this.timer = setInterval(() => {
 					this.num--;
 					if(this.num <= 0){
@@ -69,12 +77,79 @@
 					}
 				}, 1000);
 			},
+			getVerifyCode(){
+				this.$http.post({
+					api: 'api/sms/verify-code',
+					data: {
+						mobile: this.phone
+					},
+					header: {
+						'Content-Type': 'application/x-www-form-urlencoded',
+						Authorization: this.token
+					}
+				}).then(res => {
+					this.$msg(res.data.message, {icon: 'success'});
+				})
+			},
+			// 下一步
 			next(){
-				this.show_pay = true;
+				let phone = this.phone;
+				if(!phone) return this.$msg('请输入手机号');
+				if(!this.$check(phone, 'mobile')) return this.$msg('请输入正确的手机号');
+				if(!this.code) return this.$msg('请输入验证码');
+				
+				this.$http.post({
+					api: 'api/user/check_old_mobile',
+					data: {
+						code: this.code,
+						mobile: this.phone
+					},
+					header: {
+						Authorization: this.token
+					}
+				}).then(res => {
+					if(res.data.code == 200){
+						this.title = '设置密码';
+						this.show_pay = true;
+					}else{
+						this.$msg(res.data.message);
+					}
+				})
 			},
+			// 输入支付密码
 			payComfirm(event){
-				console.log("支付密码为:", event);
 				this.show_pay = false;
+				this.show_again_pay = true;
+				this.password = event;
+			},
+			// 再次输入密码
+			againPayComfirm(event){
+				if(this.password == event){
+					this.$http.post({
+						api: 'api/user/update_pay_pwd',
+						data: {
+							code: this.code,
+							pay_pwd: event
+						},
+						header: {
+							Authorization: this.token
+						}
+					}).then(res => {
+						if(res.data.code == 200){
+							this.$msg('设置成功', {icon: 'success'}).then(() => {
+								this.$toBack();
+							})
+						}else{
+							this.$msg(res.data.data);
+						}
+					})
+				}else{
+					this.$msg('两次密码不同', {icon: 'error'});
+					this.phone = '';
+					this.code = '';
+					this.show_again_pay = false;
+					this.title = '验证手机号';
+				}
 			}
 		}
 	}
diff --git a/pages/user/my/verificationPhone.vue b/pages/user/my/verificationPhone.vue
index 5bc0f4c..6e66689 100644
--- a/pages/user/my/verificationPhone.vue
+++ b/pages/user/my/verificationPhone.vue
@@ -5,10 +5,10 @@
 			<view class="list">
 				<view class="lf-flex">
 					<view class="lf-font-28 lf-color-black" style="width: 140rpx;">旧手机号</view>
-					<input class="input" placeholder="请输入手机号" v-model="phone" maxlength="11" />
+					<input class="input" placeholder="请输入旧手机号" v-model="phone" maxlength="11" />
 				</view>
 				<view class="clear" v-if="phone.length" @click="phone = ''">
-					<text class="lf-iconfont icon--"></text>
+					<text class="lf-iconfont icon-status-error"></text>
 				</view>
 			</view>
 			<view class="list">
@@ -33,11 +33,13 @@
 				code: '',
 				is_code: false,
 				timer: null,
-				num: 10
+				num: 10,
+				token: ''
 			}
 		},
 		onLoad(){
-			
+			var token = this.$cookieStorage.get('user_token');
+			this.token = token;
 		},
 		onUnload(){
 			if(this.timer){
@@ -47,14 +49,16 @@
 		},
 		methods: {
 			getCode(){
+				let phone = this.phone;
+				if(!phone) return this.$msg('请输入手机号');
+				if(!this.$check(phone, 'mobile')) return this.$msg('请输入正确的手机号');
 				if(this.is_code) return;
 				this.is_code = true;
 				if(this.timer){
 					clearInterval(this.timer);
 					this.timer = null;
 				}
-				console.log("测试重复点击", Math.random())
-				// TODO 在此发送网络请求
+				this.getVerifyCode();
 				this.timer = setInterval(() => {
 					this.num--;
 					if(this.num <= 0){
@@ -65,9 +69,43 @@
 					}
 				}, 1000);
 			},
+			getVerifyCode(){
+				this.$http.post({
+					api: 'api/sms/verify-code',
+					data: {
+						mobile: this.phone
+					},
+					header: {
+						'Content-Type': 'application/x-www-form-urlencoded',
+						Authorization: this.token
+					}
+				}).then(res => {
+					this.$msg(res.data.message, {icon: 'success'});
+				})
+			},
 			next(){
-				// this.$url('/pages/user/my/setPassword', {type: 'redirect'});
-				this.$url('/pages/user/my/setPassword');
+				let phone = this.phone;
+				if(!phone) return this.$msg('请输入手机号');
+				if(!this.$check(phone, 'mobile')) return this.$msg('请输入正确的手机号');
+				if(!this.code) return this.$msg('请输入验证码');
+				
+				this.$http.post({
+					api: 'api/user/check_old_mobile',
+					data: {
+						code: this.code,
+						mobile: this.phone
+					},
+					header: {
+						Authorization: this.token
+					}
+				}).then(res => {
+					console.log("11111res", res)
+					if(res.data.code == 200){
+						this.$url('/pages/user/my/newPhone');
+					}else{
+						this.$msg(res.data.message);
+					}
+				})
 			}
 		}
 	}
diff --git a/pages/user/my/vipinfo.vue b/pages/user/my/vipinfo.vue
index fde77ee..106c0c0 100644
--- a/pages/user/my/vipinfo.vue
+++ b/pages/user/my/vipinfo.vue
@@ -140,7 +140,17 @@
 					info.name = detail.name;
 					info.sex = detail.sex;
 					info.birthday = detail.birthday;
-					// todo 其他信息待补充...
+					info.native_place = detail.country;
+					
+					if(detail.province && detail.city && detail.area){
+						let address = [detail.province, detail.city, detail.area];
+						info.address = address;
+					}
+					info.address_detail = detail.postal_address;
+					info.home_address = detail.home_address;
+					
+					
+					// todo 其他信息待补充... id_number身份证
 					this.info = info;
 				})
 			},
@@ -151,24 +161,46 @@
 				this.info.address = event.detail.value;
 			},
 			submit(){
-				console.log(this.info);
+				let par = {};
+				if(this.info.name){
+					par.name = this.info.name; // 姓名
+				}
+				if(this.info.native_place){
+					par.country = this.info.native_place; // 国籍
+				}
+				if(this.info.address.length){
+					let address = this.info.address;
+					par.province = address[0]; // 省
+					par.city = address[1]; // 市
+					par.area = address[2]; // 区
+				}
+				if(this.info.address_detail){
+					par.postal_address = this.info.address_detail; // 通讯详细地址
+				}
+				if(this.info.home_address){
+					par.home_address = this.info.home_address; // 家庭地址
+				}
+				if(this.info.education){
+					par.education = this.info.education; // 学历
+				}
+				if(Object.keys(par).length <= 0){
+					return this.$msg('您未填写资料哦', {icon: 'error'})
+				}
 				uni.showLoading({
 					title: '正在保存中'
 				});
-				// TODO 其他参数待传入对接
 				this.$http.post({
 					api: 'api/users/update/info',
-					data: {
-						name: this.info.name,
-						// education: this.info.education
-					},
+					data: par,
 					header: {
 						Authorization: this.token,
 						Accept: 'application/json'
 					}
 				}).then(res => {
 					uni.hideLoading();
-					this.$msg('保存成功', {icon: 'success'});
+					if(res.data.code == 200){
+						this.$msg('保存成功', {icon: 'success'});
+					}
 				}).catch(err => {
 					uni.hideLoading();
 					this.$msg('保存失败', {icon: 'error'});