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

Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/ec.uniapp-master

master
邓平艺 4 years ago
parent
178b4321ed 2fa74a3b6b
commit
a8885a1a28
5 changed files with 108 additions and 84 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. 8
      pages/discover/discover.vue
  2. 30
      pages/discover/discoverdetails.vue
  3. 148
      pages/discover/publish.vue
  4. 4
      pages/shop/seckillList.vue
  5. 2
      pages/user/my/center.vue

8
pages/discover/discover.vue
View File

@ -33,16 +33,16 @@
</view>
<view class="lf-m-t-30 lf-row-between lf-p-l-50 lf-p-r-50">
<view class="lf-row-center" @click.stop="addLike(item.id)">
<text class="lf-iconfont icon-xihuanlike lf-color-price" v-if="item.is_like"></text>
<text class="lf-iconfont icon-xihuan" v-else></text>
<text class="lf-iconfont icon-xihuanlike lf-color-price lf-font-40" v-if="item.is_like"></text>
<text class="lf-iconfont icon-xihuan lf-font-40" v-else></text>
<text class="lf-font-24 lf-color-777 lf-m-l-10">{{item.likes_count}}</text>
</view>
<view class="lf-row-center">
<text class="lf-iconfont icon-chakan"></text>
<text class="lf-iconfont icon-chakan lf-font-40"></text>
<text class="lf-font-24 lf-color-777 lf-m-l-10">{{item.view_count}}</text>
</view>
<view class="lf-row-center" @click="goDetails(item.id)">
<text class="lf-iconfont icon-pinglun-"></text>
<text class="lf-iconfont icon-pinglun- lf-font-40"></text>
<text class="lf-font-24 lf-color-777 lf-m-l-10">{{item.comments_count}}</text>
</view>
</view>

30
pages/discover/discoverdetails.vue
View File

@ -24,16 +24,16 @@
</view>
<view class="lf-m-t-30 lf-row-between lf-p-l-50 lf-p-r-50">
<view class="lf-row-center" @click="addLike(discover_details.id)">
<text class="lf-iconfont icon-xihuanlike lf-color-price" v-if="discover_details.is_like"></text>
<text class="lf-iconfont icon-xihuan" v-else></text>
<text class="lf-iconfont icon-xihuanlike lf-color-price lf-font-40" v-if="discover_details.is_like"></text>
<text class="lf-iconfont icon-xihuan lf-font-40" v-else></text>
<text class="lf-font-24 lf-color-777 lf-m-l-10">{{discover_details.likes_count}}</text>
</view>
<view class="lf-row-center">
<text class="lf-iconfont icon-chakan"></text>
<text class="lf-iconfont icon-chakan lf-font-40"></text>
<text class="lf-font-24 lf-color-777 lf-m-l-10">{{discover_details.view_count}}</text>
</view>
<view class="lf-row-center">
<text class="lf-iconfont icon-pinglun-"></text>
<text class="lf-iconfont icon-pinglun- lf-font-40"></text>
<text class="lf-font-24 lf-color-777 lf-m-l-10">{{discover_details.comments_count}}</text>
</view>
</view>
@ -59,8 +59,8 @@
</view>
<view class="lf-m-l-32" style="position: absolute;right:33rpx;">
<view @click.stop="giveaLike(commentitem.id)">
<text class="lf-iconfont icon-xihuanlike lf-color-price" v-if="commentitem.is_like"></text>
<text class="lf-iconfont icon-xihuan" v-else></text>
<text class="lf-iconfont icon-xihuanlike lf-color-price lf-font-36" v-if="commentitem.is_like"></text>
<text class="lf-iconfont icon-xihuan lf-font-36" v-else></text>
</view>
<view class="lf-color-555 lf-font-24 lf-row-center">{{commentitem.likes_count}}</view>
</view>
@ -91,8 +91,8 @@
</view>
<view class="lf-m-t-30" style="position: absolute;right:33rpx;">
<view @click.stop="giveaLike(subitem.id)">
<text class="lf-iconfont icon-xihuanlike lf-color-price" v-if="subitem.is_like"></text>
<text class="lf-iconfont icon-xihuan" v-else></text>
<text class="lf-iconfont icon-xihuanlike lf-color-price lf-font-36" v-if="subitem.is_like"></text>
<text class="lf-iconfont icon-xihuan lf-font-36" v-else></text>
</view>
<view class="lf-color-555 lf-font-24 lf-row-center">{{subitem.likes_count}}</view>
</view>
@ -110,17 +110,17 @@
<input class="rom-search" type="text" confirm-type="send" v-else @confirm="sendComment(discover_details.id)" :cursor-spacing="8" v-model="comment" placeholder="说点什么" />
</view>
<view class="lf-row-center">
<view class="lf-row-center lf-m-r-35" style="align-items: center;" @click.stop="addLike(discover_details.id)">
<text class="lf-iconfont icon-xihuanlike lf-color-price lf-font-36" v-if="discover_details.is_like"></text>
<text class="lf-iconfont icon-xihuan lf-font-36" v-else></text>
<view class="lf-row-center lf-m-r-35" style="align-items: center;justify-content: center;" @click.stop="addLike(discover_details.id)">
<text class="lf-iconfont icon-xihuanlike lf-color-price lf-font-40" v-if="discover_details.is_like"></text>
<text class="lf-iconfont icon-xihuan lf-font-40" v-else></text>
<text class="lf-font-24 lf-color-777 lf-m-l-10">{{discover_details.likes_count}}</text>
</view>
<view class="lf-row-center lf-m-r-35" style="align-items: center;">
<text class="lf-iconfont icon-chakan lf-font-44"></text>
<view class="lf-row-center lf-m-r-35" style="align-items: center;justify-content: center;">
<text class="lf-iconfont icon-chakan lf-font-40"></text>
<text class="lf-font-24 lf-color-777 lf-m-l-10">{{discover_details.view_count}}</text>
</view>
<view class="lf-row-center lf-m-r-35" style="align-items: center;">
<text class="lf-iconfont icon-pinglun- lf-font-36"></text>
<view class="lf-row-center lf-m-r-35" style="align-items: center;justify-content: center;">
<text class="lf-iconfont icon-pinglun- lf-font-40"></text>
<text class="lf-font-24 lf-color-777 lf-m-l-10">{{discover_details.comments_count}}</text>
</view>
</view>

148
pages/discover/publish.vue
View File

