diff --git a/common/styles/iconfont.css b/common/styles/iconfont.css
index 493405b..58eb176 100644
--- a/common/styles/iconfont.css
+++ b/common/styles/iconfont.css
@@ -1,8 +1,8 @@
@font-face {
font-family: "lf-iconfont"; /* Project id 2651793 */
- src: url('//at.alicdn.com/t/font_2651793_o7fen3k0lq.woff2?t=1634315157253') format('woff2'),
- url('//at.alicdn.com/t/font_2651793_o7fen3k0lq.woff?t=1634315157253') format('woff'),
- url('//at.alicdn.com/t/font_2651793_o7fen3k0lq.ttf?t=1634315157253') format('truetype');
+ src: url('//at.alicdn.com/t/font_2651793_0s2r3bnbfn8.woff2?t=1634456623686') format('woff2'),
+ url('//at.alicdn.com/t/font_2651793_0s2r3bnbfn8.woff?t=1634456623686') format('woff'),
+ url('//at.alicdn.com/t/font_2651793_0s2r3bnbfn8.ttf?t=1634456623686') format('truetype');
}
.lf-iconfont {
@@ -13,6 +13,18 @@
-moz-osx-font-smoothing: grayscale;
}
+.lf-icon-dingwei1:before {
+ content: "\e61e";
+}
+
+.lf-icon-daohang:before {
+ content: "\e88a";
+}
+
+.lf-icon-ditu:before {
+ content: "\e8ad";
+}
+
.lf-icon-dingwei:before {
content: "\ec32";
}
diff --git a/pages/shopmap/index.vue b/pages/shopmap/index.vue
index 28e73d2..b90a3b8 100644
--- a/pages/shopmap/index.vue
+++ b/pages/shopmap/index.vue
@@ -22,15 +22,15 @@
-
+
-
-
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+ 瑞希开发
+
+
+
+
+
+
+
@@ -48,12 +69,12 @@
{{ loadingText }}
-
-
+
+
ß
@@ -88,7 +109,8 @@
loadingClass: true,
loadingText: '正在加载中',
page: 1,
- isPage: true
+ isPage: true,
+ type: 1
},
{
id: 2,
@@ -98,7 +120,8 @@
loadingClass: true,
loadingText: '正在加载中',
page: 1,
- isPage: true
+ isPage: true,
+ type: 4
},
{
id: 4,
@@ -108,7 +131,8 @@
loadingClass: true,
loadingText: '正在加载中',
page: 1,
- isPage: true
+ isPage: true,
+ type: 3
},
],
current: 0,
@@ -117,7 +141,6 @@
page: 1,
isPage: true,
pageSize: 20,
- isRefresher: false,
sort: 0,
}
},
@@ -153,7 +176,7 @@
}
},
clearTabItem(){
- let tab_item = this.tab_list_father[this.current];
+ let tab_item = this.tab_list[this.current];
tab_item.page = 1;
tab_item.isPage = true;
tab_item.isRefresher = true;
@@ -193,7 +216,7 @@
})
},
clicksort(index) {
- if(index == 3) {
+ if(index == 2) {
if(this.sort == 0) {
this.sort = 1
}else {
@@ -221,7 +244,7 @@
},
// scroll-view 下拉刷新
onRefresherrefresh(){
- this.tab_list_father[this.current].isRefresher = true;
+ this.tab_list[this.current].isRefresher = true;
this.$u.throttle(() => {
this.clearTabItem();
this.getActivityList();
@@ -229,7 +252,7 @@
},
// 页面触底，加载下一页
onScrolltolower(){
- let tab_item = this.tab_list_father[this.current];
+ let tab_item = this.tab_list[this.current];
if(tab_item.isPage){
tab_item.page = tab_item.page + 1;
this.getActivityList();
@@ -237,16 +260,19 @@
},
getActivityList(){
let tab_item = this.tab_list_father[this.current_father];
+ let sort_type = this.tab_list[this.current].type;
console.log('页数',tab_item.id)
if(this.$shared.isValueType(tab_item) == 'undefined') return;
- this.$http(this.API.API_ADVICELIST,{page: tab_item.page,category_id: tab_item.id}).then(res => {
+ this.$http(this.API.API_ADVICELIST,{page: tab_item.page,category_id: tab_item.id,type: sort_type,by: this.sort}).then(res => {
let isPage = res.data.next_page_url == null?false:true;
tab_item.isPage = isPage;
if(!isPage){
tab_item.loadingClass = false;
tab_item.loadingText = '没有更多数据啦~';
}
- tab_item.isRefresher = false;
+ this.tab_list[this.current].isRefresher = false;
+ console.log(this.tab_list[this.current].isRefresher )
+ console.log(this.tab_list[this.current])
if(tab_item.page == 1){
tab_item.list = res.data.data;
}else{
@@ -261,6 +287,12 @@