From 18dc0380f6d7b729599e1482c4f7842e5a6ab6ab Mon Sep 17 00:00:00 2001
From: 18631081161 <2088094923@qq.com>
Date: Sun, 23 Mar 2025 14:10:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
custom-tab-bar/index.js | 2 +-
pages/shouye/detail.vue | 2968 ++++++++++++++++----------------
pages/shouye/detail_wuxian.vue | 24 +-
pages/user/change.vue | 510 +++---
4 files changed, 1744 insertions(+), 1760 deletions(-)
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index e50d588..2bc2887 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -29,7 +29,7 @@ Component({
"pagePath": "/pages/infinite/index",
"iconPath": "/static/tabbar/m2.png",
"selectedIconPath": "/static/tabbar/s2.png",
- "text": "积分"
+ "text": "福利"
},
{
"index": 4,
diff --git a/pages/shouye/detail.vue b/pages/shouye/detail.vue
index d8521db..9e624c5 100644
--- a/pages/shouye/detail.vue
+++ b/pages/shouye/detail.vue
@@ -2,1629 +2,1631 @@
盒子详情
-->
-
-
-
-
- {{ $c.detailPageTitle((pageData && pageData.goods) || "") }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- 确认订单
-
-
-
-
-
+
+
+
+
+ 确认订单
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
- {{ orderData.goods.title }}
-
+
+
+ {{ orderData.goods.title }}
+
- 类型:明信片
+ 类型:明信片
- 0
">
-
-
- ¥
- {{ orderData.goods.shou_zhe_price }}
- 积分
- (首抽5折)
-
+
+
+ ¥
+ {{ orderData.goods.shou_zhe_price }}
+ 积分
+ (首抽5折)
+
- ×{{ 1 }}
-
+ ×{{ 1 }}
+
-
-
- ¥
- {{ orderData.goods.price }}
- 积分
-
+
+
+ ¥
+ {{ orderData.goods.price }}
+ 积分
+
-
- ×{{ orderData.goods.prize_num * 1 - 1 }}
-
-
-
+
+ ×{{ orderData.goods.prize_num * 1 - 1 }}
+
+
+
-
-
- ¥
- {{ orderData.goods.price }}
- 积分
-
+
+
+ ¥
+ {{ orderData.goods.price }}
+ 积分
+
- ×{{ orderData.goods.prize_num }}
-
-
-
-
+ ×{{ orderData.goods.prize_num }}
+
+
+
+
-
-
- 优惠券
+
+
+ 优惠券
-
- {{
+
+ {{
couponData && orderData.coupon_price > 0
? `-${couponData.price}`
: "未选择"
}}
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
-
-
- 使用积分抵扣
- {{ orderData.use_score }} (剩余:{{ orderData.score }})
-
+
+ 使用积分抵扣
+ {{ orderData.use_score }}
+ (剩余:{{ orderData.score }})
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
- 使用吧唧币抵扣¥ {{ orderData.use_integral_money }} (剩余:{{
- orderData.integral
- }}个)
-
+
+ 使用{{$config.getAppSetting('currency1_name')}}抵扣¥{{ orderData.use_integral_money }}
+ (剩余:{{orderData.integral}}个)
+
-
-
+
+
-
-
-
+
+
+
-
-
-
- 使用星钻抵扣¥
- {{ orderData.use_money }} (剩余:{{ orderData.money }})
-
+
+ 使用{{$config.getAppSetting('balance_name')}}抵扣¥{{ orderData.use_money }}
+
+ (剩余:{{ orderData.money }})
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
- 我已满18岁,阅读并同意
+ 我已满18岁,阅读并同意
-
- 《用户协议》
-
+
+ 《用户协议》
+
-
- 《隐私政策》
-
-
+
+ 《隐私政策》
+
+
-
- 确认支付
- {{
+
+ 确认支付
+ {{
pageData.goods.type == 5
? ` ${orderData.use_score}积分`
: ` ¥${orderData.price}`
}}
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
- {{ item.shang_title }}
- {{ item.prize_num }}
-
-
- {{ item.goodslist_title }}
-
+
+
+
+
+
+
+
+
+
+
+ {{ item.shang_title }}
+ {{ item.prize_num }}
+
+
+ {{ item.goodslist_title }}
+
-
-
-
+
+
+
-
-
+
- 去发货
-
+ 去发货
+
-
- 继续抽
-
-
-
-
+ 继续抽
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/shouye/detail_wuxian.vue b/pages/shouye/detail_wuxian.vue
index fa61a74..2f71bfd 100644
--- a/pages/shouye/detail_wuxian.vue
+++ b/pages/shouye/detail_wuxian.vue
@@ -500,9 +500,11 @@
-
- 吧唧币
- {{ orderData.use_integral_money }} (剩余:{{ orderData.integral }}个)
+
+ 使用{{$config.getAppSetting('currency1_name')}}抵扣
+ {{ orderData.use_integral_money }}
+
+ (剩余:{{ orderData.integral }}个)
@@ -511,9 +513,10 @@
-
- 使用星钻抵扣¥
- {{ orderData.use_money }} (剩余:{{ orderData.money }})
+
+ 使用{{$config.getAppSetting('balance_name')}}抵扣¥{{ orderData.use_money }}
+
+ (剩余:{{ orderData.money }})
@@ -652,7 +655,7 @@
}
return {
- title: this.$config.getAppSetting("app_name")+`${this.pageData.goods.title}系列`,
+ title: this.$config.getAppSetting("app_name") + `${this.pageData.goods.title}系列`,
imageUrl: this.pageData.goods.imgurl_detail,
path: '/pages/shouye/detail_wuxian' +
this.$c.qs({
@@ -853,7 +856,7 @@
if (type == 1) {
url = 'infinite_orderbuy'
- if (this.$refs.buyNotice.getIsShow() && !fromNotice) {
+ if (this.$refs.buyNotice.getIsShow() && !fromNotice) {
this.$refs.buyNotice.getRule(6)
return
}
@@ -2689,7 +2692,7 @@
}
.pay-type {
- padding: 30rpx;
+ padding: 30rpx 24rpx;
background: #FFFFFF;
border-radius: 20rpx;
margin-top: 20rpx;
@@ -2703,9 +2706,8 @@
.title {
flex: 1;
- padding: 0 20rpx;
- font-size: 28rpx;
+ font-size: 24rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #333333;
diff --git a/pages/user/change.vue b/pages/user/change.vue
index bda9bcb..2dbd0ad 100644
--- a/pages/user/change.vue
+++ b/pages/user/change.vue
@@ -1,301 +1,281 @@
-
-
+
+
-
-
- 修改头像
-
-
+
+
+ 修改头像
+
+
-
-
- 昵称:
-
-
-
-
+
+
+ 昵称:
+
+
+
+
-
- ID:
-
-
-
-
-
+
+ ID:
+
+
+
+
+
- 确认修改
-
+ 确认修改
+
\ No newline at end of file