From 258c665f188e22467802433c08483bd9f14028e1 Mon Sep 17 00:00:00 2001
From: meo <18801474720@163.com>
Date: Thu, 1 Nov 2018 17:17:27 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E6=83=A0=E5=88=B8][=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9]:0=E5=85=83=E5=88=B8=EF=BC=8C=E9=A2=86=E5=8F=96?=
=?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/config.js | 4 ++--
pages/order/detail/index.js | 6 +-----
pages/order/index/index.js | 5 +++--
pages/user/index.wxml | 2 +-
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/config/config.js b/config/config.js
index ed3d2c8..3bb0ea0 100755
--- a/config/config.js
+++ b/config/config.js
@@ -1,8 +1,8 @@
var config = {
// url: "http://10.11.205.51:7000/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: {
/**
* 接口用途:login
diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js
index cc73ca9..8c7effa 100644
--- a/pages/order/detail/index.js
+++ b/pages/order/detail/index.js
@@ -62,8 +62,6 @@ Page({
setTimeout(function () {
wx.hideLoading();
}, 1500);
- // that.data.setInter = setInterval(function() {
-
Http.get({
url: config.api.orderDetail,
data: {
@@ -83,8 +81,6 @@ Page({
createDate: createDate
});
});
-
- // }, 100);
},
/**
@@ -165,7 +161,7 @@ Page({
wx.hideLoading();
}, 1600);
setTimeout(() => {
- wx.navigateTo({
+ wx.redirectTo({
url: `/pages/order/detail/index?orderId=${orderId}`
});
}, 1600);
diff --git a/pages/order/index/index.js b/pages/order/index/index.js
index 328e592..c4b4b8a 100644
--- a/pages/order/index/index.js
+++ b/pages/order/index/index.js
@@ -102,8 +102,6 @@ Page({
// createDate: util.formatTime(that.data.list[i].createDate, "201y-M-d h:m:s")
// })
// }
-
-
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");
/**
@@ -147,6 +145,9 @@ Page({
page: 1
})
this.getList(detail.key, 1);
+ },
+ onShow(){
+
},
onReachBottom: function () {
var that = this;
diff --git a/pages/user/index.wxml b/pages/user/index.wxml
index f4b9442..c2a3b45 100644
--- a/pages/user/index.wxml
+++ b/pages/user/index.wxml
@@ -69,7 +69,7 @@
- 版本号:2.2.52
+ 版本号:2.2.6