Merge branch 'master' of https://e.coding.net/boss-01/yxx/app
This commit is contained in:
lnn19986213
commit
75eb5b96cd
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name" : "艺象心",
|
"name" : "艺象心",
|
||||||
"appid" : "__UNI__77CA6BC",
|
"appid" : "__UNI__C2FB70F",
|
||||||
"description" : "",
|
"description" : "",
|
||||||
"versionName" : "1.0.0",
|
"versionName" : "1.0.0",
|
||||||
"versionCode" : "100",
|
"versionCode" : "100",
|
||||||
|
|
|
||||||
|
|
@ -1,110 +1,115 @@
|
||||||
<template>
|
<template>
|
||||||
<view>
|
<view>
|
||||||
|
|
||||||
<view class="tabss" style="display: flex;justify-content: space-between; align-items: center;background-color: #FFFFFF; ">
|
<view class="tabss"
|
||||||
<view @click="clickTab(1)" :class="{'acttiveSty': tabNum==1}" style="flex: 1; text-align: center;height: 40px; line-height: 40px;">
|
style="display: flex;justify-content: space-between; align-items: center;background-color: #FFFFFF; ">
|
||||||
|
<view @click="clickTab(1)" :class="{'acttiveSty': tabNum==1}"
|
||||||
|
style="flex: 1; text-align: center;height: 40px; line-height: 40px;">
|
||||||
<text>已发布</text>
|
<text>已发布</text>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<view style="flex: 1;text-align: center;" :class="{'acttiveSty': tabNum==2}" @click="clickTab(2)">
|
<view style="flex: 1;text-align: center;" :class="{'acttiveSty': tabNum==2}" @click="clickTab(2)">
|
||||||
<text>已接单</text>
|
<text>已接单</text>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
<view class="art_act_itm" v-for="(item,i) in orderList" :key="i" @click="goActDeat(i)" v-if="tabNum==1">
|
<view class="main" >
|
||||||
<!-- <image src="../../static/icon12.jpg" mode=""></image> -->
|
<view class="art_act_itm" v-for="(item,i) in orderList" :key="i" @click="goActDeat(i)" v-if="tabNum==1">
|
||||||
<image :src="item.enclosure" mode=""></image>
|
<!-- <image src="../../static/icon12.jpg" mode=""></image> -->
|
||||||
<view class="bottom_part" style="padding: 0 12px;">
|
<image :src="item.enclosure" mode=""></image>
|
||||||
<view class="ddd" style="display: flex; justify-content: space-between; align-items: center;">
|
<view class="bottom_part" style="padding: 0 12px;">
|
||||||
<view class="title">
|
<view class="ddd" style="display: flex; justify-content: space-between; align-items: center;">
|
||||||
{{item.title}}
|
<view class="title">
|
||||||
|
{{item.title}}
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<view class="tag_sta_end" v-if='item.state=="3"'>
|
||||||
|
已完成
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<view class="tag_sta_going" v-if='item.state=="1"||item.state=="0"'>
|
||||||
|
进行中
|
||||||
|
</view>
|
||||||
|
<view class="tag_sta_end" v-if='item.state== "2"'>
|
||||||
|
待评价
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
<view class="act_time">
|
||||||
<view class="tag_sta_end" v-if='item.state=="3"'>
|
|
||||||
已完成
|
活动时间： {{item.createdAt}}
|
||||||
</view>
|
</view>
|
||||||
|
<view class="but_box" style="margin-top: 20rpx;">
|
||||||
<view class="tag_sta_going" v-if='item.state=="1"||item.state=="0"'>
|
|
||||||
进行中
|
|
||||||
|
|
||||||
|
<view style="width: 236rpx;margin: 0 10rpx; " v-if='!(item.state== "0")'>
|
||||||
|
<u-button icon="photo-fill" shape="circle" text="已传图片" @click="touploadedimg(item.images)">
|
||||||
|
</u-button>
|
||||||
|
</view>
|
||||||
|
<view style="width: 236rpx; margin: 0 10rpx;" v-if='item.state=="1"' @click="done(item.id)">
|
||||||
|
<u-button color="#99241B" shape="circle" text="确认完成"></u-button>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<view style="width: 236rpx;margin: 0 10rpx; " v-if='(item.state== "0")'>
|
||||||
|
<u-button icon="photo-fill" shape="circle" color="#99241B" plain text="图片上传"
|
||||||
|
@click="toUpimgPage(item.id)"></u-button>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<view style="width: 190rpx;margin: 0 10rpx; " v-if='item.state== "2" '>
|
||||||
|
<u-button plain color="#99241B" shape="circle" text="评价" @click="pingjia(i,item.id)"></u-button>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<view style="width: 190rpx;margin: 0 10rpx; " v-if='item.state== "3"'>
|
||||||
|
<!-- <view style="width: 190rpx;margin: 0 10rpx; " > -->
|
||||||
|
<u-button shape="circle" text="已评价" @click="toEvlauedpg(item.id)"></u-button>
|
||||||
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<view class="tag_sta_end" v-if='item.state== "2"'>
|
|
||||||
待评价
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<view class="act_time">
|
|
||||||
|
|
||||||
活动时间： {{item.createdAt}}
|
|
||||||
</view>
|
|
||||||
<view class="but_box" style="margin-top: 20rpx;">
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<view style="width: 236rpx;margin: 0 10rpx; " v-if='!(item.state== "0")'>
|
|
||||||
<u-button icon="photo-fill" shape="circle" text="已传图片" @click="touploadedimg(item.images)">
|
|
||||||
</u-button>
|
|
||||||
</view>
|
|
||||||
<view style="width: 236rpx; margin: 0 10rpx;" v-if='item.state=="1"' @click="done(item.id)">
|
|
||||||
<u-button color="#99241B" shape="circle" text="确认完成"></u-button>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
<view style="width: 236rpx;margin: 0 10rpx; " v-if='(item.state== "0")'>
|
|
||||||
<u-button icon="photo-fill" shape="circle" color="#99241B" plain text="图片上传"
|
|
||||||
@click="toUpimgPage(item.id)"></u-button>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
<view style="width: 190rpx;margin: 0 10rpx; " v-if='item.state== "2" '>
|
|
||||||
<u-button plain color="#99241B" shape="circle" text="评价" @click="pingjia(i,item.id)"></u-button>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
<view style="width: 190rpx;margin: 0 10rpx; " v-if='item.state== "3"'>
|
|
||||||
<!-- <view style="width: 190rpx;margin: 0 10rpx; " > -->
|
|
||||||
<u-button shape="circle" text="已评价" @click="toEvlauedpg(item.id)"></u-button>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
|
||||||
|
<view class="art_act_itm" v-for="(item,i) in orderList" :key="i" @click="goActDeat(i)" v-if="tabNum==2">
|
||||||
<view class="art_act_itm" v-for="(item,i) in orderList" :key="i" @click="goActDeat(i)" v-if="tabNum==2">
|
<image :src="item.enclosure" mode=""></image>
|
||||||
<!-- <image :src="../../static/icon12.jpg" mode=""></image> -->
|
<view class="bottom_part" style="padding: 0 12px;">
|
||||||
<image :src="item.enclosure" mode=""></image>
|
<view class="ddd" style="display: flex; justify-content: space-between; align-items: center;">
|
||||||
<view class="bottom_part" style="padding: 0 12px;">
|
<view class="title">
|
||||||
<view class="ddd" style="display: flex; justify-content: space-between; align-items: center;">
|
{{item.title}}
|
||||||
<view class="title">
|
</view>
|
||||||
{{item.title}}
|
<view class="tag_sta" v-if="item.state=='0'">
|
||||||
|
已报名
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<view class="tag_sta_end" v-if='item.state=="2"'>
|
||||||
|
已完成
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<view class="tag_sta_going" v-if='item.state=="1"'>
|
||||||
|
进行中
|
||||||
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<view class="tag_sta" v-if="item.state=='0'">
|
<view class="act_time">
|
||||||
已报名
|
活动时间： {{item.createdAt}}
|
||||||
</view>
|
</view>
|
||||||
|
<view class="but_box" style="margin-top: 20rpx;">
|
||||||
<view class="tag_sta_end" v-if='item.state=="2"'>
|
|
||||||
已完成
|
|
||||||
|
<view style="width: 236rpx;margin: 0 10rpx; " v-if='item.state== "0"'>
|
||||||
|
<u-button shape="circle" text="取消报名" @click="cancleBM(item.id)"></u-button>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
<view style="width: 236rpx;margin: 0 10rpx; " v-if='item.state== "3"'>
|
||||||
|
<u-button shape="circle" text="收到的评价" @click="receiveevlaue(item.id)"></u-button>
|
||||||
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="tag_sta_going" v-if='item.state=="1"'>
|
|
||||||
进行中
|
|
||||||
</view>
|
|
||||||
|
|
||||||
</view>
|
|
||||||
<view class="act_time">
|
|
||||||
活动时间： {{item.createdAt}}
|
|
||||||
</view>
|
|
||||||
<view class="but_box" style="margin-top: 20rpx;">
|
|
||||||
|
|
||||||
|
|
||||||
<view style="width: 236rpx;margin: 0 10rpx; " v-if='item.state== "0"'>
|
|
||||||
<u-button shape="circle" text="取消报名" @click="cancleBM(item.id)"></u-button>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
<view style="width: 236rpx;margin: 0 10rpx; " v-if='item.state== "3"'>
|
|
||||||
<u-button shape="circle" text="收到的评价" @click="receiveevlaue(item.id)"></u-button>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -112,9 +117,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<u-modal :show="show" @close="close()" :closeOnClickOverlay="true">
|
||||||
|
|
||||||
<u-modal :show="show" @close="close()" :closeOnClickOverlay="true">
|
|
||||||
|
|
||||||
<view class="pinContent">
|
<view class="pinContent">
|
||||||
<view class="pinContent_itm" v-for='(v,i) in baomingpingjia' :key="i">
|
<view class="pinContent_itm" v-for='(v,i) in baomingpingjia' :key="i">
|
||||||
|
|
@ -142,8 +145,8 @@
|
||||||
|
|
||||||
|
|
||||||
<u-modal :show="showShoudao" @close="closeRecive()" title="收到的评价" :closeOnClickOverlay="true">
|
<u-modal :show="showShoudao" @close="closeRecive()" title="收到的评价" :closeOnClickOverlay="true">
|
||||||
|
|
||||||
<u-rate count=5 v-model='starsvalue' ></u-rate>
|
<u-rate count=5 v-model='starsvalue' readonly></u-rate>
|
||||||
|
|
||||||
<view slot="confirmButton" style="display: flex; justify-content: center; align-items: center;">
|
<view slot="confirmButton" style="display: flex; justify-content: center; align-items: center;">
|
||||||
<view style="width: 400rpx;">
|
<view style="width: 400rpx;">
|
||||||
|
|
@ -153,7 +156,10 @@
|
||||||
</u-modal>
|
</u-modal>
|
||||||
|
|
||||||
|
|
||||||
|
<view v-if="!(orderList.length>0)" >
|
||||||
|
<u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" >
|
||||||
|
</u-empty>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
@ -173,15 +179,11 @@
|
||||||
}],
|
}],
|
||||||
starvalue: 0,
|
starvalue: 0,
|
||||||
orderList: [],
|
orderList: [],
|
||||||
list1: [{
|
|
||||||
name: '已发布',
|
|
||||||
}, {
|
|
||||||
name: '已接单',
|
|
||||||
}, ],
|
|
||||||
tabNum: 1,
|
tabNum: 1,
|
||||||
pingjiaobj: {},
|
pingjiaobj: {},
|
||||||
baomingpingjia: [],
|
baomingpingjia: [],
|
||||||
starsvalue:0
|
starsvalue: 0
|
||||||
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
@ -190,14 +192,14 @@
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
receiveevlaue(id) {
|
receiveevlaue(id) {
|
||||||
// /hallUser/sdpj
|
|
||||||
this.showShoudao = true
|
this.showShoudao = true
|
||||||
this.http.request('/hallUser/sdpj?id=' + id, {}, "POST").then(res => {
|
this.http.request('/hallUser/sdpj?id=' + id, {}, "POST").then(res => {
|
||||||
if (res.code == 200) {
|
if (res.code == 200) {
|
||||||
// this.clickTab(1)
|
|
||||||
this.starsvalue=res.data.evaluate
|
this.starsvalue = res.data.evaluate
|
||||||
this.showShoudao = true
|
this.showShoudao = true
|
||||||
|
|
||||||
}
|
}
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
|
|
@ -374,19 +376,23 @@
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
page {
|
page {
|
||||||
width: calc(100% - 64rpx);
|
/* width: calc(100% - 64rpx);
|
||||||
margin: 0rpx 32rpx;
|
margin: 0rpx 32rpx; */
|
||||||
background-color: #F5F5F5 !important;
|
background-color: #F5F5F5 !important;
|
||||||
}
|
}
|
||||||
|
.main{
|
||||||
|
padding: 0rpx 32rpx;
|
||||||
|
}
|
||||||
image {
|
image {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 60%;
|
height: 60%;
|
||||||
}
|
}
|
||||||
.acttiveSty{
|
|
||||||
color: #9A2720;
|
.acttiveSty {
|
||||||
font-weight: 700;
|
color: #9A2720;
|
||||||
}
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
.but_box {
|
.but_box {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue