Merge branch 'feature/hl-2月迭代' into dev

src/views/goods/gift/info.vue

@@ -296,7 +296,7 @@
             </el-form-item>
             <el-form-item prop="ladder" v-if="specialOrder">
               <el-checkbox-group v-model="giftForm.ladder" @change="changeladder" style="display:inline-block">
-                <el-checkbox label="1" :disabled="!ladderDisabled">
+                <el-checkbox label="1" :disabled="!giftForm.memberGrade.length">
                   设置阶梯价
                 </el-checkbox>
               </el-checkbox-group>

src/views/goods/ruleList/ruleList.vue

@@ -137,8 +137,7 @@
                 @change="searchGoods"
               >
                 <el-option label="优惠券" :value="1" />
-                <el-option label="兑换券" :value="2" />
-                <el-option label="实物礼品" :value="3" />
+                <el-option label="礼品" :value="3" />
               </el-select>
               <el-select
                 v-if="type=='选择'"
@@ -148,8 +147,8 @@
                 class="w-180"
                 @change="searchGoods"
               >
-                <el-option label="已关联上架规则" :value="0" />
-                <el-option label="未关联上架规则" :value="1" />
+                <el-option label="已关联上架规则" :value="1" />
+                <el-option label="未关联上架规则" :value="0" />
               </el-select>
               <el-input
                 placeholder="请输入礼品名称/礼品编码"
@@ -201,7 +200,13 @@
             <el-table-column property="date" label="商品信息" min-width="160">
               <template slot-scope="{row}">
                 <div class="img-text">
-                  <img :src="row.mainImageUrl" alt="">
+                  <img :src="row.mainImageUrl||defaultImg" alt="" v-if="row.proType==3">
+                  <div v-if="row.proType==1||row.proType==2">
+                    <img v-if="row.mainImageUrl" :src="row.mainImageUrl" alt>
+                    <img v-if="row.cardType === 0 && !row.mainImageUrl" src="../../../../static/img/quan01.png" alt>
+                    <img v-if="row.cardType === 1 && !row.mainImageUrl" src="../../../../static/img/quan03.png" alt>
+                    <img v-if="row.cardType === 2 && !row.mainImageUrl" src="../../../../static/img/quan02.png" alt>
+                  </div>
                   <div class="text">
                     <p class="goods-descript">
                       {{ row.proName }}
@@ -274,6 +279,7 @@ export default {
       ruleTitle: '',
       totalCount: '',
       integralMallProRuleId: '',
+      defaultImg: '../../../../static/img/pic_default.png',
     };
   },
   mounted () {

src/views/order/giftExchange.vue

@@ -270,7 +270,7 @@
                   <span v-if="scope.row.status === 11">待付款</span>
                   <span v-if="scope.row.status === 1">待发货</span>
                   <span v-if="scope.row.status === 3">已发货</span>
-                  <span v-if="scope.row.status === 4">交易完成</span>
+                  <span v-if="scope.row.status === 4">交易完成{{ scope.row.overFlag==1?'（超期）':'' }}</span>
                   <span v-if="scope.row.status <= 0">交易关闭</span>
                 </p>
                 <p style="line-height:18px">

src/views/setting/deliverSet.vue

@@ -105,6 +105,13 @@
                 自提设置
               </el-button>
               <el-button
+                plain
+                @click="multipleClose"
+                style="margin:0 10px 0 0"
+              >
+                <i style="margin-right:5px" />批量失效
+              </el-button>
+              <el-button
                 type="primary"
                 @click="addStore('-1')"
                 style="margin:0 "
@@ -175,6 +182,9 @@
                         删除
                       </el-button>
                     </el-popover>
+                    <el-button type="text" @click="open(scope.row)" v-if="scope.row.isValid !== 1">
+                      启用
+                    </el-button>
                   </div>
                 </template>
               </el-table-column>
@@ -458,7 +468,24 @@ export default {
         }
       });
     },
-
+    multipleClose () {
+      if (this.selectList.length < 1) {
+        this.$message.error('未选择任何自提点，不能操作批量失效');
+        return;
+      }
+      this.$confirm(`您已选择${this.selectList.length}个自提点，是否确认操作批量失效？操作后这些自提点将不能用于门店自提商品的自提`, '提示', {
+        type: 'warning',
+      }).then(_ => {
+        this.loading = true;
+        const integralMallPickUpPointIdList = this.selectList.map(item => item.integralMallPickUpPointId);
+        request.post('/api-integral-mall/unvalid-pick-up-point', { integralMallPickUpPointIdList }).then(res => {
+          this.$message.success('失效成功');
+          this.getList();
+        }).finally(_ => {
+          this.loading = false;
+        });
+      });
+    },
     // 新增
     addStore () {
       this.$router.push({ name: 'addDeliver', query: { integralMallPickUpPointId: '-1' } });
@@ -467,6 +494,12 @@ export default {
     goAdd (item) {
       this.$router.push({ name: 'editDeliver', query: { integralMallPickUpPointId: item.integralMallPickUpPointId } });
     },
+    open (row) {
+      request.post('/api-integral-mall/valid-pick-up-point', { integralMallPickUpPointId: row.integralMallPickUpPointId }).then(res => {
+        this.$message.success('启用成功,该自提点可用于门店自提商品的自提');
+        this.getList();
+      });
+    },
     // 导出数据
     exportData () {
       const params = {