'拉取dev'

src/pages/distributorSign/contract-list.vue

 <!--
- * @Description: In User Settings Edit
+ * @Description: 签约单列表
    * @Author: your name
  * @Date: 2019-09-25 10:30:46/>: your name
    -->
@@ -166,8 +166,8 @@ export default {
         height: 86px;
         display: flex;
         flex-direction: column;
-        justify-content: space-around;
-        padding: 4px 0;
+        justify-content: space-evenly;
+
         .option {
             width: 100%;
             height: 18px;

src/pages/distributorSign/details-tab.vue

 <!--
- * @Description: In User Settings Edit
+ * @Description: 详情tab
  * @Author: your name
  * @Date: 2019-09-25 19:47:59
- * @LastEditTime: 2019-09-26 14:08:08
+ * @LastEditTime: 2019-09-27 13:24:06
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -40,21 +40,12 @@ export default {
 </script>
 <style lang="less" scoped>
 .tab-style{
-   /* display:flex;
+    display:flex;
     justify-content: center;
     padding-top:12px;
     padding-bottom: 8px;
     align-items: center;
-    box-shadow:0 2px 3px 0  rgba(220,220,221,0.50);*/
-  position: relative;
-  z-index: 50;
-  background-color: #fff;
-  display:flex;
-  justify-content: center;
-  padding-top:12px;
-  padding-bottom: 8px;
-  align-items: center;
-  box-shadow:0 2px 3px 0  rgba(220,220,221,0.50);
+    box-shadow:0 2px 3px 0  rgba(220,220,221,0.50);
     span{
         display: block;
         width:112px;

src/pages/distributorSign/personal.vue

@@ -2,7 +2,7 @@
  * @Descrip：个人信息
  * @Author: your name
  * @Date: 2019-09-26 15:47:45
- * @LastEditTime: 2019-09-27 11:08:48
+ * @LastEditTime: 2019-09-27 13:21:47
  * @LastEditors: Please set LastEditors
    -->
 <template>

src/pages/userBind/np/naturePerson.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: liuxin
  * @Date: 2019-09-19 09:18:14
- * @LastEditTime: 2019-09-26 19:54:05
+ * @LastEditTime: 2019-09-27 13:21:31
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -348,13 +348,13 @@ export default {
         vm.hlsPopup.showLongCenter('学历不能为空！')
       } else if (!vm.baseInfo.marital_status) {
         vm.hlsPopup.showLongCenter('婚姻状况不能为空！')
-      } else if ((vm.marital_status_n == '已婚') && !vm.baseInfo.bp_name_sp) {
+      } else if ((vm.marital_status_n === '已婚') && !vm.baseInfo.bp_name_sp) {
         vm.hlsPopup.showLongCenter('配偶姓名不能为空！')
-      } else if ((vm.marital_status_n == '已婚') && !vm.baseInfo.spouse_phone) {
+      } else if ((vm.marital_status_n === '已婚') && !vm.baseInfo.spouse_phone) {
         vm.hlsPopup.showLongCenter('配偶手机号不能为空！')
-      } else if ((vm.marital_status_n == '已婚') && !vm.baseInfo.working_place_sp) {
+      } else if ((vm.marital_status_n === '已婚') && !vm.baseInfo.working_place_sp) {
         vm.hlsPopup.showLongCenter('配偶工作单位不能为空！')
-      } else if ((vm.marital_status_n == '已婚') && !vm.baseInfo.address_sp) {
+      } else if ((vm.marital_status_n === '已婚') && !vm.baseInfo.address_sp) {
         vm.hlsPopup.showLongCenter('配偶居住地址不能为空！')
       } else if (!vm.hlsUtil.phoneNumber(vm.baseInfo.phone)) {
         vm.hlsPopup.showLongCenter('手机号码有误!')

src/pages/userBind/org/enterprise.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-19 09:31:19
- * @LastEditTime: 2019-09-27 10:33:31
+ * @LastEditTime: 2019-09-27 12:41:35
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -65,7 +65,7 @@
           </item>
           <item>
             <div slot="name" class="font-color">注册资本</div>
-            <input slot="content" v-model="baseInfo.registered_capital" placeholder="上传营业执照自动填充" >
+            <input slot="content" v-model="baseInfo.registered_capital" type="number" placeholder="上传营业执照自动填充" >
           </item>
           <item>
             <div slot="name" class="font-color">法定代表人</div>