fix

virgo.wzfrontend/wx/main.js

@@ -14,7 +14,13 @@ Vue.prototype.$toast = msg => {
 	})
 };
 Vue.prototype.$navigateTo = (url) => {
-	console.log(uni.getStorageSync('token'));
+	if (!uni.getStorageSync('token')) {
+		uni.showToast({
+			title: '您暂未登录，请先登录～',
+			icon: "none"
+		});
+		url = '/pages/login/login'
+	}
 	uni.navigateTo({
 		url: url
 	})
@@ -26,8 +32,6 @@ Vue.prototype.$field = field;
 
 Vue.config.productionTip = false;
 
-
-
 App.mpType = 'app';
 
 const app = new Vue({

virgo.wzfrontend/wx/pages.json

@@ -13,8 +13,7 @@
 		{
 			"path": "pages/order/order",
 			"style": {
-				"navigationBarTitleText": "工单",
-				"canvas": "2d"
+				"navigationBarTitleText": "工单"
 			}
 		},
 		{

virgo.wzfrontend/wx/pages/index/index.vue

@@ -73,12 +73,8 @@
 			this.getHouseList();
 		},
 		methods: {
-			getAllProjectList() {
-				getProjectList().then(res => {
-					if (res.code == 200) {
-					}
-					console.log(res);
-				})
+			getAllProjectList() {
+				
 			},
 			getHouseList() {
 				getHouseListByPage({

virgo.wzfrontend/wx/pages/login/login.vue

@@ -123,6 +123,7 @@
 				this.isDisabled = codeNumber == 0 ? false : true;
 			},
 			wxPhoneLogin(e) { //微信手机号一键登录
+				if (!e.detail.code) return;
 				this.login({
 					pCode: e.detail.code
 				})
@@ -140,7 +141,7 @@
 					provider: 'weixin',
 					success: loginRes => {
 						if (postData.phone != '18888888888') postData['code'] = loginRes.code;
-						login(postData).then(this.successFunc)
+						login(postData).then(this.successFunc);
 					}
 				})
 				// #endif
@@ -165,11 +166,9 @@
 							uni.hideLoading();
 						}
 					})
-
 				} else {
 					uni.hideLoading();
 				}
-
 			}
 		}
 	}

virgo.wzfrontend/wx/request/api/project.js

@@ -7,33 +7,4 @@ import {
  * 
  * 
  */
-export function getProjectList() {
-	let promise = new Promise((result, rej) => {
-		request({
-			url: `/manager/userContext/allProject`,
-			method: 'get'
-		}).then(res => {
-			if (res.code === 200) {
-				if (res.data.length === 0) return result({
-					code: 200,
-					data: null,
-					message: null
-				})
-				request({
-					url: `/api/project/getIds`,
-					method: 'post',
-					data: res.data
-				}).then(node => {
-					result(node)
-				})
-			} else {
-				result({
-					code: 200,
-					data: null,
-					message: null
-				})
-			}
-		})
-	})
-	return promise
-}
+export function getProjectList() {}

virgo.wzfrontend/wx/request/request.js

@@ -11,12 +11,14 @@ export function request(options) {
 			data: options.data || {}, // 请求参数
 			header: header, // 设置请求的 header
 			success: (res) => {
-				// 请求成功
+				// 请求成功
+				console.log(res);
 				if (res.statusCode === 200) {
 					resolve(res.data);
 				} else {
 					// 可以根据项目要求修改错误处理
 					reject(res.data);
+					uni.hideLoading();
 				}
 			},
 			fail: (err) => {
@@ -26,6 +28,7 @@ export function request(options) {
 					icon: 'none'
 				})
 				reject(err);
+				uni.hideLoading();
 			},
 		});
 	});

virgo.wzfrontend/wx/unpackage/dist/dev/mp-weixin/common/main.js

@@ -31,7 +31,13 @@ _vue.default.prototype.$toast = function (msg) {
   });
 };
 _vue.default.prototype.$navigateTo = function (url) {
-  console.log(uni.getStorageSync('token'));
+  if (!uni.getStorageSync('token')) {
+    uni.showToast({
+      title: '您暂未登录，请先登录～',
+      icon: "none"
+    });
+    url = '/pages/login/login';
+  }
   uni.navigateTo({
     url: url
   });

virgo.wzfrontend/wx/unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -9572,11 +9572,13 @@ function request(options) {
       // 设置请求的 header
       success: function success(res) {
         // 请求成功
+        console.log(res);
         if (res.statusCode === 200) {
           resolve(res.data);
         } else {
           // 可以根据项目要求修改错误处理
           reject(res.data);
+          uni.hideLoading();
         }
       },
       fail: function fail(err) {
@@ -9586,6 +9588,7 @@ function request(options) {
           icon: 'none'
         });
         reject(err);
+        uni.hideLoading();
       }
     });
   });
@@ -11670,36 +11673,7 @@ var _request = __webpack_require__(/*! @/request/request.js */ 31);
  * 
  * 
  */
-function getProjectList() {
-  var promise = new Promise(function (result, rej) {
-    (0, _request.request)({
-      url: "/manager/userContext/allProject",
-      method: 'get'
-    }).then(function (res) {
-      if (res.code === 200) {
-        if (res.data.length === 0) return result({
-          code: 200,
-          data: null,
-          message: null
-        });
-        (0, _request.request)({
-          url: "/api/project/getIds",
-          method: 'post',
-          data: res.data
-        }).then(function (node) {
-          result(node);
-        });
-      } else {
-        result({
-          code: 200,
-          data: null,
-          message: null
-        });
-      }
-    });
-  });
-  return promise;
-}
+function getProjectList() {}
 
 /***/ }),
 /* 50 */,
@@ -21476,8 +21450,7 @@ var _default = {
   }, {
     "path": "pages/order/order",
     "style": {
-      "navigationBarTitleText": "工单",
-      "canvas": "2d"
+      "navigationBarTitleText": "工单"
     }
   }, {
     "path": "pages/my/my",

virgo.wzfrontend/wx/unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -187,12 +187,7 @@ var _default = {
     this.getHouseList();
   },
   methods: {
-    getAllProjectList: function getAllProjectList() {
-      (0, _project.getProjectList)().then(function (res) {
-        if (res.code == 200) {}
-        console.log(res);
-      });
-    },
+    getAllProjectList: function getAllProjectList() {},
     getHouseList: function getHouseList() {
       var _this = this;
       (0, _house.getHouseListByPage)({

virgo.wzfrontend/wx/unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -296,6 +296,7 @@ var _default = {
     },
     wxPhoneLogin: function wxPhoneLogin(e) {
       //微信手机号一键登录
+      if (!e.detail.code) return;
       this.login({
         pCode: e.detail.code
       });

virgo.wzfrontend/wx/unpackage/dist/dev/mp-weixin/pages/order/order.json

@@ -1,5 +1,4 @@
 {
   "navigationBarTitleText": "工单",
-  "canvas": "2d",
   "usingComponents": {}
 }