update: 积分

src/components/store/store-part.vue

@@ -185,6 +185,7 @@ export default {
           }
           this.total = res.data.result.totalCount;
           this.totalPage = res.data.result.totalPage;
+          console.log(this.total);
           if (this.selectLeftList.length) {
             for (const item of this.selectLeftList) {
               let obj = '';

src/components/store/store.vue

@@ -10,6 +10,7 @@
       </el-select>
     </div>
     <div class="right-content">
+      <div v-if="storeType==0" class="fz14">共 {{total}} 个自提点</div>
       <store-group v-if="storeType === 2" :selectData="selectData" @getSelectList="getSelectList" />
       <store-area v-if="storeType === 1" :selectData="selectData" @getSelectList="getSelectList" />
       <store-part v-if="storeType === 3" :selectData="selectData" @getSelectList="getSelectList" />
@@ -74,8 +75,9 @@
 import storeGroup from './store-group';
 import storeArea from './store-area';
 import storePart from './store-part';
-// import request from '../../service/request.js';
-// import qs from 'qs';
+
+import request from '../../service/request.js';
+import qs from 'qs';
 export default {
   components: {
     storeGroup,
@@ -118,6 +120,7 @@ export default {
       storeType: 0,
       dialogVisible: false,
       errorList: [],
+      total: 0,
     };
   },
   mounted () {
@@ -127,8 +130,25 @@ export default {
       this.uploadFileName = this.selectData.fileId;
       this.downloadUrl = this.selectData.downloadUrl;
     }
+    this.getList();
   },
   methods: {
+    getList () {
+      const params = {
+        pageSize: 20,
+        currentPage: 1,
+        search: '',
+        isValid: 1,
+      };
+      request.post('/api-integral-mall/page-pick-up-points', qs.stringify(params)).then(res => {
+        if (res.data.errorCode === 0) {
+          this.total = res.data.result.totalCount;
+          console.log(this.total);
+        } else {
+          this.$message.error(res.data.message);
+        }
+      });
+    },
     // 获取数据
     getSelectList (arr) {
       this.$emit('getArr', arr, this.storeType);
@@ -271,4 +291,7 @@ export default {
 .list-content {
   margin-bottom: 15px;
 }
+.fz14{
+  font-size: 14px;
+}
 </style>

src/components/visible.vue

@@ -3,7 +3,7 @@
     ref="form"
     :model="giftForm"
     :rules="rules"
-    label-width="100px"
+    label-width="150px"
     class="demo-ruleForm"
     label-position="right"
     style="margin-top: 20px"
@@ -103,7 +103,26 @@
         <span class="tips">开启后，未开卡客户在积分商城也可见该礼品（前提是该礼品的“适用会员”包含最低会员卡等级）</span>
       </div>
     </el-form-item>
-
+     <el-form-item label="是否在积分商城显示" prop="showFlag">
+       <el-radio-group v-model="giftForm.showFlag">
+        <el-radio :label="1">
+          显示
+        </el-radio>
+        <el-radio :label="0">
+           不显示
+        </el-radio>
+      </el-radio-group>
+     </el-form-item>
+      <el-form-item label="是否支持分享" prop="shareFlag">
+        <el-radio-group v-model="giftForm.shareFlag">
+              <el-radio :label="0">
+                否
+              </el-radio>
+              <el-radio :label="1">
+                是
+              </el-radio>
+         </el-radio-group>
+     </el-form-item>
     <relate-pop ref="relatePop" :integralMallProRuleId="giftForm.integralMallProRuleId" @finish="onPopFinish" />
   </el-form>
 </template>
@@ -135,6 +154,7 @@ export default {
           storeIds: [],
         },
         uuid: '',
+
       }, // 表单的值
       isAdd: this.$route.meta.type === 'add',
       groupIdDisableList: [],
@@ -148,6 +168,8 @@ export default {
         proShowStatus: [{ required: true, message: '请选择显示状态', trigger: 'change' }],
         releaseType: [{ required: true, message: '请选择上架时间', trigger: 'change' }],
         limitTimeBegin: [{ required: true, message: '请选择时间', trigger: 'change' }],
+        showFlag: [{ required: true, message: '请选择', trigger: 'change' }],
+        shareFlag: [{ required: true, message: '请选择', trigger: 'change' }],
       },
       getTimeAll: getInputVal.formatDate,
     };
@@ -223,7 +245,7 @@ export default {
       return new Promise((resolve) => {
         this.$refs.form.validate(val => {
           if (val) {
-            const { releaseType, proShowStatus, isNewGuestVisible, ruleTitle, integralMallProRuleId, sendChildData: { storeType, storeGroupIds, storeIds }, useNewStoreWidget, uuid } = this.giftForm;
+            const { releaseType, proShowStatus, shareFlag, showFlag, isNewGuestVisible, ruleTitle, integralMallProRuleId, sendChildData: { storeType, storeGroupIds, storeIds }, useNewStoreWidget, uuid } = this.giftForm;
             const params = {
               proShowStatus: proShowStatus, // 显示状态
               releaseType: releaseType, // 上架状态
@@ -231,6 +253,8 @@ export default {
               limitTimeEnd: releaseType === 2 ? this.getTimeAll(this.giftForm.limitTimeBegin[1]) : '', // 定时上架结束时间
               isNewGuestVisible: proShowStatus == 1 ? isNewGuestVisible : 0, // 新客是否可见 0：新客不可见、1：新客可见'
               showStore: storeType, // 显示门店 0所有 1部分分类 2部分门店
+              showFlag,
+              shareFlag,
             };
             // 校验定时上架时间
             if (this.giftForm.releaseType == 2 && !this.vaidataDataPicker()) return this.$message.error('定时上架结束时间必须大于当前时间和开始时间');

src/views/goods/gift/detail.vue

@@ -11,7 +11,7 @@
           :model="giftForm"
           :rules="giftRules"
           ref="giftForm"
-          label-width="100px"
+          label-width="150px"
           class="demo-ruleForm"
           @submit.native.prevent
           label-position="right"
@@ -604,7 +604,7 @@
           </div>
           <div class="section-content section-tip-content">
             <h3>售后服务</h3>
-            <el-form-item label="支持买家申请退款" prop="refundType" label-width="150px">
+            <el-form-item label="支持买家申请退款" prop="refundType"  >
               <el-tooltip
                 class="tip-content"
                 effect="dark"
@@ -902,6 +902,8 @@ export default {
           storeIds: [],
         },
         uuid: '',
+        showFlag: 1,
+        shareFlag: 0,
       },
       isNew: true, // 编辑旧商品时，是否确认转换为新数据格式
     };
@@ -1515,9 +1517,9 @@ export default {
     },
     // 处理 可见配置回显
     echoVisibleData (data) {
-      const { releaseType, limitTimeBegin, limitTimeEnd, proShowStatus, isNewGuestVisible, useNewStoreWidget, creatorId, storeWidgetId, showStore, storeGroupIds, storeInfo, ruleTitle, integralMallProRuleId, newRuleFlag } = data;
-      // 上架类型,自定义开始时间，自定义结束时间，显示状态，新客是否可见，使用新版卡券门店选择器，创建人id,新版卡券门店选择器id, 老的门店控件类型，门店分组id,部分门店id,规则标题，规则id,商品是否关联新规则
-      this.visibleData = { ...this.visibleData, releaseType, proShowStatus, isNewGuestVisible: isNewGuestVisible || 0, useNewStoreWidget, creatorId };
+      const { releaseType, limitTimeBegin, limitTimeEnd, proShowStatus, isNewGuestVisible, useNewStoreWidget, creatorId, storeWidgetId, showStore, storeGroupIds, storeInfo, ruleTitle, integralMallProRuleId, newRuleFlag, showFlag, shareFlag } = data;
+      // 上架类型,自定义开始时间，自定义结束时间，显示状态，新客是否可见，使用新版卡券门店选择器，创建人id,新版卡券门店选择器id, 老的门店控件类型，门店分组id,部分门店id,规则标题，规则id,商品是否关联新规则,是否在积分商城显示,是否支持分享
+      this.visibleData = { ...this.visibleData, releaseType, proShowStatus, isNewGuestVisible: isNewGuestVisible || 0, useNewStoreWidget, creatorId, showFlag, shareFlag };
       if (releaseType === 1) { // 1立即上架 2自定义上架时间段
         this.visibleData.limitTimeBegin = [];
       } else if (releaseType == 2) {