From 0bcad2ecb18afafab445d89b1f7c764e854befce Mon Sep 17 00:00:00 2001
From: qijq <624811160@qq.com>
Date: Sun, 29 Jun 2025 21:08:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BC=91=E6=81=AF=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=AF=84=E4=BB=B7=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/store-lists.vue         |  36 +++++++-
 helpers/loginPopup.js              |  15 ++++
 member/member/supermarketlList.vue | 127 ++++++++++++++++++++++++-----
 pages/product/commentlist.vue      |   6 +-
 pages/product/detail.vue           |  32 ++++++--
 pagesub/index/store.vue            |  35 +++++++-
 6 files changed, 219 insertions(+), 32 deletions(-)
 create mode 100644 helpers/loginPopup.js

diff --git a/components/store-lists.vue b/components/store-lists.vue
index 1fcc169..e446f9f 100644
--- a/components/store-lists.vue
+++ b/components/store-lists.vue
@@ -88,8 +88,11 @@
                     item.distance
                   "
                 >
-                  <view class="left">
+                  <view :class="['left', {'is-rest': item.store_biz_state ==2}]">
+
                     <image :src="item.store_logo"></image>
+                    <view class="is-rest-bg" v-if="item.store_biz_state ==2"></view>
+                    <view class="is-rest-tips" v-if="item.store_biz_state ==2">休息中</view>
                   </view>
                   <view class="right">
                     <view class="name">
@@ -449,6 +452,7 @@ export default {
       filterDropdownValue: [],
       filterData: [],
       loadComplete: false, // 没有加载数据前不显示的对应内容
+      isRest:true
     };
   },
   components: {
@@ -1086,6 +1090,7 @@ export default {
         padding: 10rpx 0;
         display: flex;
         .left {
+          
           flex-shrink: 0;
           width: 13vw;
           height: 13vw;
@@ -1094,7 +1099,36 @@ export default {
             height: 13vw;
             border-radius: 10rpx;
           }
+          
         }
+
+        .is-rest{
+          position: relative;
+         
+
+          .is-rest-bg{
+            position: absolute;
+            bottom: 0;
+            left: 0;
+            width: 100%;
+            height: 36rpx;
+            background: #000;
+            opacity: 0.5;
+            z-index: 2;
+          }
+
+          .is-rest-tips{
+            position: absolute;
+            bottom: 0;
+            width: 100%;
+            line-height: 36rpx;
+            font-size: 24rpx;
+            color: #fff;
+            text-align: center;
+            z-index: 3;
+          }
+        }
+
         .right {
           width: 100%;
           position: relative;
diff --git a/helpers/loginPopup.js b/helpers/loginPopup.js
new file mode 100644
index 0000000..9367a76
--- /dev/null
+++ b/helpers/loginPopup.js
@@ -0,0 +1,15 @@
+import Vue from 'vue'
+
+import loginPopup from '@/components/loginPopup.vue'
+ 
+const loginPopup_ =  Vue.extend(loginPopup)
+
+export const $loginPopup  = (data) =>{
+    const node = new loginPopup_({
+        show:data
+    })
+
+    node.$mount()
+
+    document.body.appendChild(node.$el)
+}
\ No newline at end of file
diff --git a/member/member/supermarketlList.vue b/member/member/supermarketlList.vue
index b8d99bd..3eb5aa0 100644
--- a/member/member/supermarketlList.vue
+++ b/member/member/supermarketlList.vue
@@ -63,13 +63,15 @@
             :key="index"
             @click="handerSkipShop(item)"
           >
-            <view class="list-item-hander">
-              <view class="list-item-img">
+            <view :class="['list-item-hander']">
+              <view :class="['list-item-img', {'is-rest': item.store_biz_state ==2 }]">
                 <image
                   class="item-img"
                   lazy-load
                   :src="item.store_logo"
                 ></image>
+                <view class="is-rest-bg" v-if="item.store_biz_state ==2"></view>
+                <view class="is-rest-tips" v-if="item.store_biz_state ==2">休息中</view>
               </view>
               <view class="list-item-info">
                 <view class="list-item-name">{{ item.store_name }}</view>
@@ -750,6 +752,8 @@ export default {
           margin-right: 12px;
           width: 102px;
           height: 102px;
+          min-width: 102px;
+          min-height: 102px;
           overflow: hidden;
 
           .item-img {
@@ -805,6 +809,32 @@ export default {
         }
       }
 
+    .is-rest{
+        position: relative;
+        
+        .is-rest-bg{
+          position: absolute;
+          bottom: 0;
+          left: 0;
+          width: 100%;
+          height: 40rpx;
+          background: #000;
+          opacity: 0.5;
+          z-index: 2;
+        }
+
+        .is-rest-tips{
+          position: absolute;
+          bottom: 0;
+          width: 100%;
+          line-height: 40rpx;
+          font-size: 24rpx;
+          color: #fff;
+          text-align: center;
+          z-index: 3;
+        }
+      }
+
       .list-item-bottom {
         display: flex;
         justify-content: space-between;
@@ -832,32 +862,85 @@ export default {
     }
   }
 
-  @media screen and (max-width: 320px) {
-    .address-block {
-      .address-box {
-        max-width: 140px;
-      }
+  /* 小屏幕设备（如 iPhone 5/SE） */
+    @media screen and (max-width: 320px) {
+        .address-block {
+          .address-box {
+            max-width: 140px;
+          }
+        }
+
+        .list-item-img {
+          width: 62px !important;
+          height: 62px !important;
+          min-width: 62px !important;
+          min-height: 62px !important;
+
+          .item-img {
+            width: 62px !important;
+            height: 62px !important;
+          }
+        }
+
+        .address-name {
+          max-width: 120px !important;
+        }
     }
 
-    .list-item-img {
-      width: 62px !important;
-      height: 62px !important;
+    /* 中等屏幕设备（如 iPhone 6/7/8/X） */
+    @media screen and (min-width: 321px) and (max-width: 414px) {
+        .m-product-info {
+          width: 60%;
+        }
+        .list-item-img {
+          width: 62px !important;
+          height: 62px !important;
+          min-width: 62px !important;
+          min-height: 62px !important;
 
-      .item-img {
-        width: 62px !important;
-        height: 62px !important;
-      }
+          .item-img {
+            width: 62px !important;
+            height: 62px !important;
+          }
+        }
     }
 
-    .address-name {
-      max-width: 120px !important;
-    }
-  }
+    /* 大屏幕设备（如 iPhone Plus 系列） */
+    @media screen and (min-width: 415px) {
+        /* 可以添加针对大屏幕的样式 */
+        .list-item-img {
+          width: 102px !important;
+          height: 102px !important;
+          min-width: 102px !important;
+          min-height: 102px !important;
 
-  @media screen and (min-width: 321px) {
-    .m-product-info {
-      width: 60%;
+          .item-img {
+            width: 102px !important;
+            height: 102px !important;
+          }
+        }
     }
-  }
+
+    /* 专门针对 iPhone X 的竖屏模式 */
+    @media only screen 
+      and (min-device-width: 375px) 
+      and (max-device-width: 812px) 
+      and (-webkit-device-pixel-ratio: 3) 
+      and (orientation: portrait) {
+        .list-item-img {
+          width: 62px !important;
+          height: 62px !important;
+          min-width: 62px !important;
+          min-height: 62px !important;
+
+          .item-img {
+            width: 62px !important;
+            height: 62px !important;
+          }
+        }
+    }
+
+
+  
 }
 </style>
\ No newline at end of file
diff --git a/pages/product/commentlist.vue b/pages/product/commentlist.vue
index 4889db8..a21b86c 100644
--- a/pages/product/commentlist.vue
+++ b/pages/product/commentlist.vue
@@ -20,12 +20,12 @@
 				<view class="m-media-box-bd">
 					<label class="m-media-box-title">{{item.user_name}}</label>
 					<view class="m-media-box-desc">
-						<view style="margin-bottom:10rpx;">
-							<label  style="margin-right:10rpx;font-size:20rpx;">
+						<view style="margin-bottom:20rpx;">
+							<label  style="margin-right:10rpx;font-size:24rpx;">
 								{{item.item_name}}
 							</label>
 						</view>
-						<label v-if="(item.comment_content!=null)" >{{item.comment_content}}</label>
+						<label style="font-size: 28rpx;" v-if="(item.comment_content!=null)" >{{item.comment_content}}</label>
 					</view>
 					<view class="m-media-box-info">
 						<view class="m-media-box-info-meta m-start" v-for="(itemIndex, ii) in [1, 2, 3, 4, 5]"  :key="ii">
diff --git a/pages/product/detail.vue b/pages/product/detail.vue
index 0efefe8..e2bf25d 100644
--- a/pages/product/detail.vue
+++ b/pages/product/detail.vue
@@ -876,8 +876,9 @@
 				<view class="u-cleanbox"></view>
 			</scroll-view>
 
+      <view class="is-rest" v-if="store_info.store_biz_state == 2"></view>
 
-			<view class="m-footer-btn bottom-safearea" :class="ProductInfo.is_virtual ? 'm-fg-btn' : ''" v-if="(ProductInfo.activityType!='GROUPBOOKING')">
+			<view  class="m-footer-btn bottom-safearea" :class="ProductInfo.is_virtual ? 'm-fg-btn' : ''" v-if="(ProductInfo.activityType!='GROUPBOOKING') && store_info.store_biz_state == 1">
 
 				<block v-if="(ProductInfo.is_virtual)">
 					<view class="m-footer-btn-list">
@@ -1027,7 +1028,7 @@
 				</block>
 			</view>
 
-			<view class="m-footer-btn m-fg-btn bottom-safearea" v-if="(ProductInfo.activityType=='GROUPBOOKING')">
+			<view class="m-footer-btn m-fg-btn bottom-safearea" v-if="(ProductInfo.activityType=='GROUPBOOKING') && store_info.store_biz_state == 1">
 				<view class="m-footer-btn-list">
 					<view class="m-footer-btn-item" style="width: 50%;" :data-id="(proId)" :data-name="(store_info.store_name)" :data-keyword="(ProductInfo.keyWord)" :data-appid="(AppId)" :data-appurl="(chatUrl)" v-if="(Config.MULTISHOP_ENABLE && !if_saas_status && !isStoreFlag)">
 						<navigator redirect="true" :url="'/pagesub/index/store?store_id=' + (ProductInfo.store_id)" class="u-go-home1">
@@ -1055,7 +1056,7 @@
 					</view>
 				</view>
 
-
+        
 				<block v-if="ProductInfo.activity_type_id == StateCode.ACTIVITY_TYPE_GROUPBOOKING">
 					<view v-if="true" class="m-footer-btn-main m-footer-btn-main-left" :data-type="1" @click="ckselectsp">
 						<view style="height: 16px;line-height: 26px;font-size: 12px;">{{ __('￥') }}{{ number_format(ProductInfo.ItemSalePrice, 2) }}</view>
@@ -2207,7 +2208,6 @@ export default {
             clearInterval(intervalPt);
             clearInterval(intervalCt);
             clearInterval(intervalTimeAct);
-
             that.$report("fb_mobile_content_view", data.item_row);
 
             that.setData({
@@ -5697,12 +5697,15 @@ radio-group {
   // background:rgba(255,255,255,1);
   margin-left: 20rpx;
   overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  
 }
 
 .user-text label {
   width: 360rpx;
   height: 80rpx;
-  font-size: 20rpx;
+  font-size: 32rpx;
   font-family: Alibaba PuHuiTi;
   line-height: 22rpx;
   font-weight: 400;
@@ -5768,6 +5771,25 @@ radio-group {
   border-radius: 6px;
 }
 
+.is-rest{
+  position: fixed;
+  height: 10%;
+  width: 100%;
+  bottom: 0;
+
+  &::before{
+    content: "门店已打烊";
+    position: absolute;
+    bottom: 0;
+    height: 100%;
+    width: 100%;
+    text-align: center;
+    line-height: 100rpx;
+    background-color: rgba(0, 0, 0, 0.7);
+    color: #fff;
+  }
+}
+
 .m-store-info {
   position: relative;
   //width: 750rpx;
diff --git a/pagesub/index/store.vue b/pagesub/index/store.vue
index 72d498b..965152e 100644
--- a/pagesub/index/store.vue
+++ b/pagesub/index/store.vue
@@ -4,8 +4,10 @@
       <view class="m-banner" v-if="loadStoreInfoComplete">
         <image :src="store_info.BackGroundPath" />
         <view class="m-content-box"> </view>
-        <view class="m-logo">
+        <view  :class="['m-logo', {'is-rest': store_info.base.store_biz_state == 2}]">
           <image :src="store_info.WapLogoPath" />
+          <view class="is-rest-bg" v-if="store_info.base.store_biz_state == 2"></view>
+          <view class="is-rest-tips" v-if="store_info.base.store_biz_state == 2">休息中</view>
         </view>
         <view class="m-shopinfo">
           <view style="display: flex">
@@ -758,6 +760,7 @@ export default {
       loadStoreInfoComplete: false, // 加载店铺基本信息完成
       loadStoreConfigComplete: false, // 加载店铺配置信息完成
       loadStoreCategoryComplete: false, // 加载店铺配置信息完成
+      isRest:true
     };
   },
   computed: mapState([
@@ -1738,6 +1741,36 @@ export default {
   top: 18rpx;
 }
 
+.m-logo{
+  overflow: hidden;
+}
+
+.is-rest{
+  
+  .is-rest-bg{
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 36rpx;
+    background: #000;
+    opacity: 0.5;
+    z-index: 2;
+  }
+
+  .is-rest-tips{
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    line-height: 36rpx;
+    font-size: 24rpx;
+    color: #fff;
+    text-align: center;
+    z-index: 3;
+  }
+}
+
 .uni-uploader__img {
   display: block;
   width: 182rpx;