scottpan/integral-shop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge main into shccd159，保留 shccd159 配置（jjy/ccd 域名）

Browse Source 
Made-with: Cursor
This commit is contained in:
apple
2026-03-18 10:35:08 +08:00
parent e87b823d31 e8563e4fda
commit a14566122b
35 changed files with 355 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
single_uniapp22miao/pages/goods/goods_details/index.vue
View File

@@ -2075,7 +2075,7 @@
z-index: 277;
border-top: 1rpx solid #f0f0f0;
height: 100rpx;
height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
height: calc(100rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
}

4
single_uniapp22miao/pages/goods_cate/components/fresh.vue
View File

@@ -692,11 +692,11 @@
}
.goodCate1 {
background-color: $crmeb-bg-color;
background-color: $crmeb-bg-color;
::v-deep.mask {
// z-index: 99;
}
::v-deep.attrProduct {
.mask {
z-index: 100;

2
single_uniapp22miao/pages/goods_cate/components/optimization.vue
View File

@@ -688,7 +688,7 @@
.mask {
// z-index: 99;
}
/deep/.attrProduct{
::v-deep.attrProduct{
.mask {
z-index: 100;
}

11
single_uniapp22miao/pages/integral/points.vue
View File

@@ -204,7 +204,7 @@ export default {
}
this.getUserPoints()
this.loadUserInfo()
await this.loadUserInfo()
this.loadPointsList()
},
@@ -347,7 +347,7 @@ export default {
// #endif
// #ifndef H5
uni.navigateTo({
url: '/pages/web-view/index?url=' + encodeURIComponent('https://xiashengjun.com/?#/pages/personal/index')
url: '/pages/web-view/index?url=' + encodeURIComponent('https://jjy.fwxgpt.com/?#/pages/personal/index')
})
// #endif
},
@@ -449,7 +449,8 @@ export default {
}),
getIntegralList({
page: this.page,
limit: this.limit
limit: this.limit,
type: 2
})
])
@@ -472,8 +473,8 @@ export default {
// 处理积分明细（使用 getIntegralList，需要过滤出 type === 2 的支出记录）
if (pointsRes.code === 0 && pointsRes.data) {
// 过滤出支出记录（type === 2）
const expenseRecords = (pointsRes.data.list || []).filter(item => item.type === 2)
// 过滤出支出记录（type === 2），兼容后端返回数字或字符串
const expenseRecords = (pointsRes.data.list || []).filter(item => Number(item.type) === 2)
pointsList = expenseRecords.map(item => ({
id: `points_${item.id}`,
source: 'points', // 标记来源：积分（与模板中的判断保持一致）

14
single_uniapp22miao/pages/integral/rules.vue
View File

@@ -157,14 +157,14 @@ export default {
.rules-content {
padding: 30rpx;
/deep/ .rules-section {
::v-deep .rules-section {
background-color: #FFFFFF;
border-radius: 16rpx;
padding: 30rpx;
margin-bottom: 20rpx;
}
/deep/ .section-title {
::v-deep .section-title {
font-size: 36rpx;
color: #333333;
font-weight: bold;
@@ -173,7 +173,7 @@ export default {
border-bottom: 2rpx solid #F0F0F0;
}
/deep/ .rule-item {
::v-deep .rule-item {
margin-bottom: 40rpx;
&:last-child {
@@ -181,14 +181,14 @@ export default {
}
}
/deep/ .item-title {
::v-deep .item-title {
font-size: 30rpx;
color: #333333;
font-weight: bold;
margin-bottom: 20rpx;
}
/deep/ .item-list {
::v-deep .item-list {
padding-left: 40rpx;
li {
@@ -204,7 +204,7 @@ export default {
}
}
/deep/ .item-note {
::v-deep .item-note {
font-size: 24rpx;
color: #999999;
margin-top: 16rpx;
@@ -213,7 +213,7 @@ export default {
border-radius: 8rpx;
}
/deep/ .rules-footer {
::v-deep .rules-footer {
background-color: #FFFFFF;
border-radius: 16rpx;
padding: 40rpx 30rpx;

2
single_uniapp22miao/pages/integral/search.vue
View File

@@ -458,7 +458,7 @@ export default {
-webkit-line-clamp: 2;
overflow: hidden;
/deep/ span {
::v-deep span {
color: #FF4D4F;
font-weight: bold;
}

6
single_uniapp22miao/pages/order/order_confirm/index.vue
View File

@@ -1306,7 +1306,7 @@
position: fixed;
bottom: 0;
left: 0;
height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
height: calc(100rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
}
@@ -1325,13 +1325,13 @@
opacity: 0
}
/deep/ checkbox .uni-checkbox-input.uni-checkbox-input-checked {
::v-deep checkbox .uni-checkbox-input.uni-checkbox-input-checked {
@include main_bg_color(theme);
border: none !important;
color: #fff !important
}
/deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked {
@include main_bg_color(theme);
border: none !important;
color: #fff !important;

6
single_uniapp22miao/pages/order_addcart/order_addcart.vue
View File

@@ -1509,20 +1509,20 @@
.uni-p-b-96 {
height: 96rpx;
}
/deep/ checkbox .uni-checkbox-input.uni-checkbox-input-checked {
::v-deep checkbox .uni-checkbox-input.uni-checkbox-input-checked {
@include main_bg_color(theme);
border: none !important;
color: #fff!important
}
/deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked {
@include main_bg_color(theme);
border: none !important;
color: #fff!important;
margin-right: 0 !important;
}
.bottom-custom{
bottom: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
bottom: calc(98rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
bottom: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
}
</style>

4
single_uniapp22miao/pages/users/user_address/index.vue
View File

@@ -600,13 +600,13 @@
right: 0;
}
/deep/ checkbox .uni-checkbox-input.uni-checkbox-input-checked {
::v-deep checkbox .uni-checkbox-input.uni-checkbox-input-checked {
@include main_bg_color(theme);
@include coupons_border_color(theme);
color: #fff !important
}
/deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked {
@include main_bg_color(theme);
@include coupons_border_color(theme);
color: #fff !important;

4
single_uniapp22miao/pages/users/user_address_list/index.vue
View File

@@ -497,12 +497,12 @@
@include left_color(theme);
}
/deep/ radio .wx-radio-input.wx-radio-input-checked {
::v-deep radio .wx-radio-input.wx-radio-input-checked {
@include main_bg_color(theme);
@include coupons_border_color(theme);
}
/deep/ radio .uni-radio-input.uni-radio-input-checked {
::v-deep radio .uni-radio-input.uni-radio-input-checked {
@include main_bg_color(theme);
border: none !important;
}

4
single_uniapp22miao/pages/users/user_goods_collection/index.vue
View File

@@ -405,13 +405,13 @@
.font_color{
@include main_color(theme);
}
/deep/ checkbox .uni-checkbox-input.uni-checkbox-input-checked {
::v-deep checkbox .uni-checkbox-input.uni-checkbox-input-checked {
@include main_bg_color(theme);
@include coupons_border_color(theme);
color: #fff!important
}
/deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
::v-deep checkbox .wx-checkbox-input.wx-checkbox-input-checked {
@include main_bg_color(theme);
@include coupons_border_color(theme);
color: #fff!important;