zhangkai/dyqc_hdapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://49.235.147.88:3000/zhangkai/dyqc_hdapp

Browse Source
This commit is contained in:
张凯 2025-06-12 17:31:08 +08:00
commit 985edee594
11 changed files with 1232 additions and 1187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packageA/center/applyDetail.vue
View File

@ -73,7 +73,7 @@
</view>
</view>
<view :class="showYes ? 'third flex flex-column yes' : 'third flex flex-column no'"
style="justify-content: flex-start;margin-bottom: 280rpx;">
style="justify-content: flex-start;" :style="detail.feel==1?'margin-bottom: 280rpx;':''">
<view class="flex align-items" style="padding: 30rpx;justify-content: space-between;">
<view class="third-top flex align-items" style="margin: 0px;">
<span>报名信息
@ -238,8 +238,8 @@
<view class="footer flex align-items" style="justify-content: space-between;">
<span style="margin-bottom: 170rpx; width: 750rpx;margin-left: 20rpx;">
<cc-protocolBox :agree="agree" :name="protocolArr"
@protocolClick="protocolClick"></cc-protocolBox>
<cc-protocolBox :agree="agree" @click="protocolClick" :name="protocolArr"
@clickOne="protocolClick"></cc-protocolBox>
</span>
<view class="footer-right flex justify-center align-items">
<span v-if="detail.feel == 0 && agree" @click="buy()"> 立即支付 </span>
@ -1747,6 +1747,7 @@ export default {
}
.btn_1 {
z-index: 1000;
width: 95%;
height: 90rpx;
background: #323232;

2
packageA/center/detail.vue
View File

@ -21,7 +21,7 @@
<span>元/人</span>
</view>
</view>
<view class="top_texts flex align-items" style="top:-140rpx;right: 88rpx;" v-else>
<view class="top_texts flex align-items" style="top:-140rpx;right: 35rpx;" v-else>
<span style="font-weight: 900;font-size: 44rpx;">免费</span>
</view>
<view class="first-box flex flex-start flex-column justify-start">

2
packageA/my/orderList.vue
View File

@ -645,7 +645,7 @@
position: fixed;
top: 0;
z-index: 2;
padding-left: 60rpx;
.s-header {
display: flex;
justify-content: center;

19
packageB/card/index.vue
View File

@ -31,7 +31,7 @@
</view>
</view>
</view>
<view style="height: 10rpx;width: 100%;background: #F8F8F8;margin-top: 20rpx;"></view>
<view style="height: 10rpx;width: 100%;background: #eeeeee;margin-top: 20rpx;"></view>
<view style="padding: 30rpx;">
<view>
<text style="color: #FF4810;font-size: 28rpx;">*</text>
@ -46,7 +46,7 @@
<input type="text" placeholder="请填写真实姓名" class="input" v-model="form.name" />
</view>
</view>
<view style="height: 1px;width: 100%;background-color: #F0F0F0;"></view>
<view style="height: 1px;width: 100%;background-color: #eeeeee;"></view>
<view style="display: flex;justify-content: space-between;align-items: center;padding: 40rpx 0px 0px 0px;">
<view>
身份证号
@ -57,13 +57,15 @@
</view>
</view>
</view>
<view style="height: 10rpx;width: 100%;background: #F8F8F8;"></view>
<view style="padding:30rpx">
<cc-protocolBox :agree="agree" :name="protocolArr" :desc="desc"
@protocolClick="protocolClick"></cc-protocolBox>
<view style="height: 10rpx;width: 100%;background: #eeeeee;"></view>
<view style="position: fixed;width: 100%;bottom: 4%;">
<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>
</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="{
@ -267,7 +269,6 @@
line-height: 90rpx;
text-align: center;
margin: 0 auto;
margin-top: 50rpx;
}
.popup-footer {
display: flex;

12
packageB/wallet/index.vue
View File

@ -29,8 +29,8 @@
</view>
</view>
</view>
<view style="background-color: #FFFFFF;border-radius:44rpx;padding:45rpx 30rpx;margin-top: 30rpx;">
<view style="display: flex;gap: 70rpx;padding-bottom: 40rpx;">
<view style="background-color: #FFFFFF;border-radius:44rpx;padding:45rpx 30rpx;margin-top: 30rpx;min-height: 70vh;">
<view style="display: flex;gap: 50rpx;padding-bottom: 40rpx;align-items: baseline;">
<view @click="openTab(0)">
<view :class="tabIndex==0?'act':'no_act'">收益明细</view>
<view v-if="tabIndex==0"
@ -108,7 +108,13 @@
</view>
<view style="background: #eeeeee;width: 100%;height: 1px;margin: 40rpx 0rpx;"></view>
</view>
<u-loadmore style="margin-bottom: 60rpx;" :status="loadStatus" />
<view v-if="list.length==0" style="position: absolute;text-align: center;margin: 0 auto;left: 0;right: 0;top: 50%;">
<view>
<image src="/static/detail/no_info.png" style="width: 180rpx;height: 180rpx"></image>
<view style="font-size: 28rpx;">没有更多了</view>
</view>
</view>
<u-loadmore v-if="list.length!=0" style="margin-bottom: 60rpx;" :status="loadStatus" />
</view>
<u-popup @touchmove.native.stop.prevent :custom-style="popupStyle" :closeable="false" :show="tipsShow" :round="10" mode="center"
:closeOnClickOverlay="false">

43
pages/center/index.vue
View File

@ -153,12 +153,11 @@
</span>
</view>
</view>
<view style="margin:30rpx 0 0 0;" v-if="status == -1 || status == 2">
<cc-protocolBox :agree="agree" :name="protocolArr" @protocolClick="protocolClick"></cc-protocolBox>
</view>
</scroll-view>
<view class="bottom flex align-items justify-center" v-if="status == -1 || status == 2">
<view class="bottom " v-if="status == -1 || status == 2">
<view style="margin:30rpx 0 0 0;">
<cc-protocolBox :agree="agree" :name="protocolArr" @click="protocolClick" @clickOne="protocolClick"></cc-protocolBox>
</view>
<span class="flex align-items justify-center" @click="apply()" v-if="agreeAdd == true">确认发布</span>
<span class="flex align-items justify-center" v-if="agreeAdd == false"
style="background: #EEEEEE;color: #9C9C9C;">确认发布</span>
@ -212,7 +211,7 @@
</u-popup>
<!-- 身份证是否认证 -->
<u-popup @touchmove.native.stop.prevent :closeable="true" :show="cardShow" :round="10" mode="center"
<u-popup @touchmove.native.stop.prevent :closeable="false" :show="cardShow" :round="10" mode="center"
@close="cardShow = false" :safeAreaInsetBottom="false" :custom-style="{
width: '600rpx',
padding: '24rpx 24rpx 20rpx 24rpx',
@ -222,14 +221,16 @@
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 style="text-align: center;margin-top: 30rpx;">
<image src="/static/fabu/renzheng.png" style="width: 140rpx;height: 140rpx;"></image>
</view>
<view style="gap: 20px;width: 100%;display: flex;justify-content: space-between;align-items: center;">
<view class="btn_3" @click="cardShow = false">取消</view>
<view style="font-size: 36rpx;color: #3D3D3D;margin-top: 30rpx;font-weight: 600;">完成认证，即可发布活动</view>
<view
style="padding: 40rpx 20rpx 10rpx 20rpx;;font-weight: 400;color: #3D3D3D;text-align: center;line-height: 44rpx;font-size: 28rpx;">
只差最后一步！完成身份认证，即可成为<br>【搭+】认证活动官，开始分享您的精彩活动。
</view>
<view style="gap: 20px;width: 100%;display: flex;justify-content: space-between;align-items: center;padding-bottom: 30rpx;">
<view class="btn_4" @click="cardShow = false">取消</view>
<view class="btn_2" @click="openUrl('/packageB/card/index')">我同意</view>
</view>
</u-popup>
@ -399,8 +400,8 @@
},
apply_info: {},
popupStyle: {
width: '642rpx',
padding: '24rpx 24rpx 42rpx 24rpx',
width: '620rpx',
padding: '50rpx 40rpx 42rpx 40rpx',
height: '984rpx',
margin: '0 auto', // 水平居中
display: 'flex',
@ -458,6 +459,7 @@
},
onShow() {
this.show=false;
this.getCardInfo();
},
filters: {
@ -1344,7 +1346,7 @@
overflow: visible;
/* 允许内容溢出 */
margin-top: 200rpx;
margin-bottom: 314rpx;
margin-bottom: 370rpx;
}
.title_logo {
@ -1437,7 +1439,7 @@
.label {
font-family: PingFang SC, PingFang SC;
font-weight: 500;
font-size: 26rpx;
font-size: 28rpx;
color: #343434;
line-height: 32rpx;
width: 160rpx;
@ -1542,14 +1544,13 @@
.bottom {
width: 750rpx;
height: 162rpx;
height: 230rpx;
background: #FFFFFF;
box-shadow: 0rpx -6rpx 12rpx 0rpx rgba(111, 190, 255, 0.1);
border-radius: 0rpx 0rpx 0rpx 0rpx;
bottom: 128rpx;
position: fixed;
z-index: 10;
span {
width: 642rpx;
height: 80rpx;
@ -1560,6 +1561,8 @@
font-size: 36rpx;
color: #BBFC5B;
line-height: 32rpx;
margin: 0 auto;
margin-top: 30rpx;
}
}
@ -1576,7 +1579,7 @@
.input {
text-align: right;
font-family: PingFang SC, PingFang SC;
font-size: 26rpx;
font-size: 28rpx;
color: #343434;
line-height: 32rpx;
width: 450rpx;

2
pages/my/applyOwner.vue
View File

@ -60,7 +60,7 @@
机构地址
</view>
<view class="flex align-items" @click="chooseMap()">
<input type="text" placeholder="请选择" class="input" v-model="formData.address"
<input type="text" placeholder="请选择" class="input" v-model="formData.address" disabled
placeholder-class="plasty" />
<u-icon name="arrow-right" color="#202020"></u-icon>
</view>

2321
pages/my/index.vue
View File

File diff suppressed because it is too large Load Diff

BIN
static/fabu/renzheng.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.4 KiB

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

@ -1,9 +1,10 @@
<template>
<view class="protocol_box" @click.stop="protocolClick()">
<view class="select" :class="{active: agree}" @click="agreeClick"></view>
<view>
<view style="color:#9C9C9C;">
<text>我已阅读并同意</text>
<text class="key-text" style="color: #0CA013;" @click.stop="agreeClick1"> {{name}} </text>
<text v-if="nameOne!=''"> 和 </text>
<text class="key-text" style="color: #0CA013;" @click.stop="agreeClick2"> {{nameOne}} </text>
<text> {{desc}} </text>
</view>

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

@ -172,10 +172,18 @@
},
methods: {
clickTwo(){
//隐私政策
console.log(2);
uni.navigateTo({
url:'/packageB/privacy?type=privacy'
})
},
clickOne(){
//用户协议
console.log(0);
uni.navigateTo({
url:'/packageB/privacy?type=user_protocol'
})
},
protocolClick(){
console.log(1);