xiangshan
/
yxxh5
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/boss-01/yxx/app

This commit is contained in:
jiangnan 2022-07-15 16:03:46 +08:00
parent 8560790c72 3a3d958eda
commit 7c409b00f6
5 changed files with 234 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/pages.json
View File

@ -507,6 +507,23 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},
{
"path" : "pages/my/imgUpload",
"style" :
{
"navigationBarTitleText": "图片上传",
"enablePullDownRefresh": false
}
},{
"path" : "pages/my/evaluated",
"style" :
{
"navigationBarTitleText": "已评价",
"enablePullDownRefresh": false
}
}, },
{ {
"path" : "pages/orderHall/orderHall", "path" : "pages/orderHall/orderHall",
@ -533,6 +550,15 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }
,{
"path" : "pages/my/uploadedImgShow",
"style" :
{
"navigationBarTitleText": "已传图片",
"enablePullDownRefresh": false
}
}
], ],
"globalStyle": { "globalStyle": {
"navigationBarTitleText": "艺象心", "navigationBarTitleText": "艺象心",

2
src/pages/my/My.vue
View File

@ -264,7 +264,7 @@
toOrderControl(){ toOrderControl(){
uni.navigateTo({ uni.navigateTo({
// 稍后改为 订单管理的页面 // 稍后改为 订单管理的页面
url: "/pages/my/myWoekList", url: "OrderActControl",
}) })
}, },
//设置 //设置

179
src/pages/my/OrderActControl.vue
View File

@ -3,6 +3,7 @@
<view class="art_act_itm" v-for="(v,i) in 3" :key="i" @click="goActDeat(i)"> <view class="art_act_itm" v-for="(v,i) in 3" :key="i" @click="goActDeat(i)">
<image src="../../static/icon12.jpg" mode=""></image> <image src="../../static/icon12.jpg" mode=""></image>
<view class="bottom_part" style="padding: 0 12px;">
<view class="ddd" style="display: flex; justify-content: space-between; align-items: center;"> <view class="ddd" style="display: flex; justify-content: space-between; align-items: center;">
<view class="title"> <view class="title">
露凝而白｜鸿雁来清秋满怀 露凝而白｜鸿雁来清秋满怀
@ -17,14 +18,56 @@
<view class="act_time" style=""> <view class="act_time" style="">
活动时间：2022/06/27 活动时间：2022/06/27
</view> </view>
<view class="but_box"> <view class="but_box" style="margin-top: 20rpx;">
<view style="width: 118px;"> <view style="width: 236rpx; margin: 0 10rpx;">
<u-button shape="circle" text="已传图片"></u-button> <u-button color="#99241B" shape="circle" text="确认完成"></u-button>
</view>
<view style="width: 236rpx;margin: 0 10rpx; ">
<u-button icon="photo-fill" shape="circle" text="已传图片" @click="touploadedimg()"></u-button>
</view>
<view style="width: 236rpx;margin: 0 10rpx; ">
<u-button icon="photo-fill" shape="circle" color="#99241B" plain text="图片上传"
@click="toUpimgPage()"></u-button>
</view>
<view style="width: 190rpx;margin: 0 10rpx; ">
<u-button shape="circle" text="取消报名"></u-button>
</view>
<view style="width: 190rpx;margin: 0 10rpx; ">
<u-button plain color="#99241B" shape="circle" text="评价" @click="show=true"></u-button>
</view>
<view style="width: 190rpx;margin: 0 10rpx; ">
<u-button shape="circle" text="已评价" @click="toEvlauedpg"></u-button>
</view> </view>
</view> </view>
</view> </view>
</view>=
<u-modal :show="show" @close="close()" :closeOnClickOverlay="true">
<view class="pinContent">
<view class="pinContent_itm" v-for='(v,i) in score' :key="i">
<view class="pinContent_avator">
<image class="pinContent_avator_img" src="../../static/MyBg.png" mode=""></image>
<view class="pinContent_Time">
<text style="font-size: 24rpx; font-weight: 600;">{{v.name}}</text>
</view>
</view>
<view class="pinContent_rate">
<u-rate count=5 v-model="v.star"></u-rate>
</view>
</view>
</view>
<view slot="confirmButton" style="display: flex; justify-content: center; align-items: center;">
<view style="width: 400rpx;">
<u-button color="#99241B" shape="circle" text="提交" @click="subEvalue()"></u-button>
</view>
</view>
</u-modal>
</view> </view>
</template> </template>
@ -32,7 +75,18 @@
export default { export default {
data() { data() {
return { return {
show: false,
count: 4,
value: 2,
rate2: 2,
total: 0,
score: [{
name: "jack",
star: 0
}, {
name: "tom",
star: 0
}]
}; };
}, },
methods: { methods: {
@ -40,6 +94,27 @@
uni.navigateTo({ uni.navigateTo({
// url:`/pages/ActivitiesDetail/ActivitiesDetail?id=${id}` // 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 @@
<style lang="scss"> <style lang="scss">
page { page {
width: calc(100% - 32px); width: calc(100% - 64rpx);
margin: 0px 16px; margin: 0rpx 32rpx;
background-color: #F5F5F5 !important; background-color: #F5F5F5 !important;
} }
@ -56,64 +131,96 @@
width: 100%; width: 100%;
height: 60%; height: 60%;
} }
.but_box{
.but_box {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
align-items: center; align-items: center;
} }
.tag_sta { .tag_sta {
width: 50px; width: 100rpx;
height: 24px; height: 48rpx;
background: #F9F2F2; background: #F9F2F2;
border-radius: 4px; border-radius: 8rpx;
line-height: 24px; line-height: 48rpx;
color: #99241B; color: #99241B;
text-align: center; text-align: center;
font-size: 12px; font-size: 24rpx;
} }
.tag_sta_end{
width: 50px; .tag_sta_end {
height: 24px; width: 100rpx;
background: #FFF4ED;; height: 48rpx;
border-radius: 4px; background: #FFF4ED;
line-height: 24px; ;
border-radius: 8rpx;
line-height: 48rpx;
color: #FF6600; color: #FF6600;
text-align: center; text-align: center;
font-size: 12px; font-size: 24rpx;
} }
.act_time { .act_time {
height: 17px; height: 34rpx;
font-size: 12px; font-size: 24rpx;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #AFADB0; color: #AFADB0;
line-height: 17px; line-height: 34rpx;
} }
.art_act_itm { .art_act_itm {
margin-top: 12px; margin-top: 24rpx;
height: 314px; height: 628rpx;
border-radius: 8px; border-radius: 8px;
border: 1px solid transparnt; border: 2rpx solid transparnt;
position: relative; position: relative;
border-radius: 10px; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
background-color: #FFFFFF; background-color: #FFFFFF;
.title { .title {
/* position: absolute;
bottom: 0; height: 88rpx;
background: #000000;
border-radius: 0px 0px 8px 8px;
opacity: 0.3;*/
height: 44px;
color: #000000; color: #000000;
line-height: 44px; line-height: 88rpx;
font-size: 16px; font-size: 32rpx;
font-weight: 600; font-weight: 600;
color: #251B1D; color: #251B1D;
padding-left: 12px;
} }
} }
.pinContent {
margin-top: 16rpx;
.pinContent_itm {
width: 500rpx;
display: flex;
align-items: center;
justify-content: space-between;
.pinContent_avator {
display: flex;
align-items: center;
.pinContent_avator_img {
width: 68rpx;
height: 68rpx;
margin-right: 16rpx;
margin: 24rpx 16rpx 24rpx 0rpx;
border-radius: 50%;
overflow: hidden;
}
.pinContent_Time {
display: flex;
flex-direction: column;
justify-content: space-between;
}
}
}
}
</style> </style>

24
src/pages/my/evaluated.vue
View File

@ -9,10 +9,9 @@
<view class="pinContent_avator"> <view class="pinContent_avator">
<image :src="v.avatar" mode=""></image> <image :src="v.avatar" mode=""></image>
<view class="pinContent_Time"> <view class="pinContent_Time">
<!-- <text style="font-size: 24rpx; font-weight: 600;">{{v.userName}}</text> <text style="font-size: 24rpx; font-weight: 600;">{{v.userName}}</text>
<text style="font-size: 24rpx; color: #AFADB0;">{{v.scoreTime}}</text> --> <text style="font-size: 24rpx; color: #AFADB0;">{{v.scoreTime}}</text>
<text style="font-size: 24rpx; font-weight: 600;">1</text>
<text style="font-size: 24rpx; color: #AFADB0;">2</text>
</view> </view>
</view> </view>
<view class="pinContent_rate"> <view class="pinContent_rate">
@ -29,14 +28,14 @@
data() { data() {
return { return {
rate2: 2, rate2: 2,
total: 0, total: 2,
score:[1,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) { onLoad(op) {
this.score = JSON.parse(decodeURIComponent(op.score)) /* this.score = JSON.parse(decodeURIComponent(op.score))
this.total = this.score.length this.total = this.score.length
console.log(this.score) console.log(this.score) */
} }
} }
@ -82,12 +81,13 @@
.pinContent_avator { .pinContent_avator {
display: flex; display: flex;
align-items: center; align-items: center;
image { image {
width: 36rpx; width: 68rpx;
height: 36rpx; height: 68rpx;
margin-right: 16rpx; margin-right: 16rpx;
padding: 24rpx 0rpx; margin:24rpx 16rpx 24rpx 0rpx ;
border-radius: 50%;
overflow: hidden;
} }
.pinContent_Time { .pinContent_Time {

34
src/pages/my/uploadedImgShow.vue Normal file
View File

@ -0,0 +1,34 @@
<template>
<view class="im" >
<image v-for=" (v,i) in imgArr" class="imgSt" :src="v" mode=""></image>
</view>
</template>
<script>
export default {
data() {
return {
imgArr:["../../static/DataSearch/TxtImg.png","../../static/DataSearch/TxtImg.png"]
};
}
}
</script>
<style lang="scss">
.imgSt{
width: 200rpx;
height: 200rpx;
border-radius: 10rpx;
overflow: hidden;
margin: 0 10rpx;
}
page{
padding-top: 24rpx;
width: calc(100% - 32rpx);
margin: 0 auto;
}
</style>