mine concerns 8.15

This commit is contained in:
ghusermoon 2020-08-15 17:16:11 +08:00
parent 7deb5d312b
commit df52535848
11 changed files with 377 additions and 227 deletions

View File

@ -415,7 +415,7 @@ export default {
}, },
// 关注用户列表 // 关注用户列表
attentionMemberList({ page = 1,role } = {}) { attentionMemberList({ page = 1,role } = {}) {
return vm.$u.post('member/attentionMemberList', { page,role }); return vm.$u.post('member/attentionMemberList', { page, role });
}, },
// 可用优惠券商品 // 可用优惠券商品
couponGoodsList({ voucher_id, page, order }) { couponGoodsList({ voucher_id, page, order }) {
@ -437,6 +437,10 @@ export default {
friend_tomid:id friend_tomid:id
}); });
}, },
// 设置里的帮助
getSettingHelpList() {
return vm.$u.post('document/help');
}
} }
} }

View File

@ -19,6 +19,7 @@ const store = new Vuex.Store({
hasLogin: false, // 登录状态 hasLogin: false, // 登录状态
token: "", // 储存token token: "", // 储存token
showLoginModel: false, // 登录框 showLoginModel: false, // 登录框
question: {}, // 帮助与反馈
}, },
getters: { getters: {
getOrderAddress(state) { getOrderAddress(state) {
@ -75,6 +76,9 @@ const store = new Vuex.Store({
}, },
setLoadMore(state, info) { setLoadMore(state, info) {
state.loadmore = info; state.loadmore = info;
},
setQuestion(state, question) {
state.question = question;
} }
} }
}) })

View File