@ -30,7 +30,9 @@
image_count: 6,
content: '',
backInquiry: false,
uploadImg: []
uploadImg: [],
p_list: [],
tempFilesList: []
}
},
watch: {
@ -51,66 +53,83 @@
this.$msg('请输入文字内容!');
return
}
if(this.uploadImg.length == 0) {
if(this.tempFilesList.length == 0) {
this.$msg('请上传图片!');
return
}
this.$http
.post({
api: 'api/discover/create',
data: {
images: this.uploadImg,
content: this.content
},
header: {
Authorization: this.$cookieStorage.get('user_token')
},
})
.then(res => {
if (res.data.code == 200) {
if (res.data.status) {
this.$msg('发布成功',{duration: 2500}).then(() => {
this.$toBack();
})
} else {
wx.showModal({
content: res.data.message || '发布失败，请稍后尝试！',
showCancel: false
});
}
} else {
wx.showModal({
content: res.data.message || '发布失败，请稍后尝试！',
showCancel: false
});
}
wx.hideLoading();
})
.catch(() => {
wx.hideLoading();
wx.showModal({
content: '请求失败',
showCancel: false
});
});
let p_list = [];
this.tempFilesList.forEach((item,index) => {
p_list.push(this.uploadDiscover(item.path))
})
this.p_list = p_list;
Promise.all(this.p_list).then(result => {
this.$http
.post({
api: 'api/discover/create',
data: {
images: result,
content: this.content
},
header: {
Authorization: this.$cookieStorage.get('user_token')
},
})
.then(res => {
if (res.data.code == 200) {
if (res.data.status) {
this.content = '';
this.image_list = [];
this.$msg('发布成功',{duration: 2500}).then(() => {
this.$toBack();
})
} else {
wx.showModal({
content: res.data.message || '发布失败，请稍后尝试！',
showCancel: false
});
}
} else {
wx.showModal({
content: res.data.message || '发布失败，请稍后尝试！',
showCancel: false
});
}
wx.hideLoading();
})
.catch(() => {
wx.hideLoading();
wx.showModal({
content: '请求失败',
showCancel: false
});
});
})
},
uploadDiscover(img) {
uni.uploadFile({
header: {
Authorization: this.$cookieStorage.get('user_token')
},
url: this.$config.GLOBAL.baseUrl+'api/discover/upload_image',
filePath: img,
fileType: 'image',
name: 'image',
success: res => {
var result = JSON.parse(res.data).data.url;
this.uploadImg.push(result)
console.log('上传后的图片路径',this.uploadImg)
},
fail: err => {
console.log(err)
}
console.log('=========',img)
return new Promise((resolve, reject) => {
uni.uploadFile({
header: {
Authorization: this.$cookieStorage.get('user_token')
},
url: this.$config.GLOBAL.baseUrl+'api/discover/upload_image',
filePath: img,
fileType: 'image',
name: 'image',
success: res => {
var result = JSON.parse(res.data).data.url;
resolve(result);
},
fail: err => {
console.log(err)
reject(err)
}
})
})
},
// 上传凭证图片
@ -142,9 +161,7 @@
})
}
this.image_list.push(...image_list);
this.uploadDiscover(tempFiles[0].path)
console.log('当前选择的图片列表',this.image_list);
this.tempFilesList.push(...tempFiles);
}
})
},
@ -160,9 +177,16 @@
},
// 移除图片
removeInage(current){
this.image_list.splice(current, 1);
this.uploadImg.splice(current, 1);
console.log('删除的图片列表',this.uploadImg);
uni.showModal({
title: '提示',
content: '即将取消上传这张图片，请确认？',
success: e => {
if (!e.confirm) return;
this.image_list.splice(current, 1);
this.uploadImg.splice(current, 1);
this.tempFilesList.splice(current, 1);
}
});
}
}
}

4
pages/shop/seckillList.vue
View File

@ -20,7 +20,7 @@
{{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 class="desc" v-if="item.ifStart">距离结束还剩余
<countdown-timer :time="item.countTime" :autoStart="true" @finish="dateFinish">
<countdown-timer :time="item.countTime" :autoStart="true" @finish="dateFinish" v-if="item.countTime">
<template v-slot="{day,hour,minute, second}">
<view class="lf-flex">
<view class="lf-font-24">{{ day >= 10 ? day : "0" + day }}</view>
@ -36,7 +36,7 @@
</countdown-timer>
</view>
<view class="desc" v-else>距离开始还剩余
<countdown-timer :time="item.countTime" :autoStart="true" @finish="dateFinish">
<countdown-timer :time="item.countTime" :autoStart="true" @finish="dateFinish" v-if="item.countTime">
<template v-slot="{day,hour,minute, second}">
<view class="lf-flex">
<view class="lf-font-24">{{ day >= 10 ? day : "0" + day }}</view>

2
pages/user/my/center.vue
View File

@ -31,7 +31,7 @@
<view class="lf-font-24 lf-color-white">余额(元)</view>
</view>
<view class="lf-row-center lf-flex-column" @click="$url('/pages/coupon/index/index')">
<view class="lf-font-36 lf-color-white">{{centerInfo.coupon || 0}}</view>
<view class="lf-font-36 lf-color-white">{{centerInfo.couponCount || 0}}</view>
<view class="lf-font-24 lf-color-white">优惠券</view>
</view>
</view>

Write Preview
Loading…
Cancel
Save