From a70ec2d398c3b7e1716c15b7a078f7e0aa66fca5 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Mon, 3 Jun 2024 14:28:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=9A=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=20=E5=A2=9E=E5=8A=A0=20=E8=B4=AD=E4=B9=B0?=
 =?UTF-8?q?=E5=90=8E=E8=B5=A0=E9=80=81=E5=B0=81=E5=9D=9B=E9=85=92=E9=A2=9D?=
 =?UTF-8?q?=E5=BA=A6=20=E5=A2=9E=E5=8A=A0=EF=BC=9A=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E5=95=86=E5=93=81=20=E5=A2=9E=E5=8A=A0=20=E9=85=92?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=AE=BE=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/addProduct/index.vue | 106 ++++++++++---------------
 1 file changed, 44 insertions(+), 62 deletions(-)

diff --git a/src/views/product/addProduct/index.vue b/src/views/product/addProduct/index.vue
index 8215591..dbd28e0 100644
--- a/src/views/product/addProduct/index.vue
+++ b/src/views/product/addProduct/index.vue
@@ -930,55 +930,60 @@
         <!-- 营销设置-->
         <el-row v-if="currentTab == '4'">
           <el-col :span="24">
-            <el-form-item label="商品推荐：">
-              <el-checkbox-group
-                v-model="checkboxGroup"
-                size="small"
-                @change="onChangeGroup"
-              >
-                <el-checkbox
-                  v-for="(item, index) in recommend"
-                  :key="index"
-                  :label="item.value"
-                >
+            <el-form-item label="商品推荐：" label-width="200px">
+              <el-checkbox-group v-model="checkboxGroup" size="small" @change="onChangeGroup">
+                <el-checkbox v-for="(item, index) in recommend" :key="index" :label="item.value">
                   {{ item.name }}
                 </el-checkbox>
               </el-checkbox-group>
             </el-form-item>
-          </el-col>
-          <!--酒水卡额度   菜卡额度-->
-          <el-col :span="24">
-            <el-form-item label="是否赠送酒卡额度：">
+            <el-form-item label="酒类型：" label-width="200px" v-if="config.merchant_type == 2">
+              <el-radio-group v-model="formValidate.wine_type">
+                <el-radio :label="0" class="radio">未知</el-radio>
+                <el-radio :label="1">瓶装酒</el-radio>
+                <el-radio :label="2">封坛酒</el-radio>
+              </el-radio-group>
+              <span class="tips">未知则不显示在酒道馆兑换列表中{{formValidate.wine_type}}</span>
+            </el-form-item>
+            <!--酒水卡额度   菜卡额度-->
+            <el-form-item label="是否赠送酒卡额度：" label-width="200px">
               <el-radio-group v-model="formValidate.is_give_quota">
                 <el-radio :label="0" class="radio">否</el-radio>
                 <el-radio :label="1">是</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="赠送酒卡额度数量：" v-if="formValidate.is_give_quota == 1">
+            <el-form-item label="赠送酒卡额度数量：" v-if="formValidate.is_give_quota == 1" label-width="200px">
               <el-input-number v-model="formValidate.give_quota_num" :step="0.01" placeholder="请输入赠送额度数量" />
-              <span>为0或者空则使用商户默认设置（实际支付的金额 * 倍数）</span>
+              <span class="tips">为0或者空则使用商户默认设置（实际支付的金额 * 倍数）</span>
             </el-form-item>
-            <el-form-item label="是否赠送菜卡额度：">
+            <el-form-item label="是否赠送菜卡额度：" label-width="200px">
               <el-radio-group v-model="formValidate.is_give_dish">
                 <el-radio :label="0" class="radio">否</el-radio>
                 <el-radio :label="1">是</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="赠送菜卡额度数量：" v-if="formValidate.is_give_dish == 1">
+            <el-form-item label="赠送菜卡额度数量：" v-if="formValidate.is_give_dish == 1" label-width="200px">
               <el-input-number v-model="formValidate.give_dish_num" :step="0.01" placeholder="请输入赠送额度数量" />
-              <span>为0或者空则使用商户默认设置（实际支付的金额 * 倍数）</span>
+              <span class="tips">为0或者空则使用商户默认设置（实际支付的金额 * 倍数）</span>
             </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="是否开启礼包：">
+            <el-form-item label="是否赠送封坛酒额度：" label-width="200px">
+              <el-radio-group v-model="formValidate.is_give_wine">
+                <el-radio :label="0" class="radio">否</el-radio>
+                <el-radio :label="1">是</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="赠送封坛酒额度数量：" v-if="formValidate.is_give_wine == 1" label-width="200px">
+              <el-input-number v-model="formValidate.give_wine_num" :step="0.01" placeholder="请输入赠送额度数量" />
+              <span class="tips">为0或者空则使用商户默认设置（实际支付的金额 * 倍数）</span>
+            </el-form-item>
+            <!--其他-->
+            <el-form-item label="是否开启礼包：" label-width="200px">
               <el-radio-group v-model="formValidate.is_gift_bag" :disabled="$route.params.id ? true : false">
                 <el-radio :label="0" class="radio">否</el-radio>
                 <el-radio :label="1">是</el-radio>
               </el-radio-group>
             </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注：">
+            <el-form-item label="备注：" label-width="200px">
               <div>1. 选择开启礼包后，不可修改</div>
               <div>
                 2.
