From 5c0036acfd9b878389db170eda642cf448e0cb70 Mon Sep 17 00:00:00 2001 From: lumoney <1162260777@qq.com> Date: Sat, 10 Jan 2026 21:30:50 +0800 Subject: [PATCH] =?UTF-8?q?fix(other):=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/ci.yaml | 4 ++-- package.json | 4 ++-- pnpm-workspace.yaml | 1 + src/pages/goods/pay/index.vue | 2 +- src/pages/users/order_list_detail/index.vue | 5 ++++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index d257594..06fa22e 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -39,7 +39,7 @@ jobs: ACTOR: ${{ gitea.actor }} COMMIT_MSG: ${{ gitea.event.head_commit.message }} run: | - apk add --no-cache curl jq + sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && apk add --no-cache curl jq EMOJI=$( [ "$STATUS" = "success" ] && echo "✅ 构建成功" || echo "❌ 构建失败" ) MSG="$(printf "%s\n**项目**: %s (构建 #%s)\n**分支**: %s\n**提交**: %s\n**作者**: %s\n**信息**: %s\n**详情**: [查看构建详情](%s)" \ "$EMOJI" "$REPO" "${{ gitea.run_number }}" "$BRANCH" "$COMMIT" "$ACTOR" "$(echo "$COMMIT_MSG" | tr '\n' ' ' | tr -s ' ')" "$RUN_URL")" @@ -78,7 +78,7 @@ jobs: ACTOR: ${{ gitea.actor }} COMMIT_MSG: ${{ gitea.event.head_commit.message }} run: | - apk add --no-cache curl jq + sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && apk add --no-cache curl jq EMOJI=$( [ "$STATUS" = "success" ] && echo "✅ 构建成功" || echo "❌ 构建失败" ) MSG="$(printf "%s\n**项目**: %s (构建 #%s)\n**分支**: %s\n**提交**: %s\n**作者**: %s\n**信息**: %s\n**详情**: [查看构建详情](%s)" \ "$EMOJI" "$REPO" "${{ gitea.run_number }}" "$BRANCH" "$COMMIT" "$ACTOR" "$(echo "$COMMIT_MSG" | tr '\n' ' ' | tr -s ' ')" "$RUN_URL")" diff --git a/package.json b/package.json index b35a2fe..c4c8d93 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "jdt-user", - "version": "4.0.17", + "version": "4.0.18", "taroConfig": { - "version": "4.0.17" + "version": "4.0.18" }, "scripts": { "build:weapp": "taro build --type weapp", diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 0fa8810..b62539a 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -6,6 +6,7 @@ onlyBuiltDependencies: - core-js - core-js-pure - esbuild + - less - protobufjs - swiper - vue-demi diff --git a/src/pages/goods/pay/index.vue b/src/pages/goods/pay/index.vue index 0f51610..876eeeb 100644 --- a/src/pages/goods/pay/index.vue +++ b/src/pages/goods/pay/index.vue @@ -213,7 +213,7 @@ const confirmPay = async () => { }, complete: function () { setTimeout(() => { - Taro.redirectTo({ + Taro.reLaunch({ url: `/pages/users/order_list/index?type=0`, }); }, 2000); diff --git a/src/pages/users/order_list_detail/index.vue b/src/pages/users/order_list_detail/index.vue index 0cb13e9..06cb94d 100644 --- a/src/pages/users/order_list_detail/index.vue +++ b/src/pages/users/order_list_detail/index.vue @@ -268,6 +268,9 @@ Taro.useLoad(options => { type.value = options.type; oid.value = options.orderId; tId.value = Number(options.OrderType); +}); + +Taro.useDidShow(() => { Taro.getLocation({ type: 'wgs84', success: res => { @@ -277,7 +280,7 @@ Taro.useLoad(options => { }); // goodInfo.value = Taro.getStorageSync('item'); getOrderDetail(); -}); +}) const getOrderDetail = async () => { const res = await getActiveOrderDetail({