From cbc3465c578ced71918f9221f2816240f8f6315c Mon Sep 17 00:00:00 2001
From: liuyuan <582976274@qq.com>
Date: Mon, 19 May 2025 15:59:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manifest.json | 4 ++--
pages/home/index.vue | 2 +-
pages/visitor/detail.vue | 19 ++++++++++++++-----
pages/visitor/goods.vue | 12 ++++--------
pages/visitor/list.vue | 7 ++++++-
pages/wallet/recharge.vue | 26 +++++++++++---------------
static/icon/icon_IAP.png | Bin 0 -> 859 bytes
7 files changed, 38 insertions(+), 32 deletions(-)
create mode 100644 static/icon/icon_IAP.png
diff --git a/manifest.json b/manifest.json
index fadced8..eaccdbd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "心灵空间",
"appid" : "__UNI__BBBDFD2",
"description" : "心灵空间",
- "versionName" : "1.0.24",
- "versionCode" : 1024,
+ "versionName" : "1.0.21",
+ "versionCode" : 1021,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 85bae3b..238bf35 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -94,7 +94,7 @@
-
+
{{ item.title }}
暂无数据
diff --git a/pages/visitor/detail.vue b/pages/visitor/detail.vue
index 9567e94..e101fdb 100644
--- a/pages/visitor/detail.vue
+++ b/pages/visitor/detail.vue
@@ -41,11 +41,6 @@
{{ slotProps.data.title }}
-
-
-
@@ -217,6 +212,20 @@
});
return list;
},
+ toLogin(){
+ uni.showModal({
+ title: '提示',
+ content: '为了方便您后期用不同的设备查阅订购的记录，请先完成登录或注册。',
+ confirmText: '确认',
+ success(res){
+ if (res.confirm) {
+ uni.navigateTo({
+ url: '/pages/user/login'
+ })
+ }
+ }
+ })
+ }
}
};
diff --git a/pages/visitor/goods.vue b/pages/visitor/goods.vue
index 087577b..06b4b10 100644
--- a/pages/visitor/goods.vue
+++ b/pages/visitor/goods.vue
@@ -1,6 +1,6 @@
-
+
@@ -13,7 +13,7 @@
-
+
{{ curriculumData.productName }}
@@ -92,7 +92,7 @@
-
+
@@ -103,10 +103,6 @@
-
-
-
diff --git a/pages/visitor/list.vue b/pages/visitor/list.vue
index b84b2c8..e09314e 100644
--- a/pages/visitor/list.vue
+++ b/pages/visitor/list.vue
@@ -12,7 +12,7 @@
{{item.title}}
- 了解课程
+ 了解课程
@@ -74,6 +74,11 @@ export default {
this.statusNull = true;
}
});
+ },
+ goToDetail(item){
+ uni.navigateTo({
+ url: `/pages/visitor/detail?navTitle=${item.title}&title=${item.title}&id=${item.id}`,
+ });
}
}
};
diff --git a/pages/wallet/recharge.vue b/pages/wallet/recharge.vue
index 9511d5d..e94255c 100644
--- a/pages/wallet/recharge.vue
+++ b/pages/wallet/recharge.vue
@@ -116,7 +116,7 @@ export default {
iosPaylist: [{
title: "IAP 支付",
id: 3,
- imgUrl: require("@/static/icon/pay_2.png"),
+ imgUrl: require("@/static/icon/icon_IAP.png"),
}, ],
transaction: {
// 成功回调
@@ -280,7 +280,7 @@ export default {
});
const that = this;
let IAPOrders = [];
- IAPOrders.push('s' + that.stepsCj.priceTypeId);
+ IAPOrders.push('x' + that.stepsCj.priceTypeId);
// 新建订单
uni.showLoading({
title: "正在创建订单",
@@ -325,7 +325,7 @@ export default {
orderId: result.payment.username, // 系统订单号
receiptData: result.transactionReceipt, // 苹果返回收据
// sandBox: true, //测试数据
- // body: that.stepsCj.priceTypeId // 充值类型id
+ // body: that.stepsCj.priceTypeId //充值类型id
};
$http
.request({
@@ -345,11 +345,17 @@ export default {
icon: 'success'
})
// 服务器验证票据有效后在客户端关闭订单 (iapChannel.finishTransaction)
- //that.finishTransaction(result);
+ that.finishTransaction(result);
+ setTimeout(() => {
+ uni.switchTab({
+ url: '/pages/my/index'
+ })
+ }, 2000);
}
})
.catch((e) => {
uni.hideLoading()
+ that.finishTransaction(result);
uni.showModal({
title: "提示",
showCancel: false,
@@ -360,7 +366,6 @@ export default {
}
},
});
- //that.finishTransaction(result);
}, )
},
getDevName() {
@@ -428,14 +433,6 @@ export default {
let that = this;
that.payType = e;
},
- //ios充值
- iosPay() {
- // 苹果内购实现思路:
- // 1.先确认支付通道是否包含苹果内购
- // 2.检查一下是否存在上次未处理完的订单(主要是支付成功没有走回调的订单),异常订单直接关闭掉,成功没有走回调的提交给后台进行验证
- // 3.请求并创建新的订单
- this.iphonepay();
- },
// 充值
goToPay() {
this.kaiChar();
@@ -540,8 +537,7 @@ export default {
}
});
} else if (that.payType == 3) {
- console.log("苹果支付");
- that.iosPay();
+ that.iphonepay();
}
}
});
diff --git a/static/icon/icon_IAP.png b/static/icon/icon_IAP.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ba62801a91642e0546a59d8f4017bac63813845
GIT binary patch
literal 859
zcmV-h1ElPx&6-h)vR9HvFmt9B{Q547jXT~r}-B}8KGNOWz=(VJ5XV=Iw2ny1A2zrg8hXR8w
zXBiyP2csaU-h&>}w~#&rb7two0$(cnpie>wP1#xXrQDqptFG}i}Cg~NY9jgK`^+?bb`8Xi}
z&9d78^a9u-;uOGF08v9#`u*$+0<`t_%MGiO5l|m2KINW$`e;ew}(qxe(!$-&+&1>EhVdVKp)|Xw3M7LCOCs?$AS3uQkhNAKgPkRStUsXlC*(h;NDq2iW0AcO+H}k|fcA%6nck^4
zZkSmtAxkS3Pab6EM}-~mIEY?=q%UA+GZ-fUeh1(iNczN%BNIv60d6Vehlmb!g#wTB
z0ZhAx2~kfWVZaC}nS!*uE7m;QjgS3&Tl_Gix=5)B%mz!8z)oo3=15nU)~OZZ}hlx_I{
zmOTrg%3a8J3^jOK1VD=?--3CEkL{eHD%C{*;Hsf2Lj6FCCr81&yLf;CDPZv3ZZ&vH
zWCvpLoUldVjg=_#(uwGauE;z`+&R6SDj!4E>Sl5v3ddDyv^
z;)UG#H6y~Xoc?oEkJQd(?5|kU^-OD1J)!kKv%&m|5WJevvIGBi{2k!?fOG)hh9%t?
zJ3L6Tblj%~6mG{EXQd1zeksYm7aB+wQn5G%muDo)(w227%|euQEYHnr*)Arz5M{lZ
liT>rK*a_VYOK~i!`3r^8Z7@?)_*eh{002ovPDHLkV1i|MgdYF^
literal 0
HcmV?d00001