修复:解决隐私政策查看问题;解决积分支付bug;

This commit is contained in:
2025-12-04 15:16:30 +08:00
parent 871eecb889
commit a7360e6459
6 changed files with 21 additions and 11 deletions

View File

@@ -313,10 +313,10 @@ const calculateFinalPrice = () => {
const couponAmount = 0 const couponAmount = 0
// 计算最大可用积分 // 计算最大可用积分
const orderAmountAfterDiscount = totalAmount.value - promotionDiscounted.value - vipDiscounted.value const orderAmountAfterDiscount = totalAmount.value - promotionDiscounted.value - vipDiscounted.value - couponAmount
pointsUsableMax.value = Math.min( pointsUsableMax.value = Math.min(
props?.userInfo?.jf || 0, props?.userInfo?.jf || 0,
Math.floor(orderAmountAfterDiscount - couponAmount) Math.floor(props.allowPointPay ? orderAmountAfterDiscount : 0)
) )
pointsDiscounted.value = pointsUsableMax.value pointsDiscounted.value = pointsUsableMax.value
@@ -331,7 +331,7 @@ const calculateFinalPrice = () => {
0, 0,
totalAmount.value - couponAmount - pointsDiscounted.value - promotionDiscounted.value - vipDiscounted.value totalAmount.value - couponAmount - pointsDiscounted.value - promotionDiscounted.value - vipDiscounted.value
) )
finalAmount.value = result finalAmount.value = parseFloat(result.toPrecision(12))
} }
/** /**

View File

@@ -2,8 +2,8 @@
"name" : "吴门国际", "name" : "吴门国际",
"appid" : "__UNI__1250B39", "appid" : "__UNI__1250B39",
"description" : "吴门国际", "description" : "吴门国际",
"versionName" : "1.0.6", "versionName" : "1.0.7",
"versionCode" : 106, "versionCode" : 107,
"transformPx" : false, "transformPx" : false,
/* 5+App */ /* 5+App */
"app-plus" : { "app-plus" : {
@@ -19,6 +19,15 @@
"autoclose" : true, "autoclose" : true,
"delay" : 0 "delay" : 0
}, },
"privacy" : {
"prompt" : "template",
"template" : {
"title" : "用户协议和隐私政策",
"message" : " 请你务必审慎阅读、充分理解“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>  你可阅读<a href='https://www.amazinglimited.com/agreement.html'>《用户协议》</a> 和 <a href='https://www.amazinglimited.com/privacy.html'>《隐私协议》</a>了解详细信息。如果你同意,请点击下面按钮开始接受我们的服务。",
"buttonAccept" : "同意",
"buttonRefuse" : "暂不同意"
}
},
/* */ /* */
"modules" : { "modules" : {
"Camera" : {}, "Camera" : {},

View File

@@ -59,14 +59,16 @@ const orderType = ref<string>('')
onLoad(async () => { onLoad(async () => {
try { try {
// 获取商品列表 // 获取商品列表
uni.$on('selectedGoods', (data: IOrderGoods) => { await uni.$on('selectedGoods', async (data: IOrderGoods) => {
// 获取用户信息
await getUserInfo()
// 处理商品数据
console.log('监听到传入的商品数据:', data) console.log('监听到传入的商品数据:', data)
isLengthen.value = data.state !== null isLengthen.value = data.state !== null
orderType.value = data.orderType || '' orderType.value = data.orderType || ''
goodsList.value = [ data ] goodsList.value = [ data ]
}) })
// 获取用户信息
getUserInfo()
} catch (error) { } catch (error) {
console.error('解析商品数据失败:', error) console.error('解析商品数据失败:', error)
uni.showToast({ uni.showToast({

View File

@@ -86,7 +86,7 @@
const sysStore = useSysStore() const sysStore = useSysStore()
// 默认头像 // 默认头像
const defaultAvatar = '/static/home_icon.png' const defaultAvatar = '/static/logo.png'
// 用户信息 // 用户信息
const userInfo = computed(() => userStore.userInfo) const userInfo = computed(() => userStore.userInfo)

View File

@@ -26,7 +26,6 @@
:class="{ 'package-card--popular': vip.isRecommend }" :class="{ 'package-card--popular': vip.isRecommend }"
v-for="(vip, index) in vipList" v-for="(vip, index) in vipList"
:key="index" :key="index"
@click="selectPackage(vip)"
> >
<view class="package-header"> <view class="package-header">
<view class="package-title-wrapper"> <view class="package-title-wrapper">