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
16f99dde29 96eaf15911
commit
0d1ca7add7
5 changed files with 150 additions and 40 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. 1
      pages.json
  2. 2
      pages/coupon/index/index.vue
  3. 4
      pages/discover/discoverdetails.vue
  4. 72
      pages/index/collectCoupons/collectCoupons.vue
  5. 65
      pages/user/my/my.vue

1
pages.json
View File

@ -368,6 +368,7 @@
"path" : "pages/index/collectCoupons/collectCoupons",
"style" : {
"navigationBarTitleText": "领券中心",
"enablePullDownRefresh":true,
"navigationStyle": "custom"
}
},

2
pages/coupon/index/index.vue
View File

@ -38,7 +38,7 @@
</view>
<view class="coupon-right">
<view class="lf-font-32 lf-font-bold lf-color-white">{{item.discount.title}}</view>
<view class="lf-font-24 lf-color-white">有效期{{item.discount.ends_at}}</view>
<view class="lf-font-24 lf-color-white">有效期{{item.discount.starts_at}}~{{item.discount.ends_at}}</view>
</view>
</view>
</view>

4
pages/discover/discoverdetails.vue
View File

@ -45,7 +45,7 @@
<view v-for="(commentitem,commentindex) of commentList" :key="commentindex">
<view class="lf-m-t-20" @click="applySub(commentitem.user.id,commentitem.id)">
<view class="lf-flex">
<view>
<view @click="$url('/pages/user/my/my?user_id='+commentitem.user_id)">
<image class="comment-img" :src="commentitem.user.avatar" mode="aspectFill"></image>
</view>
<view class="lf-flex-column lf-m-l-20">
@ -66,7 +66,7 @@
<view class="comment-replay" v-if="$isRight(commentitem.sub)" v-for="(subitem,index2) of commentitem.sub" :key="index2">
<view class="lf-flex" @click="applySub(subitem.user.id,subitem.parent_id)">
<view class="lf-flex lf-m-t-30">
<view>
<view @click="$url('/pages/user/my/my?user_id='+subitem.user_id)">
<image class="comment-img" :src="subitem.user.avatar" mode="aspectFill"></image>
</view>
<view class="lf-flex-column lf-m-l-20">

72
pages/index/collectCoupons/collectCoupons.vue
View File

