Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx
This commit is contained in:
commit
fc86ad2579
GPG Key ID:
A7972FD973317FF3
@ -259,12 +259,13 @@ export default {
|
||||
return vm.$u.post('Order/buyer_cancel', params);
|
||||
},
|
||||
// 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', {
|
||||
order_id: order_id,
|
||||
goods_id: goods_id,
|
||||
refund_amount: refund_amount,
|
||||
refund_type: refund_type,
|
||||
goods_num: goods_num,
|
||||
reason_info: reason_info,
|
||||
});
|
||||
},
|
||||
// 删除订单
|
||||
|
||||
@ -27,16 +27,32 @@ const install = (Vue, vm) => {
|
||||
return res.data;
|
||||
} else if(res.data.errCode == 401) {
|
||||
// 假设201为token失效，这里跳转登录
|
||||
vm.$u.toast('验证失败，请重新登录');
|
||||
setTimeout(() => {
|
||||
// 此为uView的方法，详见路由相关文档
|
||||
vm.$u.route('/pageA/login/login')
|
||||
}, 1500)
|
||||
// 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')
|
||||
}, 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为服务端的返回值
|
||||
return false;
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -17,7 +17,8 @@ const store = new Vuex.Store({
|
||||
groupbuyInfo: {}, // 秒杀详情
|
||||
loadmore: {}, // 下拉加载返回的数据
|
||||
hasLogin: false, // 登录状态
|
||||
token: "" // 储存token
|
||||
token: "", // 储存token
|
||||
showLoginModel: false, // 登录框
|
||||
},
|
||||
getters: {
|
||||
getOrderAddress(state) {
|
||||
|
||||
@ -68,7 +68,7 @@ export default {
|
||||
height: 80rpx;
|
||||
border-radius: 50%;
|
||||
margin-top: 24rpx;
|
||||
background-color: #0f0;
|
||||
background-color: #0077AA;
|
||||
}
|
||||
.name{
|
||||
font-size: 26rpx;
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
</view>
|
||||
</view>
|
||||
<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="logistics" v-if="order.view_type == 3" @click="confirmReceive">确认收货</view>
|
||||
<view class="comment" v-if="order.view_type == 4" @click="toOtherPage('Comment')">立即评价</view>
|
||||
@ -47,7 +47,7 @@ export default {
|
||||
props: {
|
||||
order: Object
|
||||
},
|
||||
created() {
|
||||
mounted() {
|
||||
this.viewState();
|
||||
},
|
||||
methods: {
|
||||
@ -81,6 +81,7 @@ export default {
|
||||
default:
|
||||
break;
|
||||
}
|
||||
// console.log(state);
|
||||
this.state = state;
|
||||
},
|
||||
cancelOrder() {
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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,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{
|
||||
|
||||
@ -77,7 +77,7 @@ export default {
|
||||
}
|
||||
}
|
||||
.next{
|
||||
font-size: 18rpx;
|
||||
font-size: 20rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
color: #999;
|
||||
|
||||
@ -23,7 +23,6 @@
|
||||
},
|
||||
methods: {
|
||||
type_logines(){
|
||||
console.log("2345")
|
||||
this.show = this.type_login
|
||||
}
|
||||
},
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -36,6 +36,7 @@
|
||||
box-sizing: border-box;
|
||||
border-radius: 6rpx;
|
||||
margin-right: 26rpx;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
.xuanzhong{
|
||||
border: #ff780f 1rpx solid;
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -515,10 +515,16 @@ export default {
|
||||
},
|
||||
// 发现回复列表
|
||||
getReplyList(id) {
|
||||
this.page_[id] = 0;
|
||||
console.log(this.page_);
|
||||
this.$u.post("article/articleReplyList", {id: id, page: 0}).then(res => {
|
||||
this.allList[id] = res.data;
|
||||
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_);
|
||||
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) {
|
||||
|
||||
@ -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">
|
||||
@ -22,10 +22,17 @@
|
||||
<text class="store-name">{{ goodsInfo.store_name }}</text>
|
||||
<text class="goods-name">{{ goodsInfo.goods_name }}</text>
|
||||
</view>
|
||||
<view class="pic">
|
||||
<text>￥{{ goodsInfo.goods_price }}</text>
|
||||
<s>￥{{ goodsInfo.goods_marketprice }}</s>
|
||||
</view>
|
||||
<view class="price-collect">
|
||||
<view class="pic" v-if="type != 3">
|
||||
<text>￥{{ goodsInfo.goods_price }}</text>
|
||||
<s>￥{{ goodsInfo.goods_marketprice }}</s>
|
||||
</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 class="hr"></view>
|
||||
<!-- <navs :value="领券"></navs> -->
|
||||
@ -135,11 +142,11 @@
|
||||
</u-popup>
|
||||
<!-- 普通商品 tool -->
|
||||
<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>
|
||||
店铺
|
||||
</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>
|
||||
客服
|
||||
</view>
|
||||
@ -154,7 +161,7 @@
|
||||
</view>
|
||||
<!-- 秒杀 tool -->
|
||||
<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)">
|
||||
<image src="/static/image/common/18.png"></image>
|
||||
<text>店铺</text>
|
||||
@ -223,7 +230,6 @@ export default {
|
||||
// console.log(option);
|
||||
this.type = Number(option.type);
|
||||
this.id = option.id;
|
||||
this.getGoodsDetails(this.id);
|
||||
this.setTitle();
|
||||
},
|
||||
onShow() {
|
||||
@ -231,6 +237,7 @@ export default {
|
||||
this.showSpec = false;
|
||||
this.showGroupUser = false;
|
||||
this.showInvolvementUser = false;
|
||||
this.getGoodsDetails(this.id);
|
||||
},
|
||||
onNavigationBarButtonTap(e) {
|
||||
if(e.index == 0) this.$u.route('/pageC/cart/index');
|
||||
@ -362,6 +369,7 @@ export default {
|
||||
this.glist = res.data.data.spec_list;
|
||||
this.user_suc = res.data.data.user_suc;
|
||||
this.groupUser =res.data.data.user;
|
||||
console.log(this.groupUser);
|
||||
}
|
||||
})
|
||||
},
|
||||
@ -403,13 +411,14 @@ export default {
|
||||
}
|
||||
if(this.type == 2) {
|
||||
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, {
|
||||
pintuan_id: this.id,
|
||||
pintuangroup_id: this.involvemenGroupInfo[0].pintuangroup_id,
|
||||
})
|
||||
} else {
|
||||
const userId = uni.getStorageSync('user_info').member.member_id;
|
||||
this.$store.commit('setGroupHeadId', userId);
|
||||
Object.assign(params, {
|
||||
pintuan_id: this.id,
|
||||
})
|
||||
@ -492,7 +501,18 @@ 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]
|
||||
})
|
||||
}
|
||||
},
|
||||
}
|
||||
</script>
|
||||
@ -583,18 +603,31 @@ export default {
|
||||
line-height: 1.5;
|
||||
}
|
||||
}
|
||||
.pic{
|
||||
>text{
|
||||
font-size: 32rpx;
|
||||
color: #FF3131;
|
||||
}
|
||||
>s{
|
||||
font-size: 26rpx;
|
||||
color: #999;
|
||||
display: inline-block;
|
||||
margin-left: 30rpx;
|
||||
}
|
||||
}
|
||||
.price-collect {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
.pic{
|
||||
>text{
|
||||
font-size: 32rpx;
|
||||
color: #FF3131;
|
||||
}
|
||||
>s{
|
||||
font-size: 26rpx;
|
||||
color: #999;
|
||||
display: inline-block;
|
||||
margin-left: 30rpx;
|
||||
}
|
||||
}
|
||||
.collect {
|
||||
margin-left: auto;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
> text {
|
||||
margin-left: 12rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.comment {
|
||||
margin-top: 20rpx;
|
||||
|
||||
@ -179,12 +179,13 @@ export default {
|
||||
let params = {
|
||||
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) {
|
||||
Object.assign(params, { pintuangroup_headid: this.$store.state.pintuangroup_headid });
|
||||
Object.assign(params, { pintuangroup_id: this.orderInfo.pintuangroup_id });
|
||||
}
|
||||
// console.log(params);
|
||||
console.log(params);
|
||||
this.$u.api.withImmediate(params).then(res => {
|
||||
this.showGroupUser = false;
|
||||
this.showInvolvementUser = false;
|
||||
@ -200,7 +201,6 @@ export default {
|
||||
if(!this.debounce) return;
|
||||
this.debounce = false;
|
||||
if(this.orderType == 2) {
|
||||
// this.sendOrder(0);
|
||||
this.withImmediate();
|
||||
} else if(this.orderType == 1) {
|
||||
this.sendOrder(0);
|
||||
@ -256,7 +256,6 @@ export default {
|
||||
// console.log(params);
|
||||
this.$u.api.sendOrder(params).then(res => {
|
||||
if(res.errCode == 0) {
|
||||
// this.withImmediate();
|
||||
this.$u.route({
|
||||
type: 'redirect',
|
||||
url: '/pageC/cart/cashier',
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<view v-for="(store, s_index) in list" :key="s_index" class="cart-item">
|
||||
<view class="store">
|
||||
<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>
|
||||
<view>{{ store.store_name }}</view>
|
||||
</view>
|
||||
@ -12,9 +12,9 @@
|
||||
<view class="goods">
|
||||
<u-checkbox-group @change="goodsChange($event, s_index)">
|
||||
<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>
|
||||
<image :src="goods.goods_image"></image>
|
||||
<view class="info">
|
||||
<u-checkbox v-model="goods.checked" shape="circle" active-color="#FF780F" icon-size="35" :name="g_index"></u-checkbox>
|
||||
<image :src="goods.goods_image" @click="viewGoodsDetails(goods.goods_id)"></image>
|
||||
<view class="info" @click="viewGoodsDetails(goods.goods_id)">
|
||||
<view class="name u-line-2">{{ goods.goods_name }}</view>
|
||||
<view class="cart-info">
|
||||
<view class="price">￥{{ goods.goods_price }}</view>
|
||||
@ -204,6 +204,23 @@ export default {
|
||||
})
|
||||
this.list[value[1]].checked = checked;
|
||||
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) {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<view class="imageTop">
|
||||
<image :src="url"></image>
|
||||
<image :src="url" mode="aspectFit"></image>
|
||||
</view>
|
||||
</template>
|
||||
<style lang="scss" scoped>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<view class="listItem">
|
||||
<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>
|
||||
</template>
|
||||
<style lang="scss" scoped>
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
</view>
|
||||
<scroll-view scroll-y class="scroll-container" :style="{ height: scrollHeight }" @scrolltolower="loadMore">
|
||||
<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>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -37,19 +37,16 @@
|
||||
</scroll-view>
|
||||
</view>
|
||||
<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">
|
||||
<videoTop :url="item.url" v-if="item.type == 2"></videoTop>
|
||||
<imageTop v-else :url="item.url"></imageTop>
|
||||
<videoTop :url="item.article_pic" v-if="item.type == 2"></videoTop>
|
||||
<imageTop v-else :url="item.article_pic"></imageTop>
|
||||
</view>
|
||||
<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 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>
|
||||
</view>
|
||||
</view>
|
||||
@ -87,10 +84,12 @@ export default {
|
||||
sid: '',
|
||||
show: false,
|
||||
cur: 0,
|
||||
list:[],
|
||||
indexlist:[],
|
||||
indextop:[],
|
||||
info:{}
|
||||
list: [],
|
||||
indexlist: [],
|
||||
indextop: [],
|
||||
info: {},
|
||||
page: 0,
|
||||
scrollHeiht: '',
|
||||
}
|
||||
},
|
||||
components:{
|
||||
@ -101,7 +100,8 @@ export default {
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
this.getStoreInfo();
|
||||
this.getStoreImgVideoList();
|
||||
this.getArticlelist();
|
||||
// this.getStoreImgVideoList();
|
||||
},
|
||||
onNavigationBarButtonTap(e) {
|
||||
// console.log(e.index);
|
||||
@ -114,7 +114,7 @@ export default {
|
||||
if(current == 0) {
|
||||
this.$u.route('/pageC/merchant/storeClassify', { id: this.sid });
|
||||
} else if(current == 2) {
|
||||
this.$u.route('./details', { id: this.sid });
|
||||
this.$u.route('/pageC/merchant/details', { id: this.sid });
|
||||
}
|
||||
},
|
||||
getStoreInfo() {
|
||||
@ -140,12 +140,38 @@ export default {
|
||||
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){
|
||||
this.sid = option.id;
|
||||
console.log(this.sid);
|
||||
// console.log(this.sid);
|
||||
this.getStoreInfo();
|
||||
this.getStoreImgVideoList();
|
||||
this.getArticlelist();
|
||||
this.setViewHeight();
|
||||
// this.getStoreImgVideoList();
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
@ -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>
|
||||
<view class="content">
|
||||
<view class="title">{{item.title}}</view>
|
||||
<view class="images_about">
|
||||
<image :src="item.goods_image"></image>
|
||||
<view>
|
||||
<text>{{item.summary}}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</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" mode="aspectFill"></image>
|
||||
<view>
|
||||
<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; //不换行
|
||||
}
|
||||
view{
|
||||
display: inline-block;
|
||||
float: left;
|
||||
width:430rpx;
|
||||
height:140rpx;
|
||||
background:rgba(241,241,241,1);
|
||||
padding: 20rpx;
|
||||
background: rgba(241,241,241,1);
|
||||
& > text {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
@ -25,45 +25,21 @@
|
||||
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{
|
||||
|
||||
@ -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;
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
@ -29,6 +29,7 @@
|
||||
</view>
|
||||
<view class="edit-tips">注意：修改手机号需要原手机号获取验证码，无原手机验证码，请联系客服</view>
|
||||
<view class="edit-btn" @click="updateMemberInfo">完成</view>
|
||||
<u-toast ref="uToast" />
|
||||
</view>
|
||||
</template>
|
||||
<script>
|
||||
@ -155,8 +156,11 @@ export default {
|
||||
birthday: this.birthday,
|
||||
}).then(res => {
|
||||
if (res.errCode == 0) {
|
||||
this.getUserInfo();
|
||||
// this.$u.toast(res.message);
|
||||
// this.getUserInfo();
|
||||
this.$refs.uToast.show({
|
||||
title: res.message,
|
||||
back: true,
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
@ -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>
|
||||
@ -44,11 +44,11 @@ export default {
|
||||
}
|
||||
},
|
||||
onShow() {
|
||||
this.articleCollectList();
|
||||
this.articleCollectList();
|
||||
},
|
||||
// 下拉刷新
|
||||
onPullDownRefresh() {
|
||||
this.articleCollectList();
|
||||
this.articleCollectList();
|
||||
},
|
||||
methods: {
|
||||
showAction(item) {
|
||||
@ -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;
|
||||
|
||||
@ -68,7 +68,7 @@
|
||||
</view>
|
||||
</view>
|
||||
<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="logistics" v-if="orderstate == '1'" @click="confirmReceive">确认收货</view>
|
||||
<view class="comment" v-if="orderstate == '2'" @click="toOtherPage('Comment')">立即评价</view>
|
||||
|
||||
@ -134,7 +134,7 @@ export default {
|
||||
if(load == 'reload') this.orderList = res.data;
|
||||
else if(load == 'loadmore') this.orderList.push(...res.data);
|
||||
}
|
||||
return res;
|
||||
return res.data.length;
|
||||
},
|
||||
// 售后
|
||||
async getAfterSaleList({ load = 'loadmore' } = {}) {
|
||||
@ -146,7 +146,7 @@ export default {
|
||||
if(load == 'reload') this.orderList = res.data;
|
||||
else if(load == 'loadmore') this.orderList.push(...res.data);
|
||||
}
|
||||
return res;
|
||||
return res.data.length;
|
||||
},
|
||||
// 试穿
|
||||
async goodsTryOrderList({ load = 'loadmore' } = {}) {
|
||||
@ -159,7 +159,7 @@ export default {
|
||||
if(load == 'reload') this.orderList = res.data.list;
|
||||
else if(load == 'loadmore') this.orderList.push(...res.data.list);
|
||||
}
|
||||
return res;
|
||||
return res.data.list.length;
|
||||
},
|
||||
reachBottom() {
|
||||
// 大于15条才会加载更多
|
||||
@ -173,9 +173,9 @@ export default {
|
||||
// else
|
||||
if(this.current == 4) promise = this.goodsTryOrderList();
|
||||
else promise = this.getOrderList();
|
||||
promise.then(res => {
|
||||
promise.then(length => {
|
||||
this.loadStatus.splice(this.current, 1, "nomore");
|
||||
if(res.data.length == 0) this.page--;
|
||||
if(length == 0) this.page--;
|
||||
}).catch(() => {
|
||||
this.loadStatus.splice(this.current, 1, "nomore");
|
||||
this.page--;
|
||||
|
||||
@ -31,22 +31,24 @@
|
||||
<view class="refund-price">
|
||||
<view class="price">
|
||||
<view class="title">退款金额</view>
|
||||
<view class="value">￥{{ (goods.goods_pay_price * num).toFixed(2) }}</view>
|
||||
<view class="value">￥{{ totalPrice }}</view>
|
||||
</view>
|
||||
<view class="tips">若退款成功，将退还给您 ￥{{ (goods.goods_pay_price * num).toFixed(2) }}</view>
|
||||
<view class="tips">若退款成功，将退还给您 ￥{{ totalPrice }}</view>
|
||||
</view>
|
||||
<view class="refund-text">
|
||||
<view class="title">申请说明</view>
|
||||
<u-input v-model="refundText" type="textarea" placeholder="必填，请详细说明退款理由" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="submit-btn">提交申请</view>
|
||||
<view class="submit-btn" @click="applyRefund">提交申请</view>
|
||||
<u-toast ref="uToast" />
|
||||
</view>
|
||||
</template>
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
oid: '',
|
||||
goodsList: [],
|
||||
goods: {
|
||||
goods_num: 0,
|
||||
@ -57,7 +59,13 @@ export default {
|
||||
num: 0,
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
totalPrice() {
|
||||
return (this.goods.goods_pay_price * this.num).toFixed(2);
|
||||
}
|
||||
},
|
||||
onLoad(option) {
|
||||
this.oid = option.oid;
|
||||
this.getOrderInfo(option.oid);
|
||||
},
|
||||
methods: {
|
||||
@ -81,16 +89,41 @@ export default {
|
||||
// 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() {
|
||||
if(!this.verifyParams()) return false;
|
||||
let params = {
|
||||
order_id: this.order.order_id,
|
||||
// goods_id: goods_id,
|
||||
// refund_amount: refund_amount,
|
||||
order_id: this.oid,
|
||||
goods_id: this.goods.goods_id,
|
||||
refund_amount: Number(this.totalPrice),
|
||||
reason_info: this.refundText,
|
||||
goods_num: this.num,
|
||||
}
|
||||
this.$u.api.refundOrder(params).then(res => {
|
||||
this.$u.toast(res.message);
|
||||
if(res.errCode == 0) {
|
||||
|
||||
this.$refs.uToast.show({
|
||||
title: res.message,
|
||||
back: true,
|
||||
})
|
||||
} else {
|
||||
this.$refs.uToast.show({
|
||||
title: res.message,
|
||||
type: 'error'
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
@ -158,7 +158,7 @@
|
||||
<view class="order-popup">
|
||||
<view class="check">
|
||||
<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>
|
||||
<scroll-view scroll-y class="order-list">
|
||||
<u-radio-group v-model="value" @change="radioChange">
|
||||
@ -271,7 +271,7 @@ export default {
|
||||
})
|
||||
},
|
||||
confirmType(e) {
|
||||
console.log(e);
|
||||
// console.log(e);
|
||||
this.type = e[0];
|
||||
},
|
||||
async getOrderList({ load = 'reload' } = {}) {
|
||||
@ -424,6 +424,12 @@ export default {
|
||||
})
|
||||
},
|
||||
animationfinish(e) {
|
||||
this.goodsStatus = '';
|
||||
this.type = {};
|
||||
this.name = '';
|
||||
this.phone = '';
|
||||
this.area = '';
|
||||
this.address = '';
|
||||
// 可重新提交订单
|
||||
this.debounce = true;
|
||||
let current = e.detail.current;
|
||||
@ -443,9 +449,6 @@ export default {
|
||||
this.choose = false;
|
||||
}
|
||||
},
|
||||
close(){
|
||||
this.showPopup = false
|
||||
},
|
||||
showToast(message, type) {
|
||||
this.$refs.uToast.show({
|
||||
title: message,
|
||||
|
||||
@ -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,11 +231,7 @@
|
||||
},
|
||||
onShow() {
|
||||
this.getArticlelist();
|
||||
this.getRecommendList();
|
||||
this.getSwiper();
|
||||
this.getZhiBoSwiper();
|
||||
this.tabLiveList();
|
||||
this.getFollowList();
|
||||
},
|
||||
onLoad(){
|
||||
if(this.$store.state.hasLogin){
|
||||
@ -253,7 +255,7 @@
|
||||
// this.getManicureList({ load: 'reload' });
|
||||
},
|
||||
methods: {
|
||||
// 列表
|
||||
// 直播列表
|
||||
tabLiveList() {
|
||||
this.$u.api.tabLiveList().then((res) => {
|
||||
console.log(res)
|
||||
@ -289,12 +291,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() {
|
||||
@ -312,7 +327,7 @@
|
||||
// 达人列表
|
||||
getRecommendList() {
|
||||
this.$u.api.getRecommendList().then(res => {
|
||||
console.log(res)
|
||||
console.log(res);
|
||||
if (res.errCode == 0) {
|
||||
this.recommendList = res.data.list;
|
||||
}
|
||||
@ -330,7 +345,6 @@
|
||||
})
|
||||
},
|
||||
toSearchPage() {
|
||||
console.log("22");
|
||||
uni.navigateTo({
|
||||
url: '/pageB/follow/index'
|
||||
});
|
||||
@ -371,6 +385,9 @@
|
||||
params: params
|
||||
})
|
||||
},
|
||||
goSearch() {
|
||||
this.$u.route("/pageB/search/index");
|
||||
}
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -152,10 +152,6 @@ export default {
|
||||
}
|
||||
this.getUserInfo();
|
||||
},
|
||||
// 下拉刷新
|
||||
onPullDownRefresh() {
|
||||
this.getUserInfo();
|
||||
},
|
||||
onNavigationBarButtonTap() {
|
||||
this.toOtherPage("/setting/Index");
|
||||
},
|
||||
|
||||
@ -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>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user