|
@@ -19,6 +19,7 @@ Page({
|
|
data: {
|
|
data: {
|
|
///下午好
|
|
///下午好
|
|
greeting: "",
|
|
greeting: "",
|
|
|
|
+ phone: "",
|
|
nvabarData: {
|
|
nvabarData: {
|
|
showCapsule: 0, //是否显示左上角图标 1表示显示 0表示不显示
|
|
showCapsule: 0, //是否显示左上角图标 1表示显示 0表示不显示
|
|
title: 'OhPlay', //导航栏 中间的标题
|
|
title: 'OhPlay', //导航栏 中间的标题
|
|
@@ -152,7 +153,8 @@ Page({
|
|
wx.getStorage({
|
|
wx.getStorage({
|
|
key: "userInfo",
|
|
key: "userInfo",
|
|
success(res) {
|
|
success(res) {
|
|
- if (!res.data.phone) {
|
|
|
|
|
|
+ var phone = res.data.phone;
|
|
|
|
+ if (!phone) {
|
|
return;
|
|
return;
|
|
};
|
|
};
|
|
|
|
|
|
@@ -163,6 +165,7 @@ Page({
|
|
}
|
|
}
|
|
|
|
|
|
that.setData({
|
|
that.setData({
|
|
|
|
+ phone: phone,
|
|
greeting: greeting,
|
|
greeting: greeting,
|
|
nickname: nickname,
|
|
nickname: nickname,
|
|
userPic: res.data.headUrl || "",
|
|
userPic: res.data.headUrl || "",
|
|
@@ -663,6 +666,7 @@ Page({
|
|
greeting = greeting + ',' + nickname;;
|
|
greeting = greeting + ',' + nickname;;
|
|
}
|
|
}
|
|
that.setData({
|
|
that.setData({
|
|
|
|
+ phone: "",
|
|
greeting: greeting,
|
|
greeting: greeting,
|
|
islogin: false,
|
|
islogin: false,
|
|
nickname: nickname,
|
|
nickname: nickname,
|
|
@@ -686,8 +690,9 @@ Page({
|
|
|
|
|
|
addDevice() {
|
|
addDevice() {
|
|
var that = this;
|
|
var that = this;
|
|
|
|
+ var phone = that.data.phone;
|
|
var showLogin = that.data.showLogin;
|
|
var showLogin = that.data.showLogin;
|
|
- if (showLogin) {
|
|
|
|
|
|
+ if (phone == "" || showLogin) {
|
|
wx.navigateTo({
|
|
wx.navigateTo({
|
|
url: './../login/login'
|
|
url: './../login/login'
|
|
});
|
|
});
|