diff --git a/common/styles/iconfont.css b/common/styles/iconfont.css
index cc3e19b..3e3b650 100644
--- a/common/styles/iconfont.css
+++ b/common/styles/iconfont.css
@@ -1,8 +1,8 @@
@font-face {
font-family: "lf-iconfont"; /* Project id 2779107 */
- src: url('//at.alicdn.com/t/font_2779107_6h2ufg0uxnx.woff2?t=1632991726658') format('woff2'),
- url('//at.alicdn.com/t/font_2779107_6h2ufg0uxnx.woff?t=1632991726658') format('woff'),
- url('//at.alicdn.com/t/font_2779107_6h2ufg0uxnx.ttf?t=1632991726658') format('truetype');
+ src: url('//at.alicdn.com/t/font_2779107_d2jv9auseui.woff2?t=1633937660899') format('woff2'),
+ url('//at.alicdn.com/t/font_2779107_d2jv9auseui.woff?t=1633937660899') format('woff'),
+ url('//at.alicdn.com/t/font_2779107_d2jv9auseui.ttf?t=1633937660899') format('truetype');
}
.lf-iconfont {
@@ -13,6 +13,14 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-xiangshang_shouqi:before {
+ content: "\e797";
+}
+
+.icon-xiangxia_shousuo:before {
+ content: "\e798";
+}
+
.icon-kefufenxiermaikefu:before {
content: "\e889";
}
diff --git a/pages/index/index/index.vue b/pages/index/index/index.vue
index dedfcef..d3106e4 100644
--- a/pages/index/index/index.vue
+++ b/pages/index/index/index.vue
@@ -44,7 +44,7 @@
-
+
diff --git a/pages/index/list/monthlyList.vue b/pages/index/list/monthlyList.vue
index 61083ed..d75f183 100644
--- a/pages/index/list/monthlyList.vue
+++ b/pages/index/list/monthlyList.vue
@@ -2,31 +2,39 @@
-
- 热销榜单
+
+ {{activity_content.topic.name}}
-
-
-
-
-
- {{ item+1 }}
-
-
-
-
-
- SK-II秋日宠粉体验套装
- 月销量：324
-
-
-
- ¥888
+
+
+
+
+
+
+
+
+
+ {{item.goods.name}}
+ 月销量：{{item.goods.sale_count}}
+
+
+
+ ¥{{item.goods.sell_price}}
+
+
+
+
+ {{ loadingText }}
+
+
-
-
+
@@ -34,14 +42,83 @@
export default {
data(){
return {
-
+ page: 1,
+ topic_id: 1,
+ activity_content: '',
+ list: [],
+ isPage: true,
+ loadingClass: true,
+ loadingText: '正在加载中',
+ scrollH: 0,
+ nav_height: 0,
+ isRefresher: true,
}
},
onLoad(){
-
+ let info = uni.getSystemInfoSync();
+ this.scrollH = info.screenHeight;
+ this.getActivityList();
+ },
+ computed: {
+ autoHeight() {
+ return `calc(${this.scrollH}px - ${this.nav_height}px - 430rpx)`;
+ }
},
methods: {
-
+ // 页面触底，加载下一页
+ onScrolltolower() {
+ if (this.isPage) {
+ this.page = this.page + 1;
+ this.getActivityList();
+ }
+ },
+ // 下拉刷新处理
+ refreshFn(options) {
+ this.page = 1;
+ this.isPage = true;
+ this.loadingClass = true;
+ this.list = []
+ this.loadingText = '正在加载中';
+ this.getActivityList(options);
+ },
+ // scroll-view 下拉刷新
+ onRefresherrefresh() {
+ this.isRefresher = true;
+ this.refreshFn({
+ type: 'scrollRefresh'
+ });
+ },
+ getActivityList(options = {}){
+ this.$http.get({
+ api: 'api/topic/list',
+ data: {
+ topic_id: this.topic_id,
+ page: this.page
+ },
+ header: {
+ Authorization: this.$cookieStorage.get('user_token')
+ }
+ }).then(res => {
+ this.activity_content = res.data.data
+ console.log('====',res.data.data)
+ let isPage = this.page < res.data.data.goods.total ? true : false;
+ this.isPage = isPage;
+ if (!isPage) {
+ this.loadingClass = false;
+ this.loadingText = '没有更多数据啦~';
+ }
+ if (options.type == 'pageRefresh') {
+ uni.stopPullDownRefresh();
+ } else if (options.type == 'scrollRefresh') {
+ this.isRefresher = false;
+ }
+ if (this.page == 1) {
+ this.list = res.data.data.goods.data;
+ } else {
+ this.list.push(...res.data.data.goods.data);
+ }
+ })
+ },
}
}
@@ -69,7 +146,7 @@
display: flex;
justify-content: center;
align-items: center;
- font-size: 100rpx;
+ font-size: 60rpx;
color: #FFFFFF;
font-weight: bold;
font-family: '楷体';
diff --git a/pages/shop/shopdetail.vue b/pages/shop/shopdetail.vue
index 14de2f3..3a6cb59 100644
--- a/pages/shop/shopdetail.vue
+++ b/pages/shop/shopdetail.vue
@@ -79,8 +79,12 @@
-
+
+
+
+
+
@@ -119,7 +123,8 @@
brand_id: 0,
detail: {},
search_val: '',
- is_collect: false
+ is_collect: false,
+ sort: 'desc'
}
},
onLoad(options){
@@ -127,6 +132,14 @@
this.getShopDetail();
},
methods: {
+ changeSort(sort) {
+ if(this.sort == 'desc') {
+ this.sort = 'asc';
+ }else {
+ this.sort = 'desc';
+ }
+ this.getData();
+ },
// 切换商品收藏
switchCollect(){
let userInfo = this.$cookieStorage.get('user_token') || {};
@@ -212,7 +225,8 @@
},
getData() {
let par = {
- brand_id: this.brand_id
+ brand_id: this.brand_id,
+ sort: this.sort
}
let orderBy = ['','sale_count','updated_at','sell_price'][this.current];
if(orderBy){
@@ -308,6 +322,9 @@