diff --git a/common/http.api.js b/common/http.api.js index d6e9b05..4618888 100644 --- a/common/http.api.js +++ b/common/http.api.js @@ -86,8 +86,8 @@ const install = (Vue, vm) => { return vm.$u.post("/article/articleInfo",{article_id}) }, // 回复评论 - reply({article_id,pid,content}){ - return vm.$u.post("/article/articleAddComment",{article_id,pid,content}) + reply({article_id,pid,content,reply_id}){ + return vm.$u.post("/article/articleAddComment",{article_id,pid,content,reply_id}) }, // 达人是否可以直播 canlive(){ diff --git a/components/order-item/index.vue b/components/order-item/index.vue index 2192fd1..b825eb4 100644 --- a/components/order-item/index.vue +++ b/components/order-item/index.vue @@ -10,14 +10,15 @@ 待处理订单 已发货订单 已完成订单 - 申请退款订单 + 申请退款 已退款订单 - 拒绝退款订单 + 商家同意 + 商家拒绝 {{info.extend_order_goods[0].goods_name}} - 共{{info.extend_order_goods[0].goods_num}}件商品 - 实付￥{{info.extend_order_goods[0].goods_pay_price}} + 共{{info.count_number}}件商品 + 实付￥{{info.order_amount}} diff --git a/pages.json b/pages.json index 9643366..11ac68c 100644 --- a/pages.json +++ b/pages.json @@ -266,29 +266,28 @@ }, "tabBar": { "color": "#7A7E83", - "selectedColor": "#3cc51f", + "selectedColor": "#FF780F", "borderStyle": "black", "backgroundColor": "#ffffff", "height": "50px", - "fontSize": "10px", "iconWidth": "24px", "spacing": "3px", "list": [{ "pagePath": "pages/index/index", - "iconPath": "", - "selectedIconPath": "", + "iconPath": "static/image/tabbar/index.png", + "selectedIconPath": "static/image/tabbar/indexselect.png", "text": "首页", "selectedColor": "#FBFBFB" }, { "pagePath": "pages/messages/messagesList", - "iconPath": "", - "selectedIconPath": "", + "iconPath": "static/image/tabbar/info.png", + "selectedIconPath": "static/image/tabbar/infoselect.png", "text": "消息", "selectedColor": "#FBFBFB" }, { "pagePath": "pages/user/index", - "iconPath": "", - "selectedIconPath": "", + "iconPath": "static/image/tabbar/mine.png", + "selectedIconPath": "static/image/tabbar/mineselect.png", "text": "我的", "selectedColor": "#FBFBFB" }] diff --git a/pages/index/details.vue b/pages/index/details.vue index e9d40da..17762e6 100644 --- a/pages/index/details.vue +++ b/pages/index/details.vue @@ -1,32 +1,38 @@ @@ -135,6 +153,13 @@ export default { type: 'error' }); } else { + this.$refs.uToast.show({ + title: res.message, + type: 'success' + }); + uni.navigateBack({ + delta: 1 + }); } }); } else { @@ -150,6 +175,13 @@ export default { type: 'error' }); } else { + this.$refs.uToast.show({ + title: res.message, + type: 'success' + }); + uni.navigateBack({ + delta: 1 + }); } }); } @@ -234,6 +266,13 @@ export default { } } } + .refunds-title{ + padding: 25rpx 30rpx; + font-weight: 500; + color: #333333; + background-color: #ffffff; + border-bottom: 2rpx solid #ececec; + } .refunds-user { padding: 25rpx 30rpx; background-color: #ffffff; @@ -290,7 +329,7 @@ export default { border-bottom: 2rpx solid #ececec; } .title { - width: 150rpx; + width: 170rpx; font-size: 30rpx; margin-right: 10rpx; } diff --git a/pages/release/index.vue b/pages/release/index.vue index ef217e0..8ea3402 100644 --- a/pages/release/index.vue +++ b/pages/release/index.vue @@ -32,8 +32,8 @@ 标签 - + 新建标签 - + + 新建标签 + {{ item.name }} @@ -46,10 +46,10 @@ 选择商品 - + - + @@ -164,7 +164,7 @@ export default { }); }, // 获取商品数组变化 - getshoplist() { + getshoplist(id) { let arr = this.arres_list; let newarr = this.list; this.shoplist = []; @@ -246,11 +246,16 @@ export default { }, // 选中某个复选框时，由checkbox时触发 checkboxChange(e) { - let id = e.name; - if (e.value == true) { - this.pushes(id); - } else { - this.delarr(id); + let id = e; + for(let num in this.list){ + if(id==this.list[num].goods_id){ + if(this.list[num].checked==true){ + this.delarr(id); + }else{ + this.pushes(id); + } + this.list[num].checked = !this.list[num].checked + } } }, // 删除直播商品 @@ -261,7 +266,7 @@ export default { } else { let index = that.arres_list.indexOf(id); that.arres_list.splice(index, 1); - that.getshoplist(); + that.getshoplist(id); } }, // 增加直播商品 @@ -271,7 +276,7 @@ export default { console.log('为空'); } else { that.arres_list.push(id); - that.getshoplist(); + that.getshoplist(id); } }, tosign() { @@ -307,7 +312,7 @@ export default { margin: 0 auto; .form-view { - background: rgba(255, 120, 15, 1); + background: #CDC7C8; border-radius: 6rpx; margin-right: 20rpx; font-size: 24rpx; @@ -317,7 +322,7 @@ export default { color: #fff; } .active { - background: red; + background: #FF780F; } .scroll { width: 100%; diff --git a/pages/release/video.vue b/pages/release/video.vue index 8b7c613..6f482f1 100644 --- a/pages/release/video.vue +++ b/pages/release/video.vue @@ -24,8 +24,8 @@ 标签 - + 新建标签 - + + 新建标签 + {{ item.name }} @@ -37,10 +37,10 @@ 选择商品 - + - + @@ -270,11 +270,15 @@ export default { }, // 选中某个复选框时，由checkbox时触发 checkboxChange(e) { - let id = e.name; - if (e.value == true) { - this.pushes(id); - } else { - this.delarr(id); + for(let num in this.list){ + if(id==this.list[num].goods_id){ + if(this.list[num].checked==true){ + this.delarr(id); + }else{ + this.pushes(id); + } + this.list[num].checked = !this.list[num].checked + } } }, // 删除直播商品 @@ -433,7 +437,7 @@ export default { -webkit-line-clamp: 2; } .form-view { - background: rgba(255, 120, 15, 1); + background: #CDC7C8; border-radius: 6rpx; margin-right: 20rpx; font-size: 24rpx; @@ -443,7 +447,7 @@ export default { color: #fff; } .active { - background: red; + background: #FF780F; } .titles { font-size: 30rpx; diff --git a/pages/user/contentDetails.vue b/pages/user/contentDetails.vue index 8a63c24..fab43fd 100644 --- a/pages/user/contentDetails.vue +++ b/pages/user/contentDetails.vue @@ -31,12 +31,12 @@ - + - {{item.member_nickname}} + {{item.member_nickname}}{{item.reply_member_nickname==null?"评论了文章":" 回复了 "+item.reply_member_nickname}} {{item.create_time}} - 回复 + 回复 {{item.content}} @@ -63,7 +63,8 @@ export default { }, type:1, content:"", - pid:null + pid:null, + replyid:null }; }, onLoad(option) { @@ -74,9 +75,10 @@ export default { }, methods: { // 展示回复弹框 - showreply(id){ + showreply(id,replyid){ this.showChat = true this.pid = id + this.replyid = replyid }, // 回复评论 reply(){ @@ -91,7 +93,8 @@ export default { this.$u.api.reply({ pid:that.pid, content:that.content, - article_id: that.id + article_id: that.id, + reply_id:that.replyid }).then(res => { if (res.errCode != 0) { this.$refs.uToast.show({ @@ -101,6 +104,8 @@ export default { } else { this.pid = ""; this.content = ""; + this.getdetail(); + this.showChat = false this.$refs.uToast.show({ title: res.message, type: 'success' diff --git a/pages/user/index.vue b/pages/user/index.vue index 34c7785..b86a080 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -35,6 +35,8 @@ export default { } }, onLoad() { + }, + onShow() { this.getmyinfo() }, methods: { diff --git a/static/image/home/chat.png b/static/image/home/chat.png new file mode 100644 index 0000000..15e0ca6 Binary files /dev/null and b/static/image/home/chat.png differ diff --git a/static/image/index/live.png b/static/image/index/live.png index f01d90e..eb1a146 100644 Binary files a/static/image/index/live.png and b/static/image/index/live.png differ diff --git a/static/image/index/photo.png b/static/image/index/photo.png index 8c1ae36..74ea53e 100644 Binary files a/static/image/index/photo.png and b/static/image/index/photo.png differ diff --git a/static/image/index/video.png b/static/image/index/video.png index d55e0dd..75b8d97 100644 Binary files a/static/image/index/video.png and b/static/image/index/video.png differ diff --git a/static/image/tabbar/index.png b/static/image/tabbar/index.png new file mode 100644 index 0000000..dd79cbf Binary files /dev/null and b/static/image/tabbar/index.png differ diff --git a/static/image/tabbar/indexselect.png b/static/image/tabbar/indexselect.png new file mode 100644 index 0000000..ada108f Binary files /dev/null and b/static/image/tabbar/indexselect.png differ diff --git a/static/image/tabbar/info.png b/static/image/tabbar/info.png new file mode 100644 index 0000000..a1ea72c Binary files /dev/null and b/static/image/tabbar/info.png differ diff --git a/static/image/tabbar/infoselect.png b/static/image/tabbar/infoselect.png new file mode 100644 index 0000000..18c49d2 Binary files /dev/null and b/static/image/tabbar/infoselect.png differ diff --git a/static/image/tabbar/mine.png b/static/image/tabbar/mine.png new file mode 100644 index 0000000..cef4977 Binary files /dev/null and b/static/image/tabbar/mine.png differ diff --git a/static/image/tabbar/mineselect.png b/static/image/tabbar/mineselect.png new file mode 100644 index 0000000..8fd5d5b Binary files /dev/null and b/static/image/tabbar/mineselect.png differ