From d4d14e45d947daa6c8b7bfd1c97afb2ea12abdb0 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Mon, 9 Oct 2023 10:15:02 +0800
Subject: [PATCH 1/6] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E6=94=AF=E4=BB=98?=
=?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/payment/payment.vue | 15 +++++++++------
pages/buy/buy.vue | 8 ++++----
pages/plugins/wallet/recharge/recharge.vue | 1 +
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/components/payment/payment.vue b/components/payment/payment.vue
index e75d0e74..9114fa54 100644
--- a/components/payment/payment.vue
+++ b/components/payment/payment.vue
@@ -124,7 +124,7 @@
},
},
// 支付失败跳转页面
- propTofailPage: {
+ propToFailPage: {
type: String,
default: '',
},
@@ -311,6 +311,7 @@
} else {
app.globalData.showToast(res.data.msg);
}
+ this.order_item_pay_fail_handle(res.data.data, order_id);
}
},
fail: () => {
@@ -511,7 +512,7 @@
}
}
},
- // 支付成功数据设置 bool:成功是否需要跳转页面
+ // 支付成功数据设置 data:后台返回的参数， order_id: 订单id，is_to_page，是否需要跳转页面的参数控制
order_item_pay_success_handle(data, order_id, is_to_page = true) {
let newData = {
data: data,
@@ -523,18 +524,18 @@
this.to_success_page_event();
}
},
- // 支付失败数据设置 bool:失败是否需要跳转页面
+ // 支付失败数据设置 data:后台返回的参数， order_id: 订单id
order_item_pay_fail_handle(data, order_id) {
let newData = {
data: data,
order_id: order_id,
- is_to_page: is_to_page,
temp_pay_index: this.propTempPayIndex,
payment_id: this.propPaymentId,
};
this.$emit('pay-fail', newData);
this.to_fail_page_event();
},
+ // 成功跳转
to_success_page_event() {
let url_data = {
code: '9000',
@@ -552,11 +553,13 @@
});
}
},
+ // 失败跳转
to_fail_page_event() {
- if (this.propTofailPage) {
+ console.log(this.propToFailPage);
+ if (this.propToFailPage) {
// 跳转支付页面
uni.navigateTo({
- url: this.propTofailPage + '?data=' + data.order_id,
+ url: this.propToFailPage,
});
}
},
diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue
index 207ca5b2..fead5f6b 100644
--- a/pages/buy/buy.vue
+++ b/pages/buy/buy.vue
@@ -326,7 +326,7 @@
page: 'user-order/user-order',
},
// 支付失败跳转的页面
- to_fail_page: 'page/user-order/user-order',
+ to_fail_page: '/pages/user-order/user-order',
};
},
@@ -647,10 +647,10 @@
this.buy_submit_response_handle(res.data.data);
} else {
app.globalData.showToast(res.data.msg);
- this.setData({
- buy_submit_disabled_status: false,
- });
}
+ this.setData({
+ buy_submit_disabled_status: false,
+ });
},
fail: () => {
uni.hideLoading();
diff --git a/pages/plugins/wallet/recharge/recharge.vue b/pages/plugins/wallet/recharge/recharge.vue
index 5a59a05f..a67e7b03 100644
--- a/pages/plugins/wallet/recharge/recharge.vue
+++ b/pages/plugins/wallet/recharge/recharge.vue
@@ -17,6 +17,7 @@
:prop-temp-pay-value="temp_pay_value"
:prop-pay-price="pay_price"
:propIsRedirectTo="true"
+ :prop-to-fail-page="to_fail_page"
@close-payment-poupon="payment_popup_event_close"
>
From d5cb2f24483bb23865f632249862d318b1788289 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Mon, 9 Oct 2023 14:52:20 +0800
Subject: [PATCH 2/6] =?UTF-8?q?1=E4=BC=98=E5=8C=96=E9=A1=B6=E9=83=A8?=
=?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE=E5=AE=9A=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/plugins/answers/detail/detail.vue | 135 ++++++++----------
pages/plugins/coupon/index/index.vue | 24 +++-
pages/plugins/distribution/user/user.vue | 31 ++--
.../plugins/membershiplevelvip/user/user.vue | 29 ++--
pages/plugins/points/index/index.vue | 60 +++++---
pages/plugins/seckill/index/index.css | 10 ++
pages/plugins/seckill/index/index.vue | 106 ++++++++------
.../signin/index-detail/index-detail.vue | 15 +-
.../user-answers-detail.vue | 11 +-
pages/user/user.vue | 4 +-
10 files changed, 258 insertions(+), 167 deletions(-)
diff --git a/pages/plugins/answers/detail/detail.vue b/pages/plugins/answers/detail/detail.vue
index 277052aa..056c8110 100644
--- a/pages/plugins/answers/detail/detail.vue
+++ b/pages/plugins/answers/detail/detail.vue
@@ -1,69 +1,63 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ detail_data.title }}
-
- 留言时间: {{ detail_data.add_time_date }}
- ·
- {{ detail_data.access_count || '0' }}浏览
-
- {{ detail_data.content }}
-
-
-
-
-
- 管理员
+
+
+
+
+ {{ detail_data.title }}
+
+ 留言时间: {{ detail_data.add_time_date }}
+ ·
+ {{ detail_data.access_count || '0' }}浏览
- 回复时间: {{ detail_data.reply_time_date }}
+ {{ detail_data.content }}
- {{ detail_data.reply }}
+
+
+
+
+ 管理员
+
+ 回复时间: {{ detail_data.reply_time_date }}
+
+ {{ detail_data.reply }}
+
+
+
+
+
+ 猜你喜欢
+
+
+
+
+
+
+
+
+
+ 我要提问
+
+
+
+
+
+ 我的提问
+
+
-
-
-
- 猜你喜欢
-
-
-
-
+
+
-
-
-
-
- 我要提问
-
-
-
-
-
- 我的提问
-
-
-
-
diff --git a/pages/plugins/coupon/index/index.vue b/pages/plugins/coupon/index/index.vue
index 9a3d8d22..082ac351 100644
--- a/pages/plugins/coupon/index/index.vue
+++ b/pages/plugins/coupon/index/index.vue
@@ -1,24 +1,22 @@
-
+
-
+
-
+
-
+
@@ -50,6 +48,8 @@
status_bar_height: parseInt(app.globalData.get_system_info('statusBarHeight', 0)),
// 顶部导航返回按钮
is_realstore_top_nav_back: app.globalData.data.is_realstore_top_nav_back || 0,
+ // 顶部返回导航背景透明度
+ opacity: 0,
data_bottom_line_status: false,
data_list_loding_status: 1,
data_list_loding_msg: '',
@@ -227,10 +227,12 @@
}
}
},
+
// url事件
url_event(e) {
app.globalData.url_event(e);
},
+
// 顶部返回操作
top_nav_left_back_event(e) {
var pages = getCurrentPages();
@@ -242,9 +244,17 @@
uni.navigateBack();
}
},
+
+ // 页面滚动监听
+ onPageScroll(e) {
+ var top = e.scrollTop > 47 ? 1 : e.scrollTop / 47;
+ this.setData({
+ opacity: top,
+ });
+ },
},
};
\ No newline at end of file
+
diff --git a/pages/plugins/distribution/user/user.vue b/pages/plugins/distribution/user/user.vue
index 173487b4..2e2b9bc0 100644
--- a/pages/plugins/distribution/user/user.vue
+++ b/pages/plugins/distribution/user/user.vue
@@ -1,15 +1,17 @@
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
@@ -211,6 +213,8 @@
status_bar_height: parseInt(app.globalData.get_system_info('statusBarHeight', 0)),
// 顶部导航返回按钮
is_realstore_top_nav_back: app.globalData.data.is_realstore_top_nav_back || 0,
+ // 顶部返回导航背景透明度
+ opacity: 0,
distribution_static_url: distribution_static_url,
data_bottom_line_status: false,
data_list_loding_status: 1,
@@ -467,6 +471,7 @@
},
});
},
+
// 顶部返回操作
top_nav_left_back_event(e) {
var pages = getCurrentPages();
@@ -478,6 +483,14 @@
uni.navigateBack();
}
},
+
+ // 页面滚动监听
+ onPageScroll(e) {
+ var top = e.scrollTop > 47 ? 1 : e.scrollTop / 47;
+ this.setData({
+ opacity: top,
+ });
+ },
},
};
diff --git a/pages/plugins/membershiplevelvip/user/user.vue b/pages/plugins/membershiplevelvip/user/user.vue
index 4a5427c2..ff7ed114 100644
--- a/pages/plugins/membershiplevelvip/user/user.vue
+++ b/pages/plugins/membershiplevelvip/user/user.vue
@@ -1,15 +1,17 @@
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
@@ -187,6 +189,8 @@
status_bar_height: parseInt(app.globalData.get_system_info('statusBarHeight', 0)),
// 顶部导航返回按钮
is_realstore_top_nav_back: app.globalData.data.is_realstore_top_nav_back || 0,
+ // 顶部返回导航背景透明度
+ opacity: 0,
data_bottom_line_status: false,
data_list_loding_status: 1,
data_list_loding_msg: '',
@@ -366,6 +370,7 @@
},
});
},
+
// 顶部返回操作
top_nav_left_back_event(e) {
var pages = getCurrentPages();
@@ -377,6 +382,14 @@
uni.navigateBack();
}
},
+
+ // 页面滚动监听
+ onPageScroll(e) {
+ var top = e.scrollTop > 47 ? 1 : e.scrollTop / 47;
+ this.setData({
+ opacity: top,
+ });
+ },
},
};
diff --git a/pages/plugins/points/index/index.vue b/pages/plugins/points/index/index.vue
index 0a6909fb..25cd273e 100644
--- a/pages/plugins/points/index/index.vue
+++ b/pages/plugins/points/index/index.vue
@@ -1,6 +1,15 @@
-
+
+
+
+
+
+ 积分
+
+
+
+
@@ -11,13 +20,7 @@
-
-
-
-
-
- 积分
-
+
@@ -35,7 +38,8 @@
{{ user.user_name_view }}
- 当前可用
+ 当前可用
{{ user_integral.integral || 0 }}
@@ -77,22 +81,26 @@
-
+
-
+
-
+
积分规则
@@ -124,6 +132,8 @@
status_bar_height: parseInt(app.globalData.get_system_info('statusBarHeight', 0)),
// 顶部导航返回按钮
is_realstore_top_nav_back: app.globalData.data.is_realstore_top_nav_back || 0,
+ // 顶部返回导航背景透明度
+ opacity: 0,
data_bottom_line_status: false,
data_list_loding_status: 1,
data_list_loding_msg: '',
@@ -192,6 +202,7 @@
app.globalData.is_config(this, 'init_config');
}
},
+
// 获取数据
get_data() {
uni.request({
@@ -248,6 +259,7 @@
},
});
},
+
// 立即登录
login_event() {
var user = app.globalData.get_user_info(this, 'login_event');
@@ -274,10 +286,12 @@
user: user || null,
});
},
+
// url事件
url_event(e) {
app.globalData.url_event(e);
},
+
// 头像查看
preview_event() {
if (app.globalData.data.default_user_head_src != this.user.avatar) {
@@ -287,6 +301,7 @@
});
}
},
+
get_integral_data_list(is_mandatory) {
// 是否加载中
if (this.integral_is_loading == 1) {
@@ -345,18 +360,21 @@
},
});
},
+
// 弹层开启
quick_open_event(e) {
this.setData({
popup_status: true,
});
},
+
// 弹层关闭
quick_close_event(e) {
this.setData({
popup_status: false,
});
},
+
// 顶部返回操作
top_nav_left_back_event(e) {
var pages = getCurrentPages();
@@ -368,9 +386,17 @@
uni.navigateBack();
}
},
+
+ // 页面滚动监听
+ onPageScroll(e) {
+ var top = e.scrollTop > 47 ? 1 : e.scrollTop / 47;
+ this.setData({
+ opacity: top,
+ });
+ },
},
};
\ No newline at end of file
+
diff --git a/pages/plugins/seckill/index/index.css b/pages/plugins/seckill/index/index.css
index ab9b8031..78591b1a 100644
--- a/pages/plugins/seckill/index/index.css
+++ b/pages/plugins/seckill/index/index.css
@@ -50,4 +50,14 @@
margin: 20rpx 70rpx 42rpx 70rpx;
height: 80rpx;
line-height: 80rpx;
+}
+
+/**
+ * 内容
+ */
+.scroll-y {
+ height: calc(100vh - 198rpx - var(--window-top) - 5px);
+ /* #ifdef H5 */
+ height: calc(100vh - 198rpx - 10px);
+ /* #endif */
}
\ No newline at end of file
diff --git a/pages/plugins/seckill/index/index.vue b/pages/plugins/seckill/index/index.vue
index 14da894d..0a41a385 100644
--- a/pages/plugins/seckill/index/index.vue
+++ b/pages/plugins/seckill/index/index.vue
@@ -13,56 +13,52 @@
-
-
+
+
{{ item.name }}
{{ item.time.msg }}
-
-
-
-
- {{ time_first_text }}
-
-
+
+
+
+
+
+ {{ time_first_text }}
+
+
+
+
+
+ 活动规则
+
-
- 活动规则
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 活动规则
-
- {{ item }}
-
-
-
-
+
+
+
+
+
+ 活动规则
+
+ {{ item }}
+
+
+
+
+
@@ -86,6 +82,8 @@
is_realstore_top_nav_back: app.globalData.data.is_realstore_top_nav_back || 0,
seckill_bg: 'background: url(' + seckill_static_url + 'header-bg.png) top/100% no-repeat;',
seckill_title_url: seckill_static_url + 'seckill-title.png',
+ scroll_top: 0,
+ scroll_top_old: 0,
data_bottom_line_status: false,
data_list_loding_status: 1,
data_list_loding_msg: '',
@@ -111,7 +109,7 @@
seckill_status: 0,
// 配置商品列表按钮
isOpenGridBtnSet: false,
- gridBtnConfig: {
+ grid_btn_config: {
name: '即将开抢',
disabled: true,
},
@@ -143,14 +141,14 @@
name: '即将开抢',
};
this.setData({
- gridBtnConfig: Object.assign({}, gridBtnConfig, newData),
+ grid_btn_config: Object.assign({}, this.grid_btn_config, newData),
});
} else if (val === 2) {
let newData = {
name: '已结束',
};
this.setData({
- gridBtnConfig: Object.assign({}, gridBtnConfig, newData),
+ grid_btn_config: Object.assign({}, this.grid_btn_config, newData),
});
}
},
@@ -250,6 +248,7 @@
goods: this.periods_list[index].goods,
isOpenGridBtnSet: seckill_status === 1 ? false : true,
});
+ this.reset_scroll();
},
// 弹层开启
quick_open_event(e) {
@@ -274,9 +273,28 @@
uni.navigateBack();
}
},
+
+ // 重置滑动位置
+ reset_scroll() {
+ this.setData({
+ scroll_top: this.scroll_top_old,
+ });
+ this.$nextTick(() => {
+ this.setData({
+ scroll_top: 0,
+ });
+ });
+ },
+
+ // 滑动事件位置记录
+ scroll_event(e) {
+ this.setData({
+ scroll_top_old: e.detail.scrollTop,
+ });
+ },
},
};
\ No newline at end of file
+
diff --git a/pages/plugins/signin/index-detail/index-detail.vue b/pages/plugins/signin/index-detail/index-detail.vue
index 86612210..f11a0673 100644
--- a/pages/plugins/signin/index-detail/index-detail.vue
+++ b/pages/plugins/signin/index-detail/index-detail.vue
@@ -86,7 +86,12 @@
- 今日已签到，获得{{ user_signin_data.integral }}积分，共{{ user_signin_data.total }}次
+
+ 今日
+ 已
+ 未
+ 签到，获得{{ user_signin_data.integral || 0 }}积分，共{{ user_signin_data.total }}次
+
@@ -108,7 +113,9 @@
签到成功
- 恭喜您获得 {{ coming_integral }} 积分
+ 恭喜您获得 {{ coming_integral }} 积分
立即使用
@@ -400,7 +407,7 @@
// 重新拉取数据
this.get_data();
break;
- // 需要填写联系人信息
+ // 需要填写联系人信息
case 1:
uni.navigateTo({
url: '/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo?id=' + res.data.data.qrcode_id + '&is_team=1',
@@ -446,4 +453,4 @@
\ No newline at end of file
+
diff --git a/pages/user-answers-detail/user-answers-detail.vue b/pages/user-answers-detail/user-answers-detail.vue
index 932b8cd1..1400763b 100644
--- a/pages/user-answers-detail/user-answers-detail.vue
+++ b/pages/user-answers-detail/user-answers-detail.vue
@@ -59,6 +59,7 @@
is_realstore_top_nav_back: app.globalData.data.is_realstore_top_nav_back || 0,
detail_data: {},
data_list_loding_status: 1,
+ params: '',
};
},
@@ -67,7 +68,13 @@
},
props: {},
- onLoad() {},
+ onLoad(params) {
+ if (params) {
+ this.setData({
+ params: params.id,
+ });
+ }
+ },
onShow() {
this.init();
@@ -112,7 +119,7 @@
url: app.globalData.get_request_url('detail', 'answer'),
method: 'POST',
data: {
- id: this.$route.query.id,
+ id: this.params,
},
dataType: 'json',
success: (res) => {
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 89b4b649..4686e214 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -13,8 +13,8 @@
{{ nickname }}
- ID
- {{ user_id }}
+ ID
+ {{ user_id }}
From b1756eb4d6a43493f17e9fde93bf13fb422ba656 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Mon, 9 Oct 2023 15:24:26 +0800
Subject: [PATCH 3/6] =?UTF-8?q?1=E4=BC=98=E5=8C=96=E9=A1=B6=E9=83=A8?=
=?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE=E5=AE=9A=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../signin/index-detail/index-detail.vue | 27 +++--
pages/plugins/wallet/user/user.vue | 34 +++++--
.../user-answers-detail.vue | 98 +++++++++++--------
3 files changed, 100 insertions(+), 59 deletions(-)
diff --git a/pages/plugins/signin/index-detail/index-detail.vue b/pages/plugins/signin/index-detail/index-detail.vue
index f11a0673..b18be5bd 100644
--- a/pages/plugins/signin/index-detail/index-detail.vue
+++ b/pages/plugins/signin/index-detail/index-detail.vue
@@ -1,14 +1,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -142,6 +142,8 @@
status_bar_height: parseInt(app.globalData.get_system_info('statusBarHeight', 0)),
// 顶部导航返回按钮
is_realstore_top_nav_back: app.globalData.data.is_realstore_top_nav_back || 0,
+ // 顶部返回导航背景透明度
+ opacity: 0,
// 首页地址
home_page_url: app.globalData.data.tabbar_pages[0],
data_bottom_line_status: false,
@@ -437,6 +439,7 @@
this.$refs.share.init();
}
},
+
// 顶部返回操作
top_nav_left_back_event(e) {
var pages = getCurrentPages();
@@ -448,6 +451,14 @@
uni.navigateBack();
}
},
+
+ // 页面滚动监听
+ onPageScroll(e) {
+ var top = e.scrollTop > 47 ? 1 : e.scrollTop / 47;
+ this.setData({
+ opacity: top,
+ });
+ },
},
};
diff --git a/pages/plugins/wallet/user/user.vue b/pages/plugins/wallet/user/user.vue
index 642ba809..15d36097 100644
--- a/pages/plugins/wallet/user/user.vue
+++ b/pages/plugins/wallet/user/user.vue
@@ -1,17 +1,18 @@
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
@@ -105,6 +106,8 @@
status_bar_height: parseInt(app.globalData.get_system_info('statusBarHeight', 0)),
// 顶部导航返回按钮
is_realstore_top_nav_back: app.globalData.data.is_realstore_top_nav_back || 0,
+ // 顶部返回导航背景透明度
+ opacity: 0,
theme_color: app.globalData.get_theme_color(),
data_list_loding_status: 1,
data_list_loding_msg: '',
@@ -245,12 +248,14 @@
});
app.globalData.updateQueryStringParameter([{ key: 'type', value: e.currentTarget.dataset.index }]);
},
+
// 滚动加载
scroll_lower(e) {
this.setData({
scroll_lower_bool: !this.scroll_lower_bool,
});
},
+
// 顶部返回操作
top_nav_left_back_event(e) {
var pages = getCurrentPages();
@@ -262,10 +267,19 @@
uni.navigateBack();
}
},
+
// 支付成功回调
pay_success_event() {
this.get_data();
},
+
+ // 页面滚动监听
+ scroll_event(e) {
+ var top = e.detail.scrollTop > 47 ? 1 : e.detail.scrollTop / 47;
+ this.setData({
+ opacity: top,
+ });
+ },
},
};
diff --git a/pages/user-answers-detail/user-answers-detail.vue b/pages/user-answers-detail/user-answers-detail.vue
index 1400763b..15634bfa 100644
--- a/pages/user-answers-detail/user-answers-detail.vue
+++ b/pages/user-answers-detail/user-answers-detail.vue
@@ -1,49 +1,55 @@
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
- 提问详情
-
- 联系人
- {{ detail_data.user.user_name_view }}
-
-
- 联系电话
- {{ detail_data.tel }}
-
-
- 标题
- {{ detail_data.title }}
-
-
- 内容
- {{ detail_data.content }}
-
-
- 回复内容
- {{ detail_data.reply }}
-
-
- 回复时间
- {{ detail_data.reply_time_time }}
-
-
- 创建时间
- {{ detail_data.add_time_time }}
+
+
+
+
+
+
+ 提问详情
+
+ 联系人
+ {{ detail_data.user.user_name_view }}
+
+
+ 联系电话
+ {{ detail_data.tel }}
+
+
+ 标题
+ {{ detail_data.title }}
+
+
+ 内容
+ {{ detail_data.content }}
+
+
+ 回复内容
+ {{ detail_data.reply }}
+
+
+ 回复时间
+ {{ detail_data.reply_time_time }}
+
+
+ 创建时间
+ {{ detail_data.add_time_time }}
+
-
-
+
+
+
+
From fa36b601886762d062046a0f676abb367500d3b7 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Mon, 9 Oct 2023 15:48:09 +0800
Subject: [PATCH 4/6] =?UTF-8?q?1=E4=BC=98=E5=8C=96=E9=A1=B6=E9=83=A8?=
=?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE=E5=AE=9A=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/plugins/answers/detail/detail.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/plugins/answers/detail/detail.vue b/pages/plugins/answers/detail/detail.vue
index 056c8110..4bc02d5e 100644
--- a/pages/plugins/answers/detail/detail.vue
+++ b/pages/plugins/answers/detail/detail.vue
@@ -24,7 +24,7 @@
-
+
猜你喜欢
From d69ea4db2ca70eb6b12dd3c39a975f49f1384023 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Mon, 9 Oct 2023 17:40:21 +0800
Subject: [PATCH 5/6] =?UTF-8?q?1=E8=A7=A3=E5=86=B3=E5=88=86=E7=B1=BB?=
=?UTF-8?q?=E6=BB=91=E5=8A=A8=E6=98=BE=E7=A4=BA=E5=BC=B9=E7=AA=97=E7=9A=84?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/css/page.css | 9 +
components/nav-more/nav-more.vue | 1 +
components/popup/popup.vue | 332 +++++++------
pages.json | 14 -
pages/plugins/distribution/user/user.vue | 338 ++++++-------
.../plugins/membershiplevelvip/user/user.vue | 296 ++++++------
.../signin/index-detail/index-detail.css | 3 +-
.../signin/index-detail/index-detail.vue | 12 +-
pages/plugins/wallet/user/user.vue | 122 ++---
.../user-answers-detail.vue | 70 +--
static/icon/iconfont.css | 5 +-
static/icon/iconfont.js | 1 -
static/icon/iconfont.json | 443 ------------------
static/icon/iconfont.svg | 143 ------
static/icon/iconfont.woff | Bin 9248 -> 0 bytes
static/icon/iconfont.woff2 | Bin 7880 -> 0 bytes
16 files changed, 601 insertions(+), 1188 deletions(-)
delete mode 100644 static/icon/iconfont.js
delete mode 100644 static/icon/iconfont.json
delete mode 100644 static/icon/iconfont.svg
delete mode 100644 static/icon/iconfont.woff
delete mode 100644 static/icon/iconfont.woff2
diff --git a/common/css/page.css b/common/css/page.css
index 1e479350..4f91f9d9 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -1591,4 +1591,13 @@ button[disabled].bg-grey {
*/
.top-search-width {
width: calc(100% - 250rpx) !important;
+}
+
+/**
+ * 小程序端距离顶部位置的控制
+ */
+.weixin-nav-padding-top {
+ /* #ifdef MP-WEIXIN */
+ padding-top: calc(var(--status-bar-height) + 5px);
+ /* #endif */
}
\ No newline at end of file
diff --git a/components/nav-more/nav-more.vue b/components/nav-more/nav-more.vue
index 68efcb38..c14ee324 100644
--- a/components/nav-more/nav-more.vue
+++ b/components/nav-more/nav-more.vue
@@ -34,6 +34,7 @@
return [];
},
},
+ // 顶部定位的距离
propTop: {
type: String,
default: '',
diff --git a/components/popup/popup.vue b/components/popup/popup.vue
index bdbf2a7c..6db37842 100644
--- a/components/popup/popup.vue
+++ b/components/popup/popup.vue
@@ -1,6 +1,6 @@
-
+
@@ -9,180 +9,176 @@
diff --git a/pages.json b/pages.json
index 1975f05a..70b4d09a 100644
--- a/pages.json
+++ b/pages.json
@@ -701,20 +701,6 @@
"navigationBarTitleText": "签到"
}
},
- // {
- // "path": "user-signin/user-signin",
- // "style": {
- // "enablePullDownRefresh": true,
- // "navigationBarTitleText": "我的签到"
- // }
- // },
- // {
- // "path": "user-qrcode/user-qrcode",
- // "style": {
- // "enablePullDownRefresh": true,
- // "navigationBarTitleText": "签到码管理"
- // }
- // },
{
"path": "user-qrcode-detail/user-qrcode-detail",
"style": {
diff --git a/pages/plugins/distribution/user/user.vue b/pages/plugins/distribution/user/user.vue
index 2e2b9bc0..1a099f13 100644
--- a/pages/plugins/distribution/user/user.vue
+++ b/pages/plugins/distribution/user/user.vue
@@ -8,191 +8,193 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{ nickname }}
-
-
- {{ user_level.name }}
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 上级用户
-
-
- {{ superior.user_name_view }}
-
-
-
-
-
-
-
-
- 基础统计
-
-
-
-
-
-
- {{ item.name }}
-
- {{ item.value }}
- 人
+
+ {{ nickname }}
+
+
+ {{ user_level.name }}
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
- {{ child.name }}
-
- {{ child.first }}
- {{ child.value }}
- {{ child.unit }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 上级用户
+
+
+ {{ superior.user_name_view }}
+
+
+
+
+
+
+
+
+ 基础统计
+
+
+
+
+
+
+ {{ item.name }}
+
+ {{ item.value }}
+ 人
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ child.name }}
+
+ {{ child.first }}
+ {{ child.value }}
+ {{ child.unit }}
+
-
-
-
-
-
-
-
-
-
- 返佣统计
-
-
-
-
- {{ item.name }}
-
- {{ currency_symbol }}
- {{ item.value }}
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.title }}
-
+
-
-
-
-
-
-
-
-
-
-
- {{ profit_ladder.msg }}
- 去推广
-
-
-
-
- 123123213
- 去推广
-
-
-
-
-
-
-
-
-
+
+
+ 返佣统计
+
+
+
+
+ {{ item.name }}
+
+ {{ currency_symbol }}
+ {{ item.value }}
+
+
+
+
-
-
- 开始时间
-
-
-
+
+
+
+
+
+
+
+ {{ item.title }}
+
-
- 结束时间
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ profit_ladder.msg }}
+ 去推广
-
+
+
+ 123123213
+ 去推广
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/plugins/membershiplevelvip/user/user.vue b/pages/plugins/membershiplevelvip/user/user.vue
index ff7ed114..bbfde8ae 100644
--- a/pages/plugins/membershiplevelvip/user/user.vue
+++ b/pages/plugins/membershiplevelvip/user/user.vue
@@ -8,166 +8,168 @@
-
-
-
-
-
-
-
-
-
-
- {{ nickname }}
-
-
-
-
-
-
-
- {{ user_vip.level_name }}
-
-
- |
- {{ user_vip.permanent_value }}{{ user_vip.permanent_unit }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {{ nickname }}
+
+
+
+
+
+
+
+ {{ user_vip.level_name }}
+
+
|
- {{ user_vip.surplus_time_number }}{{ user_vip.surplus_time_unit }}
-
-
-
+ {{ user_vip.permanent_value }}{{ user_vip.permanent_unit }}
+
+
+
+ |
+ {{ user_vip.surplus_time_number }}{{ user_vip.surplus_time_unit }}
+
+
+
+
+
+
+
+ {{ user_vip.level_name }}
+
+
-
-
-
- {{ user_vip.level_name }}
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 推广客户
-
-
-
-
-
-
-
- {{ item.value }}
- 人
-
- {{ item.name }}
-
-
-
-
-
-
-
-
-
- 返利概况
-
-
-
-
-
- {{ item.first }}
-
-
- {{ item.value }}
-
-
- {{ item.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.title }}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ 推广客户
+
+
+
+
+
+
+
+ {{ item.value }}
+ 人
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+ 返利概况
+
+
+
+
+
+ {{ item.first }}
+
+
+ {{ item.value }}
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
diff --git a/pages/plugins/signin/index-detail/index-detail.css b/pages/plugins/signin/index-detail/index-detail.css
index 1400f7c3..7a26ce2d 100644
--- a/pages/plugins/signin/index-detail/index-detail.css
+++ b/pages/plugins/signin/index-detail/index-detail.css
@@ -3,6 +3,7 @@
*/
.signin-container {
background-color: rgb(255 209 133);
+ min-height: 100vh;
}
.signin-bg {
@@ -10,7 +11,7 @@
}
.signin-opration-group {
- top: 156rpx;
+ top: calc(156rpx + var(--status-bar-height) + 5px);
}
.share,
diff --git a/pages/plugins/signin/index-detail/index-detail.vue b/pages/plugins/signin/index-detail/index-detail.vue
index b18be5bd..72763f27 100644
--- a/pages/plugins/signin/index-detail/index-detail.vue
+++ b/pages/plugins/signin/index-detail/index-detail.vue
@@ -65,7 +65,7 @@
-
+
@@ -90,7 +90,7 @@
今日
已
未
- 签到，获得{{ user_signin_data.integral || 0 }}积分，共{{ user_signin_data.total }}次
+ 签到，获得{{ user_signin_data.integral || 0 }}积分，共{{ user_signin_data.total || 0 }}次
@@ -113,9 +113,11 @@
签到成功
- 恭喜您获得 {{ coming_integral }} 积分
+
+ 恭喜您获得
+ {{ coming_integral }}
+ 积分
+
立即使用
diff --git a/pages/plugins/wallet/user/user.vue b/pages/plugins/wallet/user/user.vue
index 15d36097..1e5efc9d 100644
--- a/pages/plugins/wallet/user/user.vue
+++ b/pages/plugins/wallet/user/user.vue
@@ -9,78 +9,80 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- 有效(元)
- {{ is_price_show ? user_wallet.normal_money || '0.00' : '***' }}
-
-
- 冻结(元)
- {{ is_price_show ? user_wallet.frozen_money || '0.00' : '***' }}
-
-
- 赠送(元)
- {{ is_price_show ? user_wallet.give_money || '0.00' : '***' }}
+
+
+
+
+
+
+ 有效(元)
+ {{ is_price_show ? user_wallet.normal_money || '0.00' : '***' }}
+
+
+ 冻结(元)
+ {{ is_price_show ? user_wallet.frozen_money || '0.00' : '***' }}
+
+
+ 赠送(元)
+ {{ is_price_show ? user_wallet.give_money || '0.00' : '***' }}
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
- {{ item.title }}
-
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/pages/user-answers-detail/user-answers-detail.vue b/pages/user-answers-detail/user-answers-detail.vue
index 15634bfa..b658dbbc 100644
--- a/pages/user-answers-detail/user-answers-detail.vue
+++ b/pages/user-answers-detail/user-answers-detail.vue
@@ -8,40 +8,42 @@
-
-
-
-
-
-
- 提问详情
-
- 联系人
- {{ detail_data.user.user_name_view }}
-
-
- 联系电话
- {{ detail_data.tel }}
-
-
- 标题
- {{ detail_data.title }}
-
-
- 内容
- {{ detail_data.content }}
-
-
- 回复内容
- {{ detail_data.reply }}
-
-
- 回复时间
- {{ detail_data.reply_time_time }}
-
-
- 创建时间
- {{ detail_data.add_time_time }}
+
+
+
+
+
+
+
+ 提问详情
+
+ 联系人
+ {{ detail_data.user.user_name_view }}
+
+
+ 联系电话
+ {{ detail_data.tel }}
+
+
+ 标题
+ {{ detail_data.title }}
+
+
+ 内容
+ {{ detail_data.content }}
+
+
+ 回复内容
+ {{ detail_data.reply }}
+
+
+ 回复时间
+ {{ detail_data.reply_time_time }}
+
+
+ 创建时间
+ {{ detail_data.add_time_time }}
+
diff --git a/static/icon/iconfont.css b/static/icon/iconfont.css
index 9cdf7216..d8f41272 100644
--- a/static/icon/iconfont.css
+++ b/static/icon/iconfont.css
@@ -4,10 +4,7 @@
/* Project id 4227145 */
/* 全局注册需要切换成绝对路径 */
/* @/static/icon/ */
- src: url('@/static/icon/iconfont.woff2?t=1693280977762') format('woff2'),
- url('@/static/icon/iconfont.woff?t=1693280977762') format('woff'),
- url('@/static/icon/iconfont.ttf?t=1693280977762') format('truetype'),
- url('@/static/icon/iconfont.svg?t=1693280977762#iconfont') format('svg');
+ src: url('@/static/icon/iconfont.ttf?t=1693280977762') format('truetype');
}
.iconfont {
diff --git a/static/icon/iconfont.js b/static/icon/iconfont.js
deleted file mode 100644
index acf40d0d..00000000
--- a/static/icon/iconfont.js
+++ /dev/null
@@ -1 +0,0 @@
-window._iconfont_svg_string_4227145='',function(c){var a=(a=document.getElementsByTagName("script"))[a.length-1],l=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var i,o,d,h,t,m=function(a,l){l.parentNode.insertBefore(a,l)};if(l&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}i=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_4227145,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?m(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),i()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(d=i,h=c.document,t=!1,n(),h.onreadystatechange=function(){"complete"==h.readyState&&(h.onreadystatechange=null,e())})}function e(){t||(t=!0,d())}function n(){try{h.documentElement.doScroll("left")}catch(a){return void setTimeout(n,50)}e()}}(window);
\ No newline at end of file
diff --git a/static/icon/iconfont.json b/static/icon/iconfont.json
deleted file mode 100644
index ddad4f4f..00000000
--- a/static/icon/iconfont.json
+++ /dev/null
@@ -1,443 +0,0 @@
-{
- "id": "4227145",
- "name": "shopxo-小程序",
- "font_family": "iconfont",
- "css_prefix_text": "icon-",
- "description": "",
- "glyphs": [
- {
- "icon_id": "37550661",
- "name": "wenda-wytw",
- "font_class": "wenda-wytw",
- "unicode": "e6de",
- "unicode_decimal": 59102
- },
- {
- "icon_id": "37550660",
- "name": "wenda-wdtw",
- "font_class": "wenda-wdtw",
- "unicode": "e6df",
- "unicode_decimal": 59103
- },
- {
- "icon_id": "37539354",
- "name": "bowenxiangqing-dianzan-xuaz",
- "font_class": "bowenxiangqing-dianzan-xuaz",
- "unicode": "e6dd",
- "unicode_decimal": 59101
- },
- {
- "icon_id": "37538544",
- "name": "bowenxiangqing-fenxiang",
- "font_class": "bowenxiangqing-fenxiang",
- "unicode": "e6dc",
- "unicode_decimal": 59100
- },
- {
- "icon_id": "37538541",
- "name": "bowenxiangqing-huifu",
- "font_class": "bowenxiangqing-huifu",
- "unicode": "e6ce",
- "unicode_decimal": 59086
- },
- {
- "icon_id": "37538540",
- "name": "bowenxiangqing-dianzan",
- "font_class": "bowenxiangqing-dianzan",
- "unicode": "e6da",
- "unicode_decimal": 59098
- },
- {
- "icon_id": "37494984",
- "name": "wodeqianbao-eyeclo2",
- "font_class": "wodeqianbao-eyeclo2",
- "unicode": "e6db",
- "unicode_decimal": 59099
- },
- {
- "icon_id": "37482928",
- "name": "zuhedap-shoping",
- "font_class": "zuhedap-shoping",
- "unicode": "e6d9",
- "unicode_decimal": 59097
- },
- {
- "icon_id": "37362566",
- "name": "wdhy-gaoji",
- "font_class": "wdhy-gaoji",
- "unicode": "e6d8",
- "unicode_decimal": 59096
- },
- {
- "icon_id": "37362233",
- "name": "wdhy-erweima",
- "font_class": "wdhy-erweima",
- "unicode": "e6d7",
- "unicode_decimal": 59095
- },
- {
- "icon_id": "37361772",
- "name": "wdfx-ptfx",
- "font_class": "wdfx-ptfx",
- "unicode": "e6c6",
- "unicode_decimal": 59078
- },
- {
- "icon_id": "37361771",
- "name": "wdfx-gjfx",
- "font_class": "wdfx-gjfx",
- "unicode": "e6d5",
- "unicode_decimal": 59093
- },
- {
- "icon_id": "37361216",
- "name": "xzdz-tianjiabiaoq",
- "font_class": "xzdz-tianjiabiaoq",
- "unicode": "e6d6",
- "unicode_decimal": 59094
- },
- {
- "icon_id": "37361218",
- "name": "xzdz-dingwei",
- "font_class": "xzdz-dingwei",
- "unicode": "e6d2",
- "unicode_decimal": 59090
- },
- {
- "icon_id": "37361219",
- "name": "wddz-bianji",
- "font_class": "wddz-bianji",
- "unicode": "e6d3",
- "unicode_decimal": 59091
- },
- {
- "icon_id": "37361217",
- "name": "bjdz-guanbi",
- "font_class": "bjdz-guanbi",
- "unicode": "e6d4",
- "unicode_decimal": 59092
- },
- {
- "icon_id": "37356823",
- "name": "tongyong-fanhui",
- "font_class": "tongyong-fanhui",
- "unicode": "e6d1",
- "unicode_decimal": 59089
- },
- {
- "icon_id": "37354114",
- "name": "mendian-sousuosm",
- "font_class": "mendian-sousuosm",
- "unicode": "e6cf",
- "unicode_decimal": 59087
- },
- {
- "icon_id": "37354113",
- "name": "wodeqianbao-eye",
- "font_class": "wodeqianbao-eye",
- "unicode": "e6d0",
- "unicode_decimal": 59088
- },
- {
- "icon_id": "37352165",
- "name": "mendian-dingwei",
- "font_class": "mendian-dingwei",
- "unicode": "e6cd",
- "unicode_decimal": 59085
- },
- {
- "icon_id": "37324825",
- "name": "zhifu-yixuan",
- "font_class": "zhifu-yixuan",
- "unicode": "e6ca",
- "unicode_decimal": 59082
- },
- {
- "icon_id": "37324826",
- "name": "zhifu-weixuan",
- "font_class": "zhifu-weixuan",
- "unicode": "e6cb",
- "unicode_decimal": 59083
- },
- {
- "icon_id": "37324824",
- "name": "mendian-jiantou2",
- "font_class": "mendian-jiantou2",
- "unicode": "e6cc",
- "unicode_decimal": 59084
- },
- {
- "icon_id": "37324020",
- "name": "huiyuan-guanbi",
- "font_class": "huiyuan-guanbi",
- "unicode": "e6c9",
- "unicode_decimal": 59081
- },
- {
- "icon_id": "37314140",
- "name": "kaitonghuiy-dingdan",
- "font_class": "kaitonghuiy-dingdan",
- "unicode": "e6c8",
- "unicode_decimal": 59080
- },
- {
- "icon_id": "37307110",
- "name": "miaosha-hdgz",
- "font_class": "miaosha-hdgz",
- "unicode": "e6c7",
- "unicode_decimal": 59079
- },
- {
- "icon_id": "37289404",
- "name": "mendian-sc",
- "font_class": "mendian-sc",
- "unicode": "e6c4",
- "unicode_decimal": 59076
- },
- {
- "icon_id": "37289402",
- "name": "mendian-kefu",
- "font_class": "mendian-kefu",
- "unicode": "e6c5",
- "unicode_decimal": 59077
- },
- {
- "icon_id": "37288999",
- "name": "qiandao-tancguanbi",
- "font_class": "qiandao-tancguanbi",
- "unicode": "e6c3",
- "unicode_decimal": 59075
- },
- {
- "icon_id": "37288627",
- "name": "qiandao-dqxz",
- "font_class": "qiandao-dqxz",
- "unicode": "e6bc",
- "unicode_decimal": 59068
- },
- {
- "icon_id": "37288626",
- "name": "qiandao-fenxiang",
- "font_class": "qiandao-fenxiang",
- "unicode": "e6bd",
- "unicode_decimal": 59069
- },
- {
- "icon_id": "37288625",
- "name": "qiandao-wdqd",
- "font_class": "qiandao-wdqd",
- "unicode": "e6be",
- "unicode_decimal": 59070
- },
- {
- "icon_id": "37288624",
- "name": "qiandao-zudui",
- "font_class": "qiandao-zudui",
- "unicode": "e6bf",
- "unicode_decimal": 59071
- },
- {
- "icon_id": "37288623",
- "name": "qiandao-jiantou",
- "font_class": "qiandao-jiantou",
- "unicode": "e6c0",
- "unicode_decimal": 59072
- },
- {
- "icon_id": "37288622",
- "name": "qiandao-yixuan",
- "font_class": "qiandao-yixuan",
- "unicode": "e6c1",
- "unicode_decimal": 59073
- },
- {
- "icon_id": "37288621",
- "name": "qiandao-jiantou2",
- "font_class": "qiandao-jiantou2",
- "unicode": "e6c2",
- "unicode_decimal": 59074
- },
- {
- "icon_id": "37272530",
- "name": "zhibo-shixiao",
- "font_class": "zhibo-shixiao",
- "unicode": "e6bb",
- "unicode_decimal": 59067
- },
- {
- "icon_id": "37235239",
- "name": "icon-fenlei-jianhao",
- "font_class": "fenlei-jianhao",
- "unicode": "e6ba",
- "unicode_decimal": 59066
- },
- {
- "icon_id": "37235185",
- "name": "icon-fenlei-jiahao",
- "font_class": "fenlei-jiahao",
- "unicode": "e6b9",
- "unicode_decimal": 59065
- },
- {
- "icon_id": "37225044",
- "name": "icon-fenlei-top",
- "font_class": "fenlei-top",
- "unicode": "e6b8",
- "unicode_decimal": 59064
- },
- {
- "icon_id": "37217394",
- "name": "icon-fenlei-more",
- "font_class": "fenlei-more",
- "unicode": "e6b7",
- "unicode_decimal": 59063
- },
- {
- "icon_id": "37187706",
- "name": "icon-zhibo-time",
- "font_class": "zhibo-time",
- "unicode": "e6b3",
- "unicode_decimal": 59059
- },
- {
- "icon_id": "37187705",
- "name": "icon-pp-all",
- "font_class": "pp-all",
- "unicode": "e6b4",
- "unicode_decimal": 59060
- },
- {
- "icon_id": "37187704",
- "name": "icon-zhibo-zt",
- "font_class": "zhibo-zt",
- "unicode": "e6b5",
- "unicode_decimal": 59061
- },
- {
- "icon_id": "37187703",
- "name": "icon-zhibo-jies",
- "font_class": "zhibo-jies",
- "unicode": "e6b6",
- "unicode_decimal": 59062
- },
- {
- "icon_id": "37176907",
- "name": "icon-md-phone",
- "font_class": "md-phone",
- "unicode": "e6b1",
- "unicode_decimal": 59057
- },
- {
- "icon_id": "37176908",
- "name": "icon-md-dh",
- "font_class": "md-dh",
- "unicode": "e6b2",
- "unicode_decimal": 59058
- },
- {
- "icon_id": "37137567",
- "name": "icon-index-smbg-tj",
- "font_class": "index-smbg-tj",
- "unicode": "e6b0",
- "unicode_decimal": 59056
- },
- {
- "icon_id": "37137573",
- "name": "icon-index-morejiantou",
- "font_class": "index-morejiantou",
- "unicode": "e6ab",
- "unicode_decimal": 59051
- },
- {
- "icon_id": "37137570",
- "name": "icon-index-xptj-jiantou",
- "font_class": "index-xptj-jiantou",
- "unicode": "e6aa",
- "unicode_decimal": 59050
- },
- {
- "icon_id": "37137572",
- "name": "icon-index-zxmd-phone",
- "font_class": "index-zxmd-phone",
- "unicode": "e6ac",
- "unicode_decimal": 59052
- },
- {
- "icon_id": "37137571",
- "name": "icon-index-zxmd-dh",
- "font_class": "index-zxmd-dh",
- "unicode": "e6ad",
- "unicode_decimal": 59053
- },
- {
- "icon_id": "37137569",
- "name": "icon-index-zxmd-time",
- "font_class": "index-zxmd-time",
- "unicode": "e6ae",
- "unicode_decimal": 59054
- },
- {
- "icon_id": "37137568",
- "name": "icon-index-zxmd-dress",
- "font_class": "index-zxmd-dress",
- "unicode": "e6af",
- "unicode_decimal": 59055
- },
- {
- "icon_id": "37131264",
- "name": "icon-index-notice",
- "font_class": "index-notice",
- "unicode": "e6a8",
- "unicode_decimal": 59048
- },
- {
- "icon_id": "37131263",
- "name": "icon-index-search",
- "font_class": "index-search",
- "unicode": "e6a9",
- "unicode_decimal": 59049
- },
- {
- "icon_id": "37113110",
- "name": "icon-applet-me-settings-acquiesce",
- "font_class": "applet-me-settings-acquiesce",
- "unicode": "e6a6",
- "unicode_decimal": 59046
- },
- {
- "icon_id": "37113109",
- "name": "icon-applet-me-message-acquiesce",
- "font_class": "applet-me-message-acquiesce",
- "unicode": "e6a7",
- "unicode_decimal": 59047
- },
- {
- "icon_id": "37112559",
- "name": "icon-applet-me-acquiesce",
- "font_class": "applet-me-acquiesce",
- "unicode": "e6a2",
- "unicode_decimal": 59042
- },
- {
- "icon_id": "37112562",
- "name": "icon-applet-sort-acquiesce",
- "font_class": "applet-sort-acquiesce",
- "unicode": "e6a5",
- "unicode_decimal": 59045
- },
- {
- "icon_id": "37112561",
- "name": "icon-applet-index-acquiesce",
- "font_class": "applet-index-acquiesce",
- "unicode": "e6a4",
- "unicode_decimal": 59044
- },
- {
- "icon_id": "37112560",
- "name": "icon-applet-shop-acquiesce",
- "font_class": "applet-shop-acquiesce",
- "unicode": "e6a3",
- "unicode_decimal": 59043
- }
- ]
-}
diff --git a/static/icon/iconfont.svg b/static/icon/iconfont.svg
deleted file mode 100644
index cb0798c6..00000000
--- a/static/icon/iconfont.svg
+++ /dev/null
@@ -1,143 +0,0 @@
-
-
-
diff --git a/static/icon/iconfont.woff b/static/icon/iconfont.woff
deleted file mode 100644
index 7f33c8fa4fa1d18a7175780a82309ee2a3fcd777..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 9248
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
diff --git a/static/icon/iconfont.woff2 b/static/icon/iconfont.woff2
deleted file mode 100644
index 43e9ba727588d948d0c339150f1e07b09ea77ce1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 7880
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
From 42b544b4a6c4580b6aa18cd17efdf87831d6e996 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Tue, 10 Oct 2023 10:32:42 +0800
Subject: [PATCH 6/6] =?UTF-8?q?1=E8=A7=A3=E5=86=B3=E6=94=AF=E4=BB=98?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/payment/payment.vue | 66 ++++++----
pages/index/index.css | 7 ++
pages/index/index.vue | 20 +--
pages/plugins/points/index/index.vue | 179 ++++++++++++++-------------
static/icon/iconfont.css | 1 -
5 files changed, 152 insertions(+), 121 deletions(-)
diff --git a/components/payment/payment.vue b/components/payment/payment.vue
index 9114fa54..e191b925 100644
--- a/components/payment/payment.vue
+++ b/components/payment/payment.vue
@@ -282,6 +282,7 @@
// 现金支付
uni.showModal({
content: res.data.msg,
+ showCancel: false,
success(res) {
if (res.confirm) {
// 跳转订单列表页
@@ -309,14 +310,13 @@
popup_view_pay_html_is_show: true,
});
} else {
- app.globalData.showToast(res.data.msg);
+ this.order_item_pay_fail_handle(res.data.data, order_id, res.data.msg);
}
- this.order_item_pay_fail_handle(res.data.data, order_id);
}
},
- fail: () => {
+ fail: (res) => {
uni.hideLoading();
- app.globalData.showToast('服务器请求出错');
+ this.order_item_pay_fail_handle(res.data.data, order_id, '服务器请求出错');
},
});
} else {
@@ -333,8 +333,7 @@
self.order_item_pay_success_handle(data, order_id);
},
fail: (res) => {
- app.globalData.showToast('支付失败');
- self.order_item_pay_fail_handle(data, order_id);
+ self.order_item_pay_fail_handle(data, order_id, '支付失败');
},
});
},
@@ -360,13 +359,13 @@
success: (res) => {
// #ifdef MP-ALIPAY
if (res.resultCode != 9000) {
- app.globalData.showToast(res.memo || '支付失败');
+ self.order_item_pay_fail_handle(data, order_id, res.memo || '支付失败');
return false;
}
// #endif
// #ifdef MP-TOUTIAO
if (res.code != 0) {
- app.globalData.showToast('支付失败');
+ self.order_item_pay_fail_handle(data, order_id, '支付失败');
return false;
}
// #endif
@@ -374,8 +373,7 @@
self.order_item_pay_success_handle(data, order_id);
},
fail: (res) => {
- app.globalData.showToast('支付失败');
- self.order_item_pay_fail_handle(data, order_id);
+ self.order_item_pay_fail_handle(data, order_id, '支付失败');
},
});
},
@@ -395,7 +393,7 @@
this.$emit('reset-event');
},
fail: function (res) {
- app.globalData.showToast('支付失败');
+ self.order_item_pay_fail_handle(data, order_id, '支付失败');
},
});
} else {
@@ -429,7 +427,7 @@
// 数据设置
self.order_item_pay_success_handle(data, order_id);
} else {
- self.order_item_pay_fail_handle(data, order_id);
+ self.order_item_pay_fail_handle(data, order_id, res.err_msg);
}
}
);
@@ -484,8 +482,7 @@
},
fail: () => {
clearInterval(self.popup_view_pay_timer);
- app.globalData.showToast('服务器请求出错');
- self.order_item_pay_fail_handle(data, order_id);
+ self.order_item_pay_fail_handle(data, order_id, '服务器请求出错');
},
});
}, 3000);
@@ -524,8 +521,8 @@
this.to_success_page_event();
}
},
- // 支付失败数据设置 data:后台返回的参数， order_id: 订单id
- order_item_pay_fail_handle(data, order_id) {
+ // 支付失败数据设置 data:后台返回的参数， order_id: 订单id, msg: 错误提示信息
+ order_item_pay_fail_handle(data, order_id, msg) {
let newData = {
data: data,
order_id: order_id,
@@ -533,7 +530,7 @@
payment_id: this.propPaymentId,
};
this.$emit('pay-fail', newData);
- this.to_fail_page_event();
+ this.to_fail_page_event(msg);
},
// 成功跳转
to_success_page_event() {
@@ -554,13 +551,33 @@
}
},
// 失败跳转
- to_fail_page_event() {
- console.log(this.propToFailPage);
- if (this.propToFailPage) {
- // 跳转支付页面
- uni.navigateTo({
- url: this.propToFailPage,
- });
+ to_fail_page_event(msg) {
+ let to_fail_page = this.propToFailPage;
+ if (to_fail_page) {
+ if (msg) {
+ // 现金支付
+ uni.showModal({
+ content: msg,
+ showCancel: false,
+ success(res) {
+ if (res.confirm) {
+ // 跳转支付页面
+ uni.redirectTo({
+ url: to_fail_page,
+ });
+ }
+ },
+ });
+ } else {
+ // 跳转支付页面
+ uni.redirectTo({
+ url: to_fail_page,
+ });
+ }
+ } else {
+ if (msg) {
+ app.globalData.showToast(msg);
+ }
}
},
// 页面卸载
@@ -572,6 +589,7 @@
this.setData({
popup_view_pay_html_is_show: false,
});
+ this.to_fail_page_event();
},
},
};
diff --git a/pages/index/index.css b/pages/index/index.css
index edafc78c..90c62c40 100644
--- a/pages/index/index.css
+++ b/pages/index/index.css
@@ -83,6 +83,13 @@
/* #endif */
}
+.search-content-animation {
+ transition: all 0.2s ease;
+ /* #ifdef MP-WEIXIN */
+ transition: all 1s linear;
+ /* #endif */
+}
+
/* #ifdef H5 || MP-TOUTIAO || APP */
.search-content-fixed .nav-top-right-icon {
top: 9px !important;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9be453c1..a12cf559 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -17,14 +17,13 @@
-
+
-
+
-
@@ -541,8 +540,8 @@
// 页面滚动监听
onPageScroll(e) {
if (this.common_app_is_header_nav_fixed == 1 && this.common_app_is_enable_search == 1) {
- var top = e.scrollTop > 35 ? 35 : e.scrollTop;
- var num = top * 7;
+ var top = e.scrollTop > 42 ? 42 : e.scrollTop;
+ var num = top;
var base = 230;
// #ifdef MP-ALIPAY
base = 235;
@@ -553,14 +552,21 @@
// #endif
// 开启哀悼插件的时候不需要浮动导航并且搜索框也不需要缩短、开启站点灰度会导致浮动失效
if (!this.plugins_mourning_data_is_app) {
- var top_val = 35;
- var val = num > base ? base : num;
+ var top_val = 42;
+ var val = num * 6 > base ? base : num * 6;
// #ifdef MP-TOUTIAO
top_val = 0;
val = base;
// #endif
+ console.log('num', num);
+ // console.log('base', base);
this.setData({
+ // #ifdef H5 || MP-TOUTIAO || APP
search_style: 'width: calc(100% - ' + (val < 0 ? 0 : val) + 'rpx);',
+ // #endif
+ // #ifdef MP-WEIXIN
+ search_style: 'width: calc(100% - ' + (e.scrollTop > 200 ? 200 : e.scrollTop) + 'px);',
+ // #endif
search_is_fixed: top >= top_val ? 1 : 0,
});
}
diff --git a/pages/plugins/points/index/index.vue b/pages/plugins/points/index/index.vue
index 25cd273e..a2b7abe7 100644
--- a/pages/plugins/points/index/index.vue
+++ b/pages/plugins/points/index/index.vue
@@ -9,106 +9,107 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 立即登录
- 获知会员积分详情
-
-
-
-
-
- {{ user.user_name_view }}
- 当前可用
-
- {{ user_integral.integral || 0 }}
-
- 积分
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 立即登录
+ 获知会员积分详情
-
-
-
-
-
-
-
-
-
-
-
-
-
- 原始
- {{ item.original_integral }}
- /
- 最新
- {{ item.new_integral }}
+
+
+
+
+ {{ user.user_name_view }}
+ 当前可用
+
+ {{ user_integral.integral || 0 }}
+
+ 积分
- {{ item.add_time_time }}
-
- {{ item.msg }}
- {{ item.type == 1 ? '+' : '-' }} {{ item.operation_integral }}
+
+
+
+
+
+
+
+
+
+
+
+
+ 原始
+ {{ item.original_integral }}
+ /
+ 最新
+ {{ item.new_integral }}
+
+ {{ item.add_time_time }}
+
+
+ {{ item.msg }}
+ {{ item.type == 1 ? '+' : '-' }} {{ item.operation_integral }}
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+ 积分规则
+
+ {{ item }}
+
+
+
+
-
-
-
-
-
-
- 积分规则
-
- {{ item }}
-
-
-
-
diff --git a/static/icon/iconfont.css b/static/icon/iconfont.css
index d8f41272..dca819b3 100644
--- a/static/icon/iconfont.css
+++ b/static/icon/iconfont.css
@@ -1,7 +1,6 @@
@font-face {
font-family: "iconfont";
/* Project id 4227145 */
- /* Project id 4227145 */
/* 全局注册需要切换成绝对路径 */
/* @/static/icon/ */
src: url('@/static/icon/iconfont.ttf?t=1693280977762') format('truetype');