8a4eeec1 by simon

默认提交

1 parent ddde4ea3
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 "window": { 14 "window": {
15 "backgroundTextStyle": "light", 15 "backgroundTextStyle": "light",
16 "navigationBarBackgroundColor": "#fff", 16 "navigationBarBackgroundColor": "#fff",
17 "navigationBarTitleText": "家有儿孙", 17 "navigationBarTitleText": "组团拜年",
18 "navigationBarTextStyle": "black" 18 "navigationBarTextStyle": "black"
19 }, 19 },
20 "requiredBackgroundModes": ["audio"], 20 "requiredBackgroundModes": ["audio"],
......
...@@ -2,7 +2,7 @@ let ENV_CONFIG = require('./env/index'); ...@@ -2,7 +2,7 @@ let ENV_CONFIG = require('./env/index');
2 2
3 const APPID = '' 3 const APPID = ''
4 /** ====每次发布版本记得修改此环境配置==== */ 4 /** ====每次发布版本记得修改此环境配置==== */
5 const ENV = 'Dev'; // Dev Prod 5 const ENV = 'Prod'; // Dev Prod Slave NewYear
6 const NET_CONFIG = ENV_CONFIG[ENV]; 6 const NET_CONFIG = ENV_CONFIG[ENV];
7 const MOCKAPI = ENV_CONFIG.mockApi; 7 const MOCKAPI = ENV_CONFIG.mockApi;
8 8
......
...@@ -8,7 +8,12 @@ module.exports = { ...@@ -8,7 +8,12 @@ module.exports = {
8 baseApi: 'https://test-api.xxx.com' 8 baseApi: 'https://test-api.xxx.com'
9 }, 9 },
10 Slave: { 10 Slave: {
11 baseApi: 'https://slave-api.xxx.com' 11 baseApi: 'https://api.qi.kdao.xin/kd_jyes_api/minipro',
12 commonApi: 'https://api.k.wxpai.cn/bizproxy'
13 },
14 NewYear: {
15 baseApi: 'https://api.qi.kdao.xin/kd_jyes_api_v1/minipro',
16 commonApi: 'https://api.k.wxpai.cn/bizproxy'
12 }, 17 },
13 Prod: { 18 Prod: {
14 baseApi: 'https://api.qi.kdao.xin/kd_jyes_api/minipro', 19 baseApi: 'https://api.qi.kdao.xin/kd_jyes_api/minipro',
......
...@@ -29,7 +29,9 @@ Page({ ...@@ -29,7 +29,9 @@ Page({
29 content: "url", 29 content: "url",
30 }, 30 },
31 ], 31 ],
32 options: {} 32 options: {},
33 config: {},
34 NewYear: false
33 }, 35 },
34 onShareAppMessage(res) { 36 onShareAppMessage(res) {
35 if (res.from === 'button') { 37 if (res.from === 'button') {
...@@ -53,6 +55,13 @@ Page({ ...@@ -53,6 +55,13 @@ Page({
53 options 55 options
54 }) 56 })
55 this.initData(); 57 this.initData();
58 this.setData({
59 config: app.config,
60 ENV: app.config.ENV,
61 NewYear: app.config.ENV == "NewYear"
62 })
63 // console.log("config:", this.data.config);
64 // console.log("ENV:", this.data.ENV);
56 wx.aldstat.sendEvent('进入页面', { 65 wx.aldstat.sendEvent('进入页面', {
57 '页面名字': '首页' 66 '页面名字': '首页'
58 }); 67 });
......