From 975d24764bd4bb151de9c5c9c58cd2253787dea4 Mon Sep 17 00:00:00 2001
From: sj <1304317391@qq.com>
Date: Thu, 1 Dec 2022 14:53:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E6=B8=85?=
 =?UTF-8?q?=E7=90=86=E7=BC=93=E5=AD=98=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bxg/activity/seckill/index.vue |  2 +-
 src/views/bxg/shop/goods/form.vue        |  3 ++-
 src/views/bxg/shop/order/index.vue       | 10 +++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/views/bxg/activity/seckill/index.vue b/src/views/bxg/activity/seckill/index.vue
index f3eb320..f92dc11 100644
--- a/src/views/bxg/activity/seckill/index.vue
+++ b/src/views/bxg/activity/seckill/index.vue
@@ -32,7 +32,7 @@
       </el-table-column>
       <el-table-column prop="title" label="产品标题" />
       <el-table-column prop="price" label="秒杀价" />
-      <el-table-column prop="otPrice" label="原价" />
+      <el-table-column prop="otPrice" label="售价" />
       <el-table-column prop="stock" label="库存" />
       <el-table-column prop="sales" label="销量" />
       <el-table-column prop="num" label="限购" />
diff --git a/src/views/bxg/shop/goods/form.vue b/src/views/bxg/shop/goods/form.vue
index e726040..ce84588 100644
--- a/src/views/bxg/shop/goods/form.vue
+++ b/src/views/bxg/shop/goods/form.vue
@@ -229,7 +229,6 @@
                   <span style="display: flex;margin-bottom:10px">当前栏目标题：<el-input style="width:300px" v-model="item.content"></el-input></span>
                   <span style="display: flex;margin-bottom:10px">当前栏目图标：<single-pic v-model="item.configuration"  type="image" :num="1" :width="150" :height="150" /></span>
 
-
                 </el-tab-pane>
               </el-tabs>
             </el-form-item>
@@ -999,6 +998,8 @@ export default {
     //清空表单
     resetForm(){
       this.$refs['formValidate'].resetFields()
+      this.editableTabs=[],
+      this.attrs=[],
       this.formValidate = {
         parameter:[],
         imageArr:[],
diff --git a/src/views/bxg/shop/order/index.vue b/src/views/bxg/shop/order/index.vue
index 54900f5..68baa95 100644
--- a/src/views/bxg/shop/order/index.vue
+++ b/src/views/bxg/shop/order/index.vue
@@ -39,7 +39,7 @@
         <el-select v-model="query.type" clearable placeholder="类型" class="filter-item" style="width: 130px">
           <el-option v-for="item in queryTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
         </el-select>
-        <el-select v-model="orderType" multiple
+        <el-select v-model="orderType" multiple @change="change"
                    clearable placeholder="订单类型" class="filter-item" style="width: 130px">
           <el-option
             v-for="item in typeOptions"
@@ -364,6 +364,14 @@
       })
     },
     methods: {
+      change(val){
+        let res=val.some(item => item=='0');
+        if (res){
+          this.orderType=['0']
+          // console.info('val',this.orderType)
+        }
+        // console.info('val',val);
+      },
       toDetailURL(id){
         this.$router.push({ path: '/bxg/order/detail/'+id })
       },