修改merge中的错误

 //app.js
-const appId = 'wx04262fa98a7de5b6';
+const appId = 'wxe91c67adba6ac02d';
+
 App({
   onLaunch: function() {
     var that = this;
@@ -143,13 +144,14 @@ App({
     appId: appId,
     com_id: "",
     onshow_count: 0,
+    refresh_complete: false,
     // baseUrl: "http://47.99.47.16:20000/",
     // baseUrl: "http://47.96.75.229:20000/",
     // baseUrl: "http://192.144.144.220:20000/",
     // baseUrl: "http://154.8.229.55:20000/",
     // baseUrl: "http://47.110.250.177:20000/",
     // baseUrl: "http://47.110.158.110:20000/",
-    baseUrl: "https://api.fjhxrl.com/",
+    baseUrl: "https://api.workai.com.cn/",
     OSSUrl: "", //"https://oss.workai.com.cn/",
     userInfo: null,
     hostInfo:null,

 {
-  "navigationBarTitleText": "海峡易税",
+  "navigationBarTitleText": "自然人税收",
   "disableScroll" : true,
   "navigationBarBackgroundColor": "#4478e3"
       

 {
-  "navigationBarTitleText": "海峡易税",
+  "navigationBarTitleText": "自然人税收",
   "disableScroll": true,
   "navigationBarBackgroundColor": "#4478e3"
 }
\ No newline at end of file

 {
-  "navigationBarTitleText": "海峡易税",
+  "navigationBarTitleText": "自然人税收",
   "navigationBarTextStyle": "black",
   "navigationBarBackgroundColor": "#FFFFFF"
 }
\ No newline at end of file

 {
-  "navigationBarTitleText": "海峡易税"
+  "navigationBarTitleText": "自然人税收"
 }
\ No newline at end of file

@@ -4,19 +4,16 @@
 		"ignore": []
 	},
 	"setting": {
-		"urlCheck": true,
+		"urlCheck": false,
 		"es6": true,
 		"postcss": true,
 		"minified": true,
 		"newFeature": true
 	},
 	"compileType": "miniprogram",
-	"libVersion": "2.4.2",
-	"appid": "wx04262fa98a7de5b6",
-	"projectname": "%E6%B5%B7%E5%B3%A1%E8%87%AA%E7%84%B6%E4%BA%BA",
-	"debugOptions": {
-		"hidedInDevtools": []
-	},
+  "libVersion": "2.2.2",
+  "appid": "wxe91c67adba6ac02d",
+  "projectname": "%E8%87%AA%E7%84%B6%E4%BA%BA%E7%A8%8E%E6%94%B6",
 	"isGameTourist": false,
 	"condition": {
 		"search": {