diff --git a/config/request.js b/config/request.js
index 4d7eccc..b6a8d5e 100644
--- a/config/request.js
+++ b/config/request.js
@@ -20,7 +20,7 @@ module.exports = vm => {
//#ifdef DEV_SERVER
console.log('DEV_SERVER')
- config.baseURL = 'http://192.168.2.86:8080'
+ config.baseURL = 'http://192.168.2.105:8080/'
//#endif
//#ifdef QA_SERVER
diff --git a/pages.json b/pages.json
index 6cf63b0..14166f4 100644
--- a/pages.json
+++ b/pages.json
@@ -746,7 +746,7 @@
{
"path": "pages/architecture/resettleArchite/resettle2",
"style": {
- "navigationBarTitleText": "方案二",
+ "navigationBarTitleText": "阶段列表",
"enablePullDownRefresh": false
}
},
diff --git a/pages/architecture/architecture.vue b/pages/architecture/architecture.vue
index 189116c..364778a 100644
--- a/pages/architecture/architecture.vue
+++ b/pages/architecture/architecture.vue
@@ -30,7 +30,7 @@ export default {
isShow: false,
},
{
- name: '方案二',
+ name: '阶段列表',
url: '../../static/images/my_icon14.png',
path: '/pages/architecture/resettleArchite/resettle2',
value: 'incomeDetail',
diff --git a/pages/architecture/resettleArchite/resettle2.vue b/pages/architecture/resettleArchite/resettle2.vue
index c7fcfc9..73868f5 100644
--- a/pages/architecture/resettleArchite/resettle2.vue
+++ b/pages/architecture/resettleArchite/resettle2.vue
@@ -9,9 +9,25 @@
-
+
+
+
+
+
+ 状态
+
+
+ {{ item.label }}
+
@@ -29,86 +45,48 @@
{{
`${currentUser.memberCode}-${item.childNode}`
}}
-
- {{ item.stageStatusLabel }}
+
+
+
+
+
+
+
+
+
-
-
- {{ item.stageLabel }}
-
-
-
-
-
-
-
- 第一层
-
-
-
- 1-{{ pos }}
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- 第二层
-
-
-
- 2-{{ pos }}
-
-
-
-
-
-
-
- 第三层
-
-
-
- 3-{{ pos }}
-
-
-
-
-
-
-
-
@@ -207,14 +185,6 @@
返回
-
- 状态
-
- {{ statusName || '请选择状态' }}
-
-
-
-
清空筛选条件
确定
@@ -273,6 +243,7 @@ export default {
],
statusOptions: [
[
+ { value: '', label: '全部' },
{ value: 0, label: '已完成' },
{ value: 1, label: '未完成' },
],
@@ -287,7 +258,8 @@ export default {
// 选中的值
stageName: '阶段一',
- statusName: '',
+ statusName: '全部',
+ selectedStatusValue: '', // 当前选中的状态值
// 点位详情
selectedPoint: {},
@@ -317,6 +289,10 @@ export default {
init() {
this.stageName = this.stageOptions[0][0].label
this.queryParams.stage = this.stageOptions[0][0].value
+ // 设置默认状态为"全部"
+ this.selectedStatusValue = this.statusOptions[0][0].value
+ this.statusName = this.statusOptions[0][0].label
+ this.queryParams.stageStatus = this.selectedStatusValue || null
this.loadPointList()
},
@@ -479,9 +455,18 @@ export default {
onStatusConfirm(e) {
this.queryParams.stageStatus = e.value[0].value
this.statusName = e.value[0].label
+ this.selectedStatusValue = e.value[0].value
this.statusListVisible = false
},
+ // 状态按钮点击处理
+ onStatusButtonClick(item) {
+ this.selectedStatusValue = item.value
+ this.statusName = item.label
+ this.queryParams.stageStatus = item.value
+ this.refreshData()
+ },
+
// 应用筛选
applyFilter() {
this.refreshData()
@@ -497,7 +482,8 @@ export default {
// 清空筛选
clearFilter() {
this.queryParams.stageStatus = null
- this.statusName = ''
+ this.statusName = '全部'
+ this.selectedStatusValue = ''
this.refreshData()
this.showFilter = false
},
@@ -572,16 +558,71 @@ export default {
}
}
+/* 状态筛选按钮组 */
+.status-filter-bar {
+ background: #fff;
+ padding: 20rpx 24rpx;
+ border-bottom: 2rpx solid #eee;
+
+ .filter-title {
+ font-size: 28rpx;
+ color: #333;
+ font-weight: bold;
+ margin-bottom: 20rpx;
+ }
+
+ .status-buttons {
+ display: flex;
+ gap: 16rpx;
+
+ .status-btn {
+ flex: 1;
+ background: #f5f6f8;
+ border-radius: 24rpx;
+ padding: 16rpx 24rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ transition: all 0.2s ease;
+ border: 2rpx solid transparent;
+
+ text {
+ font-size: 26rpx;
+ color: #666;
+ transition: color 0.2s ease;
+ }
+
+ &.active {
+ background: #e8f4fd;
+ border-color: #005bac;
+
+ text {
+ color: #005bac;
+ font-weight: bold;
+ }
+ }
+
+ &:active {
+ background-color: #e8e9eb;
+ }
+
+ &.active:active {
+ background-color: #d1e9f7;
+ }
+ }
+ }
+}
+
/* 点位列表内容 */
.point-list-content {
- padding: 20rpx 24rpx;
+ padding: 20rpx 16rpx;
}
.list-wrapper {
.point-item {
background: #fff;
border-radius: 20rpx;
- padding: 30rpx;
+ padding: 20rpx 20rpx;
margin-bottom: 20rpx;
box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1);
@@ -589,19 +630,17 @@ export default {
display: flex;
justify-content: space-between;
align-items: flex-start;
- margin-bottom: 10rpx;
- padding-bottom: 20rpx;
- border-bottom: 2rpx solid #f5f6f8;
.member-info {
display: flex;
align-items: center;
-
+ width: 36%;
.member-code {
- font-size: 32rpx;
+ font-size: 24rpx;
font-weight: bold;
color: #333;
- margin-right: 20rpx;
+ flex-shrink: 0;
+ margin-right: 30rpx;
}
.status-badge {
@@ -663,89 +702,40 @@ export default {
/* 点位展示区域 - 紧凑布局 */
.points-container {
+ display: flex;
+ gap: 20rpx;
.layer-wrapper {
- margin-bottom: 16rpx;
-
- .layer-title {
- font-size: 24rpx;
- font-weight: bold;
- color: #005bac;
- margin-bottom: 12rpx;
- padding-left: 12rpx;
- position: relative;
- background: #f8fafe;
- padding: 8rpx 12rpx;
- border-radius: 8rpx;
- display: inline-block;
-
- &::before {
- content: '';
- position: absolute;
- left: 0;
- top: 50%;
- transform: translateY(-50%);
- width: 4rpx;
- height: 20rpx;
- background: #005bac;
- border-radius: 2rpx;
- }
- }
-
.points-row {
display: flex;
flex-wrap: wrap;
- gap: 8rpx;
-
- &.multi-row {
- .point-slot {
- width: calc((100% - 24rpx) / 4);
- }
- }
+ gap: 4rpx;
.point-slot {
flex: 1;
- min-height: 70rpx;
- border-radius: 12rpx;
+ width: 26rpx !important;
+ height: 26rpx !important;
+ border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
position: relative;
transition: all 0.2s ease;
- &.small {
- min-height: 60rpx;
- }
-
&.occupied {
background: linear-gradient(135deg, #005bac 0%, #0066cc 100%);
color: #fff;
box-shadow: 0 2rpx 8rpx rgba(0, 91, 172, 0.25);
-
- &:active {
- transform: scale(0.95);
- }
}
&.empty {
background: #fafbfc;
- border: 1rpx dashed #d9d9d9;
- color: #999;
+ border: 1rpx solid #000;
+ color: #000;
&:active {
background: #f0f0f0;
}
}
-
- .point-content {
- display: flex;
- flex-direction: column;
- align-items: center;
-
- .point-label {
- font-size: 20rpx;
- font-weight: bold;
- }
- }
}
}
}
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 9313811..743ae6e 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -18,23 +18,22 @@
{{ userInfo.memberCode }}
-
- {{ userInfo.pkGradeVal || '-' }}
+
+ {{ userInfo.pkAwardsVal }}
- 荣誉奖衔:
+ 个人业绩:
{{
- userInfo.pkAwardsVal || '无'
+ personalPointInfo.repPvBalance || 0
}}
-
- 分红奖衔:
- {{ userInfo.pkRangeAwardsVal }}
-
@@ -46,32 +45,6 @@
-
-
-
-
-
- {{
- personalPointInfo.pointCount || 0
- }}
- 子点位总数
-
-
-
- {{
- personalPointInfo.waitPointCount || 0
- }}
- 待激活点位
-
-
-
- {{
- personalPointInfo.repPvBalance || 0
- }}
- 复购业绩余额
-
-
-
{{ '市场动态' }}
@@ -109,6 +82,62 @@
+
+
+ 阶段列表
+
+ 更多
+
+
+
+
+
+
+
+ 一阶
+
+ {{
+ personalPointInfo.firstOrderQuantity
+ }}
+
+
+
+
+
+ 二阶
+
+ {{
+ personalPointInfo.secondOrderQuantity
+ }}
+
+
+
+
+
+ 三阶
+
+ {{
+ personalPointInfo.threeOrderQuantity
+ }}
+
+
+
+
+ 赠点
+
+ {{
+ personalPointInfo.waitPointCount
+ }}
+
+
+
+
+
+
+
{{ '我的订单' }}
@@ -291,13 +320,13 @@ export default {
menuKey: 'bankInfo',
ifshow: true,
},
- {
- url: '/pages/architecture/architecture',
- name: '架构管理',
- imgurl: '../../static/images/my_icon14.png',
- menuKey: 'recommend',
- ifshow: false,
- },
+ // {
+ // url: '/pages/architecture/architecture',
+ // name: '阶段列表',
+ // imgurl: '../../static/images/my_icon14.png',
+ // menuKey: 'recommend',
+ // ifshow: false,
+ // },
],
drShow: false,
actMenu: false,
@@ -1177,6 +1206,9 @@ export default {
.stat-block.secondary {
background: linear-gradient(135deg, #4682b4, #87ceeb);
box-shadow: 0 6rpx 12rpx rgba(70, 130, 180, 0.3);
+ .stat-label {
+ margin-bottom: 6rpx;
+ }
}
.stat-content {
@@ -1255,55 +1287,63 @@ export default {
.region-select-action {
padding: 30rpx 20rpx;
}
+.more-btn {
+ font-size: 24rpx;
+ color: #005bac;
+ text-align: right;
+ margin-right: 20rpx;
+ display: flex;
+ align-items: center;
+}
/* 会员点位信息样式 */
-.member-point-info {
- background-color: #ffffff;
- box-shadow: 0px 4px 20px 0px rgba(204, 204, 204, 0.4);
- border-radius: 20rpx;
- padding: 0 20rpx;
- margin-top: 20rpx;
-}
+// .member-point-info {
+// background-color: #ffffff;
+// box-shadow: 0px 4px 20px 0px rgba(204, 204, 204, 0.4);
+// border-radius: 20rpx;
+// padding: 0 20rpx;
+// margin-top: 20rpx;
+// }
-.point-info-grid {
- display: flex;
- align-items: center;
- justify-content: space-around;
- padding: 30rpx 0;
-}
+// .point-info-grid {
+// display: flex;
+// align-items: center;
+// justify-content: space-around;
+// padding: 30rpx 0;
+// }
-.point-info-item {
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- flex: 1;
- text-align: center;
-}
+// .point-info-item {
+// display: flex;
+// flex-direction: column;
+// align-items: center;
+// justify-content: center;
+// flex: 1;
+// text-align: center;
+// }
-.point-info-value {
- font-size: 40rpx;
- font-weight: 600;
- color: #005bac;
- line-height: 1.2;
-}
+// .point-info-value {
+// font-size: 40rpx;
+// font-weight: 600;
+// color: #005bac;
+// line-height: 1.2;
+// }
-.point-info-label {
- font-size: 24rpx;
- color: #666666;
- font-weight: 500;
- margin-top: 8rpx;
-}
+// .point-info-label {
+// font-size: 24rpx;
+// color: #666666;
+// font-weight: 500;
+// margin-top: 8rpx;
+// }
-.point-info-divider {
- width: 2rpx;
- height: 60rpx;
- background: linear-gradient(
- to bottom,
- rgba(0, 91, 172, 0.1),
- rgba(0, 91, 172, 0.3),
- rgba(0, 91, 172, 0.1)
- );
- margin: 0 20rpx;
-}
+// .point-info-divider {
+// width: 2rpx;
+// height: 60rpx;
+// background: linear-gradient(
+// to bottom,
+// rgba(0, 91, 172, 0.1),
+// rgba(0, 91, 172, 0.3),
+// rgba(0, 91, 172, 0.1)
+// );
+// margin: 0 20rpx;
+// }