From d48dc93b41c5e6580bf68bae528ffabcc502872b Mon Sep 17 00:00:00 2001 From: sugars Date: Mon, 25 Sep 2017 10:13:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/utils.js | 2 +- index.html | 1 + src/App.vue | 18 +- src/common/js/BSKEY.js | 71 ++++++-- src/components/bottomtab/bottom-tab.vue | 6 +- src/components/business/businessdata.vue | 19 ++- src/components/common/businesscard.vue | 2 +- src/components/details/details.vue | 113 ++++++++++--- src/components/details/result.vue | 96 +++++++---- src/components/home/home.vue | 121 ++++++++++++-- src/components/home/scan.vue | 88 ++++++++-- src/components/search/search.vue | 12 +- src/main.js | 11 +- src/router/index.js | 3 +- src/vuex/actions.js | 202 +++++++++++++++++++---- src/vuex/getters.js | 6 +- src/vuex/mutations.js | 18 +- src/vuex/store.js | 6 +- static/images/avatar.jpg | Bin 37581 -> 0 bytes static/images/avatar1.jpg | Bin 34744 -> 0 bytes static/images/avatar2.jpg | Bin 36772 -> 0 bytes static/images/avatar3.jpg | Bin 25428 -> 0 bytes static/images/ex1.jpg | Bin 0 -> 71526 bytes static/images/ex2.jpg | Bin 0 -> 64018 bytes static/images/lazy.jpg | Bin 5382 -> 0 bytes static/images/lazy2.png | Bin 0 -> 9017 bytes static/images/loading.gif | Bin 0 -> 30319 bytes static/js/Base.js | 12 +- static/js/OSSHelp.js | 3 + static/js/dynamictk.js | 53 ++++-- 30 files changed, 686 insertions(+), 177 deletions(-) delete mode 100644 static/images/avatar.jpg delete mode 100644 static/images/avatar1.jpg delete mode 100644 static/images/avatar2.jpg delete mode 100644 static/images/avatar3.jpg create mode 100644 static/images/ex1.jpg create mode 100644 static/images/ex2.jpg delete mode 100644 static/images/lazy.jpg create mode 100644 static/images/lazy2.png create mode 100644 static/images/loading.gif create mode 100644 static/js/OSSHelp.js diff --git a/build/utils.js b/build/utils.js index b7b8aaf..08012f2 100644 --- a/build/utils.js +++ b/build/utils.js @@ -4,7 +4,7 @@ var ExtractTextPlugin = require('extract-text-webpack-plugin') const museUiThemePath = path.join( __dirname, - 'node_modules', + '../node_modules', 'muse-ui', 'src/styles/themes/variables/default.less' ) diff --git a/index.html b/index.html index e10df28..d9ddd97 100644 --- a/index.html +++ b/index.html @@ -15,6 +15,7 @@ + diff --git a/src/App.vue b/src/App.vue index 1101611..ec30ba3 100644 --- a/src/App.vue +++ b/src/App.vue @@ -15,9 +15,9 @@ -
- -
+ + + @@ -94,4 +94,16 @@ padding: 0; margin: 0; } + + .loading-mask { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + width: 100%; + height: 100%; + z-index: 999; + background-color: rgba(0, 0, 0, .5); + } diff --git a/src/common/js/BSKEY.js b/src/common/js/BSKEY.js index 3b96d75..39ff938 100644 --- a/src/common/js/BSKEY.js +++ b/src/common/js/BSKEY.js @@ -2,24 +2,59 @@ * Created by Sugar on 2017/8/29. */ export default { - // new_enterprisename: "企业名称", - new_frname: "法定代表人", - new_regno: "工商注册号", - new_creditcode: "统一社会信用代码", - new_regcap: "注册资金(单位:万元)", - new_regcapcur: "注册币种", - new_esdate: "开业日期", - new_openfrom: "经营期限自", - new_opento: "经营期限至", - new_enterprisetype: "企业(机构)类型", - new_enterprisestatus: "经营状态", - new_canceldate: "注销日期", - new_revokedate: "吊销日期", - new_address: "注册地址", - new_abuitem: "许可经营项目", - new_cbuitem: "一般经营项目", - new_operatescope: "经营(业务)范围", - new_operatescopeandform: "经营(业务)范围及方式", + bsdata: { + // new_enterprisename: "企业名称", + + // new_frname: "法定代表人", + // new_regno: "工商注册号", + // new_creditcode: "统一社会信用代码", + // new_regcap: "注册资金(单位:万元)", + // new_regcapcur: "注册币种", + // new_esdate: "开业日期", + // new_openfrom: "经营期限自", + // new_opento: "经营期限至", + // new_enterprisetype: "企业(机构)类型", + // new_enterprisestatus: "经营状态", + // new_canceldate: "注销日期", + // new_revokedate: "吊销日期", + // new_address: "注册地址", + // new_abuitem: "许可经营项目", + // new_cbuitem: "一般经营项目", + // new_operatescope: "经营(业务)范围", + // new_operatescopeandform: "经营(业务)范围及方式", + + new_faren: "法人", + new_regnumber: "登记证号", + new_creditcode: "信用代码", + new_regcap: "注册资本", + new_regmoney: "注册资本", + new_regdate: "注册日期", + new_business: "经营期限", + new_companytype: "机构类型", + new_businessstatus: "经营状态", + new_cervalidityperiod: "证书有效期", + new_companycode: "机构代码", + // new_companyname: "公司名称", + // new_companykey: "机构主键", + new_companysize: "公司规模", + new_areacode: "区域代码", + new_areaname: "区域名称", + new_regorgname: "登记机关", + new_issuetime: "证件生效日期", + new_invalidtime: "证件失效日期", + new_phonearea: "电话区号", + new_phone: "联系电话", + // new_provincename: "省份", + new_email: "企业信箱", + new_website: "企业网站", + new_tradedic: "所属行业", + new_address: "公司地址", + new_regtype: "注册类型", + // new_chkdate: "核实日期", + // new_yearchk: "最近年检", + new_operatescope: "经营范围", + }, + //icon new_name: "名字-person-text", new_comp: "公司-domain-text", diff --git a/src/components/bottomtab/bottom-tab.vue b/src/components/bottomtab/bottom-tab.vue index 451dd08..cc858f2 100644 --- a/src/components/bottomtab/bottom-tab.vue +++ b/src/components/bottomtab/bottom-tab.vue @@ -9,9 +9,9 @@ title="名片夹" icon="contacts"/> - + + + diff --git a/src/components/business/businessdata.vue b/src/components/business/businessdata.vue index 6e61a0b..c3a8fb0 100644 --- a/src/components/business/businessdata.vue +++ b/src/components/business/businessdata.vue @@ -6,10 +6,12 @@
- - + + + - - + + - +
查无此公司的工商信息 - +
@@ -81,7 +83,7 @@ name: 'businessData', data() { return { - BSKEY: bskey + BSKEY: bskey.bsdata } }, computed: { @@ -89,6 +91,7 @@ ...mapGetters(['getBSTitle']) }, created() { + this.$store.state.compayBusinessData = []; this.$store.state.isAjax = true this.$store.dispatch('getBusinessDataByCRM', this.$route.query) }, diff --git a/src/components/common/businesscard.vue b/src/components/common/businesscard.vue index 2c299f0..45ce6d5 100644 --- a/src/components/common/businesscard.vue +++ b/src/components/common/businesscard.vue @@ -6,7 +6,7 @@ class="list-item" @click.stop="showDetails(item.new_cardid)"> - + {{item.new_comp}} diff --git a/src/components/details/details.vue b/src/components/details/details.vue index cc338a5..d17b0be 100644 --- a/src/components/details/details.vue +++ b/src/components/details/details.vue @@ -3,27 +3,26 @@
- - - - 当前分组 - {{getCardDetailGroupName}} + + + {{getCardDetailGroupName}} + - + +
- + :errorText="(key==='new_comp'||key==='new_name'||key==='new_mobile')&&val.length==0?'这是必填项':''" + :required="key==='new_comp'||key==='new_name'||key==='new_mobile'?true:false"> - - + + + + + + 查看名片 + + + - + + +
- +
@@ -62,6 +78,11 @@
+
+
+ +
+ + + + + + @@ -140,7 +165,7 @@ } .fieldlist { - padding: 0 15px 81px 0; + padding: 0 15px 81px 15px; background-color: #fff; .mu-item { padding: 0 !important; @@ -152,6 +177,19 @@ float: right; color: #2196f3; } + .mu-text-field-label { + font-weight: bold; + z-index: 99; + } + .mu-text-field { + margin-bottom: 0; + } + .mu-text-field-content { + padding-bottom: 0 !important; + } + .mu-text-field.has-label { + min-height: 60px; + } } .fr-btn { @@ -181,7 +219,15 @@ left: 0; bottom: 0; width: 100%; - z-index: 10; + z-index: 300; + } + + .card-img { + width: 100%; + } + + .custom-dialog { + width: 95% !important; }