特惠专区,装修抢购图标

.env.development

@@ -4,7 +4,7 @@ ENV = 'development'
 # http://mer.crmeb.net/admin
 # base api
 # www.shop.xyz
-VUE_APP_BASE_API = 'http://testg.tropjoin.com'
+VUE_APP_BASE_API = 'http://zkx.tropjoin.com'
 # VUE_APP_BASE_API = 'http://test.tropjoin.com'
 # VUE_APP_BASE_API = 'https://api.tropjoin.com'
 

src/components/mobileConfig/c_home_goods_list.vue

@@ -72,6 +72,10 @@ export default {
                 {
                     components: toolCom.c_is_show,
                     configNme: 'couponShow'
+                },
+                {
+                     components: toolCom.c_is_show,
+                    configNme: 'grabShow'
                 }
             ],
             manual: [
@@ -94,6 +98,10 @@ export default {
                 {
                     components: toolCom.c_is_show,
                     configNme: 'couponShow'
+                },
+                {
+                     components: toolCom.c_is_show,
+                    configNme: 'grabShow'
                 }
             ],
             setUp: 0,
@@ -158,6 +166,7 @@ export default {
                     ]
                     this.rCom = arr.concat(tempArr)
                 }
+                console.log(this.rCom);
             },
             deep: true
         },
@@ -194,6 +203,8 @@ export default {
         this.$nextTick(() => {
             let value = JSON.parse(JSON.stringify(this.$store.state.mobildConfig.defaultArray[this.num]))
             this.configObj = value;
+            console.log(this.configObj);
+            
             this.getCategory();
         })
     },

src/components/mobilePage/home_goods_list.vue

@@ -25,6 +25,9 @@
                                     </div>
                                     <!-- <div class="old-price" v-if="opriceShow">¥{{item.ot_price}}</div> -->
                                 </div>
+                                <div v-if="grabShow" class="right">
+                                    <img src="@/assets/images/aq-btn.png" alt="">
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -337,6 +340,10 @@ export default {
                     title: '是否显示优惠券',
                     val: true
                 },
+                grabShow:{
+                    title: '是否显示抢',
+                    val: false  
+                },
                 selectConfig: {
                     title: '商品分类',
                     activeValue: [],
@@ -490,6 +497,7 @@ export default {
             titleShow: true,
             // opriceShow: true,
             priceShow: true,
+            grabShow: true,
             couponShow: true,
             bgStyle:0,
             conStyle:1
@@ -513,6 +521,7 @@ export default {
                 this.titleShow = data.titleShow.val;
                 // this.opriceShow = data.opriceShow.val;
                 this.priceShow = data.priceShow.val;
+                this.grabShow = data.grabShow.val;
                 this.couponShow = data.couponShow.val;
                 this.bgStyle = data.bgStyle.type;
                 this.conStyle = data.conStyle.type;
@@ -801,9 +810,19 @@ export default {
                     flex: 1;
                     margin-left: 5px;
                     padding: 5px 10px;
+                    position: relative;
                     .num{
                         font-weight: bold;
                     }
+                    .right {
+                    position: absolute;
+                    right: 20px;
+                    bottom: 0;
+                        img {
+                            width: 75px;
+                            height: 46px;
+                        }
+                    }
                 }
             }         
         &.itemB{

src/views/product/productExamine/index.vue

@@ -103,7 +103,7 @@
           <el-option label="自定义设置" value="2" />
         </el-select>
       </el-form-item> -->
-        <el-form-item label="商品推荐：" prop="hot_type">
+        <el-form-item label="活动专区：" prop="hot_type">
           <el-select
             v-model="tableFrom.hot_type"
             placeholder="请选择"
@@ -414,18 +414,27 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="惠美乡村产品" min-width="80">
+        <el-table-column label="惠美乡村产品" min-width="100">
           <template slot-scope="scope">
             <span>{{ scope.row.is_huimei ? "是" : "否" }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="特惠专区产品" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.is_benefit ? "是" : "否" }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="is_audited" label="待审核类型" min-width="90">
           <template slot-scope="scope">
             {{ auditedList[scope.row.is_audited] }}
           </template>
         </el-table-column>
         <el-table-column prop="price" label="商品售价" min-width="80" />
-        <el-table-column prop="hot_type" label="商品推荐" min-width="80" />
+        <el-table-column
+          prop="product_recommend_type"
+          label="活动专区"
+          min-width="80"
+        />
         <el-table-column prop="refusal" label="拒绝/锁定原因" min-width="110" />
         <el-table-column prop="operator" label="操作人" min-width="110" />
         <el-table-column
@@ -703,7 +712,7 @@
             >备注：5星为最高推荐级别，1星为最低推荐级别，设置后会在商城商品列表、搜索商品列表中体现。</span
           >
         </el-form-item>
-        <el-form-item label="商品推荐：">
+        <el-form-item label="活动专区：">
           <el-checkbox-group
             v-model="checkboxGroup"
             size="small"
@@ -913,14 +922,14 @@ const proOptions = [
   //   name: "精品推荐",
   //   value: "is_best",
   // },
-  // {
-  //   name: "首发新品",
-  //   value: "is_new",
-  // },
   {
-    name: "活动专区",
+    name: "首发新品",
-    value: "is_activities",
+    value: "is_new",
   },
+  // {
+  //   name: "活动专区",
+  //   value: "is_activities",
+  // },
 ];
 export default {
   name: "ProductExamine1",
@@ -983,14 +992,14 @@ export default {
         //   name: "精品推荐",
         //   value: "best",
         // },
-        // {
-        //   name: "首发新品",
-        //   value: "new",
-        // },
         {
-          name: "活动专区",
+          name: "首发新品",
-          value: "is_activities",
+          value: "new",
         },
+        // {
+        //   name: "活动专区",
+        //   value: "activity",
+        // },
       ],
       formValidate: {
         is_hot: 0,

src/views/product/productExamine/info.vue

@@ -85,6 +85,9 @@
           />
         </div>
       </span>
+      <span class="sp"
+        >特惠专区产品：{{ projectData.is_benefit ? "是" : "否" }}</span
+      >
       <span class="sp"
         >定制产品：{{ projectData.is_customize ? "是" : "否" }}</span
       >
@@ -627,6 +630,16 @@
           >
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="特惠专区产品" prop="is_benefit" label-width="90px">
+        <el-radio-group v-model="projectData.is_benefit">
+          <el-radio :disabled="projectData.is_benefit == 1" :label="0"
+            >否</el-radio
+          >
+          <el-radio :disabled="projectData.is_benefit == 0" :label="1"
+            >是</el-radio
+          >
+        </el-radio-group>
+      </el-form-item>
       <el-form-item
         :label="projectData.status == 15 ? '解锁状态' : '审核状态'"
         prop="status"

src/views/setting/devise/index.vue

@@ -910,7 +910,7 @@ export default {
                 this.$store.commit('mobildConfig/footPageUpdata', objs);
             }
             console.log(newArr)
-            console.log(this.lConfig)
+            // console.log(this.lConfig)
             this.showTitle();
         },
         categoryList() {