Merge branch 'main' of 123.207.203.228:shang/yfs

This commit is contained in:
zpc 2025-03-22 15:50:16 +08:00
commit 36075472d3
3 changed files with 106 additions and 15 deletions

View File

@ -74,7 +74,10 @@
<view class="list-item" v-for="(a, b) in item.orderlist" :key="a.prize_code">
<view class="pic">
<image :src="a.goodslist_imgurl" lazy-load></image>
<view class="type center">{{ a.shang_title }}</view>
<view class="type center"
:style="{backgroundColor: getBgColor(a.shang_title), color: getTextColor(a.shang_title)}">
{{ a.shang_title }}
</view>
<view class="num">{{ a.prize_num }}</view>
<view class="yu-tag ziti" v-if="subTab[subTabCur].id == 2">预售</view>
</view>
@ -916,7 +919,50 @@
}
this.$refs[e].open()
},
//
getBgColor(text) {
switch (text) {
case "普通":
return "#DAFF27";
break;
case "黄金":
return "#9A8EF6";
break;
case "欧皇":
return "#FFEB8E";
break;
case "超神":
return "#FF8E8E";
break;
default:
return "#9A8EF6";
break;
}
},
//
getTextColor(text) {
switch (text) {
case "普通":
return "#86AD46";
break;
case "黄金":
return "#FFFFFF";
break;
case "欧皇":
return "#DA8A50";
break;
case "超神":
return "#FFEFB4";
break;
default:
return "#FFFFFF";
break;
}
}
}
}
</script>
@ -1072,9 +1118,16 @@
.pic {
width: 202rpx;
height: 202rpx;
padding-top: 10rpx;
margin: 0 auto;
position: relative;
// background-color: #D8D8D8;
border-radius: 16rpx 16rpx 0rpx 0rpx;
>image {
width: 202rpx;
height: 202rpx;
border-radius: 16rpx 16rpx 0rpx 0rpx;
}
.type {
position: absolute;
@ -1084,10 +1137,8 @@
min-width: 68rpx;
height: 32rpx;
padding: 0 10rpx;
background: #9A8EF6;
font-weight: 400;
font-size: 22rpx;
color: #FFFFFF;
border-radius: 18rpx;
}

View File

@ -503,7 +503,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="{
@ -2011,7 +2011,7 @@
}
>view:nth-child(1) {
color: #CDEF27;
color: #333333;
}
>view:nth-child(2) {

View File

@ -229,7 +229,10 @@
<view class="res-item" v-for="(item, i) in prizeData.data" :key="i">
<view class="pic center">
<image :src="item.goodslist_imgurl" lazy-load></image>
<view class="type-tag center">{{ item.shang_title }}</view>
<view class="type-tag center"
:style="{backgroundColor: getBgColor(item.shang_title), color: getTextColor(item.shang_title)}">
{{ item.shang_title }}
</view>
<view class="num center">{{ item.prize_num || '1' }}</view>
</view>
<view class="title hang1" style="text-align: center;">
@ -396,7 +399,7 @@
<view class="d-list">
<view class="d-item">
<!-- {{ previewData.shang_title }} -->
概率:{{ previewData.pro }}%
概率:{{ previewData.pro }}%
</view>
<view class="d-item">产品类型:{{ optData.type_text }}</view>
@ -1071,7 +1074,44 @@
}
})
}
},
//
getBgColor(text) {
switch (text) {
case "普通":
return "#DAFF27";
break;
case "黄金":
return "#9A8EF6";
break;
case "欧皇":
return "#FFEB8E";
break;
case "超神":
return "#FF8E8E";
break;
}
},
//
getTextColor(text) {
switch (text) {
case "普通":
return "#86AD46";
break;
case "黄金":
return "#FFFFFF";
break;
case "欧皇":
return "#DA8A50";
break;
case "超神":
return "#FFEFB4";
break;
}
}
}
}
</script>
@ -1084,8 +1124,7 @@
height: 44px;
>view {
font-family: YouSheBiaoTiHei;
font-weight: 400;
font-weight: 600;
font-size: 50rpx;
color: #FFFFFF;
}
@ -1903,10 +1942,11 @@
z-index: 2;
width: 68rpx;
height: 32rpx;
background: url($imgurl+ 'common/chouLabel.png') no-repeat 0 0 / 100% 100%;
border-radius: 18rpx;
// background: url($imgurl+ 'common/chouLabel.png') no-repeat 0 0 / 100% 100%;
font-weight: 400;
font-size: 14rpx;
color: #FFFFFF;
// color: #F8F8F8;
}
.num {
@ -1919,8 +1959,8 @@
height: 28rpx;
font-weight: 400;
font-size: 14rpx;
color: #333333;
background-color: rgba(255, 255, 255, 0.50);
color: #ffffff;
background: rgba(0, 0, 0, 0.5);
border-radius: 18rpx;
}
}
@ -1959,7 +1999,7 @@
}
>view:nth-child(1) {
color: #CDEF27;
color: #333333;
}
>view:nth-child(2) {