| @@ -1,8 +1,8 @@ | |||||
| var config = { | var config = { | ||||
| // url: "http://10.11.205.51:7000/C/api", | // url: "http://10.11.205.51:7000/C/api", | ||||
| // url: "https://ciformall.youlane.cn/C/api", | // url: "https://ciformall.youlane.cn/C/api", | ||||
| // url:"https://c.malls.iformall.com/C/api", | |||||
| url: "http://81be62f2.ngrok.io/C/api", | |||||
| url:"https://c.malls.iformall.com/C/api", | |||||
| // url: "http://81be62f2.ngrok.io/C/api", | |||||
| api: { | api: { | ||||
| /** | /** | ||||
| * 接口用途:login | * 接口用途:login | ||||
| @@ -62,8 +62,6 @@ Page({ | |||||
| setTimeout(function () { | setTimeout(function () { | ||||
| wx.hideLoading(); | wx.hideLoading(); | ||||
| }, 1500); | }, 1500); | ||||
| // that.data.setInter = setInterval(function() { | |||||
| Http.get({ | Http.get({ | ||||
| url: config.api.orderDetail, | url: config.api.orderDetail, | ||||
| data: { | data: { | ||||
| @@ -83,8 +81,6 @@ Page({ | |||||
| createDate: createDate | createDate: createDate | ||||
| }); | }); | ||||
| }); | }); | ||||
| // }, 100); | |||||
| }, | }, | ||||
| /** | /** | ||||
| @@ -165,7 +161,7 @@ Page({ | |||||
| wx.hideLoading(); | wx.hideLoading(); | ||||
| }, 1600); | }, 1600); | ||||
| setTimeout(() => { | setTimeout(() => { | ||||
| wx.navigateTo({ | |||||
| wx.redirectTo({ | |||||
| url: `/pages/order/detail/index?orderId=${orderId}` | url: `/pages/order/detail/index?orderId=${orderId}` | ||||
| }); | }); | ||||
| }, 1600); | }, 1600); | ||||
| @@ -102,8 +102,6 @@ Page({ | |||||
| // createDate: util.formatTime(that.data.list[i].createDate, "201y-M-d h:m:s") | // createDate: util.formatTime(that.data.list[i].createDate, "201y-M-d h:m:s") | ||||
| // }) | // }) | ||||
| // } | // } | ||||
| for (let i = 0; i < that.data.list.length; i++) { | for (let i = 0; i < that.data.list.length; i++) { | ||||
| var createDate1 = util.formatTime(that.data.list[i].createDate, "yyyy-MM-dd hh:mm:ss"); | var createDate1 = util.formatTime(that.data.list[i].createDate, "yyyy-MM-dd hh:mm:ss"); | ||||
| /** | /** | ||||
| @@ -147,6 +145,9 @@ Page({ | |||||
| page: 1 | page: 1 | ||||
| }) | }) | ||||
| this.getList(detail.key, 1); | this.getList(detail.key, 1); | ||||
| }, | |||||
| onShow(){ | |||||
| }, | }, | ||||
| onReachBottom: function () { | onReachBottom: function () { | ||||
| var that = this; | var that = this; | ||||
| @@ -69,7 +69,7 @@ | |||||
| <view class="margin"></view> | <view class="margin"></view> | ||||
| <!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | <!-- <button bindtap="navigateTo" class="user-out-btn">退出登陆</button> --> | ||||
| <view bindlongtap='showVersion' class='version'> | <view bindlongtap='showVersion' class='version'> | ||||
| <view wx:if="{{flag=='show'}}">版本号:2.2.52</view> | |||||
| <view wx:if="{{flag=='show'}}">版本号:2.2.6</view> | |||||
| <view wx:if="{{flag=='hidden'}}"></view> | <view wx:if="{{flag=='hidden'}}"></view> | ||||
| </view> | </view> | ||||
| </view> | </view> | ||||