From b9fb65756bd1f5c23acec70473f8d84a74494c4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=96=BB=E9=B9=8F?= <1242402566@qq.com>
Date: Wed, 27 May 2020 00:13:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=92=8C=E6=8E=A8?=
 =?UTF-8?q?=E8=8D=90=E4=BA=A7=E5=93=81=E6=A0=B9=E6=8D=AEsk=5Fid=E6=9D=A5?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommodityCard/CommodityCard.vue | 12 ++++++------
 src/pages/cart/cart.vue                        | 13 +++++++------
 src/pages/frameDetail/frameDetail.vue          |  6 ++++--
 src/pages/index/index.vue                      |  1 +
 src/store/modules/read.js                      | 18 +++++++++++++++++-
 5 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/src/components/CommodityCard/CommodityCard.vue b/src/components/CommodityCard/CommodityCard.vue
index 38494b9..bc3738b 100644
--- a/src/components/CommodityCard/CommodityCard.vue
+++ b/src/components/CommodityCard/CommodityCard.vue
@@ -1,7 +1,7 @@
 <template>
   <view
     class="card"
-    @tap="toGoods(goods.id?goods.id:goods.pid)"
+    @tap="toGoods(goods.id?goods.id:goods.pid,goods.sk_id)"
   >
     <image
       mode="widthFix"
@@ -10,9 +10,9 @@
     <view class="name">{{goods.name?goods.name:goods.p_name}}</view>
     <view class="info">
       <view class="priceBox">
-        <view class="price">{{goods.oldPrice !== undefined?goods.oldPrice:goods.old_price}}</view>
+        <view class="price">{{goods.oldPrice !== undefined?goods.oldPrice:goods.real_price}}</view>
         <view class="originCost">
-          {{goods.price !== undefined?goods.price:goods.real_price}}
+          {{goods.price !== undefined?goods.price:goods.old_price}}
         </view>
       </view>
       <view class="trade_num">{{goods.trade_num}}人购买</view>
@@ -46,10 +46,10 @@ export default {
     }
   },
   methods: {
-    toGoods (id) {
-      console.log('---', '../frameDetail/frameDetail?pid=' + id)
+    toGoods (id,sk_id) {
+      console.log('---', '../frameDetail/frameDetail?pid=' + id+'&sk_id='+sk_id)
       uni.navigateTo({
-        url: '../frameDetail/frameDetail?pid=' + id,
+        url: '../frameDetail/frameDetail?pid=' + id+'&sk_id='+sk_id,
         success: res => {},
         fail: () => {},
         complete: () => {}
diff --git a/src/pages/cart/cart.vue b/src/pages/cart/cart.vue
index 1414d54..667d54a 100644
--- a/src/pages/cart/cart.vue
+++ b/src/pages/cart/cart.vue
@@ -28,11 +28,11 @@
 							<image :src="item.img_index_url" mode="aspectFit" style="width: 188rpx;height: 168rpx;"></image>
 						</view> -->
 						<view class="infoRight">
-							<view class="goodName" @tap="toGoods(item.pid)">{{item.p_name}}</view>
+							<view class="goodName" @tap="toGoods(item.pid,item.sk_id)">{{item.p_name}}</view>
 							<!-- <view class="describ"> -->
 								<uni-collapse accordion="true" >
 									<uni-collapse-item showAnimation='true'
-									:title="item.tag.prod_tag_fun[0].label+'/'+item.tag.prod_tag_fun[1].label+'/'+item.tag.prod_tag_fun[2].label+'...'" >
+									:title="item.tag.prod_tag_fun[0].label+'/'+item.tag.prod_tag_fun[1].label+'/'+item.tag.prod_tag_fun[2].label+'...' || '暂无'" >
 										<text class="describ">
 											<block v-for="tag in item.tag.prod_tag_fun" :key="tag.value">
 												{{tag.label+`&nbsp;&nbsp;`}}
@@ -93,7 +93,7 @@ export default {
   computed: {
 
     cartList() {
-      console.log('cart-list', this.$store.state.cart.cartList);
+      // console.log('cart-list', this.$store.state.cart.cartList);
       return this.$store.state.cart.cartList
     },
     childIsOpen() {
@@ -124,10 +124,11 @@ export default {
 
   methods: {
 
-    toGoods(id) {
-	  console.log('---', '../frameDetail/frameDetail?pid=' + id)
+    toGoods(id, sk_id) {
+	  console.log('cart-list', this.$store.state.cart.cartList);
+	  console.log('---', '../frameDetail/frameDetail?pid=' + id +'&sk_id='+sk_id)
 	  uni.navigateTo({
-	    url: '../frameDetail/frameDetail?pid=' + id,
+	    url: '../frameDetail/frameDetail?pid=' + id+'&sk_id='+sk_id,
 	    success: res => {},
 	    fail: () => {},
 	    complete: () => {}
diff --git a/src/pages/frameDetail/frameDetail.vue b/src/pages/frameDetail/frameDetail.vue
index 806393a..b233f2a 100644
--- a/src/pages/frameDetail/frameDetail.vue
+++ b/src/pages/frameDetail/frameDetail.vue
@@ -382,10 +382,12 @@ export default {
       }
     }
   },
-  onLoad: function ({ pid }) {
+  onLoad: function ({ pid,sk_id }) {
     this.pid = pid
+	// console.log('sk_id=====>',sk_id)
     store.dispatch('read/fetch', {
-      pid
+      pid,
+	  sk_id
     }).then(() => {
       this.parameter[0].slength = `${this.goodInfo.frame_width}mm`
       this.parameter[1].slength = `${this.goodInfo.glass_width}mm`
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 41a2e87..c3d1f00 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -126,6 +126,7 @@ export default {
   computed: {
     goodsList () {
       // 也可以从 getters 获取
+	  // console.log('index-list=====>',this.$store.state.index.list)
       return this.$store.state.index.list
     },
     categoryList () {
diff --git a/src/store/modules/read.js b/src/store/modules/read.js
index d54c455..72d1382 100644
--- a/src/store/modules/read.js
+++ b/src/store/modules/read.js
@@ -17,11 +17,27 @@ const mutations = {
 
 const actions = {
   fetch({ commit }, param) {
+	  // 由于购物车和用户推荐的价格要根据sk_id来获取
+	  const arg=Object.assign({},param)
+	  delete param.sk_id
     return new Promise((resolve, reject) => request({
       url: read,
       data: param,
       success: (res) => {
-        commit('INIT', res.data.data)
+		console.log('readParm====>',arg)  
+		console.log('read====>',res.data.data)
+		// 用一个新的对象来接收sk_id找的值
+		const Res=Object.assign({},res.data.data)
+		if(arg.sk_id!=undefined){
+			for (let i = 0; i < res.data.data.skuList.length; i++) {
+				if(res.data.data.skuList[i].sk_id==arg.sk_id){
+					Res.p_sale_price= res.data.data.skuList[i].real_price
+					console.log('陈工了')
+				}
+			}
+		}
+		console.log(Res)
+        commit('INIT', Res)
         resolve()
       },
       fail: (res) => {
-- 
2.0.0