Merge branch 'master' of http://47.104.201.229/iambtr/bms

config/index.js

@@ -3,7 +3,7 @@ const type = 'dev'
 var config = {
   dev: {
     
-    appid: 'wxb517dae1188a1900',
+    appid: 'wxed819cb57829a51c',
     api: 'http://47.92.207.93:8084/app/',
     wss: 'wss://app.doomore.cn/websocket/app/api/',
     payapi: 'http://47.92.207.93:8084/pay/',
@@ -12,7 +12,7 @@ var config = {
     imgPath: '/static/image/'
   },
   pro: {
-    appid: 'wxb517dae1188a1900',
+    appid: 'wxed819cb57829a51c',
     api: 'https://guangyang.zhuzhux.com/app/',
     wss: 'wss://guangyang.zhuzhux.com/websocket/app/api/',
     payapi: 'https://guangyang.zhuzhux.com/pay/',

project.config.json

@@ -18,8 +18,8 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.9.4",
-	"appid": "wxb517dae1188a1900",
-	"projectname": "%E9%87%91%E7%9B%BE%E9%94%82%E7%94%B5%E5%8D%AB%E5%A3%AB",
+	"appid": "wxed819cb57829a51c",
+	"projectname": "GPS网络能源",
 	"simulatorType": "wechat",
 	"simulatorPluginLibVersion": {},
 	"condition": {