From 8e7da400ace68a4138076ce431cd73a8bf57085c Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Fri, 3 Jul 2020 09:08:53 +0800
Subject: [PATCH] api

---
 App.vue                    |   2 +-
 common/api/user.js         |  23 +++++++---
 pageE/mine/MineInfo.vue    |  10 ++++-
 pageE/mine/UpdatePhone.vue |  86 ++++++++++++++++++++++++++++++++++---
 pageE/zhibo/index.nvue     |  19 --------
 pages.json                 |   6 ---
 pages/mine/index.vue       |  11 +++--
 static/fonts/emoji.ttf     | Bin 35744 -> 0 bytes
 static/js/common.js        |   2 +
 9 files changed, 111 insertions(+), 48 deletions(-)
 delete mode 100644 pageE/zhibo/index.nvue
 delete mode 100644 static/fonts/emoji.ttf

diff --git a/App.vue b/App.vue
index bf7b9e5..fb9005c 100644
--- a/App.vue
+++ b/App.vue
@@ -2,5 +2,5 @@
 	export default {}
 </script>
 <style lang="scss">
-@import "/static/css/normalize"
+@import "/static/css/normalize";
 </style>
diff --git a/common/api/user.js b/common/api/user.js
index c108c38..5d57bd0 100644
--- a/common/api/user.js
+++ b/common/api/user.js
@@ -56,16 +56,16 @@ export default {
 				});
 			},
 			// 使用帮助&售后政策列表
