Merge remote-tracking branch 'origin/release-201824-wangcz' into release-201824-wangcz

assets/scss/common.scss

@@ -635,7 +635,7 @@ a {
   text-decoration: none;
   outline: 0;
   cursor: pointer;
-  transition: color .2s ease;
+  //transition: color .2s ease;
 }
 .select-adder {
   background:url("../../static/images/all/xiala.png") right no-repeat #fff !important;

components/brandCenter/RecommendBrand.vue

@@ -81,7 +81,7 @@
           display: flex;
           img {
             width: 955px;
-            height: 400px;
+            /*height: 400px;*/
             /*border: 1px solid #ccc;*/
             border-radius: 5px;
           }

components/mobile/staffManagement/StaffAdd.vue

@@ -23,12 +23,12 @@
                 </ul>
               </div>
             </li>
-            <li><span>手机号：</span><input type="text"
+            <li><span>手机：</span><input type="text"
                                         v-model="newUserPhone"
                                         @change="checkPhone()"
                                         @input="checkPhone()"
                                         maxlength="11"
-                                        placeholder="请输入手机号"></li>
+                                        placeholder="请输入手机"></li>
             <li><span>邮箱：</span><input type="text"
                                        v-model="newUserEmail"
                                        @change="checkEmail()"
@@ -46,7 +46,7 @@
           <input type="text"
                  v-model="searchKeyword"
                  @click="addApply"
-                 placeholder="请输入UU号、手机号或邮箱">
+                 placeholder="请输入UU号、手机或邮箱">
           <span @click="addApply"><i class="iconfont icon-sousuo"></i></span>
         </div>
         <div class="list-content" v-if="showSearchUser">
@@ -55,7 +55,7 @@
               <div class="list-item"><span>UU账号：</span><span v-text="newUserInfo.userUU">100000721</span></div>
               <div class="list-item"><span>姓名：</span><span v-text="newUserInfo.userName">张洪别</span></div>
               <div class="list-item"><span>性别：</span><span v-text="newUserInfo.userSex === 'F' ? '女' : newUserInfo.userSex === 'M' ? '男' : '-'">男</span></div>
-              <div class="list-item"><span>手机号：</span><span v-text="newUserInfo.userTel">12345678901</span></div>
+              <div class="list-item"><span>手机：</span><span v-text="newUserInfo.userTel">12345678901</span></div>
               <div class="list-item"><span>邮箱：</span><span v-text="newUserInfo.userEmail">12345678901</span></div>
             </div>
             <div class="staff-footer">

components/mobile/staffManagement/StaffList.vue

@@ -16,7 +16,7 @@
         <div class="staff-record" v-if="switchType === 'info'">
           <div class="search-content clearfix">
             <div class="search">
-              <input type="text" placeholder="人员姓名、电话号码、邮箱" v-model="staffSearch" class="staff-search" @keyup.13="staffRecord()">
+              <input type="text" placeholder="人员姓名、手机、邮箱" v-model="staffSearch" class="staff-search" @keyup.13="staffRecord()">
               <span @click="staffRecord()"><i class="iconfont icon-sousuo"></i></span>
             </div>
             <div class="search-filter">
@@ -33,7 +33,7 @@
                 <!--<div class="list-item"><span>UU账号：</span><span v-text="item.userUU">100000721</span></div>-->
                 <div class="list-item"><span>姓名：</span><span v-text="item.userName">张洪别</span></div>
                 <div class="list-item"><span>性别：</span><span v-text="item.userSex === 'F' ? '女' : item.userSex === 'M' ? '男' : '-'">男</span></div>
-                <div class="list-item"><span>手机号：</span><span v-text="item.userTel">12345678901</span></div>
+                <div class="list-item"><span>手机：</span><span v-text="item.userTel">12345678901</span></div>
                 <div class="list-item"><span>邮箱：</span><span v-text="item.userEmail">12345678901</span></div>
                 <div class="list-item"><span>角色：</span><span class="role" v-for="role in item.roles" v-text="role.desc ? role.desc.slice(0,2) : ''" v-bind:class="'bg' + role.color">普通</span></div>
               </div>
@@ -49,7 +49,7 @@
         </div>
         <div class="staff-record" v-if="switchType === 'Audit'">
           <div class="search-content">
-            <input type="text" placeholder="人员姓名、电话号码、邮箱" v-model="auditSearch" @keyup.13="searchAudit()">
+            <input type="text" placeholder="人员姓名、手机、邮箱" v-model="auditSearch" @keyup.13="searchAudit()">
             <span @click="searchAudit()"><i class="iconfont icon-sousuo"></i></span>
           </div>
           <div class="list-content" v-if="AuditList && AuditList.length">
@@ -57,7 +57,7 @@
               <div class="staff-list">
                 <div class="list-item"><span>用户名：</span><span v-text="item.user.vipName"></span></div>
                 <!--<div class="list-item"><span>UU账号：</span><span v-text="item.user.userUU">100000721</span></div>-->
-                <div class="list-item"><span>手机号：</span><span v-text="item.user.mobile">12345678901</span></div>
+                <div class="list-item"><span>手机：</span><span v-text="item.user.mobile">12345678901</span></div>
                 <div class="list-item"><span>邮箱：</span><span v-text="item.user.email">12345678901</span></div>
               </div>
               <div class="list-footer">

components/provider/Suppliers.vue

@@ -28,8 +28,20 @@
           <td colspan="3">
             <a class="store-name"><div :title="store.storeName">{{store.storeName}}</div></a>
             <div class="store-message">
-              <span>企业介绍：</span>
-              <span style="word-break: break-word;">{{showLittleDescription(store.enterprise.description)}}<em v-if="store.description && store.description.length > 160">...</em></span>
+              <div>
+                <span class="title">主营产品：</span>
+                <span class="info" v-text="store.description || '-'" :title="store.description">123</span>
+                <span class="split_line">|</span>
+                <span class="title">经营范围：</span>
+                <span class="info" v-text="store.storeApplication || '-'" :title="store.storeApplication">1212324</span>
+              </div>
+              <div>
+                <span class="title">电话：</span>
+                <span class="info" v-text="store.enterprise.enTel || '-'" :title="store.enterprise.enTel">123</span>
+                <span class="split_line">|</span>
+                <span class="title">地址：</span>
+                <span class="info" v-text="store.enterprise.enAddress || '-'" :title="store.enterprise.enAddress">1212324</span>
+              </div>
             </div>
           </td>
           <td class="vertical-middle" style="text-align: center">
@@ -79,6 +91,7 @@ export default {
       return this.$route.params.type
     },
     stores () {
+      console.log(this.$store.state.provider.stores.storeList.data)
       return this.$store.state.provider.stores.storeList.data
     },
     user () {
@@ -277,6 +290,21 @@ export default {
     -webkit-line-clamp: 2;
     line-height: 18px;
 	}
+  #store-list table>tbody .store-message span.title{
+    float: left;
+  }
+  #store-list table>tbody .store-message span.info{
+    float: left;
+    display: inline-block;
+    max-width: 280px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  #store-list table>tbody .store-message span.split_line {
+    float: left;
+    margin: 0 5px;
+  }
   #store-list table>tbody tr:hover{
     box-shadow: 1px 1px 12px rgb(145, 197, 239);
     -moz-box-shadow: 1px 1px 12px rgb(145, 197, 239);

