2

app.js

@@ -1,5 +1,5 @@
 // app.js
-var projectMode = 0;//0代表开发模式（本地环境），1代表测试模式（线上测试环境）,2代表线上模式（正式运行环境）
+var projectMode = 1;//0代表开发模式（本地环境），1代表测试模式（线上测试环境）,2代表线上模式（正式运行环境）
 var info = wx.getSystemInfoSync();
 console.log(info);
 if (info.platform != "devtools" && projectMode == 0) { projectMode = 1 }
@@ -23,7 +23,7 @@ App({
     userInfo: null,
     btnInfo: null,
     status: ['可下单', '服务中', '已满柜', '暂停服务'],
-    baseAppUrl: projectMode == 2 ? 'https://hx.xishuashua.art/' : (projectMode == 1 ? 'https://hx.xishuashua.art/' : 'https://wash.nanodreamtech.com/'),
+    baseAppUrl: projectMode == 2 ? 'https://hx.xishuashua.art/' : (projectMode == 1 ? 'https://wash.nanodreamtech.com/' : 'https://wash.nanodreamtech.com/'),
     location: "",
     islocation: true
   },

pages/login/login.js

@@ -90,13 +90,13 @@ Page({
             appid: wx.getAccountInfoSync().miniProgram.appId
           }, "post").then(function (res) {
             wx.showLoading({
-              title: '登录中',
+              title: '登录中....',
             })
             console.log(res);
             if (res.code != 200) {
            
                 wx.showLoading({
-                    title: '登录失败',
+                    title: res.message.msg,
                   })
                   setTimeout(function () {
                     wx.hideLoading();

project.config.json

@@ -3,8 +3,8 @@
     "packOptions": {
         "ignore": [
             {
-                "value": ".eslintrc.js",
-                "type": "file"
+                "type": "file",
+                "value": ".eslintrc.js"
             }
         ]
     },
@@ -52,48 +52,36 @@
         "useCompilerPlugins": false
     },
     "compileType": "miniprogram",
-    "libVersion": "2.21.4",
-    "appid": "wx96efd334b6da6e38",
-    "projectname": "%E6%B5%B7%E6%98%9F%E7%94%A8%E6%88%B7%E7%AB%AF",
-    "cloudfunctionTemplateRoot": "",
-    "watchOptions": {
-        "ignore": []
-    },
+    "libVersion": "2.22.0",
+    "appid": "wx0b37183822da9c21",
+    "projectname": "%E6%B5%B7%E6%98%9F%E5%88%86%E6%8B%A3%E7%AB%AF",
     "debugOptions": {
         "hidedInDevtools": []
     },
     "scripts": {},
+    "staticServerOptions": {
+        "baseURL": "",
+        "servePath": ""
+    },
+    "isGameTourist": false,
     "condition": {
-        "plugin": {
+        "search": {
+            "list": []
+        },
+        "conversation": {
             "list": []
         },
         "game": {
             "list": []
         },
+        "plugin": {
+            "list": []
+        },
         "gamePlugin": {
             "list": []
         },
         "miniprogram": {
-            "list": [
-                {
-                    "name": "",
-                    "pathName": "pages/tabber/order/index",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/control/result/result",
-                    "query": "",
-                    "scene": null
-                },
-                {
-                    "name": "",
-                    "pathName": "pages/sorting/enter/enter",
-                    "query": "",
-                    "scene": null
-                }
-            ]
+            "list": []
         }
     }
 }