master
gongfuxiang 2023-11-07 16:18:28 +08:00
parent 7fc442ea90
commit 6d7f2860fe
3 changed files with 129 additions and 117 deletions

View File

@ -1,3 +1,15 @@
## v4.0.02023-11-10
1. 手机端全新UI、极致体验优化
2. 首页轮播支持背景色自动切换
3. 分配页面支持全部分配查看
4. 钱包支持转账
5. 新增扫码登录及付款
6. 新增商品魔方
7. 购物车新增商品展示
8. 问答支持评论和点赞
9. 客服和快捷导航优化
## v3.0.32023-09-18
1. 组合搭配支持展示商品
2. 商品列表去除封面错误提示

View File

@ -1,105 +1,3 @@
/******************** 黄色 ********************/
/**
* 线
*/
.theme-yellow .border-color-main-pair {
border-color: #795548 !important;
}
.theme-yellow .border-color-main-light {
border-color: #ffebd2 !important;
}
.theme-yellow .border-color-main {
border-color: #f6c133 !important;
}
/**
*
*/
.theme-yellow .br-main-pair {
border: 1px solid #795548 !important;
}
.theme-yellow .br-main-light {
border: solid 1px #ffebd2 !important;
}
.theme-yellow .br-main {
border: 1px solid #f6c133 !important;
}
/**
* 线
*/
.theme-yellow .br-dashed-main-pair {
border: dashed 1px #795548 !important;
}
.theme-yellow .br-dashed-main-light {
border: dashed 1px #ffebd2 !important;
}
.theme-yellow .br-dashed-main {
border: dashed 1px #f6c133 !important;
}
/**
*
*/
.theme-yellow .cr-main-pair {
color: #795548 !important;
}
.theme-yellow .cr-main-light {
color: #ffebd2 !important;
}
.theme-yellow .cr-main {
color: #f6c133 !important;
}
/**
*
*/
.theme-yellow .nav-active-line::before {
background: #f6c133;
}
/**
*
*/
.theme-yellow .bg-main-pair {
background-color: #795548 !important;
}
.theme-yellow .bg-main-light {
background-color: #ffebd2 !important;
}
.theme-yellow .bg-main {
background-color: #f6c133 !important;
}
.theme-yellow button[disabled].bg-main-pair {
background-color: #b5a29c !important;
color: #8c766f !important;
}
.theme-yellow button[disabled].bg-main-light {
background-color: #fbebd6 !important;
color: #ffcc40 !important;
}
.theme-yellow button[disabled].bg-main {
background-color: #fdd178 !important;
color: #fff7e7 !important;
}
/**
* 线
*/
.theme-yellow .title-left-border::before {
background: linear-gradient(180deg, #f6c133 0%, #ffebd2 100%);
}
/**
* 线
*/
.theme-yellow .nav-left-border::before {
background: #f6c133;
}
/******************** 红色 ********************/
/**
* 线
@ -197,11 +95,113 @@
*/
.theme-red .nav-left-border::before {
background: #ff0036;
}
/******************** 黄色 ********************/
/**
* 线
*/
.theme-yellow .border-color-main-pair {
border-color: #795548 !important;
}
.theme-yellow .border-color-main-light {
border-color: #ffebd2 !important;
}
.theme-yellow .border-color-main {
border-color: #f6c133 !important;
}
/**
*
*/
.theme-yellow .br-main-pair {
border: 1px solid #795548 !important;
}
.theme-yellow .br-main-light {
border: solid 1px #ffebd2 !important;
}
.theme-yellow .br-main {
border: 1px solid #f6c133 !important;
}
/**
* 线
*/
.theme-yellow .br-dashed-main-pair {
border: dashed 1px #795548 !important;
}
.theme-yellow .br-dashed-main-light {
border: dashed 1px #ffebd2 !important;
}
.theme-yellow .br-dashed-main {
border: dashed 1px #f6c133 !important;
}
/**
*
*/
.theme-yellow .cr-main-pair {
color: #795548 !important;
}
.theme-yellow .cr-main-light {
color: #ffebd2 !important;
}
.theme-yellow .cr-main {
color: #f6c133 !important;
}
/**
*
*/
.theme-yellow .nav-active-line::before {
background: #f6c133;
}
/**
*
*/
.theme-yellow .bg-main-pair {
background-color: #795548 !important;
}
.theme-yellow .bg-main-light {
background-color: #ffebd2 !important;
}
.theme-yellow .bg-main {
background-color: #f6c133 !important;
}
.theme-yellow button[disabled].bg-main-pair {
background-color: #b5a29c !important;
color: #8c766f !important;
}
.theme-yellow button[disabled].bg-main-light {
background-color: #fbebd6 !important;
color: #ffcc40 !important;
}
.theme-yellow button[disabled].bg-main {
background-color: #fdd178 !important;
color: #fff7e7 !important;
}
/**
* 线
*/
.theme-yellow .title-left-border::before {
background: linear-gradient(180deg, #f6c133 0%, #ffebd2 100%);
}
/**
* 线
*/
.theme-yellow .nav-left-border::before {
background: #f6c133;
}
/******************** 黑色 ********************/
/**

View File

@ -464,11 +464,6 @@
this.init_config(true);
}
//
this.setData({
load_status: 1,
});
if (res.data.code == 0) {
var data = res.data.data;
var theme_view = app.globalData.get_theme_value_view();
@ -476,7 +471,7 @@
var common_static_url = app.globalData.get_static_url('common');
var seckill_static_url = app.globalData.get_static_url('seckill', true) + 'app/';
var static_url = app.globalData.get_static_url('home');
this.setData({
var upd_data = {
theme_view: theme_view,
theme_color: theme_color,
common_static_url: common_static_url,
@ -505,16 +500,16 @@
plugins_shop_data: data.plugins_shop_data || null,
plugins_binding_data: data.plugins_binding_data || null,
plugins_magic_data: data.plugins_magic_data || null,
});
};
//
if (data.banner_list && data.banner_list.length > 0) {
if (this.load_status == 0 && data.banner_list && data.banner_list.length > 0) {
if ((data.banner_list[0]['bg_color'] || null) != null) {
this.top_content_bg_color = 'background: linear-gradient(180deg, ' + data.banner_list[0].bg_color + ' 0%, #f5f5f5 80%);';
this.top_content_search_bg_color = 'background: linear-gradient(180deg, ' + data.banner_list[0].bg_color + ' 0%, #f5f5f5 460%);';
upd_data['top_content_bg_color'] = 'background: linear-gradient(180deg, ' + data.banner_list[0].bg_color + ' 0%, #f5f5f5 80%);';
upd_data['top_content_search_bg_color'] = 'background: linear-gradient(180deg, ' + data.banner_list[0].bg_color + ' 0%, #f5f5f5 460%);';
} else {
this.top_content_bg_color = 'background: linear-gradient(180deg, ' + this.theme_color + ' 0%, #f5f5f5 80%);';
this.top_content_search_bg_color = 'background: linear-gradient(180deg, ' + this.theme_color + ' 0%, #f5f5f5 460%);';
upd_data['top_content_bg_color'] = 'background: linear-gradient(180deg, ' + this.theme_color + ' 0%, #f5f5f5 80%);';
upd_data['top_content_search_bg_color'] = 'background: linear-gradient(180deg, ' + this.theme_color + ' 0%, #f5f5f5 460%);';
}
}
@ -527,9 +522,9 @@
// #ifdef MP
width += 220;
// #endif
this.setData({
top_content_search_style: 'width: calc(100% - ' + width + 'rpx);',
});
upd_data['top_content_search_style'] = 'width: calc(100% - ' + width + 'rpx);';
//
this.setData(upd_data);
// 广
this.plugins_popupscreen_handle();
@ -549,6 +544,11 @@
app.globalData.showToast(res.data.msg);
}
//
this.setData({
load_status: 1,
});
//
setTimeout(function () {
app.globalData.page_share_handle();