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

components/applyPurchase/ApplyInfo.vue

@@ -373,8 +373,8 @@ export default {
   .apply-info {
     margin: 0 auto;
     .apply-info-title {
-      height: 45px;
-      padding-top: 5px;
+      height: 58px;
+      line-height: 58px;
       background: #fff;
       border-bottom: 1px solid #e5e5e5;
       > p {
@@ -384,7 +384,7 @@ export default {
         line-height: 33px;
         color: #fff;
         background: #2496f1;
-        font-size: 16px;
+        font-size: 14px;
         text-align: center;
         border: {
           top-left-radius: 3px;
@@ -406,6 +406,7 @@ export default {
           border: 1px solid #2496f1;
           line-height: 32px;
           font-size: 13px;
+          margin-top: 14px;
           border: {
             top-right-radius: 0;
             bottom-right-radius: 0;
@@ -536,6 +537,7 @@ export default {
       > ul {
         margin-bottom: 29px;
         font-size:12px;
+        height: 1240px;
         > li {
           position: relative;
           border: 1px solid #ededed;
@@ -801,6 +803,9 @@ export default {
           /*.say-price {*/
           /*display: block;*/
           /*}*/
+        &:last-child{
+            border-bottom: none;
+         }
         }
       }
     }

components/applyPurchase/articleOne.vue

@@ -511,6 +511,7 @@
         font-size: 14px;
         color:#fff;
         line-height: 30px;
+        font-weight: bold;
       }
     }
     .publish-area{
@@ -606,8 +607,8 @@
           }
           input {
             font-size: 12px;
-            height: 20px;
-            line-height: 20px;
+            height: 26px;
+            line-height: 26px;
             border-radius: 5px;
             padding: 0 3px;
             box-shadow: none;

components/brandCenter/BrandIndex.vue

@@ -291,6 +291,7 @@
         line-height: 34px;
         background-color: #2496f1;
         font-size: 14px;
+        font-weight: bold;
         border-top-left-radius: 5px;
         border-top-right-radius: 5px;
         color: #fff;
@@ -488,9 +489,9 @@
           margin-right: 9px;
           position: relative;
           input {
-            height: 28px;
+            height: 32px;
             width: 258px;
-            line-height: 28px;
+            line-height: 32px;
             padding-left: 11px;
             background-color: #ffffff;
             border-radius: 3px;
@@ -498,15 +499,15 @@
             padding-right: 32px;
             position: absolute;
             right: 150px;
-            top: 2px;
+            top: 0px;
           }
           b.search-btn {
             position: absolute;
-            top: 2px;
+            top: 0px;
             right: 150px;
             width: 69px;
-            height: 28px;
-            line-height: 28px;
+            height: 32px;
+            line-height: 32px;
             text-align: center;
             font-size: 14px;
             color: #fff;

components/brandCenter/RecommendBrand.vue

@@ -152,6 +152,7 @@
           line-height: 34px;
           background-color: #2496f1;
           font-size: 14px;
+          font-weight: bold;
           border-top-left-radius: 5px;
           border-top-right-radius: 5px;
           color: #fff;

components/main/Nav.vue

@@ -18,7 +18,7 @@
         <span>B2B商务</span>
         <img class="new-animate" src="/images/all/hot.png" alt="">
       </a>
-      <nuxt-link  to="/provider/shop" class="item expand-item">
+      <nuxt-link  to="/provider/shop" class="item">
         <span>店铺
           <!--<i class="iconfont icon-arrow-down"></i>-->
           <!--<i class="iconfont icon-arrow-up"></i>-->

components/mobile/Home.vue

@@ -213,8 +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://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=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/MobileFooter.vue

@@ -66,6 +66,7 @@
       },
       activeType () {
         let path = this.$route.path
+        let _tp = this. $route.query.type
         if (path === '/') {
           return 'home'
         } else if (path === '/mobile/shop') {
@@ -74,6 +75,10 @@
           return 'user'
         } else if (this.baseUtils.startWith(path, '/mobile/center/user')) {
           return 'userCenter'
+        } else if (this.baseUtils.startWith(path, '/mobile/order') && _tp === 'buyer') {
+          return 'userCenter'
+        } else if (this.baseUtils.startWith(path, '/mobile/order') && _tp !== 'buyer') {
+          return 'vendorCenter'
         } else if (this.baseUtils.startWith(path, '/mobile/center/vendor')) {
           return 'vendorCenter'
         } else {

components/provider/HotCommodity.vue

@@ -4,7 +4,20 @@
       <span>产品推荐</span>
       <img src="/images/original/line.png" alt=""/>
     </div>
-    <div v-swiper:mySwiper="swiperOption" v-if="hotComponents.metadatas || hotComponents.length>0">
+    <div v-if="hotComponents.metadatas || hotComponents.length>0">
+      <div v-if="hotComponents.length<=2">
+        <ul class="recommend-list clearfix">
+          <li v-for="(component, index) in hotComponents.slice(0,2)" class="big">
+            <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>
+    <div v-swiper:mySwiper="swiperOption" v-if="hotComponents.metadatas && hotComponents.length>2">
       <div class="swiper-wrapper">
         <div class="swiper-slide" v-if="hotComponents.length>0">
           <ul class="recommend-list clearfix">
@@ -95,13 +108,13 @@ export default {
       line-height: 34px;
       text-align: center;
       span{
-        font-size: 16px;
+        font-size: 14px;
         color: #333;
       }
       img{
         position: absolute;
         top: 14px;
-        left: 25px;
+        left: 26px;
       }
     }
     ul{

components/provider/NewStore.vue

@@ -43,6 +43,7 @@ export default {
       return this.$store.state.option.user
     },
     stores () {
+      console.log(this.$store.state.provider.storeCms.newStores.data)
       return this.$store.state.provider.storeCms.newStores.data ? this.$store.state.provider.storeCms.newStores.data.content : []
     },
     storeCount () {
@@ -71,7 +72,7 @@ export default {
       border-top-left-radius: 5px;
       border-top-right-radius: 5px;
       .title {
-        font-size: 16px;
+        font-size: 14px;
         color: #fff;
       }
     }

components/provider/Suppliers.vue

@@ -155,7 +155,7 @@ export default {
             background-color: #2496f1;
             span{
               padding-left: 10px;
-              font-size: 16px;
+              font-size: 14px;
               color: #fff;
             }
             &:first-child {

components/store/home/RecommendList.vue

@@ -14,7 +14,26 @@
           </div>
         </div>
       </div>
-      <div v-swiper:mySwiper="swiperOption" v-if="commodities || commodities.length>0">
+      <div  v-if="commodities.length>0">
+        <div  v-if="commodities.length<=3">
+          <ul class="recommend-list clearfix">
+            <li v-for="commodity in commodities.slice(0,3)" class="big">
+              <a :href="commodity.batchCode ? '/store/productDetail/'+ commodity.batchCode : '#'" class="href">
+                <div class="img">
+                  <img :src="commodity.comImg.startsWith('static')?'/'+commodity.comImg:commodity.comImg"/>
+                </div>
+                <div class="content">
+                  <p>{{commodity.comCode | comCodeFilter}}</p>
+                  <!-- <p class="color666" v-text="commodity.brandNameCn">PANFAEFQ</p>-->
+                  <p class="price" v-if="commodity.minPriceRMB">¥ {{commodity.minPriceRMB | currency}}</p>
+                  <!-- <p class="price" v-if="!commodity.minPriceRMB">$ {{commodity.minPriceUSD || 0}}</p>-->
+                </div>
+              </a>
+            </li>
+          </ul>
+        </div>
+      </div>
+      <div v-swiper:mySwiper="swiperOption" v-if="commodities && commodities.length>3">
         <div class="swiper-wrapper">
           <div class="swiper-slide" v-if="commodities.length>0">
             <ul class="recommend-list clearfix">

pages/mobile/order/details.vue

@@ -10,10 +10,10 @@
         <div class="clearfix top-t-wrap">
           <div class="pull-left">
             <template v-if="orderList.status === 404 && vendorType === 'buyer'">待收货</template>
-            <template v-else-if="orderList.status === 404 || orderList.status === 520 || orderList.status === 405 || orderList.status === 503 || orderList.status === 514">
+            <template v-if="vendorType !== 'buyer' && (orderList.status === 404 || orderList.status === 520 || orderList.status === 405 || orderList.status === 503 || orderList.status === 514)">
               请耐心等待买家确认收货
             </template>
-            <span v-if="vendorType === 'buyer'">{{restTime()}}</span>
+            <span v-if="vendorType === 'buyer' && orderList.status === 404">{{restTime()}}</span>
           </div>
           <div class="pull-right" v-if="vendorType !== 'buyer'">
             <div class="concat" @click="cancatAlert()">
@@ -167,14 +167,14 @@
           <div class="name pull-left">付款方式</div>
           <div class="pull-right">
             <!--{{orderList.paytype}}-->
-            {{orderList.paytype === '1103' ? '线下付款' : '网上支付'}}
+            {{orderList.paytype === '1103' ? '线下付款' : '线下付款'}}
           </div>
         </div>
         <div class="clearfix">
           <div class="name pull-left">发票信息</div>
-          <div class="pull-right" @click="(orderList.invoicetype === 1205 || orderList.invoicetype === 1206) ? showinvoiceType = true : ''">
+          <div class="pull-right" @click="(orderList.invoicetype === 1205 || orderList.invoicetype === 1206) ? showinvoiceType = !showinvoiceType : ''">
             {{(orderList.invoicetype === 1205 || orderList.invoicetype === 1206) ? '查看更多信息' : '暂不开票'}}
-            <img src="/images/mobile/user/icon-right.png"  v-if="orderList.invoicetype === 1205 || orderList.invoicetype === 1206"/>
+            <img src="/images/mobile/user/icon-right.png"  v-if="orderList.invoicetype === 1205 || orderList.invoicetype === 1206" :class="showinvoiceType ? 'dropList' : '' "/>
           </div>
         </div>
       </div>
@@ -433,6 +433,7 @@
           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] : ''
+          data[0].sendType = data[0].rule.method
           if (route.query.type === 'buyer') {
             sellsendGoodsTime = await axios.get(`/trade/tradebasicproperties/get/1054`)
           }
@@ -1046,7 +1047,7 @@
             border-radius: 3px;
             &.sendGoods {
               color: #f43938;
-              border: 0.01rem solid #f43938;
+              border: 1px solid #f43938;
             }
           }
         }
@@ -1122,6 +1123,9 @@
             margin-top: 0.3rem;
             margin-left: 0.1rem;
             margin-right: 0.1rem;
+            &.dropList {
+              transform: rotate(270deg);
+            }
           }
           padding: 0 0.2rem;
           font-size: 0.28rem;

pages/mobile/order/index.vue

@@ -931,7 +931,7 @@
         border-radius: 3px;
         &.sendGoods {
           color: #f43938;
-          border: 0.01rem solid #f43938;
+          border: 1px solid #f43938;
         }
         &.cancat {
           height: 0.56rem;

pages/mobile/wechat/index.vue

@@ -72,16 +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://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://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://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://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/provider/shop.vue

@@ -16,7 +16,7 @@ export default {
     return Promise.all([
       store.dispatch('loadBanners', {type: 'factory_banner_carousel'}),
       store.dispatch('provider/loadSalesStore', { isOriginal: true }),
-      store.dispatch('provider/loadNewStores', { types: 'ORIGINAL_FACTORY', value: 5 }),
+      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/loadHotComponents'),

store/provider.js

@@ -74,7 +74,8 @@ export const actions = {
     return axios.get('/api/store-service/stores', {
       params: {
         filter: 'newStore',
-        types: params.types
+        types: params.types,
+        size: params.size
       }
     }).then(response => {
       commit('storeCms/GET_NEW_STORES_SUCCESS', response.data)