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

Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx

Browse Source
This commit is contained in:
luyuan 2020-08-07 11:41:03 +08:00
commit fc86ad2579
Signed by: theluyuan
GPG Key ID: A7972FD973317FF3
36 changed files with 391 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/api/user.js
View File

@ -259,12 +259,13 @@ export default {
return vm.$u.post('Order/buyer_cancel', params); return vm.$u.post('Order/buyer_cancel', params);
}, },
// add_refund // add_refund
refundOrder({ order_id, goods_id, refund_amount, refund_type = 1 } = {}) { refundOrder({ order_id, goods_id, goods_num, reason_info, refund_amount } = {}) {
return vm.$u.post('order/add_refund', { return vm.$u.post('order/add_refund', {
order_id: order_id, order_id: order_id,
goods_id: goods_id, goods_id: goods_id,
refund_amount: refund_amount, refund_amount: refund_amount,
refund_type: refund_type, goods_num: goods_num,
reason_info: reason_info,
}); });
}, },
// 删除订单 // 删除订单

22
common/http.interceptor.js
View File

@ -27,16 +27,32 @@ const install = (Vue, vm) => {
return res.data; return res.data;
} else if(res.data.errCode == 401) { } else if(res.data.errCode == 401) {
// 假设201为token失效，这里跳转登录 // 假设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(() => { setTimeout(() => {
// 此为uView的方法，详见路由相关文档 // 此为uView的方法，详见路由相关文档
vm.$u.route('/pageA/login/login') vm.$u.route('/pageA/login/login')
}, 1500) }, 500)
}
}
})
}
return false; return false;
} else if (res.errCode == 1) {
console.log(res.message);
} else { } else {
// 如果返回false，则会调用Promise的reject回调， // 如果返回false，则会调用Promise的reject回调，
// 并将进入this.$u.post(url).then().catch(res=>{})的catch回调中，res为服务端的返回值 // 并将进入this.$u.post(url).then().catch(res=>{})的catch回调中，res为服务端的返回值
return false; return res;
} }
} }

3
common/store/index.js
View File

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

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

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

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

@ -1,10 +1,10 @@
<template> <template>
<view class="notice"> <view class="notice">
<view v-for="(item,index) in notice" :key="index"> <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"> <view class="notice_view">
<image :src="item.url" mode="aspectFill" ></image> <image :src="item.picture" mode="aspectFill" ></image>
<view class="text_view">{{item.content}}</view> <view class="text_view u-line-2">{{ item.content }}</view>
<view class="notice_list"> <view class="notice_list">
<text>查看详情</text> <text>查看详情</text>
<u-icon name="arrow-right" color="#666"></u-icon> <u-icon name="arrow-right" color="#666"></u-icon>
@ -74,21 +74,20 @@
<script> <script>
export default { export default {
name: "notice", name: "notice",
props: ['list'],
data() { data() {
return { return {
notice : [ 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'
}
]
}; };
},
watch: {
list(newVal,old) {
// console.log(newVal);
this.notice = newVal;
}
},
methods: {
} }
} }
</script> </script>

5
components/mine/order-item/index.vue
View File

@ -25,7 +25,7 @@
</view> </view>
</view> </view>
<view class="order-btn" v-if="[1, 2, 3, 4, 8].indexOf(order.view_type) >= 0"> <view class="order-btn" v-if="[1, 2, 3, 4, 8].indexOf(order.view_type) >= 0">
<view class="cancel" v-if="order.view_type == 3 || order.view_type == 2" @click="toOtherPage('RefundOrder')">申请退款</view> <view class="cancel" v-if="(order.view_type == 3 || order.view_type == 2) && order.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
<view class="cancel" v-if="order.view_type == 3" @click="toOtherPage('Logistics')">查看物流</view> <view class="cancel" v-if="order.view_type == 3" @click="toOtherPage('Logistics')">查看物流</view>
<view class="logistics" v-if="order.view_type == 3" @click="confirmReceive">确认收货</view> <view class="logistics" v-if="order.view_type == 3" @click="confirmReceive">确认收货</view>
<view class="comment" v-if="order.view_type == 4" @click="toOtherPage('Comment')">立即评价</view> <view class="comment" v-if="order.view_type == 4" @click="toOtherPage('Comment')">立即评价</view>
@ -47,7 +47,7 @@ export default {
props: { props: {
order: Object order: Object
}, },
created() { mounted() {
this.viewState(); this.viewState();
}, },
methods: { methods: {
@ -81,6 +81,7 @@ export default {
default: default:
break; break;
} }
// console.log(state);
this.state = state; this.state = state;
}, },
cancelOrder() { cancelOrder() {

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

@ -10,7 +10,7 @@
<view class="label"> <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> <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> </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"> <swiper-item class="swiper-item list" v-for="(_, i) in classifyList" :key="i">
<!-- 最多显示3个 --> <!-- 最多显示3个 -->
<sitem :info="info" v-for="(info, index) in groupList.slice(0, 3)" :key="index"></sitem> <sitem :info="info" v-for="(info, index) in groupList.slice(0, 3)" :key="index"></sitem>
@ -92,7 +92,7 @@ export default {
color: #333; color: #333;
} }
.more { .more {
font-size: 18rpx; font-size: 20rpx;
display: flex; display: flex;
align-items: center; align-items: center;
color: #999; color: #999;

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

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

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

@ -2,7 +2,7 @@
<view class="list"> <view class="list">
<view class="top">商品推荐</view> <view class="top">商品推荐</view>
<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> </view>
<swiper class="swiper-box" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" :style="{height: swiperHeight}"> <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"> <swiper-item class="swiper-item" v-for="(_, index) in classifyList" :key="index">
@ -136,6 +136,7 @@ export default {
} }
.swiper-box { .swiper-box {
height: 100%; height: 100%;
padding: 20rpx 0;
margin-bottom: 10rpx; margin-bottom: 10rpx;
.swiper-item { .swiper-item {
// height: 100%; // height: 100%;

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

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

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

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

1
components/umaskes/umaskes.vue
View File

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

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

@ -3,7 +3,13 @@
<view class="user"> <view class="user">
<view class="info"> <view class="info">
<view class="avatar"> <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>
<view class="box"> <view class="box">
<view class="name">{{ item.member_nickname }}</view> <view class="name">{{ item.member_nickname }}</view>
@ -34,11 +40,39 @@
display: flex; display: flex;
align-items: center; align-items: center;
.avatar { .avatar {
position: relative;
&>image{ &>image{
z-index: 99;
width: 140rpx; width: 140rpx;
height: 140rpx; height: 140rpx;
border-radius: 50%; 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 { .box {
display: flex; display: flex;
@ -68,7 +102,7 @@
border-radius: 30rpx; border-radius: 30rpx;
} }
.btn-follow { .btn-follow {
background-color: #007AFF; background-color: #999999;
} }
.btn-unfollow { .btn-unfollow {
background-color: #FF780F; background-color: #FF780F;

1
pageB/components/sdetails/guige.vue
View File

@ -36,6 +36,7 @@
box-sizing: border-box; box-sizing: border-box;
border-radius: 6rpx; border-radius: 6rpx;
margin-right: 26rpx; margin-right: 26rpx;
margin-bottom: 20rpx;
} }
.xuanzhong{ .xuanzhong{
border: #ff780f 1rpx solid; border: #ff780f 1rpx solid;

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

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

9
pageB/photo/index.vue
View File

@ -516,9 +516,15 @@ export default {
// 发现回复列表 // 发现回复列表
getReplyList(id) { getReplyList(id) {
this.page_[id] = 0; 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_); 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; this.allList[id] = res.data;
}
}) })
}, },
// 预览图片 // 预览图片
@ -536,7 +542,6 @@ export default {
scrollBottom(e) { scrollBottom(e) {
this.page++; this.page++;
this.getComment(); this.getComment();
console.log(e);
}, },
// 跳转到商品 // 跳转到商品
gotoInfo(id) { gotoInfo(id) {

49
pageB/sdetails/index.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="sdetails"> <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="spike-view" v-if="type == 3">
<view class="left"> <view class="left">
<view class="price"> <view class="price">
@ -22,10 +22,17 @@
<text class="store-name">{{ goodsInfo.store_name }}</text> <text class="store-name">{{ goodsInfo.store_name }}</text>
<text class="goods-name">{{ goodsInfo.goods_name }}</text> <text class="goods-name">{{ goodsInfo.goods_name }}</text>
</view> </view>
<view class="pic"> <view class="price-collect">
<view class="pic" v-if="type != 3">
<text>￥{{ goodsInfo.goods_price }}</text> <text>￥{{ goodsInfo.goods_price }}</text>
<s>￥{{ goodsInfo.goods_marketprice }}</s> <s>￥{{ goodsInfo.goods_marketprice }}</s>
</view> </view>
<view class="collect">
<u-icon name="star" color="#474747" size="28" v-if="1"></u-icon>
<u-icon name="star-fill" color="#FF7807" size="28" v-else></u-icon>
<text>收藏</text>
</view>
</view>
</view> </view>
<view class="hr"></view> <view class="hr"></view>
<!-- <navs :value="领券"></navs> --> <!-- <navs :value="领券"></navs> -->
@ -135,11 +142,11 @@
</u-popup> </u-popup>
<!-- 普通商品 tool --> <!-- 普通商品 tool -->
<view class="tloos" v-if="type == 1"> <view class="tloos" v-if="type == 1">
<view class="navs" @click="toOthersPage('pageC/merchant/index?id=' + storeInfo.store_id)"> <view class="navs" @click="toOthersPage('pageC/merchant/index?id=' + storeInfo.store_id)" v-if="!showSpec">
<image src="/static/image/common/18.png"></image> <image src="/static/image/common/18.png"></image>
店铺 店铺
</view> </view>
<view @click="customers()" class="navs" style="margin-right:30rpx"> <view class="navs" style="margin-right:30rpx" v-if="!showSpec" @click="customers()">
<image src="/static/image/common/19.png"></image> <image src="/static/image/common/19.png"></image>
客服 客服
</view> </view>
@ -154,7 +161,7 @@
</view> </view>
<!-- 秒杀 tool --> <!-- 秒杀 tool -->
<view class="spike-tool" v-if="type==3"> <view class="spike-tool" v-if="type==3">
<view class="left"> <view class="left" v-if="!showSpec">
<view @click="toOthersPage('pageC/merchant/index?id=' + storeInfo.store_id)"> <view @click="toOthersPage('pageC/merchant/index?id=' + storeInfo.store_id)">
<image src="/static/image/common/18.png"></image> <image src="/static/image/common/18.png"></image>
<text>店铺</text> <text>店铺</text>
@ -223,7 +230,6 @@ export default {
// console.log(option); // console.log(option);
this.type = Number(option.type); this.type = Number(option.type);
this.id = option.id; this.id = option.id;
this.getGoodsDetails(this.id);
this.setTitle(); this.setTitle();
}, },
onShow() { onShow() {
@ -231,6 +237,7 @@ export default {
this.showSpec = false; this.showSpec = false;
this.showGroupUser = false; this.showGroupUser = false;
this.showInvolvementUser = false; this.showInvolvementUser = false;
this.getGoodsDetails(this.id);
}, },
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
if(e.index == 0) this.$u.route('/pageC/cart/index'); if(e.index == 0) this.$u.route('/pageC/cart/index');
@ -362,6 +369,7 @@ export default {
this.glist = res.data.data.spec_list; this.glist = res.data.data.spec_list;
this.user_suc = res.data.data.user_suc; this.user_suc = res.data.data.user_suc;
this.groupUser =res.data.data.user; this.groupUser =res.data.data.user;
console.log(this.groupUser);
} }
}) })
}, },
@ -403,13 +411,14 @@ export default {
} }
if(this.type == 2) { if(this.type == 2) {
if(type == 'involvement') { if(type == 'involvement') {
// const userId = uni.getStorageSync('user_info').member.member_id;
this.$store.commit('setGroupHeadId', this.involvemenGroupInfo[0].user_id);
console.log(this.$store.state.pintuangroup_headid);
Object.assign(params, { Object.assign(params, {
pintuan_id: this.id, pintuan_id: this.id,
pintuangroup_id: this.involvemenGroupInfo[0].pintuangroup_id, pintuangroup_id: this.involvemenGroupInfo[0].pintuangroup_id,
}) })
} else { } else {
const userId = uni.getStorageSync('user_info').member.member_id;
this.$store.commit('setGroupHeadId', userId);
Object.assign(params, { Object.assign(params, {
pintuan_id: this.id, pintuan_id: this.id,
}) })
@ -492,6 +501,17 @@ export default {
id: this.goodsInfo.goods_id id: this.goodsInfo.goods_id
} }
}) })
},
// 查看轮播图
viewImage(index) {
let arr = [];
this.list.forEach(item => {
arr.push(item.image);
})
uni.previewImage({
urls: arr,
current: arr[index]
})
} }
}, },
} }
@ -583,6 +603,10 @@ export default {
line-height: 1.5; line-height: 1.5;
} }
} }
.price-collect {
display: flex;
align-items: center;
justify-content: space-between;
.pic{ .pic{
>text{ >text{
font-size: 32rpx; font-size: 32rpx;
@ -595,6 +619,15 @@ export default {
margin-left: 30rpx; margin-left: 30rpx;
} }
} }
.collect {
margin-left: auto;
display: flex;
align-items: center;
> text {
margin-left: 12rpx;
}
}
}
} }
.comment { .comment {
margin-top: 20rpx; margin-top: 20rpx;

7
pageC/cart/ConfirmOrder.vue
View File

@ -179,12 +179,13 @@ export default {
let params = { let params = {
pintuan_id: this.orderInfo.pintuan_id, pintuan_id: this.orderInfo.pintuan_id,
} }
// console.log(this.involvemenGroupInfo); // console.log(this.orderInfo);
// console.log(this.$store.state.pintuangroup_headid);
if(this.orderInfo.pintuangroup_id) { if(this.orderInfo.pintuangroup_id) {
Object.assign(params, { pintuangroup_headid: this.$store.state.pintuangroup_headid }); Object.assign(params, { pintuangroup_headid: this.$store.state.pintuangroup_headid });
Object.assign(params, { pintuangroup_id: this.orderInfo.pintuangroup_id }); Object.assign(params, { pintuangroup_id: this.orderInfo.pintuangroup_id });
} }
// console.log(params); console.log(params);
this.$u.api.withImmediate(params).then(res => { this.$u.api.withImmediate(params).then(res => {
this.showGroupUser = false; this.showGroupUser = false;
this.showInvolvementUser = false; this.showInvolvementUser = false;
@ -200,7 +201,6 @@ export default {
if(!this.debounce) return; if(!this.debounce) return;
this.debounce = false; this.debounce = false;
if(this.orderType == 2) { if(this.orderType == 2) {
// this.sendOrder(0);
this.withImmediate(); this.withImmediate();
} else if(this.orderType == 1) { } else if(this.orderType == 1) {
this.sendOrder(0); this.sendOrder(0);
@ -256,7 +256,6 @@ export default {
// console.log(params); // console.log(params);
this.$u.api.sendOrder(params).then(res => { this.$u.api.sendOrder(params).then(res => {
if(res.errCode == 0) { if(res.errCode == 0) {
// this.withImmediate();
this.$u.route({ this.$u.route({
type: 'redirect', type: 'redirect',
url: '/pageC/cart/cashier', url: '/pageC/cart/cashier',

23
pageC/cart/index.vue
View File

@ -4,7 +4,7 @@
<view v-for="(store, s_index) in list" :key="s_index" class="cart-item"> <view v-for="(store, s_index) in list" :key="s_index" class="cart-item">
<view class="store"> <view class="store">
<u-checkbox v-model="store.checked" shape="circle" active-color="#FF780F" icon-size="35" :name="s_index" @change="storeaAloneChange"></u-checkbox> <u-checkbox v-model="store.checked" shape="circle" active-color="#FF780F" icon-size="35" :name="s_index" @change="storeaAloneChange"></u-checkbox>
<view class="name"> <view class="name" @click="viewStoreDetails(store.store_id)">
<image :src="store.store_avatar"></image> <image :src="store.store_avatar"></image>
<view>{{ store.store_name }}</view> <view>{{ store.store_name }}</view>
</view> </view>
@ -13,8 +13,8 @@
<u-checkbox-group @change="goodsChange($event, s_index)"> <u-checkbox-group @change="goodsChange($event, s_index)">
<view v-for="(goods, g_index) in store.goods" :key="g_index" class="goods-item"> <view v-for="(goods, g_index) in store.goods" :key="g_index" class="goods-item">
<u-checkbox v-model="goods.checked" shape="circle" active-color="#FF780F" icon-size="35" :name="g_index"></u-checkbox> <u-checkbox v-model="goods.checked" shape="circle" active-color="#FF780F" icon-size="35" :name="g_index"></u-checkbox>
<image :src="goods.goods_image"></image> <image :src="goods.goods_image" @click="viewGoodsDetails(goods.goods_id)"></image>
<view class="info"> <view class="info" @click="viewGoodsDetails(goods.goods_id)">
<view class="name u-line-2">{{ goods.goods_name }}</view> <view class="name u-line-2">{{ goods.goods_name }}</view>
<view class="cart-info"> <view class="cart-info">
<view class="price">￥{{ goods.goods_price }}</view> <view class="price">￥{{ goods.goods_price }}</view>
@ -204,6 +204,23 @@ export default {
}) })
this.list[value[1]].checked = checked; this.list[value[1]].checked = checked;
this.storeChange(); this.storeChange();
},
viewStoreDetails(sid) {
this.$u.route({
url: 'pageC/merchant/index',
params: {
id: sid
}
})
},
viewGoodsDetails(gid) {
this.$u.route({
url: 'pageB/sdetails/index',
params: {
id: gid,
type: 1,
}
})
} }
}, },
onNavigationBarButtonTap(btn) { onNavigationBarButtonTap(btn) {

2
pageC/components/merchant/image-top.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="imageTop"> <view class="imageTop">
<image :src="url"></image> <image :src="url" mode="aspectFit"></image>
</view> </view>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>

2
pageC/components/merchant/list-item.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<view class="listItem"> <view class="listItem">
<video v-if="type == '2'" :src="url" :show-fullscreen-btn="true"></video> <video v-if="type == '2'" :src="url" :show-fullscreen-btn="true"></video>
<image v-else :src="url"></image> <image v-else :src="url" mode="aspectFit"></image>
</view> </view>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>

2
pageC/merchant/goods.vue
View File

@ -14,7 +14,7 @@
</view> </view>
<scroll-view scroll-y class="scroll-container" :style="{ height: scrollHeight }" @scrolltolower="loadMore"> <scroll-view scroll-y class="scroll-container" :style="{ height: scrollHeight }" @scrolltolower="loadMore">
<view class="goods-container"> <view class="goods-container">
<view v-for="goods in goodsList" :key="goods.goods_id" class="goods-view" @click="toDetailsPage(goods.goods_id)"> <view v-for="(goods, index) in goodsList" :key="index" class="goods-view" @click="toDetailsPage(goods.goods_id)">
<goodsItem :info="goods"></goodsItem> <goodsItem :info="goods"></goodsItem>
</view> </view>
</view> </view>

52
pageC/merchant/index.vue
View File

@ -37,19 +37,16 @@
</scroll-view> </scroll-view>
</view> </view>
<view class="main"> <view class="main">
<view class="video-image" v-if="cur==0 && indextop.length"> <scroll-view class="video-image" scroll-y v-if="cur==0 && indextop.length" :style="{ height: scrollHeiht }">
<view v-for="item in indextop" :key="item.id"> <view v-for="item in indextop" :key="item.id">
<videoTop :url="item.url" v-if="item.type == 2"></videoTop> <videoTop :url="item.article_pic" v-if="item.type == 2"></videoTop>
<imageTop v-else :url="item.url"></imageTop> <imageTop v-else :url="item.article_pic"></imageTop>
</view> </view>
<view style="display: flex;flex-wrap: wrap;" v-if="indexlist.length"> <view style="display: flex;flex-wrap: wrap;" v-if="indexlist.length">
<listitem :style="{'margin-left': index%2 == 1 ? '20rpx':'0'}" v-for="(item,index) in indexlist" :key="item.id" :type="item.type" :url="item.url"></listitem> <listitem :style="{'margin-left': index%2 == 1 ? '20rpx':'0'}" v-for="(item,index) in indexlist" :key="item.id" :type="item.type" :url="item.article_pic"></listitem>
</view> </view>
</scroll-view>
</view>
<!-- 商品筛选排序未完成 -->
<view class="item" v-if="cur==1"> <view class="item" v-if="cur==1">
<!-- <item v-for="item in list" :key="item.gc_id" :info="item" class="item"></item> -->
<goods :sid="sid"></goods> <goods :sid="sid"></goods>
</view> </view>
</view> </view>
@ -90,7 +87,9 @@ export default {
list: [], list: [],
indexlist: [], indexlist: [],
indextop: [], indextop: [],
info:{} info: {},
page: 0,
scrollHeiht: '',
} }
}, },
components:{ components:{
@ -101,7 +100,8 @@ export default {
}, },
onPullDownRefresh() { onPullDownRefresh() {
this.getStoreInfo(); this.getStoreInfo();
this.getStoreImgVideoList(); this.getArticlelist();
// this.getStoreImgVideoList();
}, },
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
// console.log(e.index); // console.log(e.index);
@ -114,7 +114,7 @@ export default {
if(current == 0) { if(current == 0) {
this.$u.route('/pageC/merchant/storeClassify', { id: this.sid }); this.$u.route('/pageC/merchant/storeClassify', { id: this.sid });
} else if(current == 2) { } else if(current == 2) {
this.$u.route('./details', { id: this.sid }); this.$u.route('/pageC/merchant/details', { id: this.sid });
} }
}, },
getStoreInfo() { getStoreInfo() {
@ -140,12 +140,38 @@ export default {
this.$u.toast(res.message); this.$u.toast(res.message);
}) })
}, },
getArticlelist() {
this.$u.api.getArticlelist({
page: this.page,
is_video_img: 0,
store_id: this.sid,
}).then(res => {
uni.stopPullDownRefresh();
if (res.errCode == 0) {
// this.articleList = res.data.list;
if(res.data.list.length > 0) {
this.indextop = [res.data.list[0]]
this.indextop = [res.data.list[0], res.data.list[1]];
}
if(res.data.list.length > 1) {
this.indextop.push(res.data.list[1]);
this.indexlist.push(...res.data.list.slice(2,));
}
}
})
},
setViewHeight() {
const res = uni.getSystemInfoSync();
this.scrollHeiht = res.windowHeight - (73 + 20 + 170) + 'px';
}
}, },
onLoad(option){ onLoad(option){
this.sid = option.id; this.sid = option.id;
console.log(this.sid); // console.log(this.sid);
this.getStoreInfo(); this.getStoreInfo();
this.getStoreImgVideoList(); this.getArticlelist();
this.setViewHeight();
// this.getStoreImgVideoList();
} }
}; };
</script> </script>

53
pageD/activity/activity.vue
View File

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

44
pageD/attention/attention.vue
View File

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

47
pageD/logistics/logistics.vue
View File

@ -25,44 +25,20 @@
export default { export default {
data() { data() {
return { return {
actives: [ actives: [],
{ page: 1
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: '百搭休闲格纹裙！你值得有用！'
},
]
}; };
}, },
onLoad() {
this.getCartList();
},
methods: { methods: {
titletext(){ getCartList() {
console.log("22345") this.$u.post("message/orderDeliveryList",{page: this.page}).then(res => {
if (res.errCode == 0) {
this.actives == res.data;
}
})
} }
}, },
components:{ components:{
@ -72,7 +48,6 @@
<style lang="scss" scoped> <style lang="scss" scoped>
#actives{ #actives{
background: #ECECEC;
height: 100%; height: 100%;
} }
.activity{ .activity{

8
pageD/notice/notice.vue
View File

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

8
pageE/mine/EditUserInfo.vue
View File

@ -29,6 +29,7 @@
</view> </view>
<view class="edit-tips">注意：修改手机号需要原手机号获取验证码，无原手机验证码，请联系客服</view> <view class="edit-tips">注意：修改手机号需要原手机号获取验证码，无原手机验证码，请联系客服</view>
<view class="edit-btn" @click="updateMemberInfo">完成</view> <view class="edit-btn" @click="updateMemberInfo">完成</view>
<u-toast ref="uToast" />
</view> </view>
</template> </template>
<script> <script>
@ -155,8 +156,11 @@ export default {
birthday: this.birthday, birthday: this.birthday,
}).then(res => { }).then(res => {
if (res.errCode == 0) { if (res.errCode == 0) {
this.getUserInfo(); // this.getUserInfo();
// this.$u.toast(res.message); this.$refs.uToast.show({
title: res.message,
back: true,
})
} }
}) })
}, },

13
pageE/mine/ImageTextCollection.vue
View File

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

2
pageE/order/Details.vue
View File

@ -68,7 +68,7 @@
</view> </view>
</view> </view>
<view class="btn" v-if="['1', '2', '4', '6'].indexOf(orderstate) >= 0"> <view class="btn" v-if="['1', '2', '4', '6'].indexOf(orderstate) >= 0">
<view class="cancel" v-if="orderstate == '4' || orderstate == '1'" @click="toOtherPage('RefundOrder')">申请退款</view> <view class="cancel" v-if="(orderstate == '4' || orderstate == '1') && orderInfo.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
<view class="cancel" v-if="orderstate == '1'" @click="toOtherPage('Logistics')">查看物流</view> <view class="cancel" v-if="orderstate == '1'" @click="toOtherPage('Logistics')">查看物流</view>
<view class="logistics" v-if="orderstate == '1'" @click="confirmReceive">确认收货</view> <view class="logistics" v-if="orderstate == '1'" @click="confirmReceive">确认收货</view>
<view class="comment" v-if="orderstate == '2'" @click="toOtherPage('Comment')">立即评价</view> <view class="comment" v-if="orderstate == '2'" @click="toOtherPage('Comment')">立即评价</view>

10
pageE/order/Index.vue
View File

@ -134,7 +134,7 @@ export default {
if(load == 'reload') this.orderList = res.data; if(load == 'reload') this.orderList = res.data;
else if(load == 'loadmore') this.orderList.push(...res.data); else if(load == 'loadmore') this.orderList.push(...res.data);
} }
return res; return res.data.length;
}, },
// 售后 // 售后
async getAfterSaleList({ load = 'loadmore' } = {}) { async getAfterSaleList({ load = 'loadmore' } = {}) {
@ -146,7 +146,7 @@ export default {
if(load == 'reload') this.orderList = res.data; if(load == 'reload') this.orderList = res.data;
else if(load == 'loadmore') this.orderList.push(...res.data); else if(load == 'loadmore') this.orderList.push(...res.data);
} }
return res; return res.data.length;
}, },
// 试穿 // 试穿
async goodsTryOrderList({ load = 'loadmore' } = {}) { async goodsTryOrderList({ load = 'loadmore' } = {}) {
@ -159,7 +159,7 @@ export default {
if(load == 'reload') this.orderList = res.data.list; if(load == 'reload') this.orderList = res.data.list;
else if(load == 'loadmore') this.orderList.push(...res.data.list); else if(load == 'loadmore') this.orderList.push(...res.data.list);
} }
return res; return res.data.list.length;
}, },
reachBottom() { reachBottom() {
// 大于15条才会加载更多 // 大于15条才会加载更多
@ -173,9 +173,9 @@ export default {
// else // else
if(this.current == 4) promise = this.goodsTryOrderList(); if(this.current == 4) promise = this.goodsTryOrderList();
else promise = this.getOrderList(); else promise = this.getOrderList();
promise.then(res => { promise.then(length => {
this.loadStatus.splice(this.current, 1, "nomore"); this.loadStatus.splice(this.current, 1, "nomore");
if(res.data.length == 0) this.page--; if(length == 0) this.page--;
}).catch(() => { }).catch(() => {
this.loadStatus.splice(this.current, 1, "nomore"); this.loadStatus.splice(this.current, 1, "nomore");
this.page--; this.page--;

49
pageE/order/RefundOrder.vue
View File

@ -31,22 +31,24 @@
<view class="refund-price"> <view class="refund-price">
<view class="price"> <view class="price">
<view class="title">退款金额</view> <view class="title">退款金额</view>
<view class="value">￥{{ (goods.goods_pay_price * num).toFixed(2) }}</view> <view class="value">￥{{ totalPrice }}</view>
</view> </view>
<view class="tips">若退款成功，将退还给您 ￥{{ (goods.goods_pay_price * num).toFixed(2) }}</view> <view class="tips">若退款成功，将退还给您 ￥{{ totalPrice }}</view>
</view> </view>
<view class="refund-text"> <view class="refund-text">
<view class="title">申请说明</view> <view class="title">申请说明</view>
<u-input v-model="refundText" type="textarea" placeholder="必填，请详细说明退款理由" /> <u-input v-model="refundText" type="textarea" placeholder="必填，请详细说明退款理由" />
</view> </view>
</view> </view>
<view class="submit-btn">提交申请</view> <view class="submit-btn" @click="applyRefund">提交申请</view>
<u-toast ref="uToast" />
</view> </view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
oid: '',
goodsList: [], goodsList: [],
goods: { goods: {
goods_num: 0, goods_num: 0,
@ -57,7 +59,13 @@ export default {
num: 0, num: 0,
} }
}, },
computed: {
totalPrice() {
return (this.goods.goods_pay_price * this.num).toFixed(2);
}
},
onLoad(option) { onLoad(option) {
this.oid = option.oid;
this.getOrderInfo(option.oid); this.getOrderInfo(option.oid);
}, },
methods: { methods: {
@ -81,16 +89,41 @@ export default {
// uni.stopPullDownRefresh(); // 结束刷新 // uni.stopPullDownRefresh(); // 结束刷新
}) })
}, },
verifyParams() {
if(!this.goods.goods_id) {
this.$u.toast('请选择退款商品');
return false;
}
if(this.num == 0) {
this.$u.toast('请选择退款数量');
return false;
}
if(this.$u.test.isEmpty(this.refundText)) {
this.$u.toast('退款说明不可为空');
return false;
}
return true;
},
applyRefund() { applyRefund() {
if(!this.verifyParams()) return false;
let params = { let params = {
order_id: this.order.order_id, order_id: this.oid,
// goods_id: goods_id, goods_id: this.goods.goods_id,
// refund_amount: refund_amount, refund_amount: Number(this.totalPrice),
reason_info: this.refundText,
goods_num: this.num,
} }
this.$u.api.refundOrder(params).then(res => { this.$u.api.refundOrder(params).then(res => {
this.$u.toast(res.message);
if(res.errCode == 0) { if(res.errCode == 0) {
this.$refs.uToast.show({
title: res.message,
back: true,
})
} else {
this.$refs.uToast.show({
title: res.message,
type: 'error'
})
} }
}) })
}, },

13
pageE/tool/WashOrder.vue
View File

@ -158,7 +158,7 @@
<view class="order-popup"> <view class="order-popup">
<view class="check"> <view class="check">
<text>选择订单</text> <text>选择订单</text>
<u-icon name="close" color="#A29FA3" size="32"></u-icon> <u-icon name="close" color="#A29FA3" size="32" @click="showPopup=false"></u-icon>
</view> </view>
<scroll-view scroll-y class="order-list"> <scroll-view scroll-y class="order-list">
<u-radio-group v-model="value" @change="radioChange"> <u-radio-group v-model="value" @change="radioChange">
@ -271,7 +271,7 @@ export default {
}) })
}, },
confirmType(e) { confirmType(e) {
console.log(e); // console.log(e);
this.type = e[0]; this.type = e[0];
}, },
async getOrderList({ load = 'reload' } = {}) { async getOrderList({ load = 'reload' } = {}) {
@ -424,6 +424,12 @@ export default {
}) })
}, },
animationfinish(e) { animationfinish(e) {
this.goodsStatus = '';
this.type = {};
this.name = '';
this.phone = '';
this.area = '';
this.address = '';
// 可重新提交订单 // 可重新提交订单
this.debounce = true; this.debounce = true;
let current = e.detail.current; let current = e.detail.current;
@ -443,9 +449,6 @@ export default {
this.choose = false; this.choose = false;
} }
}, },
close(){
this.showPopup = false
},
showToast(message, type) { showToast(message, type) {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: message, title: message,

43
pages/index/index.vue
View File

@ -3,7 +3,9 @@
<view class="status_bar"></view> <view class="status_bar"></view>
<view class="index"> <view class="index">
<view class="top"> <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"> <view class="tabs">
<u-tabs :is-scroll="false" bar-width="70" ref="tabs" :list="list" :current="num" :bar-style="{ <u-tabs :is-scroll="false" bar-width="70" ref="tabs" :list="list" :current="num" :bar-style="{
'background-color':'#FF780F', 'background-color':'#FF780F',
@ -93,18 +95,17 @@
height: 100vh; height: 100vh;
.top { .top {
padding: 0 30rpx;
display: flex; display: flex;
flex-shrink: 0;
align-items: center;
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;
height: 88rpx; height: 88rpx;
align-items: center; padding: 0 30rpx;
flex-shrink: 0;
.sosuo { .sosuo {
width: 32rpx; width: 32rpx;
height: 32rpx; height: 32rpx;
} }
.tabs { .tabs {
@ -122,6 +123,7 @@
.box { .box {
width: 100%; width: 100%;
height: 100%;
padding: 0 30rpx; padding: 0 30rpx;
} }
@ -191,6 +193,7 @@
} }
</style> </style>
<script> <script>
import { mapState } from 'vuex'
import videoItem from "@/components/index/video-item/index" import videoItem from "@/components/index/video-item/index"
import zhiboItem from "@/components/index/zhibo-item/index" import zhiboItem from "@/components/index/zhibo-item/index"
import indexad from "@/components/index/ad/index" import indexad from "@/components/index/ad/index"
@ -198,6 +201,9 @@
export default { export default {
name: "index", name: "index",
computed: {
...mapState(["hasLogin"])
},
data() { data() {
return { return {
list: [{ list: [{
@ -225,11 +231,7 @@
}, },
onShow() { onShow() {
this.getArticlelist(); this.getArticlelist();
this.getRecommendList();
this.getSwiper(); this.getSwiper();
this.getZhiBoSwiper();
this.tabLiveList();
this.getFollowList();
}, },
onLoad(){ onLoad(){
if(this.$store.state.hasLogin){ if(this.$store.state.hasLogin){
@ -253,7 +255,7 @@
// this.getManicureList({ load: 'reload' }); // this.getManicureList({ load: 'reload' });
}, },
methods: { methods: {
// 列表 // 直播列表
tabLiveList() { tabLiveList() {
this.$u.api.tabLiveList().then((res) => { this.$u.api.tabLiveList().then((res) => {
console.log(res) console.log(res)
@ -289,12 +291,25 @@
}, },
// 切换导航 // 切换导航
dianji(a) { dianji(a) {
console.log(a); // console.log(a);
if (typeof a == "object") { if (typeof a == "object") {
this.num = a.detail.current this.num = a.detail.current
} else { } else {
this.num = a 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() { getArticlelist() {
@ -312,7 +327,7 @@
// 达人列表 // 达人列表
getRecommendList() { getRecommendList() {
this.$u.api.getRecommendList().then(res => { this.$u.api.getRecommendList().then(res => {
console.log(res) console.log(res);
if (res.errCode == 0) { if (res.errCode == 0) {
this.recommendList = res.data.list; this.recommendList = res.data.list;
} }
@ -330,7 +345,6 @@
}) })
}, },
toSearchPage() { toSearchPage() {
console.log("22");
uni.navigateTo({ uni.navigateTo({
url: '/pageB/follow/index' url: '/pageB/follow/index'
}); });
@ -371,6 +385,9 @@
params: params params: params
}) })
}, },
goSearch() {
this.$u.route("/pageB/search/index");
}
}, },
} }
</script> </script>

4
pages/mine/index.vue
View File

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

3
pages/shop/index.vue
View File

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