Browse Source

1.公共组件buyComponent添加storeId和storeid字段判断。
2.解决个人账户登陆Header.vue文件报错问题。

yangc 8 years ago
parent
commit
75b4d78064
3 changed files with 6 additions and 6 deletions
  1. 4 4
      components/common/buyOrCar/buyComponent.vue
  2. 1 1
      components/default/Header.vue
  3. 1 1
      nuxt.config.js

+ 4 - 4
components/common/buyOrCar/buyComponent.vue

@@ -23,8 +23,8 @@
                 uuid: this.item.uuid,
                 batchCode: this.item.batchCode,
                 number: this.item.minBuyQty,
-                storeid: this.item.storeid,
-                storeUuid: this.item.storeid,
+                storeid: this.item.storeid ? this.item.storeid : this.item.storeId,
+                storeUuid: this.item.storeid ? this.item.storeid : this.item.storeId,
                 currencyName: this.item.currencyName,
                 minPackQty: this.item.minPackQty
               }])
@@ -59,8 +59,8 @@
                 uuid: this.item.uuid,
                 batchCode: this.item.batchCode,
                 number: this.item.minBuyQty,
-                storeid: this.item.storeid,
-                storeUuid: this.item.storeid,
+                storeid: this.item.storeid ? this.item.storeid : this.item.storeId,
+                storeUuid: this.item.storeid ? this.item.storeid : this.item.storeId,
                 currencyName: this.item.currencyName,
                 minPackQty: this.item.minPackQty
               })

+ 1 - 1
components/default/Header.vue

@@ -17,7 +17,7 @@
               <ul class="dropdown-menu">
                 <li class="menu-item-first">
                   <span>{{ enterprise.enName }}</span>
-                  <a class="pull-right" @click="toggleEnterprises()" v-if="user.data.enterprises.length > 1">
+                  <a class="pull-right" @click="toggleEnterprises()" v-if="user.data.enterprises && user.data.enterprises.length > 1">
                     {{ showEnterprises ? '取消' : '切换' }}
                   </a>
                 </li>

+ 1 - 1
nuxt.config.js

@@ -1,6 +1,6 @@
 const path = require('path')
 const isProdMode = Object.is(process.env.NODE_ENV, 'production')
-const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://www.usoftmall.com/' : 'http://192.168.253.60:9090/platform-b2c/')
+const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://www.usoftmall.com/' : 'http://192.168.253.123:8080')
 
 module.exports = {
   router: {