From 78f81a84071c8765f1f3a02daf3b2e4fbab9be36 Mon Sep 17 00:00:00 2001
From: RyanRan <ryanran@RyanRandeMacBook-Pro.local>
Date: Sat, 5 Oct 2024 22:47:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BA=97=E9=93=BA=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/m-goods-list/base-list.vue         | 21 +---------
 components/m-goods-list/list.vue              | 24 +-----------
 pages/mine/distribution/history.vue           |  1 -
 pages/mine/myCollect.vue                      | 38 +------------------
 pages/mine/myTracks.vue                       |  1 -
 pages/order/afterSales/afterSales.vue         |  3 --
 pages/order/afterSales/afterSalesDetail.vue   |  7 ----
 .../afterSales/afterSalesDetailExpress.vue    |  8 +---
 pages/order/afterSales/afterSalesSelect.vue   |  8 +---
 pages/order/afterSales/applyDetail.vue        |  7 ----
 pages/order/complain/complain.vue             |  1 -
 pages/order/complain/complainList.vue         |  3 --
 pages/order/evaluate/myEvaluate.vue           |  5 ---
 pages/order/fillorder.vue                     |  5 ---
 pages/order/myOrder.vue                       |  7 +---
 pages/order/orderDetail.vue                   |  8 ----
 pages/product/goods.vue                       | 12 ++----
 pages/product/product/shop/-shop.vue          |  4 --
 pages/product/shopList.vue                    |  5 +--
 pages/tabbar/cart/cartList.vue                | 16 --------
 pages/tabbar/user/utils/tool.vue              |  6 ---
 21 files changed, 12 insertions(+), 178 deletions(-)

diff --git a/components/m-goods-list/base-list.vue b/components/m-goods-list/base-list.vue
index b7e548b..d4f54d5 100644
--- a/components/m-goods-list/base-list.vue
+++ b/components/m-goods-list/base-list.vue
@@ -32,26 +32,7 @@
             <span>已售 {{ item.buyCount || "0" }}</span>
             <span>{{ item.commentNum || "0" }}条评论</span>
           </div>
-          <div
-            class="store-seller-name"
-            v-if="storeName"
-            @click="navigateToStoreDetailPage(item)"
-          >
-            <div class="text-hidden">
-              <u-tag
-                style="margin-right: 10rpx"
-                size="mini"
-                mode="dark"
-                v-if="item.selfOperated"
-                text="自营"
-                type="error"
-              />
-              <span>{{ item.storeName || "暂无" }}</span>
-            </div>
-            <span>
-              <u-icon name="arrow-right"></u-icon>
-            </span>
-          </div>
+          
         </view>
       </view>
     </view>
diff --git a/components/m-goods-list/list.vue b/components/m-goods-list/list.vue
index 4291c64..ea8d52c 100644
--- a/components/m-goods-list/list.vue
+++ b/components/m-goods-list/list.vue
@@ -34,16 +34,7 @@
 						<span>已售 {{ item.buyCount || "0" }}</span>
 						<span>{{ item.commentNum || "0" }}条评论</span>
 					</div>
-					<div class="store-seller-name" v-if="storeName" @click="navigateToStoreDetailPage(item)">
-						<div class="text-hidden">
-							<u-tag style="margin-right: 10rpx" size="mini" mode="dark" v-if="item.selfOperated"
-								text="自营" type="error" />
-							<span>{{ item.storeName || "暂无" }}</span>
-						</div>
-						<span>
-							<u-icon name="arrow-right"></u-icon>
-						</span>
-					</div>
+					
 				</view>
 			</view>
 		</view>
@@ -79,18 +70,7 @@
 							<span style="float: left; font-size: 22rpx">已售 {{ item.buyCount || '0' }}</span>
 							<span style="float: right; font-size: 22rpx">{{ item.commentNum || '0' }}条评论</span>
 						</div>
-						<div style="overflow: hidden" @click="navigateToStoreDetailPage(item)" class="count-config">
-							<div class="text-hidden" v-if="storeName">
-								<u-tag style="margin-right: 10rpx" size="mini" mode="dark" v-if="item.selfOperated"
-									text="自营" type="error" />
-								<span class="line1-store-name">{{ item.storeName }}</span>
-								<span class="to-store">进店<u-icon size="24" name="arrow-right" color="#666"></u-icon>
-								</span>
-							</div>
-							<span>
-								<u-icon name="arrow-right" color="#c5c5c5"></u-icon>
-							</span>
-						</div>
+						
 					</div>
 				</div>
 
