diff --git a/pages/news/rules/rulesList.vue b/pages/news/rules/rulesList.vue
index dea8ea1..9d5b288 100644
--- a/pages/news/rules/rulesList.vue
+++ b/pages/news/rules/rulesList.vue
@@ -44,7 +44,8 @@
.pages {
width: 100%;
height: 100%;
- padding: 30rpx;
+ padding: 30rpx;
+ box-sizing: border-box;
}
.item {
diff --git a/pages/news/user/vip.vue b/pages/news/user/vip.vue
index acd155f..28833c0 100644
--- a/pages/news/user/vip.vue
+++ b/pages/news/user/vip.vue
@@ -5,9 +5,11 @@
-->
-
-
+
+
+
+
全部
@@ -62,6 +64,7 @@
keyword: '',
page: 1,
total: 0,
+ type: 3,
list: [],
title: '会员管理',
sortType: 'all', // 排序类型
@@ -89,12 +92,23 @@
let res = await Vip.getVipList({
page: this.page,
search: this.keyword,
- user_type: this.user_type,
+ user_type: this.type == 1?this.user_type: 30,
})
console.log(res, "===")
- this.list.push(...res.data.list.data);
+ this.list = this.arrayUnique(this.list.concat(res.data.list.data),'user_id');
this.total = res.data.list.total;
},
+
+ //数组对象去重
+ arrayUnique(arr, name) {
+ var hash = {};
+ return arr.reduce(function (item, next) {
+ hash[next[name]]
+ ? ""
+ : (hash[next[name]] = true && item.push(next));
+ return item;
+ }, []);
+ },
copyText(text) {
uni.setClipboardData({
data: text,
@@ -130,6 +144,7 @@
},
onLoad(option) {
this.title = option.title
+ this.type = option.type
uni.setNavigationBarTitle({
title: this.title
});
diff --git a/pages/search/index.vue b/pages/search/index.vue
index 60a532b..54cbe17 100644
--- a/pages/search/index.vue
+++ b/pages/search/index.vue
@@ -9,22 +9,27 @@
- 搜索发现
- 搜索历史
+
+
+
+
+ 全部删除
+ 完成
+
+
-
+
-
-
- {{item}}
+
+ {{item}}
+
@@ -79,7 +84,8 @@
searchFindList: [],
page: 1,
goodsList: [],
- category_id:0
+ category_id:0,
+ isHot: true,
}
},
@@ -97,7 +103,19 @@
this.chartsGoodsJingHandle()
},
- methods: {
+ methods: {
+ toDo(index,idx){
+ if(index == 0){
+ this.isHot = false
+ }else if(index == 1){
+ this.searchList = []
+ uni.removeStorageSync("searchList")
+ }else if(index == 2){
+ this.isHot = true
+ }else if(index == 3){
+ this.searchList.splice(idx,1)
+ }
+ },
// 跳转到秒杀商品详情
handleTargetGoods(sharpGoodsId) {
uni.navigateTo({
@@ -211,23 +229,37 @@
margin: 0 40rpx;
margin-top: 44rpx;
- .findTitle {
-
- // width: 200rpx;
- // height: 44rpx;
- // font-size: 32rpx;
- // font-family: PingFang SC, PingFang SC;
- // font-weight: 500;
- // color: #000000;
- // line-height: 44rpx;
- // margin-left: 40rpx;
+ .findTitle {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
&>text {
font-size: 32rpx;
font-family: PingFang SC, PingFang SC;
font-weight: 500;
color: #000000;
}
-
+ .do{
+ display: flex;
+ align-items: center;
+ padding: 0 20rpx;
+ white-space: nowrap;
+ }
+ .red{
+ font-size: 24rpx;
+ color: #ff0000;
+ }
+ .suc{
+ border-left: 1px solid #ececec;
+ padding-left: 20rpx;
+ margin-left: 20rpx;
+ height: 30rpx;
+ display: flex;
+ align-items: center;
+ font-size: 24rpx;
+ color: #9B9B9B;
+ }
.findIcon {
width: 36rpx;
height: auto;
@@ -256,7 +288,6 @@
flex-wrap: wrap;
margin: 0 40rpx;
margin-top: 20rpx;
- // justify-content: space-between;
.hotItem {
padding: 10rpx 30rpx;
@@ -266,22 +297,23 @@
display: flex;
align-items: center;
margin-left: 12rpx;
- // margin:0 20rpx;
margin-bottom: 24rpx;
- // height: 64rpx;
- // background: #FFFFFF;
- // border-radius: 68rpx 68rpx 68rpx 68rpx;
- // opacity: 1;
- // font-size: 28rpx;
- // font-family: PingFang SC, PingFang SC;
- // font-weight: 400;
- // color: #000000;
- // line-height: 64rpx;
- // padding-right: 22rpx;
- // margin-right: 12rpx;
- // margin-bottom: 24rpx;
- // padding-left: 30rpx;
-
+ text{
+ display: block;
+ max-width: 200rpx;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ }
+ .del{
+ border-left: 1px solid #ececec;
+ padding-left: 20rpx;
+ margin-left: 20rpx;
+ height: 30rpx;
+ display: flex;
+ align-items: center;
+ }
+
.hotImg {
width: 25rpx;
height: 29rpx;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index a50b7a7..2490539 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -122,11 +122,11 @@
会员分销
-
+
会员管理
-
+
分销管理
@@ -600,7 +600,7 @@
},
onShow(options) {
this.onRefreshPage()
- this.getSuggest()
+ this.getSuggest();
},
onPageScroll(e) {
if (e.scrollTop <= 200) { // 当滚动到顶部且向下滑动时为true
@@ -722,7 +722,8 @@
uni.setStorageSync('userInfo', that.userInfo)
if (data.user_type == 20 || data.user_type == 40) {
that.getMembershipInviteQrcode()
- } else if (data.user_type == 30 || data.user_type == 40) {
+ }
+ if (data.user_type == 30 || data.user_type == 40) {
that.getDealerInviteQrcode()
}
// that.getMembershipInviteQrcode()