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/payment/payment.vue b/components/payment/payment.vue
index e75d0e74..e191b925 100644
--- a/components/payment/payment.vue
+++ b/components/payment/payment.vue
@@ -124,7 +124,7 @@
},
},
// 支付失败跳转页面
- propTofailPage: {
+ propToFailPage: {
type: String,
default: '',
},
@@ -282,6 +282,7 @@
// 现金支付
uni.showModal({
content: res.data.msg,
+ showCancel: false,
success(res) {
if (res.confirm) {
// 跳转订单列表页
@@ -309,13 +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);
}
}
},
- fail: () => {
+ fail: (res) => {
uni.hideLoading();
- app.globalData.showToast('服务器请求出错');
+ this.order_item_pay_fail_handle(res.data.data, order_id, '服务器请求出错');
},
});
} else {
@@ -332,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, '支付失败');
},
});
},
@@ -359,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
@@ -373,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, '支付失败');
},
});
},
@@ -394,7 +393,7 @@
this.$emit('reset-event');
},
fail: function (res) {
- app.globalData.showToast('支付失败');
+ self.order_item_pay_fail_handle(data, order_id, '支付失败');
},
});
} else {
@@ -428,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);
}
}
);
@@ -483,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);
@@ -511,7 +509,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 +521,18 @@
this.to_success_page_event();
}
},
- // 支付失败数据设置 bool:失败是否需要跳转页面
- 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,
- 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();
+ this.to_fail_page_event(msg);
},
+ // 成功跳转
to_success_page_event() {
let url_data = {
code: '9000',
@@ -552,12 +550,34 @@
});
}
},
- to_fail_page_event() {
- if (this.propTofailPage) {
- // 跳转支付页面
- uni.navigateTo({
- url: this.propTofailPage + '?data=' + data.order_id,
- });
+ // 失败跳转
+ 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);
+ }
}
},
// 页面卸载
@@ -569,6 +589,7 @@
this.setData({
popup_view_pay_html_is_show: false,
});
+ this.to_fail_page_event();
},
},
};
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/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/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/answers/detail/detail.vue b/pages/plugins/answers/detail/detail.vue
index 277052aa..4bc02d5e 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..1a099f13 100644
--- a/pages/plugins/distribution/user/user.vue
+++ b/pages/plugins/distribution/user/user.vue
@@ -1,196 +1,200 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ 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
+ 去推广
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -211,6 +215,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 +473,7 @@
},
});
},
+
// 顶部返回操作
top_nav_left_back_event(e) {
var pages = getCurrentPages();
@@ -478,6 +485,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..bbfde8ae 100644
--- a/pages/plugins/membershiplevelvip/user/user.vue
+++ b/pages/plugins/membershiplevelvip/user/user.vue
@@ -1,171 +1,175 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ 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 }}
+
+
+
+
+
+
+
+
+
@@ -187,6 +191,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 +372,7 @@
},
});
},
+
// 顶部返回操作
top_nav_left_back_event(e) {
var pages = getCurrentPages();
@@ -377,6 +384,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..a2b7abe7 100644
--- a/pages/plugins/points/index/index.vue
+++ b/pages/plugins/points/index/index.vue
@@ -1,106 +1,115 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ 积分
-
-
-
-
-
- 积分
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
- 立即登录
- 获知会员积分详情
-
-
-
-
-
- {{ 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 }}
-
- 知道了
-
-
@@ -124,6 +133,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 +203,7 @@
app.globalData.is_config(this, 'init_config');
}
},
+
// 获取数据
get_data() {
uni.request({
@@ -248,6 +260,7 @@
},
});
},
+
// 立即登录
login_event() {
var user = app.globalData.get_user_info(this, 'login_event');
@@ -274,10 +287,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 +302,7 @@
});
}
},
+
get_integral_data_list(is_mandatory) {
// 是否加载中
if (this.integral_is_loading == 1) {
@@ -345,18 +361,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 +387,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.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 86612210..72763f27 100644
--- a/pages/plugins/signin/index-detail/index-detail.vue
+++ b/pages/plugins/signin/index-detail/index-detail.vue
@@ -1,14 +1,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -65,7 +65,7 @@
-
+
@@ -86,7 +86,12 @@
- 今日已签到,获得{{ user_signin_data.integral }}积分,共{{ user_signin_data.total }}次
+
+ 今日
+ 已
+ 未
+ 签到,获得{{ user_signin_data.integral || 0 }}积分,共{{ user_signin_data.total || 0 }}次
+
@@ -108,7 +113,11 @@
签到成功
- 恭喜您获得 {{ coming_integral }} 积分
+
+ 恭喜您获得
+ {{ coming_integral }}
+ 积分
+
立即使用
@@ -135,6 +144,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,
@@ -400,7 +411,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',
@@ -430,6 +441,7 @@
this.$refs.share.init();
}
},
+
// 顶部返回操作
top_nav_left_back_event(e) {
var pages = getCurrentPages();
@@ -441,9 +453,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/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"
>
diff --git a/pages/plugins/wallet/user/user.vue b/pages/plugins/wallet/user/user.vue
index 642ba809..1e5efc9d 100644
--- a/pages/plugins/wallet/user/user.vue
+++ b/pages/plugins/wallet/user/user.vue
@@ -1,85 +1,88 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 有效(元)
- {{ 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 }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
- 充值
-
-
- 提现
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 有效(元)
+ {{ 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 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 充值
+
+
+ 提现
+
+
@@ -105,6 +108,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 +250,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 +269,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 932b8cd1..b658dbbc 100644
--- a/pages/user-answers-detail/user-answers-detail.vue
+++ b/pages/user-answers-detail/user-answers-detail.vue
@@ -1,49 +1,57 @@
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
- 提问详情
-
- 联系人
- {{ 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/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 }}
diff --git a/static/icon/iconfont.css b/static/icon/iconfont.css
index 9cdf7216..dca819b3 100644
--- a/static/icon/iconfont.css
+++ b/static/icon/iconfont.css
@@ -1,13 +1,9 @@
@font-face {
font-family: "iconfont";
/* Project id 4227145 */
- /* 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 7f33c8fa..00000000
Binary files a/static/icon/iconfont.woff and /dev/null differ
diff --git a/static/icon/iconfont.woff2 b/static/icon/iconfont.woff2
deleted file mode 100644
index 43e9ba72..00000000
Binary files a/static/icon/iconfont.woff2 and /dev/null differ