Merge branch 'hotfix/aaa' into 'master'

Hotfix/aaa

hotfix

See merge request !7

@@ -6,12 +6,12 @@ class ResourceApi extends Api {
   }
 
   list() {
-    return this._post('/ufoPlatform/resource/getResources');
+    return this._post('/ufoPlatform/resource/getResources', { size: 200 });
   }
 
   info(id) {
     return this._post('/ufoPlatform/resource/getResourceInfo', {
-      id
+      id,
     });
   }
 
@@ -20,20 +20,30 @@ class ResourceApi extends Api {
   }
 
   editGoodsPool(data) {
-    return this._post('/ufoPlatform/resource/batchEditResourceGoodsPool', data, true);
+    return this._post(
+      '/ufoPlatform/resource/batchEditResourceGoodsPool',
+      data,
+      true,
+    );
   }
 
-  addResourceListItem(data) { // 添加资源位列表中的数据
+  addResourceListItem(data) {
+    // 添加资源位列表中的数据
     return this._post('/ufoPlatform/resource/addOrUpdateResource', data);
   }
 
-  editResourceListItem(data) {// 编辑资源位列表中的某条数据
+  editResourceListItem(data) {
+    // 编辑资源位列表中的某条数据
     return this._post('/ufoPlatform/resource/addOrUpdateResource', data);
   }
 
   addOrUpdateResourceDetail(data) {
-    return this._post('/ufoPlatform/resource/addOrUpdateResourceDeatil', data, true);
+    return this._post(
+      '/ufoPlatform/resource/addOrUpdateResourceDeatil',
+      data,
+      true,
+    );
   }
 }
 
-export default ResourceApi;
\ No newline at end of file
+export default ResourceApi;

@@ -106,7 +106,7 @@
           this.url_ = 'https://m.yohobuy.com/?pagename=saleCalendar';
         } else if (newVal === 'go.hotlist') {
           this.url_ = 'https://m.yohobuy.com/?pagename=hotSale';
-        } else if (newVal === 'go.bargainlist') {
+        } else if (newVal === 'go.bargainlist') { // 砍价列表
           this.url_ = 'https://m.yohobuy.com/';
         } else if('go.identifyList') {
           this.url_ = 'https://m.yohobuy.com/?pagename=identifyList';

-export default "development";
\ No newline at end of file
+export default "production";
\ No newline at end of file

@@ -70,7 +70,7 @@
           </i-upload>
         </i-poptip>
       </i-form-item>
-      <i-form-item label="禁用商品类型">
+      <!--<i-form-item label="禁用商品类型">
         <checkbox-group v-model="formData.skupForbidTypeLable" @on-change="getCheckBox">
           <checkbox label="现货" :disabled="readonly"></checkbox>
           <checkbox label="预售" :disabled="readonly"></checkbox>
@@ -78,304 +78,350 @@
           <checkbox label="全新瑕疵" :disabled="readonly"></checkbox>
           <checkbox label="闪购" :disabled="readonly"></checkbox>
         </checkbox-group>
+      </i-form-item>-->
+      <i-form-item label="可用商品类型">
+        <checkbox-group v-model="formData.skupAllowTypeLabel" @on-change="getCheckBox">
+          <!--          <checkbox label="线下店订单" :disabled="readonly"></checkbox>-->
+          <!--          <checkbox label="急速发货订单" :disabled="readonly"></checkbox>-->
+          <checkbox label="预售" :disabled="readonly"></checkbox>
+          <checkbox label="瑕疵" :disabled="readonly"></checkbox>
+          <checkbox label="二手" :disabled="readonly"></checkbox>
+          <!--          <checkbox label="鉴定" :disabled="readonly"></checkbox>-->
+          <checkbox label="海外直邮" :disabled="readonly"></checkbox>
+          <checkbox label="现货发货" :disabled="readonly"></checkbox>
+          <checkbox label="现货寄存" :disabled="readonly"></checkbox>
+          <checkbox label="闪购发货" :disabled="readonly"></checkbox>
+          <checkbox label="闪购寄存" :disabled="readonly"></checkbox>
+        </checkbox-group>
       </i-form-item>
     </i-form>
   </i-modal>
 </template>
 
 <script>
-import Api from 'api/api';
-import dayjs from 'dayjs';
-import XLSX from 'xlsx';
+  import Api from 'api/api';
+  import dayjs from 'dayjs';
+  import XLSX from 'xlsx';
 
-const api = new Api();
-const forbidenTypeMap = {
-  '现货': 1,
-  '预售': 4,
-  '二手': 6,
-  '全新瑕疵': 5,
-  '闪购': 3
-};
-const forbidenLabelMap = {
-  1: '现货',
-  4: '预售',
-  6: '二手',
-  5: '全新瑕疵',
-  3: '闪购'
-};
+  const api = new Api();
+  const forbidenTypeMap = {
+    '现货': 1,
+    '预售': 4,
+    '二手': 6,
+    '全新瑕疵': 5,
+    '闪购': 3
+  };
+  const forbidenLabelMap = {
+    1: '现货',
+    4: '预售',
+    6: '二手',
+    5: '全新瑕疵',
+    3: '闪购'
+  };
 
-export default {
-  components: {},
-  name: 'ModalCreateCoupon',
-  data() {
-    return {
-      readonly: false,
-      visiable: false,
-      loading: false,
-      posting: true,
-      uploadTxt: '',
-      couponToken: '',
-      formData: {
-        id: 0,
-        couponName: '',
-        couponType: 0,
-        couponNum: 0,
-        useNum: 1,
-        couponAmount: 0,
-        useLimitType: 0,
-        remark: '',
-        productLimitType: 2,
-        productLimitValue: '',
-        useLimitValue: 0,
-        time: ['', ''],
-        skupForbidTypeLable:[],
-        skupForbidType: ''
-      },
-      ruleValidate: {
-        couponType: {required: true, validator: (rule, value, callback) => {
-          if (value === 0 || value === '0') {
-            callback(new Error('请选择优惠券类型'));
-          } else {
-            callback();
-          }
-        }},
-        couponName: {required: true, max: 30, message: '请输入名称'},
-        couponNum: {type: 'number', required: true, min: 1, message: '请输入数量'},
-        couponAmount: {type: 'number', required: true, min: 1, message: '请输入优惠金额'},
-        time: {required: true, validator: (rule, value, callback) => {
-          if (value.some(v => !v)) {
-            callback(new Error('请选择使用期限'));
-          } else {
-            callback();
-          }
-        }},
-        remark: {required: true, message: '请输入优惠券说明'},
-        useLimitType: {required: true, validator: (rule, value, callback) => {
-          if (value >= 0) {
-            if (value === 2) {
-              if (parseInt(this.formData.useLimitValue) > 0) {
+  const allowTypeMap = {
+    // '线下店订单': '2',
+    // '急速发货订单': '3',
+    '预售': '4',
+    '瑕疵': '5',
+    '二手' : '6',
+    // '鉴定': '8',
+    '海外直邮': '17',
+    '现货发货': '1-N',
+    '现货寄存': '1-Y',
+    '闪购发货': '3-N',
+    '闪购寄存': '3-Y'
+  };
+  const allowLabelMap = {
+    // '2': '线下店订单',
+    // '3': '急速发货订单',
+    '4': '预售',
+    '5': '瑕疵',
+    '6': '二手',
+    // '8': '鉴定',
+    '17': '海外直邮',
+    '1-N': '现货发货',
+    '1-Y': '现货寄存',
+    '3-N': '闪购发货',
+    '3-Y':'闪购寄存'
+  };
+
+  export default {
+    components: {},
+    name: 'ModalCreateCoupon',
+    data() {
+      return {
+        readonly: false,
+        allreadonly: false,
+        visiable: false,
+        loading: false,
+        posting: true,
+        uploadTxt: '',
+        couponToken: '',
+        formData: {
+          id: 0,
+          couponName: '',
+          couponType: 0,
+          couponNum: 0,
+          useNum: 1,
+          couponAmount: 0,
+          useLimitType: 0,
+          remark: '',
+          productLimitType: 2,
+          productLimitValue: '',
+          useLimitValue: 0,
+          time: ['', ''],
+//        skupForbidTypeLable:[],
+//        skupForbidType: ''
+          skupAllowTypeLabel: [],
+          skupAllowType: ''
+        },
+        ruleValidate: {
+          couponType: {required: true, validator: (rule, value, callback) => {
+              if (value === 0 || value === '0') {
+                callback(new Error('请选择优惠券类型'));
+              } else {
                 callback();
+              }
+            }},
+          couponName: {required: true, max: 30, message: '请输入名称'},
+          couponNum: {type: 'number', required: true, min: 1, message: '请输入数量'},
+          couponAmount: {type: 'number', required: true, min: 1, message: '请输入优惠金额'},
+          time: {required: true, validator: (rule, value, callback) => {
+              if (value.some(v => !v)) {
+                callback(new Error('请选择使用期限'));
               } else {
-                callback(new Error('请输入限制金额'));
+                callback();
               }
-            } else {
-              callback();
-            }
-          } else {
-            callback(new Error('请选择优惠条件'));
-          }
-        }},
-        productLimitValue: {required: false, validator: (rule, value, callback) => {
-          const ids = (value || '').split(',');
+            }},
+          remark: {required: true, message: '请输入优惠券说明'},
+          useLimitType: {required: true, validator: (rule, value, callback) => {
+              if (value >= 0) {
+                if (value === 2) {
+                  if (parseInt(this.formData.useLimitValue) > 0) {
+                    callback();
+                  } else {
+                    callback(new Error('请输入限制金额'));
+                  }
+                } else {
+                  callback();
+                }
+              } else {
+                callback(new Error('请选择优惠条件'));
+              }
+            }},
+          productLimitValue: {required: false, validator: (rule, value, callback) => {
+              const ids = (value || '').split(',');
 
-          if (!value || !ids.length) {
-            callback(new Error('请输入适用范围'));
-          } else if(ids.some(id => id ? !parseInt(id) : false)) {
-            callback(new Error('适用范围格式错误'));
+              if (!value || !ids.length) {
+                callback(new Error('请输入适用范围'));
+              } else if(ids.some(id => id ? !parseInt(id) : false)) {
+                callback(new Error('适用范围格式错误'));
+              } else {
+                callback();
+              }
+            }},
+          productLimitType: {required: true, validator: (rule, value, callback) => {
+              if (value === 1 || value === 2 || value === 3) {
+                callback();
+              } else {
+                callback(new Error('请选择类型'));
+              }
+            }}
+        }
+      };
+    },
+    methods: {
+      async show(id, readonly, allreadonly) {
+        this.readonly = readonly;
+        this.allreadonly = allreadonly;
+        this.posting = this.visiable = true;
+        this.$refs.formCoupon.resetFields();
+        this.couponToken = '';
+        let initData = {
+          id: 0,
+          couponName: '',
+          couponNum: 0,
+          couponType: 0,
+          useNum: 1,
+          couponAmount: 0,
+          useLimitType: 0,
+          remark: '',
+          productLimitValue: '',
+          productLimitType: 2,
+          useLimitValue: 0,
+          time: ['', ''],
+          skupAllowTypeLabel: [],
+          skupAllowType: ''
+//        skupForbidTypeLable:[],
+//        skupForbidType: ''
+        };
+
+        if (id) {
+          this.loading = true;
+          const result = await api._get('/ufoPlatform/coupon/getCouponInfo', {
+            id
+          });
+
+          // console.log(result);
+
+          this.loading = false;
+
+          if (result.code === 200) {
+            const coupon = result.data.coupon;
+            const productLimits = result.data.productLimits;
+
+            this.couponToken = coupon.couponToken;
+            let skupAllowTypeLabel = [];
+            if (coupon.skupAllowType) {
+              let arr = coupon.skupAllowType.split(',');
+              for(let i = 0; i < arr.length; i++) {
+                skupAllowTypeLabel.push(allowLabelMap[arr[i]]);
+              }
+            }
+            initData = {
+              id,
+              couponName: coupon.couponName,
+              couponNum: coupon.couponNum,
+              couponType: coupon.couponType || 0,
+              useNum: coupon.useNum,
+              couponAmount: coupon.couponAmount,
+              useLimitType: coupon.useLimitType,
+              remark: coupon.remark,
+              productLimitType: coupon.productLimitType,
+              productLimitValue: (productLimits || []).map(i => i.productId).join(','),
+              useLimitValue: coupon.useLimitValue,
+              time: [dayjs.unix(coupon.startTime).format('YYYY-MM-DD HH:mm:ss'), dayjs.unix(coupon.endTime).format('YYYY-MM-DD HH:mm:ss')],
+              skupAllowTypeLabel: skupAllowTypeLabel,
+              skupAllowType: coupon.skupAllowType
+            };
           } else {
-            callback();
+            result.message && this.$Message.warning(result.message);
           }
-        }},
-        productLimitType: {required: true, validator: (rule, value, callback) => {
-          if (value === 1 || value === 2 || value === 3) {
-            callback();
+        }
+        this.formData = initData;
+      },
+      onOk() {
+        this.$refs.formCoupon.validate(valid => {
+          if (!valid) {
+            this.posting = false;
+            this.$nextTick(() => {
+              this.posting = true;
+            });
           } else {
-            callback(new Error('请选择类型'));
+            this.saveData(this.formData);
           }
-        }}
-      }
-    };
-  },
-  methods: {
-    async show(id, readonly, allreadonly) {
-      this.readonly = readonly;
-      this.allreadonly = allreadonly;
-      this.posting = this.visiable = true;
-      this.$refs.formCoupon.resetFields();
-      this.couponToken = '';
-      let initData = {
-        id: 0,
-        couponName: '',
-        couponNum: 0,
-        couponType: 0,
-        useNum: 1,
-        couponAmount: 0,
-        useLimitType: 0,
-        remark: '',
-        productLimitValue: '',
-        productLimitType: 2,
-        useLimitValue: 0,
-        time: ['', ''],
-        skupForbidTypeLable:[],
-        skupForbidType: ''
-      };
-
-      if (id) {
-        this.loading = true;
-        const result = await api._get('/ufoPlatform/coupon/getCouponInfo', {
-          id
         });
+      },
+      getCheckBox() { // checkbox勾选取消的监测
+        let arr = [];
+        for (let i = 0; i < this.formData.skupAllowTypeLabel.length; i++) {
+          let allowType = this.formData.skupAllowTypeLabel[i];
+          arr.push(allowTypeMap[allowType]);
+        }
 
-        console.log(result);
+        console.log(arr);
+        this.formData.skupAllowType = arr.join(',');
+      },
+      async saveData(params) {
+        if (this.allreadonly) {
+          this.visiable = false;
+          return;
+        }
 
-        this.loading = false;
+        const result = await api._post('/ufoPlatform/coupon/saveOrUpdateCoupon', {
+          id: params.id || void 0,
+          couponName: params.couponName,
+          couponAmount: params.couponAmount,
+          couponNum: params.couponNum,
+          couponType: params.couponType,
+          useNum: params.useNum,
+          useLimitValue: params.useLimitValue,
+          productLimitType: params.productLimitType,
+          productLimitValue: params.productLimitValue,
+          remark: params.remark,
+          useLimitType: parseInt(params.useLimitType) >= 0 ? params.useLimitType : void 0,
+          startTime: params.time[0] ? dayjs(params.time[0]).unix() : void 0,
+          endTime: params.time[1] ? dayjs(params.time[1]).unix() : void 0,
+          skupAllowType: params.skupAllowType
+        });
 
-        if (result.code === 200) {
-          const coupon = result.data.coupon;
-          const productLimits = result.data.productLimits;
+        console.log('result=', result);
 
-          this.couponToken = coupon.couponToken;
-          let skupForbidTypeLable = [];
-          if (coupon.skupForbidType) {
-            let arr = coupon.skupForbidType.split(',');
-            for(let i = 0; i < arr.length; i++) {
-              skupForbidTypeLable.push(forbidenLabelMap[parseInt(arr[i])]);
-            }
-          }
-          initData = {
-            id,
-            couponName: coupon.couponName,
-            couponNum: coupon.couponNum,
-            couponType: coupon.couponType || 0,
-            useNum: coupon.useNum,
-            couponAmount: coupon.couponAmount,
-            useLimitType: coupon.useLimitType,
-            remark: coupon.remark,
-            productLimitType: coupon.productLimitType,
-            productLimitValue: (productLimits || []).map(i => i.productId).join(','),
-            useLimitValue: coupon.useLimitValue,
-            time: [dayjs.unix(coupon.startTime).format('YYYY-MM-DD HH:mm:ss'), dayjs.unix(coupon.endTime).format('YYYY-MM-DD HH:mm:ss')],
-            skupForbidTypeLable: skupForbidTypeLable,
-            skupForbidType: coupon.skupForbidType
-          };
+        if (result.code === 200) {
+          this.$Message.success('保存成功');
+          this.visiable = false;
+          this.$emit('on-created');
         } else {
           result.message && this.$Message.warning(result.message);
-        }
-      }
-      this.formData = initData;
-    },
-    onOk() {
-      console.log('ok');
-      this.$refs.formCoupon.validate(valid => {
-        console.log(valid);
-        if (!valid) {
           this.posting = false;
           this.$nextTick(() => {
             this.posting = true;
           });
-        } else {
-          this.saveData(this.formData);
         }
-      });
-    },
-    getCheckBox() { // checkbox勾选取消的监测
-      let arr = [];
-      for (let i = 0; i < this.formData.skupForbidTypeLable.length; i++) {
-        let forbidType = this.formData.skupForbidTypeLable[i];
-        arr.push(forbidenTypeMap[forbidType]);
-      }
-      this.formData.skupForbidType = arr.join(',');
-    },
-    async saveData(params) {
-      if (this.readonly) {
-        this.visiable = false;
-        return;
-      }
-
-      console.log(params);
-      const result = await api._post('/ufoPlatform/coupon/saveOrUpdateCoupon', {
-        id: params.id || void 0,
-        couponName: params.couponName,
-        couponAmount: params.couponAmount,
-        couponNum: params.couponNum,
-        couponType: params.couponType,
-        useNum: params.useNum,
-        useLimitValue: params.useLimitValue,
-        productLimitType: params.productLimitType,
-        productLimitValue: params.productLimitValue,
-        remark: params.remark,
-        useLimitType: parseInt(params.useLimitType) >= 0 ? params.useLimitType : void 0,
-        startTime: params.time[0] ? dayjs(params.time[0]).unix() : void 0,
-        endTime: params.time[1] ? dayjs(params.time[1]).unix() : void 0,
-        skupForbidType: params.skupForbidType
-      });
-
-      console.log('result=', result);
-
-      if (result.code === 200) {
-        this.$Message.success('保存成功');
-        this.visiable = false;
-        this.$emit('on-created');
-      } else {
-        result.message && this.$Message.warning(result.message);
-        this.posting = false;
-        this.$nextTick(() => {
-          this.posting = true;
-        });
-      }
-    },
-    onBeforeUpload(file) {
-      const fileExt = file.name.split('.').pop().toLocaleLowerCase();
-      if (fileExt !== 'XLSX') {
-        this.$Message.warning('文件格式错误');
-        return false;
-      }
-      if (file.size > 1024 * 1024) {
-        this.$Message.warning('文件大小超过1M');
-        return false;
-      }
-      const reader = new FileReader();
+      },
+      onBeforeUpload(file) {
+        const fileExt = file.name.split('.').pop().toLocaleLowerCase();
+        if (fileExt !== 'XLSX') {
+          this.$Message.warning('文件格式错误');
+          return false;
+        }
+        if (file.size > 1024 * 1024) {
+          this.$Message.warning('文件大小超过1M');
+          return false;
+        }
+        const reader = new FileReader();
 
-      reader.readAsArrayBuffer(file);
-      reader.onloadstart = () => {
-        this.uploadTxt = '开始读取';
-      };
-      reader.onprogress = e => {
-        this.uploadTxt = `进度：${Math.round(e.loaded / e.total * 100)}...`;
-      };
-      reader.onerror = () => {
-        this.uploadTxt = '文件读取出错';
-      };
-      reader.onload = e => {
-        this.uploadTxt = '';
-        try {
-          const data = e.target.result;
-          const workbook = XLSX.read(data, { type: 'array' });
-          const firstSheetName = workbook.SheetNames[0];
-          const worksheet = workbook.Sheets[firstSheetName];
-          const results = XLSX.utils.sheet_to_json(worksheet);
+        reader.readAsArrayBuffer(file);
+        reader.onloadstart = () => {
+          this.uploadTxt = '开始读取';
+        };
+        reader.onprogress = e => {
+          this.uploadTxt = `进度：${Math.round(e.loaded / e.total * 100)}...`;
+        };
+        reader.onerror = () => {
+          this.uploadTxt = '文件读取出错';
+        };
+        reader.onload = e => {
+          this.uploadTxt = '';
+          try {
+            const data = e.target.result;
+            const workbook = XLSX.read(data, { type: 'array' });
+            const firstSheetName = workbook.SheetNames[0];
+            const worksheet = workbook.Sheets[firstSheetName];
+            const results = XLSX.utils.sheet_to_json(worksheet);
 
-          this.formData.productLimitValue = results.map(r => r['商品编码']).filter(r => r).join(',');
+            this.formData.productLimitValue = results.map(r => r['商品编码']).filter(r => r).join(',');
 
-        } catch (error) {
-          this.uploadTxt = '文件解析失败，请按照格式上传';
-        }
+          } catch (error) {
+            this.uploadTxt = '文件解析失败，请按照格式上传';
+          }
 
 
-      };
-      return false;
-    },
-    onExample() {
-      const wb = XLSX.utils.book_new();
-      const ws = XLSX.utils.json_to_sheet([{
-        '商品编码': '123456'
-      }]);
-      XLSX.utils.book_append_sheet(wb, ws, '优惠券适用范围示例');
-      XLSX.writeFile(wb, '优惠券适用范围示例.xlsx');
+        };
+        return false;
+      },
+      onExample() {
+        const wb = XLSX.utils.book_new();
+        const ws = XLSX.utils.json_to_sheet([{
+          '商品编码': '123456'
+        }]);
+        XLSX.utils.book_append_sheet(wb, ws, '优惠券适用范围示例');
+        XLSX.writeFile(wb, '优惠券适用范围示例.xlsx');
+      }
     }
-  }
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-.form-group {
-  width: 100%;
-  height: 30px;
-  background-color: #f5f7f9;
-}
+  .form-group {
+    width: 100%;
+    height: 30px;
+    background-color: #f5f7f9;
+  }
 
-.ivu-form-item-label {
-  width: 90px !important;
-}
+  .ivu-form-item-label {
+    width: 90px !important;
+  }
 
 </style>

@@ -114,6 +114,6 @@ module.exports = {
       'assets': path.join(process.cwd(), 'src/assets')
     }
   },
-    plugins: [...plugins]
+  plugins: [...plugins]
 
 };