From c9fa00edece9c0a38583a0d60fb4330e12c978bb Mon Sep 17 00:00:00 2001
From: wanghousheng <wanghousheng@njrzwl.cn>
Date: Sat, 20 Apr 2024 22:42:58 +0800
Subject: [PATCH] 1

---
 src/components/SelectGoods/SelectGoods.vue | 57 ++++++++++++----------
 src/views/apps/sharp/goods/Create.vue      |  2 -
 src/views/store/Setting.vue                | 31 ++++++++++--
 3 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/src/components/SelectGoods/SelectGoods.vue b/src/components/SelectGoods/SelectGoods.vue
index ed18462..5a1d409 100644
--- a/src/components/SelectGoods/SelectGoods.vue
+++ b/src/components/SelectGoods/SelectGoods.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <a-button @click="handleSelectGoods">选择商品</a-button>
-    <!-- <a-table
+    <a-table
       v-show="selectedItems.length"
       class="table-goodsList"
       rowKey="goods_id"
@@ -9,21 +9,23 @@
       :dataSource="selectedItems"
       :pagination="false"
     >
+      <!-- 商品信息 -->
       <template slot="item" slot-scope="item">
         <GoodsItem
           :data="{
             image: item.goods_image,
             imageAlt: '商品图片',
             title: item.goods_name,
-            subtitle: `¥${item.goods_price_min}`,
+            subtitle: `¥${item.goods_price_min}`
           }"
           :subTitleColor="true"
         />
       </template>
+      <!-- 操作项 -->
       <span slot="action" slot-scope="text, item, index">
         <a v-action:delete @click="handleDeleteItem(index)">删除</a>
       </span>
-    </a-table> -->
+    </a-table>
     <GoodsModal
       ref="GoodsModal"
       :multiple="multiple"
@@ -43,22 +45,22 @@ import { GoodsItem } from '@/components/Table'
 const columns = [
   {
     title: '商品ID',
-    dataIndex: 'goods_id',
+    dataIndex: 'goods_id'
   },
   {
     title: '商品信息',
-    scopedSlots: { customRender: 'item' },
+    scopedSlots: { customRender: 'item' }
   },
   {
     title: '库存总量',
-    dataIndex: 'stock_total',
+    dataIndex: 'stock_total'
   },
   {
     title: '操作',
     width: '180px',
     dataIndex: 'action',
-    scopedSlots: { customRender: 'action' },
-  },
+    scopedSlots: { customRender: 'action' }
+  }
 ]
 
 // 商品选择器组件
@@ -66,11 +68,11 @@ export default {
   name: 'SelectGoods',
   components: {
     GoodsModal,
-    GoodsItem,
+    GoodsItem
   },
   model: {
     prop: 'value',
-    event: 'change',
+    event: 'change'
   },
   props: {
     // 多选模式, 如果false为单选
@@ -78,15 +80,15 @@ export default {
     // 最大选择的数量限制, multiple模式下有效
     maxNum: PropTypes.integer.def(100),
     // 默认选中的商品
-    defaultList: PropTypes.array.def([]),
+    defaultList: PropTypes.array.def([])
   },
-  data() {
+  data () {
     return {
       columns,
       // 已选择的商品列表
       selectedItems: [],
       // 已选择的商品ID集
-      selectedGoodsIds: [],
+      selectedGoodsIds: []
     }
   },
   watch: {
@@ -94,22 +96,24 @@ export default {
     defaultList: {
       // 首次加载的时候执行函数
       immediate: true,
-      handler(val) {
+      handler (val) {
         const { selectedItems } = this
         if (val.length && !selectedItems.length) {
           this.onUpdate(cloneDeep(val))
         }
-      },
-    },
+      }
+    }
+  },
+  created () {
   },
-  created() {},
   methods: {
+
     // 更新数据
-    onUpdate(selectedItems) {
+    onUpdate (selectedItems) {
       if (this.multiple || !selectedItems.length) {
         // 多选模式
         this.selectedItems = selectedItems
-        this.selectedGoodsIds = selectedItems.map((item) => item.goods_id)
+        this.selectedGoodsIds = selectedItems.map(item => item.goods_id)
       } else {
         // 单选模式
         const single = selectedItems[selectedItems.length - 1]
@@ -120,30 +124,31 @@ export default {
     },
 
     // 打开商品选择器
-    handleSelectGoods() {
+    handleSelectGoods () {
       this.$refs.GoodsModal.handle()
     },
 
     // 商品库modal确认回调
-    handleSelectGoodsSubmit(result) {
+    handleSelectGoodsSubmit (result) {
       const { selectedItems } = result
       this.onUpdate(cloneDeep(selectedItems))
     },
 
     // 删除商品
-    handleDeleteItem(index) {
+    handleDeleteItem (index) {
       const { selectedItems } = this
       selectedItems.splice(index, 1)
       this.onUpdate(selectedItems)
     },
 
     // 触发change事件
-    onChange() {
+    onChange () {
       const { multiple, selectedGoodsIds } = this
-      const sGoodsIds = multiple ? selectedGoodsIds : selectedGoodsIds.length ? selectedGoodsIds[0] : undefined
+      const sGoodsIds = multiple ? selectedGoodsIds : (selectedGoodsIds.length ? selectedGoodsIds[0] : undefined)
       return this.$emit('change', sGoodsIds)
-    },
-  },
+    }
+
+  }
 }
 </script>
 
diff --git a/src/views/apps/sharp/goods/Create.vue b/src/views/apps/sharp/goods/Create.vue
index 08c4746..de1c3b3 100644
--- a/src/views/apps/sharp/goods/Create.vue
+++ b/src/views/apps/sharp/goods/Create.vue
@@ -58,9 +58,7 @@
 </template>
 
 <script>
-import { pick, get } from 'lodash'
 import * as Api from '@/api/sharp/goods'
-import { isEmpty } from '@/utils/util'
 import { SelectGoods } from '@/components'
 import { MultiSpec } from './modules'
 
diff --git a/src/views/store/Setting.vue b/src/views/store/Setting.vue
index d210167..6fbd23f 100644
--- a/src/views/store/Setting.vue
+++ b/src/views/store/Setting.vue
@@ -48,12 +48,35 @@
           extra="建议尺寸: 300*300"
         >
           <SelectImage
-            multiple
             :defaultList="record.bigBrandImg ? record.bigBrandImg : []"
             v-decorator="['big_brand_img_id']"
           />
         </a-form-item>
         <a-form-item
+          label="秒杀背景图"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          extra="建议尺寸: 300*300"
+        >
+          <SelectImage
+            multiple
+            :defaultList="record.flashSaleImg ? record.flashSaleImg : []"
+            v-decorator="['flash_sale_img_id']"
+          />
+        </a-form-item>
+        <!-- <a-form-item
+          label="排行榜背景图"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          extra="建议尺寸: 300*300"
+        >
+          <SelectImage
+            multiple
+            :defaultList="record.rankingImg ? record.rankingImg : []"
+            v-decorator="['ranking_img_id']"
+          />
+        </a-form-item> -->
+        <!-- <a-form-item
           label="新人首单"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
@@ -64,7 +87,7 @@
             :defaultList="record.newPeopleOrderImg ? record.newPeopleOrderImg : []"
             v-decorator="['new_people_order_img_id']"
           />
-        </a-form-item>
+        </a-form-item> -->
         <a-form-item :wrapperCol="{ span: wrapperCol.span, offset: labelCol.span }">
           <a-button type="primary" html-type="submit">提交</a-button>
         </a-form-item>
@@ -142,7 +165,9 @@ export default {
       const params = {
         new_product_img_id: (values.new_product_img_id && values.new_product_img_id.join(',')) || '',
         big_brand_img_id: (values.big_brand_img_id && values.big_brand_img_id.join(',')) || '',
-        new_people_order_img_id: (values.new_people_order_img_id && values.new_people_order_img_id.join(',')) || ''
+        new_people_order_img_id: (values.new_people_order_img_id && values.new_people_order_img_id.join(',')) || '',
+        flash_sale_img_id: (values.flash_sale_img_id && values.flash_sale_img_id.join(',')) || '',
+        ranking_img_id: (values.ranking_img_id && values.ranking_img_id.join(',')) || ''
       }
 
       Api.update({ form: { ...values, ...params } })