Merge branch 'youda' of http://192.168.195.14:3000/shang/yfs into youda

This commit is contained in:
18631081161 2025-05-28 13:13:11 +08:00
commit ebf5bac3e5
6 changed files with 17 additions and 758 deletions

View File

@ -22,7 +22,7 @@
/* */
"modules" : {
"Payment" : {},
"Share" : {}
"Camera" : {}
},
/* */
"distribute" : {
@ -53,7 +53,11 @@
"ios" : {
"dSYMs" : false,
"urltypes" : "youdas",
"idfa" : false
"idfa" : false,
"privacyDescription" : {
"NSPhotoLibraryUsageDescription" : "为了设置您的个人头像,我们需要访问您的照片图库。这将允许您从相册中选择现有照片作为头像。我们只会在您主动选择更换头像时访问照片,未经您的许可绝不会查看您的其他照片。",
"NSPhotoLibraryAddUsageDescription" : "我们需要访问权限以便将生成的海报保存到您的相册中。这样您就可以方便地在照片应用中查看和分享这些海报。我们只会在您明确选择保存时才将图片存入相册。"
}
},
/* SDK */
"sdkConfigs" : {
@ -192,6 +196,5 @@
"enable" : false
}
},
"fallbackLocale" : "zh-Hans",
"sassImplementationName" : "node-sass"
"fallbackLocale" : "zh-Hans"
}

View File

@ -405,7 +405,7 @@
width: 430rpx;
height: 14rpx;
/deep/.cmd-progress-inner {
::v-deep.cmd-progress-inner {
background: #CCCCCC;
}
}
@ -634,7 +634,7 @@
width: 300rpx;
margin-right: 6rpx;
/deep/.cmd-progress-inner {
::v-deep.cmd-progress-inner {
background: #F0F0F0;
}
}

View File

@ -3,7 +3,7 @@
<template>
<page-container title="福利">
<banner :type-id="6" :height="326"></banner>
<view class="grid-container" style="width: 100%; padding: 0 32rpx; margin-top: 40rpx;">
<view class="grid-container" style="padding: 0 32rpx; margin-top: 40rpx;">
<view class="grid-item" v-for="(item, index) in list" :key="item.id" @click="toPage(item)"
style="height: 184rpx;">
<image v-if="item.image" :src="item.image" mode="aspectFill" class="grid-item-bg"></image>

View File

