Merge remote-tracking branch 'origin/master'

components/product/component/StoreInfo.vue

@@ -42,7 +42,7 @@
             <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="150">操作</th>
+            <th class="text-center" width="140">操作</th>
           </tr>
         </thead>
         <tbody class="text-center">
@@ -79,7 +79,7 @@
                   <span>—</span>
                 </div>
                 <div v-for="price in list.prices">
-                  <span>{{price.uSDPrice}}</span>
+                  <span>{{price.uSDPrice | currency}}</span>
                 </div>
               </a>
             </td>
@@ -89,7 +89,7 @@
                   <span>—</span>
                 </div>
                 <div v-for="price in list.prices">
-                  <span>{{price.rMBPrice}}</span>
+                  <span>{{price.rMBPrice | currency}}</span>
                 </div>
               </a>
             </td>
@@ -117,6 +117,16 @@
 <script>
   export default {
     name: 'StoreInfo',
+    filters: {
+      currency: function (num) {
+        if (typeof num === 'number') {
+          if (num.toString().indexOf('.') === -1) {
+            num += '.00'
+          }
+        }
+        return num
+      }
+    },
     computed: {
       stores () {
         return this.$store.state.componentStore.store

components/store/CommodityInfo.vue

@@ -75,7 +75,7 @@
               <span class="money">
                  <span v-if="fragment.currency == 'RMB'">￥</span>
                  <span v-if="fragment.currency == 'USD'">$</span>
-                 <span v-text="calculate || 0"></span>
+                 <span>{{(calculate || 0) | currency('', 2)}}</span>
               </span>
             </div>
             <div class="button" ng-controller="GoodsPickUpCtrl">
@@ -98,7 +98,7 @@
                       <span v-text="price.start"></span>+
                     </div>
                     <div class="price">
-                      <span v-if="price.rMBPrice" v-text="price.rMBPrice ||0"></span>
+                      <span v-if="price.rMBPrice" v-text="price.rMBPrice || 0"></span>
                     </div>
                     <div class="price">
                       <span v-if="price.uSDPrice" v-text="price.uSDPrice || 0"></span>
@@ -174,7 +174,7 @@ export default {
     },
     calculate () {
       this.fragment.total = this.fragment.price * this.fragment.num
-      return this.fragment.total
+      return Math.ceil(this.fragment.total * Math.pow(10, 2)) / Math.pow(10, 2)
     }
   },
   methods: {

nuxt.config.js

@@ -95,6 +95,9 @@ module.exports = {
     ssr: false
   }, {
     src: '~plugins/element-ui.js'
+  }, {
+    src: '~plugins/filters.js',
+    ssr: false
   }],
   proxyTable: ['/api/**', '/search/**', '/user/**', '/login/**', '/logout/**']
 }

package.json

@@ -15,7 +15,8 @@
     "http-proxy-middleware": "^0.17.4",
     "iview": "^2.0.0-rc.19",
     "nuxt": "0.10.6",
-    "vue-awesome-swiper": "^2.5.4"
+    "vue-awesome-swiper": "^2.5.4",
+    "vue2-filters": "^0.1.9"
   },
   "scripts": {
     "dev": "nodemon --exec node server.js",

plugins/filters.js

@@ -0,0 +1,4 @@
+import Vue from 'vue'
+import Vue2Filters from 'vue2-filters'
+
+Vue.use(Vue2Filters)

store/index.js

@@ -236,6 +236,16 @@ export const actions = {
         commit('brandComponent/GET_COMPONENT_FAILURE', err)
       })
   },
+  // 获取品牌详情分页信息
+  loadBrandPages ({commit}, params = {}) {
+    commit('brandPages/REQUEST_PAGES', params)
+    return axios.get('/api/product/PAGES/list', { params })
+      .then(response => {
+        commit('brandPages/GET__SUCCESS', response.data)
+      }, err => {
+        commit('brandPages/GET_COMPONENT_FAILURE', err)
+      })
+  },
   // 获取帮助中心信息
   loadHelpSnapsho ({ commit }, params = {}) {
     commit('help/REQUEST_SNAPSHO')

yarn.lock

@@ -4965,6 +4965,10 @@ vue-template-es2015-compiler@^1.2.2:
   version "1.5.3"
   resolved "http://registry.npm.taobao.org/vue-template-es2015-compiler/download/vue-template-es2015-compiler-1.5.3.tgz#22787de4e37ebd9339b74223bc467d1adee30545"
 
+vue2-filters@^0.1.9:
+  version "0.1.9"
+  resolved "http://registry.npm.taobao.org/vue2-filters/download/vue2-filters-0.1.9.tgz#3fc9e78e5744efff03223cff0e395907bb6b41ed"
+
 vue@^2.2.6:
   version "2.4.1"
   resolved "http://registry.npm.taobao.org/vue/download/vue-2.4.1.tgz#76e0b8eee614613532216b7bfe784e0b5695b160"