@@ -1477,6 +1482,9 @@ const defaultObj = {
   give_quota_num: 0,
   is_give_dish: 0,
   give_dish_num: 0,
+  is_give_wine: 0,
+  give_wine_num: 0,
+  wine_type: 0,
   couponData: [],
   extend: [], // 自定义留言
   type: 0,
@@ -1489,7 +1497,7 @@ const defaultObj = {
   integral_give_money: 0,
   // 积分抵扣
   integral_deduction_type: 0,
-  integral_deduction_money: 0,
+  integral_deduction_money: 0
 }
 const objTitle = {
   price: {
@@ -2717,6 +2725,10 @@ export default {
         give_quota_num: info.give_quota_num || 0,
         is_give_dish: info.is_give_dish || 0,
         give_dish_num: info.give_dish_num || 0,
+        is_give_wine: info.is_give_wine || 0,
+        give_wine_num: info.give_wine_num || 0,
+        wine_type: info.wine_type || 0,
+
         couponData: info.coupon,
         video_link: info.video_link ? info.video_link : "",
         integral_rate: info.integral_rate,
@@ -3008,6 +3020,7 @@ export default {
   }
 };
 </script>
+
 <style scoped lang="scss">
 .bg {
   z-index: 100;
@@ -3018,11 +3031,9 @@ export default {
   height: 100%;
   background: rgba(0, 0, 0, 0.5);
 }
-
 .goods_detail .goods_detail_wrapper {
   z-index: -10;
 }
-
 /deep/ .upLoadPicBox {
   .upLoad {
     -webkit-box-orient: vertical;
@@ -3038,13 +3049,11 @@ export default {
     font-size: 10px;
   }
 }
-
 .proCoupon {
   /deep/ .el-form-item__content {
     margin-top: 5px;
   }
 }
-
 .tabPic {
   width: 40px !important;
   height: 40px !important;
@@ -3054,13 +3063,11 @@ export default {
     height: 100%;
   }
 }
-
 .noLeft {
   /deep/ .el-form-item__content {
     margin-left: 0 !important;
   }
 }
-
 .tabNumWidth {
   /deep/ .el-input-number--medium {
     width: 100px;
@@ -3099,24 +3106,19 @@ export default {
     text-overflow: clip !important;
   }
 }
-
 .seeCatMy {
   color: #437FFD;
   cursor: pointer;
 }
-
 .selectOn {
   color: #437FFD;
 }
-
 .virtual_boder {
   border: 1px solid #437FFD;
 }
-
 .virtual_boder2 {
   border: 1px solid #e7e7e7;
 }
-
 .virtual_san {
   position: absolute;
   bottom: 0;
@@ -3126,7 +3128,6 @@ export default {
   border-bottom: 26px solid #437FFD;
   border-left: 26px solid transparent;
 }
-
 .virtual_dui {
   position: absolute;
   bottom: -2px;
@@ -3134,7 +3135,6 @@ export default {
   color: #ffffff;
   font-family: system-ui;
 }
-
 .virtual {
   width: 120px;
   height: 60px;
@@ -3159,11 +3159,9 @@ export default {
     color: #999999;
   }
 }
-
 .virtual:nth-child(2n) {
   margin: 0 12px;
 }
-
 .addfont {
   display: inline-block;
   font-size: 13px;
@@ -3172,14 +3170,12 @@ export default {
   margin-left: 14px;
   cursor: pointer;
 }
-
 .titTip {
   display: inline-bolck;
   font-size: 12px;
   font-weight: 400;
   color: #999999;
 }
-
 .addCustom_content {
   margin-top: 20px;
 
@@ -3187,7 +3183,6 @@ export default {
     margin-bottom: 10px;
   }
 }
-
 .addCustomBox {
   margin-top: 12px;
   font-size: 13px;
@@ -3204,28 +3199,23 @@ export default {
     margin-top: 14px;
   }
 }
-
 .selWidth {
   width: 50%;
 }
-
 .ml15 {
   margin-left: 15px;
 }
-
 .button-new-tag {
   height: 28px;
   line-height: 26px;
   padding-top: 0;
   padding-bottom: 0;
 }
-
 .input-new-tag {
   width: 90px;
   margin-left: 10px;
   vertical-align: bottom;
 }
-
 .pictrue {
   width: 60px;
   height: 60px;
@@ -3239,7 +3229,6 @@ export default {
     height: 100%;
   }
 }
-
 .iview-video-style {
   width: 40%;
   height: 180px;
@@ -3249,7 +3238,6 @@ export default {
   position: relative;
   overflow: hidden;
 }
-
 .iconv {
   color: #fff;
   line-height: 180px;
@@ -3260,7 +3248,6 @@ export default {
   left: 50%;
   margin-left: -25px;
 }
-
 .iview-video-style .mark {
   position: absolute;
   width: 100%;
@@ -3269,19 +3256,15 @@ export default {
   background-color: rgba(0, 0, 0, 0.5);
   text-align: center;
 }
-
 .uploadVideo {
   margin-left: 10px;
 }
-
 .perW50 {
   width: 50%;
 }
-
 .submission {
   margin-left: 10px;
 }
-
 .btndel {
   position: absolute;
   z-index: 1;
@@ -3290,7 +3273,6 @@ export default {
   left: 46px;
   top: -4px;
 }
-
 .labeltop {
   /deep/ .el-form-item__label {
     float: none !important;
@@ -3299,12 +3281,12 @@ export default {
     width: auto !important;
   }
 }
-
 .tips {
-  height: 50px;
-  line-height: 50px;
+  height: 20px;
+  line-height: 20px;
   color: #999;
   font-size: 12px;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+  //border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+  display: block;
 }
 </style>