@ -224,6 +224,7 @@ export default {
toChange() {
var user = uni.getStorageSync('userinfo');
if (user == null || user == "" || this.userinfo == '') {
uni.setStorageSync('redirect', '/pages/user/index');
this.$c.nav("/pages/user/login")
return;
}
@ -433,648 +434,11 @@ export default {
</script>
<style lang="scss">
.pop_title {
font-size: 48rpx;
font-family: YouSheBiaoTiHei;
font-weight: 400;
color: #ffffff;
text-align: center;
margin-bottom: 30rpx;
}
.mineInfo {
width: 720rpx;
/* height: 323rpx; */
/* background: url(https://xiongmaomh.languoyun.cn/newindex/mineTop.png) no-repeat; */
background-size: 100% 100%;
box-sizing: border-box;
margin: 0 auto;
box-sizing: border-box;
padding: 35rpx 36rpx 0;
}
page {
/* background: #000000; */
}
.selTitle {
font-size: 36rpx;
font-family: YouSheBiaoTiHei;
font-weight: 400;
color: #ffffff;
text-shadow: 0px 3px 8px rgba(48, 251, 253, 0.32);
}
.noTitle {
font-size: 36rpx;
font-family: YouSheBiaoTiHei;
font-weight: 400;
color: #666666;
}
.qiehuan {
display: flex;
justify-content: space-between;
align-items: center;
width: 750rpx;
}
.qiehuan_line {
margin: -10rpx auto;
width: 30rpx;
height: 20rpx;
border-bottom: 4rpx solid #1ff7f0;
border-radius: 4rpx;
}
.qiehuan image {
width: 169rpx;
height: 38rpx;
}
.qiehuan>view {
flex: 1;
text-align: center;
}
.wzs {
font-size: 28rpx;
color: rgb(255, 255, 255);
}
.xzs {
font-size: 32rpx;
color: #ffffff;
text-shadow: 0px 0px 12rpx rgba(150, 255, 254, 0.7);
}
button::after {
border: none;
}
button {
background-color: transparent;
padding-left: 0;
padding-right: 0;
line-height: inherit;
border-radius: 0;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
width: 54rpx;
height: 54rpx;
}
.name_phone>input {
font-size: 28rpx;
margin-left: 40rpx;
}
.name_phone {
padding: 20rpx 0;
box-sizing: border-box;
border-bottom: 1px solid #eeeeee;
}
.pop_tixian_input {
margin: 20rpx 0;
padding-bottom: 20rpx;
display: flex;
justify-content: space-between;
font-size: 24rpx;
border-bottom: 1px solid #eeeeee;
}
.pop_head>view {
flex: 1;
text-align: center;
font-size: 28rpx;
margin-top: 20rpx;
}
.pop_head {
display: flex;
justify-content: space-between;
}
.pop_box>view {
width: 180rpx;
height: 80rpx;
display: flex;
justify-content: center;
align-items: center;
margin-top: 30rpx;
margin-right: 35rpx;
font-size: 28rpx;
font-family: zihun152hao-jijiachaojihei;
font-weight: 400;
color: #ffffff;
}
.pop_box>view:nth-child(3n + 3) {
margin-right: 0;
}
.pop_box {
display: flex;
justify-content: center;
flex-wrap: wrap;
}
.pop_coucent>input {
width: 630rpx;
height: 88rpx;
background: #222222;
border: none;
border-radius: 10rpx;
padding-left: 40rpx;
font-size: 24rpx;
box-sizing: border-box;
margin-top: 30rpx;
}
.pop_coucent {
width: 690rpx;
// border: 1rpx solid #fff;
// box-shadow: 0px 0px 10rpx 0px #1ff7f0;
padding: 30rpx;
background: rgba(34, 34, 34, 0.5);
box-sizing: border-box;
margin-top: 20rpx;
font-size: 28rpx;
color: #ffffff;
}
.pop_chongzhi {
width: 692rpx;
height: 88rpx;
margin: 48rpx auto 0;
display: flex;
justify-content: center;
align-items: center;
font-size: 36rpx;
font-family: YouSheBiaoTiHei;
font-weight: 400;
color: #ffffff;
}
.ca {
position: absolute;
right: 0;
top: 50%;
transform: translateY(-50%);
}
.order_title {
display: flex;
justify-content: center;
align-items: center;
font-size: 32rpx;
color: #ffffff;
position: relative;
font-weight: normal;
padding: 10rpx 0;
.title {
text-align: center;
font-size: 36rpx;
font-family: zihun152hao-jijiachaojihei;
font-weight: 400;
color: #ffffff;
}
}
.order {
width: 750rpx;
background: #0d0d0d;
border-radius: 30rpx 30rpx 0px 0px;
padding: 10rpx 30rpx 48rpx;
box-sizing: border-box;
position: absolute;
bottom: var(--window-bottom);
border-top: 2px solid transparent;
background-clip: padding-box, border-box;
background-origin: padding-box, border-box;
background-image: linear-gradient(to right, #000, #000),
linear-gradient(20deg, #ffffff, #a11aff, #85dfff, #ba39ff);
.chong-bt {
display: flex;
justify-content: space-between;
align-items: center;
padding: 40rpx 0 0;
.money {
font-size: 28rpx;
font-family: zihun152hao-jijiachaojihei;
font-weight: 400;
color: #ffffff;
}
.pay-btn {
width: 206rpx;
height: 84rpx;
}
}
}
.pop {
width: 506rpx;
height: 380px;
position: relative;
background: #B198E2;
box-shadow: 0rpx 0rpx 16rpx 0rpx rgba(137, 77, 211, 0.33);
border-radius: 44rpx;
>view:nth-child(1) {
padding-top: 40rpx;
>image {
width: 430rpx;
height: 430rpx;
margin: 0 auto 0;
background: #FFFFFF;
}
}
&-view {
position: absolute;
left: 0;
bottom: 0;
width: 506rpx;
height: 276rpx;
box-sizing: border-box;
padding: 68rpx 0 0 40rpx;
background: url($imgurl+'index/hudu.png') no-repeat 0 0 / 100% 100%;
>text:nth-child(1) {
font-weight: 400;
font-size: 52rpx;
color: #894DD3;
text-shadow: #fff 1px 0 0, #fff 0 1px 0, #fff -1px 0 0, #fff 0 -1px 0;
}
>text:nth-child(2) {
font-weight: 400;
font-size: 24rpx;
color: #894DD3;
margin-top: 10rpx;
}
}
&-liwu {
position: absolute;
right: -160rpx;
width: 380rpx;
height: 260rpx;
bottom: -60rpx;
z-index: 10;
}
&-close {
width: 94rpx;
height: 94rpx;
position: absolute;
bottom: -140rpx;
left: 50%;
transform: translateX(-50%);
opacity: 0.6;
}
}
.mengban {
width: 100%;
height: 100%;
position: fixed;
top: 0;
left: 0;
right: 0;
z-index: 999;
background: rgba(0, 0, 0, 0.45);
display: flex;
justify-content: center;
align-items: center;
}
.p_t_r {
position: absolute;
top: -20rpx;
right: -10rpx;
width: 32rpx !important;
height: 32rpx !important;
}
.shop_item>image {
width: 216rpx;
height: 216rpx;
border-radius: 8rpx 8rpx 0 0;
margin: 13rpx auto;
display: block;
}
.shop_text>.hang1 {
margin-bottom: 10rpx;
}
.shop_text {
padding: 2rpx 23rpx;
box-sizing: border-box;
}
.shop_item {
width: 242rpx;
height: 343rpx;
/* border-radius: 10rpx; */
margin-top: 10rpx;
position: relative;
color: #ffffff;
font-size: 24rpx;
}
.shop_coucent>view:nth-child(3n-1) {
margin: 10rpx 0rpx 0;
}
.shop_coucent {
display: flex;
flex-wrap: wrap;
font-size: 24rpx;
}
.sc_title {
width: 686rpx;
height: 22rpx;
margin: 0 auto;
}
.tuijian {
width: 750rpx;
padding: 0 13rpx 100rpx 13rpx;
box-sizing: border-box;
margin: 30rpx auto;
/* background-color: #222; */
}
.list>view>view>image {
margin-right: 20rpx;
}
.list image {
width: 12rpx;
height: 22rpx;
}
.list>view>view>image:nth-of-type(1) {
width: 32rpx;
height: 32rpx;
}
.list>view>view {
display: flex;
align-items: center;
}
.list>view {
display: flex;
justify-content: space-between;
align-items: center;
/* border-bottom: 1px solid #EEEEEE; */
padding: 24rpx 0;
}
.list {
width: 710rpx;
/* height: 700rpx; */
margin: 0 auto;
padding: 0rpx 20rpx;
box-sizing: border-box;
font-size: 28rpx;
color: #ffffff;
/* background: linear-gradient(135deg, transparent 10px, #F07D17 0); */
/* background: url(https://hdyfs.languowangluo.cn/zcq/mine/cz_bg.png) no-repeat; */
/* background-size: 100% 100%; */
}
.hegui image {
width: 32rpx;
height: 32rpx;
margin-right: 20rpx;
}
.hegui>image {
width: 40rpx;
height: 40rpx;
margin: 0;
}
.hegui>view {
display: flex;
align-items: center;
color: #ffffff;
font-size: 28rpx;
}
.hegui {
display: flex;
align-items: center;
justify-content: space-between;
width: 690rpx;
height: 99rpx;
background: rgba(15, 31, 67, 0.43);
border: 1px solid;
border-image: linear-gradient(269deg, #1ed3f9, #a31f9e, #2ad3f3, #c41fc1) 1 1;
border-radius: 10rpx;
margin: 30rpx auto;
padding: 0 20rpx;
box-sizing: border-box;
}
.tixian_r>image {
width: 143rpx;
height: 59rpx;
}
.tixian_r {
text-align: right;
}
.tixian_r>view:nth-child(2) {
width: 132rpx;
height: 48rpx;
background: #1ac762;
border-radius: 24rpx;
display: flex;
justify-content: center;
align-items: center;
font-size: 28rpx;
color: #ffffff;
margin-top: 20rpx;
}
.tixian_r>view:nth-child(1) {
width: 132rpx;
height: 48rpx;
border: 1px solid #1ac762;
color: #1ac762;
border-radius: 24rpx;
display: flex;
justify-content: center;
align-items: center;
font-size: 28rpx;
/* text-shadow: 0px 0px 14rpx rgba(237, 87, 255, 0.7);
font-family: 'zcq'; */
}
.tixian_l image {
width: 12rpx;
height: 22rpx;
margin-left: 10rpx;
}
.tixian_l {
font-size: 28rpx;
font-family: zihun152hao-jijiachaojihei;
font-weight: 400;
color: #ffffff;
}
.tixian {
width: 720rpx;
height: 210rpx;
margin: 30rpx auto 0;
border-radius: 20rpx;
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 46rpx;
box-sizing: border-box;
color: #ffffff;
}
.youhui text {
margin-right: 10rpx;
font-size: 32rpx;
/* font-family: 'zcq'; */
}
.youhui>view>view:nth-of-type(2) {
font-size: 24rpx;
margin-top: 28rpx;
}
.youhui>view:nth-of-type(1)::after,
.youhui>view:nth-of-type(2)::after {
content: '';
width: 2rpx;
height: 40rpx;
/* background: #FFFFFF; */
position: absolute;
right: 0;
top: 0;
bottom: 0;
margin: auto;
}
.youhuiTitle {
font-size: 28rpx;
font-family: YouSheBiaoTiHei;
font-weight: 400;
}
.youhui>view {
font-size: 24rpx;
text-align: center;
position: relative;
flex: 1;
}
.youhui {
display: flex;
justify-content: space-between;
align-items: center;
/* width: 690rpx; */
height: 193rpx;
margin: 0rpx auto 0;
color: #ffffff;
padding-bottom: 30rpx;
}
.id_z>image {
width: 84rpx;
height: 20rpx;
margin-left: 20rpx;
}
.id_z {
font-size: 24rpx;
margin-top: 10rpx;
color: #999999;
}
.phone_z {
font-size: 32rpx;
/* font-weight: bold; */
}
.headimg {
width: 105rpx;
height: 105rpx;
border-radius: 50%;
margin-right: 30rpx;
}
.jp_headimg>image {
width: 132rpx;
height: 132rpx;
/* border: 1px solid #FE0032; */
border-radius: 50%;
/* clip-path: polygon(50% 10%, 85% 30%, 85% 70%, 50% 92%, 17% 71%, 16% 30%); */
/* polygon(75% 0, 100% 50%, 75% 100%, 25% 100%, 0 50%, 25% 0) */
}
.jp_headimg {
width: 132rpx;
height: 132rpx;
margin: 25rpx 0 0 12rpx;
}
.head_name {
display: flex;
justify-content: space-between;
position: relative;
/* text-shadow: rgba(150, 255, 254, 0.7) 0px 0px 10rpx; */
}
.header_title {
font-size: 40rpx;
font-family: iFontszhounianti;
font-weight: bold;
font-style: oblique;
color: #ffffff;
}
.header {
width: 100%;
color: #ffffff;
position: relative;
box-sizing: border-box;
padding-top: calc(var(--status-bar-height) + 80rpx);
}
.mine {
width: 750rpx;
position: relative;
padding-bottom: 100px;
// width: 750rpx;
width: 100vw;
min-height: 100vh;
box-sizing: border-box;
background-color: #F7F7F7;
// background: #1C1B20 url($imgurl+'my/myBg.png') no-repeat 0 0 / 750rpx 500rpx;
.user-card {
position: relative;
@ -1104,7 +468,6 @@ button {
.nick {
max-width: 200rpx;
font-size: 32rpx;
font-family: Source Han Sans CN;
font-weight: 400;
@ -1113,7 +476,6 @@ button {
.user-day {
margin-top: 10rpx;
font-size: 24rpx;
font-family: Source Han Sans CN;
font-weight: 400;
@ -1127,7 +489,6 @@ button {
margin-top: 80rpx;
box-sizing: border-box;
position: relative;
// background-color: #FFFFFF;
background: url($imgurl+'my/userVip.png') no-repeat 0 0 / 100% 100%;
padding-left: 136rpx;
@ -1139,11 +500,9 @@ button {
font-size: 48rpx;
color: #333333;
width: 100rpx;
// text-shadow: #121212 1rpx 0 0, #121212 0 1rpx 0, #121212 -1rpx 0 0, #121212 0 -1rpx 0;
}
&-ouqi {
position: absolute;
bottom: 24rpx;
left: 32rpx;
@ -1158,23 +517,10 @@ button {
width: 618rpx;
height: 6rpx;
border-radius: 6rpx;
// border: 1px solid #111111;
/deep/.cmd-progress-inner {
::v-deep.cmd-progress-inner {
background: #CCCCCC;
}
>text {
font-weight: 400;
font-size: 20rpx;
color: #D2DBFF;
position: absolute;
left: 50%;
top: 0;
line-height: 6rpx;
transform: translateX(-50%);
z-index: 10;
}
}
}
@ -1189,24 +535,6 @@ button {
color: #4C4C4C;
border-radius: 6rpx;
background-color: #E6F791;
// text-shadow: #121212 1rpx 0 0, #121212 0 1rpx 0, #121212 -1rpx 0 0, #121212 0 -1rpx 0;
}
}
.rbtn {
position: absolute;
z-index: 10;
right: 10rpx;
top: 10rpx;
width: 110rpx;
height: 50rpx;
font-size: 28rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #ffffff;
&.btn1 {
top: 80rpx;
}
}
}
@ -1243,40 +571,6 @@ button {
}
}
}
.moneyTitle {
font-weight: 500;
font-size: 32rpx;
color: #FFFFFF;
}
.money {
display: flex;
align-items: flex-end;
padding: 0 10rpx;
font-size: 60rpx;
font-weight: 500;
margin-top: 40rpx;
color: #FFFFFF;
height: 120rpx;
background: #FFFFFF;
>view:nth-child(1) {
>image {
width: 100rpx;
height: 80rpx;
}
}
.money-detail {
display: flex;
align-items: center;
padding-left: 16rpx;
font-size: 24rpx;
font-weight: 400;
color: #333333;
}
}
}
.task {
@ -1295,7 +589,7 @@ button {
margin-bottom: 30rpx;
font-size: 28rpx;
font-weight: 400;
color: task
color: #333333;
}
.task-list {
@ -1319,30 +613,11 @@ button {
.num {
margin: 20rpx 0;
font-size: 26rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #8A8A8A;
}
.progress {
display: flex;
align-items: center;
font-size: 24rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #cccccc;
.progress-inner {
width: 300rpx;
margin-right: 6rpx;
/deep/.cmd-progress-inner {
background: #5B5B5D;
}
}
}
}
.task-r {
@ -1433,25 +708,6 @@ button {
}
}
.copyright {
padding: 30rpx;
text-align: center;
font-size: 24rpx;
color: #888;
}
.status_bar {
height: var(--status-bar-height);
width: 100%;
font-size: 40rpx;
font-family: iFontszhounianti;
font-weight: bold;
font-style: oblique;
color: #ffffff;
margin-bottom: 10rpx;
}
.pop-ball {
width: 85vw;
position: relative;

View File

@ -618,7 +618,7 @@
.progress {
width: 150rpx;
/deep/.cmd-progress-inner {
::v-deep.cmd-progress-inner {
background-color: #F0F0F0;
}
}

View File

@ -228,7 +228,7 @@
padding-top: 183rpx;
box-sizing: border-box;
/deep/.uni-navbar__content {
::v-deep.uni-navbar__content {
z-index: 998;
}