diff --git a/config/architecture.js b/config/architecture.js
index 5f69689..c330ea5 100644
--- a/config/architecture.js
+++ b/config/architecture.js
@@ -23,3 +23,12 @@ export const getTjFramework = params =>
//转换为base64格式用于图片下载
export const getUrlBase = data =>
http.post('/member/manage/member-structure/get-url-base64', data)
+
+//安置架构列表
+export const getAzFrameworkList = params =>
+ http.get('/member/api/member-structure/three-framework-list', { params })
+
+// 会员点位列表查询
+// /member/api/member/member-point
+export const getMemberPointDetail = params =>
+ http.get('/member/api/member-structure/pointDetail', { params })
diff --git a/config/mine.js b/config/mine.js
index eef344c..91daf2d 100644
--- a/config/mine.js
+++ b/config/mine.js
@@ -43,3 +43,7 @@ export const getDirectPushList = params =>
// 退款明细列表
export const getRefundList = params =>
http.get('/sale/api/my-order/refund-list', { params })
+
+// 获取个人点位信息
+export const getPersonalPointInfo = () =>
+ http.get('/member/api/member/member-point')
diff --git a/pages.json b/pages.json
index 4020f1f..6cf63b0 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 ad7aca9..189116c 100644
--- a/pages/architecture/architecture.vue
+++ b/pages/architecture/architecture.vue
@@ -29,13 +29,13 @@ export default {
value: 'marketDynamics',
isShow: false,
},
- // {
- // name: '安置方案二',
- // url: '../../static/images/my_icon14.png',
- // path: '/pages/architecture/resettleArchite/resettle2',
- // value: 'incomeDetail',
- // isShow: false,
- // },
+ {
+ name: '方案二',
+ url: '../../static/images/my_icon14.png',
+ path: '/pages/architecture/resettleArchite/resettle2',
+ value: 'incomeDetail',
+ isShow: false,
+ },
// {
// name: '安置方案三',
// url: '../../static/images/my_icon14.png',
diff --git a/pages/architecture/pointList/index.vue b/pages/architecture/pointList/index.vue
new file mode 100644
index 0000000..513359a
--- /dev/null
+++ b/pages/architecture/pointList/index.vue
@@ -0,0 +1,896 @@
+
+
+
+
+
+ 阶段
+
+ {{ stageName || '请选择阶段' }}
+
+
+
+
+
+ 筛选
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 第一层
+
+
+
+ 1-{{ pos }}
+
+
+
+
+
+
+
+ 第二层
+
+
+
+ 2-{{ pos }}
+
+
+
+
+
+
+
+ 第三层
+
+
+
+ 3-{{ pos }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 加载中...
+
+
+ 没有更多数据了
+
+
+ 上拉加载更多
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/architecture/resettleArchite/resettle2.vue b/pages/architecture/resettleArchite/resettle2.vue
index 57e25d6..9091f65 100644
--- a/pages/architecture/resettleArchite/resettle2.vue
+++ b/pages/architecture/resettleArchite/resettle2.vue
@@ -1,782 +1,898 @@
-
-
- 会员编号
-
-
-
-
-
-
-
-
+
+
+
+
+ 阶段
+
+ {{ stageName || '请选择阶段' }}
+
+
+
+
+
+ 筛选
- 筛选
-
-
+
+
+
+
-
- {{ item.name }}
+
+
+
+
+
+
+
+ 第一层
+
+
+
+ 1-{{ pos }}
+
+
+
+
+
+
+
+ 第二层
+
+
+
+ 2-{{ pos }}
+
+
+
+
+
+
+
+ 第三层
+
+
+
+ 3-{{ pos }}
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+ 加载中...
+
+
+ 没有更多数据了
+
+
+ 上拉加载更多
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 结算国家
-
-
-
-
- 会员编号
- {{ popMould.memberCode }}
-
-
- 会员姓名
- {{ popMould.name }}
-
-
- 支付时间
- {{ popMould.payDate }}
-
-
-
-
- 业绩
- 左区
- 右区
-
-
- 真实新增
- {{ popMould.leftRealNewPv }}
- {{ popMould.rightRealNewPv }}
-
-
- 首购新增
- {{ popMould.leftFirstPurchaseAdd }}
- {{ popMould.rightFirstPurchaseAdd }}
-
-
- 复购新增
- {{ popMould.leftRepeatPurchaseSurplus }}
- {{ popMould.rightRepeatPurchaseSurplus }}
-
-
- 真实累计
- {{ popMould.leftRealTotal }}
- {{ popMould.rightRealTotal }}
-
-
- 首购累计
- {{ popMould.leftFirstTotal }}
- {{ popMould.rightFirstTotal }}
-
-
- 复购累计
- {{ popMould.leftRepeatPurchaseTotal }}
- {{ popMould.rightRepeatPurchaseTotal }}
-
-
- 首购结余
- {{ popMould.leftFirstSurplus }}
- {{ popMould.rightFirstSurplus }}
-
-
- 复购结余
- {{ popMould.leftRepeatPurchaseSurplus }}
- {{ popMould.rightRepeatPurchaseSurplus }}
-
-
-
-
- 下载图片
- 复制文字
+
+ 清空筛选条件
+ 确定
-
-
+
+
+
+
+
+
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index ce7a00a..1fce880 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -88,6 +88,32 @@
+
+
+
+
+ 子点位总数
+ {{
+ personalPointInfo.pointCount || 0
+ }}
+
+
+
+ 待激活点位
+ {{
+ personalPointInfo.waitPointCount || 0
+ }}
+
+
+
+ 复购业绩余额
+ {{
+ personalPointInfo.repPvBalance || 0
+ }}
+
+
+
+
@@ -147,9 +173,8 @@ import clTabbar from '@/components/cl-tabbar.vue'
import * as min from '@/config/balance.js'
import * as api from '@/config/login.js'
import { MEMBER_SIGN } from '@/util/common.js'
-import { getMarketDynamicBoxCount } from '@/config/mine.js'
import RegionSelect from '@/components/region-select/index.vue'
-import { getRegionSelect } from '@/config/mine.js'
+import { getRegionSelect, getPersonalPointInfo } from '@/config/mine.js'
// import talentList from "@/components/talentList.vue";
export default {
components: {
@@ -248,20 +273,20 @@ export default {
totalSumPv: 0,
smallAreaPv: 0,
isNormal: false,
+ personalPointInfo: {},
}
},
onShow() {
this.getInfo().then(isNormal => {
this.orderNum()
+ this.getPersonalPointInfo()
if (!isNormal) {
return
}
this.isNormal = isNormal
- // this.getMarketDynamicBoxCount()
// this.getUserAwardss()
})
},
-
computed: {
sprintProgress() {
const targetPvStr = this.awards.targetPv
@@ -343,6 +368,13 @@ export default {
},
methods: {
+ getPersonalPointInfo() {
+ getPersonalPointInfo().then(res => {
+ if (res.code == 200) {
+ this.personalPointInfo = res.data
+ }
+ })
+ },
openRegionSelect() {
uni.showLoading({
title: '加载中...',
@@ -1192,4 +1224,55 @@ export default {
.region-select-action {
padding: 30rpx 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-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-label {
+ font-size: 24rpx;
+ color: #666666;
+ font-weight: 500;
+ margin-bottom: 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;
+}