9-30-1

pages/redirect/redirect.vue

@@ -100,6 +100,7 @@
 				uni.setStorageSync('token', data.token);
 				// 获取用户基础信息
 				getUserInfo({}).then(e => {
+					console.log(e,'jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj')
 					obj.login();
 					// 保存返回用户数据
 					obj.setUserInfo(e.data);
@@ -108,27 +109,34 @@
 					if (ur == 'pages/product/product') {
 						ur = '/pages/index/index'
 					}
-					// #ifdef H5
-					window.location.href = obj.$store.state.baseURL + obj.$store.state.urlFile + '/#' + ur
-					// #endif
-					// #ifdef MP
-					uni.switchTab({
-						url: ur,
-						fail(e) {
-							console.log(e);
-							uni.navigateTo({
-								url: ur,
-								fail(e) {
-									console.log(e);
-									uni.switchTab({
-										url: '/pages/index/index'
-									});
-								}
-							});
-						}
-					});
-					// #endif
-
+					console.log(e.data.phone,'e.data.phone++++++++++++++++')
+					if(e.data.phone) {
+						// #ifdef H5
+						window.location.href = obj.$store.state.baseURL + obj.$store.state.urlFile + '/#' + ur
+						// #endif
+						// #ifdef MP
+						uni.switchTab({
+							url: ur,
+							fail(e) {
+								console.log(e);
+								uni.navigateTo({
+									url: ur,
+									fail(e) {
+										console.log(e);
+										uni.switchTab({
+											url: '/pages/index/index'
+										});
+									}
+								});
+							}
+						});
+						// #endif
+					}else {
+						obj.$api.msg('请完善身份信息')
+						uni.navigateTo({
+							url: '/pages/set/phone'
+						})
+					}
 				}).catch((e) => {
 					uni.showModal({
 						title: '错误',

pages/set/phone.vue

@@ -5,11 +5,11 @@
 			<input class="input" v-model="account" type="text" placeholder="请填写手机号" placeholder-class="placeholder" />
 		</view>
 		<view>
-			<view class="row b-b">
+			<!-- <view class="row b-b">
 				<text class="tit">验证码</text>
 				<input class="input" v-model="captcha" type="text" placeholder="请填写验证码" placeholder-class="placeholder" />
 				<view class="code" @click="verification">{{ countDown == 0 ? '验证码' : countDown }}</view>
-			</view>
+			</view> -->
 			<button class="add-btn" :class="{ 'bg-gray': loding }" @click="loding ? '' : confirm()">提交</button>
 		</view>
 	</view>
@@ -85,7 +85,7 @@ export default {
 			obj.loding = true;
 			binding({
 				phone: obj.account,
-				captcha: obj.captcha
+				// captcha: obj.captcha
 			})
 				.then(({ data }) => {
 					obj.$api.msg('绑定成功！');

pages/user/team.vue

@@ -17,6 +17,10 @@
 				<view class="money">{{ all|| '0' }}</view>
 				<view>我的推广人数</view>
 			</view>
+			<view class="money-box" style="padding-top: 20rpx;" v-if="order*1 > 0">
+				<view>直推：{{zt_order}}单</view>
+				<view>间推：{{jt_order}}单</view>
+			</view>
 		</view>
 		<view class="flex buttom-box">
 			<view class="buttom"  @click="tabClick(0)">
@@ -47,9 +51,12 @@
 								<view class="time">
 									<text>{{ item.time }}</text>
 								</view>
+								<view class="time" style="color: #e06c75;">
+									<text>购买单数{{ item.order_count}} 订单金额{{item.order_price}}</text>
+								</view>
 							</view>
-							<!-- <view class="money">
-								<text>{{ item.self_achievement == null ? '未购买' : item.self_achievement + '元' }}</text>
+							<!-- <view class="money" v-if="item.order_count*1 > 0">
+								<text>购买单数{{ item.order_count}} <br />订单金额{{item.order_price}}</text>
 							</view> -->
 						</view>
 					</view>
@@ -111,7 +118,10 @@
 				}],
 				all: '',
 				list: '',
-				totalLevel: ''
+				totalLevel: '',
+				order: '',
+				zt_order: '',
+				jt_order: ''
 			};
 		},
 		computed: {
@@ -158,6 +168,9 @@
 						data
 					}) => {
 						console.log(data);
+						this.order = data.order
+						this.zt_order = data.zt_order
+						this.jt_order = data.jt_order
 						this.all = data.total;
 						this.totalLevel = data.totalLevel
 						if (data.list.length > 0) {
@@ -357,7 +370,7 @@
 				}
 
 				.time {
-					font-size: $font-base;
+					font-size: $font-lg;
 					color: $font-color-light;
 				}
 			}

pages/user/user.vue

@@ -443,6 +443,14 @@
 					}) => {
 						this.setUserInfo(data);
 						// 获取用户数据完毕后在获取订单数据防止多次跳转到登录页
+						if(!data.phone) {
+							this.$api.msg('请完善身份信息')
+							setTimeout(()=> {
+								uni.navigateTo({
+									url:'/pages/set/phone'
+								})
+							},1500)
+						}
 						orderData({})
 							.then(({
 								data

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>想亮商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.147ed2bc.js></script><script src=/index/static/js/index.96ec032b.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.147ed2bc.js></script><script src=/index/static/js/index.ede0d2e3.js></script></body></html>