fix: 修改bug

c1e9a3a5 · 无尘 · c47e4269 · c1e9a3a5 · c47e4269 · c1e9a3a5
Commit c1e9a3a5 authored Mar 11, 2020 by 无尘
18 changed files
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.24.css><link href=./static/css/app.173d441ecdd732a07ec4f7895be62481.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/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/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.536ca04e746a9be63be5.js></script><script type=text/javascript src=./static/js/vendor.e91073f106903eddf860.js></script><script type=text/javascript src=./static/js/app.a27b284b16025e675856.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.24.css><link href=./static/css/app.b2cef9dba69af7cf01127ecf30908787.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/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/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.032b422e2909733f0286.js></script><script type=text/javascript src=./static/js/vendor.e91073f106903eddf860.js></script><script type=text/javascript src=./static/js/app.d7bd3b39686671bcbfd0.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.173d441ecdd732a07ec4f7895be62481.css
+++ b/dist/static/css/app.173d441ecdd732a07ec4f7895be62481.css
--- a/dist/static/css/app.b2cef9dba69af7cf01127ecf30908787.css
+++ b/dist/static/css/app.b2cef9dba69af7cf01127ecf30908787.css
--- a/dist/static/js/10.8144b2952e608c99c868.js
+++ b/dist/static/js/10.8144b2952e608c99c868.js
+webpackJsonp([10],{AejC:function(t,s,i){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var e=i("Minx"),a=i.n(e),n={name:"page404",data:function(){return{img_404:a.a}},computed:{message:function(){return"抱歉，你访问的页面不存在"}},mounted:function(){}},c={render:function(){var t=this.$createElement,s=this._self._c||t;return s("div",{staticStyle:{background:"#f0f2f5","margin-top":"-20px",height:"100%"}},[s("div",{staticClass:"wscn-http404"},[s("div",{staticClass:"pic-404"},[s("img",{staticClass:"pic-404__parent",attrs:{src:this.img_404,alt:"404"}})]),this._v(" "),s("div",{staticClass:"bullshit"},[s("div",{staticClass:"bullshit__headline"},[this._v(this._s(this.message))]),this._v(" "),s("a",{staticClass:"bullshit__return-home",attrs:{href:"#/companyGroup"}},[this._v("返回首页")])])])])},staticRenderFns:[]};var r=i("VU/8")(n,c,!1,function(t){i("tDw4")},"data-v-5bffce3c",null);s.default=r.exports},Minx:function(t,s,i){t.exports=i.p+"static/img/error_404.bf58747.svg"},tDw4:function(t,s){}});
\ No newline at end of file
--- a/dist/static/js/10.cdc6733af07fe3483e78.js
+++ b/dist/static/js/10.cdc6733af07fe3483e78.js
--- a/dist/static/js/11.529019747940d70381f8.js
+++ b/dist/static/js/11.529019747940d70381f8.js
--- a/dist/static/js/12.8c2e25b234e6c994122b.js
+++ b/dist/static/js/12.8c2e25b234e6c994122b.js
--- a/dist/static/js/13.b206981c3a29ab04c807.js
+++ b/dist/static/js/13.b206981c3a29ab04c807.js
--- a/dist/static/js/5.60a4b00696f2043d92fd.js
+++ b/dist/static/js/5.60a4b00696f2043d92fd.js
--- a/dist/static/js/8.149f1ceba8ad2d3abf33.js
+++ b/dist/static/js/8.149f1ceba8ad2d3abf33.js
--- a/dist/static/js/9.5e6b743726e7d8438871.js
+++ b/dist/static/js/9.5e6b743726e7d8438871.js
-webpackJsonp([9],{AejC:function(t,s,i){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var e=i("Minx"),a=i.n(e),n={name:"page404",data:function(){return{img_404:a.a}},computed:{message:function(){return"抱歉，你访问的页面不存在"}},mounted:function(){}},c={render:function(){var t=this.$createElement,s=this._self._c||t;return s("div",{staticStyle:{background:"#f0f2f5","margin-top":"-20px",height:"100%"}},[s("div",{staticClass:"wscn-http404"},[s("div",{staticClass:"pic-404"},[s("img",{staticClass:"pic-404__parent",attrs:{src:this.img_404,alt:"404"}})]),this._v(" "),s("div",{staticClass:"bullshit"},[s("div",{staticClass:"bullshit__headline"},[this._v(this._s(this.message))]),this._v(" "),s("a",{staticClass:"bullshit__return-home",attrs:{href:"#/companyGroup"}},[this._v("返回首页")])])])])},staticRenderFns:[]};var r=i("VU/8")(n,c,!1,function(t){i("tDw4")},"data-v-5bffce3c",null);s.default=r.exports},Minx:function(t,s,i){t.exports=i.p+"static/img/error_404.bf58747.svg"},tDw4:function(t,s){}});
\ No newline at end of file
--- a/dist/static/js/8.bda5789112a4386ac684.js
+++ b/dist/static/js/8.bda5789112a4386ac684.js
--- a/dist/static/js/app.a27b284b16025e675856.js
+++ b/dist/static/js/app.a27b284b16025e675856.js
--- a/dist/static/js/manifest.536ca04e746a9be63be5.js
+++ b/dist/static/js/manifest.536ca04e746a9be63be5.js
-!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,n,r){for(var t,b,o,i=0,u=[];i<c.length;i++)b=c[i],f[b]&&u.push(f[b][0]),f[b]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(a&&a(c,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=d(d.s=r[i]);return o};var c={},f={51:0};function d(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,d){a=f[e]=[c,d]});a[2]=c;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,d.nc&&r.setAttribute("nonce",d.nc),r.src=d.p+"static/js/"+e+"."+{0:"b5c2beb958a50f5beadb",1:"06c4e42e62c1f75191f0",2:"6db64b5ffdd29f770da4",3:"e6962450c8d5738c3319",4:"f1674bae959e941960b1",5:"60a4b00696f2043d92fd",6:"b748d7ac73a6d6700725",7:"ee9b4ffcf8a8cc2fde16",8:"bda5789112a4386ac684",9:"5e6b743726e7d8438871",10:"cdc6733af07fe3483e78",11:"529019747940d70381f8",12:"8c2e25b234e6c994122b",13:"b206981c3a29ab04c807",14:"a034fd161b8c1b267354",15:"161afee4880a4b61c3f9",16:"982b6d4cc452775c1826",17:"91e2fe42aacd5fd73d9e",18:"a4c6826038e63e26db84",19:"56fbc2476082c554cb76",20:"7f3a92bcf5a66089600a",21:"857b8bbdd27214a8bc25",22:"9ad786a93be8761b954d",23:"44f8721a4e37849af31a",24:"d38696f55116fb585eae",25:"882138467fb4700637f0",26:"861a130a705ab90f18c9",27:"9b0fe9c79aebb055c7de",28:"544f03cfbdf475ad174b",29:"bc43fde10c870859a8a3",30:"8b6920d460412aedcfde",31:"053210fefb0665c59480",32:"1f767b857ef3d058d56e",33:"40d5132a7fe6147ba9ef",34:"be3b5d7a4cc5e32f0dfd",35:"4a15da14c5a042b2d797",36:"7f1b6adc72a543c5455e",37:"e868e5aa804da0b6eb8b",38:"9823df8050bae6e59dc5",39:"13770623cd0155327e56",40:"f6ef482085cccdca5f67",41:"d2e13a048e460fe7db63",42:"bbfc8147188dfd7ffd12",43:"5d2d83cd76295aac795e",44:"894c9353222f503048dd",45:"e943700ad9539430cc2a",46:"3ebb7632373e949c4784",47:"db2230e175441528fa76",48:"bda5c55f72a191ae99c2"}[e]+".js";var t=setTimeout(b,12e4);function b(){r.onerror=r.onload=null,clearTimeout(t);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=b,n.appendChild(r),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,n,r){for(var b,t,o,i=0,u=[];i<c.length;i++)t=c[i],f[t]&&u.push(f[t][0]),f[t]=0;for(b in n)Object.prototype.hasOwnProperty.call(n,b)&&(e[b]=n[b]);for(a&&a(c,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=d(d.s=r[i]);return o};var c={},f={51:0};function d(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,d){a=f[e]=[c,d]});a[2]=c;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,d.nc&&r.setAttribute("nonce",d.nc),r.src=d.p+"static/js/"+e+"."+{0:"b5c2beb958a50f5beadb",1:"06c4e42e62c1f75191f0",2:"6db64b5ffdd29f770da4",3:"e6962450c8d5738c3319",4:"f1674bae959e941960b1",5:"500be7143e86e7aad094",6:"b748d7ac73a6d6700725",7:"ee9b4ffcf8a8cc2fde16",8:"149f1ceba8ad2d3abf33",9:"916e0ede46ca141d75b8",10:"8144b2952e608c99c868",11:"e17569badebc0d03b94f",12:"106cadf87efaf0fd28ce",13:"0f01707cee8bf5918701",14:"a034fd161b8c1b267354",15:"161afee4880a4b61c3f9",16:"982b6d4cc452775c1826",17:"91e2fe42aacd5fd73d9e",18:"a4c6826038e63e26db84",19:"56fbc2476082c554cb76",20:"7f3a92bcf5a66089600a",21:"857b8bbdd27214a8bc25",22:"9ad786a93be8761b954d",23:"44f8721a4e37849af31a",24:"d38696f55116fb585eae",25:"882138467fb4700637f0",26:"861a130a705ab90f18c9",27:"9b0fe9c79aebb055c7de",28:"544f03cfbdf475ad174b",29:"bc43fde10c870859a8a3",30:"8b6920d460412aedcfde",31:"053210fefb0665c59480",32:"1f767b857ef3d058d56e",33:"40d5132a7fe6147ba9ef",34:"be3b5d7a4cc5e32f0dfd",35:"4a15da14c5a042b2d797",36:"7f1b6adc72a543c5455e",37:"e868e5aa804da0b6eb8b",38:"9823df8050bae6e59dc5",39:"13770623cd0155327e56",40:"f6ef482085cccdca5f67",41:"d2e13a048e460fe7db63",42:"bbfc8147188dfd7ffd12",43:"5d2d83cd76295aac795e",44:"894c9353222f503048dd",45:"e943700ad9539430cc2a",46:"3ebb7632373e949c4784",47:"db2230e175441528fa76",48:"bda5c55f72a191ae99c2"}[e]+".js";var b=setTimeout(t,12e4);function t(){r.onerror=r.onload=null,clearTimeout(b);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=t,n.appendChild(r),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/company/add-enterprise.vue
+++ b/src/components/company/add-enterprise.vue
@@ -2,8 +2,8 @@
 * @Descripttion : 当前组件信息
 * @Author       : 无尘
 * @Date         : 2020-02-13 16:13:59
- * @LastEditors  : 无尘
+ * @LastEditors: 无尘
- * @LastEditTime : 2020-02-26 14:25:51
+ * @LastEditTime: 2020-03-11 09:31:01
 * @FilePath     : \Hapi-demoj:\公司\haoban-3\src\components\company\add-enterprise.vue
 -->
 <!--
@@ -17,16 +17,16 @@
    <el-form :model="partForm" :rules="rules" ref="form" label-width="140px" class="dialog-form">
      <el-form-item label="选择商户" prop="enterpriseName">
        <el-autocomplete style="width: 363px;" v-model="partForm.enterpriseName" :fetch-suggestions="querySearchAsync" @select="handleSelect">
-          <el-select v-model="partForm.version" slot="prepend" class="w-95" :disabled="disflag" @change="changeCode">
+          <el-select v-model="partForm.version" slot="prepend" class="w-95" :disabled="disflag">
            <el-option v-for="(item, index) in versionList" :label="item.label" :value="item.value" :key="index + 'option'">{{ item.value }}</el-option>
          </el-select>
        </el-autocomplete>
      </el-form-item>
      <el-form-item label="超级管理员">
-        {{ partForm.clerkName }}
+        {{ partForm.clerkName | formatName }}
      </el-form-item>
-      <el-form-item label="超级管理员手机号" prop="sex"
+      <el-form-item label="超级管理员手机号" prop=""
-        ><span v-if="partForm.phoneNumber">{{ partForm.nationCode }}-</span> {{ partForm.phoneNumber | formatPhoneNum }} <el-button :disabled="!partForm.phoneNumber ? true : false" type="primary" @click="sendCode()">点击短信验证</el-button>
+        ><span v-if="partForm.phoneNumber">{{ partForm.nationCode }}-</span>{{ partForm.phoneNumber | formatPhoneNum }} <el-button class="m-l-35" :disabled="disableBtn" type="text" @click="sendCode()">{{ (disableBtn && countNum == 60) || (!disableBtn && !!countNum) ? '点击短信验证' : countNum + 's' }}</el-button>
      </el-form-item>
      <el-form-item label="短信验证码" prop="code">
        <el-input style="width: 180px;" v-model="partForm.code" placeholder="请输入验证码"></el-input>
@@ -45,6 +45,7 @@ import selectDepartment from '@/components/company/select-department.vue';
 import { getRequest, postRequest } from '@/api/api';
 import errMsg from '@/common/js/error';
 import showMsg from '@/common/js/showmsg';
+import { _debounce } from '@/common/js/public';
 // import PhoneNumber from 'awesome-phonenumber';
 export default {
  name: 'add-enterprise',
@@ -100,14 +101,31 @@ export default {
            trigger: 'blur'
          }
        ]
-      }
+      },
+      disableBtn: true, // 发验证码.默认无手机号，不可点击
+      countNum: 60
    };
  },
  methods: {
    /**
+     * 倒计时
+     */
+    countDown() {
+      const that = this;
+      let time = setInterval(function() {
+        if (that.countNum === 0) {
+          clearInterval(time);
+          that.countNum = 60;
+          that.disableBtn = false;
+          return false;
+        }
+        that.countNum--;
+      }, 1000);
+    },
+    /**
     * 发送验证码
     */
-    sendCode() {
+    sendCode: _debounce(function() {
      const that = this;
      let params = {
        phoneNumber: that.partForm.phoneNumber,
@@ -119,6 +137,8 @@ export default {
        .then(res => {
          let resData = res.data;
          if (resData.errorCode == 1) {
+            that.disableBtn = true;
+            that.countDown();
            const phone = String(that.partForm.phoneNumber);
            let handle = phone.substr(0, 3) + '****' + phone.substr(7, phone.length - 1);
            showMsg.showmsg(`已发送验证码到${that.partForm.nationCode}-${handle}`, 'success');
@@ -132,7 +152,7 @@ export default {
            message: error.message
          });
        });
-    },
+    }, 300),
    /**
     * 校验验证码
     */
@@ -221,6 +241,9 @@ export default {
      that.partForm.nationCode = item.nationCode;
      that.partForm.phoneNumber = item.phoneNumber;
      that.partForm.code = '';
+      if (item.phoneNumber) {
+        that.disableBtn = false;
+      }
    },
    /**
     * 改变对外职务
@@ -322,11 +345,14 @@ export default {
  },
  watch: {}
  /* mounted() {
-                              const that = this;
+    const that = this;
-                            } */
+  } */
 };
 </script>
 <style lang="less" scoped>
+.m-l-35 {
+  margin-left: 35px;
+}
 .span-dot {
  display: inline-block;
  width: 6px;

--- a/src/filters/index.js
+++ b/src/filters/index.js
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-09-11 18:18:32
 * @LastEditors: 无尘
- * @LastEditTime: 2019-09-25 17:10:43
+ * @LastEditTime: 2020-03-11 09:12:57
 */
 /* 全局过滤器 */
@@ -111,11 +111,24 @@ const formatPhoneNum = function(phone) {
  return phone.substr(0, 3) + '****' + phone.substr(7, 11);
 };
+/**
+ * 姓名格式化
+ * @param {String} phone
+ */
+const formatName = function(name) {
+  if (!name) {
+    return '';
+  }
+  name = name.toString();
+  return '**' + name.substr(name.length - 1, name.length);
+};
 export default {
  dateFormat,
  formatTimeStamp,
  timeStampToYmd,
  timeStampToHms,
  formatTimeYmdHms,
-  formatPhoneNum
+  formatPhoneNum,
+  formatName
 };
--- a/src/views/business/orgStructSet.vue
+++ b/src/views/business/orgStructSet.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-03-20 14:36:37
 * @LastEditors: 无尘
- * @LastEditTime: 2020-03-10 17:49:50
+ * @LastEditTime: 2020-03-11 09:35:59
 -->
 <template>
  <div class="my-customer-wrap common-set-wrap">
@@ -35,7 +35,8 @@
                <div class="add-enterprise cursor-pointer text-center" @click="showAddDialog"><span class="iconfont icontianjiajiahaowubiankuang font-12 color-2f54eb"></span><span class="font-12 color-2f54eb p-l-10">新建GIC商户授权</span></div>
              </div>
              <div class="gic-content-depart">
-                <org-tree :itemData="gicData"></org-tree>
+                <org-tree v-if="gicData.length" :itemData="gicData"></org-tree>
+                <div v-else class="font-14 color-606266">暂无数据</div>
              </div>
            </div>
          </div>
@@ -507,6 +508,9 @@ export default {
          let resData = res.data;
          if (resData.errorCode == 1) {
            that.enterpriseData = resData.result || [];
+            if (!!resData.result && resData.result.length) {
+              that.getGicData(resData.result[0]);
+            }
            return false;
          }
          errMsg.errorMsg(resData);

--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2018-10-10 14:44:45
 * @LastEditors: 无尘
- * @LastEditTime: 2020-03-10 18:23:18
+ * @LastEditTime: 2020-03-11 09:13:37
 -->
 <template>
  <div class="login-wrap">