更新

b75e1282 · damodmg · a7782606 · b75e1282 · a7782606 · b75e1282
Commit b75e1282 authored Jul 14, 2020 by damodmg
30 changed files
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.5a2e56ffae6d2ea313ed3c53dc4a7d2b.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.9072594f61a88f768c70.js></script><script type=text/javascript src=./static/js/app.54c8df1e543ffef6ff27.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.e6af3e3bbca40d64c82f28cda171bed0.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.9072594f61a88f768c70.js></script><script type=text/javascript src=./static/js/app.6d7f34001dcb2f31c008.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.5a2e56ffae6d2ea313ed3c53dc4a7d2b.css
+++ b/dist/static/css/app.5a2e56ffae6d2ea313ed3c53dc4a7d2b.css
--- a/dist/static/css/app.e6af3e3bbca40d64c82f28cda171bed0.css
+++ b/dist/static/css/app.e6af3e3bbca40d64c82f28cda171bed0.css
--- a/dist/static/css/iconfont.css
+++ b/dist/static/css/iconfont.css
 @font-face {font-family: "iconfont";
-  src: url('../fonts/iconfont.eot?t=1554690975783'); /* IE9*/
+  src: url('../fonts/iconfont.eot?t=1593759992250'); /* IE9*/
-  src: url('../fonts/iconfont.eot?t=1554690975783#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  src: url('../fonts/iconfont.eot?t=1593759992250#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('../fonts/data:application/x-font-woff;charset=utf-8;base64,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') format('woff'),
+  /* url('../fonts/data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'), */
-  url('../fonts/iconfont.woff?t=1554690975783') format('woff'),
+  url('../fonts/iconfont.woff?t=1593759992250') format('woff'),
-  url('../fonts/iconfont.ttf?t=1554690975783') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
+  url('../fonts/iconfont.ttf?t=1593759992250') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
-  url('../fonts/iconfont.svg?t=1554690975783#iconfont') format('svg'); /* iOS 4.1- */
+  url('../fonts/iconfont.svg?t=1593759992250#iconfont') format('svg'); /* iOS 4.1- */
 }
 .iconfont {
@@ -16,16 +16,16 @@
  -moz-osx-font-smoothing: grayscale;
 }
-.icon-dingdan:before {
+.icon-shangchuan:before {
-  content: "\e622";
+  content: "\eadd";
 }
-.icon-icon-:before {
+.icon-xiazai:before {
-  content: "\e6dd";
+  content: "\eade";
 }
-.icon-youhuiquan:before {
+.icon-shezhi:before {
-  content: "\e87c";
+  content: "\e663";
 }
 .icon-zhankai:before {
@@ -36,27 +36,35 @@
  content: "\e743";
 }
-.icon-shangpin:before {
+.icon-icon-:before {
-  content: "\e635";
+  content: "\e6dd";
 }
-.icon-lipin:before {
+.icon-xinxixianshi:before {
-  content: "\e78a";
+  content: "\e74f";
+}
+.icon-dingdan:before {
+  content: "\e622";
+}
+.icon-shangpin:before {
+  content: "\e635";
 }
 .icon-icon_yunxiazai:before {
  content: "\e6e8";
 }
-.icon-daifahuo:before {
+.icon-youhuiquan:before {
-  content: "\e615";
+  content: "\e87c";
 }
-.icon-shezhi:before {
+.icon-lipin:before {
-  content: "\e663";
+  content: "\e78a";
 }
-.icon-xinxixianshi:before {
+.icon-daifahuo:before {
-  content: "\e74f";
+  content: "\e615";
 }
--- a/dist/static/fonts/iconfont.eot
+++ b/dist/static/fonts/iconfont.eot
--- a/dist/static/fonts/iconfont.js
+++ b/dist/static/fonts/iconfont.js
--- a/dist/static/fonts/iconfont.svg
+++ b/dist/static/fonts/iconfont.svg
--- a/dist/static/fonts/iconfont.ttf
+++ b/dist/static/fonts/iconfont.ttf
--- a/dist/static/fonts/iconfont.woff
+++ b/dist/static/fonts/iconfont.woff
--- a/dist/static/fonts/iconfont.woff2
+++ b/dist/static/fonts/iconfont.woff2
--- a/dist/static/js/app.54c8df1e543ffef6ff27.js
+++ b/dist/static/js/app.54c8df1e543ffef6ff27.js
--- a/dist/static/js/app.6d7f34001dcb2f31c008.js
+++ b/dist/static/js/app.6d7f34001dcb2f31c008.js
--- a/dist/static/礼品自提点导入模版.xlsx
+++ b/dist/static/礼品自提点导入模版.xlsx
--- a/src/components/store/store-area.vue
+++ b/src/components/store/store-area.vue
+<template>
+  <el-popover placement="bottom-start" width="420" trigger="click" v-model="popoverShow">
+    <div class="store-area-content">
+      <div class="store-area-left-content">
+        <div v-for="(item, index) in areaList" :key="index" class="list-item" @click="getRightList(item, index)">
+          <div>
+            <el-checkbox :indeterminate="item.indeterminate" v-model="item.isCheck" @change="checkProvinceChange(item, index)"></el-checkbox>
+            <span class="list-name"> {{ item.provinceName }}</span>
+          </div>
+          <i class="el-icon-arrow-right"></i>
+        </div>
+      </div>
+      <div class="store-area-right-content">
+        <div v-if="currentCityList.length > 0">
+          <div v-for="(v, i) in currentCityList" :key="i" class="list-item">
+            <div>
+              <el-checkbox :indeterminate="v.indeterminate" v-model="v.isCheck" @change="checkCityChange()"></el-checkbox>
+              <span class="list-name"> {{ v.cityName }}</span>
+            </div>
+          </div>
+        </div>
+        <div v-else class="no-data-content">
+          暂无数据
+        </div>
+      </div>
+    </div>
+    <div class="store-button">
+      <el-button type="text" style="color:#303133" @click="cancel">取消</el-button>
+      <el-button type="text" @click="submit">确定</el-button>
+    </div>
+    <div slot="reference" class="group-title">已选择 {{ totalProvince }} 个省 {{ totalCity }} 个市区</div>
+  </el-popover>
+</template>
+<script>
+import request from '../../service/request.js';
+export default {
+  props: {
+    selectData: {
+      type: Array,
+      default() {
+        return [];
+      }
+    }
+  },
+  data() {
+    return {
+      areaList: [],
+      popoverShow: false,
+      currentCityList: [],
+      totalCity: 0,
+      totalProvince: 0,
+      currentIndex: 0
+    };
+  },
+  watch: {
+    areaList: {
+      /* indeterminate isCheck
+       * true true 半勾选
+       * false false 不选
+       * false true 全选
+       */
+      handler(val) {
+        // 全选计算省数量
+        this.totalProvince = this.areaList.filter(v => !v.indeterminate && v.isCheck).length;
+        this.totalCity = 0;
+        this.areaList.map(v => {
+          // 半勾选计算市数量
+          if (v.isCheck && v.children.length) {
+            v.children.map(w => {
+              if (w.isCheck) {
+                this.totalCity++;
+              }
+            });
+          }
+        });
+      },
+      deep: true
+    }
+  },
+  mounted() {
+    this.getAreaList();
+  },
+  methods: {
+    //获取左侧区域列表
+    getAreaList() {
+      request.get('/api-plug/dict-tree-store-widget').then(res => {
+        if (res.data.errorCode === 0) {
+          this.areaList = res.data.result.map(v => ({
+            isCheck: false,
+            indeterminate: false,
+            label: v.provinceName,
+            id: v.provinceId,
+            ...v,
+            children: v.children.map(w => ({
+              isCheck: false,
+              label: w.cityName,
+              id: w.cityId,
+              ...w
+            }))
+          }));
+          if (this.selectData.length > 0) {
+            let selectId = this.selectData.map(u => u.id);
+            selectId.map(u => {
+              this.areaList.map(v => {
+                // 全选 市一起勾选
+                if (u === v.provinceId) {
+                  v.indeterminate = false;
+                  v.isCheck = true;
+                  v.children.map(w => {
+                    w.isCheck = true;
+                  });
+                }
+                // 半勾选
+                v.children.map(w => {
+                  if (u === w.cityId) {
+                    w.isCheck = true;
+                    v.indeterminate = true;
+                    v.isCheck = true;
+                  }
+                });
+              });
+            });
+          }
+        } else {
+          this.$message.error(res.data.message);
+        }
+      });
+    },
+    // 左侧选中
+    checkProvinceChange(item, index) {
+      this.currentIndex = index;
+      item.children.map(v => {
+        v.isCheck = item.isCheck;
+      });
+      if (item.children.length) {
+        const isAllCheck = item.children.every(v => v.isCheck);
+        const isSomeCheck = item.children.some(v => v.isCheck);
+        item.isCheck = isSomeCheck;
+        item.indeterminate = !isAllCheck && isSomeCheck;
+      }
+      this.totalProvince = this.areaList.filter(v => !v.indeterminate && v.isCheck).length;
+      this.totalCity = 0;
+      this.areaList.map(v => {
+        // 半勾选计算市数量
+        if (v.isCheck && v.children.length) {
+          v.children.map(w => {
+            if (w.isCheck) {
+              this.totalCity++;
+            }
+          });
+        }
+      });
+    },
+    //获取右侧区域
+    getRightList(item, index) {
+      this.currentIndex = index;
+      this.currentCityList = item.children;
+    },
+    // 左侧选中
+    checkCityChange() {
+      let item = this.areaList[this.currentIndex];
+      const isAllCheck = item.children.every(v => v.isCheck);
+      const isSomeCheck = item.children.some(v => v.isCheck);
+      item.isCheck = isSomeCheck;
+      item.indeterminate = !isAllCheck && isSomeCheck;
+      this.totalProvince = this.areaList.filter(v => !v.indeterminate && v.isCheck).length;
+      this.totalCity = 0;
+      this.areaList.map(v => {
+        // 半勾选计算市数量
+        if (v.isCheck && v.children.length) {
+          v.children.map(w => {
+            if (w.isCheck) {
+              this.totalCity++;
+            }
+          });
+        }
+      });
+    },
+    //保存
+    submit() {
+      // 获取所有选中的省份
+      let selectProvince = this.areaList.filter(v => {
+        return v.isCheck && !v.indeterminate;
+      });
+      for (let item of selectProvince) {
+        item.type = 0;
+      }
+      //获取市选中的
+      let cityList = this.areaList.filter(v => {
+        return v.isCheck && v.indeterminate;
+      });
+      let selectCity = [];
+      for (let item of cityList) {
+        for (let v of item.children) {
+          v.type = 1;
+          if (v.isCheck) {
+            selectCity.push(v);
+          }
+        }
+      }
+      let selectList = selectProvince.concat(selectCity);
+      let selectArr = [];
+      selectList.forEach(element => {
+        selectArr.push({ id: element.id, label: element.label, type: element.type });
+      });
+      if (selectArr.length < 1) {
+        this.$message.error('请至少选择一个区域');
+        return false;
+      }
+      //处理数据过滤掉无用字段
+      this.$emit('getSelectList', selectArr);
+      this.popoverShow = false;
+    },
+    cancel() {
+      this.areaList.forEach(i => {
+        (i.isCheck = false), (i.indeterminate = false);
+        i.children.forEach(v => {
+          v.isCheck = false;
+        });
+      });
+      this.$emit('getSelectList', []);
+      this.popoverShow = false;
+    }
+  }
+};
+</script>
+<style scoped>
+.store-area-content {
+  font-size: 0;
+}
+.store-area-left-content {
+  font-size: 14px;
+  width: 200px;
+  display: inline-block;
+  height: 400px;
+  overflow-y: auto;
+  border-radius: 4px;
+  border: 1px solid rgba(228, 231, 237, 1);
+  box-sizing: border-box;
+}
+.list-item {
+  padding: 0 10px;
+  height: 34px;
+  line-height: 34px;
+  font-size: 14px;
+  display: flex;
+  justify-content: space-between;
+  align-self: center;
+}
+.list-item:hover {
+  background: #f5f7fa;
+}
+.list-name {
+  vertical-align: middle;
+  line-height: 16px;
+  margin-left: 5px;
+}
+.el-icon-arrow-right {
+  height: 34px;
+  line-height: 34px;
+}
+.store-area-right-content {
+  font-size: 14px;
+  width: 200px;
+  display: inline-block;
+  margin-left: 15px;
+  height: 400px;
+  overflow-y: auto;
+  border-radius: 4px;
+  border: 1px solid rgba(228, 231, 237, 1);
+}
+.store-button {
+  height: 22px;
+  line-height: 34px;
+  text-align: right;
+}
+.group-title {
+  width: 240px;
+  padding-left: 12px;
+  height: 32px;
+  line-height: 32px;
+  font-size: 14px;
+  color: #606266;
+  border-radius: 4px;
+  border: 1px solid rgba(228, 231, 237, 1);
+}
+.no-data-content {
+  color: #909399;
+  font-size: 14px;
+  margin: 40px auto;
+  text-align: center;
+}
+</style>
--- a/src/components/store/store-group.vue
+++ b/src/components/store/store-group.vue
--- a/src/components/store/store-part.vue
+++ b/src/components/store/store-part.vue
--- a/src/components/store/store.vue
+++ b/src/components/store/store.vue
+<template>
+  <div class="store-content">
+    <div class="left-content">
+      <el-select v-model="storeType" placeholder="请选择" @change="handleChange">
+        <el-option label="所有自提点" :value="0"></el-option>
+        <el-option label="门店分组" :value="2"></el-option>
+        <el-option label="门店区域" :value="1"></el-option>
+        <el-option label="部分自提点" :value="3"></el-option>
+        <el-option label="批量导入" :value="4"></el-option>
+      </el-select>
+    </div>
+    <div class="right-content">
+      <store-group v-if="storeType === 2" :selectData="selectData" @getSelectList="getSelectList"></store-group>
+      <store-area v-if="storeType === 1" :selectData="selectData" @getSelectList="getSelectList"></store-area>
+      <store-part v-if="storeType === 3" :selectData="selectData" @getSelectList="getSelectList"></store-part>
+      <div v-if="storeType === 4">
+        <div class="upload-box">
+          <el-upload :action="action" :data="uploadData" with-credentials :before-upload="uploadFileBefore" :on-success="uploadFile" :show-file-list="showList" class="upload-content">
+            <el-button size="small" plain class="upload-btn"><i class="iconfont icon-shangchuan"></i>点击上传</el-button>
+          </el-upload>
+          <el-button type="text" class="download-btn" @click="downLoad">
+            点击下载模板
+            <el-popover placement="top-start" width="260" trigger="hover">
+              <p>1.自提点code请至配送设置中导出；</p>
+              <p>2.仅支持.xlsx .xls文件的导入，文件大小不超过2M；</p>
+              <p>3.每个sheet数据最多可导入2000条，超出则导入失败，门店过多建议使用多张sheet填充；</p>
+              <el-button slot="reference" type="text" icon="iconfont icon-xinxixianshi"></el-button>
+            </el-popover>
+          </el-button>
+        </div>
+        <div class="upload-text" v-if="uploadNum + errorNum > 0">
+          <div v-if="isAdd">
+            本次共上传 {{ uploadNum + errorNum }} 个自提点，其中成功 <span class="file-num">{{ uploadNum }}</span
+            >个，失败 <span class="error-num"> {{ errorNum }} </span>个。
+            <el-button type="text" class="error-list" @click="dialogVisible = true" v-if="errorNum > 0">查看失败原因</el-button>
+          </div>
+          <div v-else>本次共成功上传 {{ uploadNum }} 个自提点</div>
+          <div class="file-name">
+            <span>{{ uploadFileName }}</span>
+            <el-button type="text" icon="iconfont icon-xiazai" @click="downLoadFile"></el-button>
+          </div>
+        </div>
+      </div>
+    </div>
+    <el-dialog title="导入失败原因" :visible.sync="dialogVisible" width="420px">
+      <div class="info-content" style="height:400px;overflow-y:auto">
+        <div v-for="(item, index) in errorList" :key="index" class="list-content">
+          <span class="reason-info">{{ item.orderNumber }}</span>
+          <span class="sku-info">{{ item.errorMessage }}</span>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+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';
+export default {
+  props: {
+    pickUpPointType: {
+      type: Number,
+      default() {
+        return 0;
+      }
+    },
+    selectData: {
+      type: Array,
+      default() {
+        return [];
+      }
+    },
+    isAdd: {
+      type: Boolean,
+      default() {
+        return true;
+      }
+    }
+  },
+  data() {
+    return {
+      action: window.location.origin + '/api-integral-mall/upload-pick-up-points',
+      // action: 'http://gicdev.demogic.com/api-integral-mall/upload-pick-up-points',
+      uploadData: {
+        requestProject: 'integral-mall'
+      },
+      showList: false,
+      uploadNum: 0,
+      errorNum: 0,
+      uploadFileName: '',
+      downloadUrl: '',
+      pickUpPointStr: '',
+      storeType: 0,
+      dialogVisible: false,
+      errorList: []
+    };
+  },
+  mounted() {
+    this.storeType = this.pickUpPointType || 0;
+    if (this.storeType === 4) {
+      this.uploadNum = this.selectData.correctNumber;
+      this.uploadFileName = this.selectData.fileId;
+      this.downloadUrl = this.selectData.downloadUrl;
+    }
+  },
+  methods: {
+    //获取数据
+    getSelectList(arr) {
+      this.$emit('getArr', arr, this.storeType);
+    },
+    //下载模板
+    downLoad() {
+      let url = 'static/礼品自提点导入模版.xlsx';
+      window.open(url);
+    },
+    // 上传之前
+    uploadFileBefore(file) {
+      let fileType = file.name.split('.')[file.name.split('.').length - 1];
+      if (fileType !== 'xlsx' && fileType !== 'xls') {
+        this.$message.error('文件格式错误，请导入.xlsx或.xls格式的文件');
+        return false;
+      }
+      if (file.size > 2 * 1024 * 1024) {
+        this.$message.error('请上传小于2MB的文件');
+        return false;
+      }
+    },
+    uploadFile(file, fileList) {
+      if (file.errorCode === 0) {
+        this.uploadFileName = file.result.picUploadResDTO.fileId;
+        this.uploadNum = file.result.orderErrorDTO.correctNumber;
+        this.errorNum = file.result.orderErrorDTO.errornumber;
+        this.errorList = file.result.orderErrorDTO.list || [];
+        this.downloadUrl = file.result.picUploadResDTO.url;
+        this.pickUpPointStr = file.result.pickUpPointStr;
+        let obj = {};
+        obj = {
+          downloadUrl: this.downloadUrl,
+          fileId: this.uploadFileName,
+          pickUpPointStr: this.pickUpPointStr,
+          correctNumber: this.uploadNum
+        };
+        this.$emit('getArr', obj, this.storeType);
+      } else {
+        this.$message.error(file.message);
+      }
+    },
+    // 下载上传的文件
+    downLoadFile() {
+      window.location.href = this.downloadUrl;
+      // let params = {
+      //   projectCode: 'integral-mall'
+      // };
+      // request.post('/api-admin/download-report', qs.stringify(params)).then(res => {
+      //   var data = res.data;
+      //   if (data.errorCode == 0) {
+      //     window.location.href = data.result;
+      //   } else {
+      //     this.$message.error(res.data.message);
+      //   }
+      // });
+    },
+    //门店类型切换
+    handleChange() {
+      this.selectData = [];
+      if (this.storeType === 0) {
+        this.$emit('getArr', this.selectData, this.storeType);
+      }
+    }
+  },
+  components: {
+    storeGroup,
+    storeArea,
+    storePart
+  }
+};
+</script>
+<style scoped>
+.store-content {
+  font-size: 0;
+}
+.left-content {
+  display: inline-block;
+  font-size: 14px;
+}
+.right-content {
+  display: inline-block;
+  margin-left: 10px;
+  vertical-align: top;
+}
+.upload-text {
+  font-size: 14px;
+  color: #606266;
+  line-height: 20px;
+  margin-top: 12px;
+}
+.file-num {
+  font-weight: 600;
+  margin: 0 5px;
+}
+.error-num {
+  color: #ff5152;
+}
+.error-list {
+  margin-left: 10px;
+}
+.file-name {
+  width: 220px;
+  height: 37px;
+  line-height: 37px;
+  padding: 0 10px;
+  background: #f2f3f7;
+  margin-top: 10px;
+  display: flex;
+  justify-content: space-between;
+}
+.right-content /deep/ .upload-btn {
+  width: 240px;
+}
+.right-content /deep/ .upload-btn .icon-shangchuan {
+  margin-right: 5px;
+  font-size: 14px;
+}
+.upload-box {
+  display: flex;
+}
+.download-btn {
+  margin-left: 16px;
+}
+.upload-content {
+  width: 240px;
+}
+.sku-info {
+  font-size: 13px;
+  color: #606266;
+  margin-left: 10px;
+  vertical-align: top;
+  width: 280px;
+  display: inline-block;
+  word-break: break-all;
+}
+.reason-info {
+  color: #303133;
+  font-size: 14px;
+  font-weight: 500;
+  word-break: break-all;
+  width: 80px;
+  display: inline-block;
+}
+.list-content {
+  margin-bottom: 15px;
+}
+</style>
--- a/src/components/updataCash.vue
+++ b/src/components/updataCash.vue
+<template>
+  <el-dialog :title="编辑积分费用或现金费用" :visible.sync="dialogVisible" width="650px" @close="close">
+    <div class="dialog-body">
+      <el-table :data="cardCostList" style="width: 100%" v-if="cardCostList.length > 1">
+        <el-table-column prop="proRefName" label="卡券名称"> </el-table-column>
+        <el-table-column prop="integralCost" label="积分">
+          <template slot-scope="scope">
+            <el-input-number v-model="scope.row.integralCost" :precision="0" :min="0" controls-position="right" @blur="handleIntegralCostTotal" @change="handleIntegralCostTotal"></el-input-number>
+          </template>
+        </el-table-column>
+        <el-table-column prop="cashCost" label="现金">
+          <template slot-scope="scope">
+            <el-input-number v-model="scope.row.cashCost" :precision="2" :min="0" controls-position="right" @blur="handleIntegralCostTotal" @change="handleIntegralCostTotal"></el-input-number>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-table :data="tableData" style="width: 100%;margin-top:20PX">
+        <el-table-column prop="proName" label="券包名称"> </el-table-column>
+        <el-table-column prop="integralCost" label="积分">
+          <template slot-scope="scope">
+            <el-input-number :disabled="cardCostList.length > 1" v-model="scope.row.integralCost" :precision="0" :min="0" controls-position="right"></el-input-number>
+          </template>
+        </el-table-column>
+        <el-table-column prop="cashCost" label="现金">
+          <template slot-scope="scope">
+            <el-input-number :disabled="cardCostList.length > 1" v-model="scope.row.cashCost" :precision="2" :min="0" controls-position="right"></el-input-number>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="close">取 消</el-button>
+      <el-button @click="submit">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import qs from 'qs';
+import request from '../service/request.js';
+export default {
+  props: {
+    packageData: {
+      type: Object,
+      default() {
+        return {};
+      }
+    }
+  },
+  data() {
+    return {
+      dialogVisible: true,
+      cardCostList: [],
+      tableData: []
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    getList() {
+      let params = {
+        integralMallProId: this.packageData.integralMallProId
+      };
+      this.loading = true;
+      request.post('/api-integral-mall/coupon-package-show', qs.stringify(params)).then(res => {
+        if (res.data.errorCode === 0) {
+          this.cardCostList = res.data.result.cardCostList || [];
+          this.tableData = [];
+          this.tableData.push({
+            proRefId: this.packageData.integralMallProId,
+            integralCost: res.data.result.integralCost,
+            cashCost: res.data.result.cashCost,
+            proName: res.data.result.proName
+          });
+        } else {
+          this.$message.error(res.data.message);
+        }
+      });
+    },
+    // 券包积分计算
+    handleIntegralCostTotal() {
+      let total = 0;
+      let totalCash = 0;
+      for (let item of this.cardCostList) {
+        if (item.integralCost) {
+          total = total + Number(item.integralCost);
+        } else {
+          total = total + 0;
+        }
+        if (item.cashCost) {
+          totalCash = totalCash + Number(item.cashCost);
+        } else {
+          totalCash = totalCash + 0;
+        }
+      }
+      this.tableData[0].integralCost = total;
+      this.tableData[0].cashCost = totalCash;
+    },
+    submit() {
+      if (this.cardCostList.length > 1) {
+        for (let item of this.cardCostList) {
+          if (item.cashCost === undefined || item.integralCost === undefined) {
+            this.$message.error('卡券积分或现金不能为空');
+            return false;
+          }
+        }
+      }
+      if (this.tableData[0].integralCost === undefined || this.tableData[0].cashCost === undefined) {
+        this.$message.error('卡券积分或现金不能为空');
+        return false;
+      }
+      let params = {
+        integralMallProId: this.packageData.integralMallProId,
+        cardCostList: this.cardCostList,
+        proName: this.tableData[0].proName,
+        integralCost: this.tableData[0].integralCost,
+        cashCost: this.tableData[0].cashCost
+      };
+      request.post('/api-integral-mall/update-coupon-package-price', params).then(res => {
+        if (res.data.errorCode === 0) {
+          this.$emit('getList');
+          this.$emit('closePackage');
+        } else {
+          this.$message.error(res.data.message);
+        }
+      });
+    },
+    close() {
+      this.$emit('closePackage');
+    }
+  }
+};
+</script>
+<style scoped>
+.slot-num {
+  float: right;
+  margin-top: -20px;
+  font-size: 13px;
+}
+</style>
--- a/src/views/goods/coupon/coupon.vue
+++ b/src/views/goods/coupon/coupon.vue
@@ -68,12 +68,12 @@
            <el-table-column prop="integralCost" label="积分费用" sortable="custom" min-width="110px">
              <template slot-scope="scope">
                <!-- <editInfo :popoverType='1' :popoverNum="scope.row.integralCost"><editInfo> -->
-                <p class="intergral-edit">{{ scope.row.integralCost }}积分<i class="el-icon-edit" @click="handleTable(scope.row, 1)" v-if="scope.row.canEdit"></i></p>
+                <p class="intergral-edit">{{ scope.row.integralCost }}积分<i class="el-icon-edit" @click="updataCash(scope.row)" v-if="scope.row.canEdit"></i></p>
              </template>
            </el-table-column>
            <el-table-column prop="cashCost" label="现金费用" sortable="custom" min-width="110px">
              <template slot-scope="scope">
-                <p class="intergral-edit">{{ scope.row.cashCost }}元<i class="el-icon-edit" @click="handleTable(scope.row, 2)" v-if="scope.row.canEdit"></i></p>
+                <p class="intergral-edit">{{ scope.row.cashCost }}元<i class="el-icon-edit" @click="updataCash(scope.row)" v-if="scope.row.canEdit"></i></p>
              </template>
            </el-table-column>
            <el-table-column prop="sortCost" label="库存" sortable="custom">
@@ -151,6 +151,7 @@
    <!-- 调整积分费用 -->
    <editInfo :editInfoModal="editInfoModal" @getList="getList"></editInfo>
    <!-- <stockModal :intergralModal="intergralModal" @getList="getList"></stockModal> -->
+    <updateCash v-if="packageDialog" :packageData="packageData" @getList="getList" @closePackage="closePackage"></updateCash>
  </div>
 </template>
@@ -162,6 +163,7 @@ import getInputVal from '../../../utils/common.js';
 import eqCode from '../../../components/eqCode';
 import selectType from '../../../components/selectGoodsType';
 import editInfo from '../../../components/editCouponInfo';
+import updateCash from '../../../components/updataCash';
 // import stockModal from '../../../components/getSkuList';
 export default {
  data() {
@@ -198,7 +200,12 @@ export default {
        type: '',
        costValue: ''
      },
-      couponListObj: {}
+      couponListObj: {},
+      // 券包积分现金更新
+      packageDialog: false,
+      packageData: {
+        integralMallProId: ''
+      }
    };
  },
  created() {
@@ -476,6 +483,14 @@ export default {
      this.editInfoModal.mallProId = item.integralMallProId;
      this.editInfoModal.dialogVisible = true;
    },
+    //更新积分现金
+    updataCash(item) {
+      this.packageData.integralMallProId = item.integralMallProId;
+      this.packageDialog = true;
+    },
+    closePackage() {
+      this.packageDialog = false;
+    },
    selectInit(row, index) {
      return row.canEdit;
    }
@@ -483,7 +498,8 @@ export default {
  components: {
    eqCode,
    selectType,
-    editInfo
+    editInfo,
+    updateCash
    // stockModal
  }
 };

--- a/src/views/goods/coupon/info.vue
+++ b/src/views/goods/coupon/info.vue
--- a/src/views/goods/gift/info.vue
+++ b/src/views/goods/gift/info.vue
@@ -218,6 +218,11 @@
            </el-form-item>
            <el-form-item label="自提点" v-if="giftForm.changeTypeList.indexOf('4') != -1">
              <template>
+                <pickUp-store :isAdd="isAddPick" :pickUpPointType="pickUpPointType" :selectData="selectedStoreData" @getArr="getArr"></pickUp-store>
+              </template>
+            </el-form-item>
+            <!-- <el-form-item label="自提点" v-if="giftForm.changeTypeList.indexOf('4') != -1">
+              <template>
                <el-radio v-model="giftForm.pickUpPointType" :label="1">全部自提点</el-radio>
                <el-radio v-model="giftForm.pickUpPointType" :label="2">部分自提点</el-radio>
              </template>
@@ -226,7 +231,7 @@
              <el-select v-model="giftForm.pickUpPoint" multiple placeholder="请选择自提点" size="small" class="w-600" filterable remote :remote-method="remoteMethod">
                <el-option v-for="item in pickUpPointList" :key="item.integralMallPickUpPointId" :label="item.pickUpPointName" :value="item.integralMallPickUpPointId"> </el-option>
              </el-select>
-            </el-form-item>
+            </el-form-item> -->
            <el-form-item label="配送方式" v-if="giftType !== 1" prop="changeType">
              <el-radio-group v-model="giftForm.changeType" @change="changeDeliver" :disabled="editChangeTypeStatus">
                <el-radio :label="3"
@@ -330,6 +335,7 @@ import importCoupon from './importCoupon';
 import addSku from './addSku';
 import Treeselect from '@riophae/vue-treeselect';
 import '@riophae/vue-treeselect/dist/vue-treeselect.css';
+import pickUpStore from '../../../components/store/store';
 export default {
  data() {
    const validateTime = (rule, value, callback) => {
@@ -485,7 +491,12 @@ export default {
      pickUpPointList: [], //门店自提列表
      // 新版门店卡券选择器
      uuid: '',
-      isAdd: true
+      isAdd: true,
+      // 门店自提数据
+      pickUpPointType: 0,
+      selectedStoreData: [],
+      pickUpPointStr: '',
+      isAddPick: true
    };
  },
  // watch: {
@@ -535,9 +546,11 @@ export default {
      // }, 1000);
      // this.getDisGroupList();
      this.getInfo();
+      this.isAddPick = false;
      // this.getDisGroupList();
      this.editChangeTypeStatus = true;
    } else {
+      this.isAddPick = true;
      if (this.giftType === 0) {
        this.getGiftId();
      } else {
@@ -828,14 +841,21 @@ export default {
            //实物礼品
            this.giftForm.changeType = Number(res.data.result.changeType);
            this.giftForm.changeTypeList = res.data.result.changeType.split(',');
+            // if (this.giftForm.changeTypeList.indexOf('4') != -1) {
+            //   this.getPickUpPointList();
+            //   if (res.data.result.pickUpPoint === '-1') {
+            //     this.giftForm.pickUpPoint = [];
+            //     this.giftForm.pickUpPointType = 1;
+            //   } else {
+            //     this.giftForm.pickUpPoint = res.data.result.pickUpPoint ? res.data.result.pickUpPoint.split(',') : [];
+            //     this.giftForm.pickUpPointType = 2;
+            //   }
+            // }
            if (this.giftForm.changeTypeList.indexOf('4') != -1) {
-              this.getPickUpPointList();
+              this.pickUpPointType = res.data.result.pickUpPointType;
-              if (res.data.result.pickUpPoint === '-1') {
+              this.selectedStoreData = JSON.parse(res.data.result.pickUpPointExtra) || [];
-                this.giftForm.pickUpPoint = [];
+              if (this.pickUpPointType === 4) {
-                this.giftForm.pickUpPointType = 1;
+                this.pickUpPointStr = res.data.result.pickUpPoint || '';
-              } else {
-                this.giftForm.pickUpPoint = res.data.result.pickUpPoint ? res.data.result.pickUpPoint.split(',') : [];
-                this.giftForm.pickUpPointType = 2;
              }
            }
          } else if (res.data.result.giftType === 0) {
@@ -1326,9 +1346,13 @@ export default {
      }
    },
    getSkuList(val) {
+      if(val.length===1&&val[0].length===0) {
+        return false
+      }
      this.skuList = val;
      // console.log('skuList', this.skuList);
      // return;
      this.handleSku();
      if (this.giftProStandardJson.length > 0) {
        if (this.skuList.length > 0) {
@@ -1380,12 +1404,12 @@ export default {
        for (let j in skuArr) {
          //数据的个数
          this.submitSkuJson.push({
-            giftProSkuId: skuPrice[j][5].valueName ? skuPrice[j][5].valueName : '',
+            giftProSkuId: skuPrice[j][5]? skuPrice[j][5].valueName : '',
-            giftProSkuIntegral: skuPrice[j][0].valueName, //积分
+            giftProSkuIntegral: skuPrice[j][0]?skuPrice[j][0].valueName:"", //积分
-            giftProSkuCash: skuPrice[j][1].valueName, //现金
+            giftProSkuCash: skuPrice[j][1]?skuPrice[j][1].valueName:'', //现金
-            stock: skuPrice[j][2].valueName, //库存
+            stock: skuPrice[j][2]?skuPrice[j][2].valueName:'', //库存
-            giftProSkuStandCode: skuPrice[j][3].valueName, //规格编码
+            giftProSkuStandCode: skuPrice[j][3]?skuPrice[j][3].valueName:'', //规格编码
-            giftProGiftCode: skuPrice[j][4].valueName, //条形码
+            giftProGiftCode: skuPrice[j][4]?skuPrice[j][4].valueName:'', //条形码
            giftPropValues: skuSta[j]
          });
        }
@@ -1448,6 +1472,21 @@ export default {
        }
      });
    },
+    getArr(arr,type) {
+      if(type===4){
+        let selectedStoreData = {}
+        selectedStoreData = {
+          downloadUrl:arr.downloadUrl,
+          fileId:arr.fileId,
+          correctNumber:arr.correctNumber
+        }
+        this.selectedStoreData = selectedStoreData
+        this.pickUpPointStr = arr.pickUpPointStr
+      }else{
+        this.selectedStoreData = arr
+      }
+      this.pickUpPointType = type
+    },
    // 保存
    async submitGoodsForm(form) {
      this.giftForm.detailDescription = this.$refs.tinymceWrap.tinymceHtml;
@@ -1481,6 +1520,7 @@ export default {
        }
      }
      //校验规格明细
+      console.log(this.submitSkuJson)
      if (this.submitSkuJson.length) {
        for (let item of this.submitSkuJson) {
          if (item.giftPropValues.length) {
@@ -1585,10 +1625,23 @@ export default {
      if(this.useNewStoreWidget ===1) {
        let data = await this.$refs.storeCard.getRightList();
        if (!data.length) {
-          this.$tips({ type: 'error', message: '门店不能为空' });
+          this.$message.error('门店不能为空')
          return;
        }
      }
+      if(this.giftForm.changeTypeList.indexOf('4') != -1) {//配送方式选择了门店自提
+        if(this.pickUpPointType===1||this.pickUpPointType===2||this.pickUpPointType===3) {
+          if(this.selectedStoreData.length<1) {
+            this.$message.error('请选择自提点数据');
+            return false;
+          }
+        }else if(this.pickUpPointType===4) {
+          if(!this.selectedStoreData.correctNumber > 0) {
+            this.$message.error('请至少成功导入一个自提点');
+            return false;
+          }
+        }
+      }
      this.$refs[form].validate(valid => {
        if (valid) {
@@ -1622,20 +1675,22 @@ export default {
            proCodeQuery: this.giftForm.proCodeQuery, //条形码
            costValue: this.giftForm.changeType === 1 ? this.couponCostValue : this.giftForm.costValue, //卡券礼品成本
            marketPrice: this.giftForm.marketPrice, //市场价
-            // cashCost: this.giftForm.costValue, //礼品成本
            virtualStock: this.giftForm.virtualStock, //库存
            timeZones: '', //部分时段
            proShowStatus: this.giftForm.proShowStatus, //显示状态
            releaseType: this.giftForm.releaseType, //上架状态
            limitTimeBegin: this.giftForm.releaseType === 2 ? this.getTimeAll(this.giftForm.limitTimeBegin) : '', //定时上架时间
            changeType: this.giftType === 0 ? String(this.giftForm.changeType) : this.giftForm.changeTypeList.join(','), //配送方式
-            pickUpPoint:this.giftForm.pickUpPointType ===2?this.giftForm.pickUpPoint.join(','):'-1',
+            // pickUpPoint:this.giftForm.pickUpPointType ===2?this.giftForm.pickUpPoint.join(','):'-1',//门店自提
            refundType: this.giftForm.refundType, //售后
            giftProStandardJson: this.giftProStandardJson ? JSON.stringify(this.giftProStandardJson) : '', //规格列表
-            skuJson: this.submitSkuJson.length ? JSON.stringify(this.submitSkuJson) : '' //sku数据
+            skuJson: this.submitSkuJson.length ? JSON.stringify(this.submitSkuJson) : '', //sku数据
-            // searchParams: JSON.stringify(this.searchParams) === '{}' ? null : this.searchParams, //会员筛选
+            pickUpPointType:this.giftForm.changeTypeList.indexOf('4') != -1?this.pickUpPointType:"",//门店自提数据
-            // responseParams: this.responseParams.length ? this.responseParams : null
+            pickUpPointExtra:this.giftForm.changeTypeList.indexOf('4') != -1?JSON.stringify(this.selectedStoreData):""//门店自提数据
          };
+          if(this.pickUpPointType===4) {
+            params.pickUpPoint = this.pickUpPointStr
+          }
          // 门店分类
          if(this.useNewStoreWidget===0) {
            if (this.sendChildData.storeType === 1) {
@@ -1739,7 +1794,8 @@ export default {
    addCate,
    tinymceEdit,
    addSku,
-    importCoupon
+    importCoupon,
+    pickUpStore
  }
 };
 </script>

--- a/src/views/setting/convenSet.vue
+++ b/src/views/setting/convenSet.vue
@@ -23,6 +23,12 @@
          <el-form-item prop="openAutoShelf" label="礼品无库存自动下架">
            <el-switch v-model="form.openAutoShelf"></el-switch>
          </el-form-item>
+          <el-form-item prop="showStoreType" label="礼品展示门店类型">
+            <el-checkbox-group v-model="form.showStoreType">
+              <el-checkbox label="1">服务门店</el-checkbox>
+              <el-checkbox label="2">协管门店</el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
          <el-form-item>
            <el-button type="primary" @click="handleSubmit('form')" :loading="btnLoading">确定</el-button>
          </el-form-item>
@@ -42,11 +48,13 @@ export default {
    return {
      form: {
        cardType: '',
-        openAutoShelf: false
+        openAutoShelf: false,
+        showStoreType: []
      },
      formRules: {
        cardType: [{ required: true, message: '请选择积分消耗卡', trigger: 'change' }],
-        openAutoShelf: [{ required: true, message: '请设置无库存自动下架', trigger: 'change' }]
+        openAutoShelf: [{ required: true, message: '请设置无库存自动下架', trigger: 'change' }],
+        showStoreType: [{ required: true, message: '请至少勾选一个门店类型', trigger: 'change' }]
      },
      btnLoading: false
    };
@@ -60,6 +68,7 @@ export default {
        if (res.data.errorCode === 0) {
          this.form.cardType = res.data.result.cardType || '';
          this.form.openAutoShelf = res.data.result.openAutoShelf === 1 ? true : false;
+          this.form.showStoreType = res.data.result.showStoreType ? res.data.result.showStoreType.split(',') : [];
        } else {
          this.$message.error(res.data.message);
        }
@@ -70,7 +79,8 @@ export default {
        if (valid) {
          let params = {
            // cardType: this.form.cardType,
-            openAutoShelf: this.form.openAutoShelf ? 1 : 0
+            openAutoShelf: this.form.openAutoShelf ? 1 : 0,
+            showStoreType: this.form.showStoreType.join(',')
          };
          this.btnLoading = true;
          request.get('/api-integral-mall/save-card-config', { params }).then(res => {

--- a/static/css/iconfont.css
+++ b/static/css/iconfont.css
 @font-face {font-family: "iconfont";
-  src: url('../fonts/iconfont.eot?t=1554690975783'); /* IE9*/
+  src: url('../fonts/iconfont.eot?t=1593759992250'); /* IE9*/
-  src: url('../fonts/iconfont.eot?t=1554690975783#iefix') format('embedded-opentype'), /* IE6-IE8 */
+  src: url('../fonts/iconfont.eot?t=1593759992250#iefix') format('embedded-opentype'), /* IE6-IE8 */
-  url('../fonts/data:application/x-font-woff;charset=utf-8;base64,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') format('woff'),
+  /* url('../fonts/data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2'), */
-  url('../fonts/iconfont.woff?t=1554690975783') format('woff'),
+  url('../fonts/iconfont.woff?t=1593759992250') format('woff'),
-  url('../fonts/iconfont.ttf?t=1554690975783') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
+  url('../fonts/iconfont.ttf?t=1593759992250') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
-  url('../fonts/iconfont.svg?t=1554690975783#iconfont') format('svg'); /* iOS 4.1- */
+  url('../fonts/iconfont.svg?t=1593759992250#iconfont') format('svg'); /* iOS 4.1- */
 }
 .iconfont {
@@ -16,16 +16,16 @@
  -moz-osx-font-smoothing: grayscale;
 }
-.icon-dingdan:before {
+.icon-shangchuan:before {
-  content: "\e622";
+  content: "\eadd";
 }
-.icon-icon-:before {
+.icon-xiazai:before {
-  content: "\e6dd";
+  content: "\eade";
 }
-.icon-youhuiquan:before {
+.icon-shezhi:before {
-  content: "\e87c";
+  content: "\e663";
 }
 .icon-zhankai:before {
@@ -36,27 +36,35 @@
  content: "\e743";
 }
-.icon-shangpin:before {
+.icon-icon-:before {
-  content: "\e635";
+  content: "\e6dd";
 }
-.icon-lipin:before {
+.icon-xinxixianshi:before {
-  content: "\e78a";
+  content: "\e74f";
+}
+.icon-dingdan:before {
+  content: "\e622";
+}
+.icon-shangpin:before {
+  content: "\e635";
 }
 .icon-icon_yunxiazai:before {
  content: "\e6e8";
 }
-.icon-daifahuo:before {
+.icon-youhuiquan:before {
-  content: "\e615";
+  content: "\e87c";
 }
-.icon-shezhi:before {
+.icon-lipin:before {
-  content: "\e663";
+  content: "\e78a";
 }
-.icon-xinxixianshi:before {
+.icon-daifahuo:before {
-  content: "\e74f";
+  content: "\e615";
 }
--- a/static/fonts/iconfont.eot
+++ b/static/fonts/iconfont.eot
--- a/static/fonts/iconfont.js
+++ b/static/fonts/iconfont.js
--- a/static/fonts/iconfont.svg
+++ b/static/fonts/iconfont.svg
--- a/static/fonts/iconfont.ttf
+++ b/static/fonts/iconfont.ttf
--- a/static/fonts/iconfont.woff
+++ b/static/fonts/iconfont.woff
--- a/static/fonts/iconfont.woff2
+++ b/static/fonts/iconfont.woff2
--- a/static/礼品自提点导入模版.xlsx
+++ b/static/礼品自提点导入模版.xlsx