Merge remote-tracking branch 'remotes/origin/feature/20200514_version' into 0605

src/pages/data/StoreDetail.vue

@@ -77,6 +77,18 @@
                   title: '店铺编号',
                   key: 'storeCode'
                 },
+                {
+                  title: '工号',
+                  key: 'staffCode'
+                },
+                {
+                  title: '别名',
+                  key: 'alias'
+                },
+                {
+                  title: '手机号',
+                  key: 'phone'
+                },
                 {
                   title: '所属零售公司',
                   key: 'companyName'

src/pages/shop/IncreaseStoreManager.vue

@@ -3,7 +3,7 @@
         <Row class="search-row">
             <i-col span="24" class="search-col">
                 <Row class="row-style">
-                    <i-input placeholder="店铺名称或编码" class="search-select" :on-enter="searchCustomerDataBtnClick" v-model="searchShop"/>
+                    <i-input placeholder="店铺名称或编码" class="search-select" @on-enter="searchCustomerDataBtnClick" v-model="searchShop"/>
                     <span class="search-span">大区</span>
                     <Select v-model="regionId" filterable class="search-select" @on-change="regionSelect">
                         <Option v-for="(item,index) in regionList" :value="item.id" :key=" index + item.id">{{ item.name }}</Option>

src/pages/user/AccountManager.vue

@@ -3,7 +3,7 @@
         <template>
             <Row class="search-row">
                 <!--                    <span class="search-span">账户名</span>-->
-                <i-input placeholder="搜索用户名/账户" class="left-15 search-select" :on-enter="listAccountInfoFunction" v-model="searchContent"/>
+                <i-input placeholder="搜索用户名/账户" class="left-15 search-select" @on-enter="listAccountInfoFunction" v-model="searchContent"/>
                 <span class="search-span">角色</span>
                 <Select filterable placeholder="请选择角色" v-model="selectedRoleId" class="left-15 search-select"
                         @on-change="onRoleChangeLister">

src/services/CommonHttp.js

@@ -7,9 +7,7 @@ import commonUtils from '../utils/Common'
 // http://mf.kiisoo.com:58080/
 // axios.defaults.baseURL = 'https://wxtk.bsdits.com/kiisoo-ic/';
 axios.defaults.baseURL =
-  process.env.NODE_ENV === 'production'
+  process.env.NODE_ENV === 'production' ? '/kiisoo-ic' : '/kiisoo-ic'
-    ? 'http://111.231.218.44:8080/kiisoo-ic'
-    : '/kiisoo-ic'
 
 //响应时间
 axios.defaults.timeout = 120000
@@ -227,42 +225,40 @@ export function fetchDelete(url, params) {
   })
 }
 
-export function downloadZip(url,filename, options = {}) {
+export function downloadZip(url, filename, options = {}) {
-    return new Promise((resolve, reject) => {
+  return new Promise((resolve, reject) => {
-        axios.defaults.headers['content-type'] = 'application/json;charset=UTF-8'
+    axios.defaults.headers['content-type'] = 'application/json;charset=UTF-8'
-        axios({
+    axios({
-            method: 'post',
+      method: 'post',
-            url: url, // 请求地址
+      url: url, // 请求地址
-            data: {}, // 参数
+      data: options, // 参数
-            responseType: 'blob' // 表明返回服务器返回的数据类型
+      responseType: 'blob', // 表明返回服务器返回的数据类型
-        }).then(
+    }).then(
-            response => {
+      (response) => {
-                resolve(response.data)
+        resolve(response.data)
-                let blob = new Blob([response.data], {
+        let blob = new Blob([response.data], {
-                    type: 'application/zip'
+          type: 'application/zip',
-                })
+        })
-                console.log(blob)
+        console.log(blob)
-                let fileName = filename + '.zip'
+        let fileName = filename + '.zip'
-                if (window.navigator.msSaveOrOpenBlob) {
+        if (window.navigator.msSaveOrOpenBlob) {
-                    // console.log(2)
+          // console.log(2)
-                    navigator.msSaveBlob(blob, fileName)
+          navigator.msSaveBlob(blob, fileName)
-                } else {
+        } else {
-                    // console.log(3)
+          // console.log(3)
-                    var link = document.createElement('a')
+          var link = document.createElement('a')
-                    link.href = window.URL.createObjectURL(blob)
+          link.href = window.URL.createObjectURL(blob)
-                    link.download = fileName
+          link.download = fileName
-                    link.click()
+          link.click()
-                    //释放内存
+          //释放内存
-                    window.URL.revokeObjectURL(link.href)
+          window.URL.revokeObjectURL(link.href)
-                }
+        }
-                options.page.loading = false
+      },
-            },
+      (err) => {
-            err => {
+        reject(err)
-                options.page.loading = false
+      }
-                reject(err)
+    )
-            }
+  })
-        )
-    })
 }
 export function downloadExcel(url, filename, options = {}) {
   let split = filename.split(',')