diff --git a/config/mine.js b/config/mine.js
index 91daf2d..4e2e5f1 100644
--- a/config/mine.js
+++ b/config/mine.js
@@ -47,3 +47,6 @@ export const getRefundList = params =>
// 获取个人点位信息
export const getPersonalPointInfo = () =>
http.get('/member/api/member/member-point')
+
+export const getMemberBoxCount = () =>
+ http.get('/retail-member/api/retail-member/member-box')
diff --git a/config/request.js b/config/request.js
index 4059da8..4d7eccc 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 = 'https://t-zk.beida666.com/prod-api'
+ config.baseURL = 'http://192.168.2.86:8080'
//#endif
//#ifdef QA_SERVER
diff --git a/pages/architecture/pointList/index.vue b/pages/architecture/pointList/index.vue
index 513359a..b619332 100644
--- a/pages/architecture/pointList/index.vue
+++ b/pages/architecture/pointList/index.vue
@@ -659,18 +659,22 @@ export default {
}
}
-/* 点位展示区域 */
+/* 点位展示区域 - 紧凑布局 */
.points-container {
.layer-wrapper {
- margin-bottom: 30rpx;
+ margin-bottom: 16rpx;
.layer-title {
- font-size: 28rpx;
+ font-size: 24rpx;
font-weight: bold;
- color: #333;
- margin-bottom: 20rpx;
- padding-left: 20rpx;
+ color: #005bac;
+ margin-bottom: 12rpx;
+ padding-left: 12rpx;
position: relative;
+ background: #f8fafe;
+ padding: 8rpx 12rpx;
+ border-radius: 8rpx;
+ display: inline-block;
&::before {
content: '';
@@ -678,42 +682,42 @@ export default {
left: 0;
top: 50%;
transform: translateY(-50%);
- width: 8rpx;
- height: 28rpx;
+ width: 4rpx;
+ height: 20rpx;
background: #005bac;
- border-radius: 4rpx;
+ border-radius: 2rpx;
}
}
.points-row {
display: flex;
flex-wrap: wrap;
- gap: 16rpx;
+ gap: 8rpx;
&.multi-row {
.point-slot {
- width: calc((100% - 48rpx) / 4);
+ width: calc((100% - 24rpx) / 4);
}
}
.point-slot {
flex: 1;
- min-height: 120rpx;
- border-radius: 16rpx;
+ min-height: 70rpx;
+ border-radius: 12rpx;
display: flex;
align-items: center;
justify-content: center;
position: relative;
- transition: all 0.3s ease;
+ transition: all 0.2s ease;
&.small {
- min-height: 100rpx;
+ min-height: 60rpx;
}
&.occupied {
background: linear-gradient(135deg, #005bac 0%, #0066cc 100%);
color: #fff;
- box-shadow: 0 4rpx 12rpx rgba(0, 91, 172, 0.3);
+ box-shadow: 0 2rpx 8rpx rgba(0, 91, 172, 0.25);
&:active {
transform: scale(0.95);
@@ -721,12 +725,12 @@ export default {
}
&.empty {
- background: #f5f6f8;
- border: 2rpx dashed #ccc;
+ background: #fafbfc;
+ border: 1rpx dashed #d9d9d9;
color: #999;
&:active {
- background: #e8e9eb;
+ background: #f0f0f0;
}
}
@@ -736,7 +740,7 @@ export default {
align-items: center;
.point-label {
- font-size: 24rpx;
+ font-size: 20rpx;
font-weight: bold;
}
}
diff --git a/pages/architecture/resettleArchite/resettle2.vue b/pages/architecture/resettleArchite/resettle2.vue
index 9091f65..c7fcfc9 100644
--- a/pages/architecture/resettleArchite/resettle2.vue
+++ b/pages/architecture/resettleArchite/resettle2.vue
@@ -38,7 +38,7 @@
{{ item.stageLabel }}
- {{ formatDate(item.stageDate) }}
+
@@ -589,7 +589,7 @@ export default {
display: flex;
justify-content: space-between;
align-items: flex-start;
- margin-bottom: 30rpx;
+ margin-bottom: 10rpx;
padding-bottom: 20rpx;
border-bottom: 2rpx solid #f5f6f8;
@@ -661,18 +661,22 @@ export default {
}
}
-/* 点位展示区域 */
+/* 点位展示区域 - 紧凑布局 */
.points-container {
.layer-wrapper {
- margin-bottom: 30rpx;
+ margin-bottom: 16rpx;
.layer-title {
- font-size: 28rpx;
+ font-size: 24rpx;
font-weight: bold;
- color: #333;
- margin-bottom: 20rpx;
- padding-left: 20rpx;
+ color: #005bac;
+ margin-bottom: 12rpx;
+ padding-left: 12rpx;
position: relative;
+ background: #f8fafe;
+ padding: 8rpx 12rpx;
+ border-radius: 8rpx;
+ display: inline-block;
&::before {
content: '';
@@ -680,42 +684,42 @@ export default {
left: 0;
top: 50%;
transform: translateY(-50%);
- width: 8rpx;
- height: 28rpx;
+ width: 4rpx;
+ height: 20rpx;
background: #005bac;
- border-radius: 4rpx;
+ border-radius: 2rpx;
}
}
.points-row {
display: flex;
flex-wrap: wrap;
- gap: 16rpx;
+ gap: 8rpx;
&.multi-row {
.point-slot {
- width: calc((100% - 48rpx) / 4);
+ width: calc((100% - 24rpx) / 4);
}
}
.point-slot {
flex: 1;
- min-height: 120rpx;
- border-radius: 16rpx;
+ min-height: 70rpx;
+ border-radius: 12rpx;
display: flex;
align-items: center;
justify-content: center;
position: relative;
- transition: all 0.3s ease;
+ transition: all 0.2s ease;
&.small {
- min-height: 100rpx;
+ min-height: 60rpx;
}
&.occupied {
background: linear-gradient(135deg, #005bac 0%, #0066cc 100%);
color: #fff;
- box-shadow: 0 4rpx 12rpx rgba(0, 91, 172, 0.3);
+ box-shadow: 0 2rpx 8rpx rgba(0, 91, 172, 0.25);
&:active {
transform: scale(0.95);
@@ -723,12 +727,12 @@ export default {
}
&.empty {
- background: #f5f6f8;
- border: 2rpx dashed #ccc;
+ background: #fafbfc;
+ border: 1rpx dashed #d9d9d9;
color: #999;
&:active {
- background: #e8e9eb;
+ background: #f0f0f0;
}
}
@@ -738,7 +742,7 @@ export default {
align-items: center;
.point-label {
- font-size: 24rpx;
+ font-size: 20rpx;
font-weight: bold;
}
}
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 1fce880..9313811 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -47,6 +47,68 @@
+
+
+
+
+ {{
+ personalPointInfo.pointCount || 0
+ }}
+ 子点位总数
+
+
+
+ {{
+ personalPointInfo.waitPointCount || 0
+ }}
+ 待激活点位
+
+
+
+ {{
+ personalPointInfo.repPvBalance || 0
+ }}
+ 复购业绩余额
+
+
+
+
+
+ {{ '市场动态' }}
+
+
+
+
+
+ 总业绩
+
+ {{
+ formattedTotalSumPv.integer
+ }}
+ {{
+ formattedTotalSumPv.decimal
+ }}
+
+
+
+
+ 小区业绩
+
+ {{
+ formattedSmallAreaPv.integer
+ }}
+ {{
+ formattedSmallAreaPv.decimal
+ }}
+
+
+
+
+
+
{{ '我的订单' }}
@@ -87,33 +149,6 @@
-
-
-
-
-
- 子点位总数
- {{
- personalPointInfo.pointCount || 0
- }}
-
-
-
- 待激活点位
- {{
- personalPointInfo.waitPointCount || 0
- }}
-
-
-
- 复购业绩余额
- {{
- personalPointInfo.repPvBalance || 0
- }}
-
-
-
-
@@ -174,7 +209,11 @@ import * as min from '@/config/balance.js'
import * as api from '@/config/login.js'
import { MEMBER_SIGN } from '@/util/common.js'
import RegionSelect from '@/components/region-select/index.vue'
-import { getRegionSelect, getPersonalPointInfo } from '@/config/mine.js'
+import {
+ getRegionSelect,
+ getPersonalPointInfo,
+ getMemberBoxCount,
+} from '@/config/mine.js'
// import talentList from "@/components/talentList.vue";
export default {
components: {
@@ -280,10 +319,12 @@ export default {
this.getInfo().then(isNormal => {
this.orderNum()
this.getPersonalPointInfo()
+ this.getMemberMarket()
+ this.isNormal = isNormal
if (!isNormal) {
return
}
- this.isNormal = isNormal
+
// this.getUserAwardss()
})
},
@@ -327,12 +368,6 @@ export default {
rawPercentage: clampedPercentage,
}
},
- marketWrapperVisible() {
- return this.userInfo.memberSign !== MEMBER_SIGN.ZERO_LEVEL
- },
- regionInfoVisible() {
- return this.regionInfo?.regionStatus === 0
- },
formattedTotalSumPv() {
const value = String(this.totalSumPv || '0.00')
const parts = value.split('.')
@@ -349,25 +384,21 @@ export default {
decimal: parts.length > 1 ? `.${parts[1]}` : '',
}
},
- formattedTotalBox() {
- const value = String(this.totalBox || '0')
- const parts = value.split('.')
- return {
- integer: parts[0],
- decimal: parts.length > 1 ? `.${parts[1]}` : '',
- }
- },
- formattedSmallAreaBox() {
- const value = String(this.smallAreaBox || '0')
- const parts = value.split('.')
- return {
- integer: parts[0],
- decimal: parts.length > 1 ? `.${parts[1]}` : '',
- }
- },
},
methods: {
+ getMemberMarket() {
+ getMemberBoxCount({
+ pkBigMember: this.userInfo.memberCode,
+ }).then(res => {
+ if (res.code == 200) {
+ // this.totalBox = res.data?.totalBox || 0
+ // this.smallAreaBox = res.data?.smallAreaBox || 0
+ this.totalSumPv = res.data?.totalSumPv || 0
+ this.smallAreaPv = res.data?.smallAreaPv || 0
+ }
+ })
+ },
getPersonalPointInfo() {
getPersonalPointInfo().then(res => {
if (res.code == 200) {
@@ -1261,7 +1292,7 @@ export default {
font-size: 24rpx;
color: #666666;
font-weight: 500;
- margin-bottom: 8rpx;
+ margin-top: 8rpx;
}
.point-info-divider {