Leadfyy.co
/
ec.uniapp-master
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/ec.uniapp-master

master
邓平艺 4 years ago
parent
2f8fa0cc3e f67b1f1771
commit
5bd39697a3
2 changed files with 207 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 137
      pages/point/detail/detail.vue
  2. 106
      pages/shop/seckillList.vue

137
pages/point/detail/detail.vue
View File

@ -8,7 +8,7 @@
<view>
<text class="lf-iconfont icon-jifen lf-font-50"></text>
</view>
<view class="point">78326478</view>
<view class="point">{{point_data.point}}</view>
<view class="head-menu">
<view @click="$url('/pages/point/shoppingMall/shoppingMall')">
<text class="lf-m-r-10">兑换礼品</text>
@ -26,20 +26,29 @@
<view class="lf-font-32 lf-color-black lf-font-bold">积分变动明细</view>
<picker mode='date' :value="date" @change="dateChange">
<view style="width: 440rpx; text-align: right;">
<text>{{ date || '2021-09-01' }}</text>
<text>{{ date || nowDate }}</text>
<text class="lf-iconfont icon-xiangyou lf-font-24 lf-m-l-10"></text>
</view>
</picker>
</view>
<view class="item" v-for="(item, index) in 10" :key="index">
<view class="lf-row-between">
<text class="lf-font-36 lf-color-black lf-font-bold" :class="{'lf-color-price': index % 2}">{{ index % 2 ? '-250' : '+80' }}</text>
<text class="lf-font-24 lf-color-777">2021-09-01 18:27:58</text>
</view>
<view class="lf-m-t-20">
<text class="lf-font-24 lf-color-555">商城内消费</text>
</view>
</view>
<scroll-view :style="{height: autoHeight}" :scroll-y="true" :refresher-enabled="true" :refresher-triggered="isRefresher"
@scrolltolower="onScrolltolower" @refresherrefresh="onRefresherrefresh">
<view class="item" v-for="(item, index) in list" :key="index">
<view class="lf-row-between">
<text class="lf-font-36 lf-color-black lf-font-bold" :class="{'lf-color-price': item.ifNegative}">{{ item.value }}</text>
<text class="lf-font-24 lf-color-777">{{item.created_at}}</text>
</view>
<view class="lf-m-t-20">
<text class="lf-font-24 lf-color-555">{{item.note}}</text>
</view>
</view>
<!-- 空数据的情况 -->
<view class="loading-more">
<text v-if="list.length != 0"
:class="{'loading-more-text': loadingClass}">{{ loadingText }}</text>
<lf-nocontent src="/static/images/empty.png" v-else></lf-nocontent>
</view>
</scroll-view>
</view>
</view>
</template>
@ -48,15 +57,117 @@
export default {
data(){
return {
date: ''
date: '',
nowDate: '',
point_data: '',
list: [],
page: 1,
isPage: true,
loadingClass: true,
loadingText: '正在加载中',
scrollH: 0,
nav_height: 0,
isRefresher: true,
pageSize: 10
}
},
computed: {
autoHeight(){
return `calc(${this.scrollH}px - ${this.nav_height}px - 660rpx)`;
}
},
onLoad(){
let info = uni.getSystemInfoSync();
this.scrollH = info.screenHeight;
var date1 = new Date();
var date2 = new Date(date1);
date2.setDate(date1.getDate());
this.nowDate = this.$shared.recordTime(date2, '-', 'date')
this.getPointNum();
this.getPointList();
},
methods: {
dateChange(event){
this.date = event.detail.value;
this.getPointList();
},
getPointNum(){
this.$http.get({
api: 'api/users/point',
header: {
Authorization: this.$cookieStorage.get('user_token')
}
}).then(res => {
this.point_data = res.data.data
console.log(this.point_data)
})
},
// 页面触底，加载下一页
onScrolltolower(){
if(this.isPage){
this.page = this.page + 1;
this.getPointList();
}
},
// 下拉刷新处理
refreshFn(options){
this.page = 1;
this.isPage = true;
this.loadingClass = true;
this.list = []
this.loadingText = '正在加载中';
this.getPointList(options);
},
// scroll-view 下拉刷新
onRefresherrefresh(){
this.isRefresher = true;
this.refreshFn({type: 'scrollRefresh'});
},
getPointList(options = {}){
this.$http.get({
api: 'api/users/point/list',
data: {
day: this.date || this.nowDate
},
header: {
Authorization: this.$cookieStorage.get('user_token')
}
}).then(res => {
console.log("----", res);
let isPage = this.page < res.data.meta.pagination.total_pages?true:false;
this.isPage = isPage;
if(!isPage) {
this.loadingClass = false;
this.loadingText = '没有更多数据啦~';
}
if(options.type == 'pageRefresh') {
uni.stopPullDownRefresh();
}else if(options.type == 'scrollRefresh') {
this.isRefresher = false;
}
if(this.page == 1) {
let list = res.data.data;
list.forEach((item,index) => {
if(item.value.indexOf('-') != -1) {
this.$set(item,'ifNegative',true)
}else {
this.$set(item,'ifNegative',false)
}
})
this.list = list;
}else {
let list = res.data.data;
list.forEach((item,index) => {
if(item.value.indexOf('-') != -1) {
this.$set(item,'ifNegative',true)
}else {
this.$set(item,'ifNegative',false)
}
})
this.list.push(...list);
}
})
}
}
}

