Skip to content

7
7-Eleven
Commit 72aa8584 by 赵雅纹
Options

Merge branch 'feature-zyw-sc' into 'dev_7.1.0' 

Feature zyw sc

See merge request !83
parents 3271f73b e318015e
Showing with 382 additions and 182 deletions
src/component/dialog/dialog.js
......@@ -82,6 +82,12 @@ Component({
this._updateData({
show: false
})
},
confirm(){
this._updateData({
show: false
})
// 触发父级事件
wxService.nextTick(() => {
this.triggerEvent('_closeDialog')
......
src/component/dialog/dialog.wxml
......@@ -7,7 +7,7 @@
<view class="main-close" bindtap='_close'>x</view>
<view class='content'>
<text>确认删除此作品吗?</text>
<view class="check-del" bindtap='_close'>确认</view>
<view class="check-del" bindtap='confirm'>确认</view>
</view>
</view>
......
src/component/waterFlowLayout/waterFlowLayout.js
......@@ -10,6 +10,10 @@ Component({
type: Array,
value: [],
},
type:{
type: Number,
value: [],
}
},
......@@ -46,7 +50,12 @@ Component({
//详情
gotoDetail(e){
wxService.router(`/pages/wantToBuyDetail/wantToBuyDetail?id=${e.currentTarget.dataset.id}`)
// type 1:内容 2：我的发布
if(this.data.type == 1){
wxService.router(`/pages/wantToBuyDetail/wantToBuyDetail?id=${e.currentTarget.dataset.id}`)
} else if (this.data.type == 2){
wxService.router(`/subPackage/page/pages/myReleaseDetail/myReleaseDetail?id=${e.currentTarget.dataset.id}`)
}
}
}
})
src/pages/myShare/myShare.wxml
......@@ -8,7 +8,7 @@
</view>
<scroll-view scroll-y >
<view class="main-content" wx:if="{{contentList.length > 0}}">
<water-flow-layout image-data="{{contentList}}" bind:updataLike="gotoLike" bind:_onTapShare="_onTapShare"/>
<water-flow-layout type="2" image-data="{{contentList}}" bind:updataLike="gotoLike" bind:_onTapShare="_onTapShare"/>
</view>
<view class="empty" wx:if="{{!contentList || contentList.length < 1}}">
暂无内容哦~
......
src/subPackage/page/pages/grassCommunity/grassCommunity.js
......@@ -2,6 +2,8 @@
const app = getApp()
const wxService = require('../../../../utils/wxService')
const utils = require('../../../../utils/util')
const { memberId } = wx.getStorageSync('_baseUserInfo')
wxService.page({
......@@ -10,7 +12,25 @@ wxService.page({
*/
data: {
pics:[],
showSelectRelatedGoods: false
showSelectRelatedGoods: false,
params:{
article: "",
describe: "",
headline: "",
id: 0,
sspList: [
{
cover: 0,
url: ""
}
],
stcList: [
{
commodityId: 0
}
],
userId: memberId
}
},
/**
......@@ -50,10 +70,10 @@ wxService.page({
pics: pics
});
console.log(that.data.pics)
// that.moreImgUpload({
// url: 'https://........',//这里是你图片上传的接口
// path: that.data.pics//这里是选取的图片的地址数组
// });
that.moreImgUpload({
url: 'http://buyer.devapi.bigaka.net/merchant/upload/pic',//这里是你图片上传的接口
path: that.data.pics//这里是选取的图片的地址数组
});
},
fail: function () {
// fail
......@@ -69,39 +89,50 @@ wxService.page({
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
//多张图片上传
moreImgUpload(data) {
var that = this,
i = data.i ? data.i : 0,//当前上传的哪张图片
success = data.success ? data.success : 0,//上传成功的个数
fail = data.fail ? data.fail : 0;//上传失败的个数
wx.uploadFile({
url: data.url,
filePath: data.path[i],
header : {
'buyer-token' : wx.getStorageSync('token')
},
name: 'file',//这里根据自己的实际情况改
formData: null,//这里是上传图片时一起上传的数据
success: (resp) => {
success++;//图片上传成功，图片上传成功的变量+1
console.log(resp)
console.log(i);
//这里可能有BUG，失败也会执行这里,所以这里应该是后台返回过来的状态码为成功时，这里的success才+1
},
fail: (res) => {
fail++;//图片上传失败，图片上传失败的变量+1
console.log('fail:' + i + "fail:" + fail);
},
complete: () => {
console.log(i);
i++;//这个图片执行完上传后，开始上传下一张
if (i == data.path.length) { //当图片传完时，停止调用
console.log('执行完毕');
console.log('成功：' + success + " 失败：" + fail);
} else {//若图片还没有传完，则继续调用函数
console.log(i);
data.i = i;
data.success = success;
data.fail = fail;
that.moreImgUpload(data);
}
}
})
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
// 发布笔记
formSubmit(e){
console.log(e)
}
})
\ No newline at end of file
src/subPackage/page/pages/grassCommunity/grassCommunity.wxml
<!--subPackage/page/pages/grassCommunity/grassCommunity.wxml-->
<view class="grass-community border_box">
<view class="page-upload-img">
<view class="flex-wrp">
<view class="flex-item" wx:for="{{pics}}" wx:key="{{index}}">
<image class="item-img" src="{{item}}" />
</view>
<view class="flex-item" hidden="{{pics.length >= 5}}">
<view class="upload-wrap" bindtap="uploadImg">
<view class="upload-text">+图片</view>
</view>
</view>
<view class="flex-item">
<upload-video/>
</view>
</view>
</view>
<form bindsubmit="formSubmit">
<view class="grass-community border_box">
<view class="page-upload-img">
<view class="flex-wrp">
<view class="flex-item" wx:for="{{pics}}" wx:key="{{index}}">
<image class="item-img" src="{{item}}" />
</view>
<view class="flex-item" hidden="{{pics.length >= 5}}">
<view class="upload-wrap" bindtap="uploadImg">
<view class="upload-text">+图片</view>
</view>
</view>
<view class="flex-item">
<upload-video/>
</view>
</view>
</view>
<view class="upload-tip">*只支持.jpg格式图片/ .mp4格式视频，最长60s</view>
<view class="title-border">
<input placeholder="添加标题" auto-focus />
</view>
<view class="title-border">
<input placeholder="这一刻想说什么..." auto-focus />
</view>
<view class="upload-tip">*只支持.jpg格式图片/ .mp4格式视频，最长60s</view>
<view class="title-border">
<input placeholder="添加标题" name="headline" auto-focus value="{{params.headline}}" />
</view>
<view class="title-border">
<input placeholder="这一刻想说什么..." name="article" auto-focus value="{{params.article}}" />
</view>
<view class="related-goods" bindtap="handleRelatedGoods">关联商品</view>
<view class="gress-list">
<grass-item/>
</view>
</view>
<view class="post-notes fixed-bottom0">发布笔记</view>
<view class="related-goods" bindtap="handleRelatedGoods">关联商品</view>
<view class="gress-list">
<grass-item/>
</view>
</view>
<button class="post-notes fixed-bottom0" form-type="submit">发布笔记</button>
</form>
<select-related-goods show="{{showSelectRelatedGoods}}"/>
src/subPackage/page/pages/myRelease/myRelease.js
// subPackage/page/pages/myRelease/myRelease.js
// pages/coupons.js
const app = getApp()
const wxService = require('../../../../utils/wxService')
const utils = require('../../../../utils/util')
const envInfo = require('../../../../config/index').envInfo
wxService.page({
/**
* 页面的初始数据
*/
data: {
imageData: [
{
name: '大脸猫爱吃鱼大脸猫爱吃鱼大脸猫爱吃鱼大脸猫爱吃鱼大脸猫爱吃鱼',
heart_num: '1',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://f10.baidu.com/it/u=121654667,1482133440&fm=72',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
},
{
name: '大脸猫爱吃鱼',
heart_num: '2',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://img3.imgtn.bdimg.com/it/u=1417732605,3777474040&fm=26&gp=0.jpg',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
},
{
name: '大脸猫爱吃鱼',
heart_num: '3',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://img3.imgtn.bdimg.com/it/u=1417732605,3777474040&fm=26&gp=0.jpg',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
}, {
name: '大脸猫爱吃鱼',
heart_num: '4',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://f10.baidu.com/it/u=121654667,1482133440&fm=72',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
},
{
name: '大脸猫爱吃鱼',
heart_num: '5',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://f10.baidu.com/it/u=121654667,1482133440&fm=72',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
},
{
name: '大脸猫爱吃鱼',
heart_num: '6',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://img3.imgtn.bdimg.com/it/u=1417732605,3777474040&fm=26&gp=0.jpg',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
},
{
name: '大脸猫爱吃鱼',
heart_num: '7',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://img4.imgtn.bdimg.com/it/u=2748975304,2710656664&fm=26&gp=0.jpg',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
}, {
name: '大脸猫爱吃鱼',
heart_num: '8',
title: '你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识你所不知道的红酒知识',
url: 'http://img2.imgtn.bdimg.com/it/u=1561660534,130168102&fm=26&gp=0.jpg',
avatar: 'http://img4.imgtn.bdimg.com/it/u=349345436,3394162868&fm=26&gp=0.jpg'
}
],
categoryList: [], //分类
baseImgUrl: app.globalData.imageUrl,
listData: [{
desc: "string",
imageUrl: "/group3/M00/00/0B/Cv6CBF0RvcuAXoDUAA5M5vbNswU382.png",
link: { linkId: "10", brandId: "2711", name: "会员服务", url: "5", type: 2, status: 0 },
number: 1,
redirectId: "10",
type: 0
}, {
desc: "string",
imageUrl: "/group3/M00/00/08/Cv6CBF0BqvyADM4iAABJQ-gxAy4311.png",
link: { linkId: "10", brandId: "2711", name: "会员服务", url: "5", type: 2, status: 0 },
number: 1,
redirectId: "10",
type: 0
},
{
desc: "string",
imageUrl: "/group3/M00/00/08/Cv6CBF0BqvyADM4iAABJQ-gxAy4311.png",
link: { linkId: "10", brandId: "2711", name: "会员服务", url: "5", type: 2, status: 0 },
number: 1,
redirectId: "10",
type: 0
},
{
desc: "string",
imageUrl: "/group3/M00/00/0B/Cv6CBF0RvcuAXoDUAA5M5vbNswU382.png",
link: { linkId: "10", brandId: "2711", name: "会员服务", url: "5", type: 2, status: 0 },
number: 1,
redirectId: "10",
type: 0
}]
pageNum: 1,
pageSize: 10,
totalPages: 0,
totalElements: 0,
currentTab: 0,
showCardModal: false,
cardTitle: '',
cardUrl: '',
contentList: [
]
},
/**
* 生命周期函数--监听页面加载
*/
onLoad() { },
onLoad(options) {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
this.getContentList()
},
// 获取发现内容
getContentList() {
const { memberId } = wx.getStorageSync('_baseUserInfo')
wxService.post(`/merchant/contentMobileTerminal/getContentList?pageNum=${this.data.pageNum}&pageSize=${this.data.pageSize}`, {
userId: memberId
}).then(res => {
if (!res) return false
const { result, data } = res.data
if (result == 0) {
if (data.content) {
this.setData({
contentList: this.data.pageNum == 1 ? [...data.content] : [...this.data.contentList, ...data.content],
totalPages: data.totalPages,
totalElements: data.totalElements
})
} else {
this.setData({
contentList: []
})
}
}
}).finally(() => {
})
},
// 点赞
gotoLike(e) {
console.log(e.detail)
let params = e.detail
if (!e.detail.type) {
wxService.post(`/merchant/contentMobileTerminal/operationSave`, params).then(res => {
if (!res) return false
const { result, data } = res.data
if (result == 0) {
wx.showToast({
title: '点赞成功',
icon: 'none'
})
this.getContentList()
}
}).finally(() => {
})
} else {
wxService.post(`/merchant/contentMobileTerminal/operationDelete`, {
id: e.detail.contentId,
userId: e.detail.userId
}).then(res => {
if (!res) return false
const { result, data } = res.data
if (result == 0) {
wx.showToast({
title: '取消点赞成功',
icon: 'none'
})
this.getContentList()
}
}).finally(() => {
})
}
},
// 分享
_onTapShare(e) {
console.log(e)
this.setData({
showCardModal: true,
cardTitle: e.detail.title,
cardUrl: e.detail.url,
})
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () { },
onPullDownRefresh: function () {
this.setData({
pageNum: 1,
})
this.getContentList(this.data.currentTab)
wx.stopPullDownRefresh();
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {}
onReachBottom: function () {
const { pageNum, pageSize, totalPages } = this.data
if (pageNum < totalPages) {
this.setData({
pageNum: pageNum + 1,
})
this.getContentList(this.data.currentTab)
}
}
})
\ No newline at end of file
src/subPackage/page/pages/myRelease/myRelease.json
{
"navigationBarTitleText": "我的发布",
"usingComponents": {
"water-flow-layout": "/component/waterFlowLayout/waterFlowLayout"
"water-flow-layout": "/component/waterFlowLayout/waterFlowLayout",
"card-modal": "/component/cardModal/cardModal"
}
}
\ No newline at end of file
src/subPackage/page/pages/myRelease/myRelease.wxml
......@@ -12,7 +12,11 @@
<view class="diy-banner">
商户自定义banner
</view>
<water-flow-layout image-data="{{imageData}}"/>
<navigator open-type="navigate" url="/subPackage/page/pages/grassCommunity/grassCommunity" >
<view class="add">+</view>
</navigator>
<water-flow-layout type="2" image-data="{{contentList}}" bind:updataLike="gotoLike" bind:_onTapShare="_onTapShare"/>
<card-modal show-card-modal="{{showCardModal}}" card-title="{{cardTitle}}" card-url="{{cardUrl}}"/>
......
src/subPackage/page/pages/myRelease/myRelease.wxss
......@@ -33,3 +33,16 @@
font-size: 18rpx;
font-family: PingFangSC-Regular;
}
.add{
width: 82rpx;
height: 82rpx;
background-color: rgba(203, 60, 60, 1);
border-radius: 50%;
line-height:90rpx;
text-align: center;
font-size: 60rpx;
color: #ffffff;
position: fixed;
right: 22rpx;
bottom: 35rpx;
}
src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.js
......@@ -2,6 +2,8 @@
const app = getApp()
const wxService = require('../../../../utils/wxService')
const utils = require('../../../../utils/util')
const { memberId } = wx.getStorageSync('_baseUserInfo')
wxService.page({
......@@ -9,6 +11,7 @@ wxService.page({
* 页面的初始数据
*/
data: {
id: '',
showDialig: false
},
......@@ -16,25 +19,108 @@ wxService.page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
if (options && options.id) {
this.setData({
id: options.id
})
}
},
handleDel() {
this.setData({
showDialig: true
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
// 获取内容详情
getContentDetail() {
wxService.post(`/merchant/contentMobileTerminal/terminalContentParticulars`, {
id: this.data.id,
userId: memberId
}).then(res => {
if (!res) return false
const { result, data } = res.data
if (result == 0) {
this.setData({
contentInfo: data
})
}
}).finally(() => {
})
},
// 点赞
gotoLike() {
const { memberId } = wx.getStorageSync('_baseUserInfo')
let params = {
contentId: this.data.contentInfo.id,
type: this.data.contentInfo.type,
userId: memberId
}
if (!this.data.contentInfo.currentType) {
wxService.post(`/merchant/contentMobileTerminal/operationSave`, params).then(res => {
if (!res) return false
const { result, data } = res.data
if (result == 0) {
wx.showToast({
title: '点赞成功',
icon: 'none'
})
this.getContentList(this.data.currentTab)
}
}).finally(() => {
})
} else {
wxService.post(`/merchant/contentMobileTerminal/operationDelete`, {
id: this.data.contentInfo.id,
userId: memberId
}).then(res => {
if (!res) return false
const { result, data } = res.data
if (result == 0) {
wx.showToast({
title: '取消点赞成功',
icon: 'none'
})
this.getContentList(this.data.currentTab)
}
}).finally(() => {
})
}
},
// 删除
closeDialog(){
wxService.post(`/merchant/contentMobileTerminal/contentDelete`, {
id: this.data.contentInfo.id,
userId: memberId
}).then(res => {
if (!res) return false
const { result, data } = res.data
if (result == 0) {
wx.showToast({
title: '删除成功',
icon: 'none'
})
wxService.back()
}
}).finally(() => {
})
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
if(this.data.id){
this.getContentDetail()
}
},
/**
......
src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.wxml
<!--subPackage/page/pages/myReleaseDetail.wxml-->
<view class="release-detail">
<view class="detail-img">tu</view>
<view class="detail-img">
<image src="{{contentInfo.sspList[0].url}}"></image>
</view>
<view class="detail-content border_box">
<view class="detail-title">标题标题</view>
<view class="detail-desc">种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案
种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种草文案种</view>
<view class="detail-title">{{contentInfo.headline}}</view>
<view class="detail-desc">{{contentInfo.article}}</view>
<view class="detail-bottom weui-flex df-j--bt">
<view class="bottom-collapse border_box"> 收起</view>
<view class="bottom-img">
<image class="img-top" mode="widthFix" src="/assets/imgs/7_1_0/go-top.png" bindtap="goTop"></image>
</view>
</view>
</view>
<view class="release-action">
<view class="weui-flex df-j--bt action-share border_box">
<view class="share-num"> 689 </view>
<view class="share-num"> 298 </view>
<!-- <view class="share-num"> {{contentInfo.enjoySum || 0}} </view>
<view class="share-num"> {{contentInfo.readSum || 0}} </view> -->
<view class="share-oprate" bindtap="gotoLike">
<image class="share-img" src="{{contentInfo.currentType ? '/assets/imgs/heart-primary.png' : '/assets/imgs/heart-default.png'}}"></image>
<text class="share-number">{{contentInfo.enjoySum || 0}}</text>
</view>
<view class="share-oprate">
<image class="share-img" src="/assets/imgs/share.png"></image>
<text class="share-number">{{contentInfo.transmitSum || 0}}</text>
</view>
</view>
<view class="weui-flex df-j--bt action border_box">
<view class="weui-flex">
......@@ -26,4 +33,7 @@
</view>
</view>
</view>
<x-dialog show="{{showDialig}}" />
\ No newline at end of file
<view class="bottom-img">
<image class="img-top" mode="widthFix" src="/assets/imgs/7_1_0/go-top.png" bindtap="goTop"></image>
</view>
<x-dialog show="{{showDialig}}" bind:_closeDialog="closeDialog" />
\ No newline at end of file
src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.wxss
......@@ -4,6 +4,10 @@
height: 505rpx;
background-color: rgba(216, 216, 216, 1);
}
.detail-img image{
width: 750rpx;
height: 505rpx;
}
.detail-content {
padding: 20rpx 30rpx;
}
......@@ -25,6 +29,11 @@
font-family: PingFangSC-Medium;
padding-top: 10rpx;
}
.bottom-img{
position: fixed;
bottom: 143rpx;
right: 30rpx;
}
.img-top {
width: 85rpx;
......@@ -73,4 +82,13 @@
color: rgba(203, 60, 60, 1);
font-size: 26rpx;
font-family: PingFangSC-Medium;
}
.share-img{
width: 20rpx;
height: 20rpx;
}
.share-number{
font-size: 24rpx;
color: #999999;
margin-left: 10rpx;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment