theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdpaoup

Browse Source
This commit is contained in:
Gdpao 2020-08-06 20:42:03 +08:00
parent 201f858833
commit 090b7cc753
22 changed files with 209 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/http.interceptor.js
View File

@ -27,12 +27,28 @@ const install = (Vue, vm) => {
return res;
} else if(res.errCode == 401) {
// 假设201为token失效，这里跳转登录
vm.$u.toast('验证失败，请重新登录');
// vm.$u.toast('您还没有登录哦，请先去登录！');
if (res.data.action != "memberinfo") {
uni.showModal({
title: "温馨提示",
content: "您还未登录，请立即登录",
cancelText: "以后再说",
confirmText: "立即登录",
confirmColor: "#FF780F",
success(res) {
// console.log(res);
if (res.confirm) {
setTimeout(() => {
// 此为uView的方法，详见路由相关文档
vm.$u.route('/pageA/login/login')
}, 1500)
}, 500)
}
}
})
}
return false;
} else if (res.errCode == 1) {
console.log(res.message);
} else {
// 如果返回false，则会调用Promise的reject回调，
// 并将进入this.$u.post(url).then().catch(res=>{})的catch回调中，res为服务端的返回值

3
common/store/index.js
View File

@ -17,7 +17,8 @@ const store = new Vuex.Store({
groupbuyInfo: {}, // 秒杀详情
loadmore: {}, // 下拉加载返回的数据
hasLogin: false, // 登录状态
token: "" // 储存token
token: "", // 储存token
showLoginModel: false, // 登录框
},
getters: {
getOrderAddress(state) {

2
components/index/daren-item/index.vue
View File

@ -68,7 +68,7 @@ export default {
height: 80rpx;
border-radius: 50%;
margin-top: 24rpx;
background-color: #0f0;
background-color: #0077AA;
}
.name{
font-size: 26rpx;

29
components/informations/notice/notice.vue
View File

@ -1,10 +1,10 @@
<template>
<view class="notice">
<view v-for="(item,index) in notice" :key="index">
<view class="time_notice">2020-05-14 20:11</view>
<view class="time_notice">{{ item.addtime }}</view>
<view class="notice_view">
<image :src="item.url" mode="aspectFill" ></image>
<view class="text_view">{{item.content}}</view>
<image :src="item.picture" mode="aspectFill" ></image>
<view class="text_view u-line-2">{{ item.content }}</view>
<view class="notice_list">
<text>查看详情</text>
<u-icon name="arrow-right" color="#666"></u-icon>
@ -74,21 +74,20 @@
<script>
export default {
name: "notice",
props: ['list'],
data() {
return {
notice : [
{
time : '2020-05-14 20:11',
content:'潮牌1折秒杀！杨幂同款小白鞋今日43元送10000元大红包还有明星限量签名照',
url : '../../../pageE/static/mine/23.png'
},
{
time : '2020-05-14 20:11',
content:'潮牌1折秒杀！杨幂同款小白鞋今日43元送10000元大红包还有明星限量签名照',
url : '../../../pageE/static/mine/23.png'
}
]
notice : []
};
},
watch: {
list(newVal,old) {
// console.log(newVal);
this.notice = newVal;
}
},
methods: {
}
}
</script>

4
components/shop/group/index.vue
View File

@ -10,7 +10,7 @@
<view class="label">
<u-tabs-swiper ref="group" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper>
</view>
<swiper :current="swiperCurrent" @animationfinish="animationfinish" style="height: 260rpx">
<swiper :current="swiperCurrent" @animationfinish="animationfinish" style="height: 340rpx;">
<swiper-item class="swiper-item list" v-for="(_, i) in classifyList" :key="i">
<!-- 最多显示3个 -->
<sitem :info="info" v-for="(info, index) in groupList.slice(0, 3)" :key="index"></sitem>
@ -92,7 +92,7 @@ export default {
color: #333;
}
.more {
font-size: 18rpx;
font-size: 20rpx;
display: flex;
align-items: center;
color: #999;

5
components/shop/group/item.vue
View File

@ -44,8 +44,9 @@ export default {
</script>
<style lang="scss" scoped>
.item{
width: 210rpx;
overflow: hidden;
width: 220rpx;
height: 100%;
// overflow: hidden;
.head{
width: 100%;
height: 180rpx;

3
components/shop/list/index.vue
View File

@ -2,7 +2,7 @@
<view class="list">
<view class="top">商品推荐</view>
<view>
<u-tabs-swiper ref="uTabs" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper>
<u-tabs-swiper ref="uTabs" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="26" :show-bar="false" @change="tabsChange" height="60"></u-tabs-swiper>
</view>
<swiper class="swiper-box" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" :style="{height: swiperHeight}">
<swiper-item class="swiper-item" v-for="(_, index) in classifyList" :key="index">
@ -136,6 +136,7 @@ export default {
}
.swiper-box {
height: 100%;
padding: 20rpx 0;
margin-bottom: 10rpx;
.swiper-item {
// height: 100%;

3
components/shop/recommend/pintuan.vue
View File

@ -3,7 +3,7 @@
<view class="top">
<text>今日拼团推荐</text>
<view class="more" @click="toDetailsPage">
<text>点击查看更多</text>
<text>点击查看详情</text>
<u-icon name="arrow-right" color="#999" size="22"></u-icon>
</view>
</view>
@ -86,6 +86,7 @@ export default {
display: flex;
align-items: center;
color: #999;
font-size: 20rpx;
}
}
.connect{

2
components/shop/seckill/index.vue
View File

@ -77,7 +77,7 @@ export default {
}
}
.next{
font-size: 18rpx;
font-size: 20rpx;
display: flex;
align-items: center;
color: #999;

1
components/umaskes/umaskes.vue
View File

@ -23,7 +23,6 @@
},
methods: {
type_logines(){
console.log("2345")
this.show = this.type_login
}
},

38
pageB/components/details/userinfo.vue
View File

@ -3,7 +3,13 @@
<view class="user">
<view class="info">
<view class="avatar">
<image :src="item.member_avatar"></image>
<image :src="item.member_avatar" mode="aspectFill"></image>
<view class="posi-type">
<view>
<u-icon name="play-right-fill" color="#fff" size="20rpx"></u-icon>
</view>
<text>正在直播</text>
</view>
</view>
<view class="box">
<view class="name">{{ item.member_nickname }}</view>
@ -34,11 +40,39 @@
display: flex;
align-items: center;
.avatar {
position: relative;
&>image{
z-index: 99;
width: 140rpx;
height: 140rpx;
border-radius: 50%;
}
.posi-type {
z-index: 100;
position: absolute;
bottom: 0;
left: 0;
display: flex;
align-items: center;
border-radius: 30rpx;
background-color: rgba(0,0,0,0.3);
& > view {
width: 40rpx;
height: 40rpx;
flex-shrink: 0;
text-align: center;
line-height: 30rpx;
border-radius: 50%;
background-color: rgba(0,0,0,0.5);
}
& > text {
padding: 0 12rpx 0 6rpx;
color: #FF3131;
height: 40rpx;
line-height: 40rpx;
font-size: 20rpx;
}
}
}
.box {
display: flex;
@ -68,7 +102,7 @@
border-radius: 30rpx;
}
.btn-follow {
background-color: #007AFF;
background-color: #999999;
}
.btn-unfollow {
background-color: #FF780F;

6
pageB/components/userinfo/index.vue
View File

@ -106,9 +106,9 @@ export default {
methods: {
// 关注
following(id) {
this.is_follow = !this.is_follow;
this.$u.api.attentionMember({member_id: id}).then(res => {
if (res.errCode == 0) {
this.is_follow = !this.is_follow;
this.$u.toast(res.message);
}
})
@ -116,10 +116,10 @@ export default {
// 点赞
likeType(id) {
// console.log(id);
this.is_like = !this.is_like;
this.$u.post("article/articleLike",{article_id: id}).then(res => {
if (res.errCode == 0) {
// console.log(res);
this.is_like = !this.is_like;
this.list.like_num = res.data.num;
} else {
this.$u.toast(res.message);
@ -128,10 +128,10 @@ export default {
},
// 收藏
collecting(id) {
this.is_collect = !this.is_collect;
this.$u.post("article/articleCollect",{article_id: id}).then(res => {
if (res.errCode == 0) {
// console.log(res);
this.is_collect = !this.is_collect;
this.list.collect_num = res.data.num;
} else {
this.$u.toast(res.message);

9
pageB/photo/index.vue
View File

@ -516,9 +516,15 @@ export default {
// 发现回复列表
getReplyList(id) {
this.page_[id] = 0;
if (!this.page_[id] === 0) {
}
console.log(this.page_[id]);
this.$u.post("article/articleReplyList", {id: id, page: this.page_[id]}).then(res => {
console.log(this.page_);
this.$u.post("article/articleReplyList", {id: id, page: 0}).then(res => {
if (res.errCode == 0) {
this.page_[id]++;
this.allList[id] = res.data;
}
})
},
// 预览图片
@ -536,7 +542,6 @@ export default {
scrollBottom(e) {
this.page++;
this.getComment();
console.log(e);
},
// 跳转到商品
gotoInfo(id) {

13
pageB/sdetails/index.vue
View File

@ -1,6 +1,6 @@
<template>
<view class="sdetails">
<u-swiper :list="list" height="500" border-radius="0" mode="dot"></u-swiper>
<u-swiper :list="list" height="500" border-radius="0" mode="dot" @click="viewImage"></u-swiper>
<view class="spike-view" v-if="type == 3">
<view class="left">
<view class="price">
@ -461,6 +461,17 @@ export default {
id: this.goodsInfo.goods_id
}
})
},
// 查看轮播图
viewImage(index) {
let arr = [];
this.list.forEach(item => {
arr.push(item.image);
})
uni.previewImage({
urls: arr,
current: arr[index]
})
}
},
}

53
pageD/activity/activity.vue
View File

@ -1,18 +1,20 @@
<template>
<view id="actives">
<!-- 活动消息推送 -->
<view class="activity" v-for="(item, index) in actives" :key="index">
<view class="times">{{item.type}}</view>
<block v-for="(item, index) in actives" :key="index">
<view class="time">{{ item.addtime }}</view>
<view class="activity">
<view class="content">
<view class="title">{{item.title}}</view>
<view class="images_about">
<image :src="item.goods_image"></image>
<image :src="item.goods_image" mode="aspectFill"></image>
<view>
<text>{{item.summary}}</text>
<text class="u-line-2">{{item.summary}}</text>
</view>
</view>
</view>
</view>
</block>
</view>
</template>
@ -30,13 +32,13 @@
},
methods: {
titletext(){
console.log("22345")
},
// 活动消息列表
messageactivityList(){
this.$u.api.messageactivityList({}).then((res)=>{
console.log(res)
this.actives = res.data
if (res.errCode == 0) {
this.actives = res.data;
}
})
}
},
@ -52,9 +54,14 @@
#actives{
background: #ECECEC;
height: 100%;
.time {
padding: 30rpx 0;
color: #666;
text-align: center;
font-size: 28rpx;
}
}
.activity{
.times{
width:100%;
font-size:28rpx;
@ -71,9 +78,9 @@
margin: 0 auto;
overflow: hidden;
image{
width: 137rpx;
flex-shrink: 0;
width: 140rpx;
height: 140rpx;
float: left;
}
.title{
font-size:30rpx;
@ -81,25 +88,17 @@
padding: 0rpx 0 19rpx;
}
.images_about{
overflow: hidden;
text{
display: table-cell;
display: flex;
& > view{
display: flex;
flex-direction: column;
justify-content: center;
width: 100%;
height: 140rpx;
vertical-align: middle;
width: 400rpx;
padding-left: 15rpx;
line-height: 36rpx;
display: block;
overflow:hidden; //超出的文本隐藏
text-overflow:ellipsis; //用省略号显示
white-space:nowrap; //不换行
padding: 20rpx;
background: rgba(241,241,241,1);
& > text {
}
view{
display: inline-block;
float: left;
width:430rpx;
height:140rpx;
background:rgba(241,241,241,1);
}
}
}

44
pageD/attention/attention.vue
View File

@ -2,10 +2,10 @@
<view class="attention">
<view class="attention_box" v-for="(item,index) in attention" :key="index">
<view>
<image :src="item.url"></image>
<image :src="item.friend_tomavatar" mode="aspectFill"></image>
</view>
<view>{{item.name}}</view>
<view>状态：{{item.type}}</view>
<view>{{item.friend_tomname}}</view>
<view>{{item.live_status ? '正在直播' : '未直播'}}</view>
<view class="cur_two" @click="tapClick(index)" v-if = "item.about == 1">已关注</view>
<view class="cur" @click="tapClick(index)" v-else = "item.about == 2">未关注</view>
</view>
@ -19,37 +19,7 @@
return {
rSelect:[],
type : '未关注',
attention: [{
url: '../../pageE/static/mine/1.png',
name: '达人昵称',
type: '正在直播',
about: 1
},
{
url: '../../pageE/static/mine/1.png',
name: '达人昵称',
type: '正在直播',
about: 2
},
{
url: '../../pageE/static/mine/1.png',
name: '达人昵称',
type: '正在直播',
about: 1
},
{
url: '../../pageE/static/mine/1.png',
name: '达人昵称',
type: '正在直播',
about: 1
},
{
url: '../../pageE/static/mine/1.png',
name: '达人昵称',
type: '正在直播',
about: 1
}
]
attention: []
};
},
onLoad(){
@ -64,13 +34,11 @@
this.rSelect.push(index); //选中添加到数组里
} else {
this.rSelect.splice(this.rSelect.indexOf(index), 1); //取消
}
},
snsfriendList(){
this.$u.api.snsfriendList({}).then((res)=>{
console.log(res)
// this.attention = res.data
this.attention = res.data;
})
}
},
@ -102,7 +70,7 @@
view image {
width: 80rpx;
height: 80rpx;
display: block;
border-radius: 50%;
margin: 24rpx auto 0;
}

47
pageD/logistics/logistics.vue
View File

@ -25,44 +25,20 @@
export default {
data() {
return {
actives: [
{
url: '../../pageE/static/mine/1.png',
name: '您的订单已发货',
type: '2020-05-14 20:11',
about: '百搭休闲格纹裙！你值得有用！'
},
{
url: '../../pageE/static/mine/1.png',
name: '百元趋势新品',
type: '2020-05-14 20:11',
about: '百搭休闲格纹裙！你值得有用！'
},
{
url: '../../pageE/static/mine/1.png',
name: '百元趋势新品',
type: '2020-05-14 20:11',
about: '百搭休闲格纹裙！你值得有用！'
},
{
url: '../../pageE/static/mine/1.png',
name: '百元趋势新品',
type: '2020-05-14 20:11',
about: '百搭休闲格纹裙！你值得有用！'
},
{
url: '../../pageE/static/mine/1.png',
name: '百元趋势新品',
type: '2020-05-14 20:11',
about: '百搭休闲格纹裙！你值得有用！'
},
]
actives: [],
page: 1
};
},
onLoad() {
this.getCartList();
},
methods: {
titletext(){
console.log("22345")
getCartList() {
this.$u.post("message/orderDeliveryList",{page: this.page}).then(res => {
if (res.errCode == 0) {
this.actives == res.data;
}
})
}
},
components:{
@ -72,7 +48,6 @@
<style lang="scss" scoped>
#actives{
background: #ECECEC;
height: 100%;
}
.activity{

8
pageD/notice/notice.vue
View File

@ -1,7 +1,7 @@
<template>
<view>
<!-- 公告咨询 -->
<notice></notice>
<notice :list="list"></notice>
</view>
</template>
@ -10,18 +10,18 @@
export default {
data() {
return {
list: [],
};
},
onLoad(){
this.informationList()
this.informationList();
},
methods: {
titletext(){
console.log("22345")
},
informationList(){
this.$u.api.informationList({}).then((res)=>{
console.log(res)
this.list = res.data;
})
}
},

13
pageE/mine/ImageTextCollection.vue
View File

@ -3,7 +3,7 @@
<view class="container">
<view class="item-box" v-for="(item, index) in articleList" :key="index" @click="toDetailsPage(item.article_id)">
<view class="video-item" v-if="item">
<image class="head" :src="item.article_pic" v-if="item.type == 1"></image>
<image class="head" :src="item.article_pic" mode="scaleToFill" v-if="item.type == 1"></image>
<view class="header_fist" v-else>
<view class="backes"></view>
<image class="head" :src="item.article_pic"></image>
@ -93,16 +93,15 @@ export default {
margin-right: 20rpx;
}
.video-item{
height: 540rpx;
width: 330rpx;
height: 510rpx;
margin-top: 20rpx;
width: 335rpx;
box-shadow:0 3rpx 7rpx 0 rgba(153, 153, 153, 0.35);
padding-bottom: 20rpx;
border-radius: 20rpx;
overflow: hidden;
box-shadow:0 3rpx 7rpx 0 rgba(153, 153, 153, 0.35);
.head{
width: 100%;
height: 334rpx;
width: 330rpx;
height: 330rpx !important;
}
.title{
margin:0 auto;

43
pages/index/index.vue
View File

@ -3,7 +3,9 @@
<view class="status_bar"></view>
<view class="index">
<view class="top">
<view class="sosuo"></view>
<view class="sosuo" @click="goSearch">
<u-icon name="search" color="#555" size="34rpx"></u-icon>
</view>
<view class="tabs">
<u-tabs :is-scroll="false" bar-width="70" ref="tabs" :list="list" :current="num" :bar-style="{
'background-color':'#FF780F',
@ -93,18 +95,17 @@
height: 100vh;
.top {
padding: 0 30rpx;
display: flex;
flex-shrink: 0;
align-items: center;
justify-content: space-between;
width: 100%;
height: 88rpx;
align-items: center;
flex-shrink: 0;
padding: 0 30rpx;
.sosuo {
width: 32rpx;
height: 32rpx;
}
.tabs {
@ -122,6 +123,7 @@
.box {
width: 100%;
height: 100%;
padding: 0 30rpx;
}
@ -191,6 +193,7 @@
}
</style>
<script>
import { mapState } from 'vuex'
import videoItem from "@/components/index/video-item/index"
import zhiboItem from "@/components/index/zhibo-item/index"
import indexad from "@/components/index/ad/index"
@ -198,6 +201,9 @@
export default {
name: "index",
computed: {
...mapState(["hasLogin"])
},
data() {
return {
list: [{
@ -225,18 +231,14 @@
},
onShow() {
this.getArticlelist();
this.getRecommendList();
this.getSwiper();
this.getZhiBoSwiper();
this.tabLiveList();
this.getFollowList();
},
onPullDownRefresh() {
this.getArticlelist();
// this.getManicureList({ load: 'reload' });
},
methods: {
// 列表
// 直播列表
tabLiveList() {
this.$u.api.tabLiveList().then((res) => {
console.log(res)
@ -272,12 +274,25 @@
},
// 切换导航
dianji(a) {
console.log(a);
// console.log(a);
if (typeof a == "object") {
this.num = a.detail.current
} else {
this.num = a
}
// 状态请求
if (this.num == 0) {
this.getArticlelist();
this.getSwiper();
} else if (this.num == 1) {
this.getZhiBoSwiper(); // 直播轮播
this.tabLiveList();
} else if (this.num == 2) {
if (this.hasLogin) {
this.getFollowList(); // 关注列表
}
this.getRecommendList(); // 推荐达人
}
},
// 发现别表
getArticlelist() {
@ -295,7 +310,7 @@
// 达人列表
getRecommendList() {
this.$u.api.getRecommendList().then(res => {
console.log(res)
console.log(res);
if (res.errCode == 0) {
this.recommendList = res.data.list;
}
@ -313,7 +328,6 @@
})
},
toSearchPage() {
console.log("22");
uni.navigateTo({
url: '/pageB/follow/index'
});
@ -354,6 +368,9 @@
params: params
})
},
goSearch() {
this.$u.route("/pageB/search/index");
}
},
}
</script>

4
pages/mine/index.vue
View File

@ -151,10 +151,6 @@ export default {
})
}
this.getUserInfo();
},
// 下拉刷新
onPullDownRefresh() {
this.getUserInfo();
},
onNavigationBarButtonTap() {
this.toOtherPage("/setting/Index");

3
pages/shop/index.vue
View File

@ -48,8 +48,11 @@
<view class="activity-view">
<image class="lingquan" :src="activityInfo.adv_code" @click="activityLink({ type: activityInfo.url_type, id: activityInfo.info_id })"></image>
</view>
<!-- 优惠券 -->
<youhq></youhq>
<!-- 商品列表 -->
<list ref="recommendGoods"></list>
<!-- 购物车 -->
<view class="cart" @click="toCartPage">
<image src="/static/image/common/3.png"></image>
</view>