From cf9f9fb7dd9f4c9b188a8247d2b0dfe12f5cc6a9 Mon Sep 17 00:00:00 2001
From: Yer11214 <17633066053@163.com>
Date: Sat, 26 Aug 2023 13:48:04 +0800
Subject: [PATCH] =?UTF-8?q?style:=20:lipstick:=20PC=E7=AB=AF=E6=94=B6?=
 =?UTF-8?q?=E8=97=8F=E5=95=86=E5=93=81=E4=B8=AD=E6=94=B6=E8=97=8F=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E6=B7=BB=E5=8A=A0=E8=B7=B3=E8=BD=AC=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/home/memberCenter/Favorites.vue | 91 ++++++++++++-------
 1 file changed, 57 insertions(+), 34 deletions(-)

diff --git a/buyer/src/pages/home/memberCenter/Favorites.vue b/buyer/src/pages/home/memberCenter/Favorites.vue
index 6bb32f75..ccddf03a 100644
--- a/buyer/src/pages/home/memberCenter/Favorites.vue
+++ b/buyer/src/pages/home/memberCenter/Favorites.vue
@@ -1,9 +1,10 @@
 <template>
   <div class="wrapper">
-    <card _Title="近期收藏" :_Tabs="favoriteWay" @_Change="change" :_Size="16" v-if="!homePage"/>
-    <card _Title="近期收藏" :_Size="16" :_Tabs="favoriteWay" @_Change="change" _More="全部收藏" _Src="/home/Favorites" v-else></card>
+    <card _Title="近期收藏" :_Tabs="favoriteWay" @_Change="change" :_Size="16" v-if="!homePage" />
+    <card _Title="近期收藏" :_Size="16" :_Tabs="favoriteWay" @_Change="change" _More="全部收藏" _Src="/home/Favorites" v-else>
+    </card>
     <div v-if="list.length">
-      <template v-for="(item) in list">
+      <div v-for="(item, index) in list" :key="index">
         <div class="goodsItem" :key="item.skuId">
           <div class="goodsImg hover-pointer" v-if="params.type === 'GOODS'">
             <img :src="item.image" />
@@ -11,24 +12,26 @@
           <div class="goodsImg hover-pointer" v-else>
             <img :src="item.storeLogo" />
           </div>
-          <div class="goodsTitle hover-color" v-if="params.type === 'GOODS'" @click="buynow(item.skuId, item.goodsId)">
-            {{item.goodsName}}
+          <div class="goodsTitle hover-color" v-if="params.type === 'GOODS'" @click="buynow(item.skuId, item.goodsId,item.id)">
+            {{ item.goodsName }}
           </div>
-          <div v-else class="goodsTitle hover-pointer">
-            {{item.storeName}}
+          <div v-else class="goodsTitle  hover-pointer" @click="buynow(item.skuId, item.goodsId,item.id)" >
+            {{ item.storeName }}
+            <Tag color="error" class="operated" v-if="item.selfOperated">商家自营</Tag>
           </div>
           <div class="goodsPrice">
-            <span v-if="params.type === 'GOODS'">{{item.price | unitPrice('￥')}}</span>
-            <Tag color="error" v-if="item.selfOperated">商家自营</Tag>
+            <span v-if="params.type === 'GOODS'">{{ item.price | unitPrice('￥') }}</span>
+
           </div>
           <div class="goodsBuy">
-            <Button size="small" type="primary" @click="buynow(item.skuId, item.goodsId)" v-if="params.type === 'GOODS'">立即购买</Button>
+            <Button size="small" type="primary" @click="buynow(item.skuId, item.goodsId)"
+              v-if="params.type === 'GOODS'">立即购买</Button>
             <Button size="small" type="primary" @click="goShop(item.id)" v-else>店铺购买</Button>
             <Button size="small" v-if="params.type === 'GOODS'" @click="cancel(item.skuId)">取消收藏</Button>
             <Button size="small" v-if="params.type === 'STORE'" @click="cancelStore(item.id)">取消收藏</Button>
           </div>
         </div>
-      </template>
+      </div>
       <Spin size="large" fix v-if="spinShow"></Spin>
     </div>
     <empty v-else />
