'修BUG'

api/request.js

@@ -42,7 +42,7 @@ export default function request ( {
           if (res.data.code === 200 ) {
             resolve(res.data)
             return
-          }
+          } 
           
           // 业务失败但有具体错误信息
           const errorMsg = res.data.message || '请求失败'
@@ -53,11 +53,18 @@ export default function request ( {
               icon: 'none'
             })
           }
-          reject({
-            code: res.data.code,
-            message: errorMsg,
-            data: res.data
-          })
+
+          // 对于用户被删除 做特殊判断
+          if (res.data.code === 500 && res.data.message === '操作失败，用户不存在!') {
+            uni.removeStorageSync('token')
+            uni.reLaunch({ url: '/subPages/login/login' })
+          }else{
+            reject({
+              code: res.data.code,
+              message: errorMsg,
+              data: res.data
+            })
+          }
           return
         }
 

pages/index/my.vue

@@ -98,21 +98,18 @@ export default {
         headImage: '/static/默认头像.png',
         collectionNum: 5,
         score: 41
-      }
-    }
-  },
-  computed: {
-    isLogin() {
-      return uni.getStorageSync('token')
+      },
+      isLogin: false
     }
   },
+
   methods: {
     navigateTo(page) {
       console.log('导航到:', page)
       // 根据不同页面进行导航
       switch(page) {
         case 'profile':
-          if (this.isLogin) {
+          if (uni.getStorageSync('token')) {
             uni.navigateTo({
               url: '/subPages/my/myProfile'
             })
@@ -170,10 +167,12 @@ export default {
           if (res.confirm) {
             // 清除用户信息
             uni.removeStorageSync('token')
+            this.isLogin = false
             uni.showToast({
               title: '已退出登录',
               icon: 'success'
             })
+            
             // 跳转到登录页面
             setTimeout(() => {
               uni.reLaunch({
@@ -200,6 +199,7 @@ export default {
   },
   onShow() {
     this.getUser()
+    this.isLogin = uni.getStorageSync('token') ? true : false
   },
   async onPullDownRefresh() {
     await this.getUser()

subPages/login/userInfo.vue

@@ -207,20 +207,7 @@ export default {
         });
         return;
       }
-      // if (!this.userInfo.name.trim()) {
-      //   uni.showToast({
-      //     title: '请输入真实姓名',
-      //     icon: 'none'
-      //   });
-      //   return;
-      // }
-      // if (!this.userInfo.area.trim()) {
-      //   uni.showToast({
-      //     title: '请输入所在宿集区',
-      //     icon: 'none'
-      //   });
-      //   return;
-      // }
+
       
       if (!this.userInfo.phone.trim()) {
         uni.showToast({
@@ -241,25 +228,35 @@ export default {
       console.log('提交用户信息', this.userInfo);
       
       // 提交用户信息
-      await this.$api.user.updateUser({
+      const res = await this.$api.user.updateUser({
         nickName: this.userInfo.nickName,
         phone: this.userInfo.phone,
         headImage: this.userInfo.headImage,
         address: ''
       })
 
-      // 这里可以调用API保存用户信息
-      uni.showToast({
-        title: '信息保存成功',
-        icon: 'success'
-      });
-      
-      // 跳转到首页或其他页面
+      if (res.code === 200) {
+        uni.showToast({
+          title: '信息保存成功',
+          icon: 'success'
+        });
+        // 跳转到首页或其他页面
       setTimeout(() => {
         uni.switchTab({
           url: '/pages/index/index'
         });
       }, 1000);
+      }
+      else {
+
+        // 这里可以调用API保存用户信息
+        uni.showToast({
+          title: '信息保存成功',
+          icon: 'success'
+        });
+      }
+      
+      
     }
   }
 }

subPages/my/myProfile.vue

@@ -215,6 +215,9 @@ export default {
     async getUserInfo() {
       const res = await this.$api.user.queryUser()
       this.userInfo = {...this.userInfo, ...res.result}
+      if (!userInfo.area) {
+        userInfo.area = ''
+      }
     }
   },
   onLoad() {

unpackage/dist/build/mp-weixin/project.config.json

@@ -18,7 +18,7 @@
     }
   },
   "compileType": "miniprogram",
-  "libVersion": "3.8.12",
+  "libVersion": "3.10.0",
   "appid": "wxb6f11363a55f9535",
   "projectname": "木邻有你",
   "condition": {},

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -14522,11 +14522,20 @@ function request(_ref) {
               icon: 'none'
             });
           }
-          reject({
-            code: res.data.code,
-            message: errorMsg,
-            data: res.data
-          });
+
+          // 对于用户被删除 做特殊判断
+          if (res.data.code === 500 && res.data.message === '操作失败，用户不存在!') {
+            uni.removeStorageSync('token');
+            uni.reLaunch({
+              url: '/subPages/login/login'
+            });
+          } else {
+            reject({
+              code: res.data.code,
+              message: errorMsg,
+              data: res.data
+            });
+          }
           return;
         }
 

unpackage/dist/dev/mp-weixin/pages/components/index/VolunteerHeader.json

@@ -1,7 +1,7 @@
 {
-  "component": true,
   "usingComponents": {
     "uv-swiper": "/uni_modules/uv-swiper/components/uv-swiper/uv-swiper",
     "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
-  }
+  },
+  "component": true
 }

unpackage/dist/dev/mp-weixin/pages/components/index/VolunteerRanking.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
-  }
+  },
+  "component": true
 }

unpackage/dist/dev/mp-weixin/pages/components/shop/PointsCard.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/dev/mp-weixin/pages/index/my.js

@@ -266,21 +266,17 @@ var _default = {
         headImage: '/static/默认头像.png',
         collectionNum: 5,
         score: 41
-      }
+      },
+      isLogin: false
     };
   },
-  computed: {
-    isLogin: function isLogin() {
-      return uni.getStorageSync('token');
-    }
-  },
   methods: {
     navigateTo: function navigateTo(page) {
       console.log('导航到:', page);
       // 根据不同页面进行导航
       switch (page) {
         case 'profile':
-          if (this.isLogin) {
+          if (uni.getStorageSync('token')) {
             uni.navigateTo({
               url: '/subPages/my/myProfile'
             });
@@ -331,6 +327,7 @@ var _default = {
       }
     },
     logout: function logout() {
+      var _this = this;
       uni.showModal({
         title: '提示',
         content: '确定要退出登录吗？',
@@ -338,10 +335,12 @@ var _default = {
           if (res.confirm) {
             // 清除用户信息
             uni.removeStorageSync('token');
+            _this.isLogin = false;
             uni.showToast({
               title: '已退出登录',
               icon: 'success'
             });
+
             // 跳转到登录页面
             setTimeout(function () {
               uni.reLaunch({
@@ -353,7 +352,7 @@ var _default = {
       });
     },
     getUser: function getUser() {
-      var _this = this;
+      var _this2 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var res;
         return _regenerator.default.wrap(function _callee$(_context) {
@@ -365,14 +364,14 @@ var _default = {
                   break;
                 }
                 _context.next = 3;
-                return _this.$api.user.queryUser();
+                return _this2.$api.user.queryUser();
               case 3:
                 res = _context.sent;
-                _this.userInfo = res === null || res === void 0 ? void 0 : res.result;
+                _this2.userInfo = res === null || res === void 0 ? void 0 : res.result;
                 _context.next = 8;
                 break;
               case 7:
-                _this.userInfo = {
+                _this2.userInfo = {
                   nickName: '未登录',
                   headImage: '/static/默认头像.png',
                   collectionNum: '0',
@@ -389,16 +388,17 @@ var _default = {
   },
   onShow: function onShow() {
     this.getUser();
+    this.isLogin = uni.getStorageSync('token') ? true : false;
   },
   onPullDownRefresh: function onPullDownRefresh() {
-    var _this2 = this;
+    var _this3 = this;
     return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
       return _regenerator.default.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return _this2.getUser();
+              return _this3.getUser();
             case 2:
               uni.stopPullDownRefresh();
             case 3:

unpackage/dist/dev/mp-weixin/project.config.json

@@ -1,7 +1,8 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": []
+    "ignore": [],
+    "include": []
   },
   "setting": {
     "urlCheck": false,
@@ -9,28 +10,20 @@
     "postcss": false,
     "minified": false,
     "newFeature": true,
-    "bigPackageSizeSupport": true
+    "bigPackageSizeSupport": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
   },
   "compileType": "miniprogram",
-  "libVersion": "",
+  "libVersion": "3.10.0",
   "appid": "wxb6f11363a55f9535",
   "projectname": "木邻有你",
-  "condition": {
-    "search": {
-      "current": -1,
-      "list": []
-    },
-    "conversation": {
-      "current": -1,
-      "list": []
-    },
-    "game": {
-      "current": -1,
-      "list": []
-    },
-    "miniprogram": {
-      "current": -1,
-      "list": []
-    }
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
   }
 }

unpackage/dist/dev/mp-weixin/subPages/login/userInfo.js

@@ -414,6 +414,7 @@ var _default = {
     submitUserInfo: function submitUserInfo() {
       var _this4 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+        var res;
         return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
@@ -459,18 +460,25 @@ var _default = {
                   address: ''
                 });
               case 12:
-                // 这里可以调用API保存用户信息
-                uni.showToast({
-                  title: '信息保存成功',
-                  icon: 'success'
-                });
-
-                // 跳转到首页或其他页面
-                setTimeout(function () {
-                  uni.switchTab({
-                    url: '/pages/index/index'
+                res = _context4.sent;
+                if (res.code === 200) {
+                  uni.showToast({
+                    title: '信息保存成功',
+                    icon: 'success'
                   });
-                }, 1000);
+                  // 跳转到首页或其他页面
+                  setTimeout(function () {
+                    uni.switchTab({
+                      url: '/pages/index/index'
+                    });
+                  }, 1000);
+                } else {
+                  // 这里可以调用API保存用户信息
+                  uni.showToast({
+                    title: '信息保存成功',
+                    icon: 'success'
+                  });
+                }
               case 14:
               case "end":
                 return _context4.stop();

unpackage/dist/dev/mp-weixin/subPages/my/myProfile.js

@@ -442,7 +442,10 @@ var _default = {
               case 2:
                 res = _context3.sent;
                 _this3.userInfo = _objectSpread(_objectSpread({}, _this3.userInfo), res.result);
-              case 4:
+                if (!userInfo.area) {
+                  userInfo.area = '';
+                }
+              case 5:
               case "end":
                 return _context3.stop();
             }