店铺样式调整

assets/scss/common.scss

@@ -822,3 +822,26 @@ img.new-animate{
     }
   }
 }
+#goods-list-fragment {
+  .content-adv {
+    margin: 15px 0;
+    width: 100%;
+    padding-right: 10px;
+    overflow: hidden;
+    position:relative;
+    .title-adv{
+      position: absolute;
+      top: 5px;
+      left: 45px;
+      float: left;
+      span{
+        font-size: 16px;
+        font-weight: bold;
+        color: #333;
+        &:first-child{
+          margin-right: 60px;
+        }
+      }
+    }
+  }
+}

components/btbBusiness/banner.vue

@@ -4,7 +4,7 @@
       <p class="notice" v-if="showNotice"><marquee scrollAmount=1 width=512 direction="left" behavior="alternate">【B2B商务】和【优软商城】牵手成功！大家可以更全面、便捷地了解和享受平台的各项服务咯!</marquee><a @click="showNotice = false"><img src="/images/btbBusiness/close.png"></a></p>
       <div class="clearfix">
        <!-- <h4 class="pull-left">B2B商务</h4>-->
-        <a class="enter" @click="experience">立即体验</a>
+        <a class="enter" @click="experience">立即进入</a>
       </div>
       <p class="first">十年深耕，携您飞跃<br>
         优软B2B商务，为您提供更强大的功能服务</p>
@@ -22,12 +22,7 @@
     },
     methods: {
       experience () {
-        window.location.href = 'http://uas.ubtob.com/#/index'
-//        if (this.user.logged) {
-//
-//        } else {
-//          this.$router.push('/auth/login')
-//        }
+        window.location.href = `${process.env.uasUrl}/#/index`
       }
     }
   }

components/main/Nav.vue

@@ -14,10 +14,10 @@
       <nuxt-link to="/supplier" class="item">
         <span>供应商</span>
       </nuxt-link>
-      <nuxt-link to="/btbBusiness" class="item">
+      <a to="/btbBusiness" class="item" @click="goB2B">
         <span>B2B商务</span>
         <img class="new-animate" src="/images/all/hot.png" alt="">
-      </nuxt-link>
+      </a>
       <a class="item expand-item" :class="{'active': isActive}">
         <span>{{name}}
           <i class="iconfont icon-arrow-down"></i>
@@ -80,6 +80,13 @@
       open (url) {
         window.open(url)
 //        this.$router.push(url)
+      },
+      goB2B () {
+        if (this.user.logged) {
+          window.location.href = `${process.env.uasUrl}/#/index`
+        } else {
+          this.$router.push('/auth/login')
+        }
       }
     }
   }

components/store/home/CommodityList.vue

@@ -1,7 +1,8 @@
 <template>
   <div id="goods-list-fragment">
     <div class="container">
-      <div style="margin: 15px 0;width: 100%;padding-right: 10px;">
+      <div class="content-adv">
+        <div class="title-adv"><span>全球共享交易平台</span><span>全球共享询价平台</span></div>
         <div class="input-group">
           <input type="search" class="form-control" id="search_input" title="code" placeholder="型号/品牌"
                  v-model="searchCode" @search="goodsSearch(searchCode)"/>
@@ -30,7 +31,7 @@
       <!-- 产品列表 -->
       <div class="goods-area">
         <!-- 列表展示 -->
-        <table class="goodslist" style="width: 965px;background:#fff;" >
+        <table class="goodslist" style="width: 955px;background:#fff;" >
           <thead>
           <tr>
             <th width="189"><div>品牌/物料名称(类目)</div></th>
@@ -601,6 +602,11 @@
     margin-left: 10px;
     border: 1px solid #3b7cf4;
   }
+  #goods-list-fragment .sendprove:hover{
+    background-color: #3b7cf4;
+    border-color: #3b7cf4;
+    color: #fff;
+  }
   .btn:focus,.btn:active:focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn.active.focus {
     outline: none;
     border-color: transparent;
@@ -749,7 +755,7 @@
     border: 1px solid #214797;
   }
   #goods-list-fragment .btn-add-cart:hover{
