Compare commits

..

No commits in common. "d3089285fb8b316e230c0248f2bc64864353d589" and "9218c744fc827954c4dbce04916d74c921892c0b" have entirely different histories.

8 changed files with 1383 additions and 1385 deletions

View File

@ -5,21 +5,15 @@
<view v-if="item.index!=2">
<image :src="item.acImg" mode="widthFix" v-show="tabBarShow === index"></image>
<image :src="item.img" mode="widthFix" v-show="tabBarShow != index"></image>
<!-- background: (index == 2) ? 'red' : '' -->
<view :class="(tabBarShow === index) ? 'action' :'no'">{{item.name}}</view>
</view>
<view v-if="item.index==2" style="text-align: center;">
<image :src="item.img" mode="widthFix"
style="border-radius: 50%;width: 102rpx;height: 102rpx;"></image>
<!-- background: (index == 2) ? 'red' : '' -->
<!-- <view :class="(tabBarShow === index) ? 'action' :'no'" style="height: 64rpx;line-height: 64rpx;">
{{item.name}}</view> -->
<view v-if="item.index==2" class="protrude-button">
<image :src="item.acImg" mode="widthFix"
style="border-radius: 50%;width: 120rpx;height: 120rpx"></image>
</view>
</view>
<view class="protrude-button-bg"></view>
<view v-if="isOverall==1" style="height: 100rpx;position: fixed;bottom: 0;width: 100%;background-color: #ffffff;"></view>
<!-- <span class="badge" v-if="number != 0">
<u-badge type="warning " max="99" :value="number"></u-badge>
</span> -->
</view>
</view>
</template>
@ -241,11 +235,12 @@
justify-content: center;
align-items: center;
width: 100%;
height: 111rpx;
height: 100rpx;
padding-bottom: 0;
background: url('/static/bottom_tab.png') no-repeat;
background-size: 100%;
background-color: #fff;
box-sizing: border-box;
box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.07);
border-top: 1px solid #EEEEEE;
.list {
display: flex;
@ -281,6 +276,27 @@
font-size: 20rpx;
}
.protrude-button {
text-align: center;
position: absolute;
bottom: 15rpx;
border-radius: 50%;
display: flex;
justify-content: center;
align-items: center;
}
.protrude-button-bg {
position: absolute;
top: -20rpx;
width: 120rpx;
height: 60rpx;
background-color: #fff;
border-radius: 60rpx 60rpx 0 0;
border-top: 1px solid #eeeeee;
z-index: 105;
}
.tab-list_ip {
display: flex;
justify-content: center;
@ -288,10 +304,10 @@
width: 100%;
height: 160rpx;
padding-bottom: 50rpx;
background: url('/static/bottom_tab.png') no-repeat;
background-size: 100%;
box-sizing: border-box;
z-index: 100;
background-color: #fff;
border-top: 1px solid #eeeeee;
// box-shadow: 0rpx -1rpx 0rpx 0rpx #EEEEEE;
.list {
@ -308,7 +324,6 @@
width: 44rpx;
height: 44rpx;
background-color: white;
margin-top: 12rpx;
}
text {

View File

@ -35,7 +35,7 @@
@click.stop="toMap(info.detail.latitude, info.detail.longitude, info.detail.address_detail)">
<view class="flex" style="align-items: center;">
<image src="/static/center/address.png" mode="" class="icon-size"></image>
<text>{{ info.detail.address }}{{ info.detail.address_detail }}</text>
<text>{{ info.detail.address_detail }}</text>
</view>
<image src="/static/detail/daohang.png" class="icon-size" style="width: 48rpx; height: 48rpx;">
</image>
@ -102,7 +102,7 @@
</view>
</view>
</view>
<view v-if="info.before_status!=-3" class="third flex flex-column" style="justify-content: flex-start;">
<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;">
<text>退款数量</text>
@ -146,8 +146,7 @@
</view>
<view class="flex w-100 space-between hui align-items" style="margin-top: 40rpx;">
<text>退款数量</text>
<text v-if="info.before_status!=-3" style="color: #323232;">{{ info.auth_num }}</text>
<text v-if="info.before_status==-3" style="color: #323232;">{{ info.num }}</text>
<text style="color: #323232;">{{ info.auth_num }}</text>
</view>
<view class="flex w-100 space-between hui align-items" style="margin-top: 40rpx;">
<text>退款金额</text>

View File

@ -549,12 +549,9 @@ export default {
icon: 'none',
duration: 2000
});
setTimeout(()=>{
uni.redirectTo({
url: '/packageA/my/success?id=' + this.orderInfo.id + '&order_no=' + this.orderInfo.order_no
})
},1500)
},
openUrl(url) {
uni.navigateTo({

View File

@ -1,15 +1,14 @@
<template>
<view class="detail_all">
<view class="nav">
<u-navbar :is-back="true" leftIconColor="#000000" :autoBack="true" :bgColor="background" title="详情"
:titleStyle="{color:'#000000',fontSize:'32rpx'}"></u-navbar>
<u-navbar :is-back="true" leftIconColor="#000000" :autoBack="true" :bgColor="background"
title="详情" :titleStyle="{color:'#000000',fontSize:'32rpx'}"></u-navbar>
</view>
<view class="box flex justify-start flex-column align-items" :class="overlay ? 'no-scroll' : ''">
<view class="swiper">
<u-swiper :list="detail.images" indicator indicatorInactiveColor="#D8D8D8"
indicatorActiveColor="#323232" indicatorMode="dot"
:indicator-style="{ bottom: '60rpx', zIndex: 999 }" height="580rpx" circular
@click="swiperImg"></u-swiper>
indicatorActiveColor="#323232" indicatorMode="dot" :indicator-style="{ bottom: '60rpx', zIndex: 999 }"
height="580rpx" circular @click="swiperImg"></u-swiper>
</view>
<view class="con-center w-100 flex justify-center flex-column align-items flex-start">
@ -41,7 +40,8 @@
<view class="flex justify-center align-items xieyi">
<image src="/static/detail/baohu.png" mode=""
style="width: 28rpx;height: 28rpx;margin-right: 0;"></image>
<view style="text-align: center;color: #323232;padding: 0rpx 10rpx;">{{
<view
style="text-align: center;color: #323232;padding: 0rpx 10rpx;">{{
detail.refund_info.title }}</view>
<image src="/static/detail/zidong.png" mode=""
style="width: 20rpx;height: 20rpx;margin-right: 0;"></image>
@ -56,8 +56,7 @@
<span class="first-image flex align-items"
@click.stop="toMap(detail.latitude, detail.longitude, detail.address_detail)">
<image src="/static/center/address.png" mode="" class="icon-size"></image>
<span
style="width: 590rpx;padding-right: 20rpx;">{{ detail.address }}{{ detail.address_detail }}</span>
<span style="width: 590rpx;padding-right: 20rpx;">{{ detail.address }}{{ detail.address_detail }}</span>
<image src="/static/detail/daohang.png" class="icon-size" style="width: 50rpx; height: 50rpx;">
</image>
</span>
@ -102,8 +101,7 @@
<view class="flex align-items" style="justify-content: space-between;">
<view class="">
<view style="font-size: 28rpx;color: #323232;">{{ item.name }}</view>
<view style="font-size: 24rpx;color: #9C9C9C;margin-top: 10rpx;">
身份证号{{ item.idnum }}
<view style="font-size: 24rpx;color: #9C9C9C;margin-top: 10rpx;">身份证号{{ item.idnum }}
</view>
</view>
<view class="">
@ -153,8 +151,7 @@
</view>
</view>
<view class="third flex flex-column"
style="justify-content: flex-start;padding-top: 20rpx;padding-bottom: 200rpx;">
<view class="third flex flex-column" style="justify-content: flex-start;padding-top: 20rpx;">
<view class="third-top flex align-items">
<span>活动详情
<image class="icons" src="/static/detail/xiangqing.png"></image>
@ -171,9 +168,7 @@
<view class="footer" style="display: flex;align-items: center;;justify-content: space-between;gap: 30rpx;">
<view
v-if="(detail.status == 1 ||detail.status == 2 || detail.status == 3 || detail.status == 4) && detail.auth_status==1"
@click="overlayShow()" style="width: 220rpx;height: 90rpx;">
<view v-if="(detail.status == 1 ||detail.status == 2 || detail.status == 3 || detail.status == 4) && detail.auth_status==1" @click="overlayShow()" style="width: 220rpx;height: 90rpx;">
<image src="@/static/detail/fenxiangsys.png" style="width: 100%;height: 100%;" mode="widthFix">
</image>
</view>
@ -281,11 +276,11 @@
</template>
<script>
import dayjs from 'dayjs';
import {
import dayjs from 'dayjs';
import {
dateWeek
} from '../../utils/dateFormat'
export default {
} from '../../utils/dateFormat'
export default {
computed: {
formattedTimeList() {
@ -358,19 +353,12 @@
},
};
},
onShareAppMessage() {
console.log(this.detail);
return {
title: this.detail.title, //
imageUrl: this.detail.images[0], //httphttps
path: `/packageA/center/detail?id=${this.id}`
}
},
onShareTimeline() {
return {
title: this.detail.title, //
imageUrl: this.detail.headimage, //httphttps
query: `/packageA/center/detail?id=${this.id}`
query: `id=${this.id}`
}
},
@ -394,9 +382,9 @@
},
methods: {
swiperImg(index) {
swiperImg(index){
uni.previewImage({
current: index,
current:index,
urls: this.detail.images,
});
},
@ -514,7 +502,7 @@
title: '海报生成中...',
icon: 'none',
duration: 2000,
complete: function() {
complete: function () {
//
setTimeout(() => {
//
@ -528,8 +516,8 @@
title: '请登录',
icon: 'none',
duration: 2000,
complete: function() {
setTimeout(function() {
complete: function () {
setTimeout(function () {
uni.switchTab({
url: '/pages/my/index',
});
@ -637,7 +625,7 @@
duration: 2000
})
}
}).catch(error => {});
}).catch(error => { });
},
//
getDetail() {
@ -667,7 +655,7 @@
duration: 2000
})
}
}).catch(error => {});
}).catch(error => { });
},
sign() {
@ -730,8 +718,8 @@
title: res.msg,
icon: 'none',
duration: 2000,
complete: function() {
setTimeout(function() {
complete: function () {
setTimeout(function () {
uni.reLaunch({
url: "/packageA/my/makeList?status=" + -1
})
@ -759,7 +747,7 @@
latitude: parseFloat(latitude),
longitude: parseFloat(longitude),
name: name,
success: function() {
success: function () {
console.log('success');
}
});
@ -888,7 +876,7 @@
timeSelected(time) {
return this.selectedTime === time;
},
moveScroll() {},
moveScroll() { },
//
getMoney() {
uni.$u.http.post('/api/school.newactivity.order/confirm', {
@ -914,43 +902,43 @@
});
},
},
}
}
</script>
<style lang="scss" scoped>
.detail_all {
.detail_all {
background-color: #f7f7f7;
}
}
.w-100 {
.w-100 {
width: 100%;
}
}
.flex {
.flex {
display: flex;
}
}
.flex-start {
.flex-start {
align-items: flex-start;
}
}
.justify-center {
.justify-center {
justify-content: center;
}
}
.align-items {
.align-items {
align-items: center;
}
}
.flex-column {
.flex-column {
flex-flow: column;
}
}
.justify-start {
.justify-start {
justify-content: start;
}
}
.white-space {
.white-space {
overflow: hidden;
/* 确保超出容器的文本被隐藏 */
white-space: nowrap;
@ -958,47 +946,47 @@
text-overflow: ellipsis;
/* 使用省略号表示被截断的文本 */
width: 100%;
}
}
.con-center {
.con-center {
background: white;
border-radius: 44rpx;
position: relative;
}
}
.space-between {
.space-between {
justify-content: space-between;
}
}
.swiper {
.swiper {
width: 100%;
height: 580rpx;
}
}
.box {
.box {
padding-top: 175rpx;
position: relative;
}
}
.topimgs_rmb {
.topimgs_rmb {
position: absolute;
top: -168rpx;
right: 30rpx;
width: 201rpx;
height: 118rpx;
z-index: 0;
}
}
.topimgs {
.topimgs {
position: absolute;
top: -120rpx;
width: 100%;
z-index: 0;
}
}
.top_texts {
.top_texts {
position: absolute;
top: -148rpx;
right: 30rpx;
@ -1014,9 +1002,9 @@
font-size: 22rpx;
font-weight: 400;
}
}
}
.first-box {
.first-box {
width: 690rpx;
background: #FFFFFF;
// background: url('@/static/detail/conbg.png');
@ -1093,9 +1081,9 @@
padding: 0px 10rpx;
}
}
}
}
.second-box {
.second-box {
width: 690rpx;
height: 64rpx;
border-radius: 16rpx 16rpx 16rpx 16rpx;
@ -1139,9 +1127,9 @@
// }
// }
}
}
.third {
.third {
width: 100%;
background: #ffffff;
border-radius: 44rpx;
@ -1244,23 +1232,23 @@
}
}
.line {
.line {
width: 690rpx;
height: 2rpx;
background: #F0F0F0;
margin: 19rpx 0;
}
}
.icon-size {
.icon-size {
width: 32rpx;
height: 32rpx;
margin-right: 12rpx;
}
}
.footer {
.footer {
width: 93%;
padding: 0 30rpx;
height: 185rpx;
@ -1327,10 +1315,10 @@
font-size: 48rpx;
color: #BBFC5B;
}
}
}
.popupBox {
.popupBox {
width: 640rpx;
height: 414rpx;
background-image: url("https://naweigetetest2.hschool.com.cn/dyqc/confirm2.png");
@ -1439,9 +1427,9 @@
margin: 24rpx 32rpx 0 0;
}
}
}
.share {
.share {
position: fixed;
color: #FFFFFF;
right: 0;
@ -1451,9 +1439,9 @@
border-top-left-radius: 50px;
border-bottom-left-radius: 50px;
box-shadow: 0 0 20upx rgba(0, 0, 0, .09);
}
}
.cancel {
.cancel {
width: 100vw;
padding: 30rpx;
text-align: center;
@ -1461,49 +1449,49 @@
color: red;
font-weight: bold;
font-size: 30rpx;
}
}
.md-content {
.md-content {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
padding: 50rpx 0;
background-color: white;
}
}
.md-content-item {
.md-content-item {
margin: 0 70rpx;
position: relative;
}
}
.md-content-item image {
.md-content-item image {
width: 100rpx;
height: 100rpx;
}
}
.md-content-item view {
.md-content-item view {
margin-top: 15rpx;
font-size: 28rpx;
}
}
.sharebtn {
.sharebtn {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
opacity: 0;
}
}
.cu-modal {
.cu-modal {
position: fixed;
bottom: 166rpx;
left: 0;
z-index: 999999;
}
}
.gj {
.gj {
.title {
font-family: PingFang SC, PingFang SC;
font-weight: 800;
@ -1554,9 +1542,9 @@
}
}
}
}
}
::v-deep ::-webkit-scrollbar {
::v-deep ::-webkit-scrollbar {
/*滚动条整体样式*/
width: 4px !important;
height: 1px !important;
@ -1564,46 +1552,46 @@
background: #ccc !important;
-webkit-appearance: auto !important;
display: block;
}
}
::v-deep ::-webkit-scrollbar-thumb {
::v-deep ::-webkit-scrollbar-thumb {
/*滚动条里面小方块*/
border-radius: 10px !important;
box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2) !important;
background: #7b7979 !important;
}
}
::v-deep ::-webkit-scrollbar-track {
::v-deep ::-webkit-scrollbar-track {
/*滚动条里面轨道*/
// box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2) !important;
// border-radius: 10px !important;
background: #FFFFFF !important;
}
}
.Poster {
.Poster {
position: relative;
top: 21rpx;
left: 30rpx;
width: 690rpx;
}
}
.posterClose {
.posterClose {
position: absolute;
right: 8rpx;
top: 8rpx;
}
}
.no-scroll {
.no-scroll {
overflow: hidden;
height: 100vh;
}
}
::v-deep ._root {
::v-deep ._root {
padding: 0 10rpx;
}
}
</style>
<style lang="scss">
.value_slide {
.value_slide {
width: 40%;
::v-deep .uni-slider-handle-wrapper {
@ -1654,9 +1642,9 @@
}
// #endif
}
}
.pos {
.pos {
position: fixed;
width: 100%;
height: 100%;
@ -1667,9 +1655,9 @@
// right: 8rpx;
top: 200rpx;
}
}
}
.btnList {
.btnList {
position: absolute;
bottom: 173rpx;
display: flex;
@ -1691,7 +1679,8 @@
justify-content: center;
align-items: center;
}
}
}
</style>
<style scoped>
.no-border-button {
@ -1717,10 +1706,11 @@
font-size: 28rpx;
color: #999999;
}
</style>
<style>
.rich_class {
word-wrap: break-all !important;
word-break: pre-line !important;
.rich_class{
word-wrap: break-all!important;
word-break: pre-line!important;
}
</style>

View File

@ -138,8 +138,7 @@
<text v-if="server_status==6"
style="color: #FF4810;font-weight: 600;">{{ item.real_refundprice }}</text>
</view>
<view v-if="item.before_status==-3" style="font-size: 26rpx;color: #9C9C9C;">数量{{ item.num }}</view>
<view v-if="item.before_status!=-3" style="font-size: 26rpx;color: #9C9C9C;">数量{{ item.auth_num }}</view>
<view style="font-size: 26rpx;color: #9C9C9C;">数量{{ item.auth_num }}</view>
</view>
</view>
</view>

View File

@ -40,7 +40,7 @@
</view>
</view>
<!-- <u-loadmore :status="loadStatus" nomoreText="已经到底啦~"/> -->
<view class="flex flex-column flex-start align-items" v-else style="margin-top: 600rpx;">
<view class="flex flex-column flex-start align-items" v-else>
<image src="/static/message/message.png" mode="" style="width: 256rpx;height: 240rpx;">
</image>
<view>暂无消息~</view>

View File

@ -503,8 +503,6 @@ export default {
onLoad() {
// this.tofb();
// this.searchStatus()
uni.hideShareMenu();
this.getAgreement()
this.getBqList();
this.getrefund_list();

View File

@ -896,22 +896,22 @@
</style>
<style lang="scss">
// .serch_top {
// .u-search {
.serch_top {
.u-search {
// ::v-deep .u-search__content {
// background: rgba($color: #FFFFFF, $alpha: 0.6) !important;
// }
::v-deep .u-search__content {
background: rgba($color: #FFFFFF, $alpha: 0.6) !important;
}
// ::v-deep .u-search__content__input {
// background-color: rgba($color: #FFFFFF, $alpha: 0.6) !important;
// }
::v-deep .u-search__content__input {
background-color: rgba($color: #FFFFFF, $alpha: 0.6) !important;
}
// ::v-deep .u-icon__img {
// width: 36rpx !important;
// height: 36rpx !important;
// }
// }
// }
::v-deep .u-icon__img {
width: 36rpx !important;
height: 36rpx !important;
}
}
}
</style>