From 7adca6685d734792313b6d436f2da6e434872a6c Mon Sep 17 00:00:00 2001
From: jqtmviyu <jqtmviyu@gmail.com>
Date: Thu, 15 May 2025 10:40:22 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20:sparkles:=20h5=20=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/JbcSwiper.vue                  | 32 +---------
 src/components/styles/JbcSwiper.scss          | 31 ++++++++++
 src/manifest.json                             |  6 ++
 .../category/components/PageSkeleton.vue      |  6 +-
 src/pages/goods/goods.vue                     | 13 ++--
 src/pages/index/components/CategoryPanel.vue  | 35 +++--------
 src/pages/index/components/HotPanel.vue       | 59 +------------------
 src/pages/index/components/PageSkeleton.vue   |  8 ++-
 .../components/styles/CategoryPanel.scss      | 26 ++++++++
 .../index/components/styles/HotPanel.scss     | 58 ++++++++++++++++++
 src/pages/login/login.vue                     | 30 +++++++---
 src/pages/my/my.vue                           |  2 +
 src/pagesMember/settings/settings.vue         |  2 +
 src/pagesOrder/detail/detail.vue              |  9 +++
 14 files changed, 184 insertions(+), 133 deletions(-)
 create mode 100644 src/components/styles/JbcSwiper.scss
 create mode 100644 src/pages/index/components/styles/CategoryPanel.scss
 create mode 100644 src/pages/index/components/styles/HotPanel.scss

diff --git a/src/components/JbcSwiper.vue b/src/components/JbcSwiper.vue
index 3d3a063..699365b 100644
--- a/src/components/JbcSwiper.vue
+++ b/src/components/JbcSwiper.vue
@@ -49,35 +49,5 @@ watch(
 </script>
 
 <style lang="scss">
-/* 轮播图 */
-.carousel {
-  height: 280rpx;
-  position: relative;
-  overflow: hidden;
-  transform: translateY(0);
-  background-color: #efefef;
-  .indicator {
-    position: absolute;
-    left: 0;
-    right: 0;
-    bottom: 16rpx;
-    display: flex;
-    justify-content: center;
-    .dot {
-      width: 30rpx;
-      height: 6rpx;
-      margin: 0 8rpx;
-      border-radius: 6rpx;
-      background-color: rgba(255, 255, 255, 0.4);
-    }
-    .active {
-      background-color: #fff;
-    }
-  }
-  .navigator,
-  .image {
-    width: 100%;
-    height: 100%;
-  }
-}
+@import '@/components/styles/JbcSwiper.scss';
 </style>
diff --git a/src/components/styles/JbcSwiper.scss b/src/components/styles/JbcSwiper.scss
new file mode 100644
index 0000000..374440a
--- /dev/null
+++ b/src/components/styles/JbcSwiper.scss
@@ -0,0 +1,31 @@
+/* 轮播图 */
+.carousel {
+  height: 280rpx;
+  position: relative;
+  overflow: hidden;
+  transform: translateY(0);
+  background-color: #efefef;
+  .indicator {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 16rpx;
+    display: flex;
+    justify-content: center;
+    .dot {
+      width: 30rpx;
+      height: 6rpx;
+      margin: 0 8rpx;
+      border-radius: 6rpx;
+      background-color: rgba(255, 255, 255, 0.4);
+    }
+    .active {
+      background-color: #fff;
+    }
+  }
+  .navigator,
+  .image {
+    width: 100%;
+    height: 100%;
+  }
+}
\ No newline at end of file
diff --git a/src/manifest.json b/src/manifest.json
index c38e717..41ebc83 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -48,6 +48,12 @@
   },
   /* 快应用特有相关 */
   "quickapp": {},
