shang/yfs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of 123.207.203.228:shang/yfs

Browse Source
This commit is contained in:
zpc 2025-04-07 22:54:59 +08:00
commit b0672db838
16 changed files with 982 additions and 1475 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/collect-btn/collect-btn.vue
View File

@ -23,7 +23,7 @@ export default {
},
customStyle: {
type: String,
default: 'position: absolute; right: 0; top: 232rpx; margin-right: 48rpx;'
default: 'position: absolute; right: 0; top: 56rpx; margin-right: 48rpx;'
}
},
data() {
@ -61,6 +61,7 @@ export default {
height: 95rpx;
box-sizing: border-box;
flex-direction: column;
> image {
width: 64rpx;

4
components/order-confirm-popup/order-confirm-popup-flw.vue
View File

@ -3,7 +3,7 @@
<view class="buy-pop relative">
<view class="buy-pop-hd">
<view class="" style="width: 60rpx"></view>
<text class="" style="font-size: 28rpx">确认订单</text>
<text class="" style="font-size: 28rpx;">确认订单</text>
<view class="close icon" @click="$emit('close')">
<image :src="$img('/static/img/close2.png')" style="width: 24rpx; height: 24rpx" lazy-load></image>
</view>
@ -253,7 +253,7 @@ export default {
justify-content: space-between;
align-items: center;
font-size: 40rpx;
font-weight: 500;
font-weight: 600;
color: #333333;
.close {

4
components/order-confirm-popup/order-confirm-popup.vue
View File

@ -318,7 +318,7 @@ export default {
justify-content: space-between;
align-items: center;
font-size: 40rpx;
font-weight: 500;
font-weight: 600;
color: #333333;
.close {
@ -339,7 +339,6 @@ export default {
.title {
font-size: 20rpx;
font-family: Source Han Sans CN;
font-weight: 400;
margin-left: 24rpx;
color: #333333;
@ -349,7 +348,6 @@ export default {
display: flex;
align-items: center;
font-size: 24rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #999999;

2
manifest.json
View File

@ -1,6 +1,6 @@
{
"name" : "一番赏",
"appid" : "__UNI__0BC0425",
"appid" : "__UNI__2E6CB39",
"description" : "",
"versionName" : "1.0.1",
"versionCode" : 101,

2
package/index/leitai.vue
View File

@ -403,7 +403,7 @@
<view class="ft-btn common_bg justify-center" :style="{
backgroundImage: `url(${$img1('common/quhegui.png')})`,
}" @click="toBag">
<text>去盒柜</text>
<text>去发货</text>
</view>
<view class="ft-btn common_bg justify-center" :style="{

2
package/index/lian-ji.vue
View File

@ -282,7 +282,7 @@
<view class="ft-btn common_bg justify-center" :style="{
backgroundImage: `url(${$img1('common/quhegui.png')})`
}" @click="toBag">
<text>去盒柜</text>
<text>去发货</text>
</view>
<view class="ft-btn common_bg justify-center" :style="{

2
pages/fuli/fuli-detail.vue
View File

@ -368,7 +368,7 @@
<view class="ft-btn confirm common_bg" :style="{
backgroundImage: `url(${$img('/static/img/btn_bg.png')})`
}" @click="toBag">
<text>去盒柜</text>
<text>去发货</text>
</view>
<view class="ft-btn common_bg" :style="{

2
pages/guize/guize.vue
View File

@ -117,7 +117,7 @@
.guize {
width: 100vw;
height: 100vh;
min-height: 100vh;
position: relative;
padding: 24rpx;
background-color: #FFFFFF;

7
pages/infinite/bonus_house.vue
View File

@ -85,10 +85,10 @@
</view>
<view class="btn-group row center">
<view class="my-coupon center" @click="$c.to({ url: '/pages/infinite/my_coupons' })">
<!-- <view class="my-coupon center" @click="$c.to({ url: '/pages/infinite/my_coupons' })">
<text>我的卡券</text>
</view>
</view> -->
<view class="reward-record center" @click="$c.to({ url: '/pages/infinite/reward_records' })">
<text>赏品记录</text>
</view>
@ -424,7 +424,7 @@ export default {
}
.btn-group {
margin-top: 20rpx;
margin-top: 40rpx;
}
.my-coupon {
@ -444,7 +444,6 @@ export default {
height: 72rpx;
background-color: #D8FD24;
border-radius: 16rpx;
margin-left: 38rpx;
text {
font-weight: 600;

9
pages/sangdai/sangdai.vue
View File

@ -1046,7 +1046,7 @@
flex: 1;
font-size: 26rpx;
font-weight: 400;
color: #fff;
color: #000;
}
}
@ -1201,14 +1201,14 @@
.num-box {
margin: 24rpx 20rpx 10rpx;
display: flex;
justify-content: center;
justify-content: space-between;
align-items: center;
background-color: #DFDFDF;
border-radius: 20rpx;
.icon {
width: 32rpx;
height: 28rpx;
width: 40rpx;
height: 37rpx;
}
>input {
@ -1216,7 +1216,6 @@
width: 70rpx;
text-align: center;
font-size: 24rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #8A8A8A;
}

6
pages/shouye/dada_ranking.vue
View File

@ -20,7 +20,7 @@
</view>
<image :src="$img('/static/image/reward_rule.png')" style="width: 686rpx; height: 120rpx; margin-top: 232rpx;"
@click="$refs.rulePop.getRule(15, '规则说明')" mode=""></image>
@click="$refs.rulePop.getRule(24, '规则说明')" mode=""></image>
<view style="width: 683rpx; margin-bottom: 50rpx; display: flex; flex-direction: column; overflow: auto; margin-top: 20rpx;">
@ -53,7 +53,7 @@
<text style="font-size: 20rpx; color: #333333;">{{item.nickname}}</text>
</view>
<view class="" style="margin-right: 20rpx;">
<span style="color: #333333; font-size: 32rpx;">{{item.invitenumber}}<text
<span style="color: #333333; font-size: 32rpx;">{{item.value}}<text
style="font-size: 16rpx; color: #8A8A8A;">张</text></span>
</view>
@ -88,7 +88,7 @@
}
})
that.req({
url: 'user_yaoqing',
url: 'getRankList?type=dadajuan',
success(res) {
console.log(res);
if (res.status == 1) {

2123
pages/shouye/detail.vue
View File

File diff suppressed because it is too large Load Diff

260
pages/shouye/detail_wuxian.vue
View File

@ -269,7 +269,7 @@
<view class="ft-btn common_bg justify-center center" :style="{
backgroundImage: `url(${$img1('common/quhegui.png')})`
}" @click="toBag">
<text>去盒柜</text>
<text>去发货</text>
</view>
<view class="ft-btn common_bg justify-center center" :style="{
@ -1095,9 +1095,9 @@ export default {
>image:nth-child(2) {
width: 122rpx;
height: 106rpx;
height: 120rpx;
position: absolute;
top: 0;
top: 5rpx;
left: 0;
z-index: 3;
}
@ -1253,7 +1253,7 @@ export default {
height: 95rpx;
position: absolute;
right: 0;
top: 232rpx;
top: 56rpx;
box-sizing: border-box;
// background: url($imgurl+'/common/shoucang.png') no-repeat 0 0 / 100% 100%;
@ -2034,8 +2034,8 @@ export default {
left: 50%;
transform: translateX(-50%);
width: 181rpx;
height: 153rpx;
bottom: 100rpx;
height: 173rpx;
bottom: 80rpx;
z-index: 2;
}
}
@ -2463,254 +2463,6 @@ export default {
}
}
.buy-pop {
padding: 0 30rpx;
box-sizing: border-box;
background: #F7F7F7;
padding-bottom: 30rpx;
border-radius: 16rpx 16rpx 0rpx 0rpx;
&::after {
content: '';
position: absolute;
top: -62rpx;
left: 0;
width: 750rpx;
height: 62rpx;
// background: url($imgurl+'common/ding.png') no-repeat 0 0 / 100% 100%;
}
.buy-pop-hd {
padding: 40rpx 0;
padding-left: 10rpx;
display: flex;
justify-content: space-between;
align-items: center;
font-size: 40rpx;
font-weight: 500;
color: #ffffff;
.close {
width: 24rpx;
height: 24rpx;
}
}
.buy-card {
border-radius: 20rpx;
padding: 30rpx;
background: #FFFFFF;
.buy-info {
display: flex;
.pic {
width: 190rpx;
height: 190rpx;
border-radius: 10rpx;
}
.info-r {
width: calc(100% - 190rpx);
box-sizing: border-box;
display: flex;
flex-flow: column nowrap;
justify-content: space-between;
padding: 10rpx 0 10rpx 30rpx;
.title {
font-size: 24rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #333333;
}
.hang1 {}
.type {
font-size: 20rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #999999;
}
.price-num {
display: flex;
justify-content: space-between;
align-items: center;
.price {
font-size: 16rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #333333;
text {
font-size: 28rpx;
}
}
.num {
font-size: 20rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #999999;
}
}
}
}
.line {
height: 1px;
background: #222222;
margin: 30rpx 0 10rpx;
}
.yhfs {
font-weight: 400;
font-size: 28rpx;
color: #FFFFFF;
}
.card-row {
.title {}
.row-r {
.icon {}
}
}
}
.card-row {
padding: 16rpx 0;
display: flex;
height: 82rpx;
justify-content: space-between;
align-items: center;
border-radius: 16rpx;
margin-top: 24rpx;
background-color: #FFFFFF;
.title {
>image {
width: 32rpx;
height: 32rpx;
}
>text {
font-weight: 400;
font-size: 24rpx;
color: #333333;
}
}
.row-r {
display: flex;
align-items: center;
font-size: 20rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #999999;
.icon {
width: 10rpx;
margin-right: 24rpx;
margin-left: 10rpx;
height: 17rpx;
}
}
}
.pay-title {
margin-top: 30rpx;
font-size: 28rpx;
font-weight: 400;
color: #ffffff;
}
.pay-type {
padding: 30rpx 24rpx;
background: #FFFFFF;
border-radius: 20rpx;
margin-top: 20rpx;
display: flex;
align-items: center;
.icon {
width: 32rpx;
height: 32rpx;
}
.title {
flex: 1;
font-size: 24rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #333333;
}
}
.agree {
display: flex;
margin-top: 30rpx;
font-size: 24rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #999999;
line-height: 32rpx;
.icon {
width: 32rpx;
height: 32rpx;
margin-right: 10rpx;
}
text {
color: #999999;
}
}
.rule {
padding: 20rpx;
background: #F9F8E1;
border-radius: 20rpx;
box-sizing: border-box;
margin: 20rpx 0 0;
.rule-inner {
max-height: 160rpx;
font-size: 20rpx;
font-family: Source Han Sans CN;
font-weight: 400;
color: #333333;
}
}
.pay-btn {
margin: 30rpx auto 0;
width: 686rpx;
height: 84rpx;
background: url($imgurl+'common/payBtn.png') no-repeat 0 0 / 100% 100%;
display: flex;
align-items: center;
justify-content: center;
font-weight: 500;
color: #CDEF27;
>text:nth-child(1) {
font-size: 24rpx;
}
>text:nth-child(2) {
font-size: 24rpx;
}
}
}
.ani-pop {
width: 100vw;

8
pages/shouye/index.vue
View File

@ -914,8 +914,8 @@
z-index: 1;
top: 10rpx;
left: 10rpx;
width: 68rpx;
// padding: 0 21rpx 0 32rpx;
min-width: 68rpx;
padding: 0 6rpx;
height: 32rpx;
justify-content: center;
display: flex;
@ -1064,7 +1064,7 @@
.coupon-pop {
width: 604rpx;
height: 558rpx;
height: 598rpx;
position: relative;
background: url($imgurl + "index/couponBg.png") no-repeat 0 0 / 100% 100%;
// background: #281C50;
@ -1085,7 +1085,7 @@
.coupon-list {
padding-top: 128rpx;
height: 360rpx;
height: 400rpx;
.coupon-item {
width: 530rpx;

14
pages/shouye/yaoqing_ranking.vue
View File

@ -1,7 +1,7 @@
<template>
<view
style="width: 100%; height: 100vh; display: flex; flex-direction: column; align-items: center; background-color: #FFFFFF;">
style="width: 100%; min-height: 100vh; display: flex; flex-direction: column; align-items: center; background-color: #FFFFFF;">
<view class="" style="position: relative;width: 100%;">
<!-- <view class="" style=" width: 100%; height: 457.64rpx; position: absolute;">
@ -20,7 +20,7 @@
</view>
<image :src="$img('/static/image/reward_rule.png')" style="width: 686rpx; height: 120rpx; margin-top: 232rpx;"
@click="$refs.rulePop.getRule(15, '规则说明')" mode=""></image>
@click="$refs.rulePop.getRule(25, '规则说明')" mode=""></image>
<view class="" style="width: 100%; height: 480rpx; margin-top: 20rpx; display: flex; flex-direction: row;">
@ -37,7 +37,7 @@
style="width: 100%; text-align: center; margin-top: 24rpx;">{{list[1].nickname}}</text>
<text class="hang1"
style="width: 100%; text-align: center; margin-top: 24rpx; font-size: 32rpx;">{{list[1].invitenumber}}
style="width: 100%; text-align: center; margin-top: 24rpx; font-size: 32rpx;">{{list[1].value}}
<text style="font-size: 16rpx;">人</text>
</text>
</view>
@ -54,7 +54,7 @@
style="width: 100%; text-align: center; margin-top: 24rpx;">{{list[0].nickname}}</text>
<text class="hang1"
style="width: 100%; text-align: center; margin-top: 24rpx; font-size: 32rpx;">{{list[0].invitenumber}}
style="width: 100%; text-align: center; margin-top: 24rpx; font-size: 32rpx;">{{list[0].value}}
<text style="font-size: 16rpx;">人</text>
</text>
</view>
@ -71,7 +71,7 @@
style="width: 100%; text-align: center; margin-top: 24rpx;">{{list[2].nickname}}</text>
<text class="hang1"
style="width: 100%; text-align: center; margin-top: 24rpx; font-size: 32rpx; color: #333333;">{{list[2].invitenumber}}
style="width: 100%; text-align: center; margin-top: 24rpx; font-size: 32rpx; color: #333333;">{{list[2].value}}
<text style="font-size: 16rpx; color: #8A8A8A;">人</text>
</text>
</view>
@ -109,7 +109,7 @@
<text style="font-size: 20rpx; color: #333333;">{{item.nickname}}</text>
</view>
<view class="" style="margin-right: 20rpx;">
<span style="color: #333333; font-size: 32rpx;">{{item.invitenumber}}<text
<span style="color: #333333; font-size: 32rpx;">{{item.value}}<text
style="font-size: 16rpx; color: #8A8A8A;">人</text></span>
</view>
@ -144,7 +144,7 @@
}
})
that.req({
url: 'user_yaoqing',
url: 'getRankList?type=invite',
success(res) {
console.log(res);
if (res.status == 1) {

9
pages/user/login.vue
View File

@ -34,14 +34,14 @@
拒绝
</view>
<button v-if="isAgree" class="bottom" type="primary" withCredentials="true" lang="zh_CN"
<button v-if="isAgree" class="bottom center" type="primary" withCredentials="true" lang="zh_CN"
@click="getUserProfile">
授权登录
<text>授权登录</text>
</button>
<button v-else class="bottom" type="primary" withCredentials="true" lang="zh_CN"
<button v-else class="bottom center" type="primary" withCredentials="true" lang="zh_CN"
@click="getUserProfile">
授权登录
<text>授权登录</text>
</button>
</view>
@ -324,6 +324,7 @@
margin: 0;
width: 416rpx;
height: 80rpx;
text-align: center;
box-sizing: border-box;
border-radius: 16rpx;
font-size: 28rpx;