diff --git a/pages/mine/distribution/history.vue b/pages/mine/distribution/history.vue
index 1ccf875..54ef5d7 100644
--- a/pages/mine/distribution/history.vue
+++ b/pages/mine/distribution/history.vue
@@ -28,7 +28,6 @@
         </view>
         <view class="log-item-view">
           <view>创建时间：{{ item.createTime }}</view>
-          <view>店铺：{{ item.storeName }}</view>
         </view>
         <view class="log-item-footer">
           <view>会员名称：{{ item.memberName }}</view>
diff --git a/pages/mine/myCollect.vue b/pages/mine/myCollect.vue
index e10766f..5000830 100644
--- a/pages/mine/myCollect.vue
+++ b/pages/mine/myCollect.vue
@@ -27,36 +27,7 @@
 
 				</scroll-view>
 			</view>
-			<!-- 显示收藏的店铺栏 -->
-			<view v-else class="tab-content">
-				<scroll-view class="list-scroll-content" scroll-y>
-					<!-- 空白页 -->
-					<u-empty style="margin-top: 40rpx" text="暂无收藏店铺数据" mode="favor" v-if="storeEmpty"></u-empty>
-					<!-- 店铺展示数据 -->
-					<u-swipe-action @open="openLeftChange(item, 'store')" :show="item.selected" btn-width="180"
-						:options="LeftOptions" v-else v-for="(item, index) in storeList" :key="index"
-						@click="clickStoreSwiperAction(item)">
-						<view class="store" @click="goStoreMainPage(item.id)">
-							<view class="intro">
-								<view class="store-logo">
-									<u-image width="102rpx" height="102rpx" :src="item.storeLogo" :alt="item.storeName"
-										mode="aspectFit">
-										<u-loading slot="loading"></u-loading>
-									</u-image>
-								</view>
-								<view class="store-name">
-									<view>{{ item.storeName }}</view>
-									<u-tag size="mini" type="error" :color="$mainColor" v-if="item.selfOperated"
-										text="自营" mode="plain" shape="circle" />
-								</view>
-								<view class="store-collect">
-									<view>进店逛逛</view>
-								</view>
-							</view>
-						</view>
-					</u-swipe-action>
-				</scroll-view>
-			</view>
+			
 		</view>
 	</view>
 </template>
@@ -90,14 +61,7 @@
 							pageSize: 10,
 						},
 					},
-					{
-						name: "店铺(0)",
 					
-						params: {
-							pageNumber: 1,
-							pageSize: 10,
-						},
-					},
 				],
 			
 				goodsEmpty: false, //商品数据是否为空
diff --git a/pages/mine/myTracks.vue b/pages/mine/myTracks.vue
index 01edc63..6035a7e 100644
--- a/pages/mine/myTracks.vue
+++ b/pages/mine/myTracks.vue
@@ -9,7 +9,6 @@
 		<u-empty text="暂无历史记录" style="margin-top:200rpx;" mode="history" v-if="whetherEmpty"></u-empty>
 		<div v-else>
 			<view v-for="(item, index) in trackList" :key="index">
-				<view class="myTracks-title" @click="navigateToStore(item)">{{item.storeName}}</view>
 				<view class="myTracks-items">
 
 					<u-swipe-action style="width: 100%;" :show="item.show" :index="index" :key="item.id"
diff --git a/pages/order/afterSales/afterSales.vue b/pages/order/afterSales/afterSales.vue
index 6916648..daa89c1 100644
--- a/pages/order/afterSales/afterSales.vue
+++ b/pages/order/afterSales/afterSales.vue
@@ -28,9 +28,6 @@
       >
         <!-- 店铺名称 -->
         <view class="seller-info u-flex u-row-between" v-if="current == 0">
-          <view class="seller-name">
-            <view class="name">{{ order.storeName }}</view>
-          </view>
           <view class="order-sn">订单编号:{{ order.sn }}</view>
         </view>
         <!-- 申请记录 选项卡 -->