@@ -36,7 +39,7 @@
 </template>
 
 <script>
-import { collectList, cancelCollect,storeCollectList,cancelStoreCollect} from '@/api/member.js'
+import { collectList, cancelCollect, storeCollectList, cancelStoreCollect } from '@/api/member.js'
 export default {
   name: 'Favorites',
   props: {
@@ -45,7 +48,7 @@ export default {
       default: false
     }
   },
-  data () {
+  data() {
     return {
       favoriteWay: ['收藏商品', '收藏店铺'], // 收藏分类
       list: [], // 收藏列表
@@ -60,25 +63,25 @@ export default {
   },
 
   methods: {
-    getList () { // 获取收藏列表
+    getList() { // 获取收藏列表
       this.spinShow = true
       collectList(this.params).then(res => {
         this.spinShow = false
         if (res.success) this.list = res.result.records;
       })
     },
-    getStoreList () { // 获取收藏列表
+    getStoreList() { // 获取收藏列表
       this.spinShow = true
       storeCollectList(this.params).then(res => {
         this.spinShow = false
         if (res.success) this.list = res.result.records;
       })
     },
-    change (index) { // tab栏切换
-      if (index === 0) { this.params.type = 'GOODS',this.getList()}
-      if (index === 1) { this.params.type = 'STORE',this.getStoreList()}
+    change(index) { // tab栏切换
+      if (index === 0) { this.params.type = 'GOODS', this.getList() }
+      if (index === 1) { this.params.type = 'STORE', this.getStoreList() }
     },
-    cancel (id) { // 取消收藏
+    cancel(id) { // 取消收藏
       let typeName = this.params.type === 'GOODS' ? '商品' : '店铺'
       this.$Modal.confirm({
         title: 'Title',
@@ -92,7 +95,7 @@ export default {
         }
       });
     },
-    cancelStore (id) { // 取消收藏
+    cancelStore(id) { // 取消收藏
       let typeName = this.params.type === 'GOODS' ? '商品' : '店铺'
       this.$Modal.confirm({
         title: 'Title',
@@ -106,22 +109,33 @@ export default {
         }
       });
     },
-    buynow (skuId, goodsId) { // 跳转详情
-      let url = this.$router.resolve({
-        path: '/goodsDetail',
-        query: {skuId, goodsId}
-      })
+    buynow(skuId, goodsId,storeId) { // 跳转详情
+      console.log(this.params.type)
+      let url
+      if (this.params.type === 'STORE') {
+        url = this.$router.resolve({
+          path: '/Merchant',
+          query: { 'id': storeId }
+        })
+      } else {
+        url = this.$router.resolve({
+          path: '/goodsDetail',
+          query: { skuId, goodsId }
+        })
+
+      }
       window.open(url.href, '_blank')
+
     },
-    goShop (id) { // 跳转店铺页面
+    goShop(id) { // 跳转店铺页面
       let url = this.$router.resolve({
         path: '/merchant',
-        query: {id}
+        query: { id }
       })
       window.open(url.href, '_blank')
     }
   },
-  mounted () {
+  mounted() {
     if (this.homePage) this.params.pageSize = 5;
     this.getList()
 
@@ -137,46 +151,55 @@ export default {
 .goodsTitle {
   margin: 0 6px;
 }
+
+.operated {
+  margin-left: 10px;
+}
+
 .wrapper {
   margin-bottom: 40px;
 }
+
 .goodsItem {
   display: flex;
   height: 60px;
   line-height: 60px;
   margin-bottom: 10px;
 
-  > .goodsImg {
+  >.goodsImg {
     width: 60px;
     height: 60px;
     overflow: hidden;
 
-    > img {
+    >img {
       width: 100%;
       height: 100%;
     }
   }
 
-  > .goodsPrice,
+  >.goodsPrice,
   .goodsShop {
     width: 150px;
     text-align: center;
   }
 
-  > .goodsTitle {
+  >.goodsTitle {
     width: 400px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
   }
 }
+
 .goodsBuy {
   margin-left: 80px;
-  >*{
+
+  >* {
     margin: 0 4px;
   }
 }
-.page-size{
+
+.page-size {
   text-align: right;
 }
 </style>