diff --git a/api/request.js b/api/request.js
index f7e4241..d043cb9 100644
--- a/api/request.js
+++ b/api/request.js
@@ -13,42 +13,38 @@ function request(url, method = 'GET', data = {}) {
header.Authorization = `${tokenString}`;
}
return new Promise((resolve, reject) => {
- wx.request({
- url: baseUrl + url,
- method,
- data,
- dataType: 'json', // 微信官方文档中介绍会对数据进行一次JSON.parse
- header,
- success(res) {
- if (res.data.code) {
- if (res.data.code == 10103) {
- wx.removeStorageSync('access_token');
- wx.navigateTo({
- url: '/pages/login/login',
- complete: () => {
- isNavigatingToLogin = false;
- }
- });
- }
- reject(res.data);
- return;
- }
- wx.showToast({
- title: res.data.message,
- icon: 'none'
+ wx.request({
+ url: baseUrl + url,
+ method,
+ data,
+ dataType: 'json', // 微信官方文档中介绍会对数据进行一次JSON.parse
+ header,
+ success(res) {
+ if (res.data.code) {
+ if (res.data.code == 10103) {
+ wx.removeStorageSync('access_token');
+ wx.navigateTo({
+ url: '/pages/login/login',
});
reject(res.data);
- } else {
- resolve(res.data);
+ return;
}
+ wx.showToast({
+ title: res.data.message,
+ icon: 'none'
+ });
+ reject(res.data);
+ } else {
+ resolve(res.data);
+ }
- },
- fail(err) {
- console.log(err)
- // 断网、服务器挂了都会fail回调,直接reject即可
- reject(err);
- },
- });
+ },
+ fail(err) {
+ console.log(err)
+ // 断网、服务器挂了都会fail回调,直接reject即可
+ reject(err);
+ },
+ });
});
}
diff --git a/pages/followUp/index.js b/pages/followUp/index.js
index 8a59ddc..4d630c9 100644
--- a/pages/followUp/index.js
+++ b/pages/followUp/index.js
@@ -73,6 +73,12 @@ Page({
imageVisible: true
})
},
+
+ onClose(){
+ this.setData({
+ imageVisible: false
+ })
+ },
/**
* 生命周期函数--监听页面加载
*/
diff --git a/pages/home/index.js b/pages/home/index.js
index 862559b..602bdaf 100644
--- a/pages/home/index.js
+++ b/pages/home/index.js
@@ -8,12 +8,7 @@ const app = getApp();
Page({
onShareAppMessage: function (res) {
- return {
- title: 'ECharts 可以在微信小程序中使用啦!',
- path: '/pages/index/index',
- success: function () {},
- fail: function () {}
- }
+
},
data: {
ec: {
diff --git a/pages/home/index.wxml b/pages/home/index.wxml
index 598fd48..7f62421 100644
--- a/pages/home/index.wxml
+++ b/pages/home/index.wxml
@@ -9,7 +9,7 @@
- {{userInfo.username}}{{userInfo.sex == 1 ? '男':'女'}} · {{ userInfo.age }}
+ {{userInfo.username ? userInfo.username : '患者信息未完善'}}{{userInfo.sex == 1 ? '男':'女'}} · {{ userInfo.age }}
下次随访时间:{{ userInfo.next_follow_date }}
diff --git a/pages/login/login.wxml b/pages/login/login.wxml
index 55b2fe9..937eb7f 100644
--- a/pages/login/login.wxml
+++ b/pages/login/login.wxml
@@ -30,8 +30,8 @@
登录
- 登录或注册完成即代表您同意
- 《用户服务协议》
+
\ No newline at end of file
diff --git a/pages/patients/index.wxml b/pages/patients/index.wxml
index 5918081..49bb060 100644
--- a/pages/patients/index.wxml
+++ b/pages/patients/index.wxml
@@ -19,8 +19,8 @@
- {{item.username}}
-
+ {{item.username ? item.username : '患者信息未完善'}}
+
{{item.sex == 1 ? '男':'女'}} · {{item.age}}