Compare commits
2 Commits
c3355c5faf
...
84d7c728c6
| Author | SHA1 | Date |
|---|---|---|
woody
|
84d7c728c6 | |
|
woody
|
e0f56bfa1e |
|
|
@ -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 })
|
||||
|
|
|
|||
|
|
@ -43,3 +43,10 @@ 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')
|
||||
|
||||
export const getMemberBoxCount = () =>
|
||||
http.get('/retail-member/api/retail-member/member-box')
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -746,7 +746,7 @@
|
|||
{
|
||||
"path": "pages/architecture/resettleArchite/resettle2",
|
||||
"style": {
|
||||
"navigationBarTitleText": "安置方案二",
|
||||
"navigationBarTitleText": "方案二",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
|
|
|
|||
|
|
@ -0,0 +1,900 @@
|
|||
<template>
|
||||
<view class="point-list-container">
|
||||
<!-- 搜索筛选栏 -->
|
||||
<view class="search-bar">
|
||||
<view class="search-item">
|
||||
<text class="label">阶段</text>
|
||||
<view class="select-box" @click="stageListVisible = true">
|
||||
<text class="select-text">{{ stageName || '请选择阶段' }}</text>
|
||||
<u-icon name="arrow-right" size="24rpx" color="#999"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
<view class="filter-btn" @click="showFilter = true">
|
||||
<u-icon name="list" size="28rpx" color="#005bac"></u-icon>
|
||||
<text>筛选</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 点位列表 -->
|
||||
<view class="point-list-content">
|
||||
<view v-if="pointList.length > 0" class="list-wrapper">
|
||||
<view
|
||||
v-for="(item, index) in pointList"
|
||||
:key="index"
|
||||
class="point-item"
|
||||
>
|
||||
<!-- 基本信息 -->
|
||||
<view class="item-header">
|
||||
<view class="member-info">
|
||||
<text class="member-code">{{
|
||||
item.childNode
|
||||
? `ZK${item.pkMember}-${item.childNode}`
|
||||
: `ZK${item.pkMember}`
|
||||
}}</text>
|
||||
<view
|
||||
class="status-badge"
|
||||
:class="item.stageStatus === 0 ? 'completed' : 'pending'"
|
||||
>
|
||||
{{ item.stageStatusLabel }}
|
||||
</view>
|
||||
</view>
|
||||
<view class="stage-info">
|
||||
<text class="stage">{{ item.stageLabel }}</text>
|
||||
<text class="date">{{ formatDate(item.stageDate) }}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 点位展示区域 -->
|
||||
<view class="points-container">
|
||||
<!-- 第一层 (1-1, 1-2) -->
|
||||
<view class="layer-wrapper" v-if="hasLayerPoints(item, 1)">
|
||||
<view class="layer-title">第一层</view>
|
||||
<view class="points-row">
|
||||
<view
|
||||
v-for="pos in 2"
|
||||
:key="`1-${pos}`"
|
||||
class="point-slot"
|
||||
:class="getPointClass(item[`pointMember1${pos}`])"
|
||||
@click="
|
||||
handlePointClick(item, 1, pos, item[`pointMember1${pos}`])
|
||||
"
|
||||
>
|
||||
<view class="point-content">
|
||||
<text class="point-label">1-{{ pos }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 第二层 (2-1, 2-2, 2-3, 2-4) -->
|
||||
<view class="layer-wrapper" v-if="hasLayerPoints(item, 2)">
|
||||
<view class="layer-title">第二层</view>
|
||||
<view class="points-row">
|
||||
<view
|
||||
v-for="pos in 4"
|
||||
:key="`2-${pos}`"
|
||||
class="point-slot"
|
||||
:class="getPointClass(item[`pointMember2${pos}`])"
|
||||
@click="
|
||||
handlePointClick(item, 2, pos, item[`pointMember2${pos}`])
|
||||
"
|
||||
>
|
||||
<view class="point-content">
|
||||
<text class="point-label">2-{{ pos }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 第三层 (3-1 到 3-8) -->
|
||||
<view class="layer-wrapper" v-if="hasLayerPoints(item, 3)">
|
||||
<view class="layer-title">第三层</view>
|
||||
<view class="points-row multi-row">
|
||||
<view
|
||||
v-for="pos in 8"
|
||||
:key="`3-${pos}`"
|
||||
class="point-slot small"
|
||||
:class="getPointClass(item[`pointMember3${pos}`])"
|
||||
@click="
|
||||
handlePointClick(item, 3, pos, item[`pointMember3${pos}`])
|
||||
"
|
||||
>
|
||||
<view class="point-content">
|
||||
<text class="point-label">3-{{ pos }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 其他信息 -->
|
||||
<view class="item-footer">
|
||||
<text class="point-type">{{ item.pointTypeLabel }}</text>
|
||||
<text class="creation-time">创建时间：{{ item.creationTime }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 空状态 -->
|
||||
<view v-else class="empty-state">
|
||||
<u-empty mode="data" text="暂无点位数据"></u-empty>
|
||||
</view>
|
||||
|
||||
<!-- 加载更多提示 -->
|
||||
<view v-if="pointList.length > 0" class="load-more">
|
||||
<view v-if="loading && currentPage > 1" class="loading-text">
|
||||
<u-loading-icon mode="spinner"></u-loading-icon>
|
||||
<text>加载中...</text>
|
||||
</view>
|
||||
<view v-else-if="!hasMore" class="no-more-text">
|
||||
<text>没有更多数据了</text>
|
||||
</view>
|
||||
<view v-else class="pull-up-text">
|
||||
<text>上拉加载更多</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 点位详情弹窗 -->
|
||||
<u-popup
|
||||
:show="showPointDetail"
|
||||
mode="center"
|
||||
@close="showPointDetail = false"
|
||||
:closeOnClickOverlay="true"
|
||||
borderRadius="20"
|
||||
>
|
||||
<view class="point-detail-popup">
|
||||
<view class="popup-header">
|
||||
<text class="popup-title">点位详情</text>
|
||||
<u-icon
|
||||
name="close"
|
||||
@click="showPointDetail = false"
|
||||
size="32rpx"
|
||||
></u-icon>
|
||||
</view>
|
||||
<view class="popup-content">
|
||||
<view v-if="pointDetailLoading" class="loading-detail">
|
||||
<u-loading-icon mode="spinner"></u-loading-icon>
|
||||
<text>加载详情中...</text>
|
||||
</view>
|
||||
<view v-else>
|
||||
<view class="detail-row">
|
||||
<text class="detail-label">会员编号：</text>
|
||||
<text class="detail-value">{{
|
||||
currentUser.memberName || currentUser.memberCode || 'ZK23668383'
|
||||
}}</text>
|
||||
</view>
|
||||
<view class="detail-row">
|
||||
<text class="detail-label">点位信息：</text>
|
||||
<text class="detail-value">{{
|
||||
selectedPoint.position || ''
|
||||
}}</text>
|
||||
</view>
|
||||
<view v-if="pointDetail" class="detail-row">
|
||||
<text class="detail-label">隶属体系：</text>
|
||||
<text class="detail-value">{{
|
||||
pointDetail.system || pointDetail.parentSystem || 'BF30720213'
|
||||
}}</text>
|
||||
</view>
|
||||
<view v-if="pointDetail" class="detail-row">
|
||||
<text class="detail-label">荣誉奖衔：</text>
|
||||
<text class="detail-value">{{
|
||||
pointDetail.honorTitle || '无'
|
||||
}}</text>
|
||||
</view>
|
||||
<view v-if="pointDetail" class="detail-row">
|
||||
<text class="detail-label">创建时间：</text>
|
||||
<text class="detail-value">{{
|
||||
formatDate(pointDetail.creationTime || pointDetail.createTime)
|
||||
}}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</u-popup>
|
||||
|
||||
<!-- 筛选弹窗 -->
|
||||
<u-popup
|
||||
:show="showFilter"
|
||||
mode="right"
|
||||
@close="showFilter = false"
|
||||
:closeOnClickOverlay="false"
|
||||
>
|
||||
<view class="filter-popup">
|
||||
<view class="popup-header">
|
||||
<text @click="applyFilter">筛选</text>
|
||||
<text class="close-btn" @click="showFilter = false">返回</text>
|
||||
</view>
|
||||
|
||||
<view class="filter-section">
|
||||
<text class="section-title">状态</text>
|
||||
<view class="select-box" @click="statusListVisible = true">
|
||||
<text class="select-text">{{ statusName || '请选择状态' }}</text>
|
||||
<u-icon name="arrow-right" size="24rpx" color="#999"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="filter-actions">
|
||||
<u-button type="info" @click="clearFilter">清空筛选条件</u-button>
|
||||
<u-button type="primary" @click="confirmFilter">确定</u-button>
|
||||
</view>
|
||||
</view>
|
||||
</u-popup>
|
||||
|
||||
<!-- 选择器 -->
|
||||
<u-picker
|
||||
:show="stageListVisible"
|
||||
:columns="stageOptions"
|
||||
@confirm="onStageConfirm"
|
||||
@cancel="stageListVisible = false"
|
||||
keyName="label"
|
||||
></u-picker>
|
||||
|
||||
<u-picker
|
||||
:show="statusListVisible"
|
||||
:columns="statusOptions"
|
||||
@confirm="onStatusConfirm"
|
||||
@cancel="statusListVisible = false"
|
||||
keyName="label"
|
||||
></u-picker>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import * as arc from '@/config/architecture.js'
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
// 列表数据
|
||||
pointList: [],
|
||||
total: 0,
|
||||
currentPage: 1,
|
||||
pageSize: 10,
|
||||
hasMore: true,
|
||||
|
||||
// 筛选条件
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
stage: 1,
|
||||
stageStatus: null,
|
||||
childNode: '',
|
||||
},
|
||||
|
||||
// 选择器数据
|
||||
stageOptions: [
|
||||
[
|
||||
{ value: 1, label: '阶段一' },
|
||||
{ value: 2, label: '阶段二' },
|
||||
{ value: 3, label: '阶段三' },
|
||||
],
|
||||
],
|
||||
statusOptions: [
|
||||
[
|
||||
{ value: 0, label: '已完成' },
|
||||
{ value: 1, label: '未完成' },
|
||||
],
|
||||
],
|
||||
|
||||
// UI状态
|
||||
showFilter: false,
|
||||
showPointDetail: false,
|
||||
stageListVisible: false,
|
||||
statusListVisible: false,
|
||||
loading: false,
|
||||
|
||||
// 选中的值
|
||||
stageName: '阶段一',
|
||||
statusName: '',
|
||||
|
||||
// 点位详情
|
||||
selectedPoint: {},
|
||||
pointDetail: null,
|
||||
pointDetailLoading: false,
|
||||
currentUser: {
|
||||
memberCode: 'ZK23668383', // 这里应该从用户信息中获取
|
||||
memberName: 'ZK23668383', // 用户姓名
|
||||
},
|
||||
}
|
||||
},
|
||||
|
||||
onLoad() {
|
||||
this.init()
|
||||
},
|
||||
|
||||
onPullDownRefresh() {
|
||||
this.refreshData()
|
||||
},
|
||||
|
||||
onReachBottom() {
|
||||
this.loadMore()
|
||||
},
|
||||
|
||||
methods: {
|
||||
init() {
|
||||
this.stageName = this.stageOptions[0][0].label
|
||||
this.queryParams.stage = this.stageOptions[0][0].value
|
||||
this.loadPointList()
|
||||
},
|
||||
|
||||
// 加载点位列表数据
|
||||
async loadPointList() {
|
||||
try {
|
||||
this.loading = true
|
||||
// 只在首次加载或刷新时显示全局loading
|
||||
if (this.currentPage === 1) {
|
||||
uni.showLoading({ title: '加载中...' })
|
||||
}
|
||||
|
||||
const res = await arc.getAzFrameworkList(this.queryParams)
|
||||
|
||||
if (res.code === 200 && res.data) {
|
||||
const newData = res.data.rows || []
|
||||
|
||||
if (this.currentPage === 1) {
|
||||
this.pointList = newData
|
||||
} else {
|
||||
this.pointList = [...this.pointList, ...newData]
|
||||
}
|
||||
this.total = res.data.total || 0
|
||||
|
||||
// 优化hasMore判断逻辑
|
||||
this.hasMore =
|
||||
newData.length >= this.pageSize &&
|
||||
this.pointList.length < this.total
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: res.msg || '加载失败',
|
||||
icon: 'none',
|
||||
})
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('加载点位列表失败:', error)
|
||||
uni.showToast({
|
||||
title: '网络异常，请稍后重试',
|
||||
icon: 'none',
|
||||
})
|
||||
} finally {
|
||||
this.loading = false
|
||||
// 只在首次加载或刷新时隐藏全局loading
|
||||
if (this.currentPage <= 1) {
|
||||
uni.hideLoading()
|
||||
}
|
||||
uni.stopPullDownRefresh()
|
||||
}
|
||||
},
|
||||
|
||||
// 刷新数据
|
||||
refreshData() {
|
||||
this.currentPage = 1
|
||||
this.queryParams.pageNum = 1
|
||||
this.hasMore = true
|
||||
this.loadPointList()
|
||||
},
|
||||
|
||||
// 加载更多数据
|
||||
async loadMore() {
|
||||
if (this.loading || !this.hasMore) return
|
||||
|
||||
this.currentPage++
|
||||
this.queryParams.pageNum = this.currentPage
|
||||
await this.loadPointList()
|
||||
},
|
||||
|
||||
// 检查某一层是否有点位
|
||||
hasLayerPoints(item, layer) {
|
||||
const layerPoints = {
|
||||
1: ['pointMember11', 'pointMember12'],
|
||||
2: ['pointMember21', 'pointMember22', 'pointMember23', 'pointMember24'],
|
||||
3: [
|
||||
'pointMember31',
|
||||
'pointMember32',
|
||||
'pointMember33',
|
||||
'pointMember34',
|
||||
'pointMember35',
|
||||
'pointMember36',
|
||||
'pointMember37',
|
||||
'pointMember38',
|
||||
],
|
||||
}
|
||||
|
||||
return layerPoints[layer].some(key => item.hasOwnProperty(key))
|
||||
},
|
||||
|
||||
// 获取点位样式类
|
||||
getPointClass(pointMember) {
|
||||
return {
|
||||
occupied: pointMember && pointMember !== '',
|
||||
empty: !pointMember || pointMember === '',
|
||||
}
|
||||
},
|
||||
|
||||
// 点位点击处理
|
||||
async handlePointClick(item, layer, position, pointMember) {
|
||||
if (!pointMember || pointMember === '') {
|
||||
// 空点位提示
|
||||
uni.showToast({
|
||||
title: '当前点位为空位',
|
||||
icon: 'none',
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
// 设置选中的点位信息
|
||||
this.selectedPoint = {
|
||||
...item,
|
||||
position: `${layer}-${position}`,
|
||||
pointMember: pointMember,
|
||||
}
|
||||
|
||||
// 显示弹窗
|
||||
this.showPointDetail = true
|
||||
|
||||
// 获取点位详情
|
||||
await this.getPointDetail({
|
||||
point: item[`point${layer}${position}`] || position,
|
||||
pointMember: pointMember,
|
||||
})
|
||||
},
|
||||
|
||||
// 获取点位详情
|
||||
async getPointDetail(params) {
|
||||
try {
|
||||
this.pointDetailLoading = true
|
||||
this.pointDetail = null
|
||||
|
||||
const res = await arc.getMemberPointDetail(params)
|
||||
|
||||
if (res.code === 200 && res.data) {
|
||||
this.pointDetail = res.data
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: res.msg || '获取详情失败',
|
||||
icon: 'none',
|
||||
})
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取点位详情失败:', error)
|
||||
uni.showToast({
|
||||
title: '网络异常，请稍后重试',
|
||||
icon: 'none',
|
||||
})
|
||||
} finally {
|
||||
this.pointDetailLoading = false
|
||||
}
|
||||
},
|
||||
|
||||
// 阶段选择确认
|
||||
onStageConfirm(e) {
|
||||
this.queryParams.stage = e.value[0].value
|
||||
this.stageName = e.value[0].label
|
||||
this.stageListVisible = false
|
||||
this.refreshData()
|
||||
},
|
||||
|
||||
// 状态选择确认
|
||||
onStatusConfirm(e) {
|
||||
this.queryParams.stageStatus = e.value[0].value
|
||||
this.statusName = e.value[0].label
|
||||
this.statusListVisible = false
|
||||
},
|
||||
|
||||
// 应用筛选
|
||||
applyFilter() {
|
||||
this.refreshData()
|
||||
this.showFilter = false
|
||||
},
|
||||
|
||||
// 确认筛选
|
||||
confirmFilter() {
|
||||
this.refreshData()
|
||||
this.showFilter = false
|
||||
},
|
||||
|
||||
// 清空筛选
|
||||
clearFilter() {
|
||||
this.queryParams.stageStatus = null
|
||||
this.statusName = ''
|
||||
this.refreshData()
|
||||
this.showFilter = false
|
||||
},
|
||||
|
||||
// 日期格式化
|
||||
formatDate(dateStr) {
|
||||
if (!dateStr) return ''
|
||||
const date = new Date(dateStr)
|
||||
return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.point-list-container {
|
||||
min-height: 100vh;
|
||||
background-color: #f5f6f8;
|
||||
}
|
||||
|
||||
/* 搜索筛选栏 */
|
||||
.search-bar {
|
||||
background: #fff;
|
||||
padding: 20rpx 24rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
border-bottom: 2rpx solid #eee;
|
||||
|
||||
.search-item {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
.label {
|
||||
font-size: 28rpx;
|
||||
color: #333;
|
||||
margin-right: 20rpx;
|
||||
}
|
||||
|
||||
.select-box {
|
||||
flex: 1;
|
||||
background: #f5f6f8;
|
||||
border-radius: 34rpx;
|
||||
padding: 20rpx 24rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
|
||||
.select-text {
|
||||
font-size: 26rpx;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
&:active {
|
||||
background-color: #e8e9eb;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.filter-btn {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-left: 20rpx;
|
||||
padding: 12rpx 20rpx;
|
||||
|
||||
text {
|
||||
font-size: 26rpx;
|
||||
color: #005bac;
|
||||
margin-left: 8rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 点位列表内容 */
|
||||
.point-list-content {
|
||||
padding: 20rpx 24rpx;
|
||||
}
|
||||
|
||||
.list-wrapper {
|
||||
.point-item {
|
||||
background: #fff;
|
||||
border-radius: 20rpx;
|
||||
padding: 30rpx;
|
||||
margin-bottom: 20rpx;
|
||||
box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1);
|
||||
|
||||
.item-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: flex-start;
|
||||
margin-bottom: 30rpx;
|
||||
padding-bottom: 20rpx;
|
||||
border-bottom: 2rpx solid #f5f6f8;
|
||||
|
||||
.member-info {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
.member-code {
|
||||
font-size: 32rpx;
|
||||
font-weight: bold;
|
||||
color: #333;
|
||||
margin-right: 20rpx;
|
||||
}
|
||||
|
||||
.status-badge {
|
||||
padding: 8rpx 16rpx;
|
||||
border-radius: 20rpx;
|
||||
font-size: 22rpx;
|
||||
|
||||
&.completed {
|
||||
background: #e8f5e8;
|
||||
color: #52c41a;
|
||||
}
|
||||
|
||||
&.pending {
|
||||
background: #fff2e8;
|
||||
color: #fa8c16;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.stage-info {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: flex-end;
|
||||
|
||||
.stage {
|
||||
font-size: 26rpx;
|
||||
color: #005bac;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.date {
|
||||
font-size: 22rpx;
|
||||
color: #999;
|
||||
margin-top: 8rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.item-footer {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-top: 30rpx;
|
||||
padding-top: 20rpx;
|
||||
border-top: 2rpx solid #f5f6f8;
|
||||
|
||||
.point-type {
|
||||
font-size: 24rpx;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
.creation-time {
|
||||
font-size: 22rpx;
|
||||
color: #999;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 点位展示区域 - 紧凑布局 */
|
||||
.points-container {
|
||||
.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);
|
||||
}
|
||||
}
|
||||
|
||||
.point-slot {
|
||||
flex: 1;
|
||||
min-height: 70rpx;
|
||||
border-radius: 12rpx;
|
||||
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;
|
||||
|
||||
&:active {
|
||||
background: #f0f0f0;
|
||||
}
|
||||
}
|
||||
|
||||
.point-content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
|
||||
.point-label {
|
||||
font-size: 20rpx;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 加载更多 */
|
||||
.load-more {
|
||||
padding: 40rpx 0;
|
||||
text-align: center;
|
||||
|
||||
.loading-text,
|
||||
.no-more-text,
|
||||
.pull-up-text {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 26rpx;
|
||||
color: #999;
|
||||
|
||||
text {
|
||||
margin-left: 12rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.no-more-text {
|
||||
color: #ccc;
|
||||
}
|
||||
}
|
||||
|
||||
/* 空状态 */
|
||||
.empty-state {
|
||||
padding: 100rpx 0;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
/* 弹窗样式 */
|
||||
.point-detail-popup {
|
||||
width: 600rpx;
|
||||
background: #fff;
|
||||
border-radius: 20rpx;
|
||||
overflow: hidden;
|
||||
|
||||
.popup-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 30rpx;
|
||||
background: #f5f6f8;
|
||||
|
||||
.popup-title {
|
||||
font-size: 32rpx;
|
||||
font-weight: bold;
|
||||
color: #333;
|
||||
}
|
||||
}
|
||||
|
||||
.popup-content {
|
||||
padding: 30rpx;
|
||||
|
||||
.loading-detail {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 60rpx 0;
|
||||
font-size: 26rpx;
|
||||
color: #999;
|
||||
|
||||
text {
|
||||
margin-left: 12rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.detail-row {
|
||||
display: flex;
|
||||
margin-bottom: 25rpx;
|
||||
|
||||
&:last-child {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.detail-label {
|
||||
width: 180rpx;
|
||||
font-size: 26rpx;
|
||||
color: #666;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.detail-value {
|
||||
flex: 1;
|
||||
font-size: 26rpx;
|
||||
color: #333;
|
||||
word-break: break-all;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.filter-popup {
|
||||
width: 600rpx;
|
||||
height: 100vh;
|
||||
background: #fff;
|
||||
|
||||
.popup-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 30rpx;
|
||||
background: rgba(176, 196, 222, 0.45);
|
||||
|
||||
.close-btn {
|
||||
color: #005bac;
|
||||
}
|
||||
}
|
||||
|
||||
.filter-section {
|
||||
padding: 30rpx;
|
||||
|
||||
.section-title {
|
||||
display: block;
|
||||
font-size: 30rpx;
|
||||
font-weight: bold;
|
||||
color: #333;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
|
||||
.select-box {
|
||||
background: rgba(176, 196, 222, 0.45);
|
||||
border-radius: 20rpx;
|
||||
padding: 20rpx 30rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
|
||||
.select-text {
|
||||
font-size: 26rpx;
|
||||
color: #333;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.filter-actions {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
display: flex;
|
||||
|
||||
.u-button {
|
||||
flex: 1;
|
||||
border-radius: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -47,6 +47,68 @@
|
|||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 会员点位信息展示区域 -->
|
||||
<view class="member-point-info">
|
||||
<view class="point-info-grid">
|
||||
<view class="point-info-item">
|
||||
<view class="point-info-value">{{
|
||||
personalPointInfo.pointCount || 0
|
||||
}}</view>
|
||||
<view class="point-info-label">子点位总数</view>
|
||||
</view>
|
||||
<view class="point-info-divider"></view>
|
||||
<view class="point-info-item">
|
||||
<view class="point-info-value">{{
|
||||
personalPointInfo.waitPointCount || 0
|
||||
}}</view>
|
||||
<view class="point-info-label">待激活点位</view>
|
||||
</view>
|
||||
<view class="point-info-divider"></view>
|
||||
<view class="point-info-item">
|
||||
<view class="point-info-value">{{
|
||||
personalPointInfo.repPvBalance || 0
|
||||
}}</view>
|
||||
<view class="point-info-label">复购业绩余额</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="my_order">
|
||||
<view class="my_title">
|
||||
<text class="thetitle">{{ '市场动态' }}</text>
|
||||
</view>
|
||||
<view class="market-stats-container">
|
||||
<view
|
||||
class="stat-block primary"
|
||||
@click="goTo('/pages/mine/marketDynamic/achievement-list')"
|
||||
>
|
||||
<view class="stat-content">
|
||||
<view class="stat-item">
|
||||
<text class="stat-label">总业绩</text>
|
||||
<view class="stat-value">
|
||||
<text class="stat-value__integer">{{
|
||||
formattedTotalSumPv.integer
|
||||
}}</text>
|
||||
<text class="stat-value__decimal">{{
|
||||
formattedTotalSumPv.decimal
|
||||
}}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="stat-divider"></view>
|
||||
<view class="stat-item">
|
||||
<text class="stat-label">小区业绩</text>
|
||||
<view class="stat-value">
|
||||
<text class="stat-value__integer">{{
|
||||
formattedSmallAreaPv.integer
|
||||
}}</text>
|
||||
<text class="stat-value__decimal">{{
|
||||
formattedSmallAreaPv.decimal
|
||||
}}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="my_order">
|
||||
<view class="my_title">
|
||||
<text class="thetitle">{{ '我的订单' }}</text>
|
||||
|
|
@ -87,7 +149,6 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="my_order">
|
||||
<view class="order_flex">
|
||||
<template v-for="(item, index) in otherMenuList">
|
||||
|
|
@ -147,9 +208,12 @@ 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,
|
||||
getMemberBoxCount,
|
||||
} from '@/config/mine.js'
|
||||
// import talentList from "@/components/talentList.vue";
|
||||
export default {
|
||||
components: {
|
||||
|
|
@ -248,20 +312,22 @@ export default {
|
|||
totalSumPv: 0,
|
||||
smallAreaPv: 0,
|
||||
isNormal: false,
|
||||
personalPointInfo: {},
|
||||
}
|
||||
},
|
||||
onShow() {
|
||||
this.getInfo().then(isNormal => {
|
||||
this.orderNum()
|
||||
this.getPersonalPointInfo()
|
||||
this.getMemberMarket()
|
||||
this.isNormal = isNormal
|
||||
if (!isNormal) {
|
||||
return
|
||||
}
|
||||
this.isNormal = isNormal
|
||||
// this.getMarketDynamicBoxCount()
|
||||
|
||||
// this.getUserAwardss()
|
||||
})
|
||||
},
|
||||
|
||||
computed: {
|
||||
sprintProgress() {
|
||||
const targetPvStr = this.awards.targetPv
|
||||
|
|
@ -302,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('.')
|
||||
|
|
@ -324,25 +384,28 @@ 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) {
|
||||
this.personalPointInfo = res.data
|
||||
}
|
||||
})
|
||||
},
|
||||
openRegionSelect() {
|
||||
uni.showLoading({
|
||||
title: '加载中...',
|
||||
|
|
@ -1192,4 +1255,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-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;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
Loading…
Reference in New Issue