Browse Source

[首页下拉刷新,我的订单][修改]:首页下拉刷新,我的定制单状态的修改

tags/2.2.4
meo 6 years ago
parent
commit
11c53049d6
10 changed files with 66 additions and 50 deletions
  1. +1
    -2
      app.json
  2. +2
    -0
      pages/couponorder/index/index.js
  3. +1
    -3
      pages/index/index.js
  4. +1
    -3
      pages/index/index.json
  5. +1
    -1
      pages/login/index.json
  6. +1
    -1
      pages/order/detail/index.js
  7. +16
    -3
      pages/order/index/index.js
  8. +13
    -5
      pages/order/index/index.wxml
  9. +29
    -29
      pages/rushToBuy/index.js
  10. +1
    -3
      pages/rushToBuy/index.json

+ 1
- 2
app.json View File

@@ -54,8 +54,7 @@
"backgroundTextStyle": "red",
"navigationBarBackgroundColor": "#02C0FF",
"navigationBarTitleText": "WeChat",
"navigationBarTextStyle": "white",
"enablePullDownRefresh": true
"navigationBarTextStyle": "white"
},
"networkTimeout": {
"request": 10000,


+ 2
- 0
pages/couponorder/index/index.js View File

@@ -70,6 +70,8 @@ Page({
res.data.list.map(file => {
file.expiredTime = util.fmtDate(file.expiredTime);
});

setTimeout(function () {
that.setData({
loading: false


+ 1
- 3
pages/index/index.js View File

@@ -21,6 +21,7 @@ Page({
var that = this;
var scene = decodeURIComponent(options.scene);
app.getLocation();
that.userLogin();
},
/**
* 下拉刷新
@@ -38,9 +39,6 @@ Page({
wx.stopPullDownRefresh();
};
},
onShow: function () {
this.userLogin();
},

onGetCode: function (e) {
//子组件传递给父组件的值


+ 1
- 3
pages/index/index.json View File

@@ -5,7 +5,5 @@
"c-coupons": "./coupons/index"
},
"navigationBarTitleText": "首页",
"window": {
"enablePullDownRefresh": true
}
"enablePullDownRefresh": true
}

+ 1
- 1
pages/login/index.json View File

@@ -2,5 +2,5 @@
"usingComponents": {
"i-button": "../../dist/button/index"
},
"navigationBarTitleText": "登"
"navigationBarTitleText": "登"
}

+ 1
- 1
pages/order/detail/index.js View File

@@ -77,7 +77,7 @@ Page({
});

//createDate 创建时间
var createDate = util.fmtDate(res.data.createDate);
var createDate = util.formatTime(res.data.createDate, "yyyy-MM-dddd hh:mm:ss");
console.log(createDate);
that.setData({
createDate: createDate


+ 16
- 3
pages/order/index/index.js View File

@@ -97,10 +97,23 @@ Page({
that.setData({
list: tmpArr
})
// for (let i = 0; i < that.data.list.length; i++) {
// that.setData({
// 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-dddd hh:mm:ss");
/**
* 修改list的endtime
* 渲染到页面
*/
var createDate = 'list[' + i + '].createDate'
that.setData({
createDate: util.fmtDate(that.data.list[i].createDate)
})
[createDate]: createDate1
});
}
});
} else {
@@ -130,7 +143,7 @@ Page({
list: [],
allow_load: true,
current_scroll: detail.key,
page:1
page: 1
})
this.getList(detail.key, 1);
},


+ 13
- 5
pages/order/index/index.wxml View File

@@ -12,14 +12,16 @@
<view>
<text>{{item.title}}</text>
<text wx:if="{{item.orderStatus==0}}">待付款</text>
<text wx:if="{{item.orderStatus==3}}">已退款</text>
<text wx:if="{{item.orderStatus==3}}">待退款</text>
<text wx:if="{{item.orderStatus==2}}">已取消</text>
<text wx:if="{{item.orderStatus==4}}">已退款</text>
<text wx:if="{{item.orderStatus==5}}">退款失败</text>
<text wx:if="{{item.orderStatus==1&&item.salePrice==0}}">免费领取</text>
<text wx:if="{{item.orderStatus==1&&item.salePrice!=0}}">已付款</text>
<text wx:if="{{item.orderStatus==2}}">已过期</text>
</view>
<view>{{item.subTitle}}</view>
<view>
<text>下单时间:</text>{{createDate}}
<text>下单时间:</text>{{item.createDate}}
</view>
</view>
</view>
@@ -38,14 +40,20 @@
<text>查看详情</text>
</view>
<view wx:if="{{item.orderStatus==0}}" class="btn" data-id="{{item.id}}" bindtap="gotopay">
<text>支付</text>
<text>支付</text>
</view>
<view wx:if="{{item.orderStatus==2}}" style="background:#999;opacity: .6;" class="btn">
<text>已过期</text>
<text>已取消</text>
</view>
<view wx:if="{{item.orderStatus==3}}" style="background:#999;opacity: .6;" class="btn">
<text>待退款</text>
</view>
<view wx:if="{{item.orderStatus==4}}" style="background:#999;opacity: .6;" class="btn">
<text>已退款</text>
</view>
<view wx:if="{{item.orderStatus==5}}" style="background:#999;opacity: .6;" class="btn">
<text>退款失败</text>
</view>
</view>
</view>
<view class="dingdan" wx:if="{{list.length==0}}">


+ 29
- 29
pages/rushToBuy/index.js View File

@@ -52,38 +52,38 @@ Page({
loading: false,
})
}, 1400);
} else {
setTimeout(function () {
that.setData({
loading: false,
})
}, 1400);
console.log(pageNum);
if (pageNum == 1) {
that.setData({
list: []
})
}
var tmpArr = that.data.list;
tmpArr.push.apply(tmpArr, res.data.list);
}

setTimeout(function () {
that.setData({
list: tmpArr
loading: false,
})
console.log(tmpArr);
for (let i = 0; i < that.data.list.length; i++) {
var startTime = util.fmtDate(that.data.list[i].endTime);
util.timechuo(startTime);
console.log(util.timechuo(startTime));
/**
* 修改list的endtime
* 渲染到页面
*/
var endtime = 'list[' + i + '].endtime'
that.setData({
[endtime]: util.timechuo(startTime)
});
}
}, 1400);
// if (pageNum == 2) {
// that.setData({
// list: []
// })
// }
var tmpArr = that.data.list;
tmpArr.push.apply(tmpArr, res.data.list);
that.setData({
list: tmpArr
})
console.log(tmpArr);
for (let i = 0; i < that.data.list.length; i++) {
var startTime = util.fmtDate(that.data.list[i].endTime);
util.timechuo(startTime);
console.log(util.timechuo(startTime));
/**
* 修改list的endtime
* 渲染到页面
*/
var endtime = 'list[' + i + '].endtime'
that.setData({
[endtime]: util.timechuo(startTime)
});
}

});
} else {
console.info("allow_load==false 已禁止加载");


+ 1
- 3
pages/rushToBuy/index.json View File

@@ -1,7 +1,5 @@
{
"usingComponents": {
"usingComponents": {
},
"navigationBarTitleText": "限时抢购"
}

Loading…
Cancel
Save