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

Made-with: Cursor

single_uniapp22miao/pages/integral/points.vue

@@ -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',  // 标记来源：积分（与模板中的判断保持一致）

single_uniapp22miao/pages/integral/rules.vue

@@ -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;

single_uniapp22miao/pages/integral/search.vue

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