|
@@ -1,21 +1,34 @@
|
|
|
<template>
|
|
|
- <zj-page-layout :hasFooter="true" :isScroll="true" :refresherTriggered="refresherTriggered"
|
|
|
- @refresherrefresh="refresherrefresh" @scrolltolower="scrolltolower">
|
|
|
+ <zj-page-layout
|
|
|
+ :hasFooter="true"
|
|
|
+ :isScroll="true"
|
|
|
+ :refresherTriggered="refresherTriggered"
|
|
|
+ @refresherrefresh="refresherrefresh"
|
|
|
+ @scrolltolower="scrolltolower"
|
|
|
+ >
|
|
|
<template slot="header">
|
|
|
<view class="tab-container">
|
|
|
- <u-tabs :scrollable="true" :list="tabList" :current="curTab" @click="changeTab" lineColor="#3D8FFD" :activeStyle="{
|
|
|
- color: '#3D8FFD'
|
|
|
- }" :inactiveStyle="{
|
|
|
- color: '#666666'
|
|
|
-}" itemStyle="height: 88rpx;">
|
|
|
+ <u-tabs
|
|
|
+ :scrollable="true"
|
|
|
+ :list="tabList"
|
|
|
+ :current="curTab"
|
|
|
+ @click="changeTab"
|
|
|
+ lineColor="#3D8FFD"
|
|
|
+ :activeStyle="{
|
|
|
+ color: '#3D8FFD'
|
|
|
+ }"
|
|
|
+ :inactiveStyle="{
|
|
|
+ color: '#666666'
|
|
|
+ }"
|
|
|
+ itemStyle="height: 88rpx;"
|
|
|
+ >
|
|
|
</u-tabs>
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
|
<view class="list-container">
|
|
|
- <block v-for="(item, index) in orderList" :key='index'>
|
|
|
+ <block v-for="(item, index) in orderList" :key="index">
|
|
|
<view class="item" @tap="toOrderDetail(item.orderId, item.orderRefundId)">
|
|
|
-
|
|
|
<!-- 普通订单 -->
|
|
|
<block v-if="tabCurrent != 'REFUND'">
|
|
|
<view class="top">
|
|
@@ -23,7 +36,7 @@
|
|
|
<view class="right">{{ statusFilter(item) }}</view>
|
|
|
</view>
|
|
|
|
|
|
- <block v-for="(goodsItem, goodsIndex) in item.orderDetails" :key='goodsIndex'>
|
|
|
+ <block v-for="(goodsItem, goodsIndex) in item.orderDetails" :key="goodsIndex">
|
|
|
<view class="goods" :class="'goods' + goodsIndex">
|
|
|
<image :src="goodsItem.imgUrl" mode="aspectFill"></image>
|
|
|
<view class="main">
|
|
@@ -41,7 +54,9 @@
|
|
|
|
|
|
<view class="total">
|
|
|
<view class="left">{{ item.createTime }}</view>
|
|
|
- <view class="right">共{{ item.totalNum }}件 订单总额:<text>¥{{ item.payAmount | priceFilter }}</text></view>
|
|
|
+ <view class="right"
|
|
|
+ >共{{ item.totalNum }}件 订单总额:<text>¥{{ item.payAmount | priceFilter }}</text></view
|
|
|
+ >
|
|
|
</view>
|
|
|
</block>
|
|
|
|
|
@@ -54,7 +69,7 @@
|
|
|
|
|
|
<!-- 拒绝申请 -->
|
|
|
<block v-if="item.examineStatus === 'FAIL'">
|
|
|
- <block v-for="(goodsItem, goodsIndex) in item.orderDetails" :key='goodsIndex'>
|
|
|
+ <block v-for="(goodsItem, goodsIndex) in item.orderDetails" :key="goodsIndex">
|
|
|
<view class="goods" :class="'goods' + goodsIndex">
|
|
|
<image :src="goodsItem.imgUrl" mode="aspectFill"></image>
|
|
|
<view class="main">
|
|
@@ -71,13 +86,16 @@
|
|
|
</block>
|
|
|
<view class="total">
|
|
|
<view class="left">{{ item.createTime }}</view>
|
|
|
- <view class="right">共{{ item.totalNum }}件 {{ item.orderStatus == 'NOPAY' ?
|
|
|
- '应付' : '实付' }}总额:<text>¥{{ item.payAmount | priceFilter }}</text></view>
|
|
|
+ <view class="right"
|
|
|
+ >共{{ item.totalNum }}件 {{ item.orderStatus == 'NOPAY' ? '应付' : '实付' }}总额:<text
|
|
|
+ >¥{{ item.payAmount | priceFilter }}</text
|
|
|
+ ></view
|
|
|
+ >
|
|
|
</view>
|
|
|
</block>
|
|
|
<!-- 其他 -->
|
|
|
<block v-else>
|
|
|
- <block v-for="(goodsItem, goodsIndex) in item.orderDetails" :key='goodsIndex'>
|
|
|
+ <block v-for="(goodsItem, goodsIndex) in item.orderDetails" :key="goodsIndex">
|
|
|
<view class="goods" :class="'goods' + goodsIndex" v-if="goodsItem.refund">
|
|
|
<image :src="goodsItem.imgUrl" mode="aspectFill"></image>
|
|
|
<view class="main">
|
|
@@ -94,8 +112,12 @@
|
|
|
</block>
|
|
|
<view class="total">
|
|
|
<view class="left">{{ item.createTime }}</view>
|
|
|
- <view class="right">共{{ getRefundNum(item.orderDetails) }}件 {{ item.orderStatus == 'OVER' ?
|
|
|
- '实退' : '应退' }}总额:<text>¥{{ item.refundAmount | priceFilter }}</text></view>
|
|
|
+ <view class="right"
|
|
|
+ >共{{ getRefundNum(item.orderDetails) }}件
|
|
|
+ {{ item.orderStatus == 'OVER' ? '实退' : '应退' }}总额:<text
|
|
|
+ >¥{{ item.refundAmount | priceFilter }}</text
|
|
|
+ ></view
|
|
|
+ >
|
|
|
</view>
|
|
|
</block>
|
|
|
</block>
|
|
@@ -118,31 +140,61 @@
|
|
|
<view class="tips">请在30分钟内付款</view>
|
|
|
<view class="btns">
|
|
|
<!-- <view class="button gray" @tap.stop="cancelOrder(item.orderId)">取消订单</view> -->
|
|
|
- <view class="button white" v-if="!item.isChangeAddress" @tap.stop="navToPage(`/packageMine/pages/order/changeAddress?orderId=${item.orderId}`)">修改地址</view>
|
|
|
+ <view
|
|
|
+ class="button white"
|
|
|
+ v-if="!item.isChangeAddress"
|
|
|
+ @tap.stop="navToPage(`/packageMine/pages/order/changeAddress?orderId=${item.orderId}`)"
|
|
|
+ >修改地址</view
|
|
|
+ >
|
|
|
<view class="button red" @tap.stop="payOrder(item.orderId)">立即付款</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
<!-- 按钮:待发货 -->
|
|
|
<view class="btn-group" v-if="item.orderStatus == 'DFH'">
|
|
|
- <view class="button white" v-if="!item.isChangeAddress" @tap.stop="navToPage(`/packageMine/pages/order/changeAddress?orderId=${item.orderId}`)">修改地址</view>
|
|
|
+ <view
|
|
|
+ class="button white"
|
|
|
+ v-if="!item.isChangeAddress"
|
|
|
+ @tap.stop="navToPage(`/packageMine/pages/order/changeAddress?orderId=${item.orderId}`)"
|
|
|
+ >修改地址</view
|
|
|
+ >
|
|
|
<view class="button white" @tap.stop="remindShipment(item.orderId)">提醒发货</view>
|
|
|
- <view class="button white" v-if="checkCanReturn(item)" @tap.stop="toApplyReturn(item.orderId)">申请售后</view>
|
|
|
+ <view class="button white" v-if="checkCanReturn(item)" @tap.stop="toApplyReturn(item.orderId)"
|
|
|
+ >申请售后</view
|
|
|
+ >
|
|
|
</view>
|
|
|
<!-- 按钮:待服务 -->
|
|
|
<view class="btn-group" v-if="item.orderStatus == 'YFH'">
|
|
|
<!-- <view class="button gray" @tap.stop="toLogistics(item.companyCode, item.logisticsNo)">查看物流</view> -->
|
|
|
- <view class="button white" v-if="!item.isChangeAddress" @tap.stop="navToPage(`/packageMine/pages/order/changeAddress?orderId=${item.orderId}`)">修改地址</view>
|
|
|
+ <view
|
|
|
+ class="button white"
|
|
|
+ v-if="!item.isChangeAddress"
|
|
|
+ @tap.stop="navToPage(`/packageMine/pages/order/changeAddress?orderId=${item.orderId}`)"
|
|
|
+ >修改地址</view
|
|
|
+ >
|
|
|
<view class="button red" @tap.stop="confirmReceipt(item.orderId)">服务完成</view>
|
|
|
- <view class="button white" v-if="checkCanReturn(item)" @tap.stop="toApplyReturn(item.orderId)">申请售后</view>
|
|
|
+ <view class="button white" v-if="checkCanReturn(item)" @tap.stop="toApplyReturn(item.orderId)"
|
|
|
+ >申请售后</view
|
|
|
+ >
|
|
|
</view>
|
|
|
<!-- 按钮:待评价 -->
|
|
|
<view class="btn-group" v-if="item.orderStatus == 'OVER' && tabCurrent != 'REFUND'">
|
|
|
- <view class="button gray" v-if="item.orderTaxId" @tap.stop="toInvoiceDetail(item.orderTaxId)">查看发票</view>
|
|
|
+ <view class="button gray" v-if="item.orderTaxId" @tap.stop="toInvoiceDetail(item.orderTaxId)"
|
|
|
+ >查看发票</view
|
|
|
+ >
|
|
|
<view class="button white" v-else @tap.stop="toInvoiceForm(item.orderId)">开发票</view>
|
|
|
<!-- <view class="button gray" @tap.stop="toLogistics(item.companyCode, item.logisticsNo)">查看物流</view> -->
|
|
|
- <view class="button gray" @tap.stop="navToPage('/packageWorkorder/pages/userWorkorderList')">服务详情</view>
|
|
|
- <view class="button white" v-if="checkCanReturn(item)" @tap.stop="toApplyReturn(item.orderId)">申请售后</view>
|
|
|
- <view class="button red" v-if="!item.commentService" @tap.stop="navToPage(`/packageMine/pages/order/evaluate?orderId=${item.orderId}`)">评价</view>
|
|
|
+ <view class="button gray" @tap.stop="navToPage('/packageWorkorder/pages/userWorkorderList')"
|
|
|
+ >服务详情</view
|
|
|
+ >
|
|
|
+ <view class="button white" v-if="checkCanReturn(item)" @tap.stop="toApplyReturn(item.orderId)"
|
|
|
+ >申请售后</view
|
|
|
+ >
|
|
|
+ <view
|
|
|
+ class="button red"
|
|
|
+ v-if="!item.commentService"
|
|
|
+ @tap.stop="navToPage(`/packageMine/pages/order/evaluate?orderId=${item.orderId}`)"
|
|
|
+ >评价</view
|
|
|
+ >
|
|
|
</view>
|
|
|
<!-- 按钮:已关闭 -->
|
|
|
<view class="btn-group" v-if="item.orderStatus == 'CLOSE'">
|
|
@@ -162,9 +214,11 @@
|
|
|
</view>
|
|
|
<!-- 按钮:售后中 待买家处理 -->
|
|
|
<view class="btn-group" v-if="item.orderStatus == 'DMJCL'">
|
|
|
- <view class="button red" @tap.stop="toReturnDetail(item.orderRefundId)" v-if="item.examineStatus == 'OK'">提交资料
|
|
|
+ <view class="button red" @tap.stop="toReturnDetail(item.orderRefundId)" v-if="item.examineStatus == 'OK'"
|
|
|
+ >提交资料
|
|
|
</view>
|
|
|
- <view class="button white" @tap.stop="toApplyReturn(item.orderId)" v-if="item.examineStatus == 'FAIL'">重新申请
|
|
|
+ <view class="button white" @tap.stop="toApplyReturn(item.orderId)" v-if="item.examineStatus == 'FAIL'"
|
|
|
+ >重新申请
|
|
|
</view>
|
|
|
</view>
|
|
|
<!-- 按钮:售后中 待商家收货 -->
|
|
@@ -176,7 +230,6 @@
|
|
|
<view class="button gray" @tap.stop="toReturnDetail(item.orderRefundId)">售后详情</view>
|
|
|
</view>
|
|
|
</block>
|
|
|
-
|
|
|
</view>
|
|
|
</block>
|
|
|
</view>
|
|
@@ -186,7 +239,7 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { weixinPay, mini_env } from '@/common/utils/util.js';
|
|
|
+import { weixinPay, mini_env } from '@/common/utils/util.js'
|
|
|
|
|
|
export default {
|
|
|
filters: {
|
|
@@ -209,10 +262,10 @@ export default {
|
|
|
DSJSH: '待商家收货',
|
|
|
DMJCL: '待买家处理',
|
|
|
OVER: '退款成功',
|
|
|
- CANCEL: '已取消',
|
|
|
+ CANCEL: '已取消'
|
|
|
}
|
|
|
return statusMap[val]
|
|
|
- },
|
|
|
+ }
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
@@ -223,7 +276,7 @@ export default {
|
|
|
{ key: 'DFH', name: '待服务' },
|
|
|
{ key: 'YFH', name: '服务中' },
|
|
|
{ key: 'OVER', name: '待评价' },
|
|
|
- { key: 'REFUND', name: '售后/退款' },
|
|
|
+ { key: 'REFUND', name: '售后/退款' }
|
|
|
],
|
|
|
tabCurrent: '', // 当前tab状态
|
|
|
orderList: [], // 订单列表
|
|
@@ -231,71 +284,75 @@ export default {
|
|
|
refresherTriggered: false, // 下拉刷新状态
|
|
|
pageNum: 1,
|
|
|
autoDetailId: null, // 自动跳转到详情页id
|
|
|
- canRemindShipment: true, // 能否点击提醒发货
|
|
|
+ canRemindShipment: true // 能否点击提醒发货
|
|
|
}
|
|
|
},
|
|
|
|
|
|
computed: {
|
|
|
curTab() {
|
|
|
- return this.tabList.map(item => item.key).indexOf(this.tabCurrent) || 0;
|
|
|
+ return this.tabList.map(item => item.key).indexOf(this.tabCurrent) || 0
|
|
|
}
|
|
|
},
|
|
|
|
|
|
async onLoad({ tab, orderId }) {
|
|
|
- this.tabCurrent = tab;
|
|
|
- console.log(this.tabCurrent);
|
|
|
+ this.tabCurrent = tab
|
|
|
+ console.log(this.tabCurrent)
|
|
|
if (orderId) {
|
|
|
- this.autoDetailId = orderId;
|
|
|
+ this.autoDetailId = orderId
|
|
|
}
|
|
|
- this.getOrderList();
|
|
|
+ this.getOrderList()
|
|
|
|
|
|
- this.configInfo = await this.$getConfigInfo();
|
|
|
+ this.configInfo = await this.$getConfigInfo()
|
|
|
|
|
|
- this.crossPage.$on('refreshOrderList', (data) => {
|
|
|
+ this.crossPage.$on('refreshOrderList', data => {
|
|
|
// if(data) {
|
|
|
// this.tabCurrent = 'REFUND';
|
|
|
// }
|
|
|
- this.refreshList();
|
|
|
+ this.refreshList()
|
|
|
})
|
|
|
},
|
|
|
|
|
|
onUnload() {
|
|
|
- this.crossPage.$off('refreshOrderList');
|
|
|
+ this.crossPage.$off('refreshOrderList')
|
|
|
},
|
|
|
|
|
|
methods: {
|
|
|
getOrderList() {
|
|
|
- this.loadStatus = 1;
|
|
|
- let url = '';
|
|
|
- let orderStatus = '';
|
|
|
+ this.loadStatus = 1
|
|
|
+ let url = ''
|
|
|
+ let orderStatus = ''
|
|
|
if (this.tabCurrent == 'REFUND') {
|
|
|
- url = '/order/refund/list';
|
|
|
- orderStatus = '';
|
|
|
+ url = '/order/refund/list'
|
|
|
+ orderStatus = ''
|
|
|
} else {
|
|
|
- url = '/order/my/order';
|
|
|
- orderStatus = this.tabCurrent;
|
|
|
+ url = '/order/my/order'
|
|
|
+ orderStatus = this.tabCurrent
|
|
|
}
|
|
|
- this.$api.get(url, {
|
|
|
- pageNo: this.pageNum,
|
|
|
- pageSize: 10,
|
|
|
- orderStatus: orderStatus,
|
|
|
- userId: this.$store.state.user.userId
|
|
|
- }).then(res => {
|
|
|
- this.loadStatus = 0;
|
|
|
- let list = res.data.records;
|
|
|
- if (list.length < 10) {
|
|
|
- this.loadStatus = 2;
|
|
|
- }
|
|
|
- this.orderList = this.orderList.concat(list);
|
|
|
+ this.$api
|
|
|
+ .get(url, {
|
|
|
+ pageNo: this.pageNum,
|
|
|
+ pageSize: 10,
|
|
|
+ orderStatus: orderStatus,
|
|
|
+ userId: this.$store.state.user.userId
|
|
|
+ })
|
|
|
+ .then(res => {
|
|
|
+ this.loadStatus = 0
|
|
|
+ let list = res.data.records
|
|
|
+ if (list.length < 10) {
|
|
|
+ this.loadStatus = 2
|
|
|
+ }
|
|
|
+ this.orderList = this.orderList.concat(list)
|
|
|
|
|
|
- if (this.autoDetailId) {
|
|
|
- this.toOrderDetail(this.autoDetailId);
|
|
|
- }
|
|
|
- }).catch(() => {
|
|
|
- this.loadStatus = 2;
|
|
|
- }).finally(res => {
|
|
|
- this.refresherTriggered = false;
|
|
|
- })
|
|
|
+ if (this.autoDetailId) {
|
|
|
+ this.toOrderDetail(this.autoDetailId)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ .catch(() => {
|
|
|
+ this.loadStatus = 2
|
|
|
+ })
|
|
|
+ .finally(res => {
|
|
|
+ this.refresherTriggered = false
|
|
|
+ })
|
|
|
},
|
|
|
|
|
|
statusFilter(item) {
|
|
@@ -310,56 +367,62 @@ export default {
|
|
|
TIMEOUT: '超时未支付'
|
|
|
}
|
|
|
if (item.orderStatus == 'OVER' && item.commentService) {
|
|
|
- return '已完成';
|
|
|
+ return '已完成'
|
|
|
} else {
|
|
|
- return statusMap[item.orderStatus];
|
|
|
+ return statusMap[item.orderStatus]
|
|
|
}
|
|
|
},
|
|
|
|
|
|
// 滚动到底部
|
|
|
scrolltolower(e) {
|
|
|
if (this.loadStatus === 0) {
|
|
|
- this.pageNum++;
|
|
|
- this.getOrderList();
|
|
|
+ this.pageNum++
|
|
|
+ this.getOrderList()
|
|
|
}
|
|
|
},
|
|
|
|
|
|
// 触发下拉刷新
|
|
|
async refresherrefresh(e) {
|
|
|
- this.refresherTriggered = true;
|
|
|
- this.refreshList();
|
|
|
+ this.refresherTriggered = true
|
|
|
+ this.refreshList()
|
|
|
},
|
|
|
|
|
|
refreshList() {
|
|
|
- this.orderList = [];
|
|
|
- this.pageNum = 1;
|
|
|
- this.getOrderList();
|
|
|
+ this.orderList = []
|
|
|
+ this.pageNum = 1
|
|
|
+ this.getOrderList()
|
|
|
},
|
|
|
|
|
|
getRefundNum(orderDetails) {
|
|
|
- let refundNum = 0;
|
|
|
+ let refundNum = 0
|
|
|
orderDetails.forEach(item => {
|
|
|
if (item.refund) {
|
|
|
- refundNum = refundNum + item.refundNum;
|
|
|
+ refundNum = refundNum + item.refundNum
|
|
|
}
|
|
|
})
|
|
|
- return refundNum;
|
|
|
+ return refundNum
|
|
|
},
|
|
|
|
|
|
// 检查是否可以申请售后(根据orderShareStatus, payTypeId)
|
|
|
checkCanReturn(item) {
|
|
|
- const hasRefund = item.orderDetails.some(o => o.refund);
|
|
|
- if (!item.orderShareStatus || item.orderShareStatus === 'OVER' || item.orderShareStatus === 'CANCEL' || item.payTypeId == 'STORE' || hasRefund) {
|
|
|
- return false;
|
|
|
+ const hasRefund = item.orderDetails.some(o => o.refund)
|
|
|
+ if (
|
|
|
+ !item.orderShareStatus ||
|
|
|
+ item.orderShareStatus === 'OVER' ||
|
|
|
+ item.orderShareStatus === 'CANCEL' ||
|
|
|
+ item.payTypeId == 'STORE' ||
|
|
|
+ hasRefund
|
|
|
+ ) {
|
|
|
+ return false
|
|
|
} else {
|
|
|
- return true;
|
|
|
+ return true
|
|
|
}
|
|
|
},
|
|
|
|
|
|
// 切换类型
|
|
|
changeTab(item) {
|
|
|
- this.tabCurrent = item.key;
|
|
|
- this.refreshList();
|
|
|
+ this.tabCurrent = item.key
|
|
|
+ this.refreshList()
|
|
|
},
|
|
|
|
|
|
// 申请退款
|
|
@@ -371,7 +434,7 @@ export default {
|
|
|
|
|
|
// 去订单详情
|
|
|
toOrderDetail(orderId = '', orderRefundId = '') {
|
|
|
- this.autoDetailId = null;
|
|
|
+ this.autoDetailId = null
|
|
|
if (orderRefundId) {
|
|
|
return this.$navToPage({
|
|
|
url: '/packageMine/pages/order/return/detail?orderRefundId=' + orderRefundId
|
|
@@ -386,121 +449,133 @@ export default {
|
|
|
cancelOrder(orderId) {
|
|
|
this.$modal({
|
|
|
content: '确定要取消订单吗?'
|
|
|
- }).then(() => {
|
|
|
- this.$api.post('/order/cancel', {
|
|
|
- orderId
|
|
|
- }).then(res => {
|
|
|
- this.refreshList();
|
|
|
- this.$successToast();
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ this.$api
|
|
|
+ .post('/order/cancel', {
|
|
|
+ orderId
|
|
|
+ })
|
|
|
+ .then(res => {
|
|
|
+ this.refreshList()
|
|
|
+ this.$successToast()
|
|
|
+ })
|
|
|
})
|
|
|
- }).catch(() => { })
|
|
|
+ .catch(() => {})
|
|
|
},
|
|
|
|
|
|
// 服务完成
|
|
|
confirmReceipt(orderId) {
|
|
|
this.$modal({
|
|
|
content: '请确认是否已完成服务?'
|
|
|
- }).then(() => {
|
|
|
- this.$api.post('/order/ack', {
|
|
|
- orderId
|
|
|
- }).then(res => {
|
|
|
- this.refreshList();
|
|
|
- this.$successToast();
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ this.$api
|
|
|
+ .post('/order/ack', {
|
|
|
+ orderId
|
|
|
+ })
|
|
|
+ .then(res => {
|
|
|
+ this.refreshList()
|
|
|
+ this.$successToast()
|
|
|
+ })
|
|
|
})
|
|
|
- }).catch(() => { })
|
|
|
+ .catch(() => {})
|
|
|
},
|
|
|
|
|
|
// 立即付款
|
|
|
payOrder(orderId) {
|
|
|
- mini_env((bool) => {
|
|
|
- let that = this;
|
|
|
- this.$api.post('/order/wait/pay', {
|
|
|
- userId: this.$store.state.user.userId,
|
|
|
- orderId: orderId,
|
|
|
- ...(() => {
|
|
|
- if (bool) {
|
|
|
- return {
|
|
|
- miniPay: true,
|
|
|
- openId: this.$store.state.user.miniOpenId
|
|
|
+ mini_env(bool => {
|
|
|
+ let that = this
|
|
|
+ this.$api
|
|
|
+ .post('/order/wait/pay', {
|
|
|
+ userId: this.$store.state.user.userId,
|
|
|
+ orderId: orderId,
|
|
|
+ ...(() => {
|
|
|
+ if (bool) {
|
|
|
+ return {
|
|
|
+ miniPay: true,
|
|
|
+ openId: this.$store.state.user.miniOpenId
|
|
|
+ }
|
|
|
}
|
|
|
+ return {}
|
|
|
+ })()
|
|
|
+ })
|
|
|
+ .then(res => {
|
|
|
+ if (bool) {
|
|
|
+ uniWebview.navigateTo({
|
|
|
+ url: `/pages/pay/pay?${Object.entries({
|
|
|
+ ...res.data,
|
|
|
+ payPackage: res.data.payPackage.split('=')[0] || '',
|
|
|
+ payPackageVal: res.data.payPackage.split('=')[1] || ''
|
|
|
+ })
|
|
|
+ .map(item => item.join('='))
|
|
|
+ .join('&')}`
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ weixinPay(res.data, function (res) {
|
|
|
+ that.$successToast('支付成功')
|
|
|
+ that.pageNum = 1
|
|
|
+ that.getOrderList()
|
|
|
+ that.requestMessage()
|
|
|
+ })
|
|
|
}
|
|
|
- return {}
|
|
|
- })()
|
|
|
- }).then(res => {
|
|
|
- if (bool) {
|
|
|
- uniWebview.navigateTo({
|
|
|
- url: `/pages/pay/pay?${Object.entries({
|
|
|
- ...res.data,
|
|
|
- payPackage: res.data.payPackage.split("=")[0] || "",
|
|
|
- payPackageVal: res.data.payPackage.split("=")[1] || ""
|
|
|
- }).map(item => item.join("=")).join("&")}`
|
|
|
- })
|
|
|
- } else {
|
|
|
- weixinPay(res.data, function (res) {
|
|
|
- that.$successToast('支付成功');
|
|
|
- that.pageNum = 1;
|
|
|
- that.getOrderList();
|
|
|
- that.requestMessage();
|
|
|
- })
|
|
|
- }
|
|
|
- })
|
|
|
+ })
|
|
|
})
|
|
|
},
|
|
|
|
|
|
// 消息推送
|
|
|
requestMessage() {
|
|
|
- let that = this;
|
|
|
+ let that = this
|
|
|
uni.showModal({
|
|
|
title: '温馨提示',
|
|
|
content: '为更好的促进您与买家的交流,需要在您的订单成交时向您发送消息',
|
|
|
- confirmText: "同意",
|
|
|
- cancelText: "拒绝",
|
|
|
+ confirmText: '同意',
|
|
|
+ cancelText: '拒绝',
|
|
|
success: function (res) {
|
|
|
if (res.confirm) {
|
|
|
- let tmplIds = [that.configInfo.template];
|
|
|
+ let tmplIds = [that.configInfo.template]
|
|
|
uni.requestSubscribeMessage({
|
|
|
tmplIds: tmplIds,
|
|
|
success(res) {
|
|
|
- let status = null;
|
|
|
+ let status = null
|
|
|
tmplIds.map((item, index) => {
|
|
|
if (res[item] == 'accept') {
|
|
|
- status = 'accept';
|
|
|
+ status = 'accept'
|
|
|
}
|
|
|
})
|
|
|
if (status == 'accept') {
|
|
|
- that.$successToast('订阅成功');
|
|
|
+ that.$successToast('订阅成功')
|
|
|
} else {
|
|
|
- that.$toast('订阅取消');
|
|
|
+ that.$toast('订阅取消')
|
|
|
}
|
|
|
},
|
|
|
fail(res) {
|
|
|
- console.log(res);
|
|
|
- that.$toast('订阅失败');
|
|
|
+ console.log(res)
|
|
|
+ that.$toast('订阅失败')
|
|
|
}
|
|
|
})
|
|
|
} else if (res.cancel) {
|
|
|
uni.showModal({
|
|
|
title: '温馨提示',
|
|
|
content: '拒绝后您将无法获取实时的与卖家(买家)的交易消息',
|
|
|
- confirmText: "知道了",
|
|
|
+ confirmText: '知道了',
|
|
|
showCancel: false,
|
|
|
- success: function (res) {
|
|
|
-
|
|
|
- }
|
|
|
- });
|
|
|
+ success: function (res) {}
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
- });
|
|
|
+ })
|
|
|
},
|
|
|
|
|
|
// 开发票
|
|
|
toInvoiceForm(orderId = '', orderRefundId = '') {
|
|
|
- this.navToPage('/packageMine/pages/invoice/form?orderType=ORDER&orderId=' + orderId + '&orderRefundId=' + orderRefundId);
|
|
|
+ this.navToPage(
|
|
|
+ '/packageMine/pages/invoice/form?orderType=ORDER&orderId=' + orderId + '&orderRefundId=' + orderRefundId
|
|
|
+ )
|
|
|
},
|
|
|
|
|
|
// 发票详情
|
|
|
toInvoiceDetail(orderTaxId = '') {
|
|
|
- this.navToPage('/packageMine/pages/invoice/detail?orderTaxId=' + orderTaxId);
|
|
|
+ this.navToPage('/packageMine/pages/invoice/detail?orderTaxId=' + orderTaxId)
|
|
|
},
|
|
|
|
|
|
// 去售后详情
|
|
@@ -525,24 +600,28 @@ export default {
|
|
|
|
|
|
// 提醒发货
|
|
|
remindShipment(orderId) {
|
|
|
- if (!this.canRemindShipment) return this.$toast('请勿频繁操作');
|
|
|
- this.canRemindShipment = false;
|
|
|
- setTimeout(() => { this.canRemindShipment = true }, 3000)
|
|
|
-
|
|
|
- this.$api.post('/order/notice', {
|
|
|
- orderId: orderId,
|
|
|
- userId: this.$store.state.user.userId
|
|
|
- }).then(res => {
|
|
|
- this.$successToast('提醒发货成功');
|
|
|
- })
|
|
|
- },
|
|
|
+ if (!this.canRemindShipment) return this.$toast('请勿频繁操作')
|
|
|
+ this.canRemindShipment = false
|
|
|
+ setTimeout(() => {
|
|
|
+ this.canRemindShipment = true
|
|
|
+ }, 3000)
|
|
|
+
|
|
|
+ this.$api
|
|
|
+ .post('/order/notice', {
|
|
|
+ orderId: orderId,
|
|
|
+ userId: this.$store.state.user.userId
|
|
|
+ })
|
|
|
+ .then(res => {
|
|
|
+ this.$successToast('提醒发货成功')
|
|
|
+ })
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss">
|
|
|
.tab-container {
|
|
|
- background: #FFFFFF;
|
|
|
+ background: #ffffff;
|
|
|
}
|
|
|
|
|
|
.list-container {
|
|
@@ -551,7 +630,7 @@ export default {
|
|
|
.item {
|
|
|
@include zj-card;
|
|
|
margin-top: 20rpx;
|
|
|
- background: #FFFFFF;
|
|
|
+ background: #ffffff;
|
|
|
border-radius: 20rpx;
|
|
|
padding: 0 20rpx;
|
|
|
|
|
@@ -700,7 +779,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
&.red {
|
|
|
- color: #FFFFFF;
|
|
|
+ color: #ffffff;
|
|
|
border: 1px solid $theme-color;
|
|
|
background: $theme-color;
|
|
|
}
|