@ -46,6 +46,7 @@ export default {
}, },
methods: { methods: {
viewGoodsDetails(item) { viewGoodsDetails(item) {
if(this.closeAction()) return false;
const list = this.list.filter(item => { const list = this.list.filter(item => {
return item.show; return item.show;
}) })
@ -57,6 +58,17 @@ export default {
} }
}) })
}, },
closeAction() {
let status = false;
this.list.map((val, idx) => {
if(val.show) {
status = true;
this.$set(this.list[idx], 'show', false);
};
})
this.$forceUpdate();
return status;
},
getGoodsFavoritesList() { getGoodsFavoritesList() {
this.$u.api.getFavoritesList().then(res => { this.$u.api.getFavoritesList().then(res => {
if(res.errCode == 0) { if(res.errCode == 0) {

View File

@ -31,9 +31,9 @@
<text>{{ goodsInfo.goods_price || '0.00' }}</text> <text>{{ goodsInfo.goods_price || '0.00' }}</text>
</view> </view>
<view class="collect" @click="switchCollect(goodsInfo.is_collect)"> <view class="collect" @click="switchCollect(goodsInfo.is_collect)">
<u-icon name="star" color="#474747" size="28" v-if="goodsInfo.is_collect == 0"></u-icon> <u-icon name="star-fill" color="#FF7807" size="28" v-if="goodsInfo.is_collect == 1"></u-icon>
<u-icon name="star-fill" color="#FF7807" size="28" v-else></u-icon> <u-icon name="star" color="#474747" size="28" v-else></u-icon>
<text>{{ !goodsInfo.is_collect == 1 ? '收藏' : '收藏' }}</text> <text>{{ goodsInfo.is_collect == 1 ? '收藏' : '收藏' }}</text>
</view> </view>
</view> </view>
</view> </view>
@ -638,7 +638,7 @@ export default {
current: arr[index] current: arr[index]
}) })
}, },
switchCollect(status) { switchCollect(status = 0) {
if(status == 1) { if(status == 1) {
this.removeFavorite(); this.removeFavorite();
} else { } else {
@ -646,6 +646,13 @@ export default {
} }
}, },
addFavoriteGoods() { addFavoriteGoods() {
// //
// if (!this.$store.state.hasLogin) {
// uni.navigateTo({
// url: "pageA/login/login"
// })
// return false;
// }
this.$u.api.addFavoriteGoods({ fid: this.goodsInfo.goods_id }).then(res => { this.$u.api.addFavoriteGoods({ fid: this.goodsInfo.goods_id }).then(res => {
if(res.errCode == 0) { if(res.errCode == 0) {
this.getGoodsDetails(this.id); this.getGoodsDetails(this.id);

View File

@ -169,9 +169,9 @@ export default {
} }
}, },
getStoreInfo() { getStoreInfo() {
console.log(this.sid ) // console.log(this.sid )
this.$u.api.getStoreInfo({ id: this.sid }).then((res)=>{ this.$u.api.getStoreInfo({ id: this.sid }).then((res)=>{
console.log(JSON.stringify(res)) // console.log(JSON.stringify(res))
this.info = res.data; this.info = res.data;
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
}) })
@ -221,7 +221,7 @@ export default {
const res = uni.getSystemInfoSync(); const res = uni.getSystemInfoSync();
this.scrollHeiht = res.windowHeight - (73 + 20 + 170) + 'px'; this.scrollHeiht = res.windowHeight - (73 + 20 + 170) + 'px';
this.paddingTop = res.windowWidth / 750 * (90 + 50) + 'px'; this.paddingTop = res.windowWidth / 750 * (90 + 50) + 'px';
console.log(this.paddingTop); // console.log(this.paddingTop);
} }
}, },
onLoad(option){ onLoad(option){

View File

@ -1,259 +1,121 @@
<template> <template>
<view class="concerns"> <view class="concerns">
<view> <view class="tabs-top u-border-bottom">
<u-tabs-swiper ref="uTabs" :list="list" :current="current" @change="tabsChange" :is-scroll="false" <u-tabs ref="uTabs" :show-bar="false" :list="list" font-size="32" :current="current" @change="tabsChange" :is-scroll="false"
swiperWidth="750" active-color="#FF780F"></u-tabs-swiper> swiperWidth="750" active-color="#FF780F"></u-tabs>
</view> </view>
<swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" style="width:750rpx" :style="{'height':height}"> <scroll-view v-if="current==0" scroll-y style="height: 100%;width: 100%;" class="store" @scrolltolower="onreachBottom">
<swiper-item class="swiper-item" > <storeViwe ref="store"></storeViwe>
<scroll-view scroll-y style="height: 100%;width: 100%;" class="store" @scrolltolower="shangjiaapi()">
<view @touchmove.stop="">
<u-swipe-action
v-for="(item, index) in shangjia" :key="index"
:index='item.friend_tomid'
:options="options"
:show="item.show"
@click="removeFavorite"
@open="open"
>
<view class="item u-border-bottom" @click="toDetailsPage(item.friend_store_id)">
<image :src="item.friend_tomavatar"></image>
<!-- 此层wrap在此为必写的否则可能会出现标题定位错误 -->
<view class="title-wrap">
<view class="item-name u-line-1">{{ item.friend_tomname }}</view>
<view class="item-date">
<image src="@/pageE/static/mine/26.png"></image>
<view>{{ item.friend_tomavatar | date }}</view>
</view>
</view>
</view>
</u-swipe-action>
<view style="height:20rpx"></view>
<u-loadmore :status="sstatus" bg-color="#ECECEC" v-if="shangjia.length" />
</view>
<u-empty mode="list" v-if="!shangjia.length" color="#000" img-width="200" font-size="30"></u-empty>
</scroll-view> </scroll-view>
</swiper-item> <scroll-view v-else scroll-y style="height: 100%;width: 100%;" @scrolltolower="onreachBottom">
<swiper-item class="swiper-item" >
<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="darenapi()">
<view class="concerns-container"> <view class="concerns-container">
<view v-for="(info, index) in daren" :key="index"> <view v-for="(info, index) in daren" :key="index">
<view class="daren-item"> <view class="daren-item">
<image class="head" :src="info.friend_tomavatar" @click="viewDetails({ id: info.friend_tomid, type: info.role })"></image> <image class="head" :src="info.friend_tomavatar" @click="toDetailsPage({ id: info.friend_tomid })"></image>
<text class="name" @click="viewDetails({ id: info.friend_tomid, type: info.role })">{{ info.friend_tomname || '' }}</text> <text class="name" @click="toDetailsPage({ id: info.friend_tomid })">{{ info.friend_tomname || '' }}</text>
<view class="guanzhu" @click="changeType(info.friend_tomid)" v-if="info.friend_followstate == 1">取消关注</view> <view class="guanzhu" @click="changeType(info.friend_tomid)" v-if="info.friend_followstate == 1">取消关注</view>
</view> </view>
</view> </view>
<u-loadmore :status="dstatus" bg-color="#ECECEC" v-if="daren.length" /> <u-loadmore :status="loadStatus" bg-color="#FFFFFF" v-if="daren.length > 9" @loadmore="loadmore" />
</view> </view>
<u-empty mode="list" v-if="!daren.length" color="#000" img-width="200" font-size="30"></u-empty> <u-empty mode="list" v-if="!daren.length" color="#000" img-width="200" font-size="30" margin-top="200"></u-empty>
</scroll-view> </scroll-view>
</swiper-item>
</swiper>
</view> </view>
</template> </template>
<script> <script>
import storeViwe from './storeConcerns'
export default { export default {
data() { data() {
return { return {
list: [{name:"商家"},{name:"达人"}], list: [{ name: "商家" }, { name: "达人" }],
current: 0, // tabscurrenttab daren: [],
swiperCurrent: 0, // swipercurrentswiper-item
daren:[],
shangjia:[], shangjia:[],
height:0, height: 0,
show: false, show: false,
options: [ current: 0,
{ page: 1,
text: '删除', loadStatus: 'loadmore',
style: { timer: true,
backgroundColor: '#FF3131'
}
}
],
dpage:1,
spage:1,
dstatus: 'loadmore',
sstatus: 'loadmore',
} }
}, },
components: {
storeViwe,
},
onShow() { onShow() {
this.dstatus = "loadmore" this.loadStatus = "loadmore"
this.sstatus = "loadmore" this.page = 1
this.dpage = 1 this.getPeopleList();
this.spage = 1
this.shangjiaapi();
this.darenapi();
}, },
onLoad(){ onLoad(){
let that = this this.setViewHeight();
uni.getSystemInfo({
success(res){
that.height = res.windowHeight - (res.windowWidth / 750 * 80) + 'px'
}
})
}, },
//
methods: { methods: {
setViewHeight() {
const res = uni.getSystemInfoSync();
this.height = res.windowHeight - (res.windowWidth / 750 * 80) + 'px';
},
// tabsswiper // tabsswiper
tabsChange(index) { tabsChange(index) {
this.swiperCurrent = index; this.current = index;
},
// swiper-itemtabs
transition(e) {
let dx = e.detail.dx;
this.$refs.uTabs.setDx(dx);
},
// swiperswiperdx
// swipertabsswiper
animationfinish(e) {
let current = e.detail.current;
this.$refs.uTabs.setFinishCurrent(current);
this.swiperCurrent = current;
this.current = current;
}, },
// scroll-view // scroll-view
onreachBottom() { onreachBottom() {
if(this.current == 0) this.$refs.loadmore();
else if(this.current == 1) this.loadmore();
}, },
shangjiaapi() { loadmore() {
if(this.sstatus == "loading" || this.sstatus == 'nomore') return if(!this.timer) return false;
this.sstatus = "loading" this.timer = false;
this.$forceUpdate(); this.loadStatus = "loading";
this.$u.api.attentionMemberList({role:2,page:this.spage}).then(res => { this.page++;
console.log(res) this.getPeopleList({ load: 'loadmore' }).then(length => {
if(res.errCode == 0) { this.loadStatus = "nomore";
this.spage > 1 ? this.shangjia.push(...res.data.data) : (this.shangjia = res.data.data); if(length == 0) this.page--;
this.sstatus = "loadmore" }).catch(() => {
this.loadStatus = "nomore";
if(res.data.data.length == 0){ this.page--;
this.sstatus = 'nomore'
}
this.spage++
this.$forceUpdate();
}
}) })
}, },
darenapi() { async getPeopleList({ load = 'reload' } = {}) {
this.$u.api.attentionMemberList({role:3,page:this.dpage}).then(res => { const res = await this.$u.api.attentionMemberList({
if(this.dstatus == "loading" || this.dstatus == 'nomore') return role: 3,
this.dstatus = "loading" page: this.page
this.$forceUpdate();
console.log(this.dstatus)
console.log(res)
if(res.errCode == 0) {
this.dpage > 1 ? this.daren.push(...res.data.data) : (this.daren = res.data.data);
this.dstatus = "loadmore"
if(res.data.data.length == 0){
this.dstatus = 'nomore'
}
this.dpage++
this.$forceUpdate();
}
}) })
this.timer = true;
if(res.errCode == 0) {
if(load == 'reload') this.daren = res.data.data;
else if(load == 'loadmore') this.daren.push(...res.data.data);
}
return res.data.data.length;
}, },
viewDetails({ id, type }) { //
let src = type == 3 ? 'pageB/details/index' : 'pageC/merchant/index';
this.$u.route(src, {
id: id
});
},
changeType(id) { changeType(id) {
console.log(id); // console.log(id);
this.$u.api.attentionMember({ this.$u.api.attentionMember({
member_id: id member_id: id
}).then(res => { }).then(res => {
this.$u.toast(res.message); this.$u.toast(res.message);
this.attentionMemberList(); this.getPeopleList();
})
},
removeFavorite(id) {
console.log(id)
this.$u.api.attentionMemberRemove({
id: id,
type: 'store'
}).then(res => {
console.log(res)
this.$u.toast(res.message);
if(res.errCode == 0) {
this.sstatus = "loadmore"
this.spage = 1
this.shangjiaapi();
}
}) })
}, },
toDetailsPage(id) { toDetailsPage(id) {
this.$u.route('pageC/merchant/index', { this.$u.route('pageB/details/index', {
id: id id: id
}); });
}, },
open(index) {
// swipeActionprops
// 'false''false'
this.shangjia[index].show = true;
this.shangjia.map((val, idx) => {
if(index != idx) this.list[idx].show = false;
})
}
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.store {
background-color: #ECECEC;
.item {
padding: 30rpx;
display: flex;
align-items: center;
> image {
width: 80rpx;
height: 80rpx;
border-radius: 50%;
flex-shrink: 0;
margin-right: 21rpx;
}
.title-wrap {
flex: 1;
display: flex;
align-items: center;
justify-content: space-between;
.item-name {
width: 260rpx;
font-size: 30rpx;
color: rgba(51,51,51,1);
}
.item-date {
display: flex;
align-items: center;
> image {
margin-right: 25rpx;
width: 24rpx;
height: 24rpx;
}
}
}
}
}
.concerns { .concerns {
background-color: #ECECEC; background-color: #FFFFFF;
.store {
background-color: #FFFFFF;
}
.concerns-container { .concerns-container {
padding: 30rpx; padding: 30rpx;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
// &:not(:nth-child(3n)) {
// margin-right: 20rpx;
// }
margin-left: -20rpx; margin-left: -20rpx;
.daren-item{ .daren-item{
width: 215rpx; width: 215rpx;

View File

@ -0,0 +1,176 @@
<template>
<view class="collection-item">
<u-swipe-action
v-for="(item, index) in list" :key="index"
:index='index'
:show="item.show"
:options="options"
@click="removeFavorite"
@open="open"
>
<view class="item u-border-bottom" @click="viewStoreDetails(item)">
<image :src="item.friend_tomavatar"></image>
<!-- 此层wrap在此为必写的否则可能会出现标题定位错误 -->
<view class="title-wrap">
<view class="item-top u-line-1">{{ item.friend_tomname }}</view>
<view class="item-bottom">
<view class="item-date">
<image src="@/pageE/static/mine/26.png"></image>
<view>{{ item.friend_tomavatar | date }}</view>
</view>
</view>
</view>
</view>
</u-swipe-action>
<u-empty mode="list" v-if="!list.length" color="#000" img-width="200" font-size="30" margin-top="200"></u-empty>
<u-loadmore :status="loadStatus" bg-color="#FFFFFF" v-if="list.length > pageSize" @loadmore="loadmore" />
</view>
</template>
<script>
export default {
data() {
return {
pageSize: 12,
list: [],
options: [
{
text: '删除',
style: {
backgroundColor: '#FF3131'
}
}
],
page: 1,
timer: true,
loadStatus: 'loadmore',
}
},
mounted() {
this.getStoreList();
},
methods: {
viewStoreDetails(item) {
if(this.closeAction()) return false;
// console.log(this.list);
const list = this.list.filter(item => {
return item.show;
})
if(list.length) return false;
this.$u.route({
url: 'pageC/merchant/index',
params: {
id: item.friend_store_id,
}
})
},
async getStoreList({ load = 'reload' } = {}) {
const res = await this.$u.api.attentionMemberList({
role: 2,
page: this.page
})
this.timer = true;
if(res.errCode == 0) {
if(load == 'reload') this.list = res.data.data;
else if(load == 'loadmore') this.list.push(...res.data.data);
}
this.list.forEach(item => {
Object.assign(item, { show: false });
})
// console.log(this.list);
return res.data.data.length;
},
loadmore() {
if(!this.timer) return false;
this.timer = false;
this.loadStatus = "loading";
this.page++;
let promise;
promise = this.getStoreList({ load: 'loadmore' });
promise.then(length => {
this.loadStatus = "nomore";
if(length == 0) this.page--;
}).catch(() => {
this.loadStatus = "nomore";
this.page--;
})
},
removeFavorite(index) {
const id = this.list[index].friend_tomid;
this.$u.api.attentionMemberRemove({
id: id,
type: 'store'
}).then(res => {
if(res.errCode == 0) {
this.getStoreList();
} else {
this.$u.toast(res.message);
}
})
},
closeAction() {
let status = false;
this.list.map((val, idx) => {
if(val.show) {
status = true;
this.$set(this.list[idx], 'show', false);
};
})
this.$forceUpdate();
return status;
},
open(index) {
console.log(index);
// swipeActionprops
// 'false''false'
this.list[index].show = true;
this.list.map((val, idx) => {
if(index != idx) this.list[idx].show = false;
})
this.$forceUpdate();
}
},
};
</script>
<style lang="scss" scoped>
.collection-item {
background-color: #ffffff;
.item {
padding: 30rpx;
display: flex;
> image {
width: 180rpx;
height: 160rpx;
border-radius: 10rpx;
margin-right: 30rpx;
flex-shrink: 0;
}
.title-wrap {
flex: 1;
.item-top {
font-size: 30rpx;
color: rgba(51,51,51,1);
line-height: 44rpx;
margin-bottom: 54rpx;
}
.item-bottom {
display: flex;
align-items: center;
justify-content: space-between;
.item-price {
font-size: 30rpx;
color: rgba(51,51,51,1);
}
.item-date {
display: flex;
align-items: center;
> image {
margin-right: 25rpx;
width: 24rpx;
height: 24rpx;
}
}
}
}
}
}
</style>

View File

@ -1,11 +1,11 @@
<template> <template>
<view class="setting"> <view class="setting">
<view class="list-item"> <!-- <view class="list-item">
<view>消息提醒</view> <view>消息提醒</view>
<view> <view>
<u-switch v-model="checked" active-color="#FF770F" inactive-color="#A9A7A7" size="35"></u-switch> <u-switch v-model="checked" active-color="#FF770F" inactive-color="#A9A7A7" size="35"></u-switch>
</view> </view>
</view> </view> -->
<view v-for="(item, index) in settingList" :key="index" class="list-item" @click="toNextPage(item.link)"> <view v-for="(item, index) in settingList" :key="index" class="list-item" @click="toNextPage(item.link)">
<view>{{ item.title }}</view> <view>{{ item.title }}</view>
<image src="../static/mine/21.png"></image> <image src="../static/mine/21.png"></image>

View File

@ -5,17 +5,15 @@
<view class="feedback-itme"> <view class="feedback-itme">
<view class="manual"> <view class="manual">
<view class="service-phone">拨打官方客服电话400-100-100</view> <view class="service-phone">拨打官方客服电话400-100-100</view>
<view class="manual-time">周一至周五08:0-18:00</view> <view class="manual-time">{{ wkTime }}</view>
</view> </view>
<view class="suggestions">意见反馈</view> <view class="suggestions" @click="writeComments">意见反馈</view>
</view> </view>
</view> </view>
<view class="feedback-box"> <view class="feedback-box">
<view class="feedback-title">常见服务</view> <view class="feedback-title">常见服务</view>
<view class="feedback-itme"> <view class="feedback-itme">
<view class="u-line-2">账号问题登录时需要验证码手机号使用不了怎么办</view> <view class="u-line-2" v-for="item in helpList" :key="item.id" @click="viewAnswer(item)">{{ item.question }}</view>
<view class="u-line-2">账号问题登录时需提示您的密码不安全请重置</view>
<view class="u-line-2">账号问题登录密码忘记了怎么办</view>
</view> </view>
</view> </view>
</view> </view>
@ -23,7 +21,32 @@
<script> <script>
export default { export default {
data() { data() {
return {} return {
helpList: [],
wkTime: '',
tel400: '',
}
},
onLoad() {
this.getHelpList();
},
methods: {
viewAnswer(item) {
this.$store.commit('setQuestion', item);
this.$u.route('pageE/setting/question');
},
getHelpList() {
this.$u.api.getSettingHelpList().then(res => {
this.helpList = res.data.QA;
this.tel400 = res.data.tel400;
this.wkTime = res.data.wkTime;
})
},
writeComments() {
uni.navigateTo({
url: '/pageE/more/WriteComments'
});
}
} }
}; };
</script> </script>

View File

@ -0,0 +1,51 @@
<template>
<view class="question">
<view class="public-view quest">
<view class="title qt">Q:</view>
<view class="qa">{{ item.question }}</view>
</view>
<view class="public-view answer">
<view class="title at">A:</view>
<view>
<rich-text :nodes="nodes"></rich-text>
</view>
</view>
</view>
</template>
<script>
import common from '@/static/js/common.js'
export default {
data() {
return {
item: {},
nodes: ''
}
},
onLoad() {
this.item = this.$store.state.question;
console.log(this.item);
this.nodes = common.unescapeHTML(this.item.answer);
}
};
</script>
<style lang="scss" scoped>
.question {
min-height: calc(100vh - var(--window-top));
background: #FFFFFF;
padding: 20rpx 30rpx;
.public-view {
display: flex;
margin-bottom: 40rpx;
.title {
font-size: 36rpx;
margin-right: 20rpx;
}
.at {
color: #ff780f;
}
.qa {
line-height: 36rpx;
}
}
}
</style>

View File

@ -845,7 +845,6 @@
{ {
"path": "mine/MineConcerns", "path": "mine/MineConcerns",
"style": { "style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "我的关注", "navigationBarTitleText": "我的关注",
"app-plus": { "app-plus": {
"titleSize": "36px", "titleSize": "36px",
@ -861,10 +860,9 @@
"style": { "style": {
"navigationBarTitleText": "勋章介绍", "navigationBarTitleText": "勋章介绍",
"app-plus": { "app-plus": {
"type": "transparent",
"titleSize": "36px", "titleSize": "36px",
"titleNView": { "titleNView": {
"backgroundColor": "rgba(255,255,255,0)", "type": "transparent",
"titleColor": "#ffffff" "titleColor": "#ffffff"
} }
} }
@ -968,6 +966,19 @@
} }
} }
}, },
{
"path": "setting/question",
"style": {
"navigationBarTitleText": "常见问题",
"app-plus": {
"titleSize": "36px",
"titleNView": {
"titleColor": "#333333",
"backgroundColor": "#FFFFFF"
}
}
}
},
{ {
"path": "setting/ShieldUsers", "path": "setting/ShieldUsers",
"style": { "style": {