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

Compare commits

base: theluyuan:lxb
Branches Tags
theluyuan:master theluyuan:qxf theluyuan:zhy theluyuan:xbx theluyuan:gyh theluyuan:xbx-new theluyuan:zmr theluyuan:cmx theluyuan:lxb
...
compare: theluyuan:4004f3715bab818a1c24fe398629da83fab8a317
Branches Tags
theluyuan:master theluyuan:qxf theluyuan:zhy theluyuan:xbx theluyuan:gyh theluyuan:xbx-new theluyuan:zmr theluyuan:cmx theluyuan:lxb

14 Commits
lxb ... 4004f3715b

Author SHA1 Message Date
luyuan
4004f3715b Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx 2020-07-27 18:02:22 +08:00
hansu
208f27aa93 Merge pull request 'loadmore 7.27' (#84) from zhy into master 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/84
 2020-07-27 18:01:21 +08:00
ghusermoon
6eabd3a575 loadmore 7.27 2020-07-27 17:59:47 +08:00
luyuan
2ea9b89acc 直播 2020-07-27 17:32:17 +08:00
hansu
100f31c6f9 Merge pull request 'lxb' (#83) from lxb into master 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/83
 2020-07-27 14:40:40 +08:00
luyuan
b2d284f666 直播列表 2020-07-27 14:35:32 +08:00
hansu
dbafe8b4c1 Merge pull request 'order 7.25' (#82) from zhy into master 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/82
 2020-07-25 17:51:40 +08:00
ghusermoon
185f5979b6 order 7.25 2020-07-25 17:51:01 +08:00
hansu
410a7850e6 Merge pull request 'order 7.25' (#81) from zhy into master 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/81
 2020-07-25 15:18:30 +08:00
ghusermoon
c931e87209 order 7.25 2020-07-25 15:17:52 +08:00
hansu
94636380f1 Merge pull request 'comment 7.24' (#80) from zhy into master 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/80
 2020-07-24 20:36:00 +08:00
ghusermoon
5abb3f2496 comment 7.24 2020-07-24 20:35:28 +08:00
hansu
a1b14b4f5e Merge pull request 'comment 7.24' (#79) from zhy into master 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/79
 2020-07-24 19:50:24 +08:00
ghusermoon
dd71a0f32a comment 7.2 2020-07-24 19:48:57 +08:00
42 changed files with 1586 additions and 472 deletions
Expand all files Collapse all files

31
common/api/shop.js
View File

@@ -259,7 +259,36 @@ export default {
},
getStoreInfo({id}){
return vm.$u.post('Store/getStoreInfo',{id})
}
},
// 评论标签+数量
getEvaluateSpec({ id }) {
return vm.$u.post('Specialci/getEvaluateSpec', {
goods_id: id,
})
},
// 获取商品评论
getAllEvalue({ goods_id, page, type }) {
return vm.$u.post('Specialci/getAllEvalue', {
goods_id: goods_id,
page: page,
type: type,
})
},
// 搜索发现列表
searchwordlist() {
return vm.$u.post('ShopSearch/searchwordlist')
},
saveGoodsTry({ member_name, member_mobile, area_info, address_detail, goods_id, num, store_id }) {
return vm.$u.post('Order/saveGoodsTry', {
member_name: member_name,
member_mobile: member_mobile,
area_info: area_info,
address_detail: address_detail,
goods_id: goods_id,
num: num,
store_id: store_id,
})
},
}
}

4
common/api/user.js
View File

@@ -240,6 +240,10 @@ export default {
getAfterSaleList({ page }) {
return vm.$u.post('order/afterSaleList', { page: page });
},
// 试穿列表
goodsTryOrderList() {
return vm.$u.post('order/goodsTryOrderList');
},
// 订单详情
getOrderInfo({ order_id }) {
return vm.$u.post('Order/orderInfo', { order_id: order_id });

115
components/comment/index.vue Normal file
View File

@@ -0,0 +1,115 @@
<template>
<view class="comment-item">
<view class="user">
<u-avatar :src="content.member_avatar" class="avatar" size="60"></u-avatar>
<text class="name">{{ content.geval_frommembername }}</text>
<u-rate v-if="reply" :disabled='true' count="count" v-model="rate" size="23" active-color="#FF780F" inactive-color="#F0EDF1" gutter="10"></u-rate>
</view>
<view class="content">
<view class="text">{{ content.geval_content }}</view>
</view>
<view class="image-container">
<image :src="src" v-for="(src, index) in content.geval_image" :key="index"></image>
</view>
<view class="reply" v-if="reply && content.geval_explain">
<view class="title">掌柜回复：</view>
<view class="content u-line-4">{{ content.geval_explain }}</view>
</view>
<view class="time" v-if="reply">
<image src="/static/image/common/20.png"></image>
<view class="value">{{ content.geval_addtime }}</view>
</view>
</view>
</template>
<script>
/*
* @description 显示评价
* @property {Boolean} reply 是否显示回复/时间/评分
**/
export default {
data() {
return {
count: 5,
rate: 2,
}
},
props: {
content: Object,
reply: Boolean,
},
created() {
if(this.content.hasOwnProperty('scores_two')) this.rate = this.content.scores_two;
}
};
</script>
<style lang="scss" scoped>
.comment-item {
background-color: #ffffff;
.user {
display: flex;
align-items: center;
margin-bottom: 20rpx;
.name {
margin: 0 20rpx;
font-size: 26rpx;
color: rgba(153,153,153,1);
}
}
.content {
margin-bottom: 20rpx;
.text {
font-size: 26rpx;
color: rgba(51,51,51,1);
line-height: 40rpx;
margin-bottom: 20rpx;
}
> image {
width: 210rpx;
height: 210rpx;
border-radius: 10px;
&:not(:nth-child(3n)) {
margin-right: 30rpx;
}
}
}
.image-container {
margin: 20rpx 0;
> image {
width: 210rpx;
height: 210rpx;
border-radius: 10rpx;
margin-bottom: 20rpx;
&:not(:nth-child(3n)) {
margin-right: 30rpx;
}
}
}
.reply {
padding: 30rpx;
background: rgba(240,238,238,1);
border-radius: 10rpx;
font-size: 24rpx;
color: rgba(102,102,102,1);
margin-bottom: 20rpx;
.title {
margin-bottom: 16rpx;
}
.content {
line-height: 36rpx;
}
}
.time {
display: flex;
align-items: center;
> image {
width: 28rpx;
height: 28rpx;
margin-right: 12rpx;
}
.value {
font-size: 24rpx;
color: rgba(153,153,153,1);
}
}
}
</style>

19
components/index/zhibo-item/index.vue
View File

@@ -1,10 +1,10 @@
<template>
<view class="zhibo">
<image class="head"></image>
<view class="zhibo" @click="zhibo">
<image class="head" :src="image"></image>
<view class="user">
<view class="name">
<image></image>
<text>这是名字</text>
<text class="u-line-1" style="width:130rpx">{{name}}</text>
</view>
<view class="pingbi">
<image></image>
@@ -70,6 +70,17 @@ export default {
return {
}
}
},
methods:{
zhibo(){
this.$u.route({
url:"/pageB/zhibo/index",
params:{
url:this.url
}
})
}
},
props:['name','image','url']
}
</script>

11
components/loadmore/index.vue
View File

@@ -42,17 +42,6 @@ export default {
// this.loadStatus = "nomore";
// this.tpage--;
// })
// this.$parent.callback({ page: this.tpage }).then(length => {
// if(length == 0) {
// this.tpage--;
// this.status = 'nomore';
// } else {
// this.status = 'loading';
// }
// }).catch(() => {
// this.loadStatus = "nomore";
// this.tpage--;
// })
}
}
};

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

@@ -12,9 +12,11 @@
<image :src="goods.goods_image"></image>
<view class="goods-text">
<view class="goods-name u-line-2">{{ goods.goods_name }}</view>
<view class="goods-sku u-line-1" v-if="order.order_state !== 20 && order.order_state !== 40">XL;红色条纹XL;红色条纹XL;红色条纹</view>
<view class="goods-time u-line-1" v-if="order.order_state == 10 || order.order_state == 10">距离结束：23:23:38</view>
<view class="goods-price u-line-1" v-if="order.order_state == 20 || order.order_state == 40">总价：￥99.00，实付款￥99</view>
<view class="goods-sku u-line-1" v-if="order.order_state !== 20 && order.order_state !== 40 && goods.goods_spec">
<text v-for="(spec, index) in goods.goods_spec" :key="index">{{ spec + ';' }}</text>
</view>
<view class="goods-time u-line-1" v-if="order.order_state == 10 || order.order_state == 10">结束时间：{{ order.add_time * 1000 | date('yyyy-mm-dd hh:MM') }}</view>
<view class="goods-price u-line-1" v-if="order.order_state == 20 || order.order_state == 40">总价：￥{{ goods.goods_price }}，实付款￥{{ goods.goods_pay_price }}</view>
<view class="goods-date" v-if="order.order_state == 20 || order.order_state == 40">
<image src="@/pageE/static/mine/26.png"></image>
<view>{{ order.add_time | date }}</view>
@@ -27,13 +29,14 @@
<view class="logistics" v-if="order.order_state == 30" @click="toOtherPage('Logistics')">查看物流</view>
<view class="comment" v-if="order.order_state == 40 && order.evaluation_state == 0" @click="toOtherPage('Comment')">立即评价</view>
<view class="calcel" v-if="order.order_state == 10" @click="cancelOrder">取消支付</view>
<view class="payment" v-if="order.order_state == 10">立即支付</view>
<view class="payment" v-if="order.order_state == 10" @click="payNow(order.pay_sn, order.order_amount)">立即支付</view>
<view class="service" v-if="order.order_state == 20">联系官方客服</view>
<view class="submit" v-if="order.order_state == 20">提交官方审核</view>
</view>
</view>
</template>
<script>
import common from '@/static/js/common.js';
export default {
data() {
return {
@@ -46,6 +49,14 @@ export default {
created() {
this.viewState();
},
filters: {
// timeLine(timestamp) {
// const timestamp = 0.5*60*60*1000;
// const now = new Date().getTime();
// let line = now - timestamp * 1000;
// return common.getLineTime({ timestamp: line });
// }
},
methods: {
viewState() {
let state;
@@ -85,6 +96,7 @@ export default {
if(res.errCode == 0) {
this.$emit("refreshOrderList", { reload: 'again' });
}
this.$u.toast(res.message);
})
},
toOtherPage(url) {
@@ -92,6 +104,12 @@ export default {
oid: this.order.order_id,
});
},
payNow(pay_sn, order_amount) {
this.$u.route('/pageC/cart/cashier', {
pay_sn: pay_sn,
price: order_amount,
});
},
},
};
</script>
@@ -114,6 +132,7 @@ export default {
height: 50rpx;
border-radius: 50%;
margin-right: 15rpx;
background-color: aquamarine;
}
.store-name {
font-size: 26rpx;

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

@@ -11,7 +11,7 @@
<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>
<u-empty text="暂无拼团商品" mode="list" color="#000" v-if="!groupList.length"></u-empty>
<u-empty text="暂无拼团商品" mode="list" color="#000" v-if="!groupList.length" style="margin: 0 auto;"></u-empty>
</swiper-item>
</swiper>
</view>
@@ -23,17 +23,41 @@ export default {
components:{
sitem
},
props: {
groupList: Array,
classifyList: Array,
},
data(){
return {
current: 0,
current: -1,
swiperCurrent: 0,
groupList: [], // 拼团商品
classifyList: [],
}
},
watch: {
current(value) {
this.getPinTuanList(this.classifyList[value].gc_id);
}
},
created() {
this.getGoodsClass();
},
methods: {
// 获取优惠券拼团分类
getGoodsClass() {
this.$u.api.getGoodsClass().then(res => {
if(res.errCode == 0) {
this.classifyList = res.data;
this.current = 0;
}
})
},
// 拼团列表
getPinTuanList(id) {
this.$u.api.getPinTuanList({
page: 0,
gc_id: id,
}).then(res => {
this.groupList = res.data;
})
},
tabsChange(index) {
this.swiperCurrent = index;
},
@@ -52,7 +76,9 @@ export default {
</script>
<style lang="scss" scoped>
.group{
.top{
background-color: #ffffff;
.top {
padding: 0 30rpx;
height: 90rpx;
width: 100%;
display: flex;
@@ -67,18 +93,11 @@ export default {
color: #999;
}
}
// .label{
// display: flex;
// font-size: 24rpx;
// color: #999;
// >text{
// margin-right: 34rpx;
// }
// }
.list{
.list {
box-sizing: border-box;
padding: 0 30rpx;
display: flex;
justify-content: space-between;
margin-top: 21rpx;
}
}
</style>

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

@@ -16,19 +16,26 @@ export default {
},
methods: {
toDetailsPage() {
this.$u.api.getPinTuanDetails({
pintuan_id: this.info.pintuan_id,
}).then(res => {
if(res.errCode == 0) {
const goods = {
goods: res.data.data,
type: 2,
}
this.$store.commit('setGoodsDetails', goods);
this.$store.commit('setGoodsId', this.info.pintuan_id);
this.$u.route({
url: 'pageB/sdetails/index',
})
// this.$u.api.getPinTuanDetails({
// pintuan_id: this.info.pintuan_id,
// }).then(res => {
// if(res.errCode == 0) {
// const goods = {
// goods: res.data.data,
// type: 2,
// }
// this.$store.commit('setGoodsDetails', goods);
// this.$store.commit('setGoodsId', this.info.pintuan_id);
// this.$u.route({
// url: 'pageB/sdetails/index',
// })
// }
// })
this.$u.route({
url: 'pageB/sdetails/index',
params: {
id: this.info.pintuan_id,
type: 2,
}
})
}

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

@@ -1,29 +1,23 @@
<template>
<view class="list">
<view class="top">
商品推荐
</view>
<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>
</view>
<swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" :style="{height: swiperHeight}">
<swiper-item class="swiper-item" v-for="(_, index) in classifyList" :key="index">
<!-- <scroll-view scroll-y style="height: 800rpx;width: 100%;"> -->
<view class="goods-item">
<item v-for="item in goodsList" :key="item.goods_id" :info="item"></item>
</view>
<u-empty text="暂无商品" mode="list" color="#000" v-if="!goodsList.length"></u-empty>
<!-- </scroll-view> -->
<view class="goods-item">
<item v-for="item in goodsList" :key="item.goods_id" :info="item"></item>
</view>
<u-empty text="暂无商品" mode="list" color="#000" v-if="!goodsList.length"></u-empty>
</swiper-item>
</swiper>
<!-- 加载更多 -->
<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20"></u-loadmore>
<!-- <loadmore ref="loadmore" @callback="getGoodsRecommend" bgColor="#FFF" :page="page"></loadmore> -->
<u-loadmore :status="loadStatus" bgColor="#FFF" margin-top="20" margin-bottom="20"></u-loadmore>
</view>
</template>
<script>
import item from "./item";
import loadmore from "@/components/loadmore/index";
export default {
name:"list",
data() {
@@ -40,10 +34,10 @@ export default {
},
components: {
item,
loadmore
},
watch: {
current(index) {
this.page = 1;
const id = this.classifyList[index].gc_id;
this.getGoodsRecommend({gc_id: id});
}
@@ -61,7 +55,7 @@ export default {
page: this.page,
reload: false,
}).then(length => {
console.log(length);
// console.log(length);
if(length == 0) {
this.page--;
this.loadStatus = 'nomore';
@@ -72,8 +66,6 @@ export default {
this.loadStatus = "nomore";
this.page--;
})
// this.$refs.loadmore.reachBottom();
// this.getGoodsRecommend(this.classifyList[this.current].gc_id);
},
getGoodsClassRecommend(gc_id) {
this.$u.api.getGoodsClassRecommend().then(res => {
@@ -81,7 +73,6 @@ export default {
// 初始化 current
this.current = 0;
this.classifyList = res.data.gc_recommend;
// this.getGoodsRecommend(this.classifyList[0].gc_id);
}
})
},
@@ -124,29 +115,17 @@ export default {
</script>
<style lang="scss" scoped>
.list{
.top{
background-color: #ffffff;
padding: 30rpx {
top: 0;
};
.top {
font-size: 30rpx;
height: 90rpx;
line-height: 90rpx;
text-align: center;
color: #333;
}
// .label{
// display: flex;
// color: #999;
// flex-wrap: wrap;
// >text{
// margin-right: 34rpx;
// margin-bottom: 10rpx;
// }
// }
// .item{
// display: flex;
// flex-wrap: wrap;
// justify-content: space-between;
// margin-top: 20rpx;
// }
.goods-item {
display: flex;
flex-wrap: wrap;

33
components/shop/list/item.vue
View File

@@ -16,20 +16,27 @@ export default {
},
methods: {
toDetailsPage() {
this.$u.api.getGoodsDetails({ id: this.info.goods_id }).then(res => {
if (res.errCode == 0) {
const goods = {
goods: res.data,
type: 1,
}
this.$store.commit('setGoodsDetails', goods);
this.$store.commit('setGoodsId', this.info.goods_id);
this.$u.route({
url: 'pageB/sdetails/index',
})
// console.log(this.goodsInfo.mobile_body);
// this.$u.api.getGoodsDetails({ id: this.info.goods_id }).then(res => {
// if (res.errCode == 0) {
// const goods = {
// goods: res.data,
// type: 1,
// }
// this.$store.commit('setGoodsDetails', goods);
// this.$store.commit('setGoodsId', this.info.goods_id);
// this.$u.route({
// url: 'pageB/sdetails/index',
// })
// // console.log(this.goodsInfo.mobile_body);
// }
// })
this.$u.route({
url: 'pageB/sdetails/index',
params: {
id: this.info.goods_id,
type: 1,
}
})
})
}
},
}

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

@@ -32,7 +32,7 @@ export default {
props: ['recommendData', 'type'],
created() {
this.info = this.recommendData;
console.log(this.recommendData);
// console.log(this.recommendData);
}
}
</script>

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

@@ -35,23 +35,30 @@ export default {
props: ['recommendData', 'type'],
created() {
this.info = this.recommendData;
console.log(this.recommendData);
// console.log(this.recommendData);
},
methods: {
toDetailsPage() {
this.$u.api.getPinTuanDetails({
pintuan_id: this.recommendData.pintuan_id
}).then(res => {
if(res.errCode == 0) {
const goods = {
goods: res.data.data,
type: 2,
}
this.$store.commit('setGoodsDetails', goods);
this.$store.commit('setGoodsId', this.recommendData.pintuan_id);
this.$u.route({
url: 'pageB/sdetails/index',
})
// this.$u.api.getPinTuanDetails({
// pintuan_id: this.recommendData.pintuan_id
// }).then(res => {
// if(res.errCode == 0) {
// const goods = {
// goods: res.data.data,
// type: 2,
// }
// this.$store.commit('setGoodsDetails', goods);
// this.$store.commit('setGoodsId', this.recommendData.pintuan_id);
// this.$u.route({
// url: 'pageB/sdetails/index',
// })
// }
// })
this.$u.route({
url: 'pageB/sdetails/index',
params: {
id: this.recommendData.pintuan_id,
type: 2,
}
})
}
@@ -60,7 +67,10 @@ export default {
</script>
<style lang="scss" scoped>
.recommend{
.top{
margin-bottom: 20rpx;
padding: 0 30rpx;
background-color: #ffffff;
.top {
height: 90rpx;
display: flex;
align-items: center;
@@ -75,6 +85,7 @@ export default {
}
}
.connect{
padding: 30rpx;
display: flex;
align-items: center;
.user {

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

@@ -45,6 +45,9 @@ export default {
</script>
<style lang="scss" scoped>
.seckill{
background-color: #fff;
padding: 30rpx;
margin-bottom: 20rpx;
.top{
height: 60rpx;
display: flex;

35
components/shop/seckill/item.vue
View File

@@ -26,20 +26,27 @@ export default {
methods: {
spikeGoods() {
// console.log(this.item.groupbuy_id);
this.$u.api.getSpikeInfo({
groupbuy_id: this.item.groupbuy_id
}).then(res => {
if(res.errCode == 0) {
const goods = {
goods: res.data.goodsInfo,
type: 3, // 商品详情 1普通 2拼团 3秒杀 4优惠券
}
this.$store.commit('setGoodsDetails', goods);
this.$store.commit('setGroupbuyInfo', res.data.groupbuyInfo);
this.$store.commit('setGoodsId', this.item.groupbuy_id);
this.$u.route({
url: 'pageB/sdetails/index',
})
// this.$u.api.getSpikeInfo({
// groupbuy_id: this.item.groupbuy_id
// }).then(res => {
// if(res.errCode == 0) {
// const goods = {
// goods: res.data.goodsInfo,
// type: 3, // 商品详情 1普通 2拼团 3秒杀 4优惠券
// }
// this.$store.commit('setGoodsDetails', goods);
// this.$store.commit('setGroupbuyInfo', res.data.groupbuyInfo);
// this.$store.commit('setGoodsId', this.item.groupbuy_id);
// this.$u.route({
// url: 'pageB/sdetails/index',
// })
// }
// })
this.$u.route({
url: 'pageB/sdetails/index',
params: {
id: this.item.groupbuy_id,
type: 3,
}
})
},

68
components/shop/special-shop/index.vue
View File

@@ -42,37 +42,51 @@ export default {
methods: {
spikeGoods() {
// console.log(this.item.groupbuy_id);
this.$u.api.getSpikeInfo({
groupbuy_id: this.item.groupbuy_id
}).then(res => {
if(res.errCode == 0) {
const goods = {
goods: res.data.goodsInfo,
type: 3, // 商品详情 1普通 2拼团 3秒杀 4优惠券
}
this.$store.commit('setGoodsDetails', goods);
this.$store.commit('setGroupbuyInfo', res.data.groupbuyInfo);
this.$store.commit('setGoodsId', this.item.groupbuy_id);
this.$u.route({
url: 'pageB/sdetails/index',
})
// this.$u.api.getSpikeInfo({
// groupbuy_id: this.item.groupbuy_id
// }).then(res => {
// if(res.errCode == 0) {
// const goods = {
// goods: res.data.goodsInfo,
// type: 3, // 商品详情 1普通 2拼团 3秒杀 4优惠券
// }
// this.$store.commit('setGoodsDetails', goods);
// this.$store.commit('setGroupbuyInfo', res.data.groupbuyInfo);
// this.$store.commit('setGoodsId', this.item.groupbuy_id);
// this.$u.route({
// url: 'pageB/sdetails/index',
// })
// }
// })
this.$u.route({
url: 'pageB/sdetails/index',
params: {
id: this.item.groupbuy_id,
type: 3,
}
})
},
toDetailsPage() {
this.$u.api.getPinTuanDetails({
pintuan_id: this.item.pintuan_id
}).then(res => {
if(res.errCode == 0) {
const goods = {
goods: res.data.data,
type: 2,
}
this.$store.commit('setGoodsDetails', goods);
this.$store.commit('setGoodsId', this.item.pintuan_id);
this.$u.route({
url: 'pageB/sdetails/index',
})
// this.$u.api.getPinTuanDetails({
// pintuan_id: this.item.pintuan_id
// }).then(res => {
// if(res.errCode == 0) {
// const goods = {
// goods: res.data.data,
// type: 2,
// }
// this.$store.commit('setGoodsDetails', goods);
// this.$store.commit('setGoodsId', this.item.pintuan_id);
// this.$u.route({
// url: 'pageB/sdetails/index',
// })
// }
// })
this.$u.route({
url: 'pageB/sdetails/index',
params: {
id: this.item.pintuan_id,
type: 2,
}
})
}

11
components/shop/youhq/index.vue
View File

@@ -78,7 +78,7 @@ export default {
num = this.couponList.length
? this.couponList.length > 4 ? 4 : this.couponList.length
: 1
this.swiperHeight = (97 + 10) * num - 10 + 'px';
this.swiperHeight = (97 + 10) * num + 'px';
},
toCouponPage() {
this.$u.route({
@@ -93,8 +93,11 @@ export default {
</script>
<style lang="scss" scoped>
.coupon-swiper {
background-color: #ffffff;
margin-bottom: 40rpx;
.top {
padding-top: 30rpx;
padding: 0 30rpx;
height: 90rpx;
display: flex;
align-items: center;
justify-content: space-between;
@@ -109,11 +112,9 @@ export default {
}
}
.swiper-coupon-item {
padding: 0 30rpx;
box-sizing: border-box;
background-color: #ffffff;
// padding: 30rpx {
// top: 0;
// };
.coupon-item {
margin-bottom: 20rpx;
}

123
pageB/comment/index.vue Normal file
View File

@@ -0,0 +1,123 @@
<template>
<scroll-view scroll-y class="comment" @scrolltolower="loadMore">
<view class="label-list">
<view v-for="(label, index) in evaluateSpec" :key="index" :class="{'active': current == index}" @click="current=index">{{ index + '(' + label + '}' }}</view>
</view>
<view class="comment-container">
<view v-for="(item, index) in evalueList" :key="index" class="itme">
<comment :reply="true" :content="item"></comment>
</view>
<u-empty text="暂无评论" mode="list" v-if="!evalueList.length" margin-top="120" color="#333"></u-empty>
</view>
<!-- 加载更多 -->
<u-loadmore :status="loadStatus" bgColor="#EEEBEE" margin-top="20" margin-bottom="20" v-if="evalueList.length >= 12"></u-loadmore>
</scroll-view>
</template>
<script>
import comment from "@/components/comment/index";
export default {
data() {
return {
id: Number,
current: '全部',
page: 0,
evalueList: [],
evaluateSpec: {},
loadStatus: 'loadmore',
timer: true,
}
},
components: {
comment
},
onLoad(option) {
this.id = option.id;
// this.getAllEvalue();
this.getEvaluateSpec();
},
watch: {
current(value) {
this.page = 0;
this.getAllEvalue({ type: value });
}
},
methods: {
loadMore() {
if(this.evalueList.length < 12) return false;
if(!this.timer) return false;
this.loadStatus = "loading";
this.page++;
this.getAllEvalue({ type: this.current, load: 'more' }).then(length => {
if(length == 0) {
this.page--;
this.loadStatus = 'nomore';
} else {
this.loadStatus = 'loading';
}
}).catch(() => {
this.loadStatus = "nomore";
this.page--;
})
},
getEvaluateSpec() {
this.$u.api.getEvaluateSpec({
id: this.id,
}).then(res => {
if(res.errCode == 0) {
this.evaluateSpec = res.data;
this.getAllEvalue();
}
})
},
async getAllEvalue({ type, load } = {}) {
let params = {
goods_id: this.id,
page: this.page,
}
if(type) Object.assign(params, { type: type });
const res = await this.$u.api.getAllEvalue(params);
if (res.errCode == 0) {
if(load) this.evalueList.push(...res.data);
else this.evalueList = res.data;
} else {
this.evalueList = [];
}
return res.data.length;
}
}
};
</script>
<style lang="scss" scoped>
.comment {
height: calc(100vh - var(--window-top));
background-color: #EEEBEE;
padding-bottom: 30rpx;
.label-list {
padding: 30rpx;
background-color: #ffffff;
margin-bottom: 14rpx;
display: flex;
flex-wrap: wrap;
> view {
box-sizing: content-box;
padding: 16rpx 20rpx;
border-radius: 30rpx;
margin: 0 20rpx 20rpx 0;
background: rgba(236,236,236,1);
font-size: 26rpx;
color: rgba(153,153,153,1);
}
.active {
background: rgba(255,120,15,1);
color: #ffffff;
}
}
.comment-container {
.itme {
padding: 30rpx;
background-color: #ffffff;
margin-bottom: 10rpx;
}
}
}
</style>

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

@@ -50,7 +50,7 @@ export default {
name:"guige",
data(){
return {
select:0
select: 0
}
},
props:['item','title'],

174
pageB/components/sdetails/tloos.vue
View File

@@ -1,6 +1,7 @@
<template>
<view>
<view class="tloos">
<!-- 普通商品 tool -->
<view class="tloos" v-if="type == 1">
<view class="navs">
<image src="/static/image/common/18.png"></image>
店铺
@@ -13,6 +14,28 @@
<view class="button" style="background:rgba(253,211,96,1);" @click="buy(2)">加入购物车</view>
<view class="button" style="background:rgba(255,120,15,1);" @click="buy(1)">立即购买</view>
</view>
<!-- 拼团 tool -->
<view class="group-tool" v-if="type==2">
<view class="launch" @click="settlementOrder">发起拼团</view>
<view class="involvement" @click="showGroupUser=true">参与拼团</view>
</view>
<!-- 秒杀 tool -->
<view class="spike-tool" v-if="type==3">
<view class="left">
<view>
<image src="/static/image/common/18.png"></image>
<text>店铺</text>
</view>
<view>
<image src="/static/image/common/19.png"></image>
<text>客服</text>
</view>
</view>
<view class="btn" v-if="groupbuyInfo.groupbuy_state == 20 && groupbuyInfo.inventory > groupbuyInfo.groupbuy_buy_quantity" @click="spikeGoods">立即秒杀</view>
<view class="btn" :class="{'cannot': groupbuyInfo.groupbuy_state == 32 || groupbuyInfo.inventory == groupbuyInfo.groupbuy_buy_quantity}" v-else>
{{ groupbuyInfo.groupbuy_state == 32 ? '时间已结束' : (groupbuyInfo.inventory > groupbuyInfo.groupbuy_buy_quantity ? '立即秒杀' : '已售空') }}
</view>
</view>
<u-popup v-model="show" mode="bottom">
<scroll-view scroll-y="true" class="popup">
<view>
@@ -40,9 +63,9 @@
import guige from "./guige"
export default {
name:"tloos",
props: ['id', 'info'],
props: ['id', 'info', 'type'],
components:{
guige
guige,
},
data(){
return {
@@ -107,6 +130,69 @@ export default {
}
</script>
<style lang="scss" scoped>
.group-tool {
position: fixed;
bottom: 0;
left: 0;
width: 100%;
height: 98rpx;
display: flex;
font-size: 32rpx;
color: rgba(255,255,255,1);
z-index: 99;
.launch {
flex: 1;
background: rgba(253,211,96,1);
line-height: 98rpx;
text-align: center;
}
.involvement {
flex: 1;
background: rgba(255,120,15,1);
line-height: 98rpx;
text-align: center;
}
}
.spike-tool {
position: fixed;
bottom: 0;
left: 0;
width: 100%;
height: 98rpx;
display: flex;
z-index: 99;
.left {
width: 190rpx;
display: flex;
align-items: center;
justify-content: space-around;
> view {
text-align: center;
> image {
width: 35rpx;
height: 35rpx;
margin-bottom: 15rpx;
}
> text {
display: block;
font-size: 24rpx;
color: rgba(102,102,102,1);
}
}
}
.btn {
flex: 1;
height: 98rpx;
line-height: 98rpx;
text-align: center;
font-size: 32rpx;
color: rgba(255,255,255,1);
background: rgba(255,120,15,1);
}
.cannot {
background: rgba(221,221,221,1);
}
}
.tloos{
background-color: #fff;
display: flex;
@@ -143,46 +229,46 @@ export default {
}
}
.popup{
padding: 30rpx;
box-sizing: border-box;
max-height: 750rpx;
.head{
display: flex;
margin-bottom: 30rpx;
.image{
width: 195rpx;
height: 195rpx;
border-radius: 10rpx;
flex-shrink: 0;
}
.info{
display: flex;
padding: 21rpx 0;
justify-content: space-between;
margin-left: 27rpx;
flex-direction: column;
>text:first-child{
font-size: 28rpx;
color: #333;
}
>text:last-child{
font-size: 30rpx;
color: #ff3131;
}
}
}
.popup{
padding: 30rpx;
box-sizing: border-box;
max-height: 750rpx;
.head{
display: flex;
margin-bottom: 30rpx;
.image{
width: 195rpx;
height: 195rpx;
border-radius: 10rpx;
flex-shrink: 0;
}
.info{
display: flex;
padding: 21rpx 0;
justify-content: space-between;
margin-left: 27rpx;
flex-direction: column;
>text:first-child{
font-size: 28rpx;
color: #333;
}
>text:last-child{
font-size: 30rpx;
color: #ff3131;
}
}
}
.num{
height: 84rpx;
display: flex;
border-bottom: #ececec solid 2rpx;
justify-content: space-between;
align-items: center;
>text{
font-size: 26rpx;
color: #666;
}
}
}
.num{
height: 84rpx;
display: flex;
border-bottom: #ececec solid 2rpx;
justify-content: space-between;
align-items: center;
>text{
font-size: 26rpx;
color: #666;
}
}
}
</style>

462
pageB/sdetails/index.vue
View File

@@ -1,7 +1,7 @@
<template>
<view class="sdetails">
<u-swiper :list="list" height="500" border-radius="0" mode="dot"></u-swiper>
<view class="spike-view" v-if="type==3">
<view class="spike-view" v-if="type == 3">
<view class="left">
<view class="price">
<view class="now-price">￥{{ groupbuyInfo.groupbuy_price }}</view>
@@ -9,10 +9,13 @@
</view>
<view class="num">剩余数量{{ groupbuyInfo.inventory - groupbuyInfo.groupbuy_buy_quantity }}件</view>
</view>
<view class="right">
<view class="right" v-if="!isSpike">
<view class="title">秒杀倒计时</view>
<view class="time">{{ spikeTime }}</view>
</view>
<view class="right" v-else>
<view class="title">时间已结束</view>
</view>
</view>
<view class="info">
<view class="title u-line-2">
@@ -25,10 +28,20 @@
</view>
<view class="hr"></view>
<!-- <navs :value="领券"></navs> -->
<navs :value="'产品规格'"></navs>
<navs :value="'产品规格'" @click.native="showSpec=true"></navs>
<!-- <navs :value="'产品颜色'"></navs> -->
<!-- <navs :value="'选择尺码'"></navs> -->
<!-- <navs v-for="(value, index) in goodsInfo.spec_name" :value="value" :key="index"></navs> -->
<view class="comment">
<view class="title">
<view class="left">商品评价（{{ evaluate.evaluate_num }}）</view>
<view class="right" @click="viewComment">
<text>查看全部</text>
<image src="/static/image/common/1.png"></image>
</view>
</view>
<comment :reply="false" :content="evaluate" v-if="evaluate.evaluate_num"></comment>
<view class="comment-none">暂无评价</view>
</view>
<view class="hr"></view>
<view class="group-user" v-if="groupUser.length">
<view class="top">
@@ -39,7 +52,7 @@
</view>
</view>
<view class="bottom">
<view class="left" @click="showGroupUser=true">
<view class="left" @click="showGroupUser=true" v-if="user_suc.length">
<view class="avatar">
<image v-for="(user, i) in user_suc" :src="user[0].member_avatar" :key="i"></image>
</view>
@@ -62,7 +75,7 @@
</view>
</view>
</view>
<u-popup v-model="showGroupUser" mode="center">
<u-popup v-model="showGroupUser" mode="center" z-index="10078">
<view class="launch-container">
<view class="title u-line-1">正在拼团</view>
<scroll-view class="launch-view">
@@ -71,6 +84,7 @@
<image class="avatar" :src="user[0].member_avatar"></image>
<view class="name u-line-1">{{ user[0].member_nickname }}</view>
</view>
<view class="pintuan-none" v-if="!groupUser.length">暂无拼团</view>
</view>
</scroll-view>
<image class="close" src="/static/image/common/17.png" @click="showGroupUser=false"></image>
@@ -97,12 +111,47 @@
<view class="rich">
<rich-text :nodes="goodsInfo.mobile_body"></rich-text>
</view>
<!-- 选择规格数量 -->
<u-popup v-model="showSpec" mode="bottom">
<scroll-view scroll-y="true" class="spec-popup">
<view>
<view class="head">
<image class="image" :src="goodsInfo.goods_image"></image>
<view class="info">
<text class="u-line-2">{{goodsInfo.goods_name}}</text>
<text>￥{{goodsInfo.goods_price}}</text>
</view>
</view>
<guige @sel="self" ref="guige" v-for="(item,index) in goodsInfo.spec_value" :key="index" :title="goodsInfo.spec_name[index]" :item="item"></guige>
<view class="num">
<text>购买数量</text>
<u-number-box v-model="goodsNumber" @change="valChange"></u-number-box>
</view>
<view style="height:100rpx"></view>
</view>
<u-toast ref="uToast" />
</scroll-view>
</u-popup>
<!-- 普通商品 tool -->
<view class="tloos" v-if="type == 1">
<view class="navs">
<image src="/static/image/common/18.png"></image>
店铺
</view>
<view class="navs" style="margin-right:30rpx">
<image src="/static/image/common/19.png"></image>
客服
</view>
<view class="button" style="background:rgba(253,211,96,0.6);" v-if="goodsInfo.goods_try == 1" @click="tryDress">试穿试送</view>
<view class="button" style="background:rgba(253,211,96,1);" @click="addCart">加入购物车</view>
<view class="button" style="background:rgba(255,120,15,1);" @click="settlementOrder">立即购买</view>
</view>
<!-- 拼团 tool -->
<view class="group-tool" v-if="type==2">
<view class="launch" @click="settlementOrder">发起拼团</view>
<view class="involvement" @click="showGroupUser=true">参与拼团</view>
</view>
<!-- 秒杀 -->
<!-- 秒杀 tool -->
<view class="spike-tool" v-if="type==3">
<view class="left">
<view>
@@ -119,99 +168,115 @@
{{ groupbuyInfo.groupbuy_state == 32 ? '时间已结束' : (groupbuyInfo.inventory > groupbuyInfo.groupbuy_buy_quantity ? '立即秒杀' : '已售空') }}
</view>
</view>
<!-- 普通商品 tool -->
<tloos @buy="buy" @xuanze="xuanze" :id="goodsInfo.goods_commonid" :info="goodsInfo" v-if="type==1"></tloos>
<!-- <tloos @buy="buy" @xuanze="xuanze" :id="id" :info="goodsInfo" :type="type"></tloos> -->
<u-toast ref="uToast" />
</view>
</template>
<script>
/*
* 详情是请求完存在store的，在这里从store取值
**/
import navs from "../components/sdetails/navs"
import tloos from "../components/sdetails/tloos"
import comment from "@/components/comment/index";
import navs from "../components/sdetails/navs";
import guige from "../components/sdetails/guige"
import tloos from "../components/sdetails/tloos";
export default {
name:"sdetails",
name: "sdetails",
data() {
return {
list: [],　// 轮播图列表
goodsInfo: {},
info:{},
glist:[],
id:0, // 商品id
goodsInfo: {}, // 商品信息
glist: [], // 规格列表
id: 0, // 商品id/秒杀id/拼团 id
type: '', // 商品类型 商品详情 1普通 2拼团 3秒杀 4优惠券
groupUser: [], // 拼团用户
user_suc: [], // 拼团成功用户
avatarWidth: '',
pintuan_id: '', // 拼团id
showGroupUser: false, // 拼团
showInvolvementUser: false, // 参团
involvemenGroupInfo: [], // 参团的人
groupbuyInfo: {}, // 秒杀详情
spikeTime: '',
timer: '', // 时间定时器
isSpike: false, // 是否超过秒杀时间
timer: '', // 秒杀时间定时器
spec_id: '', // 规格 id, 下单用的
evaluate: {}, // 评价内容
showSpec: false, // 是否显示选择规格
goodsNumber: 1,
sel: "", // 拼接的规格
quanxuan: false, // 规格是否选择
}
},
components:{
components: {
comment,
navs,
tloos
tloos,
guige,
},
watch: {
sel(value){
this.xuanze(value);
},
},
onLoad(option) {
// this.init();
// console.log(option);
this.type = Number(option.type);
this.id = option.id;
this.getGoodsDetails(this.id);
this.setTitle();
},
onShow() {
// if(this.pintuan_id) {
// this.$u.api.getPinTuanDetails({
// pintuan_id: this.pintuan_id
// }).then(res => {
// if(res.errCode == 0) {
// const goods = {
// goods: res.data.data,
// type: 2,
// }
// this.$store.commit('setGoodsDetails', goods);
// this.$store.commit('setGoodsId', this.pintuan_id);
// }
// })
// }
},
onLoad() {
this.init();
this.showSpec = false;
this.showGroupUser = false;
this.showInvolvementUser = false;
},
beforeDestroy() {
clearInterval(this.timer);
},
methods: {
init() {
this.id = this.$store.state.goods_id;
this.type = this.$store.getters.getGoodsType;
const info = this.$store.getters.getGoodsInfo;
if(this.type == 2) {
this.user_suc = info.user_suc;
this.groupUser = info.user;
this.pintuan_id = info.pintuan_id;
}
if (this.type == 3) {
this.groupbuyInfo = this.$store.state.groupbuyInfo;
this.setSpikeTime();
}
// console.log(this.groupbuyInfo);
this.goodsInfo = info.goods;
// 设置轮播图
let list = [];
info.goods_image[0].forEach(item => {
// init() {
// this.id = this.$store.state.goods_id;
// this.type = this.$store.getters.getGoodsType;
// const info = this.$store.getters.getGoodsInfo;
// // 拼团商品
// if(this.type == 2) {
// this.user_suc = info.user_suc;
// this.groupUser = info.user;
// this.pintuan_id = info.pintuan_id;
// }
// // 秒杀商品
// if (this.type == 3) {
// this.groupbuyInfo = this.$store.state.groupbuyInfo;
// this.setSpikeTime();
// }
// // console.log(this.groupbuyInfo);
// this.goodsInfo = info.goods;
// // 设置轮播图
// let list = [];
// info.goods_image[0].forEach(item => {
// let temp = {
// image: item
// }
// list.push(temp);
// })
// this.list = list;
// this.setTitle();
// },
setSwiperList(list) {
let img = [];
list.forEach(item => {
let temp = {
image: item
}
list.push(temp);
img.push(temp);
})
this.list = list;
this.setTitle();
this.list = img;
},
spikeGoods() {
this.settlementOrder()
},
setSpikeTime() {
const time = this.groupbuyInfo.groupbuy_endtime;
setSpikeTime(time) {
// const time = this.groupbuyInfo.groupbuy_endtime;
this.timer = setInterval(() => {
let spikeTime = time * 1000 - new Date().getTime();
if(spikeTime <= 0) this.isSpike = true;
// 计算天数
const days = Math.floor(spikeTime/(24*3600*1000));
//计算出小时数
@@ -229,61 +294,111 @@ export default {
// console.log(this.spikeTime);
}, 1000)
},
buy(info){
if(info.type == 2){ // 加入购物车
this.$u.api.addCart({
goods_id: this.id,
quantity: info.value,
}).then(res => {
this.$refs.uToast.show({
title: res.message,
type: res.errCode == 0 ? 'success' : 'warning',
})
})
} else if (info.type == 1) { // 支付
this.settlementOrder({num: info.value});
}
},
addCart() {
this.$u.api.addCart({
goods_id: this.id,
quantity: this.goodsNumber,
}).then(res => {
this.$refs.uToast.show({
title: res.message,
type: res.errCode == 0 ? 'success' : 'warning',
})
})
},
purchase() {
this.settlementOrder();
},
getGoodsDetails(id) {
this.id = id;
switch (this.type) {
case 1:
this.ordinaryDetails(id);
break;
case 2:
this.pinTuanDetails(id);
break;
case 3:
this.spikeGoodsDetails(id);
break;
case 4:
break;
default:
break;
}
},
// 普通商品
ordinaryDetails(id) {
this.$u.api.getGoodsDetails({ id: id }).then((res)=>{
if (res.errCode == 0) {
this.evaluate = res.data.goods_evaluate_info;
this.goodsInfo = res.data.goods;
let list = [];
res.data.goods_image[0].forEach(item => {
let temp = {
image: item
}
list.push(temp);
})
this.list = list;
this.info = res.data.goods;
this.setSwiperList(res.data.goods_image[0]);
this.glist = res.data.spec_list;
// console.log(this.goodsInfo.mobile_body);
}
})
},
// 下单
// 拼团
pinTuanDetails(id) {
this.$u.api.getPinTuanDetails({
pintuan_id: id
}).then(res => {
if(res.errCode == 0) {
this.evaluate = res.data.data.goods_evaluate_info;
this.goodsInfo = res.data.data.goods;
this.setSwiperList(res.data.data.goods_image[0]);
this.glist = res.data.data.spec_list;
this.user_suc = res.data.data.user_suc;
this.groupUser =res.data.data.user;
}
})
},
// 秒杀
spikeGoodsDetails(id) {
this.$u.api.getSpikeInfo({
groupbuy_id: id
}).then(res => {
if(res.errCode == 0) {
this.groupbuyInfo = res.data.groupbuyInfo;
this.evaluate = res.data.goodsInfo.goods_evaluate_info;
this.goodsInfo = res.data.goodsInfo.goods;
this.setSwiperList(res.data.goodsInfo.goods_image[0]);
this.setSpikeTime(res.data.groupbuyInfo.groupbuy_endtime);
}
})
},
// 试穿
tryDress() {
this.$u.route({
url: '/pageB/triedDress/index',
params: {
id: this.id,
}
})
},
/*
* @description 下单 订单步骤1：展示结算数据
* @params {Number} type 拼团或者开团
* @params {Number} num 数量
* @params {Number} ifcart 结算方式 1:购物车 0:直接结算（立即购买/拼团/秒杀）
**/
settlementOrder({type, num = 1} = {}) {
// ifcart 结算方式 1:购物车 0:直接结算（立即购买/拼团/秒杀）
settlementOrder({type, num = this.goodsNumber, ifcart = 0} = {}) {
let params = {
ifcart: 0,
ifcart: ifcart,
cart_id: [this.goodsInfo.goods_id + '|' + num],
}
if(this.type == 2) {
if(type == 'involvement') {
Object.assign(params, {
pintuan_id: this.pintuan_id,
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.pintuan_id,
pintuan_id: this.id,
})
}
}
@@ -297,16 +412,42 @@ export default {
}
})
},
// 参团
involvemenGroup(user) {
this.involvemenGroupInfo = user;
this.showGroupUser = false;
this.showInvolvementUser = true;
// console.log(this.involvemenGroupInfo);
},
valChange(e) {
// console.log(this.value)
},
self(){
// console.log(this.$refs.guige)
let index = 0;
let arr = [];
for(let i in this.goodsInfo.spec_value){
// console.log(i)
// console.log(this.$refs.guige[index++].select)
// index++;
let sel = this.$refs.guige[index++].select
if(sel != 0){
arr.push(sel)
}
}
// console.log(arr.length)
if(arr.length == index){
this.sel = arr.join("|")
this.quanxuan = true
// console.log(this.sel)
}
},
xuanze(id){
console.log(id)
// this.getGoodsDetails(this.glist[id])
// console.log(id)
this.getGoodsDetails(this.glist[id])
this.id = this.glist[id];
},
// 设置页面标题
setTitle() {
let title = '';
switch (this.type) {
@@ -329,6 +470,14 @@ export default {
title: title
});
},
viewComment() {
this.$u.route({
url: 'pageB/comment/index',
params: {
id: this.goodsInfo.goods_id
}
})
}
},
}
</script>
@@ -336,6 +485,7 @@ export default {
.sdetails {
padding-bottom: 98rpx;
position: relative;
background-color: #EEEBEE;
.spike-view {
position: absolute;
top: 396rpx;
@@ -397,7 +547,9 @@ export default {
}
}
.info {
background:rgba(255,255,255,1);
padding: 30rpx;
margin-bottom: 20rpx;
.title{
flex-wrap: wrap;
margin-bottom: 30rpx;
@@ -424,12 +576,42 @@ export default {
}
}
}
.comment {
margin-top: 20rpx;
background:rgba(255,255,255,1);
padding: 30rpx;
.title {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 30rpx;
.left {
font-size: 30rpx;
color: rgba(51,51,51,1);
}
.right {
font-size: 24rpx;
color: rgba(153,153,153,1);
> image {
width: 8rpx;
height: 16rpx;
margin-left: 10rpx;
}
}
}
.comment-none {
font-size: 26rpx;
text-align: center;
margin-top: 30rpx;
}
}
.hr {
width: 100%;
height: 20rpx;
background-color: #ececec;
}
.group-user {
background: rgba(255,255,255,1);
padding: 30rpx;
.top {
margin-bottom: 28rpx;
@@ -580,6 +762,11 @@ export default {
margin-right: 80rpx;
}
}
.pintuan-none {
font-size: 36rpx;
color: #333;
margin: 100rpx auto 0;
}
}
}
@@ -685,7 +872,7 @@ export default {
display: flex;
font-size: 32rpx;
color: rgba(255,255,255,1);
z-index: 99;
z-index: 10076;
.launch {
flex: 1;
background: rgba(253,211,96,1);
@@ -706,7 +893,7 @@ export default {
width: 100%;
height: 98rpx;
display: flex;
z-index: 99;
z-index: 10076;
.left {
width: 190rpx;
display: flex;
@@ -739,5 +926,82 @@ export default {
background: rgba(221,221,221,1);
}
}
.tloos{
background-color: #fff;
display: flex;
position: fixed;
height: 98rpx;
width: 100%;
bottom:0;
border-top: 1rpx solid #ececec;
z-index: 10076;
.navs{
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: 24rpx;
color: #666;
flex-shrink: 0;
margin-left: 30rpx;
>image{
width: 35rpx;
height: 35rpx;
margin-bottom: 15rpx;
}
}
.button{
width: 100%;
height: 100%;
line-height: 98rpx;
text-align: center;
color: #fff;
}
}
.spec-popup {
padding: 30rpx;
box-sizing: border-box;
max-height: 750rpx;
.head{
display: flex;
margin-bottom: 30rpx;
.image{
width: 195rpx;
height: 195rpx;
border-radius: 10rpx;
flex-shrink: 0;
}
.info{
display: flex;
padding: 21rpx 0;
justify-content: space-between;
margin-left: 27rpx;
flex-direction: column;
>text:first-child{
font-size: 28rpx;
color: #333;
}
>text:last-child{
font-size: 30rpx;
color: #ff3131;
}
}
}
.num{
height: 84rpx;
display: flex;
border-bottom: #ececec solid 2rpx;
justify-content: space-between;
align-items: center;
>text{
font-size: 26rpx;
color: #666;
}
}
}
}
</style>

52
pageB/search/index.vue
View File

@@ -1,19 +1,9 @@
<template>
<view class="search">
<view class="sosuo">
<image></image>
<u-search placeholder="搜索您需要的商品" v-model="keyword" height="60" :action-style="{
'font-size':'32rpx',
'color':'#FF780F',
'overflow':'unset'
}"
@search="search"
></u-search>
</view>
<view class="list">
<view class="title">搜索发现</view>
<view class="label">
<text>这是标签</text>
<text v-for="(label, index) in searchwordlist" :key="index" @click="search(label.word)">{{ label.word }}</text>
</view>
</view>
</view>
@@ -23,17 +13,40 @@ export default {
name:"search",
data(){
return{
keyword:""
keyword: "",
searchwordlist: [],
}
},
},
created() {
this.getWordList();
},
// 点击搜索按钮
onNavigationBarButtonTap(e) {
if(e.index == 0) this.search(this.keyword);
},
// 输入框文本变化
onNavigationBarSearchInputChanged(e) {
this.keyword = e.text;
},
// 点击键盘搜索按钮
onNavigationBarSearchInputConfirmed(value) {
this.search(this.keyword);
},
methods:{
getWordList() {
this.$u.api.searchwordlist().then(res => {
this.searchwordlist = res.data;
})
},
search(value){
// console.log(value)
// console.log(value)
if(!value) this.$u.toast('搜索内容不可为空');
this.$u.route({
url:"/pageB/search/out",
params:{
value,
type:"shop"
url: "/pageB/search/out",
params: {
value: value,
type: "shop",
order: 'goods_salenum'
}
})
}
@@ -67,7 +80,8 @@ export default {
}
.label{
display: flex;
>text{
flex-wrap: wrap;
> text {
margin-top: 20rpx;
margin-right: 30rpx;
font-size: 26rpx;

29
pageB/search/out.vue
View File

@@ -1,11 +1,7 @@
<template>
<view class="out">
<view class="sosuo">
<image></image>
<u-search placeholder="搜索您需要的商品" v-model="keyword" height="60" :show-action="false"></u-search>
</view>
<u-tabs-swiper v-if="type == 'dianpu'" @change="tabsChange" :show-bar="false" :bold="false" :font-size="32" active-color="#FF780F" ref="uTabs" :list="list" :is-scroll="false" style="border-bottom: 1px solid #ececec;flex-shrink:0" height="88"></u-tabs-swiper>
<swiper v-if="type == 'dianpu'" class="swiper" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish">
<swiper v-if="type == 'dianpu'" class="swiper" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish">
<swiper-item>
<scroll-view :scroll-y="true" style="height:100%">
<view style="padding-top:30rpx">
@@ -16,29 +12,28 @@
<swiper-item>
<scroll-view :scroll-y="true" style="height:100%">
<view class="list">
<darenItem style="margin-top:20rpx;margin-right:23rpx;box-shadow:0rpx 3rpx 7rpx 0rpx rgba(153, 153, 153, 0.35);" v-for="item in 50"></darenItem>
<!-- <darenItem style="margin-top:20rpx;margin-right:23rpx;box-shadow:0rpx 3rpx 7rpx 0rpx rgba(153, 153, 153, 0.35);" v-for="item in 50"></darenItem> -->
</view>
</scroll-view>
</swiper-item>
</swiper>
<view v-else style=" display: flex;flex-direction: column;height: calc(100vh - 88rpx);">
<view class="select">
<view @click="sx(0)" data-type="xl">销量</view>
<view @click="sx(0)" class="xz" data-type="xl">销量</view>
<view class="xz" @click="sx(1)">
<text>价格</text>
<view class="jiage">
<view class="top"></view>
<view class="top topxz"></view>
<view class="bottom bottomxz"></view>
</view>
</view>
<view data-type="hp" @click="sx(2)">好评</view>
<view data-type="hp" @click="sx(2)">好评</view>
</view>
<swiper class="swiper" :current="swiperCurrent" @change="huadong">
<swiper class="swiper" :current="swiperCurrent" @change="huadong">
<swiper-item>
<scroll-view :scroll-y="true" style="height:100%">
<view style="padding-top:30rpx">
<shop v-for="(i,j) in shoplist[0]" :key="j" :name="i.goods_name" :id="i.goods_id" :commonid="i.goods_commonid" :image="i.goods_image"></shop>
</view>
</scroll-view>
</swiper-item>
@@ -56,8 +51,6 @@
</swiper-item>
</swiper>
</view>
</view>
</template>
<style lang="scss" scoped>
@@ -162,6 +155,11 @@ export default {
shoplist:[]
}
},
onLoad(o){
this.type = o.type
this.keyword = o.value
this.search()
},
methods: {
tabsChange(index) {
this.swiperCurrent = index;
@@ -189,10 +187,5 @@ export default {
})
}
},
onLoad(o){
this.type = o.type
this.keyword = o.value
this.search()
}
}
</script>

260
pageB/triedDress/index.vue Normal file
View File

@@ -0,0 +1,260 @@
<template>
<view class="tried">
<view class="user-info">
<view>
<label for="name">试穿人:</label>
<input type="text" id="name" placeholder="" v-model="name" />
</view>
<view>
<label for="phone">手机号:</label>
<input type="text" id="phone" placeholder="" maxlength="11" v-model="phone" />
</view>
<view class="area" @click="show=true">
<label for="address">省市区:</label>
<input type="text" id="address" placeholder="" v-model="address" disabled />
<view>
<image src="/static/image/mine/24.png"></image>
<text>定位</text>
</view>
</view>
<view>
<label for="area">详细地址:</label>
<input type="text" id="area" placeholder="" v-model="area" />
</view>
<view>
<label for="time">预约时间:</label>
<input type="text" id="time" placeholder="" v-model="time" />
</view>
</view>
<view class="goods-container">
<view class="store">
<image :src="store.store_avatar"></image>
<text>{{ store.store_name }}</text>
</view>
<view class="goods">
<image :src="goodsInfo.goods_image"></image>
<view class="right">
<view class="name u-line-2">{{ goodsInfo.goods_name }}</view>
<u-number-box v-model="number" bg-color="#FFFFFF" :min="1" :input-width="38" :input-height="38" color="#FF780F"></u-number-box>
</view>
</view>
</view>
<view class="edit-btn" @click="confirmBtn">确认试穿</view>
<u-select v-model="show"
mode="mutil-column-auto"
:list="areaList"
value-name="area_id"
label-name="area_name"
child-name="_child"
@confirm="setArea">
</u-select>
<u-toast ref="uToast" />
</view>
</template>
<script>
export default {
data() {
return {
show: false,
areaList: [],
checked: false, // 是否设为默认地址
name: '',
phone: '',
address: '', // 选择地址
area: '', // 详细地址
time: '',
number: 1, // 商品数量
area_id: '', // 地区id 省
city_id: '', // 城市id
goodsInfo: {},
store: {},
}
},
mounted() {
this.getAreaData();
},
onLoad(option) {
this.ordinaryDetails(option.id);
},
methods: {
verification() {
if(this.$u.test.isEmpty(this.name)) {
this.$u.toast('姓名不可为空');
return false;
}
if(this.$u.test.isEmpty(this.phone)) {
this.$u.toast('手机号不可为空');
return false;
}
if(!this.$u.test.mobile(this.phone)) {
this.$u.toast('请填写正确的新手机号');
return false;
}
if(this.$u.test.isEmpty(this.address)) {
this.$u.toast('地址不可为空');
return false;
}
if(this.$u.test.isEmpty(this.area)) {
this.$u.toast('详细地址不可为空');
return false;
}
return true;
},
confirmBtn() {
if(!this.verification) return false;
this.$u.api.saveGoodsTry({
member_name: this.name,
member_mobile: this.phone,
area_info: this.address,
address_detail: this.area,
goods_id: this.goodsInfo.goods_id,
num: this.number,
store_id: this.store.store_id,
}).then((res)=>{
this.$u.toast(res.message);
if (res.errCode == 0) {
// this.$u.route({ type: 'navigateBack' });
}
})
},
getAreaData() {
this.$u.api.getArea().then((res)=>{
if (res.errCode == 0) {
this.areaList = res.data;
}
})
},
setArea(area) {
// console.log(area);
this.area_id = area[0].value;
this.city_id = area[1].value;
let temp = '';
area.forEach(e => {
temp += e.label + ' ';
});
this.address = temp;
},
ordinaryDetails(id) {
this.$u.api.getGoodsDetails({ id: id }).then((res)=>{
if (res.errCode == 0) {
this.goodsInfo = res.data.goods;
this.store = res.data.store;
}
})
},
}
};
</script>
<style lang="scss" scoped>
.tried {
.user-info {
border-top: 1rpx solid rgba(235,235,235,1);
> view {
display: flex;
align-items: center;
height: 98rpx;
padding: 30rpx;
border-bottom: 2rpx solid rgba(235,235,235,1);
font-size: 30rpx;
> label {
width: 150rpx;
margin-right: 20rpx;
}
> input {
flex: 1;
outline: none;
}
}
.area {
padding: 0 30rpx;
display: flex;
> input {
padding: 30rpx 0;
flex: 1;
}
> view {
margin-left: 30rpx;
width: 50rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: 22rpx;
color: rgba(255,120,15,1);
> image {
width: 26rpx;
height: 32rpx;
margin-bottom: 10rpx;
}
}
}
}
.goods-container {
padding: 30rpx;
.store {
display: flex;
align-items: center;
margin-bottom: 20rpx;
> image {
width: 60rpx;
height: 60rpx;
border-radius: 50%;
margin-right: 16rpx;
background-color: antiquewhite;
}
> text {
font-size: 28rpx;
color: rgba(51,51,51,1);
}
}
.goods {
display: flex;
> image {
width: 180rpx;
height: 160rpx;
border-radius: 10rpx;
margin-right: 30rpx;
background-color: aquamarine;
}
.right {
flex: 1;
.name {
font-size: 30rpx;
color: rgba(51,51,51,1);
line-height: 44rpx;
margin-bottom: 30rpx;
}
/deep/ .u-numberbox {
border: 1rpx solid rgba(217,215,215,1);
.u-icon-minus, .u-icon-plus {
width: 38rpx;
.u-icon {
.u-icon__icon {
font-size: 11rpx;
}
}
}
.u-number-input {
margin: 0;
border: 1rpx solid rgba(229,229,229,1) {
top: 0;
bottom: 0;
};
}
}
}
}
}
.edit-btn {
margin: 122rpx auto 0;
width: 690rpx;
height: 98rpx;
background: rgba(255,119,15,1);
border-radius: 49rpx;
font-size: 36rpx;
color:rgba(255,255,255,1);
line-height: 98rpx;
text-align: center;
}
}
</style>

38
pageB/zhibo/index.vue Normal file
View File

@@ -0,0 +1,38 @@
<template>
<view>
<video :src="url" class="vodio" autoplay="true">
</video>
<!-- <view class="user">
<view class="back"></view>
<image></image>
<view>
<text class="name">萨和登</text>
<text class="info">萨大赛大赛大赛大赛大</text>
</view>
<view class="guanzhu">
关注
</view >
</view> -->
</view>
</template>
<style lang="scss" scoped>
.vodio{
width: 100vw;
height: 100vh;
}
</style>
<script>
export default {
name:"zhibo",
data(){
return {
url:""
}
},
onLoad(a){
this.url = a.url
console.log(this.url)
}
}
</script>

23
pageC/cart/ConfirmOrder.vue
View File

@@ -68,13 +68,13 @@
<u-popup v-model="couponStatus" mode="bottom">
<scroll-view class="coupon-choose" scroll-y style="height: 800rpx;" v-if="this.couponType.type == 1">
<view class="title">优惠券详情</view>
<view class="text">店铺优惠券</view>
<view class="text">平台优惠券</view>
<Coupon :couponInfo="coupon" @use="useCoupon($event)" :goodsClass="goodsClass" v-for="(coupon, index) in orderInfo.store_voucher_all_list" :key="index"></Coupon>
<u-empty text="无可用优惠券" mode="coupon" v-if="!orderInfo.store_voucher_all_list.length"></u-empty>
</scroll-view>
<scroll-view class="coupon-choose" scroll-y style="height: 800rpx;" v-if="this.couponType.type == 2">
<view class="title">优惠券详情</view>
<view class="text">平台优惠券</view>
<view class="text">店铺优惠券</view>
<Coupon :couponInfo="coupon" @use="useCoupon($event)" :goodsClass="goodsClass" v-for="(coupon, index) in orderInfo.store_voucher_list[this.couponType.store_id]" :key="index"></Coupon>
<u-empty text="无可用优惠券" mode="coupon" v-if="!orderInfo.store_voucher_list[this.couponType.store_id].length"></u-empty>
</scroll-view>
@@ -121,7 +121,6 @@ export default {
choiceCoupon: {}, // 使用的平台优惠券
goodsClass: [],
orderType: '', // 订单类型 1 普通订单 2 拼团订单 3 秒杀订单 4 优惠券 5 购物车订单
}
},
components: {
@@ -147,11 +146,13 @@ export default {
onLoad(option) {
this.orderType = this.$store.state.orderType;
this.orderInfo = this.$store.state.orderInfo;
console.log(this.orderType);
// console.log(this.orderType);
console.log(this.orderInfo);
this.getGoodsClass();
},
onShow() {
this.storeCoupon = {};
this.choiceCoupon = {};
// 判断是不是从选择地址页面返回
if(JSON.stringify(this.$store.state.orderAddress) == '{}') {
this.$store.commit('updateAddress', this.orderInfo.address_info);
@@ -205,9 +206,14 @@ export default {
})
},
intermediate() {
if(this.orderType == 2) this.withImmediate();
if(this.orderType == 2) {
this.withImmediate();
} else if(this.orderType == 1) {
this.sendOrder(0);
}
else this.sendOrder(1);
},
// @params {Number} ifcart 是否是购物车商品
sendOrder(ifcart) {
// 拼接后端需要的数据形式
let id = [], temp = '';
@@ -241,16 +247,17 @@ export default {
cart_id: id,
address_id: this.addressInfo.address_id,
buy_city_id: this.addressInfo.city_id,
voucher_id: coupon,
}
if(coupon.length) Object.assign(params, { voucher_id: coupon });
if(this.orderType == 2) {
Object.assign(params, { pintuan_id: this.orderInfo.pintuan_id })
if(this.orderInfo.pintuangroup_id) Object.assign(params, { pintuangroup_id: this.orderInfo.pintuangroup_id })
Object.assign(params, { pintuan_id: this.orderInfo.pintuan_id });
if(this.orderInfo.pintuangroup_id) Object.assign(params, { pintuangroup_id: this.orderInfo.pintuangroup_id });
}
// console.log(params);
this.$u.api.sendOrder(params).then(res => {
if(res.errCode == 0) {
this.$u.route({
type: 'redirect',
url: '/pageC/cart/cashier',
params: {
pay_sn: res.data.pay_sn,

34
pageC/cart/cashier.vue
View File

@@ -54,24 +54,10 @@ export default {
// getProvider() {
// uni.getProvider({service: 'payment'})
// },
// 支付宝支付
payByAlipay (orderInfo) {
payOrder(provider, orderInfo) {
uni.requestPayment({
provider: 'alipay',
orderInfo: orderInfo, //支付宝订单数据
success: function (res) {
console.log('success:' + JSON.stringify(res));
},
fail: function (err) {
console.log('fail:' + JSON.stringify(err));
}
});
},
// 微信支付
payByWxpay (orderInfo) {
uni.requestPayment({
provider: 'wxpay',
orderInfo: orderInfo, //微信订单数据
provider: provider,
orderInfo: orderInfo, //订单数据
success: function (res) {
console.log('success:' + JSON.stringify(res));
},
@@ -86,11 +72,15 @@ export default {
payment_code: this.pay_way,
}).then(res => {
if(res.errCode == 0) {
// this.$u.toast(res.message);
// uni.navigateBack();
const orderInfo = JSON.parse(res.data.content);
console.log(orderInfo);
this.pay_way == 'wxpay_app' ? this.payByWxpay(orderInfo) : this.payByAlipay(orderInfo);
let orderInfo, provider;
if(res.data.payment_code == 'wxpay_app') {
provider = 'wxpay';
orderInfo = JSON.parse(res.data.content);
} else if(res.data.payment_code == 'alipay_app') {
provider = 'alipay';
orderInfo = res.data.content;
}
this.payOrder(provider, orderInfo);
}
})
}

33
pageC/groupBuy/index.vue
View File

@@ -7,7 +7,7 @@
<swiper-item class="swiper-item" v-for="(_, index) in tabList" :key="index">
<scroll-view scroll-y style="height: 800rpx;width: 100%;" @scrolltolower="onreachBottom">
<SpecialGoods v-for="(item, index) in pinTuanList" :key="index" :item="item" type='group'></SpecialGoods>
<!-- <loadmore ref="loadmore" @callback="getPinTuanList" bgColor="#FFF"></loadmore> -->
<loadmore ref="loadmore" @callback="getPinTuanList" bgColor="#FFF"></loadmore>
<u-empty text="暂无商品" mode="list" color="#000" v-if="!pinTuanList.length"></u-empty>
</scroll-view>
</swiper-item>
@@ -39,8 +39,7 @@ export default {
},
watch: {
current(index) {
// console.log(this.tabList);
this.getPinTuanList({id: this.tabList[index].gc_id });
this.getPinTuanList({ id: this.tabList[index].gc_id });
}
},
methods: {
@@ -81,20 +80,20 @@ export default {
// scroll-view到底部加载更多
onreachBottom() {
this.$$refs.loadmore.reachBottom();
// if(!this.timer) return false;
// this.loadStatus = "loading";
// this.page++;
// this.getPinTuanList().then(length => {
// if(length == 0) {
// this.page--;
// this.status = 'nomore';
// } else {
// this.status = 'loading';
// }
// }).catch(() => {
// this.loadStatus = "nomore";
// this.page--;
// })
if(!this.timer) return false;
this.loadStatus = "loading";
this.page++;
this.getPinTuanList().then(length => {
if(length == 0) {
this.page--;
this.status = 'nomore';
} else {
this.status = 'loading';
}
}).catch(() => {
this.loadStatus = "nomore";
this.page--;
})
},
setViewHeight() {
const res = uni.getSystemInfoSync();

1
pageE/mine/EditUserInfo.vue
View File

@@ -117,6 +117,7 @@ export default {
}).then(res => {
if (res.errCode == 0) {
this.getUserInfo();
this.$u.toast(res.message);
}
})
},

16
pageE/mine/MedalIntroduction.vue
View File

@@ -13,11 +13,25 @@
</view>
</template>
<script>
import common from '@/static/js/common.js';
export default {
data() {
return {
nodes: '<h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1><h1>2</h1>'
nodes: '',
}
},
created() {
this.getMemberPointsStat();
},
methods: {
getMemberPointsStat() {
this.$u.api.getMemberPointsStat().then((res)=>{
if (res.errCode == 0) {
const nodes = res.data.grade_rule;
this.nodes = common.unescapeHTML(nodes);
}
})
},
}
};
</script>

23
pageE/mine/MemberServeCoupon.vue
View File

@@ -34,6 +34,8 @@ export default {
couponGroupList: [],
couponList: [],
page: 0,
loadStatus: 'loadmore',
timer: true,
}
},
components: {
@@ -50,6 +52,27 @@ export default {
}
},
methods: {
loadMore(page) {
if(!this.timer) return false;
this.loadStatus = "loading";
this.page++;
this.getGoodsRecommend({
gc_id: this.classifyList[this.current].gc_id,
page: this.page,
reload: false,
}).then(length => {
// console.log(length);
if(length == 0) {
this.page--;
this.loadStatus = 'nomore';
} else {
this.loadStatus = 'loading';
}
}).catch(() => {
this.loadStatus = "nomore";
this.page--;
})
},
getGoodsClass() {
this.$u.api.getGoodsClass().then(res => {
if(res.errCode == 0) {

45
pageE/mine/MineProgress.vue
View File

@@ -1,16 +1,16 @@
<template>
<view class="progress">
<view class="progress" v-if="memberInfo">
<view class="header">
<view class="line-progress">
<view class="rank-value">lv1</view>
<view class="rank-value">lv{{ memberInfo.member_level }}</view>
<view class="line-box">
<u-line-progress :percent="70" :show-percent="false" inactive-color="#FFFFFF" active-color="#F1A36B" height="30"></u-line-progress>
<text>78/99</text>
<u-line-progress :percent="percent" :show-percent="false" inactive-color="#FFFFFF" active-color="#F1A36B" height="30" :striped="true" :striped-active="true"></u-line-progress>
<text>{{ memberInfo.member_exppoints | percentExp(rank[memberInfo.member_level - 1])}}</text>
</view>
<view class="rank-value">lv2</view>
<view class="rank-value">lv{{ memberInfo.member_level + 1 }}</view>
</view>
<view class="exp-value">经验值<span>78</span></view>
<view class="distance">距离下一级还需要21经验值</view>
<view class="exp-value">经验值<span>{{ memberInfo.member_exppoints }}</span></view>
<view class="distance">距离下一级还需要{{ memberInfo.member_exppoints | residualExp(rank[memberInfo.member_level - 1]) }}经验值</view>
</view>
<view class="body">
<view class="title">
@@ -66,8 +66,37 @@ export default {
min: 5000,
max: '--',
}
]
],
percent: 0,
memberInfo: {},
}
},
filters: {
percentExp(value, rank) {
// console.log(rank);
let result = '0/0';
if(rank) result = value + '/' + rank.max;
return result;
},
residualExp(value, rank) {
let result = 0;
if(rank) result = rank.max - value;
return result;
}
},
onShow() {
this.getMemberPointsStat();
},
methods: {
getMemberPointsStat() {
this.$u.api.getMemberPointsStat().then((res)=>{
if (res.errCode == 0) {
this.memberInfo = res.data;
this.percent = (this.memberInfo.member_exppoints / this.rank[this.memberInfo.member_level - 1].max) * 100;
// console.log(this.percent);
}
})
},
}
};
</script>

8
pageE/order/Comment.vue
View File

@@ -56,16 +56,16 @@ export default {
},
addOrderEvaluate() {
if(!this.verifyParams()) return false;
console.log(this.logistics);
console.log(this.service);
console.log(this.describe);
// console.log(this.logistics);
// console.log(this.service);
// console.log(this.describe);
this.$u.api.updateOrderEvaluate({
id: this.orderId,
content: this.content,
scores_one: this.logistics,
scores_two: this.service,
scores_three: this.describe,
file: '',
file: '',　// 只传文件名
}).then(res => {
})

8
pageE/order/Details.vue
View File

@@ -71,7 +71,7 @@
<view class="logistics" v-if="state == '1'" @click="toOtherPage('Logistics')">查看物流</view>
<view class="comment" v-if="state == '2'" @click="toOtherPage('Comment')">立即评价</view>
<view class="cancel" v-if="state == '6'" @click="cancelOrder">取消支付</view>
<view class="payment" v-if="state == '6'">立即支付</view>
<view class="payment" v-if="state == '6'" @click="payNow">立即支付</view>
<view class="service" v-if="state == '7'">联系官方客服</view>
<view class="submit" v-if="state == '7'">提交官方审核</view>
</view>
@@ -186,6 +186,12 @@ export default {
title: title
});
},
payNow() {
this.$u.route('/pageC/cart/cashier', {
pay_sn: this.orderInfo.pay_sn,
price: this.orderInfo.order_amount,
});
},
toOtherPage(url) {
this.$u.route('/pageE/order/' + url, {
oid: this.orderInfo.order_id,

19
pageE/order/Index.vue
View File

@@ -55,6 +55,13 @@ export default {
this.page = 0;
// again 重新请求列表 不然往列表里添加
value == 6 ? this.getAfterSaleList({ reload: 'again' }): this.getOrderList({ reload: 'again' });
if(value == 6) {
this.getAfterSaleList({ reload: 'again' });
} else if(value == 4) {
this.goodsTryOrderList({ reload: 'again' });
} else {
this.getOrderList({ reload: 'again' });
}
},
},
onLoad(option) {
@@ -113,6 +120,17 @@ export default {
}
return res;
},
async goodsTryOrderList({ reload = '' } = {}) {
const res = await this.$u.api.goodsTryOrderList({
page: this.page,
})
this.timer = true;
if(res.errCode == 0) {
if(reload) this.orderList = res.data;
else this.orderList.push(...res.data);
}
return res;
},
reachBottom() {
// 大于15条才会加载更多
if(this.orderList.length < 15) return false;
@@ -122,6 +140,7 @@ export default {
this.page++;
let promise;
if(this.current == 6) promise = this.getAfterSaleList();
else if(this.current == 4) promise = this.goodsTryOrderList();
else promise = this.getOrderList();
promise.then(res => {
this.loadStatus.splice(this.current, 1, "nomore");

4
pageE/tool/SendWash.vue
View File

@@ -88,7 +88,6 @@ export default {
this.toApplyPage(current);
},
toApplyPage(index) {
console.log(index)
var that = this;
if(index == 1) {
this.showPopup = false
@@ -175,7 +174,7 @@ export default {
}
}
}
.send-btn{
.send-btn {
width: 100%;
display: flex;
justify-content: flex-end;
@@ -183,7 +182,6 @@ export default {
.btn{
width: 154rpx;
height: 54rpx;
background: RGBA(255, 254, 255, 1);
border-radius: 49rpx;
transform: translate(-50%, 0);
font-size: 26rpx;

2
pageE/tool/WashOrder.vue
View File

@@ -131,7 +131,7 @@
<swiper style="height: 1000px;" vertical="true">
<swiper-item class="swiper-item">
<scroll-view scroll-y class="order-list">
<view v-for="(items, index) in 3" :key="items.index">
<view v-for="(items, index) in 3" :key="index">
<view class="store">
<view>
<image src="../../static/image/mine/23.png" mode=""></image>胖胖的店

29
pages.json
View File

@@ -80,6 +80,13 @@
{
"root": "pageB",
"pages": [
{
"path": "zhibo/index",
"style": {
"navigationStyle": "custom"
}
},
{
"path": "follow/index",
"style": {
@@ -113,6 +120,28 @@
}
}
},
{
"path": "triedDress/index",
"style": {
"navigationBarTitleText": "试穿订单",
"app-plus":{
"titleNView":{
"backgroundColor":"#ffffff"
}
}
}
},
{
"path": "comment/index",
"style": {
"navigationBarTitleText": "商品评价",
"app-plus":{
"titleNView":{
"backgroundColor":"#ffffff"
}
}
}
},
{
"path": "search/index",
"style": {

6
pages/index/index.vue
View File

@@ -39,10 +39,10 @@
<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code"></u-swiper>
<view class="list">
<view>
<zhiboItem v-for="item in 10"></zhiboItem>
<zhiboItem v-for="item in tabLiveLists.filter((_, index) => !(index&1))" :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"></zhiboItem>
</view>
<view style="margin-left:20rpx">
<zhiboItem v-for="item in 10"></zhiboItem>
<zhiboItem v-for="item in tabLiveLists.filter((_, index) => index&1)" :key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url"></zhiboItem>
</view>
</view>
</view>
@@ -203,6 +203,7 @@
recommendList: [], // 推荐达人
indexImageSwiper: [],
zhiboImageSwiper: [],
tabLiveLists:[]
}
},
components: {
@@ -222,6 +223,7 @@
tabLiveList(){
this.$u.api.tabLiveList().then((res)=>{
console.log(res)
this.tabLiveLists = res.data
})
},
getSwiper() {

2
pages/mine/index.vue
View File

@@ -8,7 +8,7 @@
<view class="user-nickname">{{ userInfo.member_nickname }}</view>
<view class="user-medal" @click="toOtherPage('/mine/MedalIntroduction')">
<img src="/static/image/mine/13.png" />
<view class="rank-title">勋章</view>
<view class="rank-title">{{ userInfo.member_grade_name }}</view>
</view>
</view>
<view class="info-right">

104
pages/shop/index.vue
View File

@@ -11,7 +11,9 @@
</view>
<image src="/static/image/shop/3.png" class="mnue" @click="toClassifyPage"></image>
</view>
<u-swiper :list="list" mode="dot" @click="clickImage"></u-swiper>
<view class="swiper-image">
<u-swiper :list="list" mode="dot" @click="clickImage"></u-swiper>
</view>
<view class="chengnuo">
<view>
<image src="/static/image/shop/4.png"></image>
@@ -33,21 +35,16 @@
<view class="fenlei">
<shopitem v-for="item in goodsClassify" :key="item.gc_id" :info="item" class="item"></shopitem>
</view>
<view class="hr" style="margin-top:80rpx"></view>
<!-- 秒杀 -->
<recommend v-if="JSON.stringify(recommendedSpike) != '{}'" :recommendData="recommendedSpike" type="spike"></recommend>
<view v-if="JSON.stringify(recommendedSpike) != '{}'" class="hr" style="margin-top:40rpx"></view>
<!-- 秒杀列表 -->
<seckill v-if="spikeList.length" :list="spikeList" :time="seckillTime"></seckill>
<view v-if="spikeList.length" class="hr" style="margin-top:40rpx"></view>
<!-- 拼团推荐 -->
<pintuan v-if="JSON.stringify(pinTuanPush) != '{}'" :recommendData="pinTuanPush"></pintuan>
<view class="hr" style="margin-top:40rpx" v-if="JSON.stringify(pinTuanPush) != '{}'"></view>
<!-- 拼团列表 -->
<group :groupList="pinTuanList" :classifyList="couponGroupList"></group>
<group></group>
<image class="lingquan"></image>
<youhq></youhq>
<view class="hr" style="margin-top:40rpx"></view>
<list ref="recommendGoods"></list>
<view class="cart" @click="toCartPage">
<image src="/static/image/common/3.png"></image>
@@ -56,16 +53,16 @@
</scroll-view>
</template>
<script>
import shopitem from "@/components/shop/shop-item/index"
import recommend from "@/components/shop/recommend/index"
import pintuan from "@/components/shop/recommend/pintuan"
import seckill from "@/components/shop/seckill/index"
import group from "@/components/shop/group/index"
import youhq from "@/components/shop/youhq/index"
import list from "../../components/shop/list/index"
import shopitem from "@/components/shop/shop-item/index";
import recommend from "@/components/shop/recommend/index";
import pintuan from "@/components/shop/recommend/pintuan";
import seckill from "@/components/shop/seckill/index";
import group from "@/components/shop/group/index";
import youhq from "@/components/shop/youhq/index";
import list from "@/components/shop/list/index";
export default {
name:"shop",
components:{
name: "shop",
components: {
shopitem,
recommend,
seckill,
@@ -74,7 +71,7 @@ export default {
list,
pintuan
},
data(){
data() {
return {
area: "请选择",
chooseArea: false,
@@ -83,15 +80,14 @@ export default {
city: true,
area: false
},
keyword:"",
list:[],
keyword: "",
list: [],
goodsClassify: [], // 商品分类
classifyList: [],
// classifyList: [],
recommendedSpike: {}, // 秒杀推荐
spikeList: [], // 全部秒杀列表
seckillTime: {}, // 秒杀时间
couponGroupList: [], // 优惠券拼团分类
pinTuanList: [], // 拼团商品
// couponGroupList: [], // 优惠券拼团分类
pinTuanPush: {}, // 拼团推荐
}
},
@@ -101,11 +97,10 @@ export default {
onShow() {
this.getRecommendedSpike();
this.getSpikeList();
this.getGoodsClass();
this.getPinTuanPush();
},
methods: {
sousuo(){
sousuo() {
// console.log(123)
this.$u.route({
url:"pageB/search/index"
@@ -141,15 +136,6 @@ export default {
}
})
},
// 获取优惠券拼团分类
getGoodsClass() {
this.$u.api.getGoodsClass().then(res => {
if(res.errCode == 0) {
this.couponGroupList = res.data;
this.getPinTuanList(this.couponGroupList[0].gc_id);
}
})
},
// 全部秒杀
getSpikeList() {
this.$u.api.getSpikeList({ page: 0 }).then(res => {
@@ -162,15 +148,6 @@ export default {
}
})
},
// 拼团列表
getPinTuanList(id) {
this.$u.api.getPinTuanList({
page: 0,
gc_id: id,
}).then(res => {
this.pinTuanList = res.data;
})
},
clickImage(index) {
console.log(index);
console.log(this.list[index]);
@@ -200,8 +177,10 @@ export default {
.shop {
height: calc(100vh - var(--window-top));
box-sizing: border-box;
padding: 0 33rpx 100rpx;
.top{
background-color: #F0EDF1;
.top {
padding: 0 30rpx;
background-color: #ffffff;
width: 100%;
height: 88rpx;
display: flex;
@@ -211,7 +190,11 @@ export default {
height: 37rpx;
}
}
.add{
.swiper-image {
background-color: #ffffff;
padding: 0 30rpx;
}
.add {
width: 115rpx;
height: 25rpx;
display: flex;
@@ -224,40 +207,43 @@ export default {
> text {
width: 80rpx;
}
>image{
> image {
width: 24rpx;
height: 15rpx;
}
}
.mnue{
.mnue {
background-color: #ffffff;
width: 35rpx;
height: 26rpx;
margin-left: 36rpx;
}
.chengnuo{
.chengnuo {
padding: 30rpx;
background-color: #ffffff;
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 24rpx;
>view{
> view {
display: flex;
align-items: center;
>image{
> image {
width: 23rpx;
height: 23rpx;
}
>text{
> text {
font-size: 22rpx;
color: #999;
margin-left: 8rpx;
}
}
}
.fenlei{
.fenlei {
padding: 30rpx;
background-color: #ffffff;
display: flex;
// justify-content: space-between;
margin-top: 30rpx;
flex-wrap: wrap;
margin-bottom: 20rpx;
> view {
margin-bottom: 30rpx;
&:not(:nth-child(5n)) {
@@ -265,13 +251,7 @@ export default {
}
}
}
.hr{
width: 750rpx;
margin-left: -33rpx;
height: 20rpx;
background-color: #ececec;
}
.lingquan{
.lingquan {
width: 750rpx;
height: 177rpx;
margin-left: -33rpx;

BIN
static/image/common/20.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

24
static/js/common.js
View File

@@ -43,5 +43,29 @@ const common = {
});
return promise;
},
/**
* 将 php 时间戳转化为时分秒
* @param { String } timestamp php 时间戳
* @param { String } format 间隔符 默认 '26:14:25'
* @return { String } 格式化时间
*/
getLineTime({ timestamp, format } = {}) {
const days = Math.floor(timestamp / (24 * 3600 * 1000));
//计算出小时数
const leave1 = timestamp % (24 * 3600 * 1000) // 计算天数后剩余的毫秒数
let hours = Math.floor(leave1 / (3600 * 1000));
//计算相差分钟数
const leave2 = leave1 % (3600 * 1000) // 计算小时数后剩余的毫秒数
const minutes = Math.floor(leave2 / (60 * 1000))
//计算相差秒数
const leave3 = leave2 % (60 * 1000) // 计算分钟数后剩余的毫秒数
const seconds = Math.round(leave3 / 1000)
// 把天数算在小时里
hours = days * 24 + hours;
let result;
if(format) result = hours + format + minutes + format + seconds;
else result = hours + ':' + minutes + ':' + seconds;
return result;
}
}
export default common