ylj/wechat_yxcl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ylj20011123 2026-01-13 13:48:40 +08:00
parent 2b45e72eb1
commit a4dbc6781c
7 changed files with 368 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
App.vue
View File

@ -24,7 +24,6 @@
...data.data,
ip: data.ip
}
console.log('obj',obj)
uni.setStorageSync('userInfo', obj)
},
fail(error) {
@ -59,7 +58,6 @@
})
let _this = this
console.log('app',this.user.WeChat_MiniProToken)
if (this.user.WeChat_MiniProToken) {
await this.memberLogin() // 获取用户数据
} else {
@ -82,7 +80,7 @@
});
this.handleGetUserInfo()
// this.handleGetUserInfo()
this.$util.addUserBehaviorNew({ intoRoute: '/' + options.path, outtoRoute: '' }) // 记录用户行为
@ -96,7 +94,6 @@
// var nowRoute = '/' + currentPage.route // 当前页面url
// this.$util.addUserBehavior({intoRoute: nowRoute, outtoRoute: ''}) // 记录用户行为
// }
console.log('App Show')
},
onHide: function (options) {
let pages = getCurrentPages() // 获取加载的页面
@ -107,7 +104,6 @@
let nowRoute = '/' + currentPage.route // 当前页面url
this.$util.addUserBehaviorNew({ intoRoute: '', outtoRoute: nowRoute }) // 记录用户行为
}
console.log('App Hide')
}
}
</script>
@ -138,10 +134,12 @@
.process-box.uni-active {
padding-bottom: 30rpx;
}
.process-box process-unit:nth-last-child(1) .prosess-unit::before {
content: '';
width: 0rpx;
}
.ico,
.ico-s {
display: block;
@ -214,6 +212,7 @@
checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
font-size: 30rpx;
}
/* #endif */
button::after {
border: none;

21
pages/everdayRenven/AnhuiIndex.vue
View File

@ -42,7 +42,8 @@
<view class="tab-label">经营业态</view>
</view>
<view class="tab-item" @click="selectTab('nowTab', 3)"
v-if="areaProgress.length && areaProgress.length > 1" :class="{ 'active': nowTab == 3 }">
v-if="areaProgress && areaProgress.length && areaProgress.length > 1"
:class="{ 'active': nowTab == 3 }">
<view class="tab-icon">🗺</view>
<view class="tab-label">区域营收</view>
</view>
@ -55,7 +56,7 @@
</view>
<view class="content-wrapper">
<view class="chart-section" v-show="nowTab == 1"
v-if="modelProgress.length > 0 && theRequest.ProvinceCode == 340000">
v-if="modelProgress && modelProgress.length > 0 && theRequest.ProvinceCode == 340000">
<view class="chart-container chart-optimized">
<canvas canvas-id="modelCont" id="modelCont" class="modern-chart performance-chart"
@touchstart="touchPie($event, 'modelCont')"></canvas>
@ -74,7 +75,7 @@
</view>
</view>
</view>
<view class="chart-section" v-show="nowTab == 2" v-if="regionProgress.length > 0">
<view class="chart-section" v-show="nowTab == 2" v-if="regionProgress && regionProgress.length > 0">
<view class="chart-container chart-optimized">
<canvas canvas-id="businessCont" id="businessCont" class="modern-chart performance-chart"
@touchstart="touchPie($event, 'businessCont')"></canvas>
@ -93,7 +94,7 @@
</view>
</view>
</view>
<view class="chart-section" v-show="nowTab == 3" v-if="areaProgress.length > 0">
<view class="chart-section" v-show="nowTab == 3" v-if="areaProgress && areaProgress.length > 0">
<view class="chart-container chart-optimized">
<canvas canvas-id="areaCont" id="areaCont" class="modern-chart performance-chart"
@touchstart="touchPie($event, 'areaCont')"></canvas>
@ -121,7 +122,7 @@
<text>车流分析概览</text>
</view>
<view class="traffic-summary">
{{ bayonetProgress.length }}个区域
{{ bayonetProgress && bayonetProgress.length > 0 ? bayonetProgress.length : 0 }}个区域
</view>
</view>
@ -134,7 +135,8 @@
<view class="region-title">{{ item.name }}</view>
</view>
<view class="region-actions">
<view class="region-count">{{ item.list.length }}个服务区</view>
<view class="region-count">{{ item.list && item.list.length > 0 ? item.list.length : 0
}}个服务区</view>
<view class="region-arrow" :class="{ 'collapsed': item.collapsed }">▼</view>
</view>
</view>
@ -232,7 +234,7 @@
</view>
</view>
</view>
<template v-if="theRequest && theRequest.GroupType == 1020 && regionList.length">
<template v-if="theRequest && theRequest.GroupType == 1020 && regionList && regionList.length">
<view class="service-list">
<view v-for="(item, i) in regionList[0].child" :key="i" class="service-card" @click="toDetail(item)">
<view class="service-header">
@ -456,7 +458,7 @@ export default {
// 提取查询参数部分
var urlParts = decodedUrl.split('?')
if (urlParts.length < 2) {
if (urlParts && urlParts.length < 2) {
console.log('二维码URL没有参数，使用默认值')
return this.getDefaultParams()
}
@ -1168,6 +1170,9 @@ export default {
if (option.time.indexOf(' ') > -1) {
dateForApi = option.time.split(' ')[0]
}
console.log('dateForApi', dateForApi)
console.log('option.time', option.time)
// 转换为API需要的格式 YYYY-MM-DD
option.time = this.$util.cutDate(dateForApi, 'YYYY-MM-DD')
option.month = this.$util.cutDate(option.time, 'YYYYMM')

7
pages/everdayRenven/AnhuiServerpart.vue
View File

@ -25,7 +25,7 @@
</div>
<div class="uni-flex ai-base jc-between">
<span class="center-num">{{ sMsg.totalMoneyShow }}</span>
<span class="budgetamount">
<span class="budgetamount" v-if="currentProvinceCode !== '530000'">
<text class="budget-title">计划营收(元):</text>
<text :class="sMsg.budgetAmount < sMsg.cashPay ? 'up-text-title' : 'down-text-title'">
{{ sMsg.budgetamoutShow }}
@ -104,7 +104,7 @@
<div class="pie-content">
<div class="model-busniess">经营业态占比</div>
<ServiceRevenuePie ref="serviceRevenuePie" v-show="ServiceRevenueData && ServiceRevenueData.length >= 2"
:data="ServiceRevenueData" @selectCate="selectCate" />
:data="ServiceRevenueData" @selectCate="selectCate" :currentProvinceCode="currentProvinceCode" />
<!-- 其余省份 -->
<!-- <canvas v-else-if="sellData.length>0" canvas-id="sellCate" id="sellCate" class="operation-cate-content" @click="touchPie($event,'sellCate')"></canvas> -->
<div class="model-busniess progress-section-enter">
@ -1059,7 +1059,8 @@ cover-view.page-title {
/* 门店卡片 */
.shop-card {
width: 192rpx;
// width: 192rpx;
width: calc((100% - 40rpx) / 3);
height: 240rpx;
border-radius: 16rpx;
color: #fff;

59
pages/everdayRenven/components/ServiceRevenuePie.vue
View File

@ -1,18 +1,12 @@
<template>
<uni-ec-canvas
class="uni-ec-canvas"
id="revenuecharts"
ref="revenuecharts"
canvas-id="revenuecharts"
:ec="ec"
@inited="inited"
></uni-ec-canvas>
<uni-ec-canvas class="uni-ec-canvas" id="revenuecharts" ref="revenuecharts" canvas-id="revenuecharts" :ec="ec"
@inited="inited"></uni-ec-canvas>
</template>
<script>
import uniEcCanvas from './uni-ec-canvas/uni-ec-canvas.vue';
export default {
props:['data'],
props: ['data', 'currentProvinceCode'],
components: {
uniEcCanvas
},
@ -31,14 +25,14 @@
type: 'pie',
selectedMode: 'single',
radius: [0, '32%'],
center: ['50%','50%'],
center: ['40%', '50%'],
startAngle: 40,
label: {
// position: 'inner',
formatter: '{b} \n {d}% ',
fontSize: 13,
color: '#D1D1D1',
// show: false,
// formatter: '{b} \n {d}% ',
// fontSize: 13,
// color: '#D1D1D1',
show: false,
},
startAngle: 115,
labelLine: {
@ -60,7 +54,7 @@
name: '业态',
type: 'pie',
radius: ['48%', '72%'],
center: ['50%','50%'],
center: ['40%', '50%'],
labelLine: {
length: 30,
},
@ -76,7 +70,39 @@
...this.data[1]
]
}
]
],
grid: {
left: '5%',
right: '25%', // 为右侧图例留出足够空间
top: '10%',
bottom: '10%',
containLabel: false
},
legend: this.currentProvinceCode === '530000' ? {
show: true,
orient: 'vertical',
top: 'center',
right: 10,
} : {
show: true,
orient: 'vertical',
top: 20,
right: 10,
width: 100, // 图例宽度（必需，否则滚动不生效）
height: 200, // 图例容器高度（像素，不能超过canvas高度263px）
type: 'scroll', // 启用滚动类型
pageButtonPosition: 'end', // 翻页按钮位置在底部
pageIconSize: 10, // 翻页按钮大小
pageIconColor: '#666', // 翻页按钮颜色
pageIconInactiveColor: '#ccc', // 翻页按钮不激活颜色
itemGap: 6, // 图例项之间的间距（减小以容纳更多项）
itemWidth: 18, // 图例标记的宽度
itemHeight: 10, // 图例标记的高度
textStyle: {
fontSize: 10, // 图例文字大小
lineHeight: 14 // 行高
}
}
}
}
@ -111,5 +137,4 @@
margin-top: 40rpx;
display: block;
}
</style>

39
pages/everdayRenven/components/anhuiYestodayRevenueData.js
View File

@ -15,6 +15,7 @@ const methods = {
*/
// let regionList = [] // 营收上传列表 reginListModel[]
this.groupType = obj.GroupType
this.provinceCode = obj.ProvinceCode
const requestParamas = {
Statistics_Date: obj.time,
Statistics_Month: obj.month,
@ -71,6 +72,15 @@ const methods = {
}, [], [], [], []]
}
// 云南全部自营 就接触注释 下面传入也变成newDataList
// let newDataList = []
// if (obj.ProvinceCode === '530000') {
// newDataList = data.Result_Data.List.filter(m => m.Business_TypeName === '自营')
// } else {
// newDataList = data.Result_Data.List
// }
if (isServerPartDetail) { // 是服务区营收推送页面
return _this.getSeverpartReginList(data.Result_Data.List, busniessCounts.Result_Data.List,
tradeData.Result_Data.List, budgetAmount.Result_Data.List)
@ -112,8 +122,17 @@ const methods = {
oldData.totalOffAmount += newData.TotalOffAmount
oldData.mobilePayment += newData.MobilePayment
oldData.cashPay += newData.CashPay
oldData.diffLessPrice += newData.Different_Price_Less
oldData.diffMorePrice += newData.Different_Price_More
// oldData.diffLessPrice += newData.Different_Price_Less
// oldData.diffMorePrice += newData.Different_Price_More
if (this.provinceCode === '530000') {
if (newData.Business_TypeName === '自营') {
oldData.diffLessPrice += newData.Different_Price_Less || 0
oldData.diffMorePrice += newData.Different_Price_More || 0
}
} else {
oldData.diffLessPrice += newData.Different_Price_Less || 0
oldData.diffMorePrice += newData.Different_Price_More || 0
}
if (newData.BusinessType == 1000) { // 商超
oldData.scCount = oldData.scCount ? oldData.scCount + 1 : 1
@ -129,8 +148,20 @@ const methods = {
oldData.totalOffAmount = newData.TotalOffAmount
oldData.mobilePayment = newData.MobilePayment
oldData.cashPay = newData.CashPay
oldData.diffLessPrice = newData.Different_Price_Less
oldData.diffMorePrice = newData.Different_Price_More
// oldData.diffLessPrice = newData.Different_Price_Less
// oldData.diffMorePrice = newData.Different_Price_More
if (this.provinceCode === '530000') {
if (newData.Business_TypeName === '自营') {
oldData.diffLessPrice = newData.Different_Price_Less || 0
oldData.diffMorePrice = newData.Different_Price_More || 0
} else {
oldData.diffLessPrice = 0
oldData.diffMorePrice = 0
}
} else {
oldData.diffLessPrice = newData.Different_Price_Less || 0
oldData.diffMorePrice = newData.Different_Price_More || 0
}
if (newData.BusinessType == 1000) { // 商超

15
pages/everdayRenven/index.vue
View File

@ -1360,11 +1360,24 @@ export default {
if (option.ProvinceCode) {
// 从推送进入 - 立即判断跳转，避免资源浪费
if (toSnhuiPageProvinceCode.indexOf(parseInt(option.ProvinceCode)) > -1) {
// 电脑端推送有问题 怀疑是时间的问题 这里用笨方法处理一下看看
let date = new Date(option.time)
let y = date.getFullYear()
let m = date.getMonth() + 1
let d = date.getDate()
if (m < 10) {
m = '0' + m
}
if (d < 10) {
d = '0' + d
}
// 直接跳转，不显示loading，不加载当前页面数据
const url = "/pages/everdayRenven/AnhuiIndex?ProvinceCode=" +
option.ProvinceCode +
"&time=" +
option.time +
`${y}-${m}-${d}` +
// option.time +
"&GroupType=" +
option.GroupType +
"&ServerpartIds=" +

1
pages/index/index.vue
View File

@ -27,7 +27,6 @@
<image :src="menus[item.id]==1?item.imagePath:item.noImagePath" mode="aspectFill"></image>
<text class="ico-t-count" v-if="toDoMsg[item.id]>0">{{toDoMsg[item.id]> 99 ? '99+' : toDoMsg[item.id]}}</text>
<text class="menu-text" :class="{'noFn': !menus[item.id] || menus[item.id]==0}">{{item.name}}</text>
</view>