diff --git a/pages/order/afterSales/afterSalesDetail.vue b/pages/order/afterSales/afterSalesDetail.vue
index 66a737a..1ef9d25 100644
--- a/pages/order/afterSales/afterSalesDetail.vue
+++ b/pages/order/afterSales/afterSalesDetail.vue
@@ -2,13 +2,6 @@
   <view class="content">
     <u-form :model="form" ref="uForm">
       <view class="after-sales-goods-detail-view">
-        <view class="header">
-          <view>
-            本次售后服务将由
-            <text class="seller-name">{{ sku.storeName }}</text>
-            为您提供
-          </view>
-        </view>
         <view>
           <view class="goods-item-view" v-for="(item,index) in sku.orderItems" v-if="item.sn == sn"
             @click="gotoGoodsDetail(sku.goods_id)">
diff --git a/pages/order/afterSales/afterSalesDetailExpress.vue b/pages/order/afterSales/afterSalesDetailExpress.vue
index 77b3fb3..d1f7e03 100644
--- a/pages/order/afterSales/afterSalesDetailExpress.vue
+++ b/pages/order/afterSales/afterSalesDetailExpress.vue
@@ -2,13 +2,7 @@
   <view class="mp-iphonex-bottom content">
     <u-form :model="form" ref="uForm">
       <view class="after-sales-goods-detail-view">
-        <view class="header">
-          <view>
-            本次售后服务将由
-            <text class="seller-name">{{ sku.storeName }}</text>
-            为您提供
-          </view>
-        </view>
+        
         <view>
           <view class="goods-item-view" @click="gotoGoodsDetail(sku.skuId)">
             <view class="goods-img">
diff --git a/pages/order/afterSales/afterSalesSelect.vue b/pages/order/afterSales/afterSalesSelect.vue
index d298151..2e1b185 100644
--- a/pages/order/afterSales/afterSalesSelect.vue
+++ b/pages/order/afterSales/afterSalesSelect.vue
@@ -1,13 +1,7 @@
 <template>
   <view>
     <view class="after-sales-goods-detail-view">
-      <view class="header">
-        <view>
-          本次售后服务将由
-          <text class="seller-name">{{ sku.storeName }}</text>
-          为您提供
-        </view>
-      </view>
+      
       <view>
         <view class="goods-item-view" :key="index" v-for="(item,index) in sku.orderItems" v-if="item.sn == sn" @click="navigateToGoodsDetail(sku.skuId)">
           <view class="goods-img">
diff --git a/pages/order/afterSales/applyDetail.vue b/pages/order/afterSales/applyDetail.vue
index 7926dc0..85adbc2 100644
--- a/pages/order/afterSales/applyDetail.vue
+++ b/pages/order/afterSales/applyDetail.vue
@@ -1,13 +1,6 @@
 <template>
   <view v-if="serviceDetail">
     <view class="after-sales-goods-detail-view">
-      <view class="header">
-        <view>
-          本次售后服务将由
-          <text class="seller-name">{{ serviceDetail.storeName }}</text>
-          为您提供
-        </view>
-      </view>
       <view class="apply-info-view">
         <view class="status-info">
           <view class="status-info-box">
diff --git a/pages/order/complain/complain.vue b/pages/order/complain/complain.vue
index 72d39a4..760066c 100644
--- a/pages/order/complain/complain.vue
+++ b/pages/order/complain/complain.vue
@@ -4,7 +4,6 @@
     <view class="seller-view">
       <view class="seller-info u-flex u-row-between">
         <view class="seller-name">
-          <view class="name">{{ order.storeName || "" }}</view>
           <view class="status">{{ orderStatusList[order.orderStatus] }}</view>
         </view>
         <view class="order-sn"></view>
diff --git a/pages/order/complain/complainList.vue b/pages/order/complain/complainList.vue
index cbf2788..7806b3e 100644
--- a/pages/order/complain/complainList.vue
+++ b/pages/order/complain/complainList.vue
@@ -2,9 +2,6 @@
   <view>
     <view class="seller-view" v-for="(item, index) in complaionData" :key="index">
       <view class="seller-info u-flex u-row-between">
-        <view class="seller-name">
-          <view class="name">{{ item.storeName }}</view>
-        </view>
         <view class="order-sn">{{ statusData[item.complainStatus] }}</view>
       </view>
       <u-line color="#DCDFE6"></u-line>
