add

src/views/marketing/integral/config/index.vue

@@ -21,13 +21,53 @@
               <span class="label_tip">（指平台积分功能的开启或关闭。开启：积分功能正常启用；关闭：积分功能不可使用，且前端不展示）</span>
             </el-form-item>
           </el-col>
-          <el-col v-if="formValidate.integral_status>0">
+          <el-col :span="24" v-if="formValidate.integral_status>0">
+            <el-form-item label="积分赠送：" prop="integral_give_status">
+              <el-radio-group
+                v-model="formValidate.integral_give_status">
+                <el-radio :label="0" class="radio">关闭</el-radio>
+                <el-radio :label="1">开启</el-radio>
+              </el-radio-group>
+              <!-- <span class="label_tip">（指平台积分功能的开启或关闭。开启：积分功能正常启用；关闭：积分功能不可使用，且前端不展示）</span> -->
+            </el-form-item>
+          </el-col>
+          <!-- <el-col v-if="formValidate.integral_status>0">
             <el-form-item label="积分抵用金额：" prop="integral_money">
               <el-input-number :min="0" v-model="formValidate.integral_money" size="small" placeholder="积分抵用金额" />
               <span class="label_tip">（指1积分抵用多少金额，单位： 元）</span>
             </el-form-item>
+          </el-col> -->
+          <el-col v-if="formValidate.integral_status>0">
+            <el-form-item label="订单返还积分比例(%)：" prop="integral_price_return_rate">
+              <el-input-number :min="0" v-model="formValidate.integral_price_return_rate" size="small" placeholder="订单返还积分比例(%)" />
+              <span class="label_tip">（订单支付价格返还比例%）</span>
+            </el-form-item>
           </el-col>
           <el-col v-if="formValidate.integral_status>0">
+            <el-form-item label="积分兑现倍数：" prop="integral_money_time">
+              <el-input-number :min="0" v-model="formValidate.integral_money_time" size="small" placeholder="积分兑现倍数" />
+              <span class="label_tip">（一元兑积分数量）</span>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="formValidate.integral_status>0">
+            <el-form-item label="积分签到返还天数：" prop="integral_return_day">
+              <el-input-number :min="0" v-model="formValidate.integral_return_day" size="small" placeholder="积分签到返还天数" />
+              <span class="label_tip">（积分连续签到返还结束天数）</span>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="formValidate.integral_status>0">
+            <el-form-item label="每日签到封顶积分：" prop="integral_sign_max">
+              <el-input-number :min="0" v-model="formValidate.integral_sign_max" size="small" placeholder="每日签到封顶积分" />
+              <span class="label_tip">（每个用户日签到获得积分上限）</span>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="formValidate.integral_status>0">
+            <el-form-item label="每日签到积分递减(%)：" prop="integral_sign_dec_rate">
+              <el-input-number :min="0" v-model="formValidate.integral_sign_dec_rate" size="small" placeholder="每日签到积分递减(%)" />
+              <span class="label_tip">（每个用户日签到获得每单返还积分逐日递减%）</span>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col v-if="formValidate.integral_status>0">
             <el-form-item label="下单赠送积分比例：" prop="integral_order_rate">
               <el-input-number :min="0" v-model="formValidate.integral_order_rate" size="small" placeholder="请输入赠送比例" />
               <span class="label_tip">（指实际支付1 元赠送多少积分，单位： 分）</span>
@@ -50,7 +90,7 @@
               <el-input-number :min="0" v-model="formValidate.integral_user_give" :precision="0" :step="1" size="small" placeholder="请输入赠送积分数" />
               <span class="label_tip">（指邀请新人好友成功登录商城后，赠送给邀请人的积分数；单位：分）</span>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <!-- 积分说明-->
         <el-row v-if="formValidate.integral_status>0">
@@ -116,6 +156,12 @@ const defaultObj = {
   integral_order_rate: 0,
   integral_money: 0,
   rule: "",
+  integral_give_status:1,
+  integral_price_return_rate:0,
+  integral_money_time:0,
+  integral_return_day:0,
+  integral_sign_max:0,
+  integral_sign_dec_rate:0
 };
 export default {
   name: "ProductProductAdd",

src/views/product/productExamine/index.vue

@@ -239,6 +239,15 @@
                 size="small"
               />
         </el-form-item>
+        <el-form-item label="商品封面图：" prop="image">
+          <div class="demo-image__preview">
+              <el-image
+                style="width: 60px; height: 60px"
+                :src="formValidate.image"
+                :preview-src-list="[formValidate.image]"
+              />
+            </div>
+        </el-form-item>
         <el-form-item label="星级推荐：">
           <el-rate class="rate_star" v-model="formValidate.star" :colors="colors" style="margin-top: 4px;"></el-rate>
           <span style="margin-top: 4px; font-size: 12px;">备注：5星为最高推荐级别，1星为最低推荐级别，设置后会在商城商品列表、搜索商品列表中体现。</span>
@@ -476,13 +485,14 @@ export default {
         is_ficti: "",
         content: '',
         store_name: '',
-        rank: '',
+        rank: 0,
         us_status: '',
-        star: '',
+        star: 0,
         keyword:'',
         cate_id:0,
         slider_image: [],
-        qualification:{}
+        qualification:{},
+        image:''
       },
       productStatusList: [
         { label: "上架显示", value: 1 },
@@ -751,7 +761,8 @@ export default {
           keyword:info.keyword,
           cate_id:info.cate_id,
           slider_image: info.slider_image,
-          qualification:info.qualification
+          qualification:info.qualification,
+          image:info.image
         }
         if(info.is_benefit === 1) this.checkboxGroup.push('is_benefit')
         if(info.is_hot === 1) this.checkboxGroup.push('is_hot')

src/views/product/productExamine/info.vue

@@ -334,7 +334,7 @@
               </el-table-column>
               <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="80">
                 <template slot-scope="scope">
-                  <a v-if="iii==='gist_url'" :href="scope.row[iii]" target="_blank">{{ scope.row[iii] }}</a>
+                  <a v-if="formThead[iii].title=='依据链接'" :href="scope.row[iii]" target="_blank">{{ scope.row[iii] }}</a>
                   <span v-else class="priceBox" v-text="scope.row[iii]" />
                 </template>
               </el-table-column>
@@ -370,7 +370,8 @@
               </el-table-column>
               <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="80">
                 <template slot-scope="scope">
-                  <span class="priceBox">{{ scope.row[iii] }}</span>
+                  <a v-if="formThead[iii].title=='依据链接'" :href="scope.row[iii]" target="_blank">{{ scope.row[iii] }}</a>
+                  <span v-else class="priceBox" v-text="scope.row[iii]" />
                 </template>
               </el-table-column>
               <template v-if="projectData.extension_type === 1">