-    background-color: #5078CB;
+    background-color: #3b7cf4;
     color: #fff;
   }
   .no-record{

components/store/home/EnterpriseInfo.vue

@@ -36,8 +36,9 @@
             </div>
             <div class="introduce">
               <div><h4>企业简介</h4></div>
-              <p v-if="storeInfo.enterprise.description">{{storeInfo.enterprise.description}}
-                <span @click="dialogVisible = true">查看更多 <img src="/images/store/home/angle-right.png"></span>
+              <p class="intro-content" v-if="storeInfo.enterprise.description">
+                <span class="info" v-text="getIntro(storeInfo.enterprise.description)"></span>
+                <span class="look" @click="dialogVisible = true" v-if="showMore">查看更多 <img src="/images/store/home/angle-right.png" style="margin-top:2px;"></span>
               </p>
               <p v-else class="empty-introduce">暂无简介</p>
             </div>
@@ -101,7 +102,8 @@
     data () {
       return {
         dialogVisible: false,
-        dialogCertificate: false
+        dialogCertificate: false,
+        showMore: false
       }
     },
     components: {
@@ -144,6 +146,19 @@
       }
     },
     methods: {
+      // 店铺简介
+      getIntro (text) {
+        let len = text.replace(/[\u0391-\uFFE5]/g, 'aa').length
+        if (len > 0) {
+          if (len > 500) {
+            this.showMore = true
+            text = text.slice(0, 500) + '...'
+          } else {
+            this.showMore = false
+          }
+        }
+        return text
+      },
       // 联系卖家
       goLink: function () {
         this.baseUtils.goLinkUser(this, this.storeInfo.enUU)
@@ -314,7 +329,7 @@
           position: relative;
           float: left;
           width: 962px;
-          margin-left: 5px;
+          margin-left: 9px;
           &:first-child {
             width: 218px;
             /*height: 356px;*/
@@ -329,7 +344,7 @@
               color: #333;
               /*background: #fff;*/
             &:first-child{
-               padding-top: 10px;
+               /*padding-top: 10px;*/
              }
             div:first-child {
               width: 72px;
@@ -347,17 +362,24 @@
   }
            }
             .introduce {
-              margin-top: 10px;
+              margin-top: 15px;
               width: 100%;
-              min-height: 188px;
+              height: 336px;
               font-size: 12px;
               line-height: 15px;
               color: #333;
               background: #fff;
               border-radius: 5px;
               p{
-                span {
+                span.info{
+                  font-size: 12px;
+                  color: #333;
+                  word-break: break-all;
+                  word-wrap:break-word;
+                }
+                span.look {
                   color: #3c7df5;
+                  cursor: pointer;
                 }
               }
               div{
@@ -403,6 +425,9 @@
               height: 35px;
               min-height: 35px;
             }
+            .product-show{
+              margin-top: 8px;
+            }
           }
         }
       }

components/store/home/RecommendList.vue

@@ -318,7 +318,7 @@
   }
   .recommend-fragment ul{
     width: 100%;
-    height: 368px;
+    height: 360px;
     background: #fff;
    /* display: inline-block;*/
     -webkit-padding-start: 0;
@@ -354,6 +354,7 @@
       color: #666;
       &.price{
         color: #ff002e;
+        margin-top: -3px;
       }
     }
   }
@@ -402,16 +403,16 @@
       margin: 2px 0px 0px 0px;
     }
     &:hover{
-      box-shadow: 2px 0px 1px #d9d9d9, -2px 0px 1px #d9d9d9, 0px 2px 1px #d9d9d9, 0px -2px 1px #d9d9d9;
+      /*box-shadow: 2px 0px 1px #d9d9d9, -2px 0px 1px #d9d9d9, 0px 2px 1px #d9d9d9, 0px -2px 1px #d9d9d9;*/
       .enter-store {
         top: 132px;
         left: 0px;
         transition: all .3s linear;
       }
       .img, .content{
-        /*transform:translate(0px,-10px);*/
-        /*-ms-transform:translate(0px,-10px); !* IE 9 *!*/
-        /*-webkit-transform:translate(0px,-10px); !* Safari and Chrome *!*/
+        transform:translate(0px,-10px);
+        -ms-transform:translate(0px,-10px); /* IE 9 */
+        -webkit-transform:translate(0px,-10px); /* Safari and Chrome */
       }
     }
   }

components/store/home/StoreBanner.vue

@@ -338,7 +338,7 @@ export default {
   }
 	#title-fragment .shop-logo {
 		width: 220px;
-		height: 280px;
+		height: 260px;
 		border: 1px solid #e8e8e8;
 		float: left;
 		text-align: center;
@@ -355,7 +355,7 @@ export default {
       height: 30px;
       line-height: 30px;
       text-align: left;
-      margin-top: -10px;
+      margin: 10px 0;
       padding-left: 20px;
       a {
         width: 70px;

nuxt.config.js

@@ -10,6 +10,8 @@ const materialUrl = process.env.MATERIAL_URL || (isProdMode ? 'https://api-produ
 const cmsUrl = process.env.CMS_URL || (isProdMode ? 'https://cms.usoftmall.com' : 'https://cms.usoftmall.com')
 // 消息
 const messageUrl = process.env.MESSAGE_URL || (isProdMode ? 'https://api-message.ubtob.com/' : 'http://192.168.253.6:24000/message')
+// B2B
+const uasUrl = process.env.uasUrl || (isProdMode ? 'http://uas.ubtob.com/' : 'http://192.168.253.12:9000/b2b-test/')
 // 帐户中心
 const ssoUrl = process.env.ssoUrl || (isProdMode ? 'https://sso.ubtob.com/' : 'http://192.168.253.6:32323')
 
@@ -97,7 +99,8 @@ module.exports = {
     materialUrl,
     cmsUrl,
     messageUrl,
-    ssoUrl
+    ssoUrl,
+    uasUrl
   },
   plugins: [
     {