yangc 7 years ago
parent
commit
c567a36ecc

+ 1 - 1
components/mobile/user/Info.vue

@@ -46,7 +46,7 @@
       white-space: nowrap;
       height: 1.16rem;
       line-height: 1.16rem;
-      border-bottom: 1px solid #d9d9d9;
+      border-bottom: .01rem solid #d9d9d9;
       &:last-child {
         border-bottom: none;
       }

+ 2 - 3
nuxt.config.js

@@ -1,6 +1,6 @@
 const path = require('path')
 const isProdMode = Object.is(process.env.NODE_ENV, 'production')
-const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://api.usoftmall.com/' : 'http://10.1.51.125:8080/platform-b2c/')
+const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://api.usoftmall.com/' : 'http://10.1.51.124:8080/platform-b2c')
 const commonUrl = process.env.COMMON_URL || (isProdMode ? 'https://api-inquiry.usoftmall.com/' : 'http://218.17.158.219:24000/')
 const materialUrl = process.env.MATERIAL_URL || (isProdMode ? 'https://api-product.usoftmall.com/' : 'http://218.17.158.219:24000/')
 
@@ -174,7 +174,6 @@ module.exports = {
     '/productuser/**': materialUrl,
     // 权限管理
     '/account/**': baseUrl,
-    '/vendor/**': baseUrl,
-    '/internalmessage-service/**': baseUrl
+    '/vendor/**': baseUrl
   }
 }

+ 96 - 74
pages/mobile/user/enterpriseinfo.vue

@@ -10,18 +10,35 @@
       <div ref="userContent" class="user-center-content">
         <div class="scroll">
         <!-- 账户管理 -->
-          <div class="si-wrap">
-            <ul class="infoul infoul2" :class="{'no-edit': !isAdmin}" v-if="enterpriseInfo.enName">
-              <li class="clearfix" :class="{noupdate:  storeState !== 'look'}">
-                <div class="name pull-left" :class="{update: storeState !== 'look'}" >企业名称:</div>
-                <div class="text pull-left" :class="{update: storeState !== 'look'}">
+          <div class="si-wrap" v-if="storeState !== 'look'">
+            <ul class="infoul infoul2 no-edit" v-if="enterpriseInfo.enName">
+              <li class="clearfix">
+            <div class="name pull-left" >企业名称:</div>
+            <div class="text pull-left">
+              {{enterpriseInfo.enName || '-'}}
+            </div>
+          </li>
+          <li class="clearfix">
+                <div class="name pull-left">营业执照号:</div>
+            <div class="text pull-left">
+              {{enterpriseInfo.enBussinessCode || '-'}}
+            </div>
+          </li>
+        </ul>
+      </div>
+      <div class="si-wrap">
+        <ul class="infoul infoul2" :class="{'no-edit': !isAdmin}" v-if="enterpriseInfo.enName">
+
+          <li class="clearfix" v-if="storeState === 'look'">
+            <div class="name pull-left">企业名称:</div>
+                <div class="text pull-left" >
                   {{enterpriseInfo.enName || '-'}}
                 </div>
               </li>
 
-              <li class="clearfix" :class="{noupdate:  storeState !== 'look', border:  storeState !== 'look'}">
-                <div class="name pull-left" :class="{update: storeState !== 'look'}">营业执照号:</div>
-                <div class="text pull-left" :class="{update: storeState !== 'look'}">
+              <li class="clearfix" v-if="storeState === 'look'">
+                <div class="name pull-left">营业执照号:</div>
+                <div class="text pull-left">
                   {{enterpriseInfo.enBussinessCode || '-'}}
                 </div>
               </li>
@@ -328,6 +345,7 @@
         this.BScroll.refresh()
       },
       storeInfosave(_tp) {
+        this.BScroll.refresh()
         if (_tp === 'cancel') {
           this.clearInfo()
           this.scopeLabel = []
@@ -418,6 +436,7 @@
         width: 7.1rem;
         margin: 0 auto;
         background: #fff;
+        border-radius: .05rem;
       }
     .user-center-content {
       height: 100%;
@@ -452,7 +471,7 @@
         }
       }
       li {
-        border-bottom: 1px solid #d9d9d9;
+        border-bottom: .01rem solid #d9d9d9;
         min-height: 1.16rem;
         line-height: normal;
         padding: .4rem .28rem;
@@ -474,6 +493,9 @@
         .name {
           color: #999;
         }
+        li:last-child {
+          border-bottom: none;
+        }
       }
       .text {
         width: 4.4rem;
@@ -640,77 +662,77 @@
       }
     }
     .noborder {
-      border-top: 1px solid #d9d9d9;
+      border-top: .01rem solid #d9d9d9;
     }
