流程改版

pages/my/my.js

@@ -3,6 +3,7 @@ import $ from "../../utils/request";
 Page({
 	data: {
 		userInfo: null,
+		token: null,
 
 		deviceInfo: null
 	},
@@ -11,66 +12,44 @@ Page({
 		let token = wx.getStorageSync("token") || null;
 		let userInfo = wx.getStorageSync("userInfo") || null;
 		this.setData({
-			userInfo: userInfo
+            userInfo: userInfo,
+            token: token
 		})
 		if(token && userInfo) {
 			this.getDevice();
 		}
-	},
-
-	// 打开用户信息
-	openUserInfo() {
-		if(this.data.userInfo) {
-			wx.navigateTo({
-				url: "/pages/userInfo/userInfo?initBluetooth=1&customerType=1"
-			})
-		} else {
-			wx.login({
-				success: (res) => {
-					if (res.code) {
-						this.checkOpenIdLogin(res.code);
-					} else {
-						wx.showToast({
-							icon: "none",
-							  title: "登录失败,请稍后再试!",
-						})
-					}
-				}
-			})
-		}
-	},
-
-	// 微信一键登录
-	checkOpenIdLogin(code) {
-		let params = {
-			code: code
-		};
-		$.ajax("weighingScale/checkOpenIdLogin", params, "POST", true, "登录中...").then((res) => {
-			wx.setStorageSync("userInfo", res.result.user);
-			wx.setStorageSync("token", res.result.token);
-			if(res.result.token && res.result.user) {
-				this.setData({
-					token: res.result.token,
-					userInfo: res.result.user
-				})
-				this.getDevice();
-			} else {
-				wx.showToast({
-					icon: "none",
-					title: "请先补全个人信息"
-				})
-				setTimeout(() => {
-					wx.navigateTo({
-						url: "/pages/userInfo/userInfo?initBluetooth=0&customerType=1"
-					})
-				}, 1500)
-			}
-		})
-	},
+    },
+    
+    openLoginOrReg() {
+		if(this.data.userInfo === null && this.data.token === null) {
+            wx.login({
+                success: (res) => {
+                    if (res.code) {
+                        let params = {
+                            code: res.code
+                        };
+                        $.ajax("weighingScale/checkOpenIdLogin", params, "POST", true, "登录中...").then((res) => {
+                            wx.setStorageSync("userInfo", res.result.user);
+                            wx.setStorageSync("token", res.result.token);
+                            this.setData({
+                                token: res.result.token,
+                                userInfo: res.result.user
+                            })
+                        })
+                    } else {
+                        wx.showToast({
+                            icon: "none",
+                              title: "登录失败,请稍后再试!",
+                        })
+                    }
+                }
+            })
+        }
+    },
 
 	// 打开设备详情
 	openDeviceInfo() {
-		if(this.data.userInfo) {
+		if(this.data.userInfo && this.data.token) {
 			let deviceInfo = this.data.deviceInfo;
 			if(deviceInfo) {
 				wx.navigateTo({
@@ -98,20 +77,6 @@ Page({
 		}
 	},
 
-	// 打开成员管理
-	openFamilyMembers() {
-		if(this.data.userInfo) {
-			wx.navigateTo({
-				url: "/pages/familyMembers/familyMembers"
-			})
-		} else {
-			wx.showToast({
-				icon: "none",
-				title: "请先登录"
-			})
-		}
-	},
-
 	// 获取已经绑定的设备列表
 	getDevice() {
 		let params = {};

pages/my/my.wxml

@@ -1,9 +1,14 @@
 <view class="userInfo">
-	<view class="user arrowAfter" bind:tap="openUserInfo">
+	<view class="user" bind:tap="openLoginOrReg">
 		<view>
 			<image src="/images/my/user.png" />
 		</view>
-		<view>{{userInfo && userInfo.realname ? userInfo.realname : '未登录'}}</view>
+		<view>
+            <block wx:if="{{userInfo || token}}">
+                {{userInfo ? userInfo.realname : '已登录'}}
+            </block>
+			<block wx:else>未登录</block>
+        </view>
 	</view>
 	<view class="info">
 		<view>
@@ -33,16 +38,7 @@
 			<view>设备绑定</view>
 			<view>{{deviceInfo ? '已绑定('+ deviceInfo.equipmentName +')' : '未绑定'}}</view>
 		</view>
-		<view class="list arrowAfter" bind:tap="openFamilyMembers">
-			<view>
-				<image src="/images/my/2.png" />
-			</view>
-			<view>成员管理</view>
-			<view></view>
-		</view>
-	</view>
-	<view class="agreement">
-		<view class="list arrowAfter">
+        <view class="list arrowAfter">
 			<view>
 				<image src="/images/my/3.png" />
 			</view>

pages/my/my.wxss

@@ -75,7 +75,7 @@
 	width: 100%;
 	padding: 0 30rpx;
 	box-sizing: border-box;
-	margin-bottom: 360rpx;
+	margin-bottom: 480rpx;
 }
 
 .content .arrowAfter::after {