| @@ -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://202.165.179.86:4000/C/api', | // url: 'http://202.165.179.86:4000/C/api', | ||||
| api: { | api: { | ||||
| @@ -203,7 +203,7 @@ var config = { | |||||
| }, | }, | ||||
| weapp: { | weapp: { | ||||
| AppId: "wxea71200db93d756b" | |||||
| AppId: "wx649b3be73c1afe47" | |||||
| }, | }, | ||||
| ErrorCode: { | ErrorCode: { | ||||
| @@ -20,7 +20,8 @@ | |||||
| <view class='clearfix' data-id='{{item.id}}' bindtap='gotoConsumeDetail' data-id='{{item.id}}'> | <view class='clearfix' data-id='{{item.id}}' bindtap='gotoConsumeDetail' data-id='{{item.id}}'> | ||||
| <view class='title fl'> | <view class='title fl'> | ||||
| <text class='yue'><text class='yu'>余</text>{{item.remainingAmount/100}}<text class='yu'>元</text></text> | <text class='yue'><text class='yu'>余</text>{{item.remainingAmount/100}}<text class='yu'>元</text></text> | ||||
| <text class="txt2">{{item.expiredTime}}到期</text> | |||||
| <text class="txt2" style='margin-top:9rpx!important;' wx:if="{{item.couponOrderStatus == 5 || item.couponOrderStatus == 6 || item.couponOrderStatus == 7}}">{{item.expiredTime}}到期</text> | |||||
| <text class="txt2" wx:if="{{item.couponOrderStatus == 4}}">{{item.expiredTime}}到期</text> | |||||
| </view> | </view> | ||||
| <view class='expiretime fr'> | <view class='expiretime fr'> | ||||
| <text>{{item.title}}</text> | <text>{{item.title}}</text> | ||||
| @@ -216,10 +216,10 @@ | |||||
| font-size: 24rpx; | font-size: 24rpx; | ||||
| margin-left: 25rpx; | margin-left: 25rpx; | ||||
| text-align: left; | text-align: left; | ||||
| margin-top: 36rpx; | |||||
| } | } | ||||
| .txt2{ | .txt2{ | ||||
| opacity:0.5; | opacity:0.5; | ||||
| margin-top: 36rpx; | |||||
| } | } | ||||
| .imgicon { | .imgicon { | ||||
| position: absolute; | position: absolute; | ||||
| @@ -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": { | ||||