diff --git a/components/ask-comment/ask-comment.vue b/components/ask-comments-goods/ask-comments-goods.vue similarity index 81% rename from components/ask-comment/ask-comment.vue rename to components/ask-comments-goods/ask-comments-goods.vue index e38ea972..1875bd4a 100644 --- a/components/ask-comment/ask-comment.vue +++ b/components/ask-comments-goods/ask-comments-goods.vue @@ -13,7 +13,7 @@ - + @@ -48,7 +48,17 @@ created: function () {}, - methods: {}, + methods: { + // 评价图片预览 + comment_images_show_event(e) { + var index = e.currentTarget.dataset.index; + var ix = e.currentTarget.dataset.ix; + uni.previewImage({ + current: this.propData[index]["images"][ix], + urls: this.propData[index]["images"], + }); + }, + }, }; diff --git a/components/blog-comments/blog-comments.vue b/components/blog-comments/blog-comments.vue index 725f86c1..33463baf 100644 --- a/components/blog-comments/blog-comments.vue +++ b/components/blog-comments/blog-comments.vue @@ -3,7 +3,7 @@ - + 评论({{ data.comments_count }}) @@ -18,10 +18,10 @@ - + - + @@ -552,6 +552,9 @@ .blog-comments-reply-container .right-base { padding-left: 16rpx; } + .blog-comments-reply-container .right-base .comments { + background-color: #f8f8f8; + } .blog-comments-reply-container .right-base textarea { height: 120rpx; } diff --git a/components/goods-comment/goods-comment.vue b/components/goods-comments/goods-comments.vue similarity index 100% rename from components/goods-comment/goods-comment.vue rename to components/goods-comments/goods-comments.vue diff --git a/pages.json b/pages.json index 27169272..ff01aefe 100644 --- a/pages.json +++ b/pages.json @@ -1002,7 +1002,7 @@ "path": "goods-list/goods-list", "style": { "enablePullDownRefresh": true, - "navigationBarTitleText": "问答列表" + "navigationBarTitleText": "问答专区" } } ] diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue index e735e458..5bd98d2a 100644 --- a/pages/goods-detail/goods-detail.vue +++ b/pages/goods-detail/goods-detail.vue @@ -98,7 +98,7 @@ - {{ plugins_seckill_data.goods_detail_title || "限时秒杀" }} + {{ plugins_seckill_data.goods_detail_title || '限时秒杀' }} - + {{ nav_favor_button_info.text }} @@ -229,8 +229,10 @@ - + 规格 {{ goods_spec_selected_text }} @@ -238,10 +240,12 @@ - + data-value="base" + > ， {{ item.value }} @@ -289,7 +293,7 @@ 好评率 {{ goods.comments_score.rate }}% - + 我要评价 @@ -298,17 +302,15 @@ - - - + 问答 - 查看全部回答 + 查看全部回答 - + 我要提问 @@ -319,8 +321,10 @@ - + {{ plugins_intellectstools_data.content_top.title }} @@ -441,7 +445,7 @@ - + @@ -610,857 +614,860 @@ diff --git a/pages/plugins/ask/detail/detail.vue b/pages/plugins/ask/detail/detail.vue index 58457649..6fbac4f7 100644 --- a/pages/plugins/ask/detail/detail.vue +++ b/pages/plugins/ask/detail/detail.vue @@ -22,6 +22,13 @@ {{ detail_data.reply }} + + 共3个回答 + + + + + @@ -34,13 +41,13 @@ - + 我要提问 - + 我的提问 @@ -59,6 +66,7 @@ import componentNoData from '@/components/no-data/no-data'; import componentBottomLine from '@/components/bottom-line/bottom-line'; import componentGoodsList from '@/components/goods-list/goods-list'; + import componentComments from '@/components/blog-comments/blog-comments'; export default { data() { @@ -87,6 +95,7 @@ componentNoData, componentBottomLine, componentGoodsList, + componentComments, }, props: {}, diff --git a/pages/plugins/ask/goods-list/goods-list.css b/pages/plugins/ask/goods-list/goods-list.css new file mode 100644 index 00000000..4044385c --- /dev/null +++ b/pages/plugins/ask/goods-list/goods-list.css @@ -0,0 +1,23 @@ + + +.question .title{ + width: 40rpx; + height: 40rpx; + line-height: 40rpx; + background: #fd9525; + border-radius: 4rpx; +} +.question .avatar, +.ask .avatar { + width: 80rpx; + height: 80rpx; + border-radius: 4rpx; + background: #F5F5F5; +} +.ask .title{ + width: 40rpx; + height: 40rpx; + line-height: 40rpx; + background: #99BB12; + border-radius: 4rpx; +} \ No newline at end of file diff --git a/pages/plugins/ask/goods-list/goods-list.vue b/pages/plugins/ask/goods-list/goods-list.vue index 02409e35..defb47c5 100644 --- a/pages/plugins/ask/goods-list/goods-list.vue +++ b/pages/plugins/ask/goods-list/goods-list.vue @@ -1,8 +1,220 @@ + const app = getApp(); + import componentNoData from '@/components/no-data/no-data'; + import componentBottomLine from '@/components/bottom-line/bottom-line'; - \ No newline at end of file + export default { + data() { + return { + data_list: [], + data_total: 0, + data_page_total: 0, + data_page: 1, + data_list_loding_status: 1, + data_bottom_line_status: false, + data_is_loading: 0, + goods_id: null, + }; + }, + + components: { + componentNoData, + componentBottomLine, + }, + props: {}, + + onLoad(params) { + if (params || params.goods_id) { + this.setData({ + goods_id: params.goods_id, + }); + } + }, + + onShow() { + this.init(); + }, + + methods: { + init() { + var user = app.globalData.get_user_info(this, 'init'); + if (user != false) { + // 用户未绑定用户则转到登录页面 + if (app.globalData.user_is_need_login(user)) { + uni.redirectTo({ + url: '/pages/login/login?event_callback=init', + }); + return false; + } else { + // 获取数据 + this.get_data_list(); + } + } else { + this.setData({ + data_list_loding_status: 0, + data_bottom_line_status: false, + }); + } + }, + get_data_list(is_mandatory) { + // 分页是否还有数据 + if ((is_mandatory || 0) == 0) { + if (this.data_bottom_line_status == true) { + uni.stopPullDownRefresh(); + return false; + } + } + + // 是否加载中 + if (this.data_is_loading == 1) { + return false; + } + this.setData({ + data_is_loading: 1, + data_list_loding_status: 1, + }); + + // 加载loding + uni.showLoading({ + title: '加载中...', + }); + + // 获取数据 + uni.request({ + url: app.globalData.get_request_url('datalist', 'index', 'ask'), + method: 'POST', + data: { + page: this.data_page, + goods_id: this.goods_id, + is_comments: 1, + }, + dataType: 'json', + success: (res) => { + uni.hideLoading(); + uni.stopPullDownRefresh(); + if (res.data.code == 0) { + if (res.data.data.data.length > 0) { + if (this.data_page <= 1) { + var temp_data_list = res.data.data.data; + } else { + var temp_data_list = this.data_list || []; + var temp_data = res.data.data.data; + for (var i in temp_data) { + temp_data_list.push(temp_data[i]); + } + } + this.setData({ + data_list: temp_data_list, + data_total: res.data.data.total, + data_page_total: res.data.data.page_total, + data_list_loding_status: 3, + data_page: this.data_page + 1, + data_is_loading: 0, + }); + console.log(this.data_list); + + // 是否还有数据 + this.setData({ + data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total, + }); + } else { + this.setData({ + data_list_loding_status: 0, + data_is_loading: 0, + }); + } + } else { + this.setData({ + data_list_loding_status: 0, + data_is_loading: 0, + }); + if (app.globalData.is_login_check(res.data, this, 'get_data_list')) { + app.globalData.showToast(res.data.msg); + } + } + }, + fail: () => { + uni.hideLoading(); + uni.stopPullDownRefresh(); + this.setData({ + data_list_loding_status: 2, + data_is_loading: 0, + }); + app.globalData.showToast('服务器请求出错'); + }, + }); + }, + + // 滚动加载 + scroll_lower(e) { + this.get_data_list(); + }, + // 评价图片预览 + comment_images_show_event(e) { + var index = e.currentTarget.dataset.index; + var ix = e.currentTarget.dataset.ix; + uni.previewImage({ + current: this.data_list[index]['images'][ix], + urls: this.data_list[index]['images'], + }); + }, + }, + }; + + diff --git a/pages/plugins/ask/user-list/user-list.vue b/pages/plugins/ask/user-list/user-list.vue index b7a90b6f..d3656ad6 100644 --- a/pages/plugins/ask/user-list/user-list.vue +++ b/pages/plugins/ask/user-list/user-list.vue @@ -2,7 +2,7 @@ - + {{ item.name }} {{ item.is_reply === '1' ? '已回' : '未回' }} diff --git a/pages/plugins/blog/detail/detail.vue b/pages/plugins/blog/detail/detail.vue index 68ca06c5..5fe4ecbe 100644 --- a/pages/plugins/blog/detail/detail.vue +++ b/pages/plugins/blog/detail/detail.vue @@ -3,29 +3,30 @@ - {{ data.title }} - - - 时间： - {{ data.add_time }} - - - 浏览： - {{ data.access_count }} + + {{ data.title }} + + + 时间： + {{ data.add_time }} + + + 浏览： + {{ data.access_count }} + - - - - + + + + + - + + - - - diff --git a/pages/plugins/intellectstools/goods-comments/goods-comments.vue b/pages/plugins/intellectstools/goods-comments/goods-comments.vue index 9b9c894c..6f0c2c6f 100644 --- a/pages/plugins/intellectstools/goods-comments/goods-comments.vue +++ b/pages/plugins/intellectstools/goods-comments/goods-comments.vue @@ -57,6 +57,7 @@ }, components: { + componentNoData, componentUpload, },