diff --git a/components/order-item/testlist.vue b/components/order-item/testlist.vue index 03f967d..a5bd6aa 100644 --- a/components/order-item/testlist.vue +++ b/components/order-item/testlist.vue @@ -2,14 +2,16 @@ - + + + {{info.goods_try_id}} + 待处理订单 已接单订单 已拒绝订单 已完成订单 - {{info.goods_name}} 共{{info.goods_try_num}}件商品 @@ -67,7 +69,15 @@ export default { display: flex; flex-direction: column; align-items: flex-start; - justify-content: center; + justify-content: space-between; + .box{ + width: 100%; + display: flex; + font-size: 24rpx; + } + .boxid{ + flex: 1; + } .status { align-self: flex-end; font-size: 26rpx; diff --git a/pages/index/details.vue b/pages/index/details.vue index d12e47c..283ccc1 100644 --- a/pages/index/details.vue +++ b/pages/index/details.vue @@ -105,7 +105,8 @@ 确认 - + + - - + @@ -410,15 +397,15 @@ export default { } .complaint { margin: 0 30rpx; - padding: 75rpx 30rpx; + padding: 100rpx 20rpx; background-color: #ffffff; .select-container { display: flex; align-items: center; - margin-bottom: 60rpx; + margin-bottom: 100rpx; .title { - width: 180rpx; - font-size: 30rpx; + width: 150rpx; + font-size: 26rpx; color: rgba(51, 51, 51, 1); margin-right: 20rpx; text-align: right; @@ -456,8 +443,8 @@ export default { box-sizing: border-box; display: flex; .title { - width: 180rpx; - font-size: 30rpx; + width: 150rpx; + font-size: 26rpx; text-align: right; color: rgba(51, 51, 51, 1); margin-right: 20rpx; diff --git a/pages/release/video.vue b/pages/release/video.vue index 5aae2f2..b240598 100644 --- a/pages/release/video.vue +++ b/pages/release/video.vue @@ -113,7 +113,8 @@ export default { selectarr: [], //选中标签 tagcontent: '', //新建标签名字 selectvideo: '', //视频名字 - videostate: false //视频状态 + videostate: false, //视频状态 + progress:0 }; }, onLoad() { @@ -238,7 +239,7 @@ export default { let url = this.action; let that = this; uni.showLoading({ - title:"上传中!" + title:'上传中'+that.progress+'%' }) uni.chooseVideo({ count: 1, @@ -246,7 +247,7 @@ export default { success: function(res) { that.src = res.tempFilePath; const tempFilePaths = res.tempFilePath; - uni.uploadFile({ + const uploadTask = uni.uploadFile({ url: url, //仅为示例,非真实的接口地址 filePath: tempFilePaths, name: 'article_video', @@ -268,6 +269,13 @@ export default { console.log(error); } }); + uploadTask.onProgressUpdate((res) => { + console.log("上传进度",res.progress) + that.progress = res.progress + // 测试条件,取消上传任务。 + if (res.progress == 100) { + } + }); } }); }, diff --git a/static/image/home/chat.png b/static/image/home/chat.png index 15e0ca6..b70f0ee 100644 Binary files a/static/image/home/chat.png and b/static/image/home/chat.png differ