wangyu / naturalPersonTax · 提交

提交 919de91b9eb04ff9d012006349d7eb59912aa94b

作者 wangyu
1 个父辈 cebb43c1
构建： 未知

修改merge中的错误

内嵌 并排对比
正在显示 6 个修改的文件 包含 12 行增加 和 13 行删除
1 //app.js 1 //app.js
2 -const appId = 'wx04262fa98a7de5b6'; 2 +const appId = 'wxe91c67adba6ac02d';
  3 +
3 App({ 4 App({
4 onLaunch: function() { 5 onLaunch: function() {
5 var that = this; 6 var that = this;
@@ -143,13 +144,14 @@ App({ @@ -143,13 +144,14 @@ App({
143 appId: appId, 144 appId: appId,
144 com_id: "", 145 com_id: "",
145 onshow_count: 0, 146 onshow_count: 0,
  147 + refresh_complete: false,
146 // baseUrl: "http://47.99.47.16:20000/", 148 // baseUrl: "http://47.99.47.16:20000/",
147 // baseUrl: "http://47.96.75.229:20000/", 149 // baseUrl: "http://47.96.75.229:20000/",
148 // baseUrl: "http://192.144.144.220:20000/", 150 // baseUrl: "http://192.144.144.220:20000/",
149 // baseUrl: "http://154.8.229.55:20000/", 151 // baseUrl: "http://154.8.229.55:20000/",
150 // baseUrl: "http://47.110.250.177:20000/", 152 // baseUrl: "http://47.110.250.177:20000/",
151 // baseUrl: "http://47.110.158.110:20000/", 153 // baseUrl: "http://47.110.158.110:20000/",
152 - baseUrl: "https://api.fjhxrl.com/", 154 + baseUrl: "https://api.workai.com.cn/",
153 OSSUrl: "", //"https://oss.workai.com.cn/", 155 OSSUrl: "", //"https://oss.workai.com.cn/",
154 userInfo: null, 156 userInfo: null,
155 hostInfo:null, 157 hostInfo:null,
1 { 1 {
2 - "navigationBarTitleText": "海峡易税", 2 + "navigationBarTitleText": "自然人税收",
3 "disableScroll" : true, 3 "disableScroll" : true,
4 "navigationBarBackgroundColor": "#4478e3" 4 "navigationBarBackgroundColor": "#4478e3"
5 5
1 { 1 {
2 - "navigationBarTitleText": "海峡易税", 2 + "navigationBarTitleText": "自然人税收",
3 "disableScroll": true, 3 "disableScroll": true,
4 "navigationBarBackgroundColor": "#4478e3" 4 "navigationBarBackgroundColor": "#4478e3"
5 } 5 }
1 { 1 {
2 - "navigationBarTitleText": "海峡易税", 2 + "navigationBarTitleText": "自然人税收",
3 "navigationBarTextStyle": "black", 3 "navigationBarTextStyle": "black",
4 "navigationBarBackgroundColor": "#FFFFFF" 4 "navigationBarBackgroundColor": "#FFFFFF"
5 } 5 }
1 { 1 {
2 - "navigationBarTitleText": "海峡易税" 2 + "navigationBarTitleText": "自然人税收"
3 } 3 }
@@ -4,19 +4,16 @@ @@ -4,19 +4,16 @@
4 "ignore": [] 4 "ignore": []
5 }, 5 },
6 "setting": { 6 "setting": {
7 - "urlCheck": true, 7 + "urlCheck": false,
8 "es6": true, 8 "es6": true,
9 "postcss": true, 9 "postcss": true,
10 "minified": true, 10 "minified": true,
11 "newFeature": true 11 "newFeature": true
12 }, 12 },
13 "compileType": "miniprogram", 13 "compileType": "miniprogram",
14 - "libVersion": "2.4.2",  
15 - "appid": "wx04262fa98a7de5b6",  
16 - "projectname": "%E6%B5%B7%E5%B3%A1%E8%87%AA%E7%84%B6%E4%BA%BA",  
17 - "debugOptions": {  
18 - "hidedInDevtools": []  
19 - }, 14 + "libVersion": "2.2.2",
  15 + "appid": "wxe91c67adba6ac02d",
  16 + "projectname": "%E8%87%AA%E7%84%B6%E4%BA%BA%E7%A8%8E%E6%94%B6",
20 "isGameTourist": false, 17 "isGameTourist": false,
21 "condition": { 18 "condition": {
22 "search": { 19 "search": {
请 注册 或 登录 后发表评论