diff --git a/pages/edit/edit.js b/pages/edit/edit.js index 605239d..611f9bc 100644 --- a/pages/edit/edit.js +++ b/pages/edit/edit.js @@ -937,7 +937,7 @@ Page({ wx.chooseImage({ count: 9 - that.data.imgs.length, sizeType: ['compressed'], - success: function (res) { + success: (res) => { let isLt10M = true; let isSvg = true var imgList = []; @@ -947,7 +947,26 @@ Page({ let suffix = res.tempFiles[i].path.slice(suffixIndex + 1, res.tempFiles[i].path.length) if (size < 5 && !limitSuffix.includes(suffix.toLowerCase())) { // 小于3M且照片数量<6的时候才触发上传 - that.upload_picnew(res.tempFiles[i].path, "image") + // that.data.imgs.push({ + // url: data.url, + // aid: data.aid + // }) + // that.setData({ + // imgs: that.data.imgs + // }) + + let imgs = this.data.imgs || [] + imgs.push({ + isImgLoad: true, + path: res.tempFiles[i].path, + progress: 0, + }) + + this.setData({ + imgs, + }) + + that.upload_picnew(res.tempFiles[i].path, this.data.imgs.length) } else if (size >= 5) isLt10M = false; else if (limitSuffix.includes(suffix.toLowerCase())) isSvg = false @@ -976,10 +995,9 @@ Page({ }, // 上传图片 - upload_picnew: function (imgUrl, type) { - console.log("imgUrl", imgUrl); + upload_picnew: function (imgUrl, index) { var that = this; - console.log("uploadData",this.data.uploadData); + // console.log("uploadData", this.data.uploadData); const uploadTask = wx.uploadFile({ url: `https://oss.gter.net/upload`, filePath: imgUrl, @@ -987,7 +1005,7 @@ Page({ formData: { uniqid: that.data.uniqid, session: app.globalData.session, - type, + type: "image", data: this.data.uploadData, }, header: app.globalData.header, @@ -998,20 +1016,19 @@ Page({ data = data.data if (data.aid > 0) { // 长度<6个的时候再push - if (that.data.imgs.length < 9) { - that.data.imgs.push({ - url: data.url, - aid: data.aid - }) - that.setData({ - imgs: that.data.imgs - }) - } else { - wx.showToast({ - title: '最多可上传9张', - icon: 'none' - }) - } + let imgs = that.data.imgs + + imgs.forEach((element, index) => { + if (element.path == imgUrl) { + element['isImgLoad'] = false + element['url'] = data.url + element['aid'] = data.aid + } + }) + + that.setData({ + imgs, + }) } else { wx.showModal({ title: data.state, @@ -1038,6 +1055,19 @@ Page({ }) } }) + uploadTask.onProgressUpdate(res => { + let imgs = this.data.imgs + console.log("imgs", imgs, "imgUrl", imgUrl); + // imgs[index - 1]['progress'] = res.progress + imgs.forEach((element, index) => { + if (element.path == imgUrl) element['progress'] = res.progress + }) + + this.setData({ + imgs + }) + }) + console.log("uploadTask", uploadTask); }, // 选择mp4 diff --git a/pages/edit/edit.wxml b/pages/edit/edit.wxml index 7aa1943..312a3eb 100644 --- a/pages/edit/edit.wxml +++ b/pages/edit/edit.wxml @@ -299,7 +299,12 @@ - + + + + + + @@ -345,7 +350,8 @@ {{popUpSubtitle}} - {{ item.value }} + {{ item.value }} + @@ -413,7 +419,8 @@ - {{ item - 3 >= 0 ? item - 2 : item - 3}} {{ index == floorValue ? '楼' : '' }} + {{ item - 3 >= 0 ? item - 2 : item - 3}} {{ index == floorValue ? '楼' : '' }} + @@ -479,8 +486,13 @@ - + + + + + + @@ -698,7 +710,8 @@ - {{ i + 1 }} + {{ i + 1 }} + diff --git a/pages/edit/edit.wxss b/pages/edit/edit.wxss index 2ead3ee..4733a71 100644 --- a/pages/edit/edit.wxss +++ b/pages/edit/edit.wxss @@ -427,7 +427,7 @@ align-items: center; overflow: hidden; margin-bottom: 20rpx; - + position: relative; } .homePhoto-add-icon { @@ -440,6 +440,30 @@ max-height: 100%; } +.img-loading { + width: 100%; + height: 100%; + position: absolute; + bottom: 0; + left: 0; + background-color: rgba(0, 0, 0, 0.6); +} + +.img-loading .progress { + width: 80%; + height: 20rpx; + background-color: rgb(235, 235, 235); + border-radius: 40rpx; +} + +.img-loading .progress .progress-value { + width: 10%; + height: 100%; + background-color: rgb(9, 187, 7); + border-radius: 40rpx; + transition: all .3s; +} + .red-dot { position: absolute; top: -16rpx; @@ -764,6 +788,7 @@ .pop-up-homePhoto-image .pop-up-homePhoto-image-item { width: 178rpx; height: 178rpx; + position: relative; } .pop-up-homePhoto-image.pop-up-homePhoto-image-kong { diff --git a/pages/messageCenter/messageCenter.js b/pages/messageCenter/messageCenter.js index 3573173..4e4c4e0 100644 --- a/pages/messageCenter/messageCenter.js +++ b/pages/messageCenter/messageCenter.js @@ -170,7 +170,6 @@ Page({ }, copy(e) { - let value = e.currentTarget.dataset.value miucms.copy(this.data.wechat.wechat) }, diff --git a/pages/messageCenter/messageCenter.wxml b/pages/messageCenter/messageCenter.wxml index aa0ad37..f2fead6 100644 --- a/pages/messageCenter/messageCenter.wxml +++ b/pages/messageCenter/messageCenter.wxml @@ -100,6 +100,7 @@ 复制微信号 + @@ -109,4 +110,20 @@ 长按扫码即可关注 + + + + + + + + 寄托方同学的小助手 + + + + + + + + \ No newline at end of file diff --git a/pages/messageCenter/messageCenter.wxss b/pages/messageCenter/messageCenter.wxss index 805dd9b..335b3b7 100644 --- a/pages/messageCenter/messageCenter.wxss +++ b/pages/messageCenter/messageCenter.wxss @@ -1,5 +1,6 @@ /* pages/messageCenter/messageCenter.wxss */ @import '/pages/common/common.wxss'; +@import './messageCenterLess.wxss'; .container { background-color: rgba(246, 246, 246, 1); diff --git a/pages/messageCenter/messageCenterLess.less b/pages/messageCenter/messageCenterLess.less new file mode 100644 index 0000000..8e3035c --- /dev/null +++ b/pages/messageCenter/messageCenterLess.less @@ -0,0 +1,28 @@ +.consult-pop { + align-items: flex-end; + font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif; + + .box { + width: 100%; + height: 891rpx; + background: linear-gradient(180deg, rgba(244, 244, 244, 1) -1%, rgba(247, 250, 255, 1) 100%); + border-radius: 30rpx 30rpx 0 0; + flex-direction: column; + + .title { + width: 331.5rpx; + height: 72rpx; + } + + .hint { + .icon { + width: 33rpx; + height: 33rpx; + } + + font-size: 27rpx; + color: #333333; + } + + } +} \ No newline at end of file diff --git a/pages/messageCenter/messageCenterLess.wxss b/pages/messageCenter/messageCenterLess.wxss new file mode 100644 index 0000000..5aaf230 --- /dev/null +++ b/pages/messageCenter/messageCenterLess.wxss @@ -0,0 +1,23 @@ +.consult-pop { + align-items: flex-end; + font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif; +} +.consult-pop .box { + width: 100%; + height: 891rpx; + background: linear-gradient(180deg, #f4f4f4 -1%, #f7faff 100%); + border-radius: 30rpx 30rpx 0 0; + flex-direction: column; +} +.consult-pop .box .title { + width: 331.5rpx; + height: 72rpx; +} +.consult-pop .box .hint { + font-size: 27rpx; + color: #333333; +} +.consult-pop .box .hint .icon { + width: 33rpx; + height: 33rpx; +}