front/java-mall-admin
7
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

dev2 #1

Open
panjunjie wants to merge 174 commits from dev2 into main
pull from: dev2
merge into: front:main
Conversation 0 Commits 174 Files Changed 776 +12 -1
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0211c1d57c - Show all commits

11
src/views/order/onlineOrder/index.vue
View File

@ -258,9 +258,12 @@
<el-button v-if="row.order_state_id === 2010" plain size="mini">{{ formatStateId(row) }}</el-button>
<el-button v-else-if="row.order_state_id === 2011" plain size="mini">{{ formatStateId(row) }}</el-button>
<el-button v-else-if="row.order_state_id === 2013" plain size="mini">{{ formatStateId(row) }}</el-button>
<el-button v-else-if="row.order_state_id === 2016" plain size="mini">{{ formatStateId(row) }}</el-button>
<el-button v-else-if="row.order_state_id === 2020" plain size="mini" type="warning">{{ formatStateId(row) }}</el-button>
<el-button v-else-if="row.order_state_id === 2030" plain size="mini" type="danger">{{ formatStateId(row) }}</el-button>
<el-button v-else-if="row.order_state_id === 2040" plain size="mini" type="info">{{ formatStateId(row) }}</el-button>
<el-button v-else-if="row.order_state_id === 2050" plain size="mini" type="info">{{ formatStateId(row) }}</el-button>
<el-button v-else-if="row.order_state_id === 2050" plain size="mini" type="info">{{ formatStateId(row) }}</el-button>
<el-button v-else-if="row.order_state_id === 2060" plain size="mini" type="success">{{ formatStateId(row) }}</el-button>
<el-button v-else-if="row.order_state_id === 2070" plain size="mini" type="plain">{{ formatStateId(row) }}</el-button>
<el-button v-else>
@ -768,14 +771,22 @@
? this.__('待审核')
: row.order_state_id === 2013
? this.__('待财务审核')
: row.order_state_id === 2016
? this.__('已经付款')
: row.order_state_id === 2020
? this.__('待配货')
: row.order_state_id === 2030
? this.__('待发货')
: row.order_state_id === 2040
? this.__('待签收')
: row.order_state_id === 2050
? this.__('已签收')
: row.order_state_id === 2060
? this.__('已完成')
: row.order_state_id === 2070
? this.__('已取消')
: row.order_state_id === 2080
? this.__('自提')
: row.order_state_id === 2010
? this.__('待付款')
: this.__('已关闭')

2
src/views/product/productList/components/addProductEdit.vue
View File

@ -2077,7 +2077,7 @@ export default {
} else {
if (shop_product_image.length) {
let image = shop_product_image?.[0]
obj.main_color_img = image.item_image_default
obj.main_color_img = image.item_image_default || ''
let other = image.item_image_other
if (other) {
obj.color_img = other.split(',')