Merge branch 'main' of http://49.235.147.88:3000/zhangkai/dyqc_hdapp
This commit is contained in:
commit
df8f3c76b0
@ -569,7 +569,7 @@ export default {
|
||||
.line {
|
||||
width: 630rpx;
|
||||
height: 1rpx;
|
||||
background: #F0F0F0;
|
||||
background: #eeeeee;
|
||||
margin: 30rpx 0;
|
||||
}
|
||||
|
||||
@ -692,7 +692,7 @@ export default {
|
||||
.line {
|
||||
width: 642rpx;
|
||||
height: 1rpx;
|
||||
background: #F0F0F0;
|
||||
background: #eeeeee;
|
||||
//box-shadow: 1rpx 1rpx 0rpx 0rpx rgba(102, 102, 102, 0.25);
|
||||
//border-radius: 0rpx 0rpx 0rpx 0rpx;
|
||||
}
|
||||
|
@ -1022,7 +1022,7 @@ export default {
|
||||
width: 586rpx;
|
||||
height: 52rpx;
|
||||
font-family: PingFang SC, PingFang SC;
|
||||
font-weight: 400;
|
||||
font-weight: 600;
|
||||
font-size: 36rpx;
|
||||
color: #323232;
|
||||
// margin-left: 16rpx;
|
||||
|
@ -1,81 +1,75 @@
|
||||
<template>
|
||||
<view class="detail_all">
|
||||
<view class="box flex justify-start flex-column align-items">
|
||||
<view class="box flex justify-start flex-column align-items">
|
||||
|
||||
<view class="con-center w-100 flex justify-center flex-column align-items flex-start">
|
||||
<view class="con-center w-100 flex justify-center flex-column align-items flex-start">
|
||||
|
||||
<view class="first-box flex flex-start flex-column justify-start">
|
||||
<view class="flex align-items justify-center">
|
||||
<image class="head_img" v-if="detail.images.length > 0" :src="detail.images[0]" mode="" ></image>
|
||||
<view style="margin-left: 20rpx;">
|
||||
<view class="flex align-items">
|
||||
<span class="first-name">{{detail.title}}</span>
|
||||
</view>
|
||||
<view class="first-image flex align-items white-space" style="margin-top: 25rpx;">
|
||||
<image :src="detailAny.user.avatar" mode="" style="width: 36rpx;height: 36rpx;"></image>
|
||||
<span style="color:#9C9C9C;">{{ detailAny.user.nickname }}</span>
|
||||
<span style="color:#9C9C9C;margin-left: 20rpx;">{{ detailAny.join_info.people_number }}人玩过</span>
|
||||
<view class="first-box flex flex-start flex-column justify-start">
|
||||
<view class="flex align-items justify-center">
|
||||
<image class="head_img" v-if="detail.images.length > 0" :src="detail.images[0]" mode=""></image>
|
||||
<view style="margin-left: 20rpx;">
|
||||
<view class="flex align-items">
|
||||
<span class="first-name">{{detail.title}}</span>
|
||||
</view>
|
||||
<view class="first-image flex align-items white-space" style="margin-top: 25rpx;">
|
||||
<image :src="detailAny.user.avatar" mode="" style="width: 36rpx;height: 36rpx;"></image>
|
||||
<span style="color:#9C9C9C;">{{ detailAny.user.nickname }}</span>
|
||||
<span
|
||||
style="color:#9C9C9C;margin-left: 20rpx;">{{ detailAny.join_info.people_number }}人玩过</span>
|
||||
|
||||
</view>
|
||||
<view class="flex align-items" style="margin-top: 20rpx;">
|
||||
¥{{detailAny.totalprice}}
|
||||
</view>
|
||||
<view class="flex align-items" style="margin-top: 20rpx;">
|
||||
¥{{detailAny.totalprice}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<span class="line"></span>
|
||||
<span class="first-image flex align-items" style="margin-top: 20rpx;">
|
||||
<image src="../../static/center/Alarm.png" mode="" class="icon-size"></image>
|
||||
<span>{{formattedTime.formattedTime}}</span>
|
||||
</span>
|
||||
<span class="line"></span>
|
||||
|
||||
<span class="first-image flex align-items space-between" style="width: 100%;"
|
||||
@click.stop="toMap(detail.latitude, detail.longitude, detail.address_detail)">
|
||||
<view>
|
||||
<image src="/static/center/address.png" mode="" class="icon-size"></image>
|
||||
<span class="white-space">{{detail.address_detail}}</span>
|
||||
</view>
|
||||
<image src="/static/detail/daohang.png" class="icon-size" style="width: 50rpx; height: 50rpx;">
|
||||
</image>
|
||||
</span>
|
||||
|
||||
</view>
|
||||
|
||||
<span class="line"></span>
|
||||
<span class="first-image flex align-items" style="margin-top: 20rpx;">
|
||||
<image src="../../static/center/Alarm.png" mode="" class="icon-size"></image>
|
||||
<span>{{formattedTime.formattedTime}}</span>
|
||||
</span>
|
||||
<span class="line"></span>
|
||||
|
||||
<span class="first-image flex align-items space-between"
|
||||
style="width: 100%;"
|
||||
@click.stop="toMap(detail.latitude, detail.longitude, detail.address_detail)">
|
||||
<view>
|
||||
<image src="/static/center/address.png" mode="" class="icon-size"></image>
|
||||
<span class="white-space">{{detail.address_detail}}</span>
|
||||
</view>
|
||||
<view class="third flex flex-column" style="justify-content: flex-start;">
|
||||
<view class="third-center">
|
||||
|
||||
<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
|
||||
<span>订单编号</span>
|
||||
<span>{{detailAny.order_no}}</span>
|
||||
</view>
|
||||
<view class="flex w-100 space-between hui align-items" style="margin-top: 30rpx;">
|
||||
<span>报名人昵称</span>
|
||||
<span>{{ detailAny.user.nickname }}</span>
|
||||
</view>
|
||||
<view class="flex w-100 space-between hui align-items" style="margin-top: 30rpx;">
|
||||
<span>核销/报名人数</span>
|
||||
<span style="color: #FF4810;"> {{detailAny.verification.have_number}} /
|
||||
{{ detailAny.verification.total_number }}</span>
|
||||
</view>
|
||||
<image src="/static/detail/daohang.png" class="icon-size" style="width: 50rpx; height: 50rpx;"></image>
|
||||
</span>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
</view>
|
||||
<view class="third flex flex-column" style="justify-content: flex-start;">
|
||||
<view class="third-center">
|
||||
|
||||
<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;" >
|
||||
<span>订单编号</span>
|
||||
<span>{{detailAny.order_no}}</span>
|
||||
<view class="footer flex align-items flex-column" style="justify-content: space-between;">
|
||||
<view class="footer-right flex justify-center align-items" @click="hexiaohd()">
|
||||
<span> 确认核销 </span>
|
||||
</view>
|
||||
<view class="flex w-100 space-between hui align-items" style="margin-top: 30rpx;" >
|
||||
<span>报名人昵称</span>
|
||||
<span>{{ detailAny.user.nickname }}</span>
|
||||
</view>
|
||||
<view class="flex w-100 space-between hui align-items" style="margin-top: 30rpx;" >
|
||||
<span>核销/报名人数</span>
|
||||
<span style="color: #FF4810;"> {{detailAny.verification.have_number}} / {{ detailAny.verification.total_number }}</span>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
<view class="footer flex align-items flex-column" style="justify-content: space-between;">
|
||||
|
||||
<view class="footer-right flex justify-center align-items">
|
||||
<span @click="hexiaohd()"> 确认核销 </span>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@ -119,7 +113,7 @@
|
||||
img: 'width: 100%'
|
||||
|
||||
},
|
||||
value_slide:0,
|
||||
value_slide: 0,
|
||||
scrollTop: 0,
|
||||
overlay: false,
|
||||
userInfo: {},
|
||||
@ -134,7 +128,7 @@
|
||||
order_no: '',
|
||||
PayPirce: 0,
|
||||
detail: {},
|
||||
detailAny:{},
|
||||
detailAny: {},
|
||||
people: {},
|
||||
qrUrl: '',
|
||||
is_collect: 0,
|
||||
@ -158,7 +152,7 @@
|
||||
titleStyle: {
|
||||
color: '#FFFFFF'
|
||||
},
|
||||
wxcode:'',//核销code
|
||||
wxcode: '', //核销code
|
||||
};
|
||||
},
|
||||
|
||||
@ -169,18 +163,18 @@
|
||||
this.userInfo = uni.getStorageSync("userInfo")
|
||||
this.id = options.id
|
||||
this.wxcode = options.code
|
||||
|
||||
|
||||
this.getDetail()
|
||||
},
|
||||
|
||||
methods: {
|
||||
|
||||
|
||||
//星期
|
||||
dateWeeks(timestamp) {
|
||||
return dateWeek(timestamp)
|
||||
},
|
||||
//完整时间
|
||||
formattime(e){
|
||||
formattime(e) {
|
||||
return dayjs(e).format('YYYY-MM-DD HH:mm:ss')
|
||||
},
|
||||
|
||||
@ -203,14 +197,14 @@
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// 提示
|
||||
showErrorToast(msg) {
|
||||
uni.showToast({
|
||||
@ -238,8 +232,8 @@
|
||||
}
|
||||
}).catch(error => {});
|
||||
},
|
||||
|
||||
hexiaohd(){
|
||||
|
||||
hexiaohd() {
|
||||
let wxcc = this.wxcode
|
||||
uni.$u.http.post('/api/school.newworker.activity.order/verification', {
|
||||
code: wxcc
|
||||
@ -266,9 +260,9 @@
|
||||
}
|
||||
}).catch(error => {});
|
||||
},
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// 导航
|
||||
toMap(latitude, longitude, name) {
|
||||
uni.openLocation({
|
||||
@ -287,25 +281,26 @@
|
||||
url: "/pages/index/index"
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.detail_all{
|
||||
.detail_all {
|
||||
background-color: #f7f7f7;
|
||||
height: 100vh;
|
||||
}
|
||||
|
||||
.w-100 {
|
||||
width: 100%;
|
||||
}
|
||||
@ -351,8 +346,8 @@
|
||||
margin-top: 30rpx;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
.space-between {
|
||||
justify-content: space-between;
|
||||
@ -375,13 +370,14 @@
|
||||
padding: 30rpx;
|
||||
border-radius: 18rpx;
|
||||
box-sizing: border-box;
|
||||
.head_img{
|
||||
width: 160rpx;
|
||||
|
||||
.head_img {
|
||||
width: 160rpx;
|
||||
height: 160rpx;
|
||||
border-radius: 18rpx;
|
||||
}
|
||||
|
||||
.first-name{
|
||||
.first-name {
|
||||
width: 440rpx;
|
||||
height: 39rpx;
|
||||
font-family: PingFang SC, PingFang SC;
|
||||
@ -406,8 +402,9 @@
|
||||
font-size: 26rpx;
|
||||
color: #222222;
|
||||
}
|
||||
.xieyi{
|
||||
background-color:#BBFC5B;
|
||||
|
||||
.xieyi {
|
||||
background-color: #BBFC5B;
|
||||
width: 156rpx;
|
||||
height: 48rpx;
|
||||
border-radius: 8rpx;
|
||||
@ -445,10 +442,12 @@
|
||||
.third {
|
||||
width: 100%;
|
||||
background: #ffffff;
|
||||
margin-top:20rpx;
|
||||
margin-top: 20rpx;
|
||||
border-radius: 44rpx;
|
||||
|
||||
.third-center {
|
||||
padding: 30rpx;
|
||||
|
||||
.hui {
|
||||
font-family: PingFang SC, PingFang SC;
|
||||
font-weight: 500;
|
||||
@ -488,6 +487,7 @@
|
||||
background: #323232;
|
||||
border-radius: 148rpx;
|
||||
margin-bottom: 30rpx;
|
||||
|
||||
span {
|
||||
font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
|
||||
font-weight: 400;
|
||||
@ -495,11 +495,13 @@
|
||||
color: #BBFC5B;
|
||||
}
|
||||
}
|
||||
|
||||
.footer-right1 {
|
||||
width: 690rpx;
|
||||
height: 90rpx;
|
||||
background: #E4E4E4;
|
||||
border-radius: 148rpx;
|
||||
|
||||
span {
|
||||
font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
|
||||
font-weight: 400;
|
||||
@ -867,12 +869,14 @@
|
||||
}
|
||||
</style>
|
||||
<style lang="scss">
|
||||
.value_slide{
|
||||
.value_slide {
|
||||
width: 50%;
|
||||
::v-deep .uni-slider-handle-wrapper{
|
||||
|
||||
::v-deep .uni-slider-handle-wrapper {
|
||||
height: 10rpx;
|
||||
}
|
||||
::v-deep .uni-slider-handle{
|
||||
|
||||
::v-deep .uni-slider-handle {
|
||||
background: url('@/static/detail/qiu.png') !important;
|
||||
border-radius: 0;
|
||||
background-size: 36rpx 36rpx !important;
|
||||
@ -881,17 +885,21 @@
|
||||
top: 14rpx;
|
||||
margin-left: -18rpx !important;
|
||||
}
|
||||
::v-deep .uni-slider-value{
|
||||
|
||||
::v-deep .uni-slider-value {
|
||||
color: #323232;
|
||||
&::after{
|
||||
|
||||
&::after {
|
||||
content: '%';
|
||||
}
|
||||
}
|
||||
|
||||
// #ifdef MP-WEIXIN
|
||||
.wx-slider-handle-wrapper{
|
||||
.wx-slider-handle-wrapper {
|
||||
height: 8rpx;
|
||||
}
|
||||
.wx-slider-handle{
|
||||
|
||||
.wx-slider-handle {
|
||||
background: url('@/static/detail/qiu.png') !important;
|
||||
border-radius: 0;
|
||||
background-size: 28rpx 28rpx !important;
|
||||
@ -900,14 +908,17 @@
|
||||
top: 18rpx;
|
||||
margin-left: -14rpx !important;
|
||||
}
|
||||
.wx-slider-value{
|
||||
|
||||
.wx-slider-value {
|
||||
display: flex;
|
||||
width: 30rpx;
|
||||
color: #323232;
|
||||
&::after{
|
||||
|
||||
&::after {
|
||||
content: '%';
|
||||
}
|
||||
}
|
||||
|
||||
// #endif
|
||||
}
|
||||
</style>
|
@ -55,7 +55,7 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="flex justify-center align-items" v-if="list.length == 0" style="margin-top: 150rpx;">
|
||||
<view class="flex justify-center align-items" v-if="list.length == 0" style="height: 90vh;">
|
||||
<view>
|
||||
<image src="/static/message/activen.png" mode="" style="width: 180rpx;height: 180rpx;">
|
||||
</image>
|
||||
|
@ -44,7 +44,7 @@
|
||||
<span class="title white-space">{{ item.title }}</span>
|
||||
<span class="first-image flex align-items" style="margin-top: 20rpx; width: 100%">
|
||||
<image :src="item.user.avatar" style="width: 36rpx; height: 36rpx"></image>
|
||||
<span style="color: #9c9c9c; margin-left: 10rpx; width: 35%">{{
|
||||
<span style="color: #9c9c9c; margin-left: 10rpx;">{{
|
||||
item.user.nickname
|
||||
}}</span>
|
||||
<view class="white-space" style="width: 60%">
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -607,7 +607,7 @@
|
||||
color: #181818;
|
||||
height: 110rpx;
|
||||
line-height: 110rpx;
|
||||
border-bottom: 1rpx solid #f5f6fa;
|
||||
border-bottom: 1rpx solid #eeeeee;
|
||||
|
||||
.right {
|
||||
display: flex;
|
||||
|
@ -6,7 +6,10 @@
|
||||
<view style="border: 1px solid #9C9C9C;width: 280rpx;height: 280rpx;margin: 0 auto;border-radius: 8rpx;">
|
||||
<image :src="item.codeimage" class="swiper-image" mode="aspectFill" />
|
||||
</view>
|
||||
<view style="text-align: center;font-size: 26rpx;margin-top: 20rpx;">{{item.name}}</view>
|
||||
<view v-if="item.status==6" style="border: 1px solid #9C9C9C;width: 280rpx;height: 284rpx;margin: 0 auto;border-radius: 8rpx; position: absolute;top: 0;left: 0;right: 0;">
|
||||
<image src="/static/qrcode_yes.png" class="swiper-image" mode="aspectFill" />
|
||||
</view>
|
||||
<view style="text-align: center;font-size: 28rpx;margin-top: 15rpx;font-weight: 600;">{{item.name}}</view>
|
||||
</swiper-item>
|
||||
</swiper>
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
BIN
static/qrcode_yes.png
Normal file
BIN
static/qrcode_yes.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 9.2 KiB |
Loading…
x
Reference in New Issue
Block a user