fix(other): bug修复
This commit is contained in:
@@ -39,7 +39,7 @@ jobs:
|
|||||||
ACTOR: ${{ gitea.actor }}
|
ACTOR: ${{ gitea.actor }}
|
||||||
COMMIT_MSG: ${{ gitea.event.head_commit.message }}
|
COMMIT_MSG: ${{ gitea.event.head_commit.message }}
|
||||||
run: |
|
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 "❌ 构建失败" )
|
EMOJI=$( [ "$STATUS" = "success" ] && echo "✅ 构建成功" || echo "❌ 构建失败" )
|
||||||
MSG="$(printf "%s\n**项目**: %s (构建 #%s)\n**分支**: %s\n**提交**: %s\n**作者**: %s\n**信息**: %s\n**详情**: [查看构建详情](%s)" \
|
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")"
|
"$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 }}
|
ACTOR: ${{ gitea.actor }}
|
||||||
COMMIT_MSG: ${{ gitea.event.head_commit.message }}
|
COMMIT_MSG: ${{ gitea.event.head_commit.message }}
|
||||||
run: |
|
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 "❌ 构建失败" )
|
EMOJI=$( [ "$STATUS" = "success" ] && echo "✅ 构建成功" || echo "❌ 构建失败" )
|
||||||
MSG="$(printf "%s\n**项目**: %s (构建 #%s)\n**分支**: %s\n**提交**: %s\n**作者**: %s\n**信息**: %s\n**详情**: [查看构建详情](%s)" \
|
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")"
|
"$EMOJI" "$REPO" "${{ gitea.run_number }}" "$BRANCH" "$COMMIT" "$ACTOR" "$(echo "$COMMIT_MSG" | tr '\n' ' ' | tr -s ' ')" "$RUN_URL")"
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
{
|
{
|
||||||
"name": "jdt-user",
|
"name": "jdt-user",
|
||||||
"version": "4.0.17",
|
"version": "4.0.18",
|
||||||
"taroConfig": {
|
"taroConfig": {
|
||||||
"version": "4.0.17"
|
"version": "4.0.18"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build:weapp": "taro build --type weapp",
|
"build:weapp": "taro build --type weapp",
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ onlyBuiltDependencies:
|
|||||||
- core-js
|
- core-js
|
||||||
- core-js-pure
|
- core-js-pure
|
||||||
- esbuild
|
- esbuild
|
||||||
|
- less
|
||||||
- protobufjs
|
- protobufjs
|
||||||
- swiper
|
- swiper
|
||||||
- vue-demi
|
- vue-demi
|
||||||
|
|||||||
@@ -213,7 +213,7 @@ const confirmPay = async () => {
|
|||||||
},
|
},
|
||||||
complete: function () {
|
complete: function () {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
Taro.redirectTo({
|
Taro.reLaunch({
|
||||||
url: `/pages/users/order_list/index?type=0`,
|
url: `/pages/users/order_list/index?type=0`,
|
||||||
});
|
});
|
||||||
}, 2000);
|
}, 2000);
|
||||||
|
|||||||
@@ -268,6 +268,9 @@ Taro.useLoad(options => {
|
|||||||
type.value = options.type;
|
type.value = options.type;
|
||||||
oid.value = options.orderId;
|
oid.value = options.orderId;
|
||||||
tId.value = Number(options.OrderType);
|
tId.value = Number(options.OrderType);
|
||||||
|
});
|
||||||
|
|
||||||
|
Taro.useDidShow(() => {
|
||||||
Taro.getLocation({
|
Taro.getLocation({
|
||||||
type: 'wgs84',
|
type: 'wgs84',
|
||||||
success: res => {
|
success: res => {
|
||||||
@@ -277,7 +280,7 @@ Taro.useLoad(options => {
|
|||||||
});
|
});
|
||||||
// goodInfo.value = Taro.getStorageSync('item');
|
// goodInfo.value = Taro.getStorageSync('item');
|
||||||
getOrderDetail();
|
getOrderDetail();
|
||||||
});
|
})
|
||||||
|
|
||||||
const getOrderDetail = async () => {
|
const getOrderDetail = async () => {
|
||||||
const res = await getActiveOrderDetail({
|
const res = await getActiveOrderDetail({
|
||||||
|
|||||||
Reference in New Issue
Block a user