| @@ -1,9 +1,9 @@ | |||||
| var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}; | var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}; | ||||
| var appId = extConfig.appId; | var appId = extConfig.appId; | ||||
| var config = { | var config = { | ||||
| url: "https://ciformall.youlane.cn/C/api", | |||||
| // url: "https://ciformall.youlane.cn/C/api", | |||||
| // url:"https://c.malls.iformall.com/C/api", | // url:"https://c.malls.iformall.com/C/api", | ||||
| // url:'https://ctest.malls.iformall.com/C/api', | |||||
| url:'https://ctest.malls.iformall.com/C/api', | |||||
| // url:'http://10.100.33.68:7000/C/api', | // url:'http://10.100.33.68:7000/C/api', | ||||
| // url: 'http://10.100.30.172:7000/C/api', | // url: 'http://10.100.30.172:7000/C/api', | ||||
| api: { | api: { | ||||
| @@ -199,7 +199,7 @@ var config = { | |||||
| }, | }, | ||||
| weapp: { | weapp: { | ||||
| AppId: "wxea71200db93d756b" | |||||
| AppId: "wx649b3be73c1afe47" | |||||
| }, | }, | ||||
| ErrorCode: { | ErrorCode: { | ||||
| @@ -63,7 +63,6 @@ Page({ | |||||
| // 点击查看更多 | // 点击查看更多 | ||||
| more: function() { | more: function() { | ||||
| let that = this; | let that = this; | ||||
| if (that.data.height == 'auto') { | if (that.data.height == 'auto') { | ||||
| this.setData({ | this.setData({ | ||||
| hidden: "hidden", | hidden: "hidden", | ||||
| @@ -71,14 +70,15 @@ Page({ | |||||
| more: "点击查看更多", | more: "点击查看更多", | ||||
| showMore: true | showMore: true | ||||
| }) | }) | ||||
| } else { | |||||
| this.setData({ | |||||
| hidden: "", | |||||
| height: that.data.cardDetail.merchantVoList.length * 140 + 'rpx', | |||||
| more: "", | |||||
| showMore: false | |||||
| }) | |||||
| } | |||||
| } | |||||
| // else { | |||||
| // this.setData({ | |||||
| // hidden: "", | |||||
| // height: that.data.cardDetail.merchantVoList.length * 140 + 'rpx', | |||||
| // more: "点击查看更多", | |||||
| // showMore: false | |||||
| // }) | |||||
| // } | |||||
| }, | }, | ||||
| onLoad(options) { | onLoad(options) { | ||||
| let that = this; | let that = this; | ||||
| @@ -6,6 +6,7 @@ page { | |||||
| .order { | .order { | ||||
| width: 100%; | width: 100%; | ||||
| padding-bottom: 160rpx; | |||||
| } | } | ||||
| .success { | .success { | ||||
| @@ -377,11 +378,13 @@ radio { | |||||
| .buy-view { | .buy-view { | ||||
| background: #fff; | background: #fff; | ||||
| position: fixed; | position: fixed; | ||||
| padding-top: 10rpx; | |||||
| padding-top: 30rpx; | |||||
| height: 94rpx; | height: 94rpx; | ||||
| bottom: 30rpx; | |||||
| bottom: 0; | |||||
| left: 0; | left: 0; | ||||
| right: 0; | right: 0; | ||||
| z-index: 100; | |||||
| padding-bottom: 30rpx; | |||||
| } | } | ||||
| .buy { | .buy { | ||||
| @@ -13,7 +13,7 @@ | |||||
| }, | }, | ||||
| "compileType": "miniprogram", | "compileType": "miniprogram", | ||||
| "libVersion": "2.0.9", | "libVersion": "2.0.9", | ||||
| "appid": "wxea71200db93d756b", | |||||
| "appid": "wx649b3be73c1afe47", | |||||
| "projectname": "C", | "projectname": "C", | ||||
| "isGameTourist": false, | "isGameTourist": false, | ||||
| "condition": { | "condition": { | ||||