-			getUseHelpList({page, tid}) {
+			getUseHelpList({ page, tid }) {
 				return vm.$u.post('Member/UseHelpList', {
 					page: page, 
-					tid: tid
+					tid: tid,
 				});
 			},
 			// 使用帮助&售后政策详情
 			getUseHelpInfo({ launch_id }) {
 				return vm.$u.post('Member/UseHelpInfo', {
-					launch_id: launch_id
+					launch_id: launch_id,
 				});
 			},
 			// 标签的列表
@@ -75,11 +75,11 @@ export default {
 			// 获取地区列表
 			getAreaList({ pid }) {
 				return vm.$u.post('Area/areaList', {
-					pid: pid
+					pid: pid,
 				});
 			},
 			getArea() {
-				return vm.$u.post('Area/getAreaTree')
+				return vm.$u.post('Area/getAreaTree');
 			},
 			// 用户收货地址列表
 			getAddressList() {
@@ -168,7 +168,7 @@ export default {
 			getPointslogList() {
 				return vm.$u.post('member/pointslogList');
 			},
-			// 收藏列表 商品 不传值;店铺　type: 2
+			// 收藏列表 商品 不传值;店铺 type: 2
 			getFavoritesList({ type = undefined } = {}) {
 				let params = {};
 				if(type) Object.assign(params, {type: type})
@@ -177,7 +177,7 @@ export default {
 			// 取消收藏（商品/店铺）
 			removeFavorite({ id }) {
 				return vm.$u.post('Member/removeFavorite', {
-					id: id
+					id: id,
 				});
 			},
 			// 设置-用户信息
@@ -193,6 +193,15 @@ export default {
 					birthday: birthday,
 				});
 			},
+			// 修改绑定手机号
+			changeMemberPhone({ old_mobile, old_code, new_mobile, new_code }) {
+				return vm.$u.post('Member/changeMemberInfo', {
+					old_mobile: old_mobile,
+					old_code: old_code,
+					new_mobile: new_mobile,
+					new_code: new_code,
+				});
+			},
 			// 设置-关于我们
 			aboutUsInfo() {
 				return vm.$u.post('Setting/AboutUsInfo');
diff --git a/pageE/mine/MineInfo.vue b/pageE/mine/MineInfo.vue
index e77c641..f57a396 100644
--- a/pageE/mine/MineInfo.vue
+++ b/pageE/mine/MineInfo.vue
@@ -13,7 +13,7 @@
 		</view>
 		<view class="info-item">
 			<view class="title">生日</view>
-			<view class="value">{{ userInfo.member_birthday }}</view>
+			<view class="value">{{ userInfo.member_birthday | dateFormat }}</view>
 		</view>
 		<view class="info-item">
 			<view class="title">手机号</view>
@@ -21,7 +21,7 @@
 		</view>
 		<view class="info-item">
 			<view class="title">等级</view>
-			<view class="value">{{ userInfo.member_exppoints }}</view>
+			<view class="value">{{ userInfo.level }}</view>
 		</view>
 		<view class="info-item">
 			<view class="title">积分数</view>
@@ -34,6 +34,7 @@
 	</view>
 </template>
 <script>
+import common from '@/static/js/common.js'
 export default {
 	data() {
 		return {
@@ -46,6 +47,11 @@ export default {
 	onNavigationBarButtonTap() {
 		this.toEditPage();
 	},
+	filters: {
+		dateFormat(value) {
+			return common.timestampToDate({ timestamp: value });
+		}
+	},
 	methods: {
 		getUserInfo() {
 			this.$u.api.getMemberInfo().then(res => {
diff --git a/pageE/mine/UpdatePhone.vue b/pageE/mine/UpdatePhone.vue
index ff16cee..cbf6e4d 100644
--- a/pageE/mine/UpdatePhone.vue
+++ b/pageE/mine/UpdatePhone.vue
@@ -9,7 +9,8 @@
 				<view class="code">
 					<view class="title">验证码</view>
 					<input type="text" v-model="oldCode" placeholder="请输入验证码" />
-					<view class="get-code">获取验证码</view>
+					<u-verification-code :seconds="seconds" @end="end" @start="start" ref="uOldCode" @change="oldCodeChange" unique-key="old" change-text="x秒"></u-verification-code>
+					<view class="get-code" @click="getCode(0)">{{ btnText[0] }}</view>
 				</view>
 			</view>
 			<view class="new-phone">
@@ -20,8 +21,10 @@
 				<view class="code">
 					<view class="title">验证码</view>
 					<input type="text" v-model="newCode" placeholder="请输入验证码" />
-					<view class="get-code">获取验证码</view>
+					<u-verification-code :seconds="seconds" @end="end" @start="start" ref="uNewCode" @change="newCodeChange" unique-key="new" change-text="x秒"></u-verification-code>
+					<view class="get-code" @click="getCode(1)">{{ btnText[1] }}</view>
 				</view>
+				<u-toast ref="uToast" />
 			</view>
 		</view>
 		<view class="tips">注意：修改手机号需要原手机号获取验证码，无原手机验证码，请联系后台</view>
@@ -35,13 +38,80 @@ export default {
 			oldNumber: '',
 			oldCode: '',
 			newNumber: '',
-			newCode: ''
+			newCode: '',
+			btnText: ['获取验证码', '获取验证码'],
+			seconds: 60, // 获取验证码间隔时间
 		}
 	},
 	methods: {
-		verifyValue() {
-			if (this.$u.test.mobile(this.oldNumber)) this.$u.toast('请填写正确的原手机号');
-			if (this.$u.test.mobile(this.newNumber)) this.$u.toast('请填写正确的新手机号');
+		verifyValue(type) {
+			const phone = type == 0 ? this.oldNumber : this.newNumber;
+			return this.$u.test.mobile(phone);
+		},
+		// @param Number type 0: 原手机号 1: 新手机号
+		getSmsCode (type) {
+			if(!this.verifyValue(type)) {
+				let tips = type == 0 ? '请填写正确的原手机号' : '请填写正确的新手机号';
+				this.$u.toast(tips);
+				return false;
+			}
+			if(this.seconds > 0) {
+				this.$u.toast('倒计时结束后再发送');
+			}
+			uni.showLoading({
+				title: '正在获取验证码'
+			})
+			this.$u.api.sendSmsCode({
+				member_mobile: type == 0 ? this.oldNumber: this.newNumber,
+				smslog_type: 4 // 类型[1:注册,2:登录,3:找回密码,4:绑定手机]
+			}).then(res => {
+				uni.hideLoading();
+				if(res.errCode == 0) {
+
+				} else {
+					this.$u.toast(res.message);
+				}
+			})
+		},
+		oldCodeChange(text) {
+			this.$set(this.btnText, 0, text);
+		},
+		newCodeChange(text) {
+			this.$set(this.btnText, 1, text);
+		},
+		getCode(type) {
+			const refs = type == 0 ? this.$refs.uOldCode : this.$refs.uNewCode;
+			if(refs.canGetCode) {
+				// 模拟向后端请求验证码
+				uni.showLoading({
+					title: '正在获取验证码'
+				})
+				setTimeout(() => {
+					uni.hideLoading();
+					// 这里此提示会被this.start()方法中的提示覆盖
+					this.$u.toast('验证码已发送');
+					// 通知验证码组件内部开始倒计时
+					refs.start();
+				}, 2000);
+			} else {
+				this.$u.toast('倒计时结束后再发送');
+			}
+		},
+		changeMemberPhone() {
+			this.$u.api.changeMemberPhone({
+				old_mobile: this.oldNumber,
+				old_code: this.oldCode,
+				new_mobile: this.newNumber,
+				new_code: this.newCode,
+			}).then(res => {
+
+			})
+		},
+		end() {
+			this.$u.toast('倒计时结束');
+		},
+		start() {
+			this.$u.toast('倒计时开始');
 		}
 	},
 };
@@ -64,15 +134,17 @@ export default {
 					color: rgba(51,51,51,1);
 				}
 				.input {
-					flex: 1;
+					width: 340rpx;
 					font-size: 26rpx;
 				}
 				.get-code {
+					flex: 1;
 					font-size: 28rpx;
 					color: rgba(153,153,153,1);
 					position: relative;
 					padding: 0 25rpx;
 					margin-left: 20rpx;
+					text-align: center;
 					&::after {
 						position: absolute;
 						content: "";
diff --git a/pageE/zhibo/index.nvue b/pageE/zhibo/index.nvue
deleted file mode 100644
index c8c8cec..0000000
--- a/pageE/zhibo/index.nvue
+++ /dev/null
@@ -1,19 +0,0 @@
-<template>
-	<div>
-		<myText ref="telText" tel="11" style="width:750rem;height:100vh" @onTel="onTel" @click="myTextClick"></myText>
-	</div>
-</template>
-
-<script>  
-    export default {  
-        data() {  
-            return {  
-            }  
-        },  
-        onLoad() {  
-        },  
-        methods: {  
-			
-        }  
-    }  
-</script>  
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 4b931fd..f515130 100644
--- a/pages.json
+++ b/pages.json
@@ -315,12 +315,6 @@
 		{
 			"root": "pageE",
 			"pages":[
-				{
-					"path": "zhibo/index",
-					"style": {
-						"navigationStyle": "custom"
-					}
-				},
 				{
 					"path": "tool/MineHistory",
 					"style": {
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 11c0ba1..b8a8721 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -13,18 +13,18 @@
 					</view>
 					<view class="info-right">
 						<view class="info-phone">{{ userInfo.member_mobile | phoneFormat }}</view>
-						<view class="user-rank">等级:{{ userInfo.member_exppoints }}级</view>
+						<view class="user-rank">等级:{{ userInfo.level }}级</view>
 					</view>
 				</view>
 				<view class="member-service" @click="toOtherPage('/mine/MemberServe')">会员服务</view>
 			</view>
 			<view class="bottom">
 				<view @click="toOtherPage('/mine/GoodsCollection')">
-					<view>99</view>
+					<view>{{ userInfo.member_fav_goods_num }}</view>
 					<view>商品收藏</view>
 				</view>
 				<view @click="toOtherPage('/mine/StoreCollection')">
-					<view>9</view>
+					<view>{{ userInfo.member_fav_store_num }}</view>
 					<view>店铺收藏</view>
 				</view>
 				<view @click="toOtherPage('/mine/ImageTextCollection')">
@@ -36,7 +36,7 @@
 					<view>积分数</view>
 				</view>
 				<view @click="toOtherPage('/mine/MineConcerns')">
-					<view>9</view>
+					<view>{{ userInfo.member_snsfrend_num }}</view>
 					<view>关注</view>
 				</view>
 			</view>
@@ -123,7 +123,7 @@
 export default {
     data() {
         return {
-            userInfo: {}
+            userInfo: {},
         };
 	},
 	filters: {
@@ -146,7 +146,6 @@ export default {
 			})
 		},
 		toOtherPage(url) {
-			// console.log(url);
 			uni.navigateTo({
 				url: '/pageE' + url
 			});
diff --git a/static/fonts/emoji.ttf b/static/fonts/emoji.ttf
deleted file mode 100644
index 169f0a2afcfe197d8e59ad716505805bc9a93dcd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 35744
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

diff --git a/static/js/common.js b/static/js/common.js
index d3483a7..cde9abc 100644
--- a/static/js/common.js
+++ b/static/js/common.js
@@ -5,6 +5,7 @@ const common = {
 	* @return { String } 处理好的富文本
 	*/
 	unescapeHTML(temp){
+		if(!temp) return '';
 		temp = "" + temp;
 		return temp.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&").replace(/&quot;/g, '"').replace(/&apos;/g, "'");
 	},
@@ -16,6 +17,7 @@ const common = {
 	* @return { String } 格式化日期
 	*/
 	timestampToDate({timestamp, spacer = '-', end = 'day'} = {}) {
+		if(!timestamp) return '';
 		const newDate = new Date(parseInt(timestamp) * 1000);
 		// const year = newDate.getUTCFullYear();
 		const year = newDate.getFullYear();