超级会员迁移

src/views/member/coupon/edit.vue

@@ -38,27 +38,29 @@
             <el-radio :label="3">店铺券</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="供应商" :prop="`formList.${index}.shopData`" :hidden="formItem.couponType === 3 ? false : true" :rules="rules.shopData">
-          <template v-if="formItem.shopData && formItem.shopData.length === 0">
-            <el-button type="primary" autofocussize="mini" size="mini" icon="el-icon-plus" @click="handleShopDialogVisible(index)">选择供应商</el-button>
-            <el-checkbox-group v-show="false" v-model="formItem.shopData" />
-          </template>
-          <template v-else>
-            <el-table :data="formItem.shopData" border width="1000">
-              <el-table-column prop="name" label="供应商名称" align="center" width="300" />
-              <el-table-column prop="sname" label="供应商简称" align="center" width="200" />
-              <el-table-column prop="linkMan" label="联系人" align="center" width="100" />
-              <el-table-column prop="contractMobile" label="手机号" align="center" width="150">
-                <template slot-scope="{ row }">
-                  {{ row.contractMobile ? row.contractMobile : '---' }}
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" align="center">
-                <el-button type="text" @click="deleteShop(index)">删除</el-button>
-              </el-table-column>
-            </el-table>
-          </template>
-        </el-form-item>
+        <template v-if="formItem.couponType === 3">
+          <el-form-item label="供应商" :prop="`formList.${index}.shopData`" :rules="rules.shopData">
+            <template v-if="formItem.shopData && formItem.shopData.length === 0">
+              <el-button type="primary" autofocussize="mini" size="mini" icon="el-icon-plus" @click="handleShopDialogVisible(index)">选择供应商</el-button>
+              <el-checkbox-group v-show="false" v-model="formItem.shopData" />
+            </template>
+            <template v-else>
+              <el-table :data="formItem.shopData" border width="1000">
+                <el-table-column prop="name" label="供应商名称" align="center" width="300" />
+                <el-table-column prop="sname" label="供应商简称" align="center" width="200" />
+                <el-table-column prop="linkMan" label="联系人" align="center" width="100" />
+                <el-table-column prop="contractMobile" label="手机号" align="center" width="150">
+                  <template slot-scope="{ row }">
+                    {{ row.contractMobile ? row.contractMobile : '---' }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="操作" align="center">
+                  <el-button type="text" @click="deleteShop(index)">删除</el-button>
+                </el-table-column>
+              </el-table>
+            </template>
+          </el-form-item>
+        </template>
         <el-form-item label="优惠券金额:" :prop="`formList.${index}.couponAmount`" :rules="rules.couponAmount">
           <el-input v-model="formItem.couponAmount" style="width: 150px" size="mini" />
         </el-form-item>
@@ -145,7 +147,6 @@
     <shop-dialog v-if="dialogShopVisible" ref="shopDialog" @cancel="handleShopCancel" @confirm="handleShopConfirm" />
     <!-- 商品弹框 -->
     <good-dialog v-if="dialogGoodVisible" ref="goodDialog" @cancel="handleGoodCancel" @confirm="handleGoodConfirm" />
-
   </div>
 </template>
 

src/views/member/coupon/list.vue

@@ -24,12 +24,11 @@
         <span>优惠月份:</span>
         <el-date-picker
           v-model="time"
-          type="monthrange"
+          type="daterange"
           unlink-panels
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-          value-format="yyyy-MM"
           :picker-options="pickerOptions"
           @change="getList"
         />
@@ -45,7 +44,7 @@
           {{ row.useTime }} -- {{ row.endTime }}
         </template>
       </el-table-column>
-      <el-table-column prop="coupon" label="优惠券" align="left" width="750">
+      <el-table-column prop="coupon" label="优惠券" align="left" width="650">
         <template slot-scope="{ row }">
           <p v-for="(item,index) in row.couponList" :key="index">
             优惠券

src/views/member/meal/form.vue

@@ -12,7 +12,7 @@
             </el-form-item>
             <el-form-item label="套餐2:">
               <span>3个月超级会员，售价</span>
-              <el-input v-model="form.price1" style="width: 150px">
+              <el-input v-model="form.price2" style="width: 150px">
                 <template slot="append">元</template>
               </el-input>
             </el-form-item>

src/views/member/member/record-list.vue

@@ -87,7 +87,7 @@
     <el-table v-loading="isLoading" :data="tableData" border style="width: 100%">
       <el-table-column label="购买套餐" align="center" width="180">
         <template slot-scope="{ row }">
-          {{ row.packageId | packageFilters }}
+          <span>{{ packageFilters(row) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="购买价格" align="center" width="180">
@@ -157,16 +157,6 @@ export default {
       }
       return map[value]
     },
-    packageFilters(value) {
-      // 套餐
-      const map = {
-        0: '系统赠送',
-        1: '1个月',
-        3: '3个月',
-        12: '12个月'
-      }
-      return map[value]
-    },
     priceFormat(value) {
       return Number(value).toFixed(2)
     }
@@ -306,6 +296,16 @@ export default {
     this.getList()
   },
   methods: {
+    packageFilters(row) {
+      // 套餐
+      const map = {
+        0: `${row.giveMonth}个月`,
+        1: '1个月',
+        3: '3个月',
+        12: '12个月'
+      }
+      return map[row.packageId]
+    },
     priceFilters(row) {
       // 处理购买价格
       const map = {

src/views/member/product/components/pro-dialog.vue

@@ -13,6 +13,7 @@
           v-model="listQuery.productId"
           placeholder="商品ID"
           clearable
+          @input="e => (listQuery.productId= checkedInput(e,1))"
           @keyup.enter.native="getList"
           @clear="getList"
         />
@@ -23,6 +24,7 @@
           v-model="listQuery.name"
           placeholder="商品名称"
           clearable
+          @input="e => (listQuery.name= checkedInput(e,2))"
           @keyup.enter.native="getList"
           @clear="getList"
         />
@@ -138,6 +140,18 @@ export default {
     handleCanle() {
       // 取消弹窗
       this.$emit('cancel')
+    },
+    checkedInput(event, type) {
+      let pattern = ''
+      switch (type) {
+        case 1:
+          pattern = /[^\d]/g
+          break
+        case 2:
+          pattern = /[^u4E00-u9FA5|d|a-zA-Z|rns,.?!，。？！…—&$=()-+/*{}[]]|s/g
+          break
+      }
+      return event.replace(pattern, '')
     }
   }
 }

src/views/member/product/list.vue

@@ -11,6 +11,7 @@
               v-model="listQuery.productId"
               placeholder="商品ID"
               clearable
+              @input="e => (listQuery.productId= checkedInput(e,1))"
               @keyup.enter.native="getList"
               @clear="getList"
             />
@@ -21,6 +22,7 @@
               v-model="listQuery.productName"
               placeholder="商品名称"
               clearable
+              @input="e => (listQuery.productName= checkedInput(e,2))"
               @keyup.enter.native="getList"
               @clear="getList"
             />
@@ -336,6 +338,18 @@ export default {
       } catch (error) {
         console.log(error)
       }
+    },
+    checkedInput(event, type) {
+      let pattern = ''
+      switch (type) {
+        case 1:
+          pattern = /[^\d]/g
+          break
+        case 2:
+          pattern = /[^u4E00-u9FA5|d|a-zA-Z|rns,.?!，。？！…—&$=()-+/*{}[]]|s/g
+          break
+      }
+      return event.replace(pattern, '')
     }
   }
 }