diff --git a/components/upload/upload.vue b/components/upload/upload.vue index a41e5702..81162d84 100644 --- a/components/upload/upload.vue +++ b/components/upload/upload.vue @@ -84,9 +84,14 @@ }; }, mounted() { + //#ifndef APP-NVUE this.setData({ form_images_list: (this.propData || null) == null ? [] : (typeof this.propData == 'string' ? this.propData.split(',') : this.propData), }); + //#endif + //#ifdef APP-NVUE + this.form_images_list = (this.propData || null) == null ? [] : (typeof this.propData == 'string' ? this.propData.split(',') : this.propData); + //#endif }, created: function () {}, @@ -111,11 +116,18 @@ if(self.propSingleCall) { // 是否返回全部信息 if(self.propIsAllInfo) { + //#ifndef APP-NVUE self.$emit('call-back', data.data, self.propCallData); + //#endif + //#ifdef APP-NVUE + self.$emit('callBack', data.data, self.propCallData); + //#endif } else { self.$emit('call-back', data.data.url, self.propCallData); } } else { + console.log(list); + var list = self.form_images_list; // 返回全部信息 if(self.propIsAllInfo) { @@ -123,9 +135,14 @@ } else { list.push(data.data.url); } + //#ifndef APP-NVUE self.setData({ form_images_list: list, }); + //#endif + //#ifdef APP-NVUE + self.form_images_list = list; + //#endif self.$emit('call-back', self.form_images_list, self.propCallData); } } else { @@ -177,9 +194,14 @@ if (res.confirm) { var list = self.form_images_list; list.splice(e.currentTarget.dataset.index, 1); + //#ifndef APP-NVUE self.setData({ form_images_list: list, }); + //#endif + //#ifdef APP-NVUE + self.form_images_list = list; + //#endif self.$emit('call-back', self.form_images_list, self.propCallData); } }, diff --git a/pages/plugins/video/detail/detail-nvue.css b/pages/plugins/video/detail/detail-nvue.css index 77d5406b..d646c25b 100644 --- a/pages/plugins/video/detail/detail-nvue.css +++ b/pages/plugins/video/detail/detail-nvue.css @@ -251,15 +251,21 @@ .comment-input-img-container { padding: 10rpx 16rpx 16rpx 16rpx; } -.comment-input-img-close { - position: absolute; - right: -15rpx; - top: -15rpx; - z-index: 2; -} + .comment-input-img { - width: 50rpx; - height: 50rpx; + width: 100rpx; + height: 100rpx; +} +.form-img-icon { + position: absolute; + top: 0; + right: 6rpx; + margin: 5rpx 0 5rpx 5rpx; + z-index: 2; + height: 30rpx; + width: 30rpx; + background: #fff; + border-radius: 20rpx; } /* 新的举报弹窗样式 */ diff --git a/pages/plugins/video/detail/detail.nvue b/pages/plugins/video/detail/detail.nvue index de76776a..08ca9dca 100644 --- a/pages/plugins/video/detail/detail.nvue +++ b/pages/plugins/video/detail/detail.nvue @@ -162,15 +162,17 @@ - - + + - - + + + + @@ -226,14 +228,16 @@ - + - - + + + +