wo123/dyqc_hdapp
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修改详情页面的布局

Browse Source 
2.优化分享海报
3.发布页面新增登陆判断
4.发布页面新增认证判断
5.发布页面修改责任书确认
6.优化责任书样式
7.提现页面新增tips弹窗
8.提现页面新增提现须知
9.身份认证页面新增入住协议勾选
10.身份认证页面新增入住弹窗确认
11.身份认证页面优化UI
12.个人中心页面优化
This commit is contained in:
王创世 2025-06-11 18:28:42 +08:00
parent 77e675c5d2
commit d274992900
16 changed files with 1515 additions and 1167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node_modules/uview-ui/components/u-navbar/u-navbar.vue generated vendored
View File

@ -139,7 +139,7 @@
left: 0; left: 0;
right: 0; right: 0;
top: 0; top: 0;
z-index: 11; z-index: 9999;
} }
&__content { &__content {

9
packageA/afterSales/index.vue
View File

@ -76,7 +76,7 @@
<view @click="subumit()" class="footer flex align-items" style="justify-content: space-between;"> <view @click="subumit()" class="footer flex align-items" style="justify-content: space-between;">
<view class="footer-right flex justify-center align-items"> <view class="footer-right flex justify-center align-items">
<span >确定</span> <span>确定</span>
</view> </view>
</view> </view>
@ -99,8 +99,8 @@
</scroll-view> </scroll-view>
<view class="footer flex align-items" style="justify-content: space-between;"> <view class="footer flex align-items" style="justify-content: space-between;">
<view class="footer-right flex justify-center align-items"> <view @click="closetuikuan" class="footer-right flex justify-center align-items">
<span @click="closetuikuan">确定</span> <span>确定</span>
</view> </view>
</view> </view>
</view> </view>
@ -270,6 +270,7 @@
}else{ }else{
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
icon: 'none',
}) })
} }
}) })
@ -696,7 +697,7 @@
} }
.popup-content{ .popup-content{
height: 500rpx; height: 500rpx;
margin-bottom: 100rpx; margin-bottom: 140rpx;
// overflow-y: auto; // overflow-y: auto;
} }
.popup-content-item{ .popup-content-item{

2
packageA/afterSales/info.vue
View File

@ -113,7 +113,7 @@
<text v-if="info.server_status == 3" style="color: #FF4810;font-weight: 600;">￥{{ <text v-if="info.server_status == 3" style="color: #FF4810;font-weight: 600;">￥{{
info.first_refundprice }}</text> info.first_refundprice }}</text>
<text v-if="info.server_status == 6" style="color: #FF4810;font-weight: 600;">￥{{ <text v-if="info.server_status == 6" style="color: #FF4810;font-weight: 600;">￥{{
info.real_refundprice }}</text> info.total_refundprice}}</text>
</view> </view>
<view class="flex w-100 space-between hui align-items" style="margin-top: 40rpx;"> <view class="flex w-100 space-between hui align-items" style="margin-top: 40rpx;">
<text>退款原因</text> <text>退款原因</text>

48
packageA/center/applyDetail.vue
View File

@ -73,7 +73,7 @@
</view> </view>
</view> </view>
<view :class="showYes ? 'third flex flex-column yes' : 'third flex flex-column no'" <view :class="showYes ? 'third flex flex-column yes' : 'third flex flex-column no'"
style="justify-content: flex-start;"> style="justify-content: flex-start;margin-bottom: 280rpx;">
<view class="flex align-items" style="padding: 30rpx;justify-content: space-between;"> <view class="flex align-items" style="padding: 30rpx;justify-content: space-between;">
<view class="third-top flex align-items" style="margin: 0px;"> <view class="third-top flex align-items" style="margin: 0px;">
<span>报名信息 <span>报名信息
@ -124,7 +124,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="third flex flex-column" style="justify-content: flex-start;" v-if="priceGem > 0"> <view class="third flex flex-column" style="margin-bottom: 300rpx;justify-content: flex-start;" v-if="priceGem > 0">
<view @click="tipsShow = true" class="flex align-items" <view @click="tipsShow = true" class="flex align-items"
style="padding: 30rpx;justify-content: space-between;"> style="padding: 30rpx;justify-content: space-between;">
<view class="third-top flex align-items" style="margin: 0px;"> <view class="third-top flex align-items" style="margin: 0px;">
@ -137,7 +137,30 @@
style="background: #323232;border-radius: 8rpx;text-align: center;padding: 2rpx 10rpx 10rpx 10rpx;"> style="background: #323232;border-radius: 8rpx;text-align: center;padding: 2rpx 10rpx 10rpx 10rpx;">
<text style="font-size: 22rpx;color: #BBFC5B;">{{ detail.refund_info.title }}</text> <text style="font-size: 22rpx;color: #BBFC5B;">{{ detail.refund_info.title }}</text>
</view> </view>
<view style="margin-left: 10rpx;"><u-icon name="arrow-right"></u-icon></view> <!-- <view style="margin-left: 10rpx;"><u-icon name="arrow-right"></u-icon></view> -->
</view>
</view>
<view class="third-center" style="padding:0rpx 30rpx 50rpx 30rpx;">
<view class="refund-policy-table">
<view class="table-container">
<!-- 表头 -->
<view class="table-header">
<view class="th-item">申请退款时间</view>
<view class="th-item">退款比例</view>
<view class="th-item">退款金额</view>
</view>
<!-- 表格内容 -->
<view class="table-body">
<!-- 随时退 -->
<view class="table-row" v-for="(item,index) in detail.refund_desc" :key="index">
<view class="td-item">{{item.refund_time}}</view>
<view class="td-item">{{item.refund_scale}}</view>
<view class="td-item">{{item.refund_price}}</view>
</view>
</view>
</view>
</view> </view>
</view> </view>
<!-- <view class="third-center"> <!-- <view class="third-center">
@ -196,7 +219,7 @@
<view class="zhixiao shows_zhidao" @click="tipsShow = false">我已知晓</view> <view class="zhixiao shows_zhidao" @click="tipsShow = false">我已知晓</view>
</view> </view>
</u-popup> </u-popup>
<view class="third flex flex-column" style="justify-content: flex-start;margin-bottom: 300rpx;"> <!-- <view class="third flex flex-column" style="justify-content: flex-start;margin-bottom: 300rpx;">
<view class="third-top flex align-items"> <view class="third-top flex align-items">
<span>免责声明 <span>免责声明
<image class="icons" src="/static/detail/xiangqing.png"></image> <image class="icons" src="/static/detail/xiangqing.png"></image>
@ -210,12 +233,12 @@
</span> </span>
</view> </view>
</view> </view> -->
<view class="footer flex align-items" style="justify-content: space-between;"> <view class="footer flex align-items" style="justify-content: space-between;">
<span style="margin-bottom: 170rpx; width: 750rpx;margin-left: 20rpx;"> <span style="margin-bottom: 170rpx; width: 750rpx;margin-left: 20rpx;">
<cc-protocolBox :agree="agree" :protocolArr="protocolArr" <cc-protocolBox :agree="agree" :name="protocolArr"
@protocolClick="protocolClick"></cc-protocolBox> @protocolClick="protocolClick"></cc-protocolBox>
</span> </span>
<view class="footer-right flex justify-center align-items"> <view class="footer-right flex justify-center align-items">
@ -281,11 +304,11 @@
<!-- 声明 --> <!-- 声明 -->
<u-popup @touchmove.native.stop.prevent :closeOnClickOverlay="false" :closeable="true" :show="show" :round="10" mode="center" <u-popup @touchmove.native.stop.prevent :closeOnClickOverlay="false" :closeable="true" :show="show" :round="10" mode="center"
@close="close" @open="open" :custom-style="popupStylezf"> @close="close" @open="open" :custom-style="popupStylezf">
<span style="font-size: 42rpx;font-weight: 800;margin: 12rpx 0 24rpx 0;height: 120rpx;">《免责声明》</span> <span style="font-size: 40rpx;font-weight: 800;height: 120rpx;">《用户参与须知》</span>
<scroll-view ref="scrollView" :scroll-top="scrollTop" :show-scrollbar='true' <scroll-view ref="scrollView" :scroll-top="scrollTop" :show-scrollbar='true'
@scrolltolower="handleScroll" scroll-y="true" style="height: 800rpx;margin-bottom: 24rpx;"> @scrolltolower="handleScroll" scroll-y="true" style="height: 800rpx;margin-bottom: 24rpx;">
<view class="popup flex align-items flex-column"> <view class="popup flex align-items flex-column">
<rich-text :nodes="Negotiate"></rich-text> <rich-text style="text-align: justify;" :nodes="Negotiate"></rich-text>
</view> </view>
</scroll-view> </scroll-view>
<view class="popup-footer"> <view class="popup-footer">
@ -360,7 +383,7 @@ export default {
Negotiate: null, // 入驻协议 Negotiate: null, // 入驻协议
agree: false, agree: false,
agreeShow: false, agreeShow: false,
protocolArr: ["<支付协议>"], protocolArr: "《用户参与须知》",
value_slide: 0, value_slide: 0,
scrollTop: 0, scrollTop: 0,
userInfo: {}, userInfo: {},
@ -516,6 +539,11 @@ export default {
}) })
}, },
openUrlSuccess() { openUrlSuccess() {
uni.showToast({
title: '订单处理中...',
icon: 'none',
duration: 2000
});
uni.redirectTo({ uni.redirectTo({
url: '/packageA/my/success?id=' + this.orderInfo.id + '&order_no=' + this.orderInfo.order_no url: '/packageA/my/success?id=' + this.orderInfo.id + '&order_no=' + this.orderInfo.order_no
}) })
@ -960,7 +988,7 @@ export default {
}).then(res => { }).then(res => {
if (res.code == 1) { if (res.code == 1) {
this.Negotiate = (res.data.entry_agreement).replace(/\<img/gi, this.Negotiate = (res.data.user_participation_notice).replace(/\<img/gi,
'<img style="max-width:100%;height:auto" '); '<img style="max-width:100%;height:auto" ');
} else { } else {
uni.showToast({ uni.showToast({

58
packageA/center/detail.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<view class="detail_all"> <view class="detail_all">
<view class="nav"> <view class="nav">
<u-navbar :is-back="true" leftIconColor="#FFFFFF" :autoBack="true" :bgColor="background" <u-navbar :is-back="true" leftIconColor="#000000" :autoBack="true" :bgColor="background"
:titleStyle='titleStyle'> </u-navbar> title="详情"></u-navbar>
</view> </view>
<view class="box flex justify-start flex-column align-items" :class="overlay ? 'no-scroll' : ''"> <view class="box flex justify-start flex-column align-items" :class="overlay ? 'no-scroll' : ''">
<view class="swiper"> <view class="swiper">
@ -36,10 +36,15 @@
style="width: 36rpx;height: 36rpx;margin-right: 12rpx;border-radius: 80rpx;"> style="width: 36rpx;height: 36rpx;margin-right: 12rpx;border-radius: 80rpx;">
</image> </image>
<span style="color: #9C9C9C ;width: auto;">{{ detail.user.nickname }}</span> <span style="color: #9C9C9C ;width: auto;">{{ detail.user.nickname }}</span>
<span class="flex justify-center align-items xieyi"> <span class="flex justify-center align-items xieyi"
:style="{width: detail.refund_info.status!=5?'190rpx':'156rpx'}">
<image src="/static/detail/baohu.png" mode="" <image src="/static/detail/baohu.png" mode=""
style="width: 28rpx;height: 28rpx;margin-right: 0;"></image> style="width: 28rpx;height: 28rpx;margin-right: 0;"></image>
<span class="white-space" style="width: 90rpx;text-align: center;">{{ <span v-if="detail.refund_info.status!=5" class="white-space"
style="width: 120rpx;text-align: center;">{{
detail.refund_info.title }}</span>
<span v-if="detail.refund_info.status==5" class="white-space"
style="width: 90rpx;text-align: center;">{{
detail.refund_info.title }}</span> detail.refund_info.title }}</span>
<image src="/static/detail/zidong.png" mode="" <image src="/static/detail/zidong.png" mode=""
style="width: 20rpx;height: 20rpx;margin-right: 0;"></image> style="width: 20rpx;height: 20rpx;margin-right: 0;"></image>
@ -68,10 +73,10 @@
<image src="/static/index/dian.png" <image src="/static/index/dian.png"
:class="detail.join_info.users && detail.join_info.users.length > 0 ? '' : 'smalld'" :class="detail.join_info.users && detail.join_info.users.length > 0 ? '' : 'smalld'"
style="width: 58rpx;height: 58rpx;margin-left:-20rpx;z-index: 1;"></image> style="width: 58rpx;height: 58rpx;margin-left:-20rpx;z-index: 1;"></image>
</view>
<span class="number">{{ detail.join_info.people_number }}/{{ detail.join_info.stock >= 10000 ? <span class="number">{{ detail.join_info.people_number }}/{{ detail.join_info.stock >= 10000 ?
'9999+' : detail.join_info.stock}} '9999+' : detail.join_info.stock}}
人数</span> 人数</span>
</view>
<view class="value_slide"> <view class="value_slide">
<u-slider v-model="value_slide" showValue min="0" max="100" blockSize="12" <u-slider v-model="value_slide" showValue min="0" max="100" blockSize="12"
inactiveColor="#EBEBEB" activeColor="#BBFC5B" disabled></u-slider> inactiveColor="#EBEBEB" activeColor="#BBFC5B" disabled></u-slider>
@ -220,17 +225,17 @@
<view v-if="overlay" class="pos"> <view v-if="overlay" class="pos">
<image @click="closeoo" src="/static/center/close.png" mode="" <image @click="closeoo" src="/static/center/close.png" mode=""
style="z-index: 10000;width: 64rpx;height: 64rpx;position: absolute;top: 200rpx;right: 45rpx;"> style="z-index: 10000;width: 64rpx;height: 64rpx;position: absolute;top: 0rpx;right: 45rpx;">
</image> </image>
<l-painter isCanvasToTempFilePath :after-delay="500" @success="sunccessimg" <l-painter isCanvasToTempFilePath :after-delay="500" @success="sunccessimg"
css="width:661rpx;height: 1072rpx;background-image:url(https://naweigetetest2.hschool.com.cn/dyqc/fenxiang.png);" css="width:661rpx;height: 1072rpx;background-image:url(https://naweigetetest2.hschool.com.cn/dyqc/fenxiang.png);"
custom-style="position:absolute;left:45rpx;right:44rpx;top:200rpx;z-index:100"> custom-style="position:absolute;left:45rpx;right:44rpx;top:0rpx;z-index:100">
<l-painter-image :src="detail.user.avatar" <l-painter-image :src="detail.user.avatar"
css="z-index:300;margin-left: 15rpx; margin-top: 120rpx;border: 2rpx solid #FFFFFF; width: 60rpx; height: 60rpx; border-radius: 50%;" /> css="z-index:300;margin-left: 15rpx; margin-top: 120rpx;border: 2rpx solid #FFFFFF; width: 60rpx; height: 60rpx; border-radius: 50%;" />
<l-painter-view css="margin-top: 130rpx; padding-left: 20rpx; display: inline-block"> <l-painter-view css="margin-top: 130rpx; padding-left: 20rpx; display: inline-block">
<l-painter-text :text="detail.user.nickname+'的邀请'" <l-painter-text :text="detail.user.nickname+'的邀请'"
css="display: block; height: 36rpx;color: #3D3D3D; font-size: 28rpx; fontWeight: 400;" /> css="display: block; height: 36rpx;color: #3D3D3D; font-size: 28rpx; fontWeight: 600;" />
</l-painter-view> </l-painter-view>
<l-painter-view <l-painter-view
css="margin-left: 20rpx; margin-top: 20rpx; margin-bottom: 20rpx; box-sizing: border-box;width: 100%;"> css="margin-left: 20rpx; margin-top: 20rpx; margin-bottom: 20rpx; box-sizing: border-box;width: 100%;">
@ -244,7 +249,7 @@
css="line-clamp: 1;font-weight: bold;color:#202020;font-size: 32rpx;width:400rpx;box-sizing:border-box;line-height: 42rpx;" css="line-clamp: 1;font-weight: bold;color:#202020;font-size: 32rpx;width:400rpx;box-sizing:border-box;line-height: 42rpx;"
:text="detail.title"></l-painter-text> :text="detail.title"></l-painter-text>
<l-painter-text <l-painter-text
css="line-clamp: 1; color:#FF4810;font-size: 28rpx;width:220rpx;margin-top: 20rpx;line-height: 38rpx;" css="line-clamp: 1; color:#FF4810;font-size: 35rpx;width:220rpx;margin-top: 20rpx;line-height: 38rpx;fontWeight: 600;"
:text="'￥'+detail.price"></l-painter-text> :text="'￥'+detail.price"></l-painter-text>
<l-painter-text <l-painter-text
css="line-clamp: 2; color:#9C9C9C;font-size: 26rpx;margin-top: 20rpx;line-height: 36rpx;width: 360rpx;" css="line-clamp: 2; color:#9C9C9C;font-size: 26rpx;margin-top: 20rpx;line-height: 36rpx;width: 360rpx;"
@ -292,16 +297,14 @@
style="width: 400rpx;border: 1rpx solid #D5FD99;" mode="widthFix"></image> style="width: 400rpx;border: 1rpx solid #D5FD99;" mode="widthFix"></image>
</view> </view>
<view style="padding: 0rpx 40rpx;"> <view style="padding: 0rpx 40rpx;">
<view <view style="font-size: 28rpx;font-weight: 300;color: #9C9C9C;text-align: center;margin-top: 20rpx;">
style="font-size: 28rpx;font-weight: 300;color: #9C9C9C;text-align: center;margin-top: 20rpx;">
长按识别二维码进群</view> 长按识别二维码进群</view>
<view style="font-size: 28rpx;color: #3D3D3D;text-align: center;margin-top: 30rpx;"> <view style="font-size: 28rpx;color: #3D3D3D;text-align: center;margin-top: 30rpx;">
如果无法加入或者开启了群验证，可能是成员已满您即将加入由用户自发组织的户外活动，请知悉</view> 如果无法加入或者开启了群验证，可能是成员已满您即将加入由用户自发组织的户外活动，请知悉</view>
<view style="font-size: 28rpx;color: #0CA013;text-align: center;margin-top: 30rpx;"> <view style="font-size: 28rpx;color: #0CA013;text-align: center;margin-top: 30rpx;">
确认您已知晓《用户协议》的用户义务与责任平台不对活动真实性作担保，请入群自行辨别</view> 确认您已知晓《用户协议》的用户义务与责任平台不对活动真实性作担保，请入群自行辨别</view>
</view> </view>
<view @click="qunShow = false" <view @click="qunShow = false" class="btn_1">我已知晓</view>
class="btn_1">我已知晓</view>
</u-popup> </u-popup>
</view> </view>
</template> </template>
@ -342,7 +345,7 @@
data() { data() {
return { return {
qunShow:false, qunShow: false,
height_sw: '580rpx', height_sw: '580rpx',
style: { style: {
// 字符串的形式 // 字符串的形式
@ -384,9 +387,9 @@
order_no2: '', order_no2: '',
mobile: '', mobile: '',
is_show_model: false, //是否显示分享模态窗 is_show_model: false, //是否显示分享模态窗
background: '#ffffff00', background: '#ffffff',
titleStyle: { titleStyle: {
color: '#FFFFFF' color: '#000000'
}, },
}; };
}, },
@ -1049,6 +1052,7 @@
} }
.box { .box {
padding-top: 175rpx;
position: relative; position: relative;
} }
@ -1070,10 +1074,14 @@
.top_texts { .top_texts {
position: absolute; position: absolute;
top: -151rpx; top: -148rpx;
right: 68rpx; right: 30rpx;
z-index: 3; z-index: 3;
color: #ffffff; color: #ffffff;
width: 200rpx;
text-align: center;
display: flex;
justify-content: center;
.xiao { .xiao {
margin-left: 4rpx; margin-left: 4rpx;
@ -1172,16 +1180,13 @@
font-weight: 400; font-weight: 400;
font-size: 26rpx; font-size: 26rpx;
color: #323232; color: #323232;
margin-left: 32rpx; margin-left: 20rpx;
} }
view { view {
span { span {
width: 24rpx;
height: 24rpx;
background: rgba(255, 255, 255, 0.4); background: rgba(255, 255, 255, 0.4);
border-radius: 24rpx; border-radius: 24rpx;
margin: 0 22rpx 0 4rpx;
} }
} }
} }
@ -1233,7 +1238,7 @@
.imgs { .imgs {
display: block; display: block;
width: 100%; width: 690rpx;
} }
} }
@ -1593,6 +1598,7 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
z-index: 99999; z-index: 99999;
.posterClose { .posterClose {
position: absolute; position: absolute;
// right: 8rpx; // right: 8rpx;
@ -1702,7 +1708,7 @@
.btnList { .btnList {
position: absolute; position: absolute;
bottom: 10rpx; bottom: 173rpx;
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
align-items: self-start; align-items: self-start;
@ -1811,7 +1817,8 @@
// #endif // #endif
} }
.ck-qrcode{
.ck-qrcode {
width: 180rpx; width: 180rpx;
height: 70rpx; height: 70rpx;
background: #323232; background: #323232;
@ -1823,6 +1830,7 @@
line-height: 70rpx; line-height: 70rpx;
text-align: center; text-align: center;
} }
.btn_1 { .btn_1 {
width: 95%; width: 95%;
height: 90rpx; height: 90rpx;

36
packageA/center/detailSys.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<view class="detail_all"> <view class="detail_all">
<view class="nav"> <view class="nav">
<u-navbar :is-back="true" leftIconColor="#FFFFFF" :autoBack='true' :bgColor="background" <u-navbar :is-back="true" leftIconColor="#000000" :autoBack="true" :bgColor="background"
:titleStyle='titleStyle'> </u-navbar> title="详情"></u-navbar>
</view> </view>
<view class="box flex justify-start flex-column align-items" :class="overlay ? 'no-scroll' : ''"> <view class="box flex justify-start flex-column align-items" :class="overlay ? 'no-scroll' : ''">
<view class="swiper"> <view class="swiper">
@ -35,11 +35,16 @@
<image :src="detail.user.avatar" mode="" class="icon-size" <image :src="detail.user.avatar" mode="" class="icon-size"
style="width: 36rpx;height: 36rpx;margin-right: 12rpx;border-radius: 80rpx;"></image> style="width: 36rpx;height: 36rpx;margin-right: 12rpx;border-radius: 80rpx;"></image>
<span style="color: #9C9C9C ;width: 32%;">{{ detail.user.nickname }}</span> <span style="color: #9C9C9C ;width: 32%;">{{ detail.user.nickname }}</span>
<span class="flex justify-center align-items xieyi"> <span class="flex justify-center align-items xieyi"
:style="{width: detail.refund_info.status!=5?'190rpx':'156rpx'}">
<image src="/static/detail/baohu.png" mode="" <image src="/static/detail/baohu.png" mode=""
style="width: 28rpx;height: 28rpx;margin-right: 0;"></image> style="width: 28rpx;height: 28rpx;margin-right: 0;"></image>
<span class="white-space" <span v-if="detail.refund_info.status!=5" class="white-space"
style="width: 90rpx;text-align: center;">{{ detail.refund_info.title }}</span> style="width: 120rpx;text-align: center;">{{
detail.refund_info.title }}</span>
<span v-if="detail.refund_info.status==5" class="white-space"
style="width: 90rpx;text-align: center;">{{
detail.refund_info.title }}</span>
<image src="/static/detail/zidong.png" mode="" <image src="/static/detail/zidong.png" mode=""
style="width: 20rpx;height: 20rpx;margin-right: 0;"></image> style="width: 20rpx;height: 20rpx;margin-right: 0;"></image>
</span> </span>
@ -203,17 +208,17 @@
<view v-if="overlay" class="pos"> <view v-if="overlay" class="pos">
<image @click="closeoo" src="/static/center/close.png" mode="" <image @click="closeoo" src="/static/center/close.png" mode=""
style="z-index: 10000;width: 64rpx;height: 64rpx;position: absolute;top: 200rpx;right: 45rpx;"> style="z-index: 10000;width: 64rpx;height: 64rpx;position: absolute;top: 0rpx;right: 45rpx;">
</image> </image>
<l-painter isCanvasToTempFilePath :after-delay="500" @success="sunccessimg" <l-painter isCanvasToTempFilePath :after-delay="500" @success="sunccessimg"
css="width:661rpx;height: 1072rpx;background-image:url(https://naweigetetest2.hschool.com.cn/dyqc/fenxiang.png);" css="width:661rpx;height: 1072rpx;background-image:url(https://naweigetetest2.hschool.com.cn/dyqc/fenxiang.png);"
custom-style="position:absolute;left:45rpx;right:44rpx;top:200rpx;z-index:100"> custom-style="position:absolute;left:45rpx;right:44rpx;top:0rpx;z-index:100">
<l-painter-image :src="detail.user.avatar" <l-painter-image :src="detail.user.avatar"
css="z-index:300;margin-left: 15rpx; margin-top: 120rpx;border: 2rpx solid #FFFFFF; width: 60rpx; height: 60rpx; border-radius: 50%;" /> css="z-index:300;margin-left: 15rpx; margin-top: 120rpx;border: 2rpx solid #FFFFFF; width: 60rpx; height: 60rpx; border-radius: 50%;" />
<l-painter-view css="margin-top: 130rpx; padding-left: 20rpx; display: inline-block"> <l-painter-view css="margin-top: 130rpx; padding-left: 20rpx; display: inline-block">
<l-painter-text :text="detail.user.nickname+'的邀请'" <l-painter-text :text="detail.user.nickname+'的邀请'"
css="display: block; height: 36rpx;color: #3D3D3D; font-size: 28rpx; fontWeight: 400;" /> css="display: block; height: 36rpx;color: #3D3D3D; font-size: 28rpx; fontWeight: 600;" />
</l-painter-view> </l-painter-view>
<l-painter-view <l-painter-view
css="margin-left: 20rpx; margin-top: 20rpx; margin-bottom: 20rpx; box-sizing: border-box;width: 100%;"> css="margin-left: 20rpx; margin-top: 20rpx; margin-bottom: 20rpx; box-sizing: border-box;width: 100%;">
@ -227,7 +232,7 @@
css="line-clamp: 1;font-weight: bold;color:#202020;font-size: 32rpx;width:400rpx;box-sizing:border-box;line-height: 42rpx;" css="line-clamp: 1;font-weight: bold;color:#202020;font-size: 32rpx;width:400rpx;box-sizing:border-box;line-height: 42rpx;"
:text="detail.title"></l-painter-text> :text="detail.title"></l-painter-text>
<l-painter-text <l-painter-text
css="line-clamp: 1; color:#FF4810;font-size: 28rpx;width:220rpx;margin-top: 20rpx;line-height: 38rpx;" css="line-clamp: 1; color:#FF4810;font-size: 35rpx;width:220rpx;margin-top: 20rpx;line-height: 38rpx;fontWeight: 600;"
:text="'￥'+detail.price"></l-painter-text> :text="'￥'+detail.price"></l-painter-text>
<l-painter-text <l-painter-text
css="line-clamp: 2; color:#9C9C9C;font-size: 26rpx;margin-top: 20rpx;line-height: 36rpx;width: 360rpx;" css="line-clamp: 2; color:#9C9C9C;font-size: 26rpx;margin-top: 20rpx;line-height: 36rpx;width: 360rpx;"
@ -343,7 +348,7 @@
order_no2: '', order_no2: '',
mobile: '', mobile: '',
is_show_model: false, //是否显示分享模态窗 is_show_model: false, //是否显示分享模态窗
background: '#ffffff00', background: '#ffffff',
titleStyle: { titleStyle: {
color: '#FFFFFF' color: '#FFFFFF'
}, },
@ -954,6 +959,7 @@
} }
.box { .box {
padding-top: 175rpx;
position: relative; position: relative;
} }
@ -975,10 +981,14 @@
.top_texts { .top_texts {
position: absolute; position: absolute;
top: -156rpx; top: -148rpx;
right: 68rpx; right: 30rpx;
z-index: 3; z-index: 3;
color: #ffffff; color: #ffffff;
width: 200rpx;
text-align: center;
display: flex;
justify-content: center;
.xiao { .xiao {
margin-left: 4rpx; margin-left: 4rpx;
@ -1638,7 +1648,7 @@
.btnList { .btnList {
position: absolute; position: absolute;
bottom: 10rpx; bottom: 173rpx;
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
align-items: self-start; align-items: self-start;

125
packageA/my/orderList.vue
View File

@ -118,19 +118,25 @@
style="display: flex;justify-content: space-between;align-items: center;margin-top: 30rpx;padding-right: 30rpx;"> style="display: flex;justify-content: space-between;align-items: center;margin-top: 30rpx;padding-right: 30rpx;">
<view> <view>
<text>退款金额：</text> <text>退款金额：</text>
<text v-if="server_status==3" style="color: #FF4810;font-weight: 600;">￥{{ item.first_refundprice }}</text> <text v-if="server_status==3"
<text v-if="server_status==6" style="color: #FF4810;font-weight: 600;">￥{{ item.real_refundprice }}</text> style="color: #FF4810;font-weight: 600;">￥{{ item.first_refundprice }}</text>
<text v-if="server_status==6"
style="color: #FF4810;font-weight: 600;">￥{{ item.real_refundprice }}</text>
</view> </view>
<view style="font-size: 26rpx;color: #9C9C9C;">数量：{{ item.num }}</view> <view style="font-size: 26rpx;color: #9C9C9C;">数量：{{ item.num }}</view>
</view> </view>
</view> </view>
</view> </view>
<view style="height: 1px;width: 98%;background-color: #F0F0F0;margin:30rpx 0px 0rpx 0px;"> <view
style="height: 1px;width: 98%;background-color: #F0F0F0;margin:30rpx 0px 0rpx 0px;">
</view> </view>
</view> </view>
</view> </view>
<view class="flex align-items" style="justify-content: flex-end;padding: 0rpx 30rpx 30rpx 0rpx;"> <view class="flex align-items"
<view style="font-weight: 600;font-size: 28rpx;width: 180rpx;height: 70rpx;text-align: center;line-height: 70rpx;background: linear-gradient( 270deg, #FBF66D 0%, #9CEAA2 100%);border-radius: 276rpx;" @click="goAfterInfo(item.id)"> 查看详情 </view> style="justify-content: flex-end;padding: 0rpx 30rpx 30rpx 0rpx;">
<view
style="font-weight: 600;font-size: 28rpx;width: 180rpx;height: 70rpx;text-align: center;line-height: 70rpx;background: linear-gradient( 270deg, #FBF66D 0%, #9CEAA2 100%);border-radius: 276rpx;"
@click="goAfterInfo(item.id)"> 查看详情 </view>
</view> </view>
</view> </view>
</view> </view>
@ -178,10 +184,10 @@
</template> </template>
<script> <script>
import { import {
dateWeek dateWeek
} from "../../utils/dateFormat"; } from "../../utils/dateFormat";
export default { export default {
data() { data() {
return { return {
popupStyle: { popupStyle: {
@ -270,7 +276,7 @@ export default {
title: '加载中...' title: '加载中...'
}); });
this.page = 1; this.page = 1;
this.list = []; this.hotList = [];
this.getHotList(this.selected); this.getHotList(this.selected);
setTimeout(() => { setTimeout(() => {
uni.hideLoading(); uni.hideLoading();
@ -292,7 +298,7 @@ export default {
}, },
methods: { methods: {
goAfterInfo(id){ goAfterInfo(id) {
uni.navigateTo({ uni.navigateTo({
url: "/packageA/afterSales/info?id=" + id, url: "/packageA/afterSales/info?id=" + id,
}); });
@ -459,7 +465,7 @@ export default {
}); });
} }
}) })
.catch((error) => { }); .catch((error) => {});
}, },
// 跳转预约 // 跳转预约
toMake(id, orderId, classes_lib_id, type) { toMake(id, orderId, classes_lib_id, type) {
@ -543,7 +549,7 @@ export default {
}); });
} }
}) })
.catch((error) => { }); .catch((error) => {});
this.show = true; this.show = true;
}, },
switchSort(index, value) { switchSort(index, value) {
@ -618,11 +624,11 @@ export default {
this.getAfterList(); this.getAfterList();
} }
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.box { .box {
.con-center { .con-center {
width: 100%; width: 100%;
// margin-top: 25rpx; // margin-top: 25rpx;
@ -676,12 +682,13 @@ export default {
} }
.shenhe { .shenhe {
width: 100%; width: 94%;
margin-left: 30rpx;
margin-top: 30rpx;
position: fixed; position: fixed;
top: 80rpx; top: 80rpx;
//background: #f7f7f7;
background: #f7f7f7;
z-index: 100;
padding: 30rpx 0rpx;
.span_s { .span_s {
width: 134rpx; width: 134rpx;
height: 60rpx; height: 60rpx;
@ -699,45 +706,45 @@ export default {
} }
} }
} }
} }
.w-100 { .w-100 {
width: 100%; width: 100%;
} }
.flex { .flex {
display: flex; display: flex;
} }
.flex-start { .flex-start {
align-items: flex-start; align-items: flex-start;
} }
.justify-center { .justify-center {
justify-content: center; justify-content: center;
} }
.align-items { .align-items {
align-items: center; align-items: center;
} }
.flex-column { .flex-column {
flex-flow: column; flex-flow: column;
} }
.justify-start { .justify-start {
justify-content: start; justify-content: start;
} }
.line { .line {
margin-top: 12rpx; margin-top: 12rpx;
width: 690rpx; width: 690rpx;
height: 1rpx; height: 1rpx;
background: #008cff; background: #008cff;
border-radius: 0rpx 0rpx 0rpx 0rpx; border-radius: 0rpx 0rpx 0rpx 0rpx;
} }
.centerBox { .centerBox {
width: 690rpx; width: 690rpx;
.box-line { .box-line {
@ -852,17 +859,17 @@ export default {
margin-top: 50rpx; margin-top: 50rpx;
} }
} }
} }
.charge { .charge {
font-family: PingFang SC, PingFang SC; font-family: PingFang SC, PingFang SC;
font-weight: 800; font-weight: 800;
font-size: 28rpx; font-size: 28rpx;
color: #ff2323; color: #ff2323;
line-height: 32rpx; line-height: 32rpx;
} }
.search { .search {
margin-top: 24rpx; margin-top: 24rpx;
width: 690rpx; width: 690rpx;
height: 64rpx; height: 64rpx;
@ -916,9 +923,9 @@ export default {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
} }
.popup { .popup {
.header { .header {
margin-left: 24rpx; margin-left: 24rpx;
font-family: PingFang SC, PingFang SC; font-family: PingFang SC, PingFang SC;
@ -1007,25 +1014,25 @@ export default {
color: #ffffff; color: #ffffff;
} }
} }
} }
.hui { .hui {
font-family: PingFang SC, PingFang SC; font-family: PingFang SC, PingFang SC;
font-weight: 500; font-weight: 500;
font-size: 24rpx; font-size: 24rpx;
color: #7a7a7a; color: #7a7a7a;
} }
.white-space { .white-space {
overflow: hidden; overflow: hidden;
/* 确保超出容器的文本被隐藏 */ /* 确保超出容器的文本被隐藏 */
white-space: nowrap; white-space: nowrap;
/* 确保文本在一行内显示 */ /* 确保文本在一行内显示 */
text-overflow: ellipsis; text-overflow: ellipsis;
/* 使用省略号表示被截断的文本 */ /* 使用省略号表示被截断的文本 */
} }
.hot { .hot {
margin-top: 80rpx; margin-top: 80rpx;
margin-bottom: 70rpx; margin-bottom: 70rpx;
min-height: 100vh; min-height: 100vh;
@ -1060,13 +1067,13 @@ export default {
line-height: 30rpx; line-height: 30rpx;
} }
} }
} }
.wsh_hot { .wsh_hot {
margin-top: 160rpx; margin-top: 160rpx;
} }
.content { .content {
// height: 462rpx; // height: 462rpx;
// overflow-x: auto; // overflow-x: auto;
@ -1224,9 +1231,9 @@ export default {
margin-top: 18rpx; margin-top: 18rpx;
margin-right: 24rpx; margin-right: 24rpx;
} }
} }
.part { .part {
width: 168rpx; width: 168rpx;
height: 70rpx; height: 70rpx;
background: url(@/static/index/shangche.png); background: url(@/static/index/shangche.png);
@ -1236,9 +1243,9 @@ export default {
font-weight: 400; font-weight: 400;
font-size: 42rpx; font-size: 42rpx;
color: #bbfc5b; color: #bbfc5b;
} }
.part1 { .part1 {
width: 168rpx; width: 168rpx;
height: 70rpx; height: 70rpx;
background: url(@/static/index/hexiao.png); background: url(@/static/index/hexiao.png);
@ -1248,9 +1255,9 @@ export default {
font-weight: 400; font-weight: 400;
font-size: 42rpx; font-size: 42rpx;
color: #323232; color: #323232;
} }
.tofb { .tofb {
margin-top: 50rpx; margin-top: 50rpx;
width: 280rpx; width: 280rpx;
height: 70rpx; height: 70rpx;
@ -1263,5 +1270,5 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
</style> </style>

5
packageA/my/pendinPayStatus.vue
View File

@ -83,11 +83,6 @@
<span > 申请售后 </span> <span > 申请售后 </span>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</template> </template>

128
packageB/card/index.vue
View File

@ -3,7 +3,7 @@
<view style="padding: 30rpx;"> <view style="padding: 30rpx;">
<view> <view>
<text style="color: #FF4810;font-size: 28rpx;">*</text> <text style="color: #FF4810;font-size: 28rpx;">*</text>
<text>上传身份证</text> <text style="font-weight: 600;">上传身份证</text>
</view> </view>
<view <view
style="display: flex;justify-content: space-between;align-items: center;gap: 30rpx;margin-top: 30rpx;"> style="display: flex;justify-content: space-between;align-items: center;gap: 30rpx;margin-top: 30rpx;">
@ -35,7 +35,7 @@
<view style="padding: 30rpx;"> <view style="padding: 30rpx;">
<view> <view>
<text style="color: #FF4810;font-size: 28rpx;">*</text> <text style="color: #FF4810;font-size: 28rpx;">*</text>
<text>身份证信息</text> <text style="font-weight: 600;">身份证信息</text>
</view> </view>
<view> <view>
<view style="display: flex;justify-content: space-between;align-items: center;padding: 40rpx 0px;"> <view style="display: flex;justify-content: space-between;align-items: center;padding: 40rpx 0px;">
@ -58,7 +58,36 @@
</view> </view>
</view> </view>
<view style="height: 10rpx;width: 100%;background: #F8F8F8;"></view> <view style="height: 10rpx;width: 100%;background: #F8F8F8;"></view>
<view class="btn_1" @click="save()">提交信息</view> <view style="padding:30rpx">
<cc-protocolBox :agree="agree" :name="protocolArr" :desc="desc"
@protocolClick="protocolClick"></cc-protocolBox>
</view>
<view v-if="agree" class="btn_1" @click="save()">提交信息</view>
<view v-if="!agree" class="btn_2">提交信息</view>
<u-popup @touchmove.native.stop.prevent :closeable="true" :show="show" :round="10" mode="center"
@close="show = false" :custom-style="{
width: '642rpx',
padding: '24rpx 24rpx 42rpx 24rpx',
height: '984rpx',
margin: '0 auto',
display: 'flex',
justifyContent: 'start',
alignItems: 'center',
flexColumn: 'column'
}" :closeOnClickOverlay="false">
<span style="font-size: 40rpx;font-weight: 800;height: 120rpx;">《【搭+】入驻协议》</span>
<scroll-view ref="scrollView" :show-scrollbar='true'
@scrolltolower="handleScroll" scroll-y="true" style="height: 800rpx;margin-bottom: 24rpx;">
<view class="popup flex align-items flex-column">
<rich-text style="text-align: justify;" :nodes="Negotiate"></rich-text>
</view>
</scroll-view>
<view class="popup-footer">
<span class="zhixiao" v-if="agreeShow == false">我同意</span>
<span class="zhixiao shows_zhidao" v-if="agreeShow == true" @click="change">我同意</span>
</view>
</u-popup>
</view> </view>
</template> </template>
@ -66,7 +95,13 @@
export default { export default {
data() { data() {
return { return {
agreeShow:false,
show:false,
agree:false,
protocolArr:"《【搭+】入驻协议》",
desc:'的全部条款，愿意受其约束',
imgUrl:uni.$u.http.config.baseURL, imgUrl:uni.$u.http.config.baseURL,
Negotiate: null, // 入驻协议
form:{ form:{
name:'', name:'',
idnum:'', idnum:'',
@ -77,8 +112,45 @@
}, },
onShow() { onShow() {
this.getInfo(); this.getInfo();
this.getAgreement();
}, },
methods: { methods: {
protocolClick(tag) {
this.show=true;
},
//同意
handleScroll() {
console.log(111);
this.agreeShow = true
},
change(){
this.show=false;
this.agree=true;
},
getAgreement() {
uni.$u.http.get('/api/index/agreement', {
params: {
}
}).then(res => {
if (res.code == 1) {
this.Negotiate = (res.data.entry_agreement).replace(/\<img/gi,
'<img style="max-width:100%;height:auto" ');
} else {
uni.showToast({
title: res.msg,
icon: 'none',
duration: 2000
});
}
}).catch(error => {
uni.showToast({
title: '请求失败，请稍后再试',
icon: 'none',
duration: 2000
});
});
},
getInfo(){ getInfo(){
uni.$u.http.get('/api/school.real_name/info').then(res=>{ uni.$u.http.get('/api/school.real_name/info').then(res=>{
console.log(res); console.log(res);
@ -113,6 +185,9 @@
console.log(res); console.log(res);
if(res.code==1){ if(res.code==1){
uni.$u.toast('提交成功'); uni.$u.toast('提交成功');
setTimeout(()=>{
uni.navigateBack();
},1000)
}else{ }else{
uni.$u.toast(res.data.msg); uni.$u.toast(res.data.msg);
} }
@ -180,4 +255,51 @@
margin: 0 auto; margin: 0 auto;
margin-top: 50rpx; margin-top: 50rpx;
} }
.btn_2 {
width: 95%;
height: 90rpx;
background: #C1C1C1;
border-radius: 198rpx 198rpx 198rpx 198rpx;
font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
font-weight: 400;
font-size: 32rpx;
color: #ffffff;
line-height: 90rpx;
text-align: center;
margin: 0 auto;
margin-top: 50rpx;
}
.popup-footer {
display: flex;
justify-content: center;
align-items: center;
// margin: 30rpx 0;
height: 146rpx;
.zhixiao {
height: 80rpx;
background: #E8E8E8;
//border-radius: 401rpx 401rpx 401rpx 401rpx;
font-family: YouSheBiaoTiHei;
font-weight: 400;
font-size: 36rpx;
color: #9C9C9C;
line-height: 32rpx;
display: flex;
justify-content: center;
align-items: center;
position: absolute;
width: 100%;
bottom: 0;
border-radius: 0rpx 0rpx 20rpx 20rpx;
}
.shows_zhidao {
background-color: #323232;
color: #BBFC5B;
font-weight: 400;
font-size: 36rpx;
}
}
</style> </style>

26
packageB/wallet/bank.vue
View File

@ -20,7 +20,7 @@
</view> </view>
<view style="background-color: #ffffff;border-radius:44rpx;padding:40rpx 30rpx;margin-top: 20rpx;"> <view style="background-color: #ffffff;border-radius:44rpx;padding:40rpx 30rpx;margin-top: 20rpx;">
<view style="font-size: 28rpx;color: #3D3D3D;font-weight: 400;"> <view style="font-size: 28rpx;color: #3D3D3D;font-weight: 400;">
提现金额 可提现金额
</view> </view>
<view style="margin-top: 20rpx;font-family: D-DIN-PRO, D-DIN-PRO;"> <view style="margin-top: 20rpx;font-family: D-DIN-PRO, D-DIN-PRO;">
<text style="font-size: 28rpx;color: #3D3D3D;font-weight: 700;">￥</text> <text style="font-size: 28rpx;color: #3D3D3D;font-weight: 700;">￥</text>
@ -28,11 +28,27 @@
settleInfo.settled_amount }}</text> settleInfo.settled_amount }}</text>
</view> </view>
<view style="background-color: #F0F0F0;height: 1px;width: 100%;margin-top: 20rpx;"></view> <view style="background-color: #F0F0F0;height: 1px;width: 100%;margin-top: 20rpx;"></view>
<view style="font-size: 24rpx;color: #9C9C9C;font-weight: 400;margin-top: 30rpx;"> <view style="line-height:40rpx;">
默认全部提现，具体到账时间以银行为准 <view style="font-size: 24rpx;color: #000000;font-weight: 600;margin-top: 20rpx;">
<view>1、提现金额：</view>
<view style="text-indent: 2em;">本平台的提现操作默认将您当前“可提现金额”的全部款项一次性提现，暂不支持部分提现。</view>
</view>
<view style="font-size: 24rpx;color: #000000;margin-top: 20rpx;">
<view style="font-weight: 600;">2、到账时间：</view>
<view style="text-indent: 2em;">我们将在您提交有效提现申请后的<text style="font-weight: 600;">T+3个工作日内</text>处理您的请求（T为申请日）。工作日不含周末及法定节假日，我们会尽快处理，但具体到账时间以收款银行的实际处理速度为准。</view>
</view>
<view style="font-size: 24rpx;color: #000000;margin-top: 20rpx;font-weight: 600;">
<view>3、关于手续费：</view>
<view style="text-indent: 2em;">若您的提现账户为跨行或跨区域的对公账户，银行在处理转账时可能会收取额外的手续费。该费用由银行直接扣除，非本平台收取，具体扣费金额以您的最终实际到账金额为准。</view>
</view>
<view style="font-size: 24rpx;color: #000000;margin-top: 20rpx;">
<view style="font-weight: 600;">4、信息准确性：</view>
<view style="text-indent: 2em;">请务必确保您填写的<text style="font-weight: 600;">持卡人姓名、银行卡号、开户银行</text>等信息完全正确。因您填写信息错误导致的任何资金损失、提现延迟或失败，全部责任由您自行承担。</view>
</view>
<view style="font-size: 24rpx;color: #000000;margin-top: 20rpx;">
<view style="font-weight: 600;">5、联系客服：</view>
<view style="text-indent: 2em;">如在提现过程中遇到任何问题，或超过预计到账时间仍未收到款项，请及时联系平台客服。</view>
</view> </view>
<view style="color: #FF4810;font-size: 24rpx;font-weight: 400;margin-top: 30rpx;">
若您的提现账户为跨行或跨区域的对公账户，银行会收取额外 手续费，具体金额以实际到账为准
</view> </view>
<view class="btn_1" @click="withdraw()">确认提现</view> <view class="btn_1" @click="withdraw()">确认提现</view>
</view> </view>

67
packageB/wallet/index.vue
View File

@ -2,7 +2,10 @@
<view class="page"> <view class="page">
<view style="background-color: #FFFFFF;border-radius: 0rpx 0rpx 44rpx 44rpx;padding: 30rpx 30rpx 40rpx 30rpx;"> <view style="background-color: #FFFFFF;border-radius: 0rpx 0rpx 44rpx 44rpx;padding: 30rpx 30rpx 40rpx 30rpx;">
<view class="section_1"> <view class="section_1">
<view style="color: #FFFFFF;font-size: 26rpx;padding: 30rpx 30rpx 0rpx 30rpx;">当前余额</view> <view style="color: #FFFFFF;font-size: 26rpx;padding: 30rpx 30rpx 0rpx 30rpx;">
<text style="vertical-align: middle;">当前余额</text>
<image @click="tipsShowOne = true" src="/static/tips.png" style="width: 25rpx;height: 25rpx;margin-left: 10rpx;vertical-align: middle;"></image>
</view>
<view style="display: flex;justify-content: space-between;align-items: center;padding: 30rpx;"> <view style="display: flex;justify-content: space-between;align-items: center;padding: 30rpx;">
<view style="color: #FFFFFF;font-size: 60rpx;font-weight: 900;"> <view style="color: #FFFFFF;font-size: 60rpx;font-weight: 900;">
{{settleInfo.settled_amount?settleInfo.settled_amount:0}} {{settleInfo.settled_amount?settleInfo.settled_amount:0}}
@ -22,6 +25,7 @@
<text>累计收益</text> <text>累计收益</text>
<text <text
style="padding-left: 20rpx;">￥{{settleInfo.accumulated_incoming_amount?settleInfo.accumulated_incoming_amount:0}}</text> style="padding-left: 20rpx;">￥{{settleInfo.accumulated_incoming_amount?settleInfo.accumulated_incoming_amount:0}}</text>
<image @click="tipsShowTwo = true" src="/static/tips.png" style="width: 25rpx;height: 25rpx;margin-left: 10rpx;"></image>
</view> </view>
</view> </view>
</view> </view>
@ -108,27 +112,54 @@
</view> </view>
<u-popup @touchmove.native.stop.prevent :custom-style="popupStyle" :closeable="false" :show="tipsShow" :round="10" mode="center" <u-popup @touchmove.native.stop.prevent :custom-style="popupStyle" :closeable="false" :show="tipsShow" :round="10" mode="center"
:closeOnClickOverlay="false"> :closeOnClickOverlay="false">
<view style="font-size: 32rpx;font-weight: 400;margin: 12rpx 0 24rpx 0;">预计待入账金额说明</view> <view style="font-size: 40rpx;font-weight: 600;">预计待入账金额说明</view>
<view style="font-size: 26rpx;color: #3D3D3D;padding-bottom: 20px;line-height: 20px;"> <view style="font-size: 26rpx;color: #3D3D3D;padding: 40rpx 0rpx;line-height: 20px;">
<text style="font-weight: 600;">1. 活动结束时：</text> <view>①这是您已结束活动产生的、正在结算中的款项金额。</view>
<text>您的可入账金额会显示为预计待入账金额。</text> <view style="margin-top: 20rpx;">②为处理潜在的用户退款，所有款项会经过一个<text style="font-weight: 600;">为期7天</text>的“结算与售后处理期”。在此期间发生的退款，将直接从这笔金额中扣除。</view>
</view> <view style="margin-top: 20rpx;">③7天处理期结束后，剩余金额将自动转入您的“当前余额”，变为可提现资金。</view>
<view style="font-size: 26rpx;color: #3D3D3D;padding-bottom: 20px;line-height: 20px;"> <view style="margin-top: 20rpx;">④您可在【我发布的-已售后】查询退款详情。</view>
<text style="font-weight: 600;">2. 7天售后期：</text> <view style="margin-top: 20rpx;text-decoration: underline;">⑤最终转入“当前余额”的金额=活动应结算总额−7日内发生的退款总额。</view>
<text>活动结束后7天内，若发生售后问题(如退款)，对应金额将从“预计待入账”中扣除您的可入账金额会显示为预计待入账金额。</text>
</view>
<view style="font-size: 26rpx;color: #3D3D3D;padding-bottom: 20px;line-height: 20px;">
<text style="font-weight: 600;">3. 查看售后进度：</text>
<text>您可在【我发布的-已售后】中查询具体售后单详情</text>
</view>
<view style="font-size: 26rpx;color: #3D3D3D;padding-bottom: 20px;line-height: 20px;">
<text style="font-weight: 600;">4. 最终可提现金额：</text>
<text>7天售后期结束后，剩余未扣除的金额即可全额提现</text>
</view> </view>
<view class="popup-footer"> <view class="popup-footer">
<view class="zhixiao shows_zhidao" @click="tipsShow = false">我已知晓</view> <view class="zhixiao shows_zhidao" @click="tipsShow = false">我已知晓</view>
</view> </view>
</u-popup> </u-popup>
<u-popup @touchmove.native.stop.prevent :custom-style="{
width: '600rpx',
padding: '24rpx 24rpx 42rpx 24rpx',
margin: '0 auto',
display: 'flex',
justifyContent: 'start',
alignItems: 'center',
flexColumn: 'column'
}" :closeable="false" :show="tipsShowOne" :round="10" mode="center"
:closeOnClickOverlay="false">
<view style="font-size: 40rpx;font-weight: 600;">当前余额</view>
<view style="font-size: 26rpx;color: #3D3D3D;padding-top: 40rpx;line-height: 40rpx;">
<text>前余额指已经完成所有结算流程、您可以随时发起提现的金额。</text>
</view>
<view class="popup-footer">
<view class="zhixiao shows_zhidao" @click="tipsShowOne = false">我已知晓</view>
</view>
</u-popup>
<u-popup @touchmove.native.stop.prevent :custom-style="{
width: '600rpx',
padding: '24rpx 24rpx 42rpx 24rpx',
margin: '0 auto',
display: 'flex',
justifyContent: 'start',
alignItems: 'center',
flexColumn: 'column'
}" :closeable="false" :show="tipsShowTwo" :round="10" mode="center"
:closeOnClickOverlay="false">
<view style="font-size: 40rpx;font-weight: 600;">累计收益</view>
<view style="font-size: 26rpx;color: #3D3D3D;padding-top: 40rpx;line-height: 40rpx;">
<text>指自您入驻以来，所有已完成结算的活动为您带来的结算款项总和。累计收益=提现金额总和+当前余额。</text>
</view>
<view class="popup-footer">
<view class="zhixiao shows_zhidao" @click="tipsShowTwo = false">我已知晓</view>
</view>
</u-popup>
</view> </view>
</template> </template>
@ -136,6 +167,8 @@
export default { export default {
data() { data() {
return { return {
tipsShowTwo:false,
tipsShowOne:false,
tabIndex: 0, tabIndex: 0,
page: 1, page: 1,
list: [], list: [],

214
pages/center/index.vue
View File

@ -6,7 +6,8 @@
<image src="/static/fabu/fabuhd.png" style="width: 237rpx; height: 57rpx"></image> <image src="/static/fabu/fabuhd.png" style="width: 237rpx; height: 57rpx"></image>
</view> </view>
<scroll-view @touchmove.prevent scroll-y="true" :show-scrollbar="true" class="scroll-container box flex flex-column align-items"> <scroll-view @touchmove.prevent scroll-y="true" :show-scrollbar="true"
class="scroll-container box flex flex-column align-items">
<view class="first flex flex-column align-items justify-start"> <view class="first flex flex-column align-items justify-start">
<view class="row flex align-items" style="margin-top: 25rpx;"> <view class="row flex align-items" style="margin-top: 25rpx;">
<span> <span>
@ -135,7 +136,7 @@
活动价格 活动价格
</span> </span>
<span class="row-right"> <span class="row-right">
<input type="text" placeholder="请填写活动价格" class="input" v-model="form.price" <input type="digit" placeholder="请填写活动价格" class="input" v-model="form.price"
placeholder-class="plasty" /> placeholder-class="plasty" />
</span> </span>
</view> </view>
@ -154,8 +155,7 @@
</view> </view>
<view style="margin:30rpx 0 0 0;" v-if="status == -1 || status == 2"> <view style="margin:30rpx 0 0 0;" v-if="status == -1 || status == 2">
<cc-protocolBox :agree="agree" :protocolArr="protocolArr" <cc-protocolBox :agree="agree" :name="protocolArr" @protocolClick="protocolClick"></cc-protocolBox>
@protocolClick="protocolClick"></cc-protocolBox>
</view> </view>
</scroll-view> </scroll-view>
<view class="bottom flex align-items justify-center" v-if="status == -1 || status == 2"> <view class="bottom flex align-items justify-center" v-if="status == -1 || status == 2">
@ -190,25 +190,55 @@
</u-popup> </u-popup>
<!-- 声明 --> <!-- 声明 -->
<u-popup @touchmove.native.stop.prevent :closeable="true" :show="show" :round="10" mode="center" <u-popup @touchmove.native.stop.prevent :closeable="false" :show="show" :round="10" mode="center"
@close="close" @open="open" :custom-style="popupStyle" :closeOnClickOverlay="false"> @close="close" @open="open" :custom-style="popupStyle" :closeOnClickOverlay="false">
<span style="font-size: 42rpx;font-weight: 800;margin: 12rpx 0 24rpx 0;height: 120rpx;">《免责声明》</span> <span style="font-size: 40rpx;font-weight: 800;height: 120rpx;">《责任承诺确认书》</span>
<scroll-view ref="scrollView" :scroll-top="scrollTop" :show-scrollbar='true' <scroll-view ref="scrollView" :scroll-top="scrollTop" :show-scrollbar='true'
@scrolltolower="handleScroll" scroll-y="true" style="height: 800rpx;margin-bottom: 24rpx;"> @scrolltolower="handleScroll" scroll-y="true" style="height: 800rpx;">
<view class="popup flex align-items flex-column"> <view class="popup flex align-items flex-column">
<rich-text :nodes="Negotiate"></rich-text> <rich-text style="text-align: justify;" :nodes="Negotiate"></rich-text>
</view> </view>
</scroll-view> </scroll-view>
<view class="popup-footer"> <!-- <view class="popup-footer">
<span class="zhixiao" v-if="agreeShow == false">我同意 （{{timeLog}}）</span> <span class="zhixiao" v-if="agreeShow == false">我同意</span>
<span class="zhixiao shows_zhidao" v-if="agreeShow == true" @click="change">我同意</span> <span class="zhixiao shows_zhidao" v-if="agreeShow == true" @click="change">我同意</span>
</view> -->
<view
style="gap: 20rpx;margin-top: 50rpx;width: 100%;height: 0px;display: flex;justify-content: space-between;align-items: center;">
<view class="btn_3" @click="show = false">取消</view>
<view class="btn_3" v-if="agreeShow == false">我同意</view>
<view class="btn_2" v-if="agreeShow == true" @click="change()">我同意</view>
</view>
</u-popup>
<!-- 身份证是否认证 -->
<u-popup @touchmove.native.stop.prevent :closeable="true" :show="cardShow" :round="10" mode="center"
@close="cardShow = false" :custom-style="{
width: '600rpx',
padding: '24rpx 24rpx 20rpx 24rpx',
margin: '0 auto',
display: 'flex',
justifyContent: 'start',
alignItems: 'center',
flexColumn: 'column'
}" :closeOnClickOverlay="false">
<view style="font-size: 32rpx;font-weight: 800;">去认证</view>
<view style="font-size: 24rpx;color: #999999;margin-top: 30rpx;">完成认证，即可发布精彩活动</view>
<view
style="font-weight: 400;color: #3D3D3D;text-align: center;line-height: 36rpx;font-size: 26rpx;margin-top: 40rpx;">
只差最后一步！完成身份认证，即可成为【搭+】认证活动官，开始分享您的精彩活动。
</view>
<view
style="gap: 20px;margin-top: 30px;width: 100%;height: 40rpx;display: flex;justify-content: space-between;align-items: center;">
<view class="btn_3" @click="cardShow = false">取消</view>
<view class="btn_2" @click="openUrl('/packageB/card/index')">我同意</view>
</view> </view>
</u-popup> </u-popup>
<!-- 活动分类 --> <!-- 活动分类 -->
<u-popup :show="showPopbq" mode="bottom" round="20" <u-popup :show="showPopbq" mode="bottom" round="20"
:customStyle="{ 'width': '750rpx', 'height': '1040rpx','zIndex': '20000'}" :closeable="false" :customStyle="{ 'width': '750rpx', 'height': '1040rpx','zIndex': '999'}" :closeable="false"
@close="closebq" :closeOnClickOverlay="false"> @close="closebq" :closeOnClickOverlay="false">
<image @click="closebq" src="@/static/center/close.png" mode="" <image @click="closebq" src="@/static/center/close.png" mode=""
style="width: 44rpx;height: 44rpx;position: absolute;right: 30rpx;top: -160rpx;z-index: 155;"> style="width: 44rpx;height: 44rpx;position: absolute;right: 30rpx;top: -160rpx;z-index: 155;">
@ -218,7 +248,7 @@
<img src="https://naweigetetest2.hschool.com.cn/dyqc/hdfenlei.png" alt="" /> <img src="https://naweigetetest2.hschool.com.cn/dyqc/hdfenlei.png" alt="" />
<view class="flex flex-column w-100 bqlist"> <view class="flex flex-column w-100 bqlist">
<scroll-view scroll-y="true" class="flex align-items allbqs"> <scroll-view scroll-y="true" class="flex align-items allbqs">
<view class="titles_fl">最近使用</view> <view class="titles_fl">已选择</view>
<view class="flex align-items allmybqs"> <view class="flex align-items allmybqs">
<view class="flex align-items bqpiece" v-for="(item_bq, index) in list" :key="index"> <view class="flex align-items bqpiece" v-for="(item_bq, index) in list" :key="index">
<span> <span>
@ -276,9 +306,9 @@
export default { export default {
data() { data() {
return { return {
agreeAdd:false, agreeAdd: false,
timer:null, timer: null,
timeLog:0, timeLog: 0,
showPopbq: false, //标签弹窗 showPopbq: false, //标签弹窗
bqList: [], //标签列表 bqList: [], //标签列表
cate_id: '', //标签id cate_id: '', //标签id
@ -306,7 +336,7 @@
Negotiate: null, // 入驻协议 Negotiate: null, // 入驻协议
agree: false, agree: false,
agreeShow: false, agreeShow: false,
protocolArr: ["<入驻协议>"], protocolArr: "《活动发布者责任与承诺确认书》",
form: { form: {
cate_ids: '', cate_ids: '',
// 活动分类名字 // 活动分类名字
@ -352,7 +382,7 @@
flexColumn: 'column' flexColumn: 'column'
}, },
current: 0, current: 0,
currents: 0, currents: -1,
institutionList: [], institutionList: [],
images: '', images: '',
fileList1: [], // 用于存储第一个上传组件的文件列表 fileList1: [], // 用于存储第一个上传组件的文件列表
@ -364,6 +394,9 @@
times_sinb: '', times_sinb: '',
times_sine: '', times_sine: '',
qunQrcode: '', qunQrcode: '',
boxHeight: 0,
cardShow: false,
cardStatus: 0,
}; };
}, },
onLoad() { onLoad() {
@ -372,9 +405,16 @@
this.getAgreement() this.getAgreement()
this.getBqList(); this.getBqList();
this.getrefund_list(); this.getrefund_list();
//this.getitembq(); this.getitembq();
//var c=uni.getSystemInfoSync();
//844-94-70-100 = 580
//763-47-(100-47)-34-50
//this.computeBoxHeight();
}, },
onShow() {
this.getCardInfo();
},
filters: { filters: {
formatTimestamp(value) { formatTimestamp(value) {
if (!value) return ''; if (!value) return '';
@ -386,6 +426,18 @@
} }
}, },
methods: { methods: {
openUrl(url) {
uni.navigateTo({
url: url
})
},
getCardInfo() {
uni.$u.http.get('/api/school.real_name/info').then(res => {
console.log(res);
this.cardShow = res.data.status != 1 ? true : false;
this.cardStatus = res.data.status;
})
},
//选择政策 //选择政策
selectItem(index, item) { selectItem(index, item) {
this.currents = index; this.currents = index;
@ -396,7 +448,7 @@
const result = await this.uploadFilePromise(item.file.url, 'user'); const result = await this.uploadFilePromise(item.file.url, 'user');
this.qunQrcode = result; this.qunQrcode = result;
}, },
//登录及发布 //登录及发布123
// tofb() { // tofb() {
// const token = uni.getStorageSync('token') // const token = uni.getStorageSync('token')
// if (token) { // if (token) {
@ -418,15 +470,17 @@
// }, // },
// 获取本地最近使用 // 获取本地最近使用
getitembq() { getitembq() {
if (uni.getStorageSync("zjlist") != "") { this.list = [];
this.list = JSON.parse(uni.getStorageSync("zjlist"));
let arr = this.list.map((item) => {
return item.name
})
this.form.cate_idsName = arr.join(',');
} else {
uni.setStorageSync('zjlist', JSON.stringify(this.list)) uni.setStorageSync('zjlist', JSON.stringify(this.list))
} // if (uni.getStorageSync("zjlist") != "") {
// this.list = JSON.parse(uni.getStorageSync("zjlist"));
// let arr = this.list.map((item) => {
// return item.name
// })
// this.form.cate_idsName = arr.join(',');
// } else {
// uni.setStorageSync('zjlist', JSON.stringify(this.list))
// }
}, },
//删除标签（本地） //删除标签（本地）
removebq(i) { removebq(i) {
@ -536,6 +590,7 @@
}, },
//同意 //同意
handleScroll() { handleScroll() {
console.log(123)
this.agreeShow = true this.agreeShow = true
}, },
getTime() { getTime() {
@ -611,26 +666,26 @@
}, },
opentuikuan() { opentuikuan() {
this.tuikuan = true; this.tuikuan = true;
this.form.refund_id = 1; //this.form.refund_id = 1;
this.form.refund_idn = '随时退'; //this.form.refund_idn = '随时退';
}, },
change() { change() {
this.agree = true; this.agree = true;
this.agreeAdd=true; this.agreeAdd = true;
this.show = false this.show = false
}, },
// 选择机构地址 // 选择机构地址
protocolClick(tag) { protocolClick(tag) {
//timeLog 开始倒计时 //timeLog 开始倒计时
this.timeLog = 5; // this.timeLog = 5;
this.timer = setInterval(() => { // this.timer = setInterval(() => {
this.timeLog--; // this.timeLog--;
if (this.timeLog === 0) { // if (this.timeLog === 0) {
this.agreeShow=true; // this.agreeShow=true;
clearInterval(this.timer); // clearInterval(this.timer);
} // }
}, 1000); // }, 1000);
this.show = true this.show = true
}, },
// 获取入驻协议文章 // 获取入驻协议文章
@ -641,7 +696,7 @@
} }
}).then(res => { }).then(res => {
if (res.code == 1) { if (res.code == 1) {
this.Negotiate = (res.data.entry_agreement).replace(/\<img/gi, this.Negotiate = (res.data.commitment_activity).replace(/\<img/gi,
'<img style="max-width:100%;height:auto" '); '<img style="max-width:100%;height:auto" ');
} else { } else {
uni.showToast({ uni.showToast({
@ -758,6 +813,10 @@
}); });
for (let i = 0; i < lists.length; i++) { for (let i = 0; i < lists.length; i++) {
const result = await this.uploadFilePromise(lists[i].url, categoryMap[event.name - 1].category); const result = await this.uploadFilePromise(lists[i].url, categoryMap[event.name - 1].category);
if(result==''){
this.fileList1=[];
return;
}
let item = this[`fileList${event.name}`][fileListLen]; let item = this[`fileList${event.name}`][fileListLen];
this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, { this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
status: 'success', status: 'success',
@ -788,7 +847,22 @@
"token": uni.getStorageSync("token") "token": uni.getStorageSync("token")
}, },
success: (res) => { success: (res) => {
resolve(JSON.parse(res.data).data.url); var js = JSON.parse(res.data);
console.log(js.data.errcode);
if (js.data.errcode == '30002') {
uni.showToast({
title: '请登录...',
icon: 'none',
duration: 1000
});
setTimeout(()=>{
uni.switchTab({
url: '/pages/my/index',
})
},1000)
resolve('');
}
resolve(js.data.url);
}, },
fail: (err) => { fail: (err) => {
reject(err); reject(err);
@ -840,6 +914,10 @@
}, },
apply() { apply() {
if (this.cardStatus == -1) {
this.cardShow = true;
return;
}
let url = '/api/school.new_activity/add'; let url = '/api/school.new_activity/add';
let params = {}; let params = {};
this.form.cate_ids = this.list.map(item => item.id).join(','); this.form.cate_ids = this.list.map(item => item.id).join(',');
@ -973,7 +1051,7 @@
latitude: this.form.latitude, latitude: this.form.latitude,
address: this.form.address, address: this.form.address,
address_detail: this.form.address_detail, address_detail: this.form.address_detail,
image:this.qunQrcode image: this.qunQrcode
} }
uni.$u.http.post(url, params).then(res => { uni.$u.http.post(url, params).then(res => {
if (res.code == 1) { if (res.code == 1) {
@ -1017,6 +1095,9 @@
} }
} else { } else {
if (res.data.errcode == '1001100') {
this.cardShow = true;
}
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
icon: 'none', icon: 'none',
@ -1037,23 +1118,28 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.allbg{ .allbg {
position: fixed; position: fixed;
height: 100%; height: 100%;
width: 100%; width: 100%;
} }
/* 添加新样式用于内部可滚动区域 */ /* 添加新样式用于内部可滚动区域 */
.scroll-container { .scroll-container {
margin: 0 auto; margin: 0 auto;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
z-index: 1; /* 确保在.allbg之上 */ z-index: 1;
overflow: visible; /* 允许内容溢出 */ /* 确保在.allbg之上 */
overflow: visible;
/* 允许内容溢出 */
margin-top: 200rpx; margin-top: 200rpx;
} margin-bottom: 314rpx;
}
.title_logo { .title_logo {
width: 690rpx; width: 690rpx;
margin-top: 110rpx; margin-top: 110rpx;
@ -1104,7 +1190,7 @@
.box { .box {
width: 690rpx; width: 690rpx;
height: 1111rpx;
.title { .title {
font-family: PingFang SC, PingFang SC; font-family: PingFang SC, PingFang SC;
font-weight: 500; font-weight: 500;
@ -1273,7 +1359,8 @@
.inputl { .inputl {
text-align: left; text-align: left;
font-family: PingFang SC, PingFang SC; font-family: PingFang SC, PingFang SC;
font-size: 28rpx; font-size: 30rpx;
font-weight: 600;
color: #343434; color: #343434;
line-height: 32rpx; line-height: 32rpx;
width: 500rpx; width: 500rpx;
@ -1542,5 +1629,36 @@
line-height: 80rpx; line-height: 80rpx;
text-align: center; text-align: center;
margin-top: 40rpx; margin-top: 40rpx;
z-index: 100;
}
.btn_2 {
width: 50%;
height: 80rpx;
background: #323232;
border-radius: 198rpx 198rpx 198rpx 198rpx;
font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
font-weight: 400;
font-size: 32rpx;
color: #BBFC5B;
line-height: 80rpx;
text-align: center;
margin-top: 40rpx;
z-index: 100;
}
.btn_3 {
width: 50%;
height: 80rpx;
background: #E2E2E2;
border-radius: 198rpx 198rpx 198rpx 198rpx;
font-family: YouSheBiaoTiHei, YouSheBiaoTiHei;
font-weight: 400;
font-size: 32rpx;
color: #999999;
line-height: 80rpx;
text-align: center;
margin-top: 40rpx;
z-index: 100;
} }
</style> </style>

16
pages/index/index.vue
View File

@ -20,13 +20,13 @@
<image src="/static/index/schoolNight.png" alt="" class="imgstop_ye" @click="toshool"></image> <image src="/static/index/schoolNight.png" alt="" class="imgstop_ye" @click="toshool"></image>
</view> </view>
<scroll-view :refresher-enabled="true" :refresher-triggered="homrS" @refresherrefresh="onS" scroll-y="true" class="flex align-items" style="height: 1250rpx;box-sizing: border-box;"> <scroll-view @scrolltolower="onScrolltolower" :refresher-enabled="true" :refresher-triggered="homrS" @refresherrefresh="onS" scroll-y="true" class="flex align-items" style="height: 1250rpx;box-sizing: border-box;">
<view class="swiper-box"> <view class="swiper-box">
<!-- <MySwiper :list="swiperList"></MySwiper> --> <!-- <MySwiper :list="swiperList"></MySwiper> -->
<view class="swiper_s"> <view class="swiper_s">
<swiper class="swiper_s" :circular="true" :autoplay="true" indicator-active-color="#0DAE11" <swiper class="swiper_s" :circular="true" :autoplay="true" indicator-active-color="#0DAE11"
indicator-color="#ffffff" :indicator-dots="false" :current="swiperCurrent" indicator-color="#ffffff" :indicator-dots="false" :current="swiperCurrent"
@change="swiperChange"> @animationfinish="swiperChange">
<swiper-item v-for="(item, index) in swiperList" :key="index" @click="openSwiper(item)"> <swiper-item v-for="(item, index) in swiperList" :key="index" @click="openSwiper(item)">
<view style="position: relative;width: 100%;height: 100%"> <view style="position: relative;width: 100%;height: 100%">
<view class="fnon_tit"></view> <view class="fnon_tit"></view>
@ -354,6 +354,16 @@ export default {
// } // }
}, },
methods: { methods: {
onScrolltolower(){
uni.showLoading({
title: '加载中...'
});
this.page+=1;
this.getHotList();
setTimeout(() => {
uni.hideLoading();
}, 2000)
},
onS(){ onS(){
this.homrS=true; this.homrS=true;
uni.showLoading({ uni.showLoading({
@ -487,7 +497,9 @@ export default {
} }
}, },
swiperChange(e) { swiperChange(e) {
if(e.detail.source =='autoplay' || e.detail.source == 'touch'){
this.swiperCurrent = e.detail.current; this.swiperCurrent = e.detail.current;
}
}, },
//跳转夜校 //跳转夜校
toshool() { toshool() {

4
pages/my/index.vue
View File

@ -73,12 +73,12 @@
<view class="flex justify-center align-items" style="margin-top: 50rpx;width: 100%;"> <view class="flex justify-center align-items" style="margin-top: 50rpx;width: 100%;">
<image src="https://naweigetetest2.hschool.com.cn/dyqc/hotac.png" mode="" style="width: 327rpx; height: 38rpx;"> <image src="https://naweigetetest2.hschool.com.cn/dyqc/hotac.png" mode="" style="width: 243rpx; height: 38rpx;">
</image> </image>
</view> </view>
<!-- 热门活动 --> <!-- 热门活动 -->
<view class="hot flex flex-column"> <view class="hot flex flex-column" style="margin-top: 40rpx;">
<view class="content flex align-items flex-column"> <view class="content flex align-items flex-column">
<view class="flex flex-column w-100 bbb" v-for="(item, index) in hotList" :key="index" <view class="flex flex-column w-100 bbb" v-for="(item, index) in hotList" :key="index"
@click="detail(item.id)"> @click="detail(item.id)">

32
uni_modules/cc-protocolBox/components/cc-protocolBox/cc-protocolBox.vue
View File

@ -1,17 +1,11 @@
<template> <template>
<view class="protocol_box" @click="protocolClick()"> <view class="protocol_box" @click="protocolClick()">
<view class="select" :class="{active: agree}" @click="agreeClick"></view> <view class="select" :class="{active: agree}" @click="agreeClick"></view>
由于本类活动特殊性，请自已查看 <view>
<text>我已阅读并同意</text>
<view v-for="(item, index) in protocolArr" :key="index"> <text class="key-text" style="color: #0CA013;"> {{name}} </text>
<text> {{desc}} </text>
<!-- <text @click="protocolClick(index)">{{protocolArr[index]}}</text> -->
<text style="color: #0CA013;"> 《免责声明》 </text>
<span v-if="index < (protocolArr.length - 1)">{{" 、"}}</span>
</view> </view>
</view> </view>
</template> </template>
@ -23,6 +17,14 @@
type: Boolean, type: Boolean,
default: false default: false
}, },
desc: {
type: String,
default: ''
},
name: {
type: String,
default: ''
},
// 协议数组 // 协议数组
protocolArr: { protocolArr: {
type: Array, type: Array,
@ -63,7 +65,7 @@
.protocol_box { .protocol_box {
display: flex; display: flex;
flex-wrap:nowrap; flex-wrap: nowrap;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
@ -72,6 +74,7 @@
font-size: 28rpx; font-size: 28rpx;
color: $themeColor; color: $themeColor;
font-size: 13px; font-size: 13px;
.select { .select {
width: 36rpx; width: 36rpx;
height: 36rpx; height: 36rpx;
@ -88,16 +91,11 @@
} }
} }
text { .key-text {
color: $themeColor; color: $themeColor;
font-size: 13px; font-size: 13px;
text-decoration: underline; text-decoration: underline;
white-space: pre-wrap; white-space: pre-wrap;
} }

2
uni_modules/lsl-protocol-popup/components/lsl-protocol-popup/lsl-protocol-popup.vue
View File

@ -372,7 +372,7 @@
} }
.btn { .btn {
width: 240rpx; width: 285rpx;
line-height: 80rpx; line-height: 80rpx;
font-size: 28rpx; font-size: 28rpx;
border-radius: 24px; border-radius: 24px;