修改产品推荐和店铺批次详情

components/store/CommodityInfo.vue

@@ -116,6 +116,9 @@
 <script>
 
 function initFragment (commodity) {
+  if (!commodity) {
+    return {}
+  }
   let fragment = {}
   let prices = commodity.prices[0]
   fragment.num = commodity.minBuyQty

components/store/RecommendProduct.vue

@@ -2,23 +2,23 @@
   <div id="recommend-fragment" v-if="commodities && commodities.length > 0">
     <div class="recommend-list">
       <ul>
-        <li ng-repeat="commodity in commodities">
-          <div class="img"><a href="javascript:void(0);"><img ng-src="commodity.comImg"/></a></div>
+        <li v-for="commodity in commodities">
+          <div class="img"><a href="javascript:void(0);"><img :src="commodity.comImg || '/images/store/common/default.png'"/></a></div>
           <div class="content">
-            <p ng-bind="commodity.comCode">MRFE6S9045NF001</p>
-            <p class="color666" ng-bind="commodity.brandNameCn">PANFAEFQ</p>
-            <p class="price" ng-if="commodity.minPriceRMB">¥ commodity.minPriceRMB</p>
-            <p class="price" ng-if="!commodity.minPriceRMB">$ commodity.minPriceUSD || 0</p>
+            <p v-text="commodity.comCode">MRFE6S9045NF001</p>
+            <p class="color666" v-text="commodity.brandNameCn">PANFAEFQ</p>
+            <p class="price" v-if="commodity.minPriceRMB">¥ {{commodity.minPriceRMB}}</p>
+            <p class="price" v-if="!commodity.minPriceRMB">$ {{commodity.minPriceUSD || 0}}</p>
           </div>
-          <div class="hover-show" ng-href="commodity.batchCode ? 'store/' + storeInfo.uuid + '#/batchInfo/' + commodity.batchCode : ''">
-            <a ng-href="commodity.batchCode ? 'store/' + storeInfo.uuid + '#/batchInfo/' + commodity.batchCode : ''" class="href">
-              <div class="title" ng-bind="commodity.comCode">MRFE6S9045NF001</div>
-              <div class="type" ng-bind="commodity.brandNameCn">PANFAEFQ</div>
+          <div class="hover-show" :href="commodity.batchCode ? '/store/' + storeInfo.uuid + '/' + commodity.batchCode : '#'">
+            <a :href="commodity.batchCode ? '/store/' + storeInfo.uuid + '/' + commodity.batchCode : '#'" class="href">
+              <div class="title" v-text="commodity.comCode">MRFE6S9045NF001</div>
+              <div class="type" v-text="commodity.brandNameCn">PANFAEFQ</div>
               <div class="hr"><span>抢购价</span></div>
-              <div class="price" ng-if="commodity.minPriceRMB">¥ commodity.minPriceRMB</div>
-              <div class="price" ng-if="!commodity.minPriceRMB">$ commodity.minPriceUSD || 0</div>
+              <div class="price" v-if="commodity.minPriceRMB">¥ {{commodity.minPriceRMB}}</div>
+              <div class="price" v-if="!commodity.minPriceRMB">$ {{commodity.minPriceUSD || 0}}</div>
             </a>
-            <div class="by-cart"><button title="加入购物车" ng-click="addToCart(commodity, false, commodity.minBuyQty, commodity.currency)"><img src="static/img/icon/cart-blue.png"/></button></div>
+            <div class="by-cart"><button title="加入购物车" ng-click="addToCart(commodity, false, commodity.minBuyQty, commodity.currency)"><img src="/images/store/icon/cart-blue.png"/></button></div>
             <div class="buy-now"><button title="立即购买" ng-click="addToCart(commodity, true, commodity.minBuyQty, commodity.currency)">立即购买</button></div>
           </div>
         </li>
@@ -33,6 +33,9 @@ export default {
   computed: {
     commodities () {
       return this.$store.state.shop.recommend.products.data
+    },
+    storeInfo () {
+      return this.$store.state.shop.storeInfo.store.data
     }
   }
 }

store/shop.js

@@ -31,9 +31,9 @@ export const actions = {
   findRecommendProducts ({ commit }, params = {}) {
     params.condition = 'store_uuid'
     commit('recommend/REQUEST_PRODUCTS')
-    return axios.get('/api/recommend/products', { params })
+    return axios.get('/api/store/recommend/products', { params })
       .then(response => {
-        commit('recommend/GET_PRODUCTS_SUCCESS', response.data)
+        commit('recommend/GET_PRODUCTS_SUCCESS', response.data ? JSON.parse(response.data) : [])
       }, err => {
         commit('recommend/GET_PRODUCTS_FAILURE', err)
       })
@@ -42,7 +42,6 @@ export const actions = {
     let params = { storeid: uuid, origin: 'store', code: code }
     params.page = pageParams.page
     params.count = pageParams.count
-    console.log(1)
     commit('storeInfo/REQUEST_STORE_COMMODITY')
     return axios.get('/api/commodity/commodities', { params })
       .then(response => {