| @@ -4,9 +4,8 @@ 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.30.173: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: { | ||||
| /** | /** | ||||
| * 接口用途:login | * 接口用途:login | ||||
| @@ -374,6 +374,10 @@ Page({ | |||||
| }) | }) | ||||
| .catch(err => { | .catch(err => { | ||||
| console.log(err); | console.log(err); | ||||
| that.setData({ | |||||
| showbutton: false, | |||||
| showbutton1:false | |||||
| }) | |||||
| if (err.code == 2011) { | if (err.code == 2011) { | ||||
| wx.showToast({ | wx.showToast({ | ||||
| title: "商户信息没找到", | title: "商户信息没找到", | ||||
| @@ -503,6 +503,6 @@ page { | |||||
| font-size: 30rpx; | font-size: 30rpx; | ||||
| color: #fff; | color: #fff; | ||||
| line-height: 95rpx; | line-height: 95rpx; | ||||
| background:linear-gradient(90deg,rgba(236,59,45,1) 0%,rgba(248,98,52,1) 100%); | |||||
| background:rgba(236,59,45,1); | |||||
| box-shadow:0px 8px 8px 1px rgba(246,93,51,0.32); | box-shadow:0px 8px 8px 1px rgba(246,93,51,0.32); | ||||
| } | } | ||||
| @@ -21,7 +21,7 @@ | |||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||
| <!-- <view class='none' wx:if="{{item.discount/10==10&&discountMerchantList.length>0}}"> | |||||
| <view class='none' wx:if="{{discountMerchantList.length==0}}"> | |||||
| 暂无数据 | 暂无数据 | ||||
| </view> --> | |||||
| </view> | |||||
| </view> | </view> | ||||