Home Explore Help
Register Sign In
usoft
/
mall-web-ssr
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' into dev

# Conflicts:
#	app.html
#	components/mobile/Home.vue
#	nuxt.config.js
#	pages/mobile/center/vendor/material.vue
yangc 7 years ago
parent
a5374834d5 1827ebbd48
commit
06eace0995
4 changed files with 10 additions and 10 deletions
Split View Show Diff Stats
  1. 5 5
      app.html
  2. 3 3
      components/mobile/Home.vue
  3. 1 1
      nuxt.config.js
  4. 1 1
      pages/mobile/center/vendor/material.vue

+ 5 - 5
app.html
View File 

@@ -2,12 +2,12 @@
 
 <html {{ HTML_ATTRS }}>
 
 
 <head>
 
-  <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" />
 
-  <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css" />
 
-  <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/element-ui/1.3.7/theme-default/index.css" />
 
+  <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" />
 
+  <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
 
+  <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/element-ui/1.3.7/theme-default/index.css" />
 
   <!--<link rel="stylesheet" type="text/css" href="https://at.alicdn.com/t/font_0d1jjt5tukcblnmi.css"/>-->
 
   <link rel="stylesheet" type="text/css" href="https://at.alicdn.com/t/font_452262_7ji4kygow4.css">
 
-  <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/Swiper/3.4.2/css/swiper.css" />
 
+  <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/Swiper/3.4.2/css/swiper.min.css" />
 
   <!--<script src="https://wechatfe.github.io/vconsole/lib/vconsole.min.js?v=3.2.0"></script>-->
 
   {{ HEAD }}
 
   <script>
 
@@ -31,7 +31,7 @@
 
       }
 
       // cnzz
 
       var hm = d.createElement("script");
 
-      hm.src = "https://hm.baidu.com/hm.js?5701b143e26c91522f816effc41f5df0;"
 
+      hm.src = "https://hm.baidu.com/hm.js?5701b143e26c91522f816effc41f5df0";
 
       var s = d.getElementsByTagName("script")[0];
 
       s.parentNode.insertBefore(hm, s);
 
       var cnzz_protocol = (("https" === w.location.protocol.split(':')[0]) ? " https://" : " http://");

+ 3 - 3
components/mobile/Home.vue
View File 

@@ -30,9 +30,9 @@
 
         </div>
 
         <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_03.jpg" alt="">-->
 
-            <!--</div>-->
 
+            <!--<div class="swiper-slide">
 
+              <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_01.jpg" alt="">
 
             </div>

+ 1 - 1
nuxt.config.js
View File 

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

+ 1 - 1
pages/mobile/center/vendor/material.vue
View File 

@@ -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.MaterielItem.packaging : this.packObj[0]
 
+        this.MaterielItem.packaging = (!this.MaterielItem.packaging && this.MaterielItem.packaging === '') ? this.packObj[0] : this.MaterielItem.packaging
 
         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 || '')