From 3adec4b6e58cb19cece346fea6aa8fd9f943cc7c Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Mon, 10 Nov 2025 17:39:58 +0800
Subject: [PATCH] =?UTF-8?q?fix(approval):=20=E6=8F=90=E4=BA=A4=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=97=B6=E6=A3=80=E6=9F=A5=E5=B9=B6=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=87=AD=E8=AF=81=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在提交审批表单前检查是否已上传图片，若未上传则提示用户选择图片
同时将订单页面的图片链接转换为https协议
---
 package.json                  |  2 +-
 src/pages/approval/submit.vue | 16 ++++++++++++++++
 src/pages/order/index.vue     |  7 ++++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index b61dea4..d85e3f9 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "build:h5": "uni build",
     "build:h5:test": "uni build --mode test",
     "build:h5:prod": "uni build --mode production",
-    "build": "uni build",
+    "build": "pnpm run build:mp-weixin",
     "build:test": "uni build --mode test",
     "build:prod": "uni build --mode production",
     "build:h5:ssr": "uni build --ssr",
diff --git a/src/pages/approval/submit.vue b/src/pages/approval/submit.vue
index eb672e5..52e0e5d 100644
--- a/src/pages/approval/submit.vue
+++ b/src/pages/approval/submit.vue
@@ -185,6 +185,22 @@ const validateForm = () => {
 const handleSubmit = async () => {
   if (!validateForm()) return
 
+  // 检查是否选择了图片，如果没有则自动调用chooseImages
+  if (uploadedFiles.value.length === 0) {
+    uni.showModal({
+      title: '提示',
+      content: '请先上传凭证图片',
+      confirmText: '选择图片',
+      cancelText: '取消',
+      success: (res) => {
+        if (res.confirm) {
+          chooseImages()
+        }
+      },
+    })
+    return
+  }
+
   submitting.value = true
   try {
     // 组装图片URL
diff --git a/src/pages/order/index.vue b/src/pages/order/index.vue
index 5ea8245..fb530f5 100644
--- a/src/pages/order/index.vue
+++ b/src/pages/order/index.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 import { useOrderStore } from '@/pinia/stores/order'
-import { useWxStore } from '@/pinia/stores/wx'
+import { useWxStore } from '@/pinia/stores/wx';
+import { toHttpsUrl } from '@/utils'
 
 definePage({
   style: {
@@ -85,7 +86,7 @@ onMounted(() => {
                 class="goods-item"
               >
                 <image
-                  :src="goods.goodsInfo?.coverImg"
+                  :src="toHttpsUrl(goods.goodsInfo?.coverImg)"
                   mode="aspectFill"
                   class="product-image"
                 />
@@ -134,7 +135,7 @@ onMounted(() => {
                 class="goods-item"
               >
                 <image
-                  :src="goods.goodsInfo?.coverImg"
+                  :src="toHttpsUrl(goods.goodsInfo?.coverImg)"
                   mode="aspectFill"
                   class="product-image"
                 />