Commit 1b94b36b by 谢中龙

新优化功能

parent f92fd489
...@@ -124,8 +124,7 @@ Component({ ...@@ -124,8 +124,7 @@ Component({
}) })
} }
}).finally(() => { }).finally(() => {})
})
}, },
}, },
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
// 修改 BRANCH_ID 为对应的商户id // 修改 BRANCH_ID 为对应的商户id
// app.js 中brandId 修改为对应 // app.js 中brandId 修改为对应
const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
//仅生产环境时 配置 : //仅生产环境时 配置 :
//3001 3001 , wx313ec36b710125d4 //3001 3001 , wx313ec36b710125d4
//2006 泰华 , wx40fec8944623c8b3 //2006 泰华 , wx40fec8944623c8b3
...@@ -24,7 +24,7 @@ const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门 ...@@ -24,7 +24,7 @@ const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门
//2992 山东盛联微商城 wx53dedc202ae0d0c2 //2992 山东盛联微商城 wx53dedc202ae0d0c2
//2002 巴黎贝甜 wx21968cb3a486d4ab //2002 巴黎贝甜 wx21968cb3a486d4ab
const BRANCH_ID = 3001 const BRANCH_ID = 1002
const isMall = true const isMall = true
// const needMock = '' // // const needMock = '' //
......
...@@ -246,7 +246,7 @@ wxService.page({ ...@@ -246,7 +246,7 @@ wxService.page({
[finCouponName]: finCouponId, [finCouponName]: finCouponId,
// couponId: id, // couponId: id,
haveCoupon: true, haveCoupon: true,
currentCoupon: `${faceAmount / 100} 元` currentCoupon: `${parseFloat(faceAmount/10/10).toFixed(2)} 元`
}) })
} else if (type == 2) { } else if (type == 2) {
// let discounPrice = (faceAmount / 100) * (orderPrice) // let discounPrice = (faceAmount / 100) * (orderPrice)
...@@ -593,6 +593,9 @@ wxService.page({ ...@@ -593,6 +593,9 @@ wxService.page({
data.couponDiscountPreviews[0].couponSettingDTO.faceAmount / 100 : data && data.couponDiscountPreviews[0].couponSettingDTO.faceAmount / 100 : data &&
data.couponDiscountPreviews.length && data.couponDiscountPreviews[0] && data.couponDiscountPreviews.length && data.couponDiscountPreviews[0] &&
data.couponDiscountPreviews[0].couponDiscount; data.couponDiscountPreviews[0].couponDiscount;
defalutCoupon = defalutCoupon ? parseFloat(defalutCoupon).toFixed(2) : 0;
let defalutCouponId = data && data.couponDiscountPreviews.length && let defalutCouponId = data && data.couponDiscountPreviews.length &&
data.couponDiscountPreviews[0] && data.couponDiscountPreviews[0].couponDTOS[0] && data.couponDiscountPreviews[0] && data.couponDiscountPreviews[0].couponDTOS[0] &&
data.couponDiscountPreviews[0].couponDTOS[0].id || ''; data.couponDiscountPreviews[0].couponDTOS[0].id || '';
......
...@@ -45,7 +45,7 @@ wxService.page({ ...@@ -45,7 +45,7 @@ wxService.page({
], ],
currentIndex: 1, currentIndex: 1,
pageNo: 1, pageNo: 1,
pageSize: 5, pageSize: 10,
noMoreFlag: false, noMoreFlag: false,
orderList: null, orderList: null,
totalPages: 0, totalPages: 0,
...@@ -89,7 +89,7 @@ wxService.page({ ...@@ -89,7 +89,7 @@ wxService.page({
} else { } else {
this.setData({ this.setData({
pageNo: 1, pageNo: 1,
pageSize: 5 pageSize: 10
}, () => { }, () => {
this.initOrderList(this.data.pageNo, this.data.pageSize, this.data.status) this.initOrderList(this.data.pageNo, this.data.pageSize, this.data.status)
}) })
......
...@@ -42,6 +42,18 @@ wxService.page({ ...@@ -42,6 +42,18 @@ wxService.page({
}) })
} }
}, },
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
this.getOrderDetail(this.data.id);
setTimeout(() => {
wx.stopPullDownRefresh();
}, 500);
},
//获取订单详情
getOrderDetail(id){ getOrderDetail(id){
wx.showLoading({ wx.showLoading({
title: '加载中', title: '加载中',
...@@ -379,39 +391,4 @@ wxService.page({ ...@@ -379,39 +391,4 @@ wxService.page({
} }
}); });
}, },
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
}) })
\ No newline at end of file
{ {
"navigationBarTitleText": "订单详情", "navigationBarTitleText": "订单详情",
"enablePullDownRefresh": true,
"usingComponents": { "usingComponents": {
"go-home": "/component/goHome/goHome", "go-home": "/component/goHome/goHome",
"go-guid": "/component/goGuid/goGuid" "go-guid": "/component/goGuid/goGuid"
......
...@@ -105,7 +105,7 @@ wxService.page({ ...@@ -105,7 +105,7 @@ wxService.page({
wx.navigateBack({ wx.navigateBack({
delta: 1 delta: 1
}); });
}, 2000); }, 500);
return ; return ;
} }
...@@ -134,7 +134,7 @@ wxService.page({ ...@@ -134,7 +134,7 @@ wxService.page({
wx.navigateBack({ wx.navigateBack({
delta: 1 delta: 1
}); });
}, 2000) }, 500)
} }
}) })
}).catch(err => { }).catch(err => {
......
...@@ -38,6 +38,17 @@ wxService.page({ ...@@ -38,6 +38,17 @@ wxService.page({
}) })
} }
}, },
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
this.getRfDetail(this.data.id);
setTimeout(() => {
wx.stopPullDownRefresh();
}, 500);
},
handelRevokeRefund() { handelRevokeRefund() {
const { id } = this.data const { id } = this.data
wx.showLoading({ wx.showLoading({
...@@ -68,6 +79,7 @@ wxService.page({ ...@@ -68,6 +79,7 @@ wxService.page({
onDeliveryOk(){ onDeliveryOk(){
this.getRfDetail(this.data.id); this.getRfDetail(this.data.id);
}, },
//获取退单详情
getRfDetail(id) { getRfDetail(id) {
wx.showLoading({ wx.showLoading({
title: '加载中', title: '加载中',
...@@ -85,6 +97,7 @@ wxService.page({ ...@@ -85,6 +97,7 @@ wxService.page({
} }
}) })
}, },
//复制
copy(e) { copy(e) {
wx.setClipboardData({ wx.setClipboardData({
//准备复制的数据 //准备复制的数据
......
{ {
"navigationBarTitleText": "退单详情", "navigationBarTitleText": "退单详情",
"enablePullDownRefresh": true,
"usingComponents": { "usingComponents": {
"apply-refund": "/component/applyRefund/applyRefund", "apply-refund": "/component/applyRefund/applyRefund",
"go-home": "/component/goHome/goHome", "go-home": "/component/goHome/goHome",
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.8.2", "libVersion": "2.8.2",
"appid": "wx313ec36b710125d4", "appid": "wxac09792264c49b5c",
"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E", "projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
"debugOptions": { "debugOptions": {
"hidedInDevtools": [] "hidedInDevtools": []
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment