From c64a39b45226f5d5dde67797f4201e479aacf3e9 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 25 Dec 2023 18:45:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/product.js                       |  4 ++--
 src/views/product/addProduct/index.vue   | 17 +++++++++--------
 src/views/product/productCloud/index.vue | 15 ++++++++++++---
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/api/product.js b/src/api/product.js
index 041f01a..804f4c1 100644
--- a/src/api/product.js
+++ b/src/api/product.js
@@ -505,8 +505,8 @@ export function labelStatusApi (id, status) {
   return request.post(`product/label/status/${id}`, { status })
 }
 /** 商品列表 -- 获取标签项 */
-export function getProductLabelApi () {
-  return request.get(`product/label/option`)
+export function getProductLabelApi (data) {
+  return request.get(`product/label/option`, data)
 }
 /** 商品列表 -- 编辑标签 */
 export function updatetProductLabel (id, data) {
diff --git a/src/views/product/addProduct/index.vue b/src/views/product/addProduct/index.vue
index aaee3b2..1e34649 100644
--- a/src/views/product/addProduct/index.vue
+++ b/src/views/product/addProduct/index.vue
@@ -85,7 +85,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col v-if="labelList.length" :span="24">
+          <el-col v-if="labelList.length&&$store.state.user.merchantType.type_code=='TypeSupplyChain'" :span="24">
             <el-form-item label="商品标签：">
               <el-select
                 v-model="formValidate.mer_labels"
@@ -95,9 +95,9 @@
               >
                 <el-option
                   v-for="item in labelList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
+                  :key="item.product_label_id"
+                  :label="item.label_name"
+                  :value="item.product_label_id"
                 />
               </el-select>
             </el-form-item>
@@ -1251,7 +1251,7 @@ import {
   productGetTempKeysApi,
   guaranteeListApi,
   productPreviewApi,
-  getProductLabelApi,
+  labelListApi,
   specsSelectedApi,
   productSpecsDetailApi
 } from '@/api/product'
@@ -1714,9 +1714,10 @@ export default {
     },
     // 获取标签项
     getLabelLst () {
-      getProductLabelApi()
-        .then(res => {
-          this.labelList = res.data
+      labelListApi({
+        type: 1
+      }).then(res => {
+          this.labelList = res.data.list
         })
         .catch(res => {
           this.$message.error(res.message)
diff --git a/src/views/product/productCloud/index.vue b/src/views/product/productCloud/index.vue
index f4fe0d2..b8cbbf0 100644
--- a/src/views/product/productCloud/index.vue
+++ b/src/views/product/productCloud/index.vue
@@ -146,6 +146,11 @@
             />
           </template>
         </el-table-column>
+        <el-table-column prop="mer_labels_name" label="送达时间">
+          <template slot-scope="scope">
+            <span style="color: #ff0018;">{{scope.row.mer_labels_name}}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="stock" label="商品状态" min-width="90">
           <template slot-scope="scope">
             <span>{{ scope.row.us_status | productStatusFilter }}</span>
@@ -200,9 +205,10 @@
           <el-radio-group
                 v-model="addShopInfo.type"
               >
-                <el-radio label="two" class="radio">次日达</el-radio>
+                <el-radio label="five">五日达</el-radio>
+                <!-- <el-radio label="two" class="radio">次日达</el-radio>
                 <el-radio label="three">三日达</el-radio>
-                <el-radio label="seven">七日达</el-radio>
+                <el-radio label="seven">七日达</el-radio> -->
               </el-radio-group>
         </el-form-item>
       </el-form>
@@ -259,9 +265,10 @@ export default {
       },
       show: false,
       addShopInfo: {
+        product_id: '',
         img: '',
         store_name: '',
-        type: ''
+        type: 'five'
       },
       roterPre: roterPre,
       BASE_URL: SettingMer.https,
@@ -366,6 +373,8 @@ export default {
     },
     // 添加商品
     add(){
+      if(!this.addShopInfo.product_id) return Message.error('请选择商品');
+      if(!this.addShopInfo.type) return Message.error('请选择送达时间');
       addCloudProduct(this.addShopInfo).then((res)=>{
         Message.success(res.message);
         this.getList();