Merge remote-tracking branch 'origin/dev' into dev

components/mobile/Home.vue

@@ -31,13 +31,13 @@
         <div v-swiper:mySwiper="swiperOption">
           <div class="swiper-wrapper">
             <div class="swiper-slide">
-              <img class="home-bg" src="/images/mobile/@2x/applyPurchase/home/app-banner_01.jpg" alt="">
+              <img class="home-bg" src="/images/mobile/@2x/applyPurchase/home/app-banner_03.jpg" alt="">
             </div>
             <div class="swiper-slide">
-              <img class="home-bg" src="/images/mobile/@2x/applyPurchase/home/app-banner_02.jpg" alt="">
+              <img class="home-bg" src="/images/mobile/@2x/applyPurchase/home/app-banner_01.jpg" alt="">
             </div>
             <div class="swiper-slide">
-              <img class="home-bg" src="/images/mobile/@2x/applyPurchase/home/app-banner_03.jpg" alt="">
+              <img class="home-bg" src="/images/mobile/@2x/applyPurchase/home/app-banner_02.jpg" alt="">
             </div>
           </div>
           <div class="swiper-pagination swiper-pagination-bullets"></div>

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:36006/')
+const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://api.usoftmall.com/' : 'http://192.168.253.121:9090/platform-b2c/')
 // 公共询价
 const commonUrl = process.env.COMMON_URL || (isProdMode ? 'https://api-inquiry.usoftmall.com/' : 'http://218.17.158.219:24000/')
 // 公共物料

pages/mobile/center/vendor/material.vue

@@ -517,7 +517,7 @@
         this.MaterielItem = item
         this.$item = this.baseUtils.deepCopy(item)
         this.MaterielItem.minPackQty = (this.MaterielItem.minPackQty === '' || this.MaterielItem.minPackQty === 0) ? 1 : this.MaterielItem.minPackQty
-        this.MaterielItem.packaging = (!this.MaterielItem.packaging && this.MaterielItem.packaging === '') ? this.packObj[0] : this.MaterielItem.packaging
+        this.MaterielItem.packaging = (this.MaterielItem.packaging && this.MaterielItem.packaging !== '') ? this.MaterielItem.packaging : this.packObj[0]
         this.$set(this.MaterielItem, 'IsSave', (item.productAttachSubmit && item.productAttachSubmit.uploadAttach || item.attach) ? true : false) // 规格书是否存在
         this.$set(this.MaterielItem, 'cmpImg', item.cmpImg || '')
         this.$set(this.MaterielItem, 'Regulpic', (item.productAttachSubmit && item.productAttachSubmit.uploadAttach) || item.attach || '')