components/provider/ToggleStore.vue

@@ -84,7 +84,6 @@ export default {
   },
   computed: {
     storeType () {
-      console.log(this.$route.params.type, '1111')
       return this.$route.params.type
     },
     store () {
@@ -98,14 +97,16 @@ export default {
     },
     count () {
       let allCount =  this.$store.state.option.counter.data ? this.$store.state.option.counter.data : []
-      allCount.forEach((value) => {
-        if (value.item === '供应商') {
-          this.supplierArr.push(value.count)
-        }
-        if (value.item === '品   牌') {
-          this.brandArr.push(value.count)
-        }
-      })
+      if (allCount) {
+        allCount.forEach((value) => {
+          if (value.item === '供应商') {
+            this.supplierArr.push(value.count)
+          }
+          if (value.item === '品   牌') {
+            this.brandArr.push(value.count)
+          }
+        })
+      }
     }
   },
   mounted () {

components/supplier/merchant.vue

@@ -108,10 +108,10 @@
       },
       // 判断是否有有效物料信息
       isVaildSupplier (id) {
-        this.$http.get('vendor/introduction/product/count', {params: {vendUU: id}})
+        this.$http.get('/vendor/introduction/product/count', {params: {vendUU: id}})
           .then(res => {
             if (res.data.count !== 0) {
-              this.$router.push('supplier/' + id)
+              this.$router.push('/supplier/' + id)
             } else {
               this.hasDialog = true
             }

nuxt.config.js

@@ -1,7 +1,7 @@
 const path = require('path')
 const isProdMode = Object.is(process.env.NODE_ENV, 'production')
 // b2c后台
-const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://api.usoftmall.com/' : 'http://192.168.253.3:36002/')
+const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://api.usoftmall.com/' : 'http://192.168.253.3:36006/')
 // 公共询价
 const commonUrl = process.env.COMMON_URL || (isProdMode ? 'https://api-inquiry.usoftmall.com/' : 'http://218.17.158.219:24000/')
 // 公共物料

pages/eCommerce/home/_type.vue

@@ -36,7 +36,7 @@
         store.dispatch('provider/loadSalesStore', { isOriginal: true }),
         store.dispatch('provider/loadNewStores', { types: 'ORIGINAL_FACTORY', size: 5 }),
         store.dispatch('provider/loadRecommendOriginal', { types: 'ORIGINAL_FACTORY', num: 5 }),
-        store.dispatch('provider/findSimilarStoreList', { page: 1, count: 10, type: 'ORIGINAL_FACTORY' }),
+        store.dispatch('provider/findSimilarStoreList', { page: 1, count: 10, type: 'AGENCY-DISTRIBUTION' }),
         store.dispatch('provider/loadHotComponents'),
         store.dispatch('provider/loadFactoriesCount'),
         store.dispatch('provider/loadAgencyCount'),

pages/mobile/center/index.vue

@@ -168,7 +168,7 @@
                 <div class="text">{{item.minPackQty}}</div>
               </div>
               <div class="fr">
-                <div class="name">库存：</div>
+                <div class="name">库存(PCS)：</div>
                 <div class="text">{{item.reserve}}</div>
               </div>
             </div>

pages/mobile/center/vendor/product.vue

@@ -94,7 +94,7 @@
                 <div class="text">{{item.minPackQty}}</div>
               </div>
               <div class="fr">
-                <div class="name">库存：</div>
+                <div class="name">库存(PCS)：</div>
                 <div class="text">{{item.reserve}}</div>
               </div>
             </div>