106
pages/shop/seckillList.vue
View File

@ -1,29 +1,38 @@
<template>
<view>
<lf-nav title="秒杀专场" :showIcon="true" bgColor="#fff"></lf-nav>
<view class="content">
<view class="card" v-for="(item, index) in list" :key="index"
@click="$url('/pages/shop/goodsdetail?type=seckill&id='+ item.goods.id)">
<view class="goods-img">
<image class="img" :src="item.goods.img"></image>
<view class="tips">TODO已有0人购买</view>
</view>
<view class="goods-info">
<view>
<view class="lf-line-2 title">{{ item.goods.name }}</view>
<view class="desc">距离开始还剩余 20:34:18</view>
<scroll-view :style="{height: autoHeight}" :scroll-y="true" :refresher-enabled="true" :refresher-triggered="isRefresher"
@scrolltolower="onScrolltolower" @refresherrefresh="onRefresherrefresh">
<view class="content">
<view class="card" v-for="(item, index) in list" :key="index"
@click="$url('/pages/shop/goodsdetail?type=seckill&id='+ item.goods.id)">
<view class="goods-img">
<image class="img" :src="item.goods.img"></image>
<view class="tips lf-line-1">已有{{item.sell_num}}人购买</view>
</view>
<view class="lf-row-between">
<view class="price">
<text>¥{{ item.goods.max_price }}</text>
<text>¥{{ item.goods.market_price }}</text>
<view class="goods-info">
<view>
<view class="lf-line-2 title lf-m-b-16">{{ item.goods.name }}</view>
<view class="desc" v-if="item.seckill.end_left_time.length==0">距离开始还剩余 {{item.seckill.start_left_time[0]}}天{{item.seckill.start_left_time[1]}}时{{item.seckill.start_left_time[2]}}分{{item.seckill.start_left_time[3]}}秒</view>
<view class="desc" v-if="item.seckill.start_left_time.length==0">距离结束还剩余 {{item.seckill.end_left_time[0]}}天{{item.seckill.end_left_time[1]}}时{{item.seckill.end_left_time[2]}}分{{item.seckill.end_left_time[3]}}秒</view>
</view>
<view class="lf-row-between">
<view class="price">
<text>¥{{ item.goods.max_price }}</text>
<text>¥{{ item.goods.market_price }}</text>
</view>
<view class="btn" hover-class="lf-opacity">立即秒杀</view>
</view>
<view class="btn" hover-class="lf-opacity">立即秒杀</view>
</view>
</view>
<!-- 空数据的情况 -->
<view class="loading-more">
<text v-if="list.length != 0"
:class="{'loading-more-text': loadingClass}">{{ loadingText }}</text>
<lf-nocontent src="/static/images/empty.png" v-else></lf-nocontent>
</view>
</view>
<lf-nocontent src="/static/images/empty.png" v-if="list.length <= 0"></lf-nocontent>
</view>
</scroll-view>
<u-back-top :scrollTop="pageScrollTop"></u-back-top>
</view>
</template>
@ -32,19 +41,71 @@
export default {
data(){
return {
list: []
list: [],
page: 1,
isPage: true,
loadingClass: true,
loadingText: '正在加载中',
scrollH: 0,
nav_height: 0,
isRefresher: true,
pageSize: 10
}
},
computed: {
autoHeight(){
return `calc(${this.scrollH}px - ${this.nav_height}px - 180rpx)`;
}
},
onLoad(){
let info = uni.getSystemInfoSync();
this.scrollH = info.screenHeight;
this.getSeckillList();
},
methods: {
getSeckillList(){
// 页面触底，加载下一页
onScrolltolower(){
if(this.isPage){
this.page = this.page + 1;
this.getMyActivity();
}
},
// 下拉刷新处理
refreshFn(options){
this.page = 1;
this.isPage = true;
this.loadingClass = true;
this.list = []
this.loadingText = '正在加载中';
this.getSeckillList(options);
},
// scroll-view 下拉刷新
onRefresherrefresh(){
this.isRefresher = true;
this.refreshFn({type: 'scrollRefresh'});
},
getSeckillList(options = {}){
this.$http.get({
api: 'api/seckill/all'
}).then(res => {
console.log("----", res);
this.list = res.data.data;
let isPage = this.page < res.data.meta.pagination.total_pages?true:false;
this.isPage = isPage;
if(!isPage) {
this.loadingClass = false;
this.loadingText = '没有更多数据啦~';
}
if(options.type == 'pageRefresh') {
uni.stopPullDownRefresh();
}else if(options.type == 'scrollRefresh') {
this.isRefresher = false;
}
if(this.page == 1) {
this.list = res.data.data;
}else {
this.list.push(...res.data.data);
}
})
}
}
@ -112,7 +173,7 @@
}
.desc{
width: 281rpx;
height: 35rpx;
height: max-content;
border-radius: 3rpx;
background-color: #E9F2F2;
font-size: 24rpx;
@ -120,7 +181,6 @@
display: flex;
justify-content: center;
align-items: center;
margin-top: 10rpx;
}
.price>text:nth-child(1){
font-size: 36rpx;

Write Preview
Loading…
Cancel
Save