@ -6,7 +6,7 @@
<view class="suspension" hover-class="lf-opacity" @click="$url('/pages/coupon/index/index')">我的优惠券</view>
</view>
<view class="coupon-wrap">
<view class="coupon-box" v-for="i of 3">
<view class="coupon-box" v-for="(item,index) of coupon_list" :key="index">
<view class="coupon-card lf-m-b-30">
<view class="coupon-circle-top">
<view class="coupon-circle1"></view>
@ -16,19 +16,19 @@
</view>
<view class="coupon-radius">
<view class="coupon-left">
<view class="lf-color-white">
<view class="lf-color-white" v-if="item.action_type.type == 'cash'">
<text class="lf-font-24">￥</text>
<text class="lf-font-70 lf-color-white lf-font-bold">200</text>
<text class="lf-font-70 lf-color-white lf-font-bold">{{item.action_type.value}}</text>
</view>
</view>
<view class="coupon-right">
<view class="lf-font-32 lf-font-bold lf-color-white">满1200减200</view>
<view class="lf-font-24 lf-color-white">有效期2021.09.09-2021-09.15</view>
<view class="lf-font-32 lf-font-bold lf-color-white">{{item.title}}</view>
<view class="lf-font-24 lf-color-white">有效期{{item.starts_at}}~{{item.ends_at}}</view>
</view>
</view>
</view>
<view class="coupon-receive" @click="receive">立即领取</view>
<block v-if="i == 2">
<view class="coupon-receive" @click="receive(item.code)">立即领取</view>
<block v-if="item.ifpast">
<view class="coupon-opacity"></view>
<view class="coupon-end">
<view>抢光了</view>
@ -44,15 +44,65 @@
export default {
data(){
return {
coupon_list: []
}
},
onLoad(){
this.getCouponsList();
},
onPullDownRefresh() {
this.getCouponsList();
},
methods: {
receive(){
this.$msg('领取成功')
receive(code){
this.$http.post({
api: 'api/coupon/convert',
data: {
coupon_code: code
},
header: {
Authorization: this.$cookieStorage.get('user_token')
}
}).then(res => {
if(res.data.code == 200) {
this.$msg('领取成功');
this.getCouponsList();
}else {
this.$msg(JSON.stringify(res.data.message));
}
}).catch(err => {
console.log("====", err);
})
},
compareDate(val) {
var nowTime = new Date(new Date().toLocaleDateString()).getTime();
let oldTime = new Date(new Date(val).toLocaleDateString()).getTime();
if(nowTime>oldTime) {
return true;
}else {
return false;
}
},
//获取优惠券列表
getCouponsList() {
this.$http.get({
api: 'api/coupons/list',
header: {
Authorization: this.$cookieStorage.get('user_token')
}
}).then(res => {
this.coupon_list = res.data.data;
this.coupon_list.forEach((item,index) => {
if(this.compareDate(item.ends_at)) {
this.$set(item,'ifpast',true);
}else {
this.$set(item,'ifpast',false);
}
})
uni.stopPullDownRefresh();
}).catch(err => {
console.log("====", err);
})
}
}
}

65
pages/user/my/my.vue
View File

@ -20,6 +20,8 @@
</view>
</view>
</view>
<scroll-view :style="{height: autoHeight}" :scroll-y="true" :refresher-enabled="true" :refresher-triggered="isRefresher"
@scrolltolower="onScrolltolower" @refresherrefresh="onRefresherrefresh">
<view class="lf-m-32" v-for="(item,index) in discover_info.list.data" :key="index" @click="goDetails(item.id)">
<view class="lf-font-48 lf-color-black lf-font-bold">
{{item.create_time[0]}}
@ -46,6 +48,13 @@
</view>
</view>
</view>
<!-- 空数据的情况 -->
<view class="loading-more">
<text v-if="discover_info.list.data.length"
:class="{'loading-more-text': loadingClass}">{{ loadingText }}</text>
<lf-nocontent v-else></lf-nocontent>
</view>
</scroll-view>
<view style="height: 40rpx;"></view>
</view>
</template>
@ -57,14 +66,32 @@
user_id: 0,
page: 1,
page_size: 15,
discover_info: ''
discover_info: '',
isPage: true,
loadingClass: true,
loadingText: '正在加载中',
isRefresher: false,
scrollH: 0,
nav_height: 0,
}
},
onLoad(e) {
let info = uni.getSystemInfoSync();
this.scrollH = info.screenHeight;
this.user_id = e.user_id;
this.loginList();
},
computed: {
autoHeight(){
return `calc(${this.scrollH}px - ${this.nav_height}px - 460rpx)`;
}
},
methods: {
// scroll-view 下拉刷新
onRefresherrefresh(){
this.isRefresher = true;
this.refreshFn({type: 'scrollRefresh'});
},
//关注
payAttention() {
this.$http
@ -104,6 +131,22 @@
});
});
},
// 下拉刷新处理
refreshFn(options){
this.page = 1;
this.isPage = true;
this.loadingClass = true;
this.discover_info.list.data = [];
this.loadingText = '正在加载中';
this.loginList(options);
},
// 页面触底，加载下一页
onScrolltolower(){
if(this.isPage){
this.page = this.page + 1;
this.loginList();
}
},
//点赞发现
addLike(id) {
let user_info = this.$cookieStorage.get('user_token');
@ -121,7 +164,7 @@
.then(res => {
if (res.data.code == 200) {
if (res.data.status) {
this.loginList();
this.refreshFn({type: 'scrollRefresh'});
} else {
wx.showModal({
content: res.data.message || '请下拉页面刷新重试',
@ -151,7 +194,7 @@
this.$url('/pages/discover/discoverdetails?discover_id='+id)
},
//登录时的发现列表
loginList() {
loginList(options = {}) {
this.$http
.get({
api: 'api/discover/user/'+this.user_id,
@ -167,6 +210,22 @@
if (res.data.code == 200) {
if (res.data.status) {
this.discover_info = res.data.data;
let isPage = res.data.data.list.last_page == this.page?false:true;
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.discover_info.list.data = res.data.data.list.data;
}else {
this.discover_info.list.data.push(...res.data.data.list.data);
}
console.log('登录时的发现列表',this.discover_info);
} else {
wx.showModal({

Write Preview
Loading…
Cancel
Save