diff --git a/config/config.js b/config/config.js index 006b46a..98502ba 100755 --- a/config/config.js +++ b/config/config.js @@ -1,9 +1,9 @@ var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}; var appId = extConfig.appId; 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://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.30.172:7000/C/api', api: { @@ -199,7 +199,7 @@ var config = { }, weapp: { - AppId: "wxea71200db93d756b" + AppId: "wx649b3be73c1afe47" }, ErrorCode: { diff --git a/pages/ConsumeDetail/ConsumeDetail.js b/pages/ConsumeDetail/ConsumeDetail.js index f6a56e0..0351cbb 100644 --- a/pages/ConsumeDetail/ConsumeDetail.js +++ b/pages/ConsumeDetail/ConsumeDetail.js @@ -63,7 +63,6 @@ Page({ // 点击查看更多 more: function() { let that = this; - if (that.data.height == 'auto') { this.setData({ hidden: "hidden", @@ -71,14 +70,15 @@ Page({ more: "点击查看更多", 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) { let that = this; diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss index b1487be..a3ca89d 100644 --- a/pages/order/detail/index.wxss +++ b/pages/order/detail/index.wxss @@ -6,6 +6,7 @@ page { .order { width: 100%; + padding-bottom: 160rpx; } .success { @@ -377,11 +378,13 @@ radio { .buy-view { background: #fff; position: fixed; - padding-top: 10rpx; + padding-top: 30rpx; height: 94rpx; - bottom: 30rpx; + bottom: 0; left: 0; right: 0; + z-index: 100; + padding-bottom: 30rpx; } .buy { diff --git a/project.config.json b/project.config.json index 4e30ca0..2970aaf 100644 --- a/project.config.json +++ b/project.config.json @@ -13,7 +13,7 @@ }, "compileType": "miniprogram", "libVersion": "2.0.9", - "appid": "wxea71200db93d756b", + "appid": "wx649b3be73c1afe47", "projectname": "C", "isGameTourist": false, "condition": {