diff --git a/common/api/user.js b/common/api/user.js index 3d62a31..6fa493c 100644 --- a/common/api/user.js +++ b/common/api/user.js @@ -217,6 +217,12 @@ export default { page: page, }); }, + // 删除浏览记录 + delMemberBrowse({ goods_id }) { + return vm.$u.post('Member/delMemberBrowse', { + goods_id: goods_id, + }); + }, // 意见反馈列表 getFeedbackList({ page }) { return vm.$u.post('Member/feedbackList', { diff --git a/pageE/mine/ImageTextCollection.vue b/pageE/mine/ImageTextCollection.vue index 632ed7d..c19a5bc 100644 --- a/pageE/mine/ImageTextCollection.vue +++ b/pageE/mine/ImageTextCollection.vue @@ -1,11 +1,13 @@ @@ -39,8 +32,17 @@ export default { data() { return { + tid: '', show: -1, articleList: [], + showAction: false, + actionList: [ + { + text: '删除', + color: '#000000', + fontSize: 36 + } + ] } }, onShow() { @@ -51,9 +53,6 @@ export default { this.articleCollectList(); }, methods: { - showAction(item) { - this.show = this.show > 0 ? -1 : item.article_id; - }, articleCollectList() { this.$u.api.articleCollectList().then(res => { uni.stopPullDownRefresh(); @@ -64,8 +63,16 @@ export default { } }) }, - delArticle(id) { - this.$u.api.articleCollect({ article_id: id }).then(res => { + viewAction(id) { + this.showAction = true; + this.tid = id; + }, + toDetailsPage({ id, type }) { + let src = type == 1 ? 'pageB/photo/index' : 'pageB/video/video'; + this.$u.route(src, {　id: id　}); + }, + delArticle() { + this.$u.api.articleCollect({ article_id: this.tid }).then(res => { if(res.errCode == 0) { this.articleCollectList(); } else { @@ -73,11 +80,6 @@ export default { } }) }, - toDetailsPage(id) { - uni.navigateTo({ - url: '/pageB/photo/index?id=' + id - }); - }, } }; @@ -88,11 +90,9 @@ export default { padding: 21rpx 30rpx 0; display: flex; flex-wrap: wrap; + justify-content: space-between; .item-box { - &:not(:nth-child(2n)) { - margin-right: 20rpx; - } - .video-item{ + .video-item { width: 330rpx; height: 510rpx; margin-top: 20rpx; @@ -104,30 +104,28 @@ export default { height: 330rpx !important; } .title{ - margin:0 auto; - margin-top: 20rpx; + margin: 20rpx auto 0; font-size: 22rpx; color: #333; font-weight: 500; + height: 30rpx; line-height: 30rpx; width: 300rpx; } .jianjie{ - // height: 60rpx; - margin:0 auto; - margin-top: 20rpx; + height: 30rpx; + margin: 20rpx auto 0; font-size: 22rpx; color: #666; line-height: 30rpx; width: 300rpx; margin-left: 18rpx; } - .user{ + .user { display: flex; justify-content: space-between; align-items: center; - margin:0 auto; - margin-top: 20rpx; + margin: 20rpx auto 0; width: 300rpx; position: relative; .info { @@ -149,82 +147,27 @@ export default { width: 37rpx; height: 8rpx; } - .action { - z-index: 19; - position: absolute; - right: 0rpx; - bottom: 55rpx; - // width: 234rpx; - background: rgba(255,255,255,1); - box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12); - border-radius: 6rpx; - .bubble { - position: relative; - background-color: #fff; - &::after { - position: absolute; - right: 10rpx; - bottom: 0; - content: ''; - width: 60rpx; - height: 40rpx; - background-color: inherit; - transform: rotate(45deg); - margin-top: -10rpx; - z-index: -1; - box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12); - } - > view { - padding: 9rpx 12rpx; - display: flex; - align-items: center; - &:not(:last-child) { - border-bottom: 2rpx #ECECEC solid; - } - @mixin image-class($width, $height, $right) { - width: $width; - height: $height; - margin-right: $right; - } - > image { - &:first-child { - @include image-class($width: 21rpx, $height: 22rpx, $right: 12rpx); - } - &:nth-child(2) { - @include image-class($width: 22rpx, $height: 22rpx, $right: 12rpx); - } - &:last-child { - @include image-class($width: 24rpx, $height: 20rpx, $right: 9rpx); - } - } - > text { - font-size: 20rpx; - color: rgba(51,51,51,1); - } - } - } - } - .layer { - position: fixed; - top: 0; - left: 0; + } + .header_fist { + width: 330rpx; + height: 330rpx; + position: relative; + .backs { width: 100%; height: 100%; z-index: 9; - background-color: transparent; - } - } - .header_fist{ - position: relative; - .backes{ position: absolute; - top: 0; - // background: rgba(0,0,0,0.6); - width: 100%; - height: 100%; - color: #fff; + background-color: rgba(0, 0, 0, 0.35); + .play-icon { + z-index: 19; + position: absolute; + width: 100rpx; + height: 100rpx; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + } } - } } } diff --git a/pageE/order/Comment.vue b/pageE/order/Comment.vue index fb376b0..e574bb7 100644 --- a/pageE/order/Comment.vue +++ b/pageE/order/Comment.vue @@ -146,7 +146,8 @@ export default { let files = []; // console.log(this.uploadImageList); this.uploadImageList.forEach((item, index) => { - // files[index] = ''; + // 赋默认值 + files[index] = ''; // console.log(item); item.forEach((img, idx) => { if(idx < item.length-1) { diff --git a/pageE/tool/MineHistory.vue b/pageE/tool/MineHistory.vue index dfcb728..67d100e 100644 --- a/pageE/tool/MineHistory.vue +++ b/pageE/tool/MineHistory.vue @@ -8,16 +8,16 @@ {{ item.store_name }} - + {{ item.goods_name }} - + + + - + @@ -28,16 +28,40 @@ export default { data() { return { + hid: '', // 选中的商品 id historyList: [], page: 1, // 默认1 loadStatus: 'loadmore', timer: true, + showAction: false, + actionList: [ + { + text: '删除', + color: '#000000', + fontSize: 36 + } + ] }; }, onLoad() { this.getBrowseList(); }, methods: { + viewAction(id) { + this.showAction = true; + this.hid = id; + }, + delHistory() { + let glist = []; + glist.push(this.hid); + this.$u.api.delMemberBrowse({ goods_id: glist }).then(res => { + if(res.errCode == 0) { + this.getBrowseList(); + } else { + this.$u.toast(res.message); + } + }) + }, viewStoreDetails(sid) { this.$u.route({ url: 'pageC/merchant/index', @@ -54,11 +78,12 @@ export default { } }) }, - async getBrowseList () { + async getBrowseList ({ load = 'reload' } = {}) { const res = await this.$u.api.getBrowseList({ page: this.page }); this.timer = true; if(res.errCode == 0) { - this.historyList.push(...res.data.storeInfo); + if(load == 'reload') this.historyList = res.data.storeInfo; + else if(load == 'loadmore') this.historyList.push(...res.data.storeInfo); } return res.data.storeInfo.length; }, @@ -67,7 +92,7 @@ export default { this.timer = false; this.loadStatus = "loading"; this.page++; - this.getBrowseList().then(length => { + this.getBrowseList({ load: 'loadmore' }).then(length => { if(length == 0) { this.page--; this.loadStatus = 'nomore'; @@ -103,6 +128,7 @@ export default { .item-title { display: flex; align-items: center; + margin-bottom: 20rpx; > image { width: 50rpx; height: 50rpx; @@ -115,25 +141,24 @@ export default { } } .item-image { - margin: 20rpx 0 17rpx; width: 180rpx; height: 140rpx; border-radius: 10rpx; } .item-info { + height: 60rpx; + font-size: 22rpx; display: flex; justify-content: space-between; align-items: center; .info-name { - margin-right: 10rpx; + height: 60rpx; + line-height: 60rpx; + margin-right: 14rpx; flex: 1; font-size: 22rpx; color: rgba(51,51,51,1); } - // > image { - // width: 37rpx; - // height: 8rpx; - // } } } }