+  /* H5特有相关 */
+  "h5": {
+    "router": {
+      "base": "./"
+    }
+  },
   /* 小程序特有相关 */
   "mp-weixin": {
     "appid": "",
diff --git a/src/pages/category/components/PageSkeleton.vue b/src/pages/category/components/PageSkeleton.vue
index 70ec50b..1a26862 100644
--- a/src/pages/category/components/PageSkeleton.vue
+++ b/src/pages/category/components/PageSkeleton.vue
@@ -153,7 +153,11 @@
   </view>
 </template>
 
-<style>
+<style lang="scss">
+// #ifdef H5
+@import '@/components/styles/JbcSwiper.scss';
+// #endif
+
 .sk-transparent {
   color: transparent !important;
 }
diff --git a/src/pages/goods/goods.vue b/src/pages/goods/goods.vue
index 6ca2fd6..c947bba 100644
--- a/src/pages/goods/goods.vue
+++ b/src/pages/goods/goods.vue
@@ -97,16 +97,18 @@
     <view class="toolbar" :style="{ paddingBottom: safeAreaInsets?.bottom + 'px' }">
       <view class="icons">
         <button class="icons-button"><text class="icon-heart"></text>收藏</button>
+        <!-- #ifdef MP-WEIXIN -->
         <button class="icons-button" open-type="contact">
           <text class="icon-handset"></text>客服
         </button>
+        <!-- #endif -->
         <navigator class="icons-button" url="/pages/cart/goodsCart" open-type="navigate">
           <text class="icon-cart"></text>购物车
         </navigator>
       </view>
       <view class="buttons">
         <view class="addcart" @tap="showSkuPopup(SkuMode.AddCart)"> 加入购物车 </view>
-        <view class="buynow" @tap="showSkuPopup(SkuMode.BuyNow)"> 立即购买 </view>
+        <view class="payment" @tap="showSkuPopup(SkuMode.BuyNow)"> 立即购买 </view>
       </view>
     </view>
 
@@ -502,11 +504,11 @@ page {
   position: fixed;
   left: 0;
   right: 0;
-  bottom: 0;
+  bottom: calc((var(--window-bottom)));
   z-index: 1;
   background-color: #fff;
   height: 100rpx;
-  padding: 0 20rpx var(--window-bottom);
+  padding: 0 20rpx;
   border-top: 1rpx solid #eaeaea;
   display: flex;
   justify-content: space-between;
@@ -525,17 +527,18 @@ page {
     .addcart {
       background-color: #ffa868;
     }
-    .buynow,
     .payment {
       background-color: #27ba9b;
       margin-left: 20rpx;
     }
   }
   .icons {
-    padding-right: 10rpx;
+    padding-right: 20rpx;
     display: flex;
     align-items: center;
     flex: 1;
+    // 兼容 H5 端和 App 端的导航链接样式
+    .navigator-wrap,
     .icons-button {
       flex: 1;
       text-align: center;
diff --git a/src/pages/index/components/CategoryPanel.vue b/src/pages/index/components/CategoryPanel.vue
index 4a6134a..6872f0c 100644
--- a/src/pages/index/components/CategoryPanel.vue
+++ b/src/pages/index/components/CategoryPanel.vue
@@ -7,8 +7,12 @@
       v-for="item in props.list"
       :key="item.id"
     >
-      <image class="icon" :src="item.icon"></image>
-      <text class="text">{{ item.name }}</text>
+      <view>
+        <image class="icon" :src="item.icon"></image>
+      </view>
+      <view>
+        <text class="text">{{ item.name }}</text>
+      </view>
     </navigator>
   </view>
 </template>
@@ -22,30 +26,5 @@ const props = defineProps<{
 </script>
 
 <style lang="scss">
-/* 前台类目 */
-.category {
-  margin: 20rpx 0 0;
-  padding: 10rpx 0;
-  display: flex;
-  flex-wrap: wrap;
-  min-height: 328rpx;
-
-  .category-item {
-    width: 150rpx;
-    display: flex;
-    justify-content: center;
-    flex-direction: column;
-    align-items: center;
-    box-sizing: border-box;
-
-    .icon {
-      width: 100rpx;
-      height: 100rpx;
-    }
-    .text {
-      font-size: 26rpx;
-      color: #666;
-    }
-  }
-}
+@import './styles/CategoryPanel.scss';
 </style>
diff --git a/src/pages/index/components/HotPanel.vue b/src/pages/index/components/HotPanel.vue
index 7108778..ebd61e0 100644
--- a/src/pages/index/components/HotPanel.vue
+++ b/src/pages/index/components/HotPanel.vue
@@ -29,62 +29,5 @@ defineProps<{
 </script>
 
 <style lang="scss">
-/* 热门推荐 */
-.hot {
-  display: flex;
-  flex-wrap: wrap;
-  min-height: 508rpx;
-  margin: 20rpx 20rpx 0;
-  border-radius: 10rpx;
-  background-color: #fff;
-
-  .title {
-    display: flex;
-    align-items: center;
-    padding: 24rpx 24rpx 0;
-    font-size: 32rpx;
-    color: #262626;
-    position: relative;
-
-    .title-desc {
-      font-size: 24rpx;
-      color: #7f7f7f;
-      margin-left: 18rpx;
-    }
-  }
-
-  .item {
-    display: flex;
-    flex-direction: column;
-    width: calc(50% - 1rpx);
-    height: 254rpx;
-    border-right: 1rpx solid #eee;
-    border-top: 1rpx solid #eee;
-
-    .title {
-      justify-content: start;
-    }
-
-    &:nth-child(2n) {
-      border-right: 0 none;
-    }
-
-    &:nth-child(-n + 2) {
-      border-top: 0 none;
-    }
-
-    .image {
-      width: 150rpx;
-      height: 150rpx;
-    }
-  }
-
-  .cards {
-    flex: 1;
-    padding: 15rpx 20rpx;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
-}
+@import './styles/HotPanel.scss';
 </style>
diff --git a/src/pages/index/components/PageSkeleton.vue b/src/pages/index/components/PageSkeleton.vue
index 5c5e502..f6129ca 100644
--- a/src/pages/index/components/PageSkeleton.vue
+++ b/src/pages/index/components/PageSkeleton.vue
@@ -146,7 +146,13 @@
   </view>
 </template>
 
-<style>
+<style lang="scss">
+// #ifdef H5
+@import '@/components/styles/JbcSwiper.scss';
+@import './styles/CategoryPanel.scss';
+@import './styles/HotPanel.scss';
+// #endif
+
 .sk-transparent {
   color: transparent !important;
 }
diff --git a/src/pages/index/components/styles/CategoryPanel.scss b/src/pages/index/components/styles/CategoryPanel.scss
new file mode 100644
index 0000000..a0e69fe
--- /dev/null
+++ b/src/pages/index/components/styles/CategoryPanel.scss
@@ -0,0 +1,26 @@
+/* 前台类目 */
+.category {
+  margin: 20rpx 0 0;
+  padding: 10rpx 0;
+  display: flex;
+  flex-wrap: wrap;
+  min-height: 328rpx;
+
+  .category-item {
+    width: 150rpx;
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+    align-items: center;
+    box-sizing: border-box;
+
+    .icon {
+      width: 100rpx;
+      height: 100rpx;
+    }
+    .text {
+      font-size: 26rpx;
+      color: #666;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/pages/index/components/styles/HotPanel.scss b/src/pages/index/components/styles/HotPanel.scss
new file mode 100644
index 0000000..f506af9
--- /dev/null
+++ b/src/pages/index/components/styles/HotPanel.scss
@@ -0,0 +1,58 @@
+/* 热门推荐 */
+.hot {
+  display: flex;
+  flex-wrap: wrap;
+  min-height: 508rpx;
+  margin: 20rpx 20rpx 0;
+  border-radius: 10rpx;
+  background-color: #fff;
+
+  .title {
+    display: flex;
+    align-items: center;
+    padding: 24rpx 24rpx 0;
+    font-size: 32rpx;
+    color: #262626;
+    position: relative;
+
+    .title-desc {
+      font-size: 24rpx;
+      color: #7f7f7f;
+      margin-left: 18rpx;
+    }
+  }
+
+  .item {
+    display: flex;
+    flex-direction: column;
+    width: calc(50% - 1rpx);
+    height: 254rpx;
+    border-right: 1rpx solid #eee;
+    border-top: 1rpx solid #eee;
+
+    .title {
+      justify-content: start;
+    }
+
+    &:nth-child(2n) {
+      border-right: 0 none;
+    }
+
+    &:nth-child(-n + 2) {
+      border-top: 0 none;
+    }
+
+    .image {
+      width: 150rpx;
+      height: 150rpx;
+    }
+  }
+
+  .cards {
+    flex: 1;
+    padding: 15rpx 20rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+}
\ No newline at end of file
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 45b3d66..7c220a4 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -5,15 +5,19 @@
     </view>
     <view class="login">
       <!-- 网页端表单登录 -->
-      <!-- <input class="input" type="text" placeholder="请输入用户名/手机号码" />
+      <!-- #ifdef H5 -->
+      <input class="input" type="text" placeholder="请输入用户名/手机号码" />
       <input class="input" type="text" password placeholder="请输入密码" />
-      <button class="button phone">登录</button> -->
+      <button class="button phone">登录</button>
+      <!-- #endif -->
 
       <!-- 小程序端授权登录 -->
+      <!-- #ifdef MP-WEIXIN -->
       <button class="button phone" @getphonenumber="onGetPhoneNumber">
         <text class="icon icon-phone"></text>
         手机号快捷登录
       </button>
+      <!-- #endif -->
       <view class="extra">
         <view class="caption">
           <text>其他登录方式</text>
@@ -40,6 +44,7 @@ import type { LoginResult } from '@/types/member'
 // 会员信息
 const memberStore = useMemberStore()
 
+// #ifdef MP-WEIXIN
 const code = ref('')
 onLoad(async () => {
   const res = await wx.login()
@@ -59,16 +64,10 @@ const onGetPhoneNumber: UniHelper.ButtonOnGetphonenumber = async (e) => {
     res.result && loginSucess(res.result)
   }
 }
+// #endif
 
 // 模拟快捷登录
 const handlePhoneLogin = async () => {
-  if (!code.value) {
-    uni.showToast({
-      title: '请先授权登录',
-      icon: 'none',
-    })
-    return
-  }
   const res = await postPhoneNumberLoginMockAPI({
     phoneNumber: '13800138000',
   })
@@ -84,7 +83,20 @@ const loginSucess = (profile: LoginResult) => {
     icon: 'none',
   })
   setTimeout(() => {
+    // #ifdef MP-WEIXIN
     uni.navigateBack()
+    // #endif
+
+    // #ifdef H5
+    // 获取当前页面栈
+    const pages = getCurrentPages()
+    const hasBack = pages.length > 1
+    if (hasBack) {
+      uni.navigateBack()
+    } else {
+      uni.switchTab({ url: '/pages/index/index' })
+    }
+    // #endif
   }, 500)
 }
 </script>
diff --git a/src/pages/my/my.vue b/src/pages/my/my.vue
index 99066a2..9a4212d 100644
--- a/src/pages/my/my.vue
+++ b/src/pages/my/my.vue
@@ -57,7 +57,9 @@
           {{ item.text }}
         </navigator>
         <!-- 客服 -->
+        <!-- #ifdef MP-WEIXIN -->
         <button class="contact icon-handset" open-type="contact">售后</button>
+        <!-- #endif -->
       </view>
     </view>
     <!-- 猜你喜欢 -->
diff --git a/src/pagesMember/settings/settings.vue b/src/pagesMember/settings/settings.vue
index 957893f..9299d98 100644
--- a/src/pagesMember/settings/settings.vue
+++ b/src/pagesMember/settings/settings.vue
@@ -7,11 +7,13 @@
       </navigator>
     </view>
     <!-- 列表2 -->
+    <!-- #ifdef MP-WEIXIN -->
     <view class="list">
       <button hover-class="none" class="item arrow" open-type="openSetting">授权管理</button>
       <button hover-class="none" class="item arrow" open-type="feedback">问题反馈</button>
       <button hover-class="none" class="item arrow" open-type="contact">联系我们</button>
     </view>
+    <!-- #endif -->
     <!-- 列表3 -->
     <view class="list">
       <navigator hover-class="none" class="item arrow" url="">关于金佰川</navigator>
diff --git a/src/pagesOrder/detail/detail.vue b/src/pagesOrder/detail/detail.vue
index 52a8565..99e3117 100644
--- a/src/pagesOrder/detail/detail.vue
+++ b/src/pagesOrder/detail/detail.vue
@@ -364,14 +364,23 @@ const handlePay = async () => {
     res = await getMockPayParamsAPI({ orderId: query.id })
   } else {
     // 生产环境获取微信支付参数
+    // #ifdef MP-WEIXIN
     res = await getWechatPayParamsAPI({ orderId: query.id })
+    // #endif
+
+    // #ifdef H5
+    res = await getMockPayParamsAPI({ orderId: query.id })
+    // #endif
   }
   if (res.code === '1') {
     if (isDev) {
       uni.redirectTo({ url: `/pagesOrder/payment/payment?id=${query.id}` })
     } else {
       // 生产环境使用微信支付
+      // #ifdef MP-WEIXIN
       await wx.requestPayment(res.result as WechatMiniprogram.RequestPaymentOption)
+      // #endif
+
       uni.redirectTo({ url: `/pagesOrder/payment/payment?id=${query.id}` })
     }
   } else {