Merge branch 'feature-201831-wangcz'

# Conflicts:
#	nuxt.config.js
#	pages/mobile/center/vendor/material.vue

components/btbBusiness/service.vue

@@ -32,32 +32,32 @@
             imgUrl: '/images/btbBusiness/customer0.png',
             englishName: 'customer service',
             chinaName: '客户服务',
-            enterUrl: 'http://uas.ubtob.com/serve'
+            enterUrl: 'http://b2b.usoftchina.com/serve'
           }, {
             imgUrl: '/images/btbBusiness/procurement0.png',
             englishName: 'Procurement management',
             chinaName: '采购管理',
-            enterUrl: 'http://uas.ubtob.com/#/purc/order'
+            enterUrl: 'http://b2b.usoftchina.com/#/purc/order'
           }, {
             imgUrl: '/images/btbBusiness/sales0.png',
             englishName: 'Sales management',
             chinaName: '销售管理',
-            enterUrl: 'http://uas.ubtob.com/#/sale/order'
+            enterUrl: 'http://b2b.usoftchina.com/#/sale/order'
           }, {
             imgUrl: '/images/btbBusiness/subcontract0.png',
             englishName: 'subcontract',
             chinaName: '委外加工',
-            enterUrl: 'http://uas.ubtob.com/#/sale/maketodo/makeorder'
+            enterUrl: 'http://b2b.usoftchina.com/#/sale/maketodo/makeorder'
           }, {
             imgUrl: '/images/btbBusiness/quality0.png',
             englishName: 'Quality Control',
             chinaName: '品质管理',
-            enterUrl: 'http://uas.ubtob.com/#/sale/MRB'
+            enterUrl: 'http://b2b.usoftchina.com/#/sale/MRB'
           }, {
             imgUrl: '/images/btbBusiness/financial0.png',
             englishName: 'Financial docking',
             chinaName: '财务对接',
-            enterUrl: 'http://uas.ubtob.com/#/fa/apBill'
+            enterUrl: 'http://b2b.usoftchina.com/#/fa/apBill'
           }]
       }
     },

components/default/Header.vue

@@ -9,7 +9,7 @@
     <nav class="navbar">
       <div class="navbar-container container">
         <div class="navbar-header">
-          <a href="http://www.ubtob.com" class="item navbar-link">
+          <a href="http://www.usoftchina.com" class="item navbar-link">
             <img src="/images/logo/uas.png" class="navbar-logo">
             <span class="navbar-slogan">进入优软云</span>
           </a>

nuxt.config.js

@@ -1,11 +1,11 @@
 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.usoftmall.com/' : 'http://218.17.158.219:24000/')
+const commonUrl = process.env.COMMON_URL || (isProdMode ? 'https://api-inquiry.usoftchina.com/' : 'http://218.17.158.219:24000/')
 // 公共物料
-const materialUrl = process.env.MATERIAL_URL || (isProdMode ? 'https://api-product.usoftmall.com/' : 'http://218.17.158.219:24000/')
+const materialUrl = process.env.MATERIAL_URL || (isProdMode ? 'https://api-product.usoftchina.com/' : 'http://218.17.158.219:24000/')
 // 公共cms
 const cmsUrl = process.env.CMS_URL || (isProdMode ? 'http://cms.usoftchina.com' : 'http://cms.usoftchina.com')
 // 消息

pages/help/helpDetail/_id.vue

@@ -7,7 +7,7 @@
         <div class="left">
           <left></left>
         </div>
-        <div class="right">
+        <div class="right ql-editor">
           <div class="help-center">
             <div class="help-head">
               <nuxt-link to="/help/home"><img src="/images/help/help-title.png"></nuxt-link>

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.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 || '')