cxc/sphc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix button status

Browse Source
This commit is contained in:
quantulr
2024-05-24 17:17:01 +08:00
parent 5c547bdd69
commit c5011c53d7
10 changed files with 259 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app.js
View File

@ -146,8 +146,8 @@ App({
bgImg: 'https://sanpinhuicai.com/wisdommining/static/icon/bg/',//背景图片地址 bgImg: 'https://sanpinhuicai.com/wisdommining/static/icon/bg/',//背景图片地址
// ip: 'http://106.54.198.47/', //接口地址 // ip: 'http://106.54.198.47/', //接口地址
ip: 'https://sanpinhuicai.com/', //接口地址 // ip: 'https://sanpinhuicai.com/', //接口地址
// ip: 'http://192.168.0.112:9000/', //接口地址/ ip: 'http://192.168.0.112:9000/', //接口地址/
// ip: 'http://127.0.0.1:9000/', //接口地址/ // ip: 'http://127.0.0.1:9000/', //接口地址/
//appId wx65c9560afc9cbaa7 //appId wx65c9560afc9cbaa7

6
pages/logistics_details/logistics_details.wxml
View File

@ -12,7 +12,7 @@
</view> </view>
</scroll-view> </scroll-view>
<!-- 包裹内容, 物流公司 --> <!-- 包裹内容, 物流公司 -->
<view style="height: 400rpx; width: 100%;background-color: #fff;border-radius: 24rpx;overflow: hidden;"> <view style="width: 100%;background-color: #fff;border-radius: 24rpx;overflow: hidden;">
<view style="background-color: #fef8ec;color: #f85900;font-size: 24rpx;padding: 12rpx 12rpx;">快递走件，催派等物流信息，请联系物流公司，如需平台接入请联系客服</view> <view style="background-color: #fef8ec;color: #f85900;font-size: 24rpx;padding: 12rpx 12rpx;">快递走件，催派等物流信息，请联系物流公司，如需平台接入请联系客服</view>
<view style="margin: 36rpx 0 0 24rpx;display: flex;align-items: center;"> <view style="margin: 36rpx 0 0 24rpx;display: flex;align-items: center;">
<picker range="{{expressComName}}" value="{{currentExpressComIndex}}" bindchange="pickExpressCom"> <picker range="{{expressComName}}" value="{{currentExpressComIndex}}" bindchange="pickExpressCom">
@ -26,8 +26,8 @@
<text>运单号: {{logistics[activePackage].logisticsNumber}}</text> <text>运单号: {{logistics[activePackage].logisticsNumber}}</text>
<button data-logistics-number="{{logistics[activePackage].logisticsNumber}}" style="border-radius: 999rpx;margin: 0 0 0 12rpx;" plain size="mini" bind:tap="copyLogisticsNumber">复制</button> <button data-logistics-number="{{logistics[activePackage].logisticsNumber}}" style="border-radius: 999rpx;margin: 0 0 0 12rpx;" plain size="mini" bind:tap="copyLogisticsNumber">复制</button>
</view> </view>
<view style="margin: 24rpx 48rpx 0"> <view style="margin: 0rpx 48rpx 24rpx">
<view style="justify-content: space-between;align-items: center;display: flex;height: 48rpx;" wx:for="{{logistics[activePackage].goods}}" wx:key="id"> <view style="margin-top:24rpx;justify-content: space-between;align-items: center;display: flex;" wx:for="{{logistics[activePackage].goods}}" wx:key="id">
<view class="goods-name" style="flex:7;">{{item.name}}</view> <view class="goods-name" style="flex:7;">{{item.name}}</view>
<view class="goods-name" style="flex:3;text-align: center;">{{item.spec}}</view> <view class="goods-name" style="flex:3;text-align: center;">{{item.spec}}</view>
<view style="flex:1;text-align: right;">{{item.num}}</view> <view style="flex:1;text-align: right;">{{item.num}}</view>

4
pages/logistics_details/logistics_details.wxss
View File

@ -48,9 +48,9 @@ page {
padding-left: 48rpx; padding-left: 48rpx;
} }
.goods-name { .goods-name {
overflow: hidden; /* overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap; */
} }
.record-item:not(:last-child) { .record-item:not(:last-child) {

46
pages/my/after_sales/after_sales.js
View File

@ -26,6 +26,48 @@ Page({
url: '/pages/my/after_sales_next/after_sales_next?id=' + this.data.id + '&&num=' + this.data.num, url: '/pages/my/after_sales_next/after_sales_next?id=' + this.data.id + '&&num=' + this.data.num,
}) })
}, },
// 撤销退换货申请
cancel() {
wx.showModal({
title: '确定要撤销申请吗？',
// content: '',
complete: (res) => {
if (res.cancel) {
}
if (res.confirm) {
wx.request({
url: app.globalData.ip + '/wisdommining/api/order/cancelRefund',
method: 'GET',
header: {
"content-type": "application/x-www-form-urlencoded",
},
data: {
orderId: this.data.id
},
success(res) {
if (res.data.code == 1) {
wx.showToast({
title: res.data.message,
})
wx.navigateTo({
url: '/pages/my/my_order/my_order?state=' + 3,
})
} else {
wx.showModal({
title: '提示!',
content: res.data.message,
showCancel: false,
})
}
}
})
}
}
})
},
/** /**
* 生命周期函数--监听页面初次渲染完成 * 生命周期函数--监听页面初次渲染完成
@ -49,14 +91,14 @@ Page({
}, },
data: { data: {
userId: app.globalData.userId, userId: app.globalData.userId,
orderNumber:this.data.num, orderNumber: this.data.num,
}, },
success: res => { success: res => {
console.log(res) console.log(res)
wx.hideLoading() wx.hideLoading()
if (res.data.code == 1) { if (res.data.code == 1) {
let goods = res.data.value; let goods = res.data.value;
if(goods.orderRefundImage){ if (goods.orderRefundImage) {
goods.orderRefundImage = goods.orderRefundImage.split(','); goods.orderRefundImage = goods.orderRefundImage.split(',');
} }
this.setData({ this.setData({

2
pages/my/after_sales/after_sales.wxml
View File

@ -81,6 +81,8 @@
<!-- 申请中 --> <!-- 申请中 -->
<view class="btn-1" wx:if='{{goods.afterSalesStatus==61||goods.afterSalesStatus==62}}'>下一步</view> <view class="btn-1" wx:if='{{goods.afterSalesStatus==61||goods.afterSalesStatus==62}}'>下一步</view>
<view class="btn btn-cancel" wx:if='{{goods.afterSalesStatus==61||goods.afterSalesStatus==62}}' catchtap="cancel">撤销申请</view>
<view class="height100"></view> <view class="height100"></view>
<view class="height100"></view> <view class="height100"></view>

192
pages/my/after_sales/after_sales.wxss
View File

@ -1,29 +1,29 @@
/* pages/my/after_sales/after_sales.wxss */ /* pages/my/after_sales/after_sales.wxss */
page{ page {
background-color: #f5f5f5; background-color: #f5f5f5;
} }
.top{ .top {
width: 750rpx; width: 750rpx;
height: 80rpx; height: 80rpx;
line-height: 80rpx; line-height: 80rpx;
background-color: #f7e0cd; background-color: #f7e0cd;
font-size: 28rpx; font-size: 28rpx;
color: #333333; color: #333333;
text-align: center; text-align: center;
} }
.top text{ .top text {
color: #ff372d; color: #ff372d;
/* margin-left: 15rpx; */ /* margin-left: 15rpx; */
} }
.jl{ .jl {
width:750rpx; width: 750rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 40rpx; border-radius: 40rpx;
margin-top: 30rpx; margin-top: 30rpx;
padding-bottom:60rpx; padding-bottom: 60rpx;
} }
.title{ .title {
width: 100%; width: 100%;
height: 90rpx; height: 90rpx;
line-height: 90rpx; line-height: 90rpx;
@ -33,40 +33,38 @@ page{
border-bottom: 1rpx #eeeeee solid; border-bottom: 1rpx #eeeeee solid;
margin-bottom: 35rpx; margin-bottom: 35rpx;
} }
.jlcont{ .jlcont {
padding:0 30rpx; padding: 0 30rpx;
margin-bottom: 35rpx; margin-bottom: 35rpx;
line-height: 45rpx; line-height: 45rpx;
} }
.cont-1{ .cont-1 {
width: 15rpx; width: 15rpx;
height: 15rpx; height: 15rpx;
background-color: #cccccc; background-color: #cccccc;
border-radius: 50%; border-radius: 50%;
margin-top:15rpx; margin-top: 15rpx;
margin-right: 15rpx; margin-right: 15rpx;
} }
.cont-1h{ .cont-1h {
background-color: #ffbb00; background-color: #ffbb00;
} }
.cont-2{ .cont-2 {
font-size: 28rpx; font-size: 28rpx;
color: #999999; color: #999999;
width: 150rpx; width: 150rpx;
} }
.cont-3{ .cont-3 {
font-size: 28rpx; font-size: 28rpx;
color: #333333; color: #333333;
width: 480rpx; width: 480rpx;
} }
.btn{ .btn {
width: 690rpx; width: 690rpx;
height: 80rpx; height: 80rpx;
line-height: 80rpx; line-height: 80rpx;
background-image: linear-gradient(90deg, background-image: linear-gradient(90deg, #fdac04 0%, #ee7c1d 100%);
#fdac04 0%,
#ee7c1d 100%);
border-radius: 40rpx; border-radius: 40rpx;
position: fixed; position: fixed;
left: 30rpx; left: 30rpx;
@ -75,100 +73,114 @@ page{
color: #ffffff; color: #ffffff;
text-align: center; text-align: center;
} }
.btn-1{
width: 690rpx;
height: 80rpx;
line-height: 80rpx;
background-color: #999;
border-radius: 40rpx;
position: fixed;
left: 30rpx;
bottom: 50rpx;
font-size: 32rpx;
color: #ffffff;
text-align: center;
}
.dengdai{
margin-top: 200rpx;
font-size: 32rpx;
color: #ffbb00;
}
.dengdai view image{
width: 103rpx;
height: 103rpx;
}
.dengdai view{
text-align: center;
}
.jieguo_cont{ .btn-cancel {
bottom: 160rpx;
}
.btn-1 {
width: 690rpx;
height: 80rpx;
line-height: 80rpx;
background-color: #999;
border-radius: 40rpx;
position: fixed;
left: 30rpx;
bottom: 50rpx;
font-size: 32rpx;
color: #ffffff;
text-align: center;
}
.btn-2 {
width: 690rpx;
height: 80rpx;
line-height: 80rpx;
background-color: #999;
border-radius: 40rpx;
position: fixed;
left: 30rpx;
bottom: 160rpx;
font-size: 32rpx;
color: #ffffff;
text-align: center;
}
.dengdai {
margin-top: 200rpx;
font-size: 32rpx;
color: #ffbb00;
}
.dengdai view image {
width: 103rpx;
height: 103rpx;
}
.dengdai view {
text-align: center;
}
.jieguo_cont {
font-size: 28rpx; font-size: 28rpx;
line-height: 48rpx; line-height: 48rpx;
color: #999999; color: #999999;
width: 690rpx; width: 690rpx;
padding: 0 30rpx; padding: 0 30rpx;
} }
.goods {
.goods{
width: 690rpx; width: 690rpx;
padding: 0 30rpx; padding: 0 30rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 20rpx; border-radius: 20rpx;
margin: 30rpx 0; margin: 30rpx 0;
} }
.cont{ .cont {
padding: 30rpx 0; padding: 30rpx 0;
border-bottom: 1rpx #dcdcdc solid; border-bottom: 1rpx #dcdcdc solid;
} }
.cont:last-child{ .cont:last-child {
border-bottom: none; border-bottom: none;
} }
.cont-l image{ .cont-l image {
width: 160rpx; width: 160rpx;
height: 160rpx; height: 160rpx;
} }
.cont-m{ .cont-m {
width: 400rpx; width: 400rpx;
padding: 10rpx 0; padding: 10rpx 0;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
align-content: space-between; align-content: space-between;
} }
.name{ .name {
width:100%; width: 100%;
font-size: 28rpx; font-size: 28rpx;
color: #333333; color: #333333;
} }
.specs{ .specs {
width:100%; width: 100%;
font-size: 24rpx; font-size: 24rpx;
color: #999999; color: #999999;
} }
.price{ .price {
width:100%; width: 100%;
font-size: 36rpx; font-size: 36rpx;
color: #ff291e; color: #ff291e;
} }
.price text{ .price text {
font-size: 24rpx; font-size: 24rpx;
color: #999999; color: #999999;
text-decoration: line-through; text-decoration: line-through;
margin-left: 11rpx; margin-left: 11rpx;
} }
.cont-r{ .cont-r {
display: flex; display: flex;
align-items : flex-end; align-items: flex-end;
font-size: 32rpx; font-size: 32rpx;
color: #0b0b0b; color: #0b0b0b;
height: 130rpx; height: 130rpx;
} }
.up{ .up {
width: 690rpx; width: 690rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 20rpx; border-radius: 20rpx;
padding: 30rpx; padding: 30rpx;
} }
@ -176,7 +188,6 @@ page{
font-size: 32rpx; font-size: 32rpx;
color: #333; color: #333;
margin: 0 0 30rpx 0; margin: 0 0 30rpx 0;
} }
.title text { .title text {
@ -184,7 +195,6 @@ page{
color: #bababa; color: #bababa;
} }
.photo { .photo {
margin-top: 50rpx; margin-top: 50rpx;
} }
@ -199,7 +209,7 @@ page{
float: left; float: left;
} }
.photo_all>view:nth-child(4) { .photo_all > view:nth-child(4) {
margin-right: 0; margin-right: 0;
} }
@ -211,7 +221,6 @@ page{
margin-right: 30rpx; margin-right: 30rpx;
margin-bottom: 30rpx; margin-bottom: 30rpx;
float: left; float: left;
} }
.photo_cont image { .photo_cont image {
@ -236,9 +245,7 @@ page{
.submit { .submit {
width: 690rpx; width: 690rpx;
height: 80rpx; height: 80rpx;
background-image: linear-gradient(-90deg, background-image: linear-gradient(-90deg, #ee7b1e 0%, #fdae03 100%);
#ee7b1e 0%,
#fdae03 100%);
border-radius: 40rpx; border-radius: 40rpx;
font-size: 36rpx; font-size: 36rpx;
line-height: 80rpx; line-height: 80rpx;
@ -247,37 +254,36 @@ page{
position: fixed; position: fixed;
bottom: 100rpx; bottom: 100rpx;
left: 30rpx; left: 30rpx;
} }
.aArice{ .aArice {
width: 690rpx; width: 690rpx;
padding: 0 30rpx; padding: 0 30rpx;
height: 100rpx; height: 100rpx;
line-height: 100rpx; line-height: 100rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 20rpx; border-radius: 20rpx;
margin: 30rpx 0; margin: 30rpx 0;
font-size: 28rpx; font-size: 28rpx;
letter-spacing: 1rpx; letter-spacing: 1rpx;
color: #333333; color: #333333;
} }
.aArice text{ .aArice text {
font-size: 28rpx; font-size: 28rpx;
letter-spacing: 2rpx; letter-spacing: 2rpx;
color: #ee7b1e; color: #ee7b1e;
} }
.aArice text text{ .aArice text text {
font-size: 36rpx; font-size: 36rpx;
} }
.aArice2{ .aArice2 {
font-size: 28rpx; font-size: 28rpx;
letter-spacing: 1rpx; letter-spacing: 1rpx;
color: #333333; color: #333333;
margin-top: 30rpx; margin-top: 30rpx;
border-radius: 20rpx; border-radius: 20rpx;
} }
.aArice input{ .aArice input {
height: 100%; height: 100%;
line-height: 100%; line-height: 100%;
border: none; border: none;

2
pages/my/my_order/my_order.js
View File

@ -210,7 +210,7 @@ Page({
url: app.globalData.ip + '/wisdommining/api/order/afterSales', url: app.globalData.ip + '/wisdommining/api/order/afterSales',
method: 'POST', method: 'POST',
header: { header: {
"content-type": "application/x-www-form-urlencoded", "content-type": "application/json",
}, },
data: { data: {
orderRefund: '', orderRefund: '',

42
pages/my/my_order/my_order.wxml
View File

@ -29,15 +29,20 @@
</view> </view>
<view class="orderAll"> <view class="orderAll">
<view class="order" wx:for="{{orderList}}" wx:key='index' data-num="{{item.orderNumber}}" catchtap="toOrderDetail"> <view class="order" wx:for="{{orderList}}" wx:key='index' data-num="{{item.orderNumber}}" catchtap="toOrderDetail">
<view class="state" wx:if="{{item.status<6 && (item.afterSalesStatus ==66 || !item.afterSalesStatus) && type != 6}}"> <view class="state" wx:if="{{item.status<6 && (item.afterSalesStatus == 66 || !item.afterSalesStatus) && type != 6}}">
{{item.status==5?'已取消':item.status==1?'待支付':item.status==2?'待发货':item.status==3?'待收货':item.status==4?'已完成':''}} {{item.status==5?'已取消'
:item.status==1?'待支付'
:item.status==2?'待发货'
:item.status==3?'待收货'
:item.status==4?'已完成'
:''}}
</view> </view>
<view class="state" wx:if="{{item.afterSalesStatus && type==6}}"> <view class="state" wx:if="{{item.afterSalesStatus && type==6}}">
{{ {{
item.afterSalesStatus==61?'换货审核中' item.afterSalesStatus==61?'换货审核中'
:item.afterSalesStatus==62?'退货审核中' :item.afterSalesStatus==62?'退款审核中'
:item.afterSalesStatus==63&&item.orderRefundType==1?'换货申请成功' :item.afterSalesStatus==63&&item.orderRefundType==1?'请退回商品'
:item.afterSalesStatus==63&&item.orderRefundType==2?'退货申请成功' :item.afterSalesStatus==63&&item.orderRefundType==2?'请退货'
:item.afterSalesStatus==64&&item.orderRefundType==1?'换货待商家收货' :item.afterSalesStatus==64&&item.orderRefundType==1?'换货待商家收货'
:item.afterSalesStatus==64&&item.orderRefundType==2?'退货待商家收货' :item.afterSalesStatus==64&&item.orderRefundType==2?'退货待商家收货'
:item.afterSalesStatus==65&&item.orderRefundType==1?'换货完成' :item.afterSalesStatus==65&&item.orderRefundType==1?'换货完成'
@ -45,6 +50,7 @@
:item.afterSalesStatus==65&&item.orderRefundType==3?'退款完成' :item.afterSalesStatus==65&&item.orderRefundType==3?'退款完成'
:item.afterSalesStatus==66&&item.orderRefundType==1?'换货失败' :item.afterSalesStatus==66&&item.orderRefundType==1?'换货失败'
:item.afterSalesStatus==66&&item.orderRefundType==2?'退货失败' :item.afterSalesStatus==66&&item.orderRefundType==2?'退货失败'
:item.afterSalesStatus==66&&item.orderRefundType==3?'退款失败'
:'' :''
}} }}
</view> </view>
@ -74,31 +80,33 @@
<view wx:if="{{item.timeStr}}" style="font-size: 28rpx"> <view wx:if="{{item.timeStr}}" style="font-size: 28rpx">
您需要在<text style="color:#ee7b1e;">{{item.timeStr}}</text>内处理 您需要在<text style="color:#ee7b1e;">{{item.timeStr}}</text>内处理
</view> </view>
<view class="btn display_J_E"> <view class="btn display_J_E" style="flex-wrap: wrap;row-gap: 24rpx;">
<view class="btn1" wx:if="{{item.status==3}}" data-item='{{item}}' data-logistics="{{item.logistics}}" data-order-number="{{item.orderNumber}}" data-logistics-name="{{item.logisticsName}}" catchtap="viewLogisticsDetails">物流查询</view> <view class="btn1" wx:if="{{item.status==3&&item.afterSalesStatus!=64}}" data-item='{{item}}' data-logistics="{{item.logistics}}" data-order-number="{{item.orderNumber}}" data-logistics-name="{{item.logisticsName}}" catchtap="viewLogisticsDetails">物流查询</view>
<view class="btn1 btn2" wx:if="{{item.status==3}}" data-id='{{item.id}}' catchtap="confirm">确认收货</view> <view class="btn1 btn2" wx:if="{{item.status==3&&type==3&&item.afterSalesStatus!=64}}" data-id='{{item.id}}' catchtap="confirm">确认收货</view>
<view class="btn1" wx:if="{{item.status==1}}">立即支付</view> <view class="btn1" wx:if="{{item.status==1}}">立即支付</view>
<view class="btn1" wx:if="{{item.status==4||item.status==5}}" catchtap="del" data-id='{{item.id}}' data-index="{{index}}">删除订单</view> <view class="btn1" wx:if="{{item.status==4||item.status==5}}" catchtap="del" data-id='{{item.id}}' data-index="{{index}}">删除订单</view>
<!-- 退货流程 --> <!-- 退货流程 -->
<!-- 待发货 申请 --> <!-- 待发货 申请 -->
<!-- 申请退款按钮只在代发货或者退款申请被驳回时显示 -->
<view class="btn1 btn2" wx:if="{{item.status==2}}" data-id='{{item.id}}' catchtap="apply1"> <view class="btn1 btn2" wx:if="{{item.status==2 && (item.afterSalesStatus<66 || !item.afterSalesStatus)}}" data-id='{{item.id}}' catchtap="apply1">
申请退款</view> 申请退款</view>
<!-- 待收货申请 --> <!-- 待收货申请 -->
<view class="btn1 btn2" wx:if="{{item.status==3&& (item.afterSalesStatus<60 || item.afterSalesStatus == null)}}" data-id='{{item.id}}' data-num='{{item.orderNumber}}' data-s='{{item.status}}' data-sq='1' catchtap="apply">申请退货</view> <view class="btn1 btn2" wx:if="{{item.status==3&& type==3 && (item.afterSalesStatus==66 || !item.afterSalesStatus)}}" data-id='{{item.id}}' data-num='{{item.orderNumber}}' data-s='{{item.status}}' data-sq='1' catchtap="apply">申请退货</view>
<view class="btn1 btn2" wx:if="{{item.status==3&& item.afterSalesStatus==null }}" data-id='{{item.id}}' data-num='{{item.orderNumber}}' data-s='{{item.status}}' data-sq='2' catchtap="apply">申请换货</view> <view class="btn1 btn2" wx:if="{{item.status==3&& type==3 && ( item.afterSalesStatus==66 || !item.afterSalesStatus) }}" data-id='{{item.id}}' data-num='{{item.orderNumber}}' data-s='{{item.status}}' data-sq='2' catchtap="apply">申请换货</view>
<!-- 申请中 --> <!-- 申请中 -->
<view class="btn1 btn2" wx:if="{{item.afterSalesStatus==61||item.afterSalesStatus==62||item.afterSalesStatus==63||item.afterSalesStatus==66}}" data-id='{{item.id}}' data-num='{{item.orderNumber}}' catchtap="after">查看进度</view> <!-- -->
<view class="btn1 btn2" wx:if="{{(item.afterSalesStatus==61||item.afterSalesStatus==62||item.afterSalesStatus==63||item.afterSalesStatus==66) && item.afterSalesStatus!=64&&type==6}}" data-id='{{item.id}}' data-num='{{item.orderNumber}}' catchtap="after">查看进度</view>
<!-- 退货待商家收货 完成 --> <!-- 退货待商家收货 完成 -->
<view class="btn1 btn2" wx:if="{{(item.status==64||item.status==65)&&item.orderRefundType!=3}}" data-id='{{item.id}}' data-num='{{item.orderNumber}}' data-sq='{{item.orderRefundType==1?2:1}}' catchtap="jilu"> <view class="btn1 btn2" wx:if="{{(item.status==64||item.status==65)&&item.orderRefundType!=3}}" data-id='{{item.id}}' data-num='{{item.orderNumber}}' data-sq='{{item.orderRefundType==1?2:1}}' catchtap="jilu">
退换货记录</view> 退换货记录</view>
<!-- 后台同意退换货后不显示 -->
<view wx:if="{{item.afterSalesStatus!=63&&item.afterSalesStatus!=64}}" class="btn1 btn2" data-id='{{item.id}}' data-address-id="{{item.addressId}}" data-order-address="{{item.orderAddress}}" catchtap="updateAddress">
修改地址</view>
<!-- <view class="btn display_J_E" style="margin-top: 24rpx;">
</view> -->
</view> </view>
<!-- wx:if="{{item.status==2}}" --> <!-- wx:if="{{item.status==2}}" -->
<view class="btn display_J_E" style="margin-top: 24rpx;">
<view class="btn1 btn2" data-id='{{item.id}}' data-address-id="{{item.addressId}}" data-order-address="{{item.orderAddress}}" catchtap="updateAddress">
修改地址</view>
</view>
</view> </view>
</view> </view>

12
pages/order_details/order_details.wxml
View File

@ -23,6 +23,14 @@
findGoods: findGoods, findGoods: findGoods,
} }
</wxs> </wxs>
<wxs module="num">
function toFixed(num, precise) {
return typeof (num) === "undefined" ? num : num.toFixed(precise)
}
module.exports = {
toFixed: toFixed,
}
</wxs>
<!-- 倒计时 --> <!-- 倒计时 -->
<view wx:if='{{goods.status==1}}'> <view wx:if='{{goods.status==1}}'>
<view class="djs" wx:if="{{ticker!=''}}">还剩余<text>{{ticker}}</text>订单将自动取消</view> <view class="djs" wx:if="{{ticker!=''}}">还剩余<text>{{ticker}}</text>订单将自动取消</view>
@ -100,7 +108,7 @@
<view class="data"> <view class="data">
<view class="data-t display_J_B display_A_C"> <view class="data-t display_J_B display_A_C">
<view class="t-l">商品合计</view> <view class="t-l">商品合计</view>
<view class="t-r t-r__1">{{goods.orderPayWay!=2?'￥'+total:goods.orderOtherPay+'积分'}}</view> <view class="t-r t-r__1">{{goods.orderPayWay!=2?'￥'+ num.toFixed(total, 2) : goods.orderOtherPay+'积分'}}</view>
</view> </view>
<view class="data-t display_J_B display_A_C"> <view class="data-t display_J_B display_A_C">
<view class="t-l">运费</view> <view class="t-l">运费</view>
@ -130,7 +138,7 @@
</view> </view>
<view class="data-t display_J_B display_A_C"> <view class="data-t display_J_B display_A_C">
<view class="t-l">实际支付</view> <view class="t-l">实际支付</view>
<view class="t-r t-r__4">{{goods.orderPayWay!=2?'￥'+goods.orderActualPay:goods.orderOtherPay+'积分'}}</view> <view class="t-r t-r__4">{{goods.orderPayWay!=2?'￥'+num.toFixed(goods.orderActualPay, 2):goods.orderOtherPay+'积分'}}</view>
</view> </view>
</view> </view>

141
pages/order_detailsCode/order_details.wxml
View File

@ -1,88 +1,89 @@
<view style="height:34rpx"></view> <view style="height:34rpx"></view>
<view class="address display_J_S"> <view class="address display_J_S">
<image src="/icon/order-addrass.png"></image> <image src="/icon/order-addrass.png"></image>
<view class="address-cont">{{goods.orderAddress}}</view> <view class="address-cont">{{goods.orderAddress}}</view>
</view> </view>
<view class="goods"> <view class="goods">
<view class="cont display_J_B" wx:for='{{goods.goodsList}}' wx:key='index'> <view class="cont display_J_B" wx:for='{{goods.goodsList}}' wx:key='index'>
<view class="cont-l"> <view class="cont-l">
<image src="{{item.goodsPhoto}}"></image> <image src="{{item.goodsPhoto}}"></image>
</view> </view>
<view class="cont-m"> <view class="cont-m">
<view class="name GStitleOne">{{item.goodsName}}</view> <view class="name GStitleOne">{{item.goodsName}}</view>
<view class="specs" wx:if="{{goods.orderPayWay!=3}}">规格：{{item.wisdGoodsSpec.specName}}</view> <view class="specs" wx:if="{{goods.orderPayWay!=3}}">规格：{{item.wisdGoodsSpec.specName}}</view>
<view class="price" wx:if="{{goods.orderPayWay!=3}}"> <view class="price" wx:if="{{goods.orderPayWay!=3}}">
￥{{item.wisdGoodsSpec.specBulyPrice==null?item.wisdGoodsSpec.specPrice:item.wisdGoodsSpec.specBulyPrice}} ￥{{item.wisdGoodsSpec.specBulyPrice==null?item.wisdGoodsSpec.specPrice:item.wisdGoodsSpec.specBulyPrice}}
<text>￥{{item.wisdGoodsSpec.originalPrice}}</text> <text>￥{{item.wisdGoodsSpec.originalPrice}}</text>
</view> </view>
<view class="price" wx:if="{{goods.orderPayWay==3}}">￥0</view> <view class="price" wx:if="{{goods.orderPayWay==3}}">￥0</view>
</view> </view>
<view class="cont-r">x{{item.goodsNum}}</view> <view class="cont-r">x{{item.goodsNum}}</view>
</view> </view>
</view> </view>
<view class="data"> <view class="data">
<view class="data-t display_J_B display_A_C"> <view class="data-t display_J_B display_A_C">
<view class="t-l">商品合计</view> <view class="t-l">商品合计</view>
<view class="t-r t-r__1">￥{{total}}</view> <view class="t-r t-r__1">￥{{total}}</view>
</view> </view>
<view class="data-t display_J_B display_A_C"> <view class="data-t display_J_B display_A_C">
<view class="t-l">运费</view> <view class="t-l">运费</view>
<view class="t-r t-r__2">{{goods.orderPick==1?'自提':goods.orderFreight==0?'包邮':'￥'+goods.orderFreight}}</view> <view class="t-r t-r__2">{{goods.orderPick==1?'自提':goods.orderFreight==0?'包邮':'￥'+goods.orderFreight}}</view>
</view> </view>
<view class="data-t display_J_B display_A_C"> <view class="data-t display_J_B display_A_C">
<view class="t-l">优惠</view> <view class="t-l">优惠</view>
<view class="t-r t-r__3 display_A_C" wx:if='{{goods.orderPayWay!=5&&goods.orderPayWay!=4&&goods.orderPayWay!=3}}'> <view class="t-r t-r__3 display_A_C" wx:if='{{goods.orderPayWay!=5&&goods.orderPayWay!=4&&goods.orderPayWay!=3}}'>
<text>无</text></view> <text>无</text>
<view class="t-r t-r__3 display_A_C" wx:if='{{goods.orderPayWay==5||goods.orderPayWay==4}}'> </view>
<text>{{goods.orderPayWay==4?'现金券':goods.orderPayWay==5?'折扣券':''}}</text>-￥{{goods.orderOtherPay}}</view> <view class="t-r t-r__3 display_A_C" wx:if='{{goods.orderPayWay==5||goods.orderPayWay==4}}'>
<view class="t-r t-r__3 display_A_C" wx:if='{{goods.orderPayWay==3}}'><text>套餐券</text>-1</view> <text>{{goods.orderPayWay==4?'现金券':goods.orderPayWay==5?'折扣券':''}}</text>-￥{{goods.orderOtherPay}}
</view> </view>
<view class="data-t display_J_B"> <view class="t-r t-r__3 display_A_C" wx:if='{{goods.orderPayWay==3}}'><text>套餐券</text>-1</view>
<view class="t-l" style="line-height: 32rpx;">备注</view> </view>
<view class="t-r t-r__2 note">{{goods.orderRemark==''?'无':goods.orderRemark}}</view> <view class="data-t display_J_B">
</view> <view class="t-l" style="line-height: 32rpx;">备注</view>
<view class="data-t display_J_B display_A_C"> <view class="t-r t-r__2 note">{{goods.orderRemark==''?'无':goods.orderRemark}}</view>
<view class="t-l">实际支付</view> </view>
<view class="t-r t-r__4">￥{{goods.orderActualPay==null?'0':goods.orderActualPay}}</view> <view class="data-t display_J_B display_A_C">
</view> <view class="t-l">实际支付</view>
<view class="t-r t-r__4">￥{{goods.orderActualPay==null?'0':goods.orderActualPay}}</view>
</view>
</view> </view>
<view class="order-data"> <view class="order-data">
<view class="order display_J_B display_A_C"> <view class="order display_J_B display_A_C">
<view class="order-l">支付方式</view> <view class="order-l">支付方式</view>
<view class="order-r"> <view class="order-r">
{{goods.orderPayWay==1?'微信支付':goods.orderPayWay==2?'积分支付':goods.orderPayWay==3?'套餐券':goods.orderPayWay==4?'微信支付+现金券':goods.orderPayWay==1?'微信支付+折扣券':''}} {{goods.orderPayWay==1?'微信支付':goods.orderPayWay==2?'积分支付':goods.orderPayWay==3?'套餐券':goods.orderPayWay==4?'微信支付+现金券':goods.orderPayWay==1?'微信支付+折扣券':''}}
</view> </view>
</view> </view>
<view class="order display_J_B display_A_C" wx:if="{{goods.status==2||goods.status==3||goods.status==4}}"> <view class="order display_J_B display_A_C" wx:if="{{goods.status==2||goods.status==3||goods.status==4}}">
<view class="order-l">支付时间</view> <view class="order-l">支付时间</view>
<view class="order-r">{{goods.orderPayTime}}</view> <view class="order-r">{{goods.orderPayTime}}</view>
</view> </view>
<view class="order display_J_B display_A_C" wx:if="{{goods.status==2||goods.status==3||goods.status==4}}"> <view class="order display_J_B display_A_C" wx:if="{{goods.status==2||goods.status==3||goods.status==4}}">
<view class="order-l">自提时间</view> <view class="order-l">自提时间</view>
<view class="order-r">{{goods.orderPickTime}}</view> <view class="order-r">{{goods.orderPickTime}}</view>
</view> </view>
<view class="order display_J_B display_A_C"> <view class="order display_J_B display_A_C">
<view class="order-l">订单编号</view> <view class="order-l">订单编号</view>
<view class="order-r">{{goods.orderNumber}}</view> <view class="order-r">{{goods.orderNumber}}</view>
</view> </view>
<view class="order display_J_B display_A_C"> <view class="order display_J_B display_A_C">
<view class="order-l">物流单号</view> <view class="order-l">物流单号</view>
<view class="order-r">暂无</view> <view class="order-r">暂无</view>
</view> </view>
<view class="order display_J_B display_A_C"> <view class="order display_J_B display_A_C">
<view class="order-l">联系方式</view> <view class="order-l">联系方式</view>
<view class="order-r">{{goods.userPhone}}</view> <view class="order-r">{{goods.userPhone}}</view>
</view> </view>
</view> </view>
<!-- 自提 --> <!-- 自提 -->
<view style="height:100rpx;"></view> <view style="height:100rpx;"></view>
<view class="b-btn display_J_E display_A_C"> <view class="b-btn display_J_E display_A_C">
<!-- <view class="btn" wx:if="{{goods.status==4}}" catchtap="del">删除订单</view> --> <!-- <view class="btn" wx:if="{{goods.status==4}}" catchtap="del">删除订单</view> -->
<view class="btn btn-red" catchtap="confirm" wx:if="{{goods.status==2}}">确认提货</view> <view class="btn btn-red" catchtap="confirm" wx:if="{{goods.status==2}}">确认提货</view>
</view> </view>