Browse Source

修改云中心以及涉及到的选择地址的反馈问题

hangb 7 years ago
parent
commit
9b2f07127d

+ 1 - 1
assets/scss/mobileCommon.scss

@@ -369,7 +369,7 @@
 }
 
 //地址选择弹框
-.mobile .distpicker-address-wrapper .address-container ul[data-v-7aa38d48] {
+.mobile .distpicker-address-wrapper .address-container ul {
   height: 4.3rem;
   overflow-y: auto;
 }

+ 49 - 16
components/mobile/cloudcenter/cloudCenter.vue

@@ -9,7 +9,7 @@
       <div class="basic-info" v-show="activeTab === 0">
         <div class="basic-top">
           <div class="line">
-            <div class="people"><i class="man"></i> <em v-text="user.user.vipName ? user.user.vipName : '用户名'"></em></div>
+            <div class="people"><i class="man"></i> <em class="user" v-text="user.user.vipName ? user.user.vipName : '用户名'"></em></div>
             <div class="time"><span>上次登录时间: {{user.user.lastLoginTime | time}}</span></div>
           </div>
         </div>
@@ -93,7 +93,7 @@
       <div class="basic-info" v-show="activeTab === 1" v-if="user.userspace">
         <div class="basic-top">
           <div class="line">
-            <div class="people enterprise">
+            <div class="enter" :class="{enterprise : (user.userspace.validCode === 1 && user.newUserSpace)}">
               <i class="enterprise-img"></i>
               <em v-text="user.userspace.spaceName ? user.userspace.spaceName : '企业名称'"></em>
               <b v-if='user.userspace.validCode === 1 && user.newUserSpace' class="angle">——></b>
@@ -129,31 +129,28 @@
           <div class="enterprise">
             <div class="bind-info">
               <span>营业执照扫描件</span>
-              <div v-show="user.userspace.businessCodeImage">附件: 营业执照扫描.jpg</div>
-              <div v-show="!user.userspace.businessCodeImage">未上传</div>
-              <!--<b v-if='user.userspace.validCode === 1 && user.newUserSpace' class="angle" style="float: left;">——></b>-->
-              <!--<div class="new" v-if='user.userspace.validCode === 1 && user.newUserSpace'-->
-                   <!--v-show="user.newUserSpace.businessCodeImage">-->
-                <!--附件: 营业执照扫描.jpg-->
-              <!--</div>-->
-            </div>
-            <div class="bind-detail"
-                 v-show="user.userspace.businessCodeImage">
-              <i @click="showImg(user.userspace.businessCodeImage)">查看</i>
+              <div v-if="user.userspace.businessCodeImage"
+                   @click="showImg(user.userspace.businessCodeImage)">查看附件: <i class="fa fa-eye" style="color:#0076ad"></i></div>
+              <div v-if="!user.userspace.businessCodeImage">未上传</div>
+              <b v-if='user.userspace.validCode === 1 && user.newUserSpace' class="angle" style="float: left;margin-top: .3rem;">——></b>
+              <div v-if='user.userspace.validCode === 1 && user.newUserSpace'
+                   @click="showImg(user.newUserSpace.businessCodeImage)"
+                   v-show="user.newUserSpace.businessCodeImage"  class="new">
+                查看附件: <i class="fa fa-eye" style="color:#0076ad"></i></div>
             </div>
           </div>
           <div class="enterprise">
             <div class="bind-info">
               <span>法定代表人</span>
               <div>{{user.userspace.corporation || '-'}}</div>
-              <!--<div v-if='user.userspace.validCode === 1 && user.newUserSpace' class="new"><b class="angle">——></b>{{user.newUserSpace.corporation || '-'}}</div>-->
+              <div v-if='user.userspace.validCode === 1 && user.newUserSpace' class="new"><b class="angle">——></b>{{user.newUserSpace.corporation || '-'}}</div>
             </div>
           </div>
           <div class="enterprise">
             <div class="bind-info">
               <span>注册地址</span>
               <div>{{user.userspace.regAddress || '-'}}</div>
-              <!--<div v-if='user.userspace.validCode === 1 && user.newUserSpace' class="new"><b class="angle">——></b>{{user.newUserSpace.regAddress || '-'}}</div>-->
+              <div v-if='user.userspace.validCode === 1 && user.newUserSpace' class="new"><b class="angle">——></b>{{user.newUserSpace.regAddress || '-'}}</div>
             </div>
           </div>
         </div>
@@ -324,6 +321,8 @@
       width: .3rem;
       height: .3rem;
       background: url(/img/over_account/enter.png) no-repeat;
+      float: left;
+      margin-top: .5rem;
     }
     .w-over-box .basic-info{
       width: 100%;
@@ -332,6 +331,7 @@
         margin: 0 .1rem;
         font-weight: normal;
         color: #000;
+        float: left;
       }
       .new {
         color: #2ab300 !important ;
@@ -355,10 +355,36 @@
               font-size: .32rem;
               color: #000;
             }
+            em.user{
+              float: none;
+            }
+          }
+          div.enter{
+            width: 100%;
+            text-align: left;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            em{
+              font-style: normal;
+              font-size: .32rem;
+              color: #000;
+            }
           }
           div.enterprise {
             width: 100%;
             text-align: left;
+            em{
+              display: inline-block;
+              font-style: normal;
+              font-size: .32rem;
+              color: #000;
+              max-width: 1.5rem;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+              float: left;
+            }
           }
           div.time{
             float: right;
@@ -535,18 +561,25 @@
             text-align: left;
             width: 4.6rem;
             span{
+              display: inline-block;
+              width: 100%;
               font-size: .26rem;
               color: #000;
             }
             div{
               margin-top: .3rem;
-              width: 5rem;
+              max-width: 2rem;
               white-space: nowrap;
               text-overflow: ellipsis;
               overflow: hidden;
               text-align: left;
               font-size: .26rem;
               color: #b4b4b4;
+              float: left;
+            }
+            .new {
+              max-width: 2.6rem;
+              color: #2ab300 !important ;
             }
           }
           .bind-detail{

+ 5 - 5
components/mobile/enterpriseCertification/addressChoose.vue

@@ -230,13 +230,13 @@
       // 返回注册页面
       goBack () {
         if (this.chooseAddress && this.detailAddress) {
-          this.allAddress = this.chooseAddress + this.detailAddress
+          this.allAddress = this.popAddress + this.regStreet
           this.$emit('getAddress', this.allAddress)
           this.$emit('getProvince', this.currentProvince)
           this.$emit('getCity', this.currentCity)
           this.$emit('getArea', this.currentArea)
-          this.$emit('getDetailAddress', this.detailAddress)
-          this.$emit('getPopAddress', this.chooseAddress)
+          this.$emit('getDetailAddress', this.regStreet)
+          this.$emit('getPopAddress', this.popAddress)
         } else if (this.chooseAddress && !this.detailAddress) {
           this.$emit('getAddress', '')
           this.$emit('getProvince', this.currentProvince)
@@ -545,8 +545,8 @@
   .address-container {
     background-color: #fff;
   ul {
-    height: 100%;
-    overflow: auto;
+    height: 4.3rem;
+    overflow-y: auto;
   li {
     color: #555;
     padding: 8px 10px;