验收

components/mobile/supplier/List.vue

@@ -178,6 +178,11 @@
           }
           span {
             color: #333;
+            width: 4.65rem;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            display: inline-block;
           }
         }
       }

components/mobile/user/Info.vue

@@ -53,7 +53,7 @@
       span {
         margin-left: .56rem;
         display: inline-block;
-        width: .92rem;
+        width: 1.2rem;
         text-align: right;
       }
     }

pages/help/helpDetail/_id.vue

@@ -58,7 +58,7 @@
     }
   }
 </script>
-<style scoped>
+<style>
   @import '~assets/scss/help.css';
   .help-center-details .ql-container img {
     max-width: 840px;

pages/mobile/search/_keycode.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="search-list mobile-content">
-  <div class="search-item">
+  <div class="search-item" v-if="(!productList.brands && brandList && brandList.length > 0) && productList.expose > 0 || activeType != 'store'">
       <span :class="activeType=='store'?'active':''" @click="clickType('store')">所有器件</span>
       <span :class="activeType=='support'?'active':''" @click="clickType('support')">仅看有货</span>
     </div>

pages/mobile/user/enterpriseinfo.vue

@@ -3,7 +3,7 @@
     <div class="com-mobile-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <p>企业信息
-        <span @click="updateInfo()" v-show="isAdmin && storeState === 'look'"><i class="iconfont icon-edit"></i>编辑</span>
+        <span @click="updateInfo()" v-show="storeState === 'look'"><i class="iconfont icon-edit"></i>编辑</span>
       </p>
     </div>
     <div class="user-content mobile-fix-content">
@@ -338,7 +338,15 @@
         this.isSearchSearchingMore = true
         this.updateEnterpriseInfo()
       },
+      setRemindText (str) {
+        this.collectResult = str
+        this.timeoutCount++
+      },
       updateInfo() {
+        if (!this.isAdmin) {
+          this.setRemindText('您无该模块的编辑权限，请联系企业管理员进行编辑维护！')
+          return
+        }
         this.storeState = 'update'
         this.Islook = true
         this.hidelook = true
@@ -395,16 +403,14 @@
       }
     },
     created () {
-      this.$nextTick(() => {
-        this.$http.get('/data/profession.json').then(response => {
-          this.TypeObj = response.data
-          for (let i of Object.keys(response.data)) {
-            this.TypeList.firstList.push(i)
-          }
-        })
-        this.$store.dispatch('supplier/loadEnUser', {enUU: this.user.data.enterprise.uu, filter: 'enUU'}).then(res => {
-          this.scopeLabel = this.enterpriseInfo.enBusinessScope ? this.enterpriseInfo.enBusinessScope.split(',') : []
-        })
+      this.$http.get('/data/profession.json').then(response => {
+        this.TypeObj = response.data
+        for (let i of Object.keys(response.data)) {
+          this.TypeList.firstList.push(i)
+        }
+      })
+      this.$store.dispatch('supplier/loadEnUser', {enUU: this.user.data.enterprise.uu, filter: 'enUU'}).then(res => {
+        this.scopeLabel = this.enterpriseInfo.enBusinessScope ? this.enterpriseInfo.enBusinessScope.split(',') : []
       })
     },
     mounted() {
@@ -511,9 +517,9 @@
       textarea{
         width: 4.4rem;
         padding: 0.06rem 0 0.06rem 0.12rem;
-        min-height: 5rem;
+        overflow: visible;
         resize: none;
-        border: 0px solid #b4b4b4;
+        border: 0 solid #b4b4b4;
       }
     }
     .control {

pages/mobile/user/index.vue

@@ -289,7 +289,8 @@
       font-size: .3rem;
       background: #f6f5f5;
       i {
-        float: right;
+        position: absolute;
+        right: 0;
         color: #bebebe;
         font-size: .24rem;
         margin-right: .35rem;

pages/mobile/user/storeinfo.vue

@@ -3,7 +3,7 @@
     <div class="com-mobile-header">
       <a @click="goLastPage"><i class="iconfont icon-fanhui"></i></a>
       <p>店铺信息
-        <span @click="updateInfo()" v-show="isAdmin && storeState === 'look'"><i class="iconfont icon-edit"></i>编辑</span>
+        <span @click="updateInfo()" v-show="storeState === 'look'"><i class="iconfont icon-edit"></i>编辑</span>
       </p>
     </div>
     <!-- 店铺管理 -->
@@ -34,9 +34,7 @@
                     </a>
                   </div>
                   <div class="text pull-left" v-else>
-                  <textarea v-model="storeInfo.description">
-
-                  </textarea>
+                  <textarea v-model="storeInfo.description" maxlength="500" ref="descTextarea"></textarea>
                   </div>
                 </li>
                 <li class="clearfix" :class="{border:  storeState !== 'look'}">
@@ -139,8 +137,28 @@
         collectResult: ''
       }
     },
+    watch: {
+      'storeInfo.description': {
+        handler: function (val) {
+          let el = this.$refs.descTextarea
+          if (el) {
+            console.log(el.scrollHeight)
+            console.log(el.clientHeight)
+            el.style.height = (el.scrollHeight + 92) / 100 + 'rem'
+          }
+        }
+      }
+    },
     methods: {
+      setRemindText (str) {
+        this.collectResult = str
+        this.timeoutCount++
+      },
       updateInfo() {
+        if (!this.isAdmin) {
+          this.setRemindText('您无该模块的编辑权限，请联系企业管理员进行编辑维护！')
+          return
+        }
         this.storeState = 'update'
         this.Islook = true
         this.hidelook = true
@@ -208,7 +226,7 @@
           this.timeoutCount++
           return false
         }
-        if (!/^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,19}$/.test(this.storeInfo.enterprise.enWeixin) && this.storeInfo.enterprise.enWeixin) {
+        if (!/^[0-9a-zA-Z]{6,20}$/.test(this.storeInfo.enterprise.enWeixin) && this.storeInfo.enterprise.enWeixin) {
           this.collectResult = '请输入正确的微信号'
           this.timeoutCount++
           return false
@@ -349,15 +367,15 @@
     }
     input {
       width: 4.4rem;
-      border: 0px solid #b4b4b4;
+      border: 0 solid #b4b4b4;
       padding: 0.06rem 0 0.06rem 0.12rem;
     }
     textarea{
       width: 4.4rem;
+      height: 2.06rem;
       padding: 0.06rem 0 0.06rem 0.12rem;
-      min-height: 5rem;
-      resize: none;
-      border: 0 solid #b4b4b4;
+      overflow-y: visible;
+      border: none;
     }
   }
   .control {