clunt
/
dingdong-mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

售后，加价及支付相关金额问题修复

This commit is contained in:
donqi 2022-10-17 01:15:23 +08:00
parent a4b7fa306f
commit ebead5eb61
4 changed files with 50 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/js/request.js
View File

@ -12,7 +12,7 @@ export default {
})
// request 触发前拼接 url
// args.url = 'https://www.opsoul.com' + args.url;
// args.url = 'http://192.168.2.27:80' + args.url;
// args.url = 'http://192.168.2.42:80' + args.url;
args.url = 'http://127.0.0.1:80' + args.url;
if (args.data && Object.prototype && Object.prototype.toString.call(args.data) === '[object Object]') {
args.data.deptId = globalData.deptId;

14
pages/my/my-order.vue
View File

@ -39,15 +39,19 @@
</view>
<view class="margin-right-sm"><text>优惠</text><text class="text-price text-red">{{shopOrder.discountMoney}}</text>
</view>
<view class="margin-right-sm" v-if="shopOrder.changeMoney"><text>加价</text><text class="text-price text-red">{{shopOrder.changeMoney}}</text>
<view class="margin-right-sm" v-if="shopOrder.payStatus == 4"><text>已付款</text><text class="text-price text-red">{{shopOrder.payMoney - shopOrder.changeMoney}}</text>
</view>
<view class="text-lg"><text>需付款</text><text
class="text-price text-red text-lg text-bold">{{shopOrder.payMoney}}</text></view>
<view class="text-lg" v-if="shopOrder.payStatus == 1"><text>实付款</text><text
class="text-price text-red text-lg text-bold">{{shopOrder.payMoney}}</text></view>
<view class="text-lg" v-else-if="shopOrder.payStatus == 0"><text>需付款</text><text
class="text-price text-red text-lg text-bold">{{shopOrder.payMoney}}</text></view>
<view class="text-lg" v-else-if="shopOrder.payStatus == 4"><text>需付款</text><text
class="text-price text-red text-lg text-bold">{{shopOrder.changeMoney}}</text></view>
</view>
<view v-if="orderType === 0" class="padding-tb-sm">
<view class="flex justify-end">
<button v-if="[0,1].indexOf(shopOrder.orderStatus) >= 0" class="cu-btn bg-gray margin-right-sm shadow-blur" @click="showModalByRef('confirmModal', shopOrder)">取消订单</button>
<button v-if="shopOrder.payStatus === 0" class="cu-btn bg-main-color shadow-blur margin-right-sm" @click="wxpay(shopOrder)">付款</button>
<button v-if="shopOrder.payStatus != 1" class="cu-btn bg-main-color shadow-blur margin-right-sm" @click="wxpay(shopOrder)">付款</button>
<button class="cu-btn bg-main-color shadow-blur" @click="showServDetail(shopOrder)">查看</button>
</view>
</view>
@ -174,7 +178,7 @@
params.orderStatus = orderStatus;
}
if (this.tabCur === 0) {
params.payStatus = 0;
params.payStatusList = "0,4";
params.exceptOrderStatus = 6;
}
let res = null;

23
pages/my/serv-detail.vue
View File

@ -95,7 +95,8 @@
<view class="cu-bar solid-bottom">
<view class="action bar-first-action">
<text class="cuIcon-titles text-main-color"></text> 服务记录
</view>
</view>
<view class='cu-tag bg-gray radius light' v-if="item.orderStatus == 6">已取消</view>
<view class='cu-tag bg-purple radius light margin-right-sm'>编码:{{item.orderDetailCode}}</view>
</view>
<view class="margin-top-sm">
@ -107,20 +108,20 @@
<simple-product-picked :pickedList="item.orderStandardList" :columnTitleArr="servedColumnHeaders"
:valFieldArr="servedValFields"></simple-product-picked>
</view>
<view v-if="item.financialChangeRecord" class="bg-white">
<view v-if="item.financialChangeRecord && item.financialChangeRecord.length > 0" class="bg-white">
<view class="cu-bar solid-bottom">
<view class="action bar-first-action">
<text class="cuIcon-title text-main-color"></text> 加价记录
</view>
</view>
<view class="padding-tb-sm">
<view class="padding-tb-sm" v-for="(changeRecord, changeRecordIndex) in item.financialChangeRecord">
<view>
<text>加价金额：</text>
<text>{{item.financialChangeRecord.changeMoney}}</text>
<text>{{changeRecord.changeMoney}}</text>
</view>
<view>
<text>加价备注：</text>
<text>{{item.financialChangeRecord.remark}}</text>
<text>{{changeRecord.remark}}</text>
</view>
</view>
</view>
@ -268,7 +269,17 @@
<view class='cu-tag bg-main-color radius light'>客户最终确认</view>
<view class="margin-top-xs">{{afterServiceRecord.customerFinalCheck === 1 ? '同意' : '不同意'}}
</view>
<view class="text-red" v-if="afterServiceRecord.customerFinalCheck === 0">订单已申请平台介入</view>
<view class="text-red" v-if="afterServiceRecord.customerFinalCheck === 0">订单已申请平台介入</view>
<view v-else-if="afterServiceRecord.customerFinalCheck === 1">
<view v-if="afterServiceRecord.originalRefund > 0">
<text>本单退款，系统已发起原路退回</text>
<text class="text-red">{{afterServiceRecord.originalRefund}}</text>
<text>元，有其余部分的以双方沟通操作为准（注：银行按工作日到帐，节假日顺延到账）。</text>
</view>
<view v-else-if="afterServiceRecord.originalRefund == 0 && servDetail.payStatus == 0">
<text>本单未支付，实际退回0.00元</text>
</view>
</view>
</view>
</view>
</view>

36
pages/order/pay-result.vue
View File

@ -24,21 +24,31 @@
servOrderTabList: [{
// type: -1,
name: '待付款'
},
// {
// type: 0,
// name: '待接单'
// }, {
// type: 1,
// name: '待排期'
// }, {
// type: 2,
// name: '待上门'
// },
{
type: '0,1,2',
name: '待服务'
}, {
type: 0,
name: '待接单'
}, {
type: 1,
name: '待排期'
}, {
type: 2,
name: '待上门'
}, {
type: 3,
type: '3,4',
name: '服务中'
}, {
type: 4,
name: '完成待确认'
},
// {
// type: 4,
// name: '待确认'
// },
{
// type: 4,
name: '售后中'
}, {
type: 5,
name: '已完成'