diff --git a/api/config.ts b/api/config.ts
index 24e0a21..5b3a64c 100644
--- a/api/config.ts
+++ b/api/config.ts
@@ -7,7 +7,7 @@ export const ENV = process.env.NODE_ENV || 'development';
*/
const BASE_URL_MAP = {
development: {
- //MAIN: 'http://192.168.110.100:9300/pb/', // 张川川
+ // MAIN: 'http://192.168.110.100:9300/pb/', // 张川川
MAIN: 'https://global.nuttyreading.com/', // 线上
// PAYMENT: 'https://dev-pay.example.com', // 暂时用不到
// CDN: 'https://cdn-dev.example.com', // 暂时用不到
diff --git a/components/order/Confirm.vue b/components/order/Confirm.vue
index 3cee5cd..f27417f 100644
--- a/components/order/Confirm.vue
+++ b/components/order/Confirm.vue
@@ -313,10 +313,10 @@ const calculateFinalPrice = () => {
const couponAmount = 0
// 计算最大可用积分
- const orderAmountAfterDiscount = totalAmount.value - promotionDiscounted.value - vipDiscounted.value
+ const orderAmountAfterDiscount = totalAmount.value - promotionDiscounted.value - vipDiscounted.value - couponAmount
pointsUsableMax.value = Math.min(
props?.userInfo?.jf || 0,
- Math.floor(orderAmountAfterDiscount - couponAmount)
+ Math.floor(props.allowPointPay ? orderAmountAfterDiscount : 0)
)
pointsDiscounted.value = pointsUsableMax.value
@@ -331,7 +331,7 @@ const calculateFinalPrice = () => {
0,
totalAmount.value - couponAmount - pointsDiscounted.value - promotionDiscounted.value - vipDiscounted.value
)
- finalAmount.value = result
+ finalAmount.value = parseFloat(result.toPrecision(12))
}
/**
diff --git a/manifest.json b/manifest.json
index 5d00489..2258c2c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "吴门国际",
"appid" : "__UNI__1250B39",
"description" : "吴门国际",
- "versionName" : "1.0.6",
- "versionCode" : 106,
+ "versionName" : "1.0.7",
+ "versionCode" : 107,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
@@ -19,6 +19,15 @@
"autoclose" : true,
"delay" : 0
},
+ "privacy" : {
+ "prompt" : "template",
+ "template" : {
+ "title" : "用户协议和隐私政策",
+ "message" : " 请你务必审慎阅读、充分理解“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
你可阅读《用户协议》 和 《隐私协议》了解详细信息。如果你同意,请点击下面按钮开始接受我们的服务。",
+ "buttonAccept" : "同意",
+ "buttonRefuse" : "暂不同意"
+ }
+ },
/* 模块配置 */
"modules" : {
"Camera" : {},
diff --git a/pages/order/vipConfirm.vue b/pages/order/vipConfirm.vue
index cff3b34..b4d1081 100644
--- a/pages/order/vipConfirm.vue
+++ b/pages/order/vipConfirm.vue
@@ -59,14 +59,16 @@ const orderType = ref('')
onLoad(async () => {
try {
// 获取商品列表
- uni.$on('selectedGoods', (data: IOrderGoods) => {
+ await uni.$on('selectedGoods', async (data: IOrderGoods) => {
+ // 获取用户信息
+ await getUserInfo()
+
+ // 处理商品数据
console.log('监听到传入的商品数据:', data)
isLengthen.value = data.state !== null
orderType.value = data.orderType || ''
goodsList.value = [ data ]
})
- // 获取用户信息
- getUserInfo()
} catch (error) {
console.error('解析商品数据失败:', error)
uni.showToast({
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 1d232e8..3cd324b 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -86,7 +86,7 @@
const sysStore = useSysStore()
// 默认头像
- const defaultAvatar = '/static/home_icon.png'
+ const defaultAvatar = '/static/logo.png'
// 用户信息
const userInfo = computed(() => userStore.userInfo)
diff --git a/pages/vip/book.vue b/pages/vip/book.vue
index d166c86..ec94826 100644
--- a/pages/vip/book.vue
+++ b/pages/vip/book.vue
@@ -26,7 +26,6 @@
:class="{ 'package-card--popular': vip.isRecommend }"
v-for="(vip, index) in vipList"
:key="index"
- @click="selectPackage(vip)"
>