Merge branch 'feature_0521' of http://git.51jingcheng.com/zhenghuang/bsdgy-front into feature_0521

5 years ago · f50ff73b31
parent 8ddb417ac5 9f27c108cb
commit f50ff73b31
29 changed files with 10 additions and 9915 deletions
--- a/dist/assets/css/app.css
+++ b/dist/assets/css/app.css
--- a/dist/assets/css/chunk-vendors.css
+++ b/dist/assets/css/chunk-vendors.css
--- a/dist/assets/fonts/ionicons.ttf
+++ b/dist/assets/fonts/ionicons.ttf
--- a/dist/assets/fonts/ionicons.woff
+++ b/dist/assets/fonts/ionicons.woff
--- a/dist/assets/fonts/ionicons.woff2
+++ b/dist/assets/fonts/ionicons.woff2
--- a/dist/assets/img/bg.jpg
+++ b/dist/assets/img/bg.jpg
--- a/dist/assets/img/bsd-logo.png
+++ b/dist/assets/img/bsd-logo.png
--- a/dist/assets/img/head_bg.png
+++ b/dist/assets/img/head_bg.png
--- a/dist/assets/img/ionicons.svg
+++ b/dist/assets/img/ionicons.svg
--- a/dist/assets/img/jt.png
+++ b/dist/assets/img/jt.png
--- a/dist/assets/img/lbx.png
+++ b/dist/assets/img/lbx.png
--- a/dist/assets/img/map.png
+++ b/dist/assets/img/map.png
--- a/dist/assets/js/app.js
+++ b/dist/assets/js/app.js
--- a/dist/assets/js/chunk-753dcded.js
+++ b/dist/assets/js/chunk-753dcded.js
--- a/dist/assets/js/chunk-vendors.js
+++ b/dist/assets/js/chunk-vendors.js
--- a/dist/favicon.ico
+++ b/dist/favicon.ico
--- a/dist/font/DS-DIGIT.TTF
+++ b/dist/font/DS-DIGIT.TTF
--- a/dist/images/bg.jpg
+++ b/dist/images/bg.jpg
--- a/dist/images/head_bg.png
+++ b/dist/images/head_bg.png
--- a/dist/images/jt.png
+++ b/dist/images/jt.png
--- a/dist/images/lbx.png
+++ b/dist/images/lbx.png
--- a/dist/images/line.png
+++ b/dist/images/line.png
--- a/dist/images/loading.gif
+++ b/dist/images/loading.gif
--- a/dist/images/map.png
+++ b/dist/images/map.png
--- a/dist/index.html
+++ b/dist/index.html
@ -1 +0,0 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><link rel=icon href=/dist/favicon.ico><title>优客</title><link href=/dist/assets/js/chunk-753dcded.js rel=prefetch><link href=/dist/assets/css/app.css rel=preload as=style><link href=/dist/assets/css/chunk-vendors.css rel=preload as=style><link href=/dist/assets/js/app.js rel=preload as=script><link href=/dist/assets/js/chunk-vendors.js rel=preload as=script><link href=/dist/assets/css/chunk-vendors.css rel=stylesheet><link href=/dist/assets/css/app.css rel=stylesheet></head><body><noscript><strong>We're sorry but kiisoo-ic-ui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/dist/assets/js/chunk-vendors.js></script><script src=/dist/assets/js/app.js></script></body></html>
--- a/dist/推广人员批量添加.xlsx
+++ b/dist/推广人员批量添加.xlsx
--- a/dist/门店号批量开通模板.xlsx
+++ b/dist/门店号批量开通模板.xlsx
--- a/src/pages/activity/useActivityStepThree.vue
+++ b/src/pages/activity/useActivityStepThree.vue
@ -12,30 +12,20 @@
    <div class="companyTable">
      <div class="companyListClass">
        <Row :gutter="10">
-          <div v-if="loading"
-               style="padding: 50px 0"
-               class="loading">
+          <div v-if="loading" style="padding: 50px 0" class="loading">
            <Spin fix>加载中...</Spin>
          </div>
-          <CheckboxGroup size="large"
-                         @on-change="onChange"
-                         v-model="isSelect">
-            <i-col span="8"
-                   v-if="!item.hide && index < block"
-                   :key="index"
-                   v-for="(item, index) in shopList">
-              <Checkbox size="large"
-                        :label="item.value"
-                        border>
-                <span>{{ item.label }}</span>
+          <CheckboxGroup size="large" @on-change="onChange" v-model="isSelect">
+            <i-col span="8" v-if="!item.hide && index < block" :key="index" v-for="(item, index) in shopList">
+              <Checkbox size="large" :label="item.value" border>
+                <span :title="item.label">{{ item.label.substr(0, 18) }}</span>
              </Checkbox>
            </i-col>
          </CheckboxGroup>
        </Row>
      </div>
-      <Spin size="large"
-            fix
-            v-if="loading"></Spin>
+      <Spin size="large" fix v-if="loading"></Spin>
+      <Button type="info" long v-if="block < orginShopList.length" @click="loadMore">加载更多</Button>
    </div>
  </div>
 </template>
@ -144,6 +134,9 @@ export default {
        }
      });
    },
+    loadMore() {
+      this.block += 50;
+    },
    getShopInfo () {
      let that = this;
      let companyIds = [];
--- a/yarn.lock
+++ b/yarn.lock
				`@ -1 +0,0 @@`
				<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><link rel=icon href=/dist/favicon.ico><title>优客</title><link href=/dist/assets/js/chunk-753dcded.js rel=prefetch><link href=/dist/assets/css/app.css rel=preload as=style><link href=/dist/assets/css/chunk-vendors.css rel=preload as=style><link href=/dist/assets/js/app.js rel=preload as=script><link href=/dist/assets/js/chunk-vendors.js rel=preload as=script><link href=/dist/assets/css/chunk-vendors.css rel=stylesheet><link href=/dist/assets/css/app.css rel=stylesheet></head><body><noscript><strong>We're sorry but kiisoo-ic-ui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/dist/assets/js/chunk-vendors.js></script><script src=/dist/assets/js/app.js></script></body></html>