Merge remote-tracking branch 'origin/release-201816-wcz' into release-201816-wcz

components/applyPurchase/ApplyInfo.vue

@@ -373,6 +373,9 @@ export default {
   .apply-info {
     margin: 0 auto;
     .apply-info-title {
+      height: 45px;
+      padding-top: 5px;
+      background: #fff;
       border-bottom: 1px solid #e5e5e5;
       > p {
         display: inline-block;
@@ -380,7 +383,7 @@ export default {
         height: 33px;
         line-height: 33px;
         color: #fff;
-        background: #3975f4;
+        background: #2496f1;
         font-size: 16px;
         text-align: center;
         border: {
@@ -412,7 +415,7 @@ export default {
           display: inline-block;
           width: 69px;
           color: #fff;
-          background: #3975f4;
+          background: #2496f1;
           text-align: center;
           margin: 0 6px 0 -1px;
           /*vertical-align: middle;*/
@@ -448,7 +451,7 @@ export default {
             display: inline-block;
             width: 69px;
             color: #fff;
-            background: #3975f4;
+            background: #2496f1;
             text-align: center;
             margin: 0 6px 0 -1px;
             height: 33px;
@@ -494,6 +497,8 @@ export default {
       }
     }
     .apply-info-list {
+      border-radius:5px;
+      background: #fff;
       .list-title {
         background: #edf1fa;
         height: 36px;
@@ -505,7 +510,7 @@ export default {
           .fa {
             color: #333;
             &.active {
-              color: #5078cb;
+              color: #2496f1;
             }
           }
           &:nth-child(1) {
@@ -810,7 +815,7 @@ export default {
       min-height: auto;
       border-radius: 2px;
       .title {
-        background-color: #4290f7;
+        background-color: #2496f1;
         height: 22px;
         line-height: 22px;
         margin-bottom: 20px;
@@ -820,7 +825,7 @@ export default {
           line-height: 20px;
           padding-top: 0;
           i {
-            color: #4290f7;
+            color: #2496f1;
             margin-right: 4px;
           }
           span {
@@ -830,7 +835,7 @@ export default {
         div {
           a {
             width: 78px;
-            background: #4290f7;
+            background: #2496f1;
             margin: 18px 0 13px 0;
             border-radius: 2px;
           }

components/applyPurchase/PublishApply.vue

@@ -6,8 +6,10 @@
 </script>
 <style lang="scss">
   .publish-apply {
+    border:1px solid #f2f1f1;
+    border-radius:5px;
     background: url('/images/applyPurchase/banner.png') center center/cover no-repeat;
     height: 400px;
-    margin-bottom:20px;
+    margin-bottom:10px;
   }
 </style>

components/applyPurchase/articleFour.vue

@@ -38,8 +38,8 @@
   .article_four{
     position:relative;
     border-radius:5px;
-    border:1px solid #d2d2d2;
     margin-bottom:20px;
+    background: #fff;
     ul{
       padding:10px 0;
       li{

components/applyPurchase/articleOne.vue

@@ -500,8 +500,7 @@
 </script>
 <style lang="scss" type="text/scss">
   .article_one{
-    border: 1px solid #d2d2d2;
-    border-radius:3px;
+    border-radius:5px;
     background: #fff;
     margin-bottom:30px;
     .title{

components/applyPurchase/articleThree.vue

@@ -92,7 +92,7 @@
           height:30px;
           line-height: 30px;
           color:#eee;
-          background: #3b7cf4;
+          background: #2496f1;
           border-radius:5px;
           text-align: center;
         }

components/applyPurchase/articleTwo.vue

@@ -38,9 +38,10 @@
   .article_two{
     position:relative;
     border-radius:5px;
-    border:1px solid #d2d2d2;
     padding-top:25px;
     margin-bottom:20px;
+    height:388px;
+    background: #fff;
     &:before{
       content: '';
       display:block;
@@ -84,6 +85,7 @@
               &:nth-child(1) {
                 color: #f6682f;
                 font-size: 12px;
+                text-align:left;
                 >div {
                   width: 50px;
                   span {
@@ -105,7 +107,7 @@
                 overflow: hidden;
                 text-overflow: ellipsis;
                 white-space: nowrap;
-                padding: 0 8px;
+                padding: 0 3px;
                 position: relative;
                 height: 30px;
                 i {

components/brandCenter/BrandIndex.vue

@@ -282,7 +282,7 @@
         height: 862px;
         background-color: #ffffff;
         border-radius: 5px;
-        border: solid 1px #d2d2d2;
+        /*border: solid 1px #d2d2d2;*/
       }
       .recommend-head {
         padding-left: 10px;
@@ -361,8 +361,9 @@
         margin-top: 20px;
         width: 220px;
         height: 229px;
-        border-radius: 4px;
-        border: solid 1px rgba(210, 210, 210, 0.8);
+        border-radius: 5px;
+        background: #fff;
+        /*border: solid 1px rgba(210, 210, 210, 0.8);*/
         .item {
           overflow: hidden;
           margin-bottom: 22px;
@@ -399,6 +400,7 @@
       width: 955px;
       height: 34px;
       border-radius: 5px;
+      background: #fff;
       border: solid 1px #e5e5e5;
       .brand-index-group {
         float: left;
@@ -434,6 +436,10 @@
            width: 56px;
            padding-left: 3px;
          }
+        &:last-child a.active{
+           width: 56px;
+           padding-left: 3px;
+         }
       }
     }
     .brand-center-index-list {
@@ -442,7 +448,8 @@
         height: 34px;
         line-height: 34px;
         position: relative;
-        overflow: hidden;
+        /*overflow: hidden;*/
+        background: #fff;
         border-bottom: solid 1px #e5e5e5;
         span.search-index-show {
           float: left;
@@ -459,7 +466,7 @@
          span {
             font-size: 14px;
             color: #333;
-            margin-bottom: 20px;
+            /*margin-bottom: 20px;*/
             .active-index {
               font-size: 16px;
               color: #3c7cf5;
@@ -476,8 +483,8 @@
         }
         .filter-area {
           float: right;
-          height: 50px;
-          line-height: 50px;
+          /*height: 50px;*/
+          /*line-height: 50px;*/
           margin-right: 9px;
           position: relative;
           input {
@@ -491,11 +498,11 @@
             padding-right: 32px;
             position: absolute;
             right: 150px;
-            top: 0px;
+            top: 2px;
           }
           b.search-btn {
             position: absolute;
-            top: 0px;
+            top: 2px;
             right: 150px;
             width: 69px;
             height: 28px;
@@ -504,7 +511,8 @@
             font-size: 14px;
             color: #fff;
             background-color: #2496f1;
-            border-radius: 5px;
+            border-top-right-radius: 5px;
+            border-bottom-right-radius: 5px;
           }
           span {
             height: 28px;
@@ -512,6 +520,7 @@
             float:left;
             margin-left: 47px;
             color: #666;
+            margin-top: 5px;
             a {
               width: 30px;
               height: 22px;
@@ -533,13 +542,11 @@
             position: absolute;
             z-index: 1;
             right: 150px;
-            top: 41px;
+            top: 29px;
             border: 1px solid #c9c9c9;
             text-align: left;
-            width: 318px;
+            width: 258px;
             background: #fff;
-            /*max-height: 150px;*/
-            /*overflow-y: auto;*/
             li {
               padding: 0 11px;
               height: 30px;
@@ -554,11 +561,15 @@
       }
       .brand-list-items {
         padding-top: 20px;
+        padding-left: 20px;
         background-size: cover;
         padding-bottom: 20px;
         position: relative;
         height: 1034px;
+        background: #fff;
         border-bottom: 1px solid #dcdcdc;
+        border-bottom-left-radius: 5px;
+        border-bottom-right-radius: 5px;
         .search-modal-wrap {
           background: rgba(255, 255, 255, 0.3);
           position: absolute;
@@ -600,6 +611,8 @@
               line-height: 20px;
               color: #323232;
               font-size: 14px;
+              overflow: hidden;
+              text-overflow: ellipsis;
               &:nth-child(2) {
                 font-size: 12px;
               }

components/brandCenter/RecommendBrand.vue

@@ -134,7 +134,7 @@
   .recommend-brand {
     width: 1190px;
     margin: 0 auto;
-    margin-top: 10px;
+    padding-top: 20px;
     .brand-content{
       overflow: hidden;
       .brand-index-tab {
@@ -144,7 +144,7 @@
         height: 400px;
         background-color: #ffffff;
         border-radius: 5px;
-        border: solid 1px #d2d2d2;
+        /*border: solid 1px #d2d2d2;*/
         .index-head {
           padding-left: 10px;
           width: 220px;
@@ -208,7 +208,8 @@
           img {
             width: 955px;
             height: 400px;
-            border: 1px solid #ccc;
+            /*border: 1px solid #ccc;*/
+            border-radius: 5px;
           }
         }
         .swiper-button-prev i, .swiper-button-next i {
@@ -317,5 +318,7 @@
     background-color: #2496f1;
     border-radius: 2px;
     color: #fff;
+    /*width: 56px;*/
+    /*padding-left: 3px;*/
   }
 </style>

components/common/page/pageComponent.vue

@@ -155,7 +155,7 @@
   }
   .page-wrap{
     float: right;
-    margin: 30px 0;
+    margin: 30px 15px;
   }
   .page-wrap ul, .page-wrap div {
     display: inline-block;

components/mobile/Home.vue

@@ -213,7 +213,8 @@
         // 如果本地有缓存 则证明存在openid
         info = info && JSON.parse(info)
         if (ua.match(/micromessenger/i) && ua.match(/micromessenger/i)[0] === 'micromessenger' && !this.$route.query.code && !info) {
-            window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb3274b676737a319&redirect_uri=https://www.usoftmall.com&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
+          window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb3274b676737a319&redirect_uri=https://pre.usoftmall.com&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
+            // window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb3274b676737a319&redirect_uri=https://www.usoftmall.com&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
             // window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxd29bbca61728b189&redirect_uri=http://cuy53h.natappfree.cc&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
           } else if (ua.match(/micromessenger/i) && ua.match(/micromessenger/i)[0] === 'micromessenger') {
             if (!info) {

components/mobile/MobileHeader.vue

@@ -205,6 +205,12 @@
         } else if (this.startWith(val, '/mobile/center/user/doPay')) {
           this.showSearchIcon = false
           title = '待付款订单'
+        } else if (this.startWith(val, '/mobile/order/details')) {
+          this.showSearchIcon = false
+          title = '订单详情'
+        } else if (this.startWith(val, '/mobile/order')) {
+          this.showSearchIcon = false
+          title = '订单中心'
         } else {
           this.showSearchIcon = true
           title = '优软商城'

components/news/Detail.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="col-md-9">
+    <div class="col-md-9" style="background: #fff;">
       <div class="news-detail" v-bind="item">
         <h1 >{{item.title}}</h1>
         <div class="hot-time">
@@ -38,9 +38,10 @@
 </script>
 <style scoped>
   .col-md-9{
-    padding-left: 0;
     float: right;
-    margin-top: 10px;
+    padding: 15px 10px;
+    min-height:1200px;
+    border-radius:5px;
   }
   @media (min-width: 992px) {
     .col-md-9 {

components/news/Left.vue

@@ -49,7 +49,8 @@
 </script>
 <style>
   .hot-news{
-    border: 1px solid #e8e8e8;
+    background: #fff;
+    border-radius:5px;
     width:260px;
     padding: 0;
   }

components/news/Right.vue

@@ -72,10 +72,12 @@
 
 <style>
   .news-content{
-    padding-left: 0;
+    padding-left: 20px;
     float: right;
     width: 75%;
     padding-bottom: 15px;
+    background: #fff;
+    border-radius:5px;
   }
   .news-content .news{
     margin-bottom: 15px;

components/provider/Carousel.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="carousel" :class="{width_670: providerType === 'original'}">
+  <div class="carousel">
     <div v-swiper:mySwiper="swiperOption">
       <div class="swiper-wrapper">
         <div class="swiper-slide" v-for="banner in banners">
@@ -21,28 +21,13 @@
     data () {
       return {
         activeSlide: 0
-    //    banners: {}
       }
     },
     mixins: [carousel],
-//    mounted () {
-//      this.$http.get('/api/carousel/home%20page%20banner')
-//      .then(response => {
-//        this.banners = response.data
-//        this.x++
-//      })
-//    }
     computed: {
-      providerType () {
-        return this.$route.path === '/provider/home' ? 'agency' : 'original'
-      },
       banners () {
         if (this.$store.state.carousel.banners) {
-          let banner = this.$store.state.carousel.banners.data.data.slice()
-          banner.sort(function (a, b) {
-            return a.contentId - b.contentId
-          })
-          return banner
+          return this.$store.state.carousel.banners.data.data
         } else {
           return ''
         }
@@ -70,13 +55,9 @@
   @import '~assets/scss/variables';
 
   $carousel_width: 955px;
-  /*$carousel_width_670: 670px;*/
   $carousel_height: 400px;
 
   .carousel {
-    /*&.width_670{*/
-      /*width: $carousel_width_670;*/
-    /*}*/
     width: $carousel_width;
     height: $carousel_height;
     transition: background-color .3s;

components/provider/HotCommodity.vue

@@ -4,48 +4,48 @@
       <span>产品推荐</span>
       <img src="/images/original/line.png" alt=""/>
     </div>
-    <div v-swiper:mySwiper="swiperOption" v-if="hotComponents || hotComponents.length>0">
+    <div v-swiper:mySwiper="swiperOption" v-if="hotComponents.metadatas || hotComponents.length>0">
       <div class="swiper-wrapper">
         <div class="swiper-slide" v-if="hotComponents.length>0">
           <ul class="recommend-list clearfix">
             <li v-for="(component, index) in hotComponents.slice(0,2)" class="big">
-              <a :href="'/store/productDetail/' + component.batchCode" target="_blank">
-                <div class="img"><img :src="component.img || '/images/store/common/default.png'"/></div>
-                <span class="name">{{component.code}}</span>
-                <div class="price">{{component.prices ? component.currencyName === 'RMB' ? '¥' + '&nbsp;' + component.prices[0].rMBPrice : '$' +  '&nbsp;' + component.prices[0].uSDPrice : '-'}}</div>
+              <a :href="component.detailsLink" target="_blank">
+                <div class="img"><img :src="component.pictureLink || '/images/store/common/default.png'"/></div>
+                <span class="name">{{component.metadatas.contExp_abstract}}</span>
+                <div class="price">{{component.metadatas.contExp_remark}}</div>
               </a>
             </li>
           </ul>
         </div>
-        <div class="swiper-slide" v-if="hotComponents.length>=2">
+        <div class="swiper-slide" v-if="hotComponents.length>2">
           <ul class="recommend-list clearfix">
             <li v-for="(component, index) in hotComponents.slice(2,4)" class="big">
-              <a :href="'/store/productDetail/' + component.batchCode" target="_blank">
-                <div class="img"><img :src="component.img || '/images/store/common/default.png'"/></div>
-                <span class="name">{{component.code}}</span>
-                <div class="price">{{component.prices ? component.currencyName === 'RMB' ? '¥' + '&nbsp;' + component.prices[0].rMBPrice : '$' +  '&nbsp;' + component.prices[0].uSDPrice : '-'}}</div>
+              <a :href="component.detailsLink" target="_blank">
+                <div class="img"><img :src="component.pictureLink || '/images/store/common/default.png'"/></div>
+                <span class="name">{{component.metadatas.contExp_abstract}}</span>
+                <div class="price">{{component.metadatas.contExp_remark}}</div>
               </a>
             </li>
           </ul>
         </div>
-        <div class="swiper-slide" v-if="hotComponents.length>=4">
+        <div class="swiper-slide" v-if="hotComponents.length>4">
           <ul class="recommend-list clearfix">
             <li v-for="(component, index) in hotComponents.slice(4,6)" class="big">
-              <a :href="'/store/productDetail/' + component.batchCode" target="_blank">
-                <div class="img"><img :src="component.img || '/images/store/common/default.png'"/></div>
-                <span class="name">{{component.code}}</span>
-                <div class="price">{{component.prices ? component.currencyName === 'RMB' ? '¥' + '&nbsp;' + component.prices[0].rMBPrice : '$' +  '&nbsp;' + component.prices[0].uSDPrice : '-'}}</div>
+              <a :href="component.detailsLink" target="_blank">
+                <div class="img"><img :src="component.pictureLink || '/images/store/common/default.png'"/></div>
+                <span class="name">{{component.metadatas.contExp_abstract}}</span>
+                <div class="price">{{component.metadatas.contExp_remark}}</div>
               </a>
             </li>
           </ul>
         </div>
-        <div class="swiper-slide" v-if="hotComponents.length>=6">
+        <div class="swiper-slide" v-if="hotComponents.length>6">
           <ul class="recommend-list clearfix">
             <li v-for="(component, index) in hotComponents.slice(6,8)" class="big">
-              <a :href="'/store/productDetail/' + component.batchCode" target="_blank">
-                <div class="img"><img :src="component.img || '/images/store/common/default.png'"/></div>
-                <span class="name">{{component.code}}</span>
-                <div class="price">{{component.prices ? component.currencyName === 'RMB' ? '¥' + '&nbsp;' + component.prices[0].rMBPrice : '$' +  '&nbsp;' + component.prices[0].uSDPrice : '-'}}</div>
+              <a :href="component.detailsLink" target="_blank">
+                <div class="img"><img :src="component.pictureLink || '/images/store/common/default.png'"/></div>
+                <span class="name">{{component.metadatas.contExp_abstract}}</span>
+                <div class="price">{{component.metadatas.contExp_remark}}</div>
               </a>
             </li>
           </ul>
@@ -61,7 +61,7 @@ export default {
   name: 'hot-commodity',
   computed: {
     hotComponents () {
-      return this.$store.state.provider.storeCms.hotComponents.data
+      return this.$store.state.provider.storeCms.hotComponents.data.data
     },
     // 产品推荐轮播
     swiperOption () {

components/provider/RecommendStore.vue

@@ -45,7 +45,7 @@ export default {
       min-height: 400px;
       display: inline-block;
       float: left;
-      border: 1px solid #D6D3CE;
+      border-radius: 5px;
     }
 
     /*.carousel_670 {*/

components/provider/Suppliers.vue

@@ -66,7 +66,7 @@ export default {
         page: 1,
         count: 10,
         keyword: '',
-        type: this.storeType === 'factory' ? 'ORIGINAL_FACTORY' : 'AGENCY-DISTRIBUTION',
+        type: 'ORIGINAL_FACTORY',
         field: ''
       }
     }
@@ -95,6 +95,7 @@ export default {
   },
   methods: {
     search (obj) {
+      this.pageParams.type = this.storeType === 'factory' ? 'ORIGINAL_FACTORY' : 'AGENCY-DISTRIBUTION'
       this.pageParams.page = 1
       this.pageParams.keyword = obj.keyword === '' ? null : obj.keyword
       this.pageParams.field = obj.type ? 'similar' : null
@@ -136,6 +137,7 @@ export default {
 		width: 955px;
     height: 1213px;
     background: #fff;
+    border-radius: 5px;
     table{
       table-layout: fixed;
       width: 955px;

components/provider/ToggleStore.vue

@@ -215,6 +215,14 @@ export default {
           }
         }
       }
+    }
+    .factory {
+      border-top-left-radius: 5px;
+      border-top-right-radius: 5px;
+    }
+    .sale{
+      border-bottom-left-radius: 5px;
+      border-bottom-right-radius: 5px;
     }
 	}
 </style>

components/store/home/RecommendList.vue

@@ -33,7 +33,7 @@
               </li>
             </ul>
           </div>
-          <div class="swiper-slide" v-if="commodities.length>=3">
+          <div class="swiper-slide" v-if="commodities.length>3">
             <ul class="recommend-list clearfix">
               <li v-for="commodity in commodities.slice(3,6)" class="big">
                 <a :href="commodity.batchCode ? '/store/productDetail/'+ commodity.batchCode : '#'" class="href">
@@ -50,7 +50,7 @@
               </li>
             </ul>
           </div>
-          <div class="swiper-slide" v-if="commodities.length>=6">
+          <div class="swiper-slide" v-if="commodities.length>6">
             <ul class="recommend-list clearfix">
               <li v-for="commodity in commodities.slice(6,9)" class="big">
                 <a :href="commodity.batchCode ? '/store/productDetail/'+ commodity.batchCode : '#'" class="href">
@@ -67,7 +67,7 @@
               </li>
             </ul>
           </div>
-          <div class="swiper-slide" v-if="commodities.length>=9">
+          <div class="swiper-slide" v-if="commodities.length>9">
             <ul class="recommend-list clearfix">
               <li v-for="commodity in commodities.slice(9,12)" class="big">
                 <a :href="commodity.batchCode ? '/store/productDetail/'+ commodity.batchCode : '#'" class="href">

components/supplier/articleOne.vue

@@ -64,7 +64,6 @@
 <style type="text/scss" lang="scss">
 .supplier_one{
   position:relative;
-  border:1px solid #ccc;
   padding-top:90px;
   border-radius:5px;
   padding-bottom:5px;
@@ -77,6 +76,7 @@
       background: #4290f7;
       line-height: 40px;
       padding: 0 20px 0;
+      display:block;
       .el-dialog__title{
         color:#fff;
       }

components/supplier/articleTwo.vue

@@ -3,8 +3,13 @@
     <div class="title">
       <span>供应商推荐</span>
     </div>
+    <div class="empty" v-if="!list.content || list.content.length === 0">
+      <div class="supplier-empty-info">
+        <p>暂无供应商推荐信息</p>
+      </div>
+    </div>
     <ul class="list-unstyled">
-      <li v-for="item in list.content" @click="jumpResource(item.enUU)">
+      <li v-for="item in list.content" @click="jumpResource(item.uu)">
         <div class="img">
           <img :src="item.enLogoUrl || '/images/all/default.png'">
         </div>
@@ -33,6 +38,7 @@
     },
     computed: {
       list () {
+        console.log('12', this.$store.state.supplier.merchant.recommend.data)
         return this.$store.state.supplier.merchant.recommend.data
       }
     },
@@ -62,18 +68,19 @@
 <style type="text/scss" lang="scss">
   .supplier_two{
     position:relative;
-    border:1px solid #ccc;
     border-radius:5px;
     padding-bottom:5px;
     margin-bottom:15px;
     background: #fff;
-    min-height:300px;
+    height:1205px;
+    overflow: hidden;
     .el-dialog{
       width: 290px!important;
       .el-dialog__header{
         background: #4290f7;
         line-height: 40px;
         padding: 0 20px 0;
+        display:block;
         .el-dialog__title{
           color:#fff;
         }
@@ -122,7 +129,14 @@
         color:#fff;
       }
     }
-    ul{
+    .empty{
+      padding-top:30px;
+      text-align: center;
+      .supplier-empty-info{
+       font-size: 14px;
+      }
+    }
+    > ul{
       li{
         position:relative;
         padding: 0 10px;

components/supplier/banner.vue

@@ -13,5 +13,7 @@
   height:400px;
   background: url(/images/supplier/banner.png)no-repeat center center;
   margin-bottom:15px;
+  border-radius:5px;
+  overflow: hidden;
 }
 </style>

components/supplier/merchant.vue

@@ -19,7 +19,7 @@
     <ul class="list-inline">
       <li v-for="item in list.content" @click="jumpResource(item.enUU)" class="clearfix">
         <div class="img">
-          <img :src="item.logoUrl || '/images/all/default.png'">
+          <img :src="item.storeLogoUrl || item.logoUrl || '/images/all/default.png'">
           <span class="has_shop" v-if="item.isStore === 1"></span>
         </div>
         <div class="content">
@@ -138,16 +138,15 @@
 
 <style type="text/scss" lang="scss">
 .merchant{
-  padding-bottom:25px;
   border-radius:5px;
   overflow:hidden;
-  background: #fff;
   .el-dialog{
     width: 290px!important;
     .el-dialog__header{
       background: #4290f7;
       line-height: 40px;
       padding: 0 20px 0;
+      display:block;
       .el-dialog__title{
         color:#fff;
       }
@@ -187,6 +186,7 @@
   }
   .top{
     border-bottom:1px solid #d3d3d3;
+    background: #fff;
     .title{
       background: #2496f1;
       height:35px;
@@ -203,6 +203,11 @@
       width:370px;
       padding-top:7px;
       margin-right:10px;
+      .search-content-pc > ul{
+        left:0;
+        top:100%;
+        width:100%;
+      }
       .btn{
         width:68px;
         background: #2496f1;
@@ -215,12 +220,9 @@
     }
   }
   .list_info{
-    margin-bottom:50px;
+    height: 1187px;
     .empty{
-      height:418px;
-      border:15px solid #c4e9f9;
-      background: #eef9fd;
-      padding-top:165px;
+      padding-top:1px;
       text-align: center;
       img{
         vertical-align: top;
@@ -232,6 +234,7 @@
       }
     }
     > ul{
+      background: #fff;
       margin:0;
       li{
         position:relative;

pages/applyPurchase/index.vue

@@ -44,6 +44,7 @@
   .seek {
     position: relative;
     padding-top:20px;
+    background: #f2f1f1;
   }
   .footer {
     text-align: center;

pages/mobile/order/details.vue

@@ -130,6 +130,10 @@
           <div class="pull-left">运费：</div>
           <div class="pull-right">¥{{orderList.fare | priceFiter}}</div>
         </div>
+        <div class="clearfix">
+          <div class="pull-left">手续费：</div>
+          <div class="pull-right"><a class="red" style="color:#f43938;">¥0.00</a><span class="del" style="text-decoration: line-through;color: #999;font-size: 0.24rem;">(¥{{parseFloat(orderList.ensurePrice * 0.0045).toFixed(2)}})</span></div>
+        </div>
         <!--<div class="clearfix">-->
           <!--<div class="pull-left">促销优惠：</div>-->
           <!--<div class="pull-right">-¥13212.32132</div>-->
@@ -143,7 +147,7 @@
         <div>共<span>{{orderList.batchQty}}</span>件商品&nbsp;&nbsp;合计：
           <span class="pri"><a class="red">¥</a>{{orderList.ensurePrice}}</span>
           <span class="lab">(含运费：<a class="red">¥</a><a class="red">{{orderList.fare | priceFiter}}</a>)</span></div>
-        <div>手续费：<a class="red">¥0.00</a><span class="del">(¥{{parseFloat(orderList.ensurePrice * 0.0045).toFixed(2)}})</span></div>
+        <!--<div>手续费：<a class="red">¥0.00</a><span class="del">(¥{{parseFloat(orderList.ensurePrice * 0.0045).toFixed(2)}})</span></div>-->
       </div>
       <div class="order-details-info">
         <div class="clearfix">
@@ -162,7 +166,8 @@
         <div class="clearfix">
           <div class="name pull-left">付款方式</div>
           <div class="pull-right">
-            {{orderList.paytype === 1103 ? '线下付款' : '网上支付'}}
+            <!--{{orderList.paytype}}-->
+            {{orderList.paytype === '1103' ? '线下付款' : '网上支付'}}
           </div>
         </div>
         <div class="clearfix">
@@ -177,7 +182,9 @@
       <div class="order-details-invoiceinfo" v-if="orderList.invoicetype === 1205 || orderList.invoicetype === 1206" v-show="showinvoiceType">
         <div class="invoiceList clearfix" >
           <div class="pull-left">发票类型：</div>
-          <div class="pull-right">{{orderList.purchaseRemark || '空'}}</div>
+          <div class="pull-right">
+            {{orderList.invoicetype === 1205 ? '增值税(专用)发票': '增值税普通发票'}}
+          </div>
         </div>
         <div class="invoiceList clearfix">
           <div class="pull-left">发票抬头：</div>
@@ -425,6 +432,7 @@
           data[0].paytype = route.query.paytype
           data[0].historyS = JSON.parse(data[0].statushistory)
           data[0].purchaseDetails = data[0].orderDetails
+          data[0].purchaseRemark = data[0].orderRemark ? JSON.parse(data[0].orderRemark)[data[0].storeid] : ''
           if (route.query.type === 'buyer') {
             sellsendGoodsTime = await axios.get(`/trade/tradebasicproperties/get/1054`)
           }
@@ -436,7 +444,7 @@
         let { data } = await axios.get(`/trade/purchase/purchaseId/${route.query.uuid}`)
         console.log(data)
         data.data.area = JSON.parse(data.data.jsonAddress)
-        data.data.rule = JSON.parse(data.data.jsonRule)
+        data.data.rule = data.data.jsonRule ? JSON.parse(data.data.jsonRule) : ''
         data.data.paytype = route.query.paytype
         data.data.historyS = JSON.parse(data.data.statushistory)
         let invoiceAddress = data.data.invoiceAddress ? JSON.parse(data.data.invoiceAddress) : ''
@@ -554,7 +562,7 @@
             })
           } else {
             this.$http.get(`/trade/purchase/vendor/tobeshiped/${item.id}`).then(res => {
-              this._id = EncryptionFilter(res.inid)
+              this._id = EncryptionFilter(res.data.inid)
               this.$http.get(`/trade/inFpu/tobeshipped/${this._id}`).then(res => {
                 this.sendGoodsInfo = res.data[0]
                 this.sendGoodsInfo.area = JSON.parse(res.data[0].jsonSpAddress)
@@ -902,7 +910,7 @@
           }
           .pull-right {
             @include lineHeight(0.56rem);
-            border: 0.01rem solid #3f84f6;
+            border: 1px solid #3f84f6;
             color: #3f84f6;
             font-size: 0.26rem;
             text-align: center;
@@ -911,7 +919,7 @@
             padding: 0 0.1rem;
             overflow: hidden;
             i {
-              font-size: 0.14rem;
+              font-size: 0.26rem;
               margin-left: 0.05rem;
             }
           }
@@ -982,11 +990,12 @@
         .list-wrap-content {
           background: #f9f9f8;
           padding: 0.3rem 0.2rem;
+          padding-right: 0.32rem;
           border-bottom: 1px solid #e4e4e4;
           .list-item {
             font-size: 0.28rem;
             color: #333;
-            line-height: 0.6rem;
+            line-height: 0.5rem;
             .list-wrap-content-brand {
               @include overFlowHidden();
               .spec {
@@ -1000,7 +1009,7 @@
             .lab {
               color: #999;
               font-size: 0.24rem;
-              max-width: 2.2rem;
+              max-width: 2.1rem;
               @include overFlowHidden();
               span {
                 font-size: 0.16rem;
@@ -1028,7 +1037,7 @@
             display: inline-block;
             width: 1.5rem;
             @include lineHeight(0.56rem);
-            border: 0.01rem solid #333;
+            border: 1px solid #333;
             font-size: 0.26rem;
             color: #333;
             text-align: center;
@@ -1167,8 +1176,8 @@
     }
     .sendGoods_Alert {
       background: #fff;
-      position: absolute;
-      bottom: 0;
+      position: fixed;
+      bottom: 0.98rem;
       left: 0;
       width: 100%;
       border-top-left-radius: 5px;
@@ -1218,9 +1227,9 @@
         border-bottom: 1px solid #d9d9d9;
         font-size: 0.32rem;
         color: #333;
-        .ti {
-          font-weight: bold;
-        }
+        /*.ti {*/
+          /*font-weight: bold;*/
+        /*}*/
         .pull-right {
           font-size: 0.28rem;
           color: #999;
@@ -1262,7 +1271,7 @@
     .peisong_Alert {
       background: #f1f3f6;
       position: fixed;
-      bottom: 0;
+      bottom: 0.98rem;
       left: 0;
       right: 0;
       top: 0;
@@ -1454,7 +1463,7 @@
     .cancelOrder {
       background: #fff;
       position: absolute;
-      bottom: 0;
+      bottom: 0.98rem;
       left: 0;
       width: 100%;
       border-top-left-radius: 5px;

pages/mobile/order/index.vue

@@ -455,7 +455,7 @@
           })
         } else {
           this.$http.get(`/trade/purchase/vendor/tobeshiped/${item.id}`).then(res => {
-            this._id = EncryptionFilter(res.inid)
+            this._id = EncryptionFilter(res.data.inid)
             this.$http.get(`/trade/inFpu/tobeshipped/${this._id}`).then(res => {
               this.sendGoodsInfo = res.data[0]
               this.sendGoodsInfo.area = JSON.parse(res.data[0].jsonSpAddress)
@@ -815,7 +815,7 @@
   margin: 0.88rem 0 0.98rem 0;
   height: calc(100vh - 0.88rem - 0.96rem);
   overflow-y: scroll;
-  padding-bottom: 0.2rem;
+  /*padding-bottom: 0.96rem;*/
   .order-nav {
     background: #fff;
     div {
@@ -828,7 +828,7 @@
       color: #666;
       &.active span{
         color: #3f84f6;
-        border-bottom: 0.03rem solid #3f84f6;
+        border-bottom: 0.04rem solid #3f84f6;
         padding-bottom: 0.2rem;
       }
     }
@@ -856,11 +856,12 @@
     .list-wrap-content {
       background: #f9f9f8;
       padding: 0.3rem 0.2rem;
+      padding-right: 0.32rem;
       border-bottom: 1px solid #e4e4e4;
       .list-item {
         font-size: 0.28rem;
         color: #333;
-        line-height: 0.6rem;
+        line-height: 0.5rem;
         .list-wrap-content-brand {
           @include overFlowHidden();
           .spec {
@@ -874,7 +875,7 @@
         .lab {
           color: #999;
           font-size: 0.24rem;
-          max-width: 2.2rem;
+          max-width: 2.1rem;
           @include overFlowHidden();
           span {
             font-size: 0.16rem;
@@ -921,7 +922,7 @@
         display: inline-block;
         width: 1.5rem;
         @include lineHeight(0.56rem);
-        border: 0.01rem solid #333;
+        border: 1px solid #333;
         font-size: 0.26rem;
         color: #333;
         text-align: center;
@@ -935,7 +936,7 @@
         &.cancat {
           height: 0.56rem;
           line-height: 0.56rem;
-          border: 0.01rem solid #3f84f6;
+          border: 1px solid #3f84f6;
           color: #3f84f6;
           font-size: 0.26rem;
           text-align: center;
@@ -943,14 +944,17 @@
           padding: 0 0.1rem;
           overflow: hidden;
           width: auto;
+          i {
+            font-size: 0.26rem;
+          }
         }
       }
     }
   }
   .sendGoods_Alert {
     background: #fff;
-    position: absolute;
-    bottom: 0;
+    position: fixed;
+    bottom: 0.98rem;
     left: 0;
     width: 100%;
     border-top-left-radius: 5px;
@@ -1000,9 +1004,9 @@
       border-bottom: 1px solid #d9d9d9;
       font-size: 0.32rem;
       color: #333;
-      .ti {
-        font-weight: bold;
-      }
+      /*.ti {*/
+        /*font-weight: bold;*/
+      /*}*/
       .pull-right {
         font-size: 0.28rem;
         color: #999;
@@ -1044,13 +1048,13 @@
   .peisong_Alert {
     background: #f1f3f6;
     position: fixed;
-    bottom: 0;
+    bottom: 0.98rem;
     left: 0;
     right: 0;
     top: 0;
     z-index: 11111;
     ul {
-      height: calc(100vh - 1.2rem - 1.7rem);
+      height: calc(100vh - 1.2rem - 1.7rem - 1rem);
       overflow-y: scroll;
       li {
         line-height: 1rem;
@@ -1236,7 +1240,7 @@
   .cancelOrder {
     background: #fff;
     position: absolute;
-    bottom: 0;
+    bottom: 0.98rem;
     left: 0;
     width: 100%;
     border-top-left-radius: 5px;

pages/mobile/wechat/index.vue

@@ -72,14 +72,16 @@
         localStorage.setItem('RETURNURL', this.$route.query.url || '')
       }
       if (!info && !this.$route.query.code) {
-        window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb3274b676737a319&redirect_uri=https://www.usoftmall.com/mobile/wechat&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
+        window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb3274b676737a319&redirect_uri=https://pre.usoftmall.com/mobile/wechat&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
+        // window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb3274b676737a319&redirect_uri=https://www.usoftmall.com/mobile/wechat&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
         // window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb3274b676737a319&redirect_uri=https://www.usoftmall.com/mobile/wechat&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
       } else if (info) {
         info = JSON.parse(info)
         if (info.openid) {
           this.$store.dispatch('GerWechatInfo', {code: '', openId: info.openid})
         } else {
-          window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb3274b676737a319&redirect_uri=https://www.usoftmall.com/mobile/wechat&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
+          window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb3274b676737a319&redirect_uri=https://pre.usoftmall.com/mobile/wechat&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
+          // window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxb3274b676737a319&redirect_uri=https://www.usoftmall.com/mobile/wechat&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`
         }
       } else {
         this.$store.dispatch('GerWechatInfo', {code: this.$route.query.code})

pages/news/_id.vue

@@ -1,8 +1,10 @@
 <template>
-  <div class="container">
-    <div class="menu-title" style="margin: 10px 0"><nuxt-link to="/news">优软快讯</nuxt-link> &gt; <span>资讯详情</span></div>
-    <left></left>
-    <detail></detail>
+  <div class="new_menu_info" style="background: #f2f1f1;">
+    <div class="container">
+      <div class="menu-title" style="margin: 10px 0"><nuxt-link to="/news">优软快讯</nuxt-link> &gt; <span>资讯详情</span></div>
+      <left></left>
+      <detail></detail>
+    </div>
   </div>
 </template>
 <script>

pages/news/index.vue

@@ -1,7 +1,9 @@
 <template>
-  <div class="container news-container">
-    <left></left>
-    <right @pageEvent="listenChild"></right>
+  <div class="news-container">
+    <div class="container">
+      <left></left>
+      <right @pageEvent="listenChild"></right>
+    </div>
   </div>
 </template>
 
@@ -40,6 +42,7 @@
     font-size: 14px!important;
   }
   .news-container{
-    margin-top: 15px;
+    background: #f2f1f1;
+    padding-top: 15px;
   }
 </style>

pages/product/brand/brandList/_initial.vue

@@ -28,6 +28,7 @@
 </script>
 <style lang="scss">
   #brand-center {
+    background: #f2f1f1;
     .search-box {
       background-size: auto!important;
       background-position: 54% 0!important;

pages/product/brand_new/brandList/_initial.vue

@@ -50,6 +50,7 @@
     /*font-weight: bold;*/
   /*}*/
   #brand-center {
+  background: #f2f1f1;
     .search-box {
       background-size: auto!important;
       background-position: 54% 0!important;

pages/provider/shop.vue

@@ -38,6 +38,6 @@ export default {
 </script>
 <style scoped lang="scss">
   div{
-    background: #efefef;
+    background: #f2f1f1;
   }
 </style>

pages/supplier/index.vue

@@ -27,7 +27,7 @@
         store.dispatch('supplier/loadVendorList', {page: 1, size: 10}),
         store.dispatch('supplier/loadVendorAll', {page: 1, size: 20}),
         store.dispatch('supplier/loadNewMerchant', {filter: 'page', size: 10}),
-        store.dispatch('supplier/loadRecommend', {size: 10}),
+        store.dispatch('supplier/loadRecommend', {size: 19}),
         store.dispatch('loadBanners', {type: 'home'}),
         store.dispatch('loadProductKinds', { id: 0 })
       ])

store/provider.js

@@ -104,7 +104,7 @@ export const actions = {
   },
   loadHotComponents ({ commit }) {
     commit('storeCms/REQUEST_HOT_COMPONENTS')
-    return axios.get('/api/cms-service/storeCms/inventory')
+    return axios.get('/cmsApi?method=queryContentPage&module=recommended&orderBy=order_number%20ASC')
       .then(response => {
         commit('storeCms/GET_HOT_COMPONENTS_SUCCESS', response.data)
       }, err => {