代码提交

.hbuilderx/launch.json

@@ -4,27 +4,28 @@
     "version" : "0.0",
     "configurations" : [
         {
-        	"app-plus" : 
-        	{
-        		"launchtype" : "remote"
-        	},
-        	"default" : 
-        	{
-        		"launchtype" : "remote"
-        	},
-        	"h5" : 
-        	{
-        		"launchtype" : "remote"
-        	},
-        	"mp-weixin" : 
-        	{
-        		"launchtype" : "remote"
-        	},
-        	"type" : "uniCloud"
+            "app-plus" : {
+                "launchtype" : "remote"
+            },
+            "default" : {
+                "launchtype" : "remote"
+            },
+            "h5" : {
+                "launchtype" : "remote"
+            },
+            "mp-weixin" : {
+                "launchtype" : "remote"
+            },
+            "type" : "uniCloud"
         },
         {
+            "openVueDevtools" : true,
             "playground" : "custom",
             "type" : "uni-app:app-android"
+        },
+        {
+            "openVueDevtools" : true,
+            "type" : "uni-app:app-ios"
         }
     ]
 }

libs/login.js

@@ -55,13 +55,19 @@ export function _toLogin(push, pathLogin) {
 	console.log(333,login_back_url)
 
 	if (['pages/user/index','/pages/user/index'].indexOf(login_back_url) === -1) {
-		// #ifdef APP-PLUS || APP ||MP
+		// #ifdef MP
 		console.log(444)
 		uni.navigateTo({
-		  // url: '/pages/users/wechat_login/index'
+		  url: '/pages/users/wechat_login/index'
 		  // url: '/pages/users/login/index'
 		})
 		// #endif
+
+		// #ifdef APP-PLUS || APP
+		uni.navigateTo({
+		  url: '/pages/users/login/index'
+		})
+		// #endif
 	}
 }
 

manifest.json

@@ -61,7 +61,10 @@
             },
             "icons" : {}
         },
-        "nvueLaunchMode" : ""
+        "nvueLaunchMode" : "",
+        "uniStatistics" : {
+            "enable" : true
+        }
     },
     /* 快应用特有相关 */
     "quickapp" : {},

mixins/SendVerifyCode.js

@@ -7,6 +7,7 @@ export default {
   },
   methods: {
     sendCode() {
+		console.log('走到这')
       if (this.disabled) return;
       this.disabled = true;
       let n = 60;

package-lock.json

@@ -8,7 +8,8 @@
         "@amap/amap-jsapi-loader": "^1.0.1",
         "@vant/weapp": "^1.11.6",
         "uview-ui": "^1.8.8",
-        "vant": "^2.13.2"
+        "vant": "^2.13.2",
+        "vconsole": "^3.15.1"
       },
       "devDependencies": {
         "sass-loader": "^14.2.1"
@@ -168,6 +169,27 @@
       "integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA==",
       "peer": true
     },
+    "node_modules/copy-text-to-clipboard": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/copy-text-to-clipboard/-/copy-text-to-clipboard-3.2.0.tgz",
+      "integrity": "sha512-RnJFp1XR/LOBDckxTib5Qjr/PMfkatD0MUCQgdpqS8MdKiNUzBjAQBEN6oUy+jW7LI93BBG3DtMB2KOOKpGs2Q==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/core-js": {
+      "version": "3.37.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.37.1.tgz",
+      "integrity": "sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==",
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
     "node_modules/csstype": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
@@ -201,6 +223,11 @@
         "@jridgewell/sourcemap-codec": "^1.4.15"
       }
     },
+    "node_modules/mutation-observer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/mutation-observer/-/mutation-observer-1.0.3.tgz",
+      "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA=="
+    },
     "node_modules/nanoid": {
       "version": "3.3.7",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
@@ -503,6 +530,16 @@
       "integrity": "sha512-Yp3wtJk//8cO4NItOPpi3QkLExAr/aLBGZMmTtW9WpdwBCJpRM6zj9WgWktXAl8IDIozwNMByT45JP3tO3ACWA==",
       "peer": true
     },
+    "copy-text-to-clipboard": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/copy-text-to-clipboard/-/copy-text-to-clipboard-3.2.0.tgz",
+      "integrity": "sha512-RnJFp1XR/LOBDckxTib5Qjr/PMfkatD0MUCQgdpqS8MdKiNUzBjAQBEN6oUy+jW7LI93BBG3DtMB2KOOKpGs2Q=="
+    },
+    "core-js": {
+      "version": "3.37.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.37.1.tgz",
+      "integrity": "sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw=="
+    },
     "csstype": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
@@ -530,6 +567,11 @@
         "@jridgewell/sourcemap-codec": "^1.4.15"
       }
     },
+    "mutation-observer": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/mutation-observer/-/mutation-observer-1.0.3.tgz",
+      "integrity": "sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA=="
+    },
     "nanoid": {
       "version": "3.3.7",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
@@ -596,6 +638,17 @@
         "vue-lazyload": "1.2.3"
       }
     },
+    "vconsole": {
+      "version": "3.15.1",
+      "resolved": "https://registry.npmjs.org/vconsole/-/vconsole-3.15.1.tgz",
+      "integrity": "sha512-KH8XLdrq9T5YHJO/ixrjivHfmF2PC2CdVoK6RWZB4yftMykYIaXY1mxZYAic70vADM54kpMQF+dYmvl5NRNy1g==",
+      "requires": {
+        "@babel/runtime": "^7.17.2",
+        "copy-text-to-clipboard": "^3.0.1",
+        "core-js": "^3.11.0",
+        "mutation-observer": "^1.0.3"
+      }
+    },
     "vue": {
       "version": "3.4.31",
       "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.31.tgz",

package.json

@@ -3,7 +3,8 @@
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@vant/weapp": "^1.11.6",
     "uview-ui": "^1.8.8",
-    "vant": "^2.13.2"
+    "vant": "^2.13.2",
+    "vconsole": "^3.15.1"
   },
   "devDependencies": {
     "sass-loader": "^14.2.1"

pages/index/index.vue

@@ -346,11 +346,11 @@
 			goEquList() {
 				console.log('走到这')
 				// 记得放开
-				// if (!this.isLogin) {
-				// 	console.log('进来了')
-				// 	toLogin();
-				// 	return
-				// }
+				if (!this.isLogin) {
+					console.log('进来了')
+					toLogin();
+					return
+				}
 				console.log('点击了')
 				uni.navigateTo({
 					url: '/pages/equ_list/index',

pages/users/login/index.vue

@@ -255,7 +255,7 @@
         socialCode = await Routine.getCode();
         socialState = 'default'
         // #endif
-
+		console.log('走到这')
         // 2. 短信登录
 				AuthApi.smsLogin({
           mobile: this.account,
@@ -287,7 +287,7 @@
           return this.$util.Tips({
             title: '请输入正确的手机号码'
           });
-        }
+        }		
 				await AuthApi.sendSmsCode(this.account, 1)
 					.then(res => {
             this.$util.Tips({title:res.message});