Merge remote-tracking branch 'origin/master'

components/default/RightBar.vue

@@ -3,10 +3,10 @@
     <div class="right-bar">
       <ul class="right-bar-center">
         <li class="right-bar-item">
-          <a href="user#/cart" class="title" target="_blank">
+          <a href="/user#/cart" class="title" target="_blank">
             <i class="iconfont icon-shopping-cart icon-xlg"></i>
           </a>
-          <div class="sidebar-menu"><a href="user#/cart" title="我的购物车" target="_blank">我的购物车<em><span>(<span v-text="cartCount.count || 0"></span>)</span></em></a></div>
+          <div class="sidebar-menu"><a href="/user#/cart" title="我的购物车" target="_blank">我的购物车<em><span>(<span v-text="cartCount.count || 0"></span>)</span></em></a></div>
         </li>
         <li class="right-bar-item">
           <el-button type="text" @click="dialogVisible = true">
@@ -34,8 +34,8 @@
           <a href="http://www.usoftmall.com/user#/browsingHistory" class="title" target="_blank">
             <i class="iconfont icon-zuji icon-xlg"></i>
           </a>
-          <div class="sidebar-menu" v-if="!user.logged"><a href="user#/browsingHistory" title="浏览记录" target="_blank">浏览记录</a></div>
-          <div class="sidebar-menu" v-if="user.logged && listMe(history).length == 0"><a href="user#/browsingHistory" title="浏览记录" target="_blank">浏览记录</a></div>
+          <div class="sidebar-menu" v-if="!user.logged"><a href="/user#/browsingHistory" title="浏览记录" target="_blank">浏览记录</a></div>
+          <div class="sidebar-menu" v-if="user.logged && listMe(history).length == 0"><a href="/user#/browsingHistory" title="浏览记录" target="_blank">浏览记录</a></div>
           <div class="foot-record sidebar-menu" v-if="user.logged && listMe(history).length > 0">
             <h3><a href="">浏览历史</a></h3>
             <dl>

components/messageBoard/MessageBoard.vue

@@ -139,8 +139,8 @@
   </div>
 </template>
 <script>
-  import ImageUpload from '~components/common/image-upload/ImageUpload.vue'
-  import PageComponent from '~components/common/page/PageComponent.vue'
+  import ImageUpload from '~components/common/image-upload/imageUpload.vue'
+  import PageComponent from '~components/common/page/pageComponent.vue'
   export default {
     name: 'messageBoard',
     data () {

components/product/ComponentGoods.vue

@@ -112,7 +112,7 @@
 </template>
 
 <script>
-  import Buy from '~components/common/buyOrCar/BuyComponent.vue'
+  import Buy from '~components/common/buyOrCar/buyComponent.vue'
   export default {
     layout: 'mian',
     props: ['brandid', 'propertyJSON'],

components/product/component/StoreInfo.vue

@@ -41,7 +41,7 @@
             <th class="text-center" width="80">数量</th>
             <th class="text-center" width="100">香港交货<span style="font-size: 12px;">($)</span></th>
             <th class="text-center" width="130">大陆交货<span style="font-size: 12px;">(￥)</span></th>
-            <th class="text-center" width="120">交期</span></th>
+            <th class="text-center" width="120">交期<span style="font-size: 12px;">(天)</span></th>
             <th class="text-center" width="140">操作</th>
           </tr>
         </thead>
@@ -114,7 +114,7 @@
   </div>
 </template>
 <script>
-  import Buy from '~components/common/buyOrCar/BuyComponent.vue'
+  import Buy from '~components/common/buyOrCar/buyComponent.vue'
   export default {
     name: 'StoreInfo',
     data () {
@@ -149,7 +149,7 @@
         if (storeList.storeid && storeList.storeid !== '') {
           this.storeIds = storeList.storeid
         }
-        this.storeId
+       // this.storeId
         if (this.storeIds.length > 0) {
           if (this.storeIds.indexOf(this.storeId) === -1) {
             this.storeExist = true

components/search/GoodList.vue

@@ -142,7 +142,7 @@
 
 <script>
   import Page from '~components/common/page/pageComponent.vue'
-  import Buy from '~components/common/buyOrCar/BuyComponent.vue'
+  import Buy from '~components/common/buyOrCar/buyComponent.vue'
   export default {
     data () {
       return {

components/store/CommodityList.vue

@@ -135,7 +135,7 @@ function getAllLeafIds (kind) {
     return ids.join('-')
   }
 }
-import Buy from '~components/common/buyOrCar/BuyComponent.vue'
+import Buy from '~components/common/buyOrCar/buyComponent.vue'
 export default {
   name: 'commodity-list',
   props: ['kinds'],

components/store/RecommendProduct.vue

@@ -27,7 +27,7 @@
   </div>
 </template>
 <script>
-  import Buy from '~components/common/buyOrCar/BuyComponent.vue'
+  import Buy from '~components/common/buyOrCar/buyComponent.vue'
   import axios from '~/plugins/axios'
   import {Message} from 'element-ui'
   export default {

pages/messageBoard/messageBoard.vue

@@ -1,42 +0,0 @@
-<!--
-<template>
-  <div class="message">
-    <message-board @pageEvent="listenPage"/>
-  </div>
-</template>
-<script>
-  import MessageBoard from '~components/messageBoard/MessageBoard.vue'
-  export default {
-    components: {
-      MessageBoard
-    },
-    data () {
-      return {
-        page: 1,
-        count: 3,
-        currentPage: 1
-      }
-    },
-    fetch ({ store }) {
-      return Promise.all([
-        store.dispatch('userIsLogin'),
-        store.dispatch('getMessageBoardInformation', {page: 1, count: 3})
-      ])
-    },
-    methods: {
-      listenPage: function (p) {
-        this.page = p
-        this.$store.dispatch('getMessageBoardInformation', {page: this.page, count: 3})
-      }
-    }
-  }
-</script>
-<style  scoped>
- .message .el-dialog__header {
-    display: none;
-  }
- .message .el-dialog__body {
-   padding: 0;
- }
-</style>
--->