diff --git a/src/pages.json b/src/pages.json index 41ca242..7e5d859 100644 --- a/src/pages.json +++ b/src/pages.json @@ -507,6 +507,23 @@ "enablePullDownRefresh": false } + }, + { + "path" : "pages/my/imgUpload", + "style" : + { + "navigationBarTitleText": "图片上传", + "enablePullDownRefresh": false + } + + },{ + "path" : "pages/my/evaluated", + "style" : + { + "navigationBarTitleText": "已评价", + "enablePullDownRefresh": false + } + }, { "path" : "pages/orderHall/orderHall", @@ -533,6 +550,15 @@ "enablePullDownRefresh": false } } + ,{ + "path" : "pages/my/uploadedImgShow", + "style" : + { + "navigationBarTitleText": "已传图片", + "enablePullDownRefresh": false + } + + } ], "globalStyle": { "navigationBarTitleText": "艺象心", diff --git a/src/pages/my/My.vue b/src/pages/my/My.vue index f321e87..778e670 100644 --- a/src/pages/my/My.vue +++ b/src/pages/my/My.vue @@ -264,7 +264,7 @@ toOrderControl(){ uni.navigateTo({ // 稍后改为 订单管理的页面 - url: "/pages/my/myWoekList", + url: "OrderActControl", }) }, //设置 diff --git a/src/pages/my/OrderActControl.vue b/src/pages/my/OrderActControl.vue index 5bb6bd3..49f1522 100644 --- a/src/pages/my/OrderActControl.vue +++ b/src/pages/my/OrderActControl.vue @@ -3,28 +3,71 @@ - - - 露凝而白|鸿雁来清秋满怀 + + + + 露凝而白|鸿雁来清秋满怀 + + + 已报名 + + + 已完成 + - - 已报名 + + 活动时间:2022/06/27 - - 已完成 + + + + + + + + + + + + + + + + + + + + + - - 活动时间:2022/06/27 - - - - + + + = + + + + + + + + {{v.name}} + + + + + - - - + + + + + + + + @@ -32,7 +75,18 @@ export default { data() { return { - + show: false, + count: 4, + value: 2, + rate2: 2, + total: 0, + score: [{ + name: "jack", + star: 0 + }, { + name: "tom", + star: 0 + }] }; }, methods: { @@ -40,6 +94,27 @@ uni.navigateTo({ // url:`/pages/ActivitiesDetail/ActivitiesDetail?id=${id}` }) + }, + toUpimgPage() { + uni.navigateTo({ + url: `/pages/my/imgUpload` + }) + }, + touploadedimg() { + uni.navigateTo({ + url: `/pages/my/uploadedImgShow` + }) + }, + subEvalue() { + this.show = false + console.log(this.score) + // 提交评价 + }, + toEvlauedpg(){uni.navigateTo({ + url: `/pages/my/evaluated` + })}, + close() { + this.show = false } } } @@ -47,8 +122,8 @@ diff --git a/src/pages/my/evaluated.vue b/src/pages/my/evaluated.vue index 21ca1b8..db918b8 100644 --- a/src/pages/my/evaluated.vue +++ b/src/pages/my/evaluated.vue @@ -9,10 +9,9 @@ - - 1 - 2 + {{v.userName}} + {{v.scoreTime}} + @@ -29,14 +28,14 @@ data() { return { rate2: 2, - total: 0, - score:[1,2] + total: 2, + score:[{ userName:'jaskon',scoreTime:'2020-01-02',avatar:'../../static/DataSearch/TxtImg.png'},{ userName:'tom',scoreTime:'2020-08-02',avatar:'../../static/DataSearch/TxtImg.png'}] }; }, onLoad(op) { - this.score = JSON.parse(decodeURIComponent(op.score)) + /* this.score = JSON.parse(decodeURIComponent(op.score)) this.total = this.score.length - console.log(this.score) + console.log(this.score) */ } } @@ -82,12 +81,13 @@ .pinContent_avator { display: flex; align-items: center; - image { - width: 36rpx; - height: 36rpx; + width: 68rpx; + height: 68rpx; margin-right: 16rpx; - padding: 24rpx 0rpx; + margin:24rpx 16rpx 24rpx 0rpx ; + border-radius: 50%; + overflow: hidden; } .pinContent_Time { diff --git a/src/pages/my/uploadedImgShow.vue b/src/pages/my/uploadedImgShow.vue new file mode 100644 index 0000000..35c96ae --- /dev/null +++ b/src/pages/my/uploadedImgShow.vue @@ -0,0 +1,34 @@ + + + + +