From a0904da41b981b3d773ef1b1d41f5ec154ce8187 Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Tue, 4 Nov 2025 16:11:38 +0800
Subject: [PATCH] =?UTF-8?q?feat(utils):=20=E6=B7=BB=E5=8A=A0toHttpsUrl?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=87=BD=E6=95=B0=E5=B9=B6=E5=BA=94=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加toHttpsUrl函数用于将http链接转换为https，并在多个组件和store中应用该函数
调整product-container和index页面的高度计算方式
---
 .../index/components/product-container.vue      |  4 +++-
 src/pages/index/index.vue                       | 13 +++++++++----
 src/pages/me/index.vue                          |  3 ++-
 src/pinia/stores/ab98-user.ts                   |  5 +++--
 src/pinia/stores/product.ts                     |  3 ++-
 src/utils/common.ts                             | 17 +++++++++++++++++
 src/utils/index.ts                              |  3 +++
 7 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/pages/index/components/product-container.vue b/src/pages/index/components/product-container.vue
index 1a8f04d..962bba0 100644
--- a/src/pages/index/components/product-container.vue
+++ b/src/pages/index/components/product-container.vue
@@ -227,7 +227,8 @@ function handleCheckout() {
 <style scoped lang="scss">
 .product-container {
   display: flex;
-  height: 100%;
+  // height: 100%;
+  height: calc(100vh - 150px);
   background: #f7f8fa;
   position: relative;
   overflow: hidden;
@@ -272,6 +273,7 @@ function handleCheckout() {
 
 .product-list {
   flex: 1;
+  height: calc(100vh - 150px);
   padding: 10px;
   background: #ffffff;
 }
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 356afa3..fd8feac 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -7,6 +7,7 @@ import { getShopListApi } from '@/api/shop'
 import type { ShopEntity } from '@/api/shop/types'
 import ProductContainer from './components/product-container.vue';
 import { mpCodeToOpenId } from '@/api/users'
+import { toHttpsUrl } from '@/utils'
 
 definePage({
   style: {
@@ -110,7 +111,7 @@ function handleCheckout() {
         <view v-for="shop in shopList" :key="shop.shopId" class="shop-col" @click="handleShopSelect(shop.shopId)">
           <view class="shop-item">
             <wd-img
-              :src="shop.coverImg || '/static/product-image.png'"
+              :src="toHttpsUrl(shop.coverImg) || '/static/product-image.png'"
               width="100%"
               height="80"
               mode="aspectFill"
@@ -139,7 +140,8 @@ function handleCheckout() {
 .shop-list {
   display: flex;
   flex-direction: column;
-  height: calc(100vh - 94px - env(safe-area-inset-top) - env(safe-area-inset-bottom));
+  // height: calc(100vh - 94px - env(safe-area-inset-top) - env(safe-area-inset-bottom));
+  height: 100vh;
   background: #f7f8fa;
   overflow: hidden;
   
@@ -152,8 +154,7 @@ function handleCheckout() {
 
   .shop-list-content {
     flex: 1;
-    overflow-y: auto;
-    overflow-x: hidden;
+    height: calc(100vh - 150px);
   }
 
   .shop-prompt {
@@ -171,10 +172,14 @@ function handleCheckout() {
   }
 
   .shop-row {
+    overflow-y: auto;
+    overflow-x: hidden;
     padding: 0 8px;
     display: flex;
     flex-wrap: wrap;
     gap: 8px;
+    flex: 1;
+    height: calc(100vh - 150px - 60px);
   }
 
   .shop-col {
diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue
index 420f1d9..98a0bc1 100644
--- a/src/pages/me/index.vue
+++ b/src/pages/me/index.vue
@@ -3,6 +3,7 @@ import { computed, onMounted } from 'vue'
 import { useWxStore } from '@/pinia/stores/wx'
 import { useAb98UserStore } from '@/pinia/stores/ab98-user'
 import { storeToRefs } from 'pinia'
+import { toHttpsUrl } from '@/utils'
 
 definePage({
   style: {
@@ -20,7 +21,7 @@ const name = computed(() => {
   return userName.value || qyName.value || '未知用户'
 })
 
-const userAvatar = computed(() => face_img.value ? face_img.value : '/static/logo.png')
+const userAvatar = computed(() => face_img.value ? toHttpsUrl(face_img.value) : '/static/logo.png')
 
 const ab98BalanceInYuan = computed(() => {
   if (ab98User.value && ab98User.value.ab98Balance !== undefined) {
diff --git a/src/pinia/stores/ab98-user.ts b/src/pinia/stores/ab98-user.ts
index 4b784fc..bc5b978 100644
--- a/src/pinia/stores/ab98-user.ts
+++ b/src/pinia/stores/ab98-user.ts
@@ -2,6 +2,7 @@ import { pinia } from "@/pinia"
 import { LoginData } from "@/api/ab98/types"
 import { defineStore } from "pinia"
 import { ref } from "vue"
+import { toHttpsUrl } from "@/utils"
 
 // 本地存储键名常量
 const STORAGE_KEYS = {
@@ -54,8 +55,8 @@ export const useAb98UserStore = defineStore("ab98User", () => {
    * @param data - 登录接口返回的用户数据
    */
   const setUserInfo = (data: LoginData) => {
-    face_img.value = data.face_img
-    uni.setStorageSync(STORAGE_KEYS.FACE, encodeURIComponent(data.face_img))
+    face_img.value = toHttpsUrl(data.face_img)
+    uni.setStorageSync(STORAGE_KEYS.FACE, encodeURIComponent(toHttpsUrl(data.face_img)))
     sex.value = data.sex
     uni.setStorageSync(STORAGE_KEYS.SEX, encodeURIComponent(data.sex))
     name.value = data.name
diff --git a/src/pinia/stores/product.ts b/src/pinia/stores/product.ts
index 842d806..b448ac7 100644
--- a/src/pinia/stores/product.ts
+++ b/src/pinia/stores/product.ts
@@ -2,6 +2,7 @@ import { ShopEntity } from "@/api/shop/types"
 import { pinia } from "@/pinia"
 import { getShopGoodsApi } from "@/api/shop"
 import { defineStore } from "pinia"
+import { toHttpsUrl } from "@/utils"
 
 export interface Product {
   id: number // 商品ID
@@ -55,7 +56,7 @@ export const useProductStore = defineStore("product", () => {
         price: g.price,
         stock: g.stock,
         description: g.goodsDetail || "暂无描述",
-        image: g.coverImg,
+        image: toHttpsUrl(g.coverImg),
         label: g.categoryId,
         cellId: g.cellId,
         usageInstruction: g.usageInstruction || "",
diff --git a/src/utils/common.ts b/src/utils/common.ts
index d8fa4be..07ed5c0 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -1,3 +1,20 @@
+/**
+ * 将URL中的 http:// 替换为 https://
+ * @param url 原始URL字符串
+ * @returns 替换后的URL字符串
+ */
+export function toHttpsUrl(url: string): string {
+  // 严格类型检查
+  if (typeof url !== 'string') {
+    return url;
+  }
+  // 检查是否以 http:// 开头
+  if (!/^http:\/\//i.test(url)) {
+    return url;
+  }
+  return url.replace(/^http:\/\//i, 'https://');
+}
+
 /**
  * 终极版URL参数解析函数（支持哈希内参数和各种异常格式）
  * @param url 任意格式的URL字符串
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 3f6339d..13c0b7a 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,5 +1,8 @@
 import { pages, subPackages } from '@/pages.json'
 import { isMpWeixin } from './platform'
+import { toHttpsUrl } from './common'
+
+export { toHttpsUrl }
 
 export function getLastPage() {
   // getCurrentPages() 至少有1个元素，所以不再额外判断