bug修复

manifest.json

@@ -83,7 +83,7 @@
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
-                "desc" : "1111111"
+                "desc" : "获取用户头像昵称"
             }
         },
         "optimization" : {

static/util/api.js

 const erp = erp || {}; //wxb21370ac25ee51b0,//wx45bb68de16ddddb7
 // const DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜
-const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
+// const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
 // const DOMAIN = 'http://192.168.1.178:9099/' // 国禄 
 // const DOMAIN = 'http://192.168.1.197:9099/' // 志就
-// const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
+const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
 const HOST = DOMAIN + 'api/'
 
 erp.login = HOST + 'loginAndRegister/login' // 登录

unpackage/dist/build/mp-weixin/app.json

@@ -153,7 +153,11 @@
   },
   "permission": {
     "scope.userLocation": {
+<<<<<<< HEAD
       "desc": "1111111"
+=======
+      "desc": "获取用户头像昵称"
+>>>>>>> cfd4269be7156bb981ee9cc6926c67c09a7814af
     }
   },
   "usingComponents": {

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

@@ -6,12 +6,42 @@
   "setting": {
     "urlCheck": false,
     "es6": true,
+    "enhance": false,
     "postcss": true,
-    "minified": true
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": false,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "enableEngineNative": false,
+    "bundle": false,
+    "useIsolateContext": true,
+    "useCompilerModule": true,
+    "userConfirmedUseCompilerModuleSwitch": false,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true
   },
   "compileType": "miniprogram",
   "libVersion": "",
-  "appid": "wx45bb68de16ddddb7",
+  "appid": "wxb21370ac25ee51b0",
   "projectname": "gangshi",
   "condition": {
     "search": {

unpackage/dist/build/mp-weixin/static/util/api.js

 const erp = erp || {}; //wxb21370ac25ee51b0,//wx45bb68de16ddddb7
 // const DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜
-const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
+// const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
 // const DOMAIN = 'http://192.168.1.178:9099/' // 国禄 
 // const DOMAIN = 'http://192.168.1.197:9099/' // 志就
-// const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
+const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
 const HOST = DOMAIN + 'api/'
 
 erp.login = HOST + 'loginAndRegister/login' // 登录