Browse Source

修改店铺品牌bug

gaoxm 7 years ago
parent
commit
c0a22926ae

+ 15 - 1
components/brandCenter/BrandIndex.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="brand-center-index">
+  <div class="brand-center-index" id="index">
     <img src="/images/brandCenter/brand-index-title1.png" alt="">
     <div class="brand-index-tab">
       <div class="brand-index-group" v-for="(indexGroup, index) in indexGroups">
@@ -178,6 +178,8 @@
             this.reloadData()
           } else {
             this.$router.push('/product/brand/brandList/' + index)
+//            window.location.href = '/product/brand/brandList/' + index + '#index'
+//            window.open('/product/brand/brandList/' + index + '#index', '_self')
           }
         },
         goBrandApply: function () {
@@ -357,6 +359,18 @@
       .brand-list-nav {
         height: 56px;
         padding-top: 8px;
+        position: relative;
+        &::after{
+          content: '';
+          height: 25px;
+          width: 1px;
+          position: absolute;
+          display: block;
+          border-left: 1px solid #c6c6c6;
+          top: 21px;
+          right: 192px;
+          z-index: 1000;
+        }
         .filter-area {
           float: right;
           height: 50px;

+ 3 - 6
components/btbBusiness/features.vue

@@ -41,9 +41,6 @@
         }, {
           illustrationF: ' 全智能的',
           illustrationS: '交易平台'
-        }, {
-          illustrationF: '平台用户的链式',
-          illustrationS: '反应式发展'
         }],
         timerIndex: 0,
         isTop: false
@@ -169,7 +166,7 @@
 
       }
       .content{
-        width: 1140px;
+        width: 1000px;
         height: 228px;
         margin: 0 auto;
         padding-left: 3px;
@@ -177,8 +174,8 @@
           float: left;
           height: 228px;
           width: 165px;
-          margin-right: 29px;
-          &:nth-child(6){
+          margin-right: 42px;
+          &:nth-child(5){
             margin-right: 0px;
           }
           &:nth-child(2), &:nth-child(4), &:nth-child(6){

+ 5 - 4
components/product/brand/BrandDetail.vue

@@ -18,7 +18,7 @@
           应用领域:<span v-for="(item, index) in applications"><span>{{item}}</span><span v-show="index+1 < applications.length">|</span></span>
         </li>
         <li class="brand-description" v-if="list.brief"><span>品牌介绍:</span><div class="txt-description">{{list.brief | briefFilter}}</div></li>
-        <li style="margin-top: 10px;color:#eb062b;" v-show="list.url"><span style="color:#666;">官网地址:</span><a class="office-address" :href="list.url">{{list.url}}</a></li>
+        <li style="margin-top: 10px;color:#eb062b;" v-show="list.url"><span style="color:#666;">官网地址:</span><a class="office-address" :href="list.url" target="_blank">{{list.url}}</a></li>
         </ul>
       </div>
     </div>
@@ -132,9 +132,10 @@
           font-size: 20px;
           color: #eb062b;
           padding: 30px 0px 0px 30px;
-          border-left: 2px solid #efefef;
-          border-right: 2px solid #efefef;
-          border-bottom: 3px solid #efefef;
+          border-left: 1px solid #efefef;
+          border-right: 1px solid #efefef;
+          border-bottom: 1px solid #efefef;
+          /*box-shadow: 2px 0px 1px #d9d9d9, -2px 0px 1px #d9d9d9, 0px 2px 1px #d9d9d9, 0px -2px 1px #d9d9d9;*/
           li {
             color: #666;
             font-size: 14px;

+ 1 - 1
components/search/GoodList.vue

@@ -59,7 +59,7 @@
             <!--<nuxt-link class="component-img-box" :to="item.batchCode?`/store/${item.storeId}/${item.batchCode}`:`/product/component/${item.uuid}`">-->
               <!--&lt;!&ndash;          <img :src="item.img?item.img:item.brand&&item.brand.logoUrl?item.brand.logoUrl:'/images/component/default.png'">&ndash;&gt;-->
               <!--<img class="component-img" :src="item.batchCode?item.img?item.img:'/images/component/default.png':item.brand&&item.brand.logoUrl?item.brand.logoUrl:'/images/component/default.png'">-->
-              <!--<img v-if="item.status === 602" class="sellout-flag" src="/images/search/sellout-search.png" alt="">-->
+              <!--<img v-if="item.status === 602" class="sellout-flag" src="/images/search/sellsearch-btn1.png.png" alt="">-->
             <!--</nuxt-link>-->
           <!--</td>-->
             <td class="brand-code">

+ 5 - 2
components/store/home/CommodityList.vue

@@ -612,6 +612,7 @@
 
   #goods-list-fragment .brand-code .code {
     font-weight: 600;
+    word-break: break-all;
   }
   #goods-list-fragment .brand-code .spec {
     word-break: break-all;
@@ -715,18 +716,20 @@
     background-color: #ffa422;
     color: #fff;
     width: 80px;
-    height: 30px;
+    height: 24px;
     font-size: 12px;
     border: 1px solid #ffa422;
+    border-radius: 2px;
   }
 
   #goods-list-fragment .btn-add-cart {
     margin-top: 10px;
     color: #3b7cf4;
     width: 80px;
-    height: 30px;
+    height: 24px;
     font-size: 12px;
     background-color: #fff;
+    border-radius: 2px;
     border: 1px solid #3b7cf4;
   }
   #goods-list-fragment .btn-buy-now:hover{

+ 1 - 1
components/store/home/EnterpriseInfo.vue

@@ -294,7 +294,7 @@
                 margin:10px 0px;
               }
               p {
-                margin: -15px 0px 0px 15px;
+                margin: -7px 0px 0px 15px;
                 text-indent: 2em;
                 overflow-y: auto;
                 overflow-x: hidden;

+ 1 - 1
components/store/home/RecommendList.vue

@@ -363,7 +363,7 @@
     &:hover{
       box-shadow: 2px 0px 1px #d9d9d9, -2px 0px 1px #d9d9d9, 0px 2px 1px #d9d9d9, 0px -2px 1px #d9d9d9;
       .enter-store {
-        top: 140px;
+        top: 132px;
         left: 0px;
         transition: all .3s linear;
       }

+ 46 - 8
components/store/home/StoreBanner.vue

@@ -13,8 +13,10 @@
           <p class="shop-name" v-if="storeInfo.storeName">{{storeInfo.storeName | nameFilter}}</p>
           <p class="shop-name" v-else></p>
           <div class="enter-store">
-            <a v-if="isFocus == 'false' || typeof isFocus == 'object'" @click="focus(storeInfo.id, storeInfo.storeName)">关注店铺</a>
-            <a v-if="isFocus == 'true'" class="focus">已关注</a>
+            <!--<a v-if="isFocus == 'false' || typeof isFocus == 'object'" @click="focus(storeInfo.id, storeInfo.storeName)">关注店铺</a>-->
+            <!--<a v-if="isFocus == 'true'" class="focus">已关注</a>-->
+            <a v-if="isFocus == 'false' || typeof isFocus == 'object'" @click="focusStore(storeInfo, $event)">关注店铺</a>
+            <a v-if="isFocus == 'true'" class="focus" @click="focusStore(storeInfo, $event)">已关注</a>
             <a @click="goLink()">联系卖家</a>
           </div>
           <div class="share">
@@ -47,6 +49,18 @@
           </button>
         </div>
       </el-dialog>
+      <el-dialog
+        :visible.sync="dialogInvisible"
+        size="tiny"
+      >
+        <h3 class="header-text">关注取消!</h3>
+        <div class="focus modal-body">
+          <button type="button" @click="dialogInvisible = false" class="btn" style="margin-left:25px;">关&nbsp;&nbsp;闭</button>
+          <button type="button" @click="dialogInvisible = false" class="focus-btn btn btn btn-info" style="margin-left:35px;">
+            <a href="/user#/storeFocus" target="_blank">查看我的店铺关注</a>
+          </button>
+        </div>
+      </el-dialog>
       <link-saler-box
         :tel="tel"
         v-if="showLinkBox"
@@ -65,6 +79,7 @@ export default {
   data () {
     return {
       dialogVisible: false,
+      dialogInvisible: false,
       showShare: false,
       clipboard: {},
       showLinkBox: false,
@@ -105,19 +120,42 @@ export default {
       this.showShare = flag
       this.showCate = flag
     },
-    focus (id, name) {
-      if (!this.user.logged) {
+    focusStore: function (item) {
+      if (this.user.logged) {
+        if (this.isFocus === 'false' || typeof isFocus === 'object') {
+          this.dialogVisible = true
+          this.$store.dispatch('shop/StoreFocus', {storeName: item.storeName, storeid: item.id})
+          this.isFocus = 'true'
+        } else {
+          this.$http.post('/trade/storeFocus/delete/storeId', [item.id])
+            .then(response => {
+              this.dialogInvisible = true
+//              alert(this.isFocus)
+              this.isFocus = 'false'
+//              alert(this.isFocus)
+            })
+        }
+      } else {
         this.$http.get('/login/page', {params: {returnUrl: window.location.href}}).then(response => {
           if (response.data) {
             window.location.href = response.data.content + '&baseUrl=' + encodeURIComponent(window.location.protocol + '//' + window.location.host + response.data.baseUrl)
           }
         })
-      } else {
-        this.dialogVisible = true
-        this.$store.dispatch('shop/StoreFocus', {storeName: name, storeid: id})
-        this.isFocus = true
       }
     },
+//    focus (id, name) {
+//      if (!this.user.logged) {
+//        this.$http.get('/login/page', {params: {returnUrl: window.location.href}}).then(response => {
+//          if (response.data) {
+//            window.location.href = response.data.content + '&baseUrl=' + encodeURIComponent(window.location.protocol + '//' + window.location.host + response.data.baseUrl)
+//          }
+//        })
+//      } else {
+//        this.dialogVisible = true
+//        this.$store.dispatch('shop/StoreFocus', {storeName: name, storeid: id})
+//        this.isFocus = true
+//      }
+//    },
     goLink: function () {
       this.baseUtils.goLinkUser(this, this.storeInfo.enUU)
     }

+ 1 - 1
pages/product/brand/_code.vue

@@ -12,7 +12,7 @@
 <script>
   import { BrandDetail, CategoriesList, BrandComponent } from '~components/product'
   export default {
-    layout: 'main',
+    layout: 'default',
     data () {
       return {
         code: '',

BIN
static/images/brandCenter/search.png