From aa196918bf75cd660d3cfc0f613cc27625e03abd Mon Sep 17 00:00:00 2001
From: Chopper711 <1814994716@qq.com>
Date: Fri, 31 Mar 2023 07:23:51 +0000
Subject: [PATCH 1/2] update README.md.

Signed-off-by: Chopper711 <1814994716@qq.com>
---
 README.md | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 62fda1fb..a94031b2 100644
--- a/README.md
+++ b/README.md
@@ -9,11 +9,12 @@
 ##### 交流 qq 1群 961316482（已满）
 ##### 交流 qq 2群 875294241（已满）
 ##### 交流 qq 3群 263785057（已满）
-##### 交流 qq 4群 674617534
+##### 交流 qq 4群 674617534 (已满)
+##### 交流 qq 5群 594675235 
 
 ##### 体验 公众号/小程序/APP 体验，扫描二维码
 
-![image-20210511171611793](https://pickmall.cn/assets/imgs/h5-qrcode.png)
+![image-20210511171611793](https://static.pickmall.cn/images/h5-qrcode.png)
 
 [![star](https://gitee.com/beijing_hongye_huicheng/lilishop/badge/star.svg?theme=dark)](https://gitee.com/beijing_hongye_huicheng/lilishop/stargazers)
 &nbsp;&nbsp;![github](https://img.shields.io/github/stars/hongyehuicheng/lilishop.svg?style=social&logo=#181717)
@@ -55,7 +56,7 @@ PS：手机验证码为 ‘111111’
 
 **商城 小程序/公众号/APP**：扫描二维码
 
-![image-20210511171611793](https://pickmall.cn/assets/imgs/h5-qrcode.png)
+![image-20210511171611793](https://static.pickmall.cn/images/h5-qrcode.png)
 
 ### 快速本地部署
 
@@ -74,24 +75,24 @@ PS：手机验证码为 ‘111111’
 
 #### 平台管理端功能
 
-![平台管理端功能](https://pickmall.cn/assets/imgs/other/managerList1.jpg)
+![平台管理端功能](https://static.pickmall.cn/images/other/managerList1.jpg)
 
 
 
 #### 卖家功能
 
-![商家端功能](https://pickmall.cn/assets/imgs/other/storeList.jpg)
+![商家端功能](https://static.pickmall.cn/images/other/storeList.jpg)
 
 
 ### 商城前端功能展示
 
 #### 商城移动端
 
-<img src="https://pickmall.cn/assets/imgs/other/app.gif" alt="移动端功能展示" style="zoom:50%;" />
+<img src="https://static.pickmall.cn/images/other/app.gif" alt="移动端功能展示" style="zoom:50%;" />
 
 #### 平台管理端
 
-![管理端功能展示](https://pickmall.cn/assets/imgs/other/manager.gif)
+![管理端功能展示](https://static.pickmall.cn/images/other/manager.gif)
 
 
 ### 技术选型
@@ -164,4 +165,12 @@ PS：手机验证码为 ‘111111’
 ##### 交流 qq 1群 961316482（已满）
 ##### 交流 qq 2群 875294241（已满）
 ##### 交流 qq 3群 263785057（已满）
-##### 交流 qq 4群 674617534
+##### 交流 qq 4群 674617534（已满）
+##### 交流 qq 5群 594675235 
+
+### 附录
+有人有自己的学习视频、学习记录文档、希望宣传关联开源项目等均可以私聊仓库所有者。
+
+类似：
+
+清晨敲代码同学的分析: https://blog.csdn.net/vaevaevae233/category_12103567.html
\ No newline at end of file

From 2f6e50cc1c0a951610667c58d19aec79ce6e7add Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Fri, 31 Mar 2023 17:14:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E9=80=82=E9=85=8D=E6=96=B0=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=95=86=E5=93=81=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/GoodsList.vue | 28 +++++++++------------
 buyer/src/pages/Merchant.vue  | 47 +++++++++++++++++------------------
 2 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue
index 0d454c22..15e1cc15 100644
--- a/buyer/src/pages/GoodsList.vue
+++ b/buyer/src/pages/GoodsList.vue
@@ -49,35 +49,35 @@
               class="goods-show-info"
               v-for="(item, index) in goodsList"
               :key="index"
-              @click="goGoodsDetail(item.id, item.content.goodsId)"
+              @click="goGoodsDetail(item.id, item.goodsId)"
             >
               <div class="goods-show-img">
-                <img width="220" height="220" :src="item.content.thumbnail" />
+                <img width="220" height="220" :src="item.thumbnail" />
               </div>
               <div class="goods-show-price">
                 <span>
                   <span class="seckill-price text-danger">{{
-                    item.content.price | unitPrice("￥")
+                    item.price | unitPrice("￥")
                   }}</span>
                 </span>
               </div>
               <div class="goods-show-detail">
                 <Tag
-                  v-if="item.content.salesModel === 'WHOLESALE'"
+                  v-if="item.salesModel === 'WHOLESALE'"
                   class="goods-show-tag"
                   color="purple"
                 >
                   批发
                 </Tag>
-                <span>{{ item.content.goodsName }}</span>
+                <span>{{ item.goodsName }}</span>
               </div>
               <div class="goods-show-num">
-                已有<span>{{ item.content.commentNum || 0 }}</span
+                已有<span>{{ item.commentNum || 0 }}</span
                 >人评价
               </div>
               <div class="goods-show-seller">
                 <span class="text-bottom" style="color: #e4393c">{{
-                  item.content.storeName
+                  item.storeName
                 }}</span>
               </div>
 
@@ -85,21 +85,21 @@
                 <Tag
                   class="goods-show-tag"
                   color="red"
-                  v-if="item.content.selfOperated"
+                  v-if="item.selfOperated"
                 >
                   自营
                 </Tag>
                 <Tag
                   class="goods-show-tag"
                   color="blue"
-                  v-if="item.content.goodsType == 'VIRTUAL_GOODS'"
+                  v-if="item.goodsType === 'VIRTUAL_GOODS'"
                 >
                   虚拟
                 </Tag>
                 <Tag
                   class="goods-show-tag"
                   color="blue"
-                  v-else-if="item.content.goodsType == 'PHYSICAL_GOODS'"
+                  v-else-if="item.goodsType === 'PHYSICAL_GOODS'"
                 >
                   实物
                 </Tag>
@@ -146,7 +146,6 @@ export default {
       ],
       goodsList: [], // 商品列表
       loading: false, // 加载状态
-      goodsListType: "",
       total: 0, // 列表总数
       params: {
         // 请求参数
@@ -230,11 +229,8 @@ export default {
         .then((res) => {
           this.loading = false;
           if (res.success) {
-            this.goodsList = res.result.content;
-            this.total = res.result.totalElements;
-            for (var i = 0; i < this.goodsList.length; i++) {
-              this.goodsListType = this.goodsList[i];
-            }
+            this.goodsList = res.result;
+            this.total = res.result.total;
           }
         })
         .catch(() => {
diff --git a/buyer/src/pages/Merchant.vue b/buyer/src/pages/Merchant.vue
index 773d8ac8..621f3ad5 100644
--- a/buyer/src/pages/Merchant.vue
+++ b/buyer/src/pages/Merchant.vue
@@ -7,14 +7,14 @@
     <div class="shop-logo">
       <div>
         <p>{{ storeMsg.storeName || 'xx店铺' }}</p>
-        <p class="ellipsis" :alt="storeMsg.storeDesc" v-html="storeMsg.storeDesc"></p>
+        <p :alt="storeMsg.storeDesc" class="ellipsis" v-html="storeMsg.storeDesc"></p>
       </div>
       <div>
-        <span class="hover-pointer" @click="collect"><Icon type="ios-heart"
-                                                           :color="storeCollected ? '#ed3f14' : '#fff'"/>{{
+        <span class="hover-pointer" @click="collect"><Icon :color="storeCollected ? '#ed3f14' : '#fff'"
+                                                           type="ios-heart"/>{{
             storeCollected ? '已收藏店铺' : '收藏店铺'
           }}</span>
-        <span style="width:80px" class="hover-pointer ml_10" @click="IMService(storeMsg.storeId)"><Icon
+        <span class="hover-pointer ml_10" style="width:80px" @click="IMService(storeMsg.storeId)"><Icon
           custom="icomoon icon-customer-service"/>联系客服</span>
       </div>
     </div>
@@ -26,7 +26,7 @@
         >
           首页
         </li>
-        <li class="cate-item" v-for="(cate, index) in cateList" :key="index">
+        <li v-for="(cate, index) in cateList" :key="index" class="cate-item">
           <Dropdown v-if="cate.children.length">
             <div @click.self="searchByCate(cate)">
               {{ cate.labelName }}
@@ -34,10 +34,10 @@
             </div>
             <DropdownMenu slot="list">
               <DropdownItem
-                @click.native="searchByCate(sec)"
-                :name="sec.id"
                 v-for="sec in cate.children"
                 :key="sec.id"
+                :name="sec.id"
+                @click.native="searchByCate(sec)"
               >{{ sec.labelName }}
               </DropdownItem
               >
@@ -63,38 +63,38 @@
 
         <empty v-if="goodsList.length === 0"/>
         <div
-          v-else
-          class="goods-show-info"
           v-for="(item, index) in goodsList"
+          v-else
           :key="index"
-          @click="goGoodsDetail(item.content.id, item.content.goodsId)"
+          class="goods-show-info"
+          @click="goGoodsDetail(item.id, item.goodsId)"
         >
           <div class="goods-show-img">
-            <img width="220" height="220" :src="item.content.thumbnail"/>
+            <img :src="item.thumbnail" height="220" width="220" alt=""/>
           </div>
           <div class="goods-show-price">
             <span>
               <span class="seckill-price text-danger">{{
-                  item.content.price | unitPrice("￥")
+                  item.price | unitPrice("￥")
                 }}</span>
             </span>
           </div>
           <div class="goods-show-detail">
-            <span>{{ item.content.goodsName }}</span>
+            <span>{{ item.goodsName }}</span>
           </div>
           <div class="goods-show-num">
-            已有<span>{{ item.content.commentNum || 0 }}</span
+            已有<span>{{ item.commentNum || 0 }}</span
           >人评价
           </div>
         </div>
       </div>
       <div class="goods-page">
         <Page
+          :page-size="params.pageSize"
+          :total="total"
           show-sizer
           @on-change="changePageNum"
           @on-page-size-change="changePageSize"
-          :total="total"
-          :page-size="params.pageSize"
         ></Page>
       </div>
 
@@ -107,15 +107,14 @@
 
 <script>
 
-import {getDetailById, getCateById} from "@/api/shopentry";
-import {cancelStoreCollect, collectStore, isStoreCollection} from "@/api/member";
+import {getCateById, getDetailById} from "@/api/shopentry";
+import {cancelStoreCollect, collectStore} from "@/api/member";
 import {goodsList} from "@/api/goods";
 import Search from "@/components/Search";
 import ModelForm from "@/components/indexDecorate/ModelForm";
 import HoverSearch from "@/components/header/hoverSearch";
 import storage from "@/plugins/storage";
 import {getFloorStoreData} from "@/api/index.js";
-import {seckillByDay} from "@/api/promotion";
 import imTalk from '@/components/mixes/talkIm'
 
 export default {
@@ -165,8 +164,8 @@ export default {
             let dataJson = JSON.parse(res.result.pageData);
             // 秒杀活动不是装修的数据，需要调用接口判断是否有秒杀商品
             // 轮播图根据不同轮播，样式不同
-            for (let i = 0; i < dataJson.list.length; i++) {
-              let type = dataJson.list[i].type;
+            for (const element of dataJson.list) {
+              let type = element.type;
               if (type === "carousel2") {
                 this.carouselLarge = true;
               } else if (type === "carousel1") {
@@ -255,8 +254,8 @@ export default {
       goodsList(this.params)
         .then((res) => {
           if (res.success) {
-            this.goodsList = res.result.content;
-            this.total = res.result.totalElements;
+            this.goodsList = res.result;
+            this.total = res.result.total;
           }
         })
         .catch(() => {
@@ -313,7 +312,7 @@ export default {
 };
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 @import "../assets/styles/goodsList.scss";
 
 .merchant {