From 871eecb889b0b94b5ddb2f28afa130b2876a0752 Mon Sep 17 00:00:00 2001
From: fuchao <2577131060@qq.com>
Date: Thu, 4 Dec 2025 14:08:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9A=E5=A4=A9=E5=8C=BB?=
 =?UTF-8?q?=E5=B8=81=E3=80=81=E7=A7=AF=E5=88=86=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=B7=B3=E8=BD=AC=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E3=80=82=E4=BF=AE=E6=94=B9=E6=B4=BB=E5=8A=A8=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E=E5=AD=97=E4=BD=93=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/config.ts                 |  2 +-
 pages/user/order/details.vue  |  4 +--
 pages/user/points/index.vue   | 12 ++++++++-
 pages/user/recharge/index.vue | 46 ++++++++++++++++++++++++++++++-----
 pages/user/virtual/index.vue  | 12 ++++++++-
 5 files changed, 65 insertions(+), 11 deletions(-)

diff --git a/api/config.ts b/api/config.ts
index f437afb..24e0a21 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/pages/user/order/details.vue b/pages/user/order/details.vue
index f81dab3..3794704 100644
--- a/pages/user/order/details.vue
+++ b/pages/user/order/details.vue
@@ -23,7 +23,7 @@
           <text class="text-red-500 text-lg font-bold">{{ `- ${order.jfDeduction}` }}</text>
         </wd-cell>
         <wd-cell title="实付金额">
-          <text class="text-red-500 text-lg font-bold">{{ `${order.realMoney}` }}</text> {{ $t('global.coin') }}
+          <text class="text-red-500 text-lg font-bold">{{ `${order.realMoney}` }}</text> {{ order.orderType === 'point' ? 'NZ$' : $t('global.coin') }}
         </wd-cell>
       </wd-cell-group>
 
@@ -36,7 +36,7 @@
           <wd-icon name="file-copy" size="14px" color="#65A1FA" class="ml-1!" @click="copyToClipboard(order.orderSn)"></wd-icon>
         </wd-cell>
         <wd-cell title="创建时间" :value="order.createTime" />
-        <wd-cell title="付款时间" :value="order.paymentDate" />
+        <wd-cell title="付款时间" :value="order.paymentDate" v-if="order.paymentDate"/>
       </wd-cell-group>
     </view>
 
diff --git a/pages/user/points/index.vue b/pages/user/points/index.vue
index 51294a2..91cc2e2 100644
--- a/pages/user/points/index.vue
+++ b/pages/user/points/index.vue
@@ -11,7 +11,7 @@
 				<view><wd-icon name="arrow-right" size="16px" color="#fff" /></view>
 			</view>
 			<view class="title">{{$t('order.pointsRecord')}}</view>
-			<view class="recharge-record-block" v-for="(item, index) in bookList" :key="index">
+			<view class="recharge-record-block" v-for="(item, index) in bookList" :key="index" @click="toDetails(item)">
 				<view class="recharge-record-block-row">{{item.remark.slice(0, (item.remark.indexOf('：')))}}<text
 						:class="item.actType === 1 ? 'text1' : 'text2'">{{item.actType === 1 ? '' : '+'}}{{item.changeAmount}}</text>
 				</view>
@@ -64,6 +64,16 @@
 			url: '/pages/user/recharge/index'
 		})
 	}
+	
+	/**
+	 * 跳转订单详情
+	 */
+	const toDetails = (order: IOrder) => {
+		console.log(order.relationId, "order");
+	  uni.navigateTo({
+	    url: '/pages/user/order/details?orderId=' + order.relationId
+	  })
+	}
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/user/recharge/index.vue b/pages/user/recharge/index.vue
index d27af79..51a1af0 100644
--- a/pages/user/recharge/index.vue
+++ b/pages/user/recharge/index.vue
@@ -8,16 +8,17 @@
 				<view class="recharge_block" @click="chosPric(item)"
 					:class="aloneItem.priceTypeId === item.priceTypeId ? 'selected' : ''"
 					v-for="item in rechargeList.bookBuyConfigList" :key="item.priceTypeId">
-					<view class="recharge_money">￥{{item.realMoney}}</view>
+					<view class="recharge_money">NZ${{item.realMoney}}</view>
 					<view style="font-size: 26rpx;">{{item.money}}{{ $t('global.coin') }}</view>
 					<!-- 红框位置的618活动标签 -->
 					<!-- <view class="activity-tag">618活动</view> -->
 					<span class="activity-label" v-if="item.givejf >0">{{item.description}}</span>
-					<text class="recharge_give" v-if="item.givejf >0">（{{$t('order.give')}}{{item.givejf}}{{$t('order.points')}}）</text>
+					<text class="recharge_give"
+						v-if="item.givejf >0">（{{$t('order.give')}}{{item.givejf}}{{$t('order.points')}}）</text>
 				</view>
 			</view>
 		</view>
-		<view class="activity-container">
+		<view class="active_block" v-if="remark?.remark">
 			<view v-html="remark.remark"></view>
 		</view>
 		<view class="cha_fangsh">
@@ -100,7 +101,7 @@
 	const popup = ref(null)
 	const agreemenState = ref(false)
 	// 协议id
-	const id = ref(101)
+	const id = ref(116)
 
 	const richTextContent = ref('');
 	// 协议数据
@@ -347,8 +348,7 @@
 		try {
 			const text = ref(await getActivityDescription())
 			remark.value = text.value.res[0]
-			// console.log(remark.value, '活动说明内容');
-
+			console.log(remark.value, '活动说明内容');
 		} catch (error) {
 			console.error('获取协议数据:', error)
 		}
@@ -542,4 +542,38 @@
 			overflow-y: scroll
 		}
 	}
+
+	.active_block {
+		background-color: rgba(37, 143, 235, 0.2);
+		margin: 0 30rpx 20rpx 30rpx;
+		border-radius: 10rpx; 
+		padding: 15rpx;
+		font-size: 28rpx;
+		color: #333;
+	}
+
+	::v-deep.active_block span {
+		color: red;
+		font-size: 32rpx;
+		font-weight: bold;
+		padding: 0 5rpx;
+		color: red;
+		font-size: 32rpx;
+		font-weight: bold;
+	}
+
+	::v-deep.active_block span:first-child {
+		padding: 0 5rpx 0 0;
+	}
+
+	::v-deep.active_block p {
+		padding-top: 10rpx;
+		color: #666;
+		font-size: 24rpx;
+		line-height: 34rpx;
+	}
+
+	::v-deep.active_block p span {
+		padding: 0 5rpx !important;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/user/virtual/index.vue b/pages/user/virtual/index.vue
index 6403ca2..2e1cf01 100644
--- a/pages/user/virtual/index.vue
+++ b/pages/user/virtual/index.vue
@@ -14,7 +14,7 @@
 				<view><wd-icon name="arrow-right" size="16px" color="#fff" /></view>
 			</view>
 			<view class="title">{{$t('order.rechargeConsumptionList')}}</view>
-			<view class="recharge-record-block" v-for="(item, index) in bookList" :key="index">
+			<view class="recharge-record-block" v-for="(item, index) in bookList" :key="index" @click="toDetails(item)">
 				<view class="recharge-record-block-row">{{item.orderType}}<text
 						:class="item.orderType !== '充值' ? 'text1' : 'text2'">{{item.orderType !== '充值' ? '' : '+'}}{{item.changeAmount}}</text>
 				</view>
@@ -70,6 +70,16 @@
 			url: '/pages/user/recharge/index'
 		})
 	}
+	
+	/**
+	 * 跳转订单详情
+	 */
+	const toDetails = (order: IOrder) => {
+		console.log(order.relationId, "order");
+	  uni.navigateTo({
+	    url: '/pages/user/order/details?orderId=' + order.relationId
+	  })
+	}
 </script>
 
 <style lang="scss" scoped>