diff --git a/ext.json b/ext.json new file mode 100644 index 0000000..d898f0b --- /dev/null +++ b/ext.json @@ -0,0 +1,82 @@ +{ + "extEnable": true, + "extAppid": "wxea71200db93d756b", + "ext": { + "weappId": "wxea71200db93d756b", + "name": "富茂客官开发", + "attr": { + "appFlag":"0", + "ifHaveCarModular":"1", + "configUrl":[ + { + "url01":"https://ciformall.youlane.cn/C/api" + }, + { + "url02": "https://ctest.malls.iformall.com/C/api" + }, + { + "url03": "https://c.malls.iformall.com/C/api" + } + ], + "passCarAppId": [ + {"releaseAppId":"wxc07f9d67923d676d"}, + {"developAppId":"wx192b7d2e8dcbefd0"} + ], + "passCarPath": [ + { + "haveCarModular": "pages/passCar/passCar" + }, + { + "nothaveCarModular": "pages/cartest/cartest" + } + ], + "passCarreturnUrl":[ + { + "returnUrl1": "https://ciformall.youlane.cn/api/carCallback/etcpPaidCallback" + }, + { + "returnUrl2": "https://c.malls.iformall.com/api/carCallback/etcpPaidCallback" + }, + { + "returnUrl3": "https://ctest.malls.iformall.com/api/carCallback/etcpPaidCallback" + } + ] + } + }, + "directCommit": false, + "tabBar": { + "color": "#9F9F9F", + "selectedColor": "#00C0FF", + "list": [ + { + "pagePath": "pages/login/index", + "iconPath": "assets/images/home-n.png", + "selectedIconPath": "assets/images/home-y.png", + "text": "首页" + }, + { + "pagePath": "pages/passCar/passCar", + "iconPath": "assets/images/pass1.png", + "selectedIconPath": "assets/images/pass0.png", + "text": "停车" + }, + { + "pagePath": "pages/user/index", + "iconPath": "assets/images/user-n.png", + "selectedIconPath": "assets/images/user-y.png", + "text": "我的" + } + ] + }, + "window": { + "backgroundTextStyle": "dark", + "navigationBarBackgroundColor": "#02C0FF", + "navigationBarTitleText": "WeChat", + "navigationBarTextStyle": "white" + }, + "networkTimeout": { + "request": 30000, + "downloadFile": 10000 + }, + "debug": false +} \ No newline at end of file diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 8b13789..e69de29 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1 +0,0 @@ - diff --git a/pages/login/index.js b/pages/login/index.js index 7316359..d6f648f 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -160,11 +160,11 @@ Page({ played: true }) } - if (optionss.couponChannelId && optionss.couponId || optionss.orderId) { - that.userLogin(optionss.couponChannelId, optionss.couponId, optionss.orderId); - } else { - that.userLogin() - } + // if (optionss.couponChannelId && optionss.couponId || optionss.orderId) { + // that.userLogin(optionss.couponChannelId, optionss.couponId, optionss.orderId); + // } else { + // that.userLogin() + // } }, onShow: function() { this.setData({