From 585ff1cd29e9875f5f2a0fa2b0fdc876c5c6301f Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 26 一月 2026 18:26:31 +0800
Subject: [PATCH] 小程序 接口开发
---
admin/src/views/business/goodsorder.vue | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/admin/src/views/business/goodsorder.vue b/admin/src/views/business/goodsorder.vue
index ac49b58..4350e14 100644
--- a/admin/src/views/business/goodsorder.vue
+++ b/admin/src/views/business/goodsorder.vue
@@ -85,7 +85,7 @@
<span v-if="item.status ==1" class="orange">{{item.receiveType==1?'寰呰嚜鎻�':'寰呭彂璐�'}}</span>
<span v-if="item.status ==2" class="orange">寰呮敹璐�</span>
<span v-if="item.status ==3" class="grey">浜ゆ槗瀹屾垚</span>
- <span v-if="item.status ==4" class="grey">宸插叧闂�</span>
+ <span v-if="item.status ==4" class="grey">宸插彇娑�</span>
<span v-if="item.status ==6" class="grey">宸查��娆�</span>
</div>
</div>
@@ -107,8 +107,8 @@
<div class="mark" v-if="item.sysInfo&& item.sysInfo.length" >澶囨敞锛歿{item.sysInfo}}</div>
</div>
<div class="member-message right-border">
- <div class="el-icon-user" style="padding: 5px 5px;">{{ item.linkname }}</div>
- <div class="el-icon-phone-outline" style="padding: 10px 5px;color: #777;font-size: 13px;">{{ item.linkphone }}</div>
+ <div class="el-icon-user" style="padding: 5px 5px;width: 100%;">{{ item.linkname }}</div>
+ <div class="el-icon-phone-outline" style="padding: 10px 5px;width: 100%;color: #777;font-size: 13px;">{{ item.linkphone }}</div>
</div>
<div class="address-message right-border right-border" style="padding-top: 15px;" >
<div class="underway el-icon-sell" >{{item.receiveType==1?'鍒板簵鑷彁':'蹇�掗厤閫�'}} </div>
@@ -116,7 +116,7 @@
</div>
<div class="price-message right-border">
<div class="underway" >璁㈠崟鎬讳环锛氾骏{{ (item.totalPrice||0).toFixed(2) }}</div>
- <div class="price-info">鍟嗗搧鎬讳环锛氾骏{{ ((item.totalPrice||0)-(item.price || 0)).toFixed(2)}}</div>
+ <div class="price-info">鍟嗗搧鎬讳环锛氾骏{{ ((item.totalPrice||0)-(item.mailPrice || 0)).toFixed(2)}}</div>
<div class="price-info">鐗╂祦杩愯垂锛氾骏{{ (item.mailPrice || 0).toFixed(2)}}</div>
<div class="price-info">绉垎鎶垫墸锛�-锟{ (item.integral || 0 ).toFixed(2)}}</div>
<div class="price-info">浼樻儬閲戦锛�-锟{ (item.couponPrice).toFixed(2) }}</div>
@@ -125,9 +125,9 @@
<div class="action">
<el-button v-if="item.status==1 && item.receiveType!=1" style=" width: 80%;" type="primary" @click="$refs.operaShipmentsWindow.open('鍙戣揣', item)">鍙戣揣</el-button>
<div></div>
- <el-button v-if="item.status == 0" style="color: red; " type="text" @click="cancelOrder(item)">鍙栨秷璁㈠崟</el-button>
+ <el-button v-if="item.status == 0 || item.status==1" style="color: red; " type="text" @click="$refs.OperaOrderCancelWindow.open('鍙栨秷璁㈠崟', item)">鍙栨秷璁㈠崟</el-button>
<div></div>
- <el-button v-if="item.status == 3" style="color: red " type="text" @click="cancelOrder(item)">璁㈠崟閫�娆�</el-button>
+ <el-button v-if="item.status == 3" style="color: red " type="text" @click="$refs.OperaOrderRefundWindow.open('璁㈠崟閫�娆�', item)">璁㈠崟閫�娆�</el-button>
<div></div>
<el-button v-if="item.status==2 && item.receiveType!=1" style="color: #666; " type="text" @click="$refs.operaShipmentsWindow.open('蹇�掍俊鎭彉鏇�', item)">蹇�掑彉鏇�</el-button>
<div></div>
@@ -149,7 +149,9 @@
<!-- 鏂板缓/淇敼 -->
<OperaShipmentsWindow ref="operaShipmentsWindow" @success="search"/>
<OperaOrderMarkWindow ref="operaOrderMarkWindow" @success="handlePageChange"/>
- <OperaGoodsOrderDetail ref="operaGoodsOrderDetail"/>
+ <OperaOrderRefundWindow ref="OperaOrderRefundWindow" @success="handlePageChange"/>
+ <OperaOrderCancelWindow ref="OperaOrderCancelWindow" @success="handlePageChange"/>
+ <OperaGoodsOrderDetail ref="operaGoodsOrderDetail" @success="handlePageChange"/>
</TableLayout>
</template>
@@ -159,11 +161,13 @@
import Pagination from '@/components/common/Pagination'
import OperaShipmentsWindow from '@/components/business/OperaShipmentsWindow'
import OperaOrderMarkWindow from '@/components/business/OperaOrderMarkWindow'
+import OperaOrderCancelWindow from '@/components/business/OperaOrderCancelWindow'
import OperaGoodsOrderDetail from '@/components/business/OperaGoodsOrderDetail'
+import OperaOrderRefundWindow from '@/components/business/OperaOrderRefundWindow'
export default {
name: 'Goodsorder',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaShipmentsWindow, OperaOrderMarkWindow, OperaGoodsOrderDetail },
+ components: { OperaOrderRefundWindow, TableLayout, Pagination, OperaShipmentsWindow, OperaOrderMarkWindow, OperaGoodsOrderDetail, OperaOrderCancelWindow },
data () {
return {
status: '10',
@@ -175,7 +179,7 @@
{ name: '2', label: '寰呮敹璐�', count: 0 },
{ name: '3', label: '浜ゆ槗瀹屾垚', count: 0 },
{ name: '6', label: '宸查��娆�', count: 0 },
- { name: '4', label: '浜ゆ槗鍏抽棴', count: 0 }],
+ { name: '4', label: '宸插彇娑�', count: 0 }],
// 鎼滅储
searchForm: {
id: '',
@@ -187,7 +191,7 @@
nickName: '',
starttime: null,
enttime: null
- },
+ }
}
},
created () {
@@ -252,7 +256,7 @@
this.search()
},
cancelOrder (item) {
- this.$dialog.cancelOrder(`纭畾鍙栨秷璁㈠崟锛�${item.code}锛焋)
+ this.$dialog.messageWaring(`纭畾鍙栨秷璁㈠崟锛�${item.code}锛焋)
.then(() => {
})
@@ -339,7 +343,7 @@
flex: 0.4;
}
.address-message {
- flex: 0.6;
+ flex: 0.7;
display: -webkit-box;
-webkit-box-orient: vertical;
overflow: hidden;
@@ -382,7 +386,7 @@
}
}
.action {
- flex: 0.5;
+ flex: 0.4;
box-sizing: border-box;
padding: 10px;
text-align: center;
--
Gitblit v1.9.3