-    .modal-content {
-      position: absolute;
-      height: 10rem;
-      bottom: 0px;
-      left: 0px;
-      background: #fff;
-      width: 100%;
-      border-radius: 0px;
-      box-shadow: 0 -9px 9px rgba(0,0,0,.5);
-      .content-title {
-        color: #666;
-        font-size: .3rem;
+  }
+  .modal-content {
+    position: absolute;
+    height: 10rem;
+    bottom: 0px;
+    left: 0px;
+    background: #fff;
+    width: 100%;
+    border-radius: 0px;
+    box-shadow: 0 -9px 9px rgba(0,0,0,.5);
+    .content-title {
+      color: #666;
+      font-size: .3rem;
+      text-align: center;
+      height: 1rem;
+      line-height: 1rem;
+      position: relative;
+      i {
+        font-size: 0.3rem;
+        color: #999;
+        position: absolute;
+        right: 0.3rem;
+        top: 50%;
+        margin-top: -0.15rem;
+      }
+    }
+    .content-title-label {
+      color: #3f84f6;
+      font-size: 0.28rem;
+      height: 0.5rem;
+      line-height: 0.5rem;
+      border-bottom: 0.01rem solid #999;
+      div {
+        width: 33.3%;
+        float: left;
         text-align: center;
-        height: 1rem;
-        line-height: 1rem;
-        position: relative;
-        i {
-          font-size: 0.3rem;
-          color: #999;
-          position: absolute;
-          right: 0.3rem;
-          top: 50%;
-          margin-top: -0.15rem;
+        a {
+          height: 0.5rem;
+          line-height: 0.5rem;
+          color: #333 !important;
+          display: inline-block;
+          width: 80%;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          &.active {
+            color: #3e82f5 !important;
+            border-bottom: 1px solid #3e82f5;
+          }
         }
       }
-      .content-title-label {
-        color: #3f84f6;
+    }
+    .content-info {
+      overflow-y: auto;
+      height: 8.5rem;
+      width: 100%;
+      .content-info-item {
+        height: 0.86rem;
+        line-height: 0.86rem;
+        color: #333;
         font-size: 0.28rem;
-        height: 0.5rem;
-        line-height: 0.5rem;
-        border-bottom: 0.01rem solid #999;
-        div {
-          width: 33.3%;
-          float: left;
-          text-align: center;
-          a {
-            height: 0.5rem;
-            line-height: 0.5rem;
-            color: #333 !important;
-            display: inline-block;
-            width: 80%;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            &.active {
-              color: #3e82f5 !important;
-              border-bottom: 1px solid #3e82f5;
-            }
-          }
+        padding-left: 0.3rem;
+        &.active {
+          color: #3f84f6 !important
         }
-      }
-      .content-info {
-        overflow-y: auto;
-        height: 8.5rem;
-        width: 100%;
-        .content-info-item {
-          height: 0.86rem;
-          line-height: 0.86rem;
-          color: #333;
-          font-size: 0.28rem;
-          padding-left: 0.3rem;
-          &.active {
-            color: #3f84f6 !important
-          }
-          img {
-            width: 0.3rem;
-            height: 0.18rem;
-            margin-left: 0.3rem;
-          }
+        img {
+          width: 0.3rem;
+          height: 0.18rem;
+          margin-left: 0.3rem;
         }
       }
     }

+ 5 - 2
pages/mobile/user/index.vue

@@ -204,7 +204,7 @@
           position: absolute;
           top: 0;
           height: 1px;
-          background: #d3d3d3;
+          background: #d9d9d9;
         }
       }
     }
@@ -276,7 +276,7 @@
   .modal-content {
     position: absolute;
     height: 5.32rem;
-    bottom: .98rem;
+    bottom: 0;
     left: 0;
     background: #fff;
     width: 100%;
@@ -303,6 +303,9 @@
         line-height: 1rem;
         padding: 0 .23rem 0 .4rem;
         border-bottom: 1px solid #e5e6eb;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
         a {
           display: inline-block;
           color: #666;

+ 4 - 1
pages/mobile/user/storeinfo.vue

@@ -171,6 +171,7 @@
         }
       },
       storeInfosave(_tp) {
+        this.BScroll.refresh()
         if (_tp === 'cancel') {
           let str = JSON.stringify(this.$store.state.option.storeStatus.data)
           this.storeInfo = JSON.parse(str)
@@ -272,6 +273,7 @@
       width: 7.1rem;
       margin: .3rem auto;
       background: #fff;
+      border-radius: .05rem;
     }
     .user-center-content {
       height: 100%;
@@ -340,6 +342,7 @@
     }
     .text {
       width: 4.4rem;
+      word-break: break-all;
     }
     .update {
       padding: 0.06rem 0 0.06rem 0;
@@ -352,7 +355,7 @@
     textarea{
       width: 4.4rem;
       padding: 0.06rem 0 0.06rem 0.12rem;
-      /*min-height: 5rem;*/
+      min-height: 5rem;
       resize: none;
       border: 0 solid #b4b4b4;
     }