11-21

.env.dev

@@ -2,7 +2,7 @@
 NODE_ENV=development
 VUE_APP_ENV='dev'
 # 页面 title
-VUE_APP_TITLE='中雁石斛'
+VUE_APP_TITLE='智宝'
 
 # 接口请求地址
-VUE_APP_API_URL='https://zyxs.qiniu1314.com/adminapi'
+VUE_APP_API_URL='http://zhibao.frp.qiniu1314.com/adminapi'

src/components/goodsList/index.vue

@@ -23,6 +23,12 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="是否复购" v-if="!liveStatus">
+        <el-select v-model="formValidate.is_share" clearable @change="userSearchs" class="form_content_width">
+          <el-option v-for="item in packList" :value="item.value" :key="item.value" :label="item.label">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="商品搜索：">
         <el-input
           clearable
@@ -156,6 +162,7 @@ export default {
         page: 1,
         limit: 15,
         is_pack: 0,
+        is_share: 0,
         cate_id: '',
         store_name: '',
         is_new: this.is_new,

src/pages/product/productAdd/components/MarketingSetting.vue

@@ -8,19 +8,25 @@
         </el-switch>
       </el-form-item>
     </el-col>
-    <el-col :span="24" v-if="formValidate.is_pack">
-      <el-form-item label="赠送股份：" prop="share">
-        <el-input-number :controls="false" v-model="formValidate.share" :min="0" :max="9999999999" placeholder="请输入赠送股份"
-          class="input_width input-number-unit-class" class-unit="股份" />
+    <el-col :span="24">
+      <el-form-item label="报单数：" v-if="formValidate.is_pack">
+        <el-input-number :controls="false" v-model="formValidate.share" :min="0" :max="9999999999"
+          placeholder="请输入报单数" class="input_width input-number-unit-class" class-unit="单" />
+      </el-form-item>
+    </el-col>
+    <el-col :span="24">
+      <el-form-item label="是否复购：">
+        <el-switch v-model="formValidate.is_share" class="defineSwitch" active-text="是" inactive-text="否"
+          :active-value="1" :inactive-value="0" size="large" @change="changeTemplates">
+        </el-switch>
       </el-form-item>
     </el-col>
-    <el-col :span="24" v-if="!formValidate.is_pack">
-      <el-form-item label="积分抵扣比例" prop="max_use_integral">
-        <el-input-number :controls="false" v-model="formValidate.max_use_integral" :min="0" :max="100" placeholder="请输入积分抵扣比例"
-          class="input_width input-number-unit-class" class-unit="%" />
+     <el-col :span="24">
+      <el-form-item label="PV：">
+        <el-input-number :controls="false" v-model="formValidate.pv" :min="0" :max="9999999999"
+          placeholder="请输入PV值" class="input_width input-number-unit-class" class-unit="" />
       </el-form-item>
     </el-col>
-    <!-- share -->
     <el-col :span="24">
       <div class="line"></div>
     </el-col>
@@ -204,10 +210,17 @@ export default {
   },
   methods: {
     changeTemplate(e) {
-      if (!e) {
+      if (e) {
+        this.formValidate.is_share = 0
+      }else { 
+        this.formValidate.share = 0
+      }
+    },
+    changeTemplates(e) {
+      if (e) {
+        this.formValidate.is_pack = 0
         this.formValidate.share = 0
       }
-      this.formValidate.max_use_integral = 0
     },
     handleClose(tag) {
       this.$emit('handleClose', tag);

src/pages/product/productAdd/index.vue

@@ -485,6 +485,8 @@ export default {
       currentIndex: 0,
 
       formValidate: {
+        pv: 0,
+        is_share: 0,//是否复购
         share: 0,
         is_pack: 0,//是否报单
         disk_info: '', //卡密类型

src/pages/product/productList/index.vue

@@ -39,6 +39,13 @@
                   <el-option label="否" value="0" />
                 </el-select>
               </el-form-item>
+              <el-form-item label="是否复购：">
+                <el-select v-model="artFrom.is_share" clearable placeholder="全部" class="form_content_width">
+                  <el-option label="全部" value="" />
+                  <el-option label="是" value="1" />
+                  <el-option label="否" value="0" />
+                </el-select>
+              </el-form-item>
               <template v-if="collapse">
                 <el-form-item label="配送方式：">
                 <el-select v-model="artFrom.logistics" clearable placeholder="全部" class="form_content_width">

src/pages/user/list/handle/userEditForm.vue

@@ -119,14 +119,14 @@
               </div>
             </el-form-item>
           </div>
-           <div class="item lang">
+           <!-- <div class="item lang">
             <el-form-item label="是否每月返100：">
               <el-radio-group v-model="formItem.is_sc" class="form-sty">
                 <el-radio :label="0">否</el-radio>
                 <el-radio :label="1">是</el-radio>
               </el-radio-group>
             </el-form-item>
-          </div>
+          </div> -->
           <div class="item lang">
             <el-form-item label="分销禁用：">
               <el-radio-group v-model="formItem.spread_open" class="form-sty">

src/pages/user/list/handle/userInfo.vue

@@ -46,10 +46,10 @@
     <div class="section">
       <div class="section-hd">用户概况</div>
       <div class="section-bd">
-        <div class="item">
+        <!-- <div class="item">
           <div>每月发放100：</div>
           <div class="value">{{ psInfo.is_sc ? '开启' : '关闭' }}</div>
-        </div>
+        </div> -->
         <div class="item">
           <div>推广资格：</div>
           <div class="value">{{ psInfo.spread_open ? '开启' : '关闭' }}</div>