diff --git a/pages/order/evaluate/myEvaluate.vue b/pages/order/evaluate/myEvaluate.vue
index dbe110b..9705219 100644
--- a/pages/order/evaluate/myEvaluate.vue
+++ b/pages/order/evaluate/myEvaluate.vue
@@ -11,11 +11,6 @@
             <u-empty text="尚无需要评价的商品" mode="list" v-if="orderList.length == 0"></u-empty>
             <view class="seller-view" v-for="(order, index) in orderList" :key="index">
               <!-- 店铺名称 -->
-              <view class="box-title">
-                <view class="title_seller_name">
-                  {{ order.storeName }}
-                </view>
-              </view>
               <view v-for="(sku, _index) in order.orderItems" :key="_index">
                 <view class="goods-item-view">
                   <view>
diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue
index eeadac9..ea8f2d3 100644
--- a/pages/order/fillorder.vue
+++ b/pages/order/fillorder.vue
@@ -125,11 +125,6 @@
       :key="index"
     >
       <div v-if="item.checked">
-        <div @click="navigateToStore(item)">
-          <div class="store-name">
-            <span>{{ item.storeName }}</span>
-          </div>
-        </div>
         <div class="promotionNotice">{{ item.promotionNotice || "" }}</div>
         <div
           class="flex goods-item"
diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index 5caa7fd..a6eb986 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -39,10 +39,7 @@
             v-for="(order, oderIndex) in tabItem.orderList"
           >
             <!-- 店铺名称 -->
-            <view class="seller-info u-flex u-row-between">
-              <view class="seller-name wes" @click="navigateToStore(order)">
-                <view class="name wes">{{ order.storeName }}</view>
-              </view>
+            <view class="seller-info u-flex u-row-left ">
               <view class="order-sn">{{
                 order.orderStatus | orderStatusList
               }}</view>
@@ -701,7 +698,7 @@ page,
     }
 
     .order-sn {
-      flex:2;
+     
       width:120rpx;
       text-align: center;
       color: $aider-light-color;
diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue
index 6be9698..3e9718b 100644
--- a/pages/order/orderDetail.vue
+++ b/pages/order/orderDetail.vue
@@ -72,14 +72,6 @@
     <view>
       <view class="seller-view">
         <!-- 店铺名称 -->
-        <view class="seller-info u-flex u-row-between">
-          <view class="seller-name" @click="goToShopPage(order)">
-            <view class="name">{{ order.storeName }}</view>
-            <view class="status" v-if="orderStatusList[order.orderStatus]"> {{ orderStatusList[order.orderStatus].title
-            }}</view>
-          </view>
-          <view class="order-sn"></view>
-        </view>
         <view>
           <view v-for="(sku, skuIndex) in orderGoodsList" :key="skuIndex">
             <view class="goods-item-view">
diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index bb88575..ff4efba 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -183,9 +183,7 @@
           <!-- 评价 -->
           <Evaluation id="main5" :goodsDetail="goodsDetail" />
 
-          <!-- 店铺推荐 -->
-          <storeLayout id="main7" :storeDetail="storeDetail" :goodsDetail="goodsDetail" :res="recommendList" />
-
+          
           <!-- 宝贝详情 -->
           <GoodsIntro id="main9" :res="goodsDetail" :goodsParams="goodsParams" :goodsId="goodsDetail.goodsId"
             v-if="goodsDetail.id" />
@@ -198,10 +196,6 @@
 
       <view class="page-bottom mp-iphonex-bottom" id="pageBottom">
         <view class="icon-btn">
-          <view class="icon-btn-item" @click="navigateToStore(goodsDetail.storeId)">
-            <u-icon size="34" class="red" name="home-fill"></u-icon>
-            <view class="red icon-btn-name">店铺</view>
-          </view>
           <view class="icon-btn-item" @click="linkMsgDetail()">
             <u-icon size="34" name="kefu-ermai"></u-icon>
             <view class="icon-btn-name">客服</view>
@@ -293,7 +287,7 @@ import PromotionAssembleListLayout from "./product/promotion/-promotion-assemble
 import PromotionCoupon from "./product/promotion/-promotion-coupon"; //优惠券组件
 import GoodsIntro from "./product/goods/-goods-intro"; //商品介绍组件
 import GoodsRecommend from "./product/goods/-goods-recommend"; //宝贝推荐
-import storeLayout from "./product/shop/-shop"; //店铺组件
+
 import Evaluation from "./product/evaluation/-evaluation"; //评价组件
 import GoodsSwiper from "./product/goods/-goods-swiper"; //轮播图组件
 import popupGoods from "@/components/m-buy/goods"; //购物车商品的模块
@@ -314,7 +308,7 @@ export default {
     PromotionCoupon,
     GoodsIntro,
     GoodsRecommend,
-    storeLayout,
+
     Evaluation,
     GoodsSwiper,
     popupGoods,
diff --git a/pages/product/product/shop/-shop.vue b/pages/product/product/shop/-shop.vue
index 70662e5..8562aad 100644
--- a/pages/product/product/shop/-shop.vue
+++ b/pages/product/product/shop/-shop.vue
@@ -6,10 +6,6 @@
         <u-image width="120rpx" mode="aspectFit" height="120rpx" :src="storeDetail.storeLogo"></u-image>
       </view>
       <view class="name-star star-con">
-        <div class="name">
-          {{ storeDetail.storeName }}
-          <span v-if="storeDetail.selfOperated == 1" class="shopTag">自营</span>
-        </div>
         <div class="store-row">
           <div class="collectionNum">{{ storeDetail.collectionNum || 0 }}人关注</div>
           <div class="goodsNum">{{ storeDetail.goodsNum || 0 }}件商品</div>
diff --git a/pages/product/shopList.vue b/pages/product/shopList.vue
index 79e81ca..0729320 100644
--- a/pages/product/shopList.vue
+++ b/pages/product/shopList.vue
@@ -11,9 +11,6 @@
           </u-image>
         </div>
         <div class="store-msg">
-          <div class="store-name">
-            {{item.storeName}}
-          </div>
           <div class="goods-num">
             商品 {{item.goodsNum}}
           </div>
@@ -154,4 +151,4 @@ export default {
   font-size: 34rpx;
   font-weight: bold;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue
index 59bfaca..fcbd2d3 100644
--- a/pages/tabbar/cart/cartList.vue
+++ b/pages/tabbar/cart/cartList.vue
@@ -19,24 +19,8 @@
         :key="index">
         <view class="tab">
           <view class="store-line">
-            <u-checkbox-group class="store-line-check">
-              <!-- #ifndef MP-WEIXIN -->
-              <u-checkbox shape="circle" :active-color="lightColor" v-model="item.checked"
-                @change="checkboxChangeDP(item)"></u-checkbox>
-              <!-- #endif -->
-              <!-- 微信小程序这里 v-model出现问题，改用:value -->
-              <!-- #ifdef MP-WEIXIN -->
-              <u-checkbox shape="circle" :active-color="lightColor" :value="item.checked"
-                @change="checkboxChangeDP(item)"></u-checkbox>
-              <!-- #endif -->
-            </u-checkbox-group>
-            <span class="store-name wes store-line-desc" @click.stop="navigateToStore(item)">{{
-              item.storeName
-            }}</span>
-            <u-icon @click="navigateToStore(item)"  size="24" style="margin-left:10rpx;"  name="arrow-right"></u-icon>
           </view>
           <view class="right-col" v-if="item.canReceiveCoupon" @click="navigateToCoupon(item)">
-            <div class="right-line"></div>
             <span>领劵</span>
           </view>
         </view>
diff --git a/pages/tabbar/user/utils/tool.vue b/pages/tabbar/user/utils/tool.vue
index 2fcb91e..d1fb412 100644
--- a/pages/tabbar/user/utils/tool.vue
+++ b/pages/tabbar/user/utils/tool.vue
@@ -91,12 +91,6 @@
             <view>关于</view>
           </view>
           
-          <view class="interact-item" @click="navigateTo('/pages/passport/entry/seller/index')">
-            <image src="/static/mine/feedback.png" mode=""></image>
-            <view>店铺入驻</view>
-          </view>
-          
-          
           <view class="interact-item" @click="navigateTo('/pages/mine/set/setUp')">
             <image src="/static/mine/setting.png" mode=""></image>
             <view>设置</view>