优化

suguoyao · Sep 25, 2017 · d48dc93 · d48dc93
1 parent 7eae0ce
commit d48dc93
Show file tree

Hide file tree

Showing 30 changed files with 686 additions and 177 deletions.
diff --git 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
@@ -15,6 +15,7 @@
   <link rel="stylesheet" href="static/iconfont/material-icons.css">
   <script src="static/js/jquery-1.9.1.min.js"></script>
   <script src="static/js/Base.js"></script>
+  <!--<script src="/platform/Base.js"></script>-->
   <script src="static/js/dynamictk.js"></script>
   <script src="static/js/DynamicApi.js"></script>
   <script src="static/js/OSSHelp.js"></script>

diff --git a/src/App.vue b/src/App.vue
@@ -15,9 +15,9 @@
     <mu-toast v-if="toast" :message="toastMsg"></mu-toast>
 
     <!--底部tabs-->
-    <div class="container-bottom">
-      <bottom-tab class="tab"></bottom-tab>
-    </div>
+    <!--<div class="container-bottom">-->
+    <!--<bottom-tab class="tab"></bottom-tab>-->
+    <!--</div>-->
   </div>
 </template>
 
@@ -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);
+  }
 </style>
diff --git 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
@@ -9,9 +9,9 @@
                         title="名片夹"
                         icon="contacts"/>
 
-    <mu-bottom-nav-item value="discover"
-                        title="我"
-                        icon="person"/>
+    <!--<mu-bottom-nav-item value="discover"-->
+                        <!--title="我"-->
+                        <!--icon="person"/>-->
 
   </mu-bottom-nav>
 </template>

diff --git a/src/components/business/businessdata.vue b/src/components/business/businessdata.vue
@@ -6,10 +6,12 @@
     </div>
 
     <div v-if="compayBusinessData.length>0" style="text-align:center;">
-      <mu-row :gutter="true">
-        <mu-col v-for="(val,key) in getBSTitle"
-                :key="key" :width="key=='经营(业务)范围'?'100':'50'">
+      <!--<mu-row :gutter="true">-->
+        <!--<mu-col v-for="(val,key) in getBSTitle"-->
+                <!--:key="key" :width="key=='经营(业务)范围'?'100':'50'">-->
           <mu-list-item
+            v-for="(val,key) in getBSTitle"
+            :key="key"
             disableRipple>
             <mu-text-field :label="key" type="text"
                            :value="val"
@@ -23,16 +25,16 @@
                            :underlineShow="true"
                            :disabled="true"></mu-text-field>
           </mu-list-item>
-        </mu-col>
-      </mu-row>
+        <!--</mu-col>-->
+      <!--</mu-row>-->
 
-      <mu-raised-button label="返回" class="demo-raised-button" @click="backDetails"></mu-raised-button>
+      <mu-raised-button label="返回" class="demo-raised-button" primary @click="backDetails"></mu-raised-button>
     </div>
 
     <div class="empty" v-if="compayBusinessData.length==0&&!isAjax">
       <mu-icon value="sentiment_neutral" :size="80"></mu-icon>
       <mu-content-block :style="{'margin-bottom':'20px'}">查无此公司的工商信息</mu-content-block>
-      <mu-raised-button label="返回" class="demo-raised-button" @click="backDetails"></mu-raised-button>
+      <mu-raised-button label="返回" class="demo-raised-button" primary @click="backDetails"></mu-raised-button>
     </div>
   </div>
 </template>
@@ -81,14 +83,15 @@
     name: 'businessData',
     data() {
       return {
-        BSKEY: bskey
+        BSKEY: bskey.bsdata
       }
     },
     computed: {
       ...mapState(['isAjax', 'compayBusinessData']),
       ...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
@@ -6,7 +6,7 @@
                   class="list-item"
                   @click.stop="showDetails(item.new_cardid)">
       <!--<mu-avatar :src="'./static/images/sugars.jpeg'" slot="leftAvatar"/>-->
-      <img v-lazy="'./static/images/sugars.jpeg'" alt="" slot="leftAvatar" style="width:100%;">
+      <img v-lazy="item.new_card_url||''" alt="" slot="leftAvatar" style="width:100%;">
       <span slot="describe">
         <span style="color: rgba(0, 0, 0, .87)">{{item.new_comp}}</span>
         </span>