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

131
App.vue
View File

@ -1,20 +1,20 @@
<script> <script>
import Vue from 'vue' import Vue from 'vue'
import util from '@/common/utils' import util from '@/common/utils'
import { import {
mapGetters, mapGetters,
mapActions, mapActions,
mapMutations mapMutations
} from 'vuex' } from 'vuex'
export default { export default {
computed:{ computed: {
...mapGetters({'user':'getUser'}) ...mapGetters({ 'user': 'getUser' })
}, },
methods: { methods: {
...mapActions(['memberLogin','getLoginCode']), ...mapActions(['memberLogin', 'getLoginCode']),
...mapMutations(['setVisitChannels']), ...mapMutations(['setVisitChannels']),
// 拿到用户ip数据 地址什么的数据 // 拿到用户ip数据 地址什么的数据
handleGetUserInfo(){ handleGetUserInfo() {
wx.request({ wx.request({
url: 'https://qifu-api.baidubce.com/ip/local/geo/v1/district', url: 'https://qifu-api.baidubce.com/ip/local/geo/v1/district',
success(response) { success(response) {
@ -24,8 +24,7 @@
...data.data, ...data.data,
ip: data.ip ip: data.ip
} }
console.log('obj',obj) uni.setStorageSync('userInfo', obj)
uni.setStorageSync('userInfo',obj)
}, },
fail(error) { fail(error) {
// 处理错误 // 处理错误
@ -34,9 +33,9 @@
} }
}, },
onLaunch: async function(options) { onLaunch: async function (options) {
uni.getSystemInfo({ uni.getSystemInfo({
success: function(e) { success: function (e) {
// #ifndef MP // #ifndef MP
Vue.prototype.StatusBar = e.statusBarHeight; Vue.prototype.StatusBar = e.statusBarHeight;
if (e.platform == 'android') { if (e.platform == 'android') {
@ -51,7 +50,7 @@
let custom = wx.getMenuButtonBoundingClientRect(); let custom = wx.getMenuButtonBoundingClientRect();
Vue.prototype.Custom = custom; Vue.prototype.Custom = custom;
Vue.prototype.CustomBar = custom.bottom + custom.top - e.statusBarHeight; Vue.prototype.CustomBar = custom.bottom + custom.top - e.statusBarHeight;
Vue.prototype.pageWindowHeight = e.screenHeight-custom.bottom - custom.top + e.statusBarHeight;; Vue.prototype.pageWindowHeight = e.screenHeight - custom.bottom - custom.top + e.statusBarHeight;;
// #endif // #endif
@ -59,7 +58,6 @@
}) })
let _this = this let _this = this
console.log('app',this.user.WeChat_MiniProToken)
if (this.user.WeChat_MiniProToken) { if (this.user.WeChat_MiniProToken) {
await this.memberLogin() // 获取用户数据 await this.memberLogin() // 获取用户数据
} else { } else {
@ -68,7 +66,7 @@
this.setVisitChannels(options.scene) this.setVisitChannels(options.scene)
const updateManager = uni.getUpdateManager() const updateManager = uni.getUpdateManager()
updateManager.onUpdateReady(function(res) { updateManager.onUpdateReady(function (res) {
uni.showModal({ uni.showModal({
title: '更新提示', title: '更新提示',
content: '新版本已经准备好，是否重启应用？', content: '新版本已经准备好，是否重启应用？',
@ -82,12 +80,12 @@
}); });
this.handleGetUserInfo() // this.handleGetUserInfo()
this.$util.addUserBehaviorNew( {intoRoute: '/'+options.path, outtoRoute: ''}) // 记录用户行为 this.$util.addUserBehaviorNew({ intoRoute: '/' + options.path, outtoRoute: '' }) // 记录用户行为
}, },
onShow: function() { onShow: function () {
// var pages = getCurrentPages() // 获取加载的页面 // var pages = getCurrentPages() // 获取加载的页面
// let len = pages.length // let len = pages.length
@ -96,60 +94,60 @@
// var nowRoute = '/' + currentPage.route // 当前页面url // var nowRoute = '/' + currentPage.route // 当前页面url
// this.$util.addUserBehavior({intoRoute: nowRoute, outtoRoute: ''}) // 记录用户行为 // this.$util.addUserBehavior({intoRoute: nowRoute, outtoRoute: ''}) // 记录用户行为
// } // }
console.log('App Show')
}, },
onHide: function(options) { onHide: function (options) {
let pages = getCurrentPages() // 获取加载的页面 let pages = getCurrentPages() // 获取加载的页面
let len = pages.length let len = pages.length
if (len > 0) { if (len > 0) {
let currentPage = pages[len - 1] // 获取当前页面的对象 let currentPage = pages[len - 1] // 获取当前页面的对象
let nowRoute = '/' + currentPage.route // 当前页面url let nowRoute = '/' + currentPage.route // 当前页面url
this.$util.addUserBehaviorNew( {intoRoute: '', outtoRoute:nowRoute}) // 记录用户行为 this.$util.addUserBehaviorNew({ intoRoute: '', outtoRoute: nowRoute }) // 记录用户行为
}
console.log('App Hide')
} }
} }
}
</script> </script>
<style> <style>
@import url("./common/uni.css"); @import url("./common/uni.css");
/*每个页面公共css */ /*每个页面公共css */
page { page {
font-size: 26rpx; font-size: 26rpx;
color: #333; color: #333;
height: 100%; height: 100%;
background-color: #f8f9fb; background-color: #f8f9fb;
line-height: 1.2; line-height: 1.2;
} }
/* 加载更多 */ /* 加载更多 */
.load-more { .load-more {
text-align: center; text-align: center;
width: 100%; width: 100%;
height: 80rpx; height: 80rpx;
color: #9999; color: #9999;
font-size: 24rpx; font-size: 24rpx;
} }
/* 审核环节最后一个加底部边距 */ /* 审核环节最后一个加底部边距 */
.process-box.uni-active { .process-box.uni-active {
padding-bottom: 30rpx; padding-bottom: 30rpx;
} }
.process-box process-unit:nth-last-child(1) .prosess-unit::before{
.process-box process-unit:nth-last-child(1) .prosess-unit::before {
content: ''; content: '';
width: 0rpx; width: 0rpx;
} }
.ico,
.ico-s { .ico,
.ico-s {
display: block; display: block;
} }
.ico-s:before, .ico-s:before,
.ico:before { .ico:before {
content: ''; content: '';
width: 36rpx; width: 36rpx;
height: 34rpx; height: 34rpx;
@ -159,27 +157,27 @@
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: contain; background-size: contain;
background-position: center; background-position: center;
} }
.ico-s:before { .ico-s:before {
width: 18rpx; width: 18rpx;
height: 18rpx; height: 18rpx;
} }
.ico-fj:before { .ico-fj:before {
background-image: url('./static/images/fjwj.png'); background-image: url('./static/images/fjwj.png');
} }
.ico-tp:before { .ico-tp:before {
background-image: url('./static/images/fjtp.png'); background-image: url('./static/images/fjtp.png');
} }
.ico-bz:before { .ico-bz:before {
background-image: url('./static/images/tender/yj.png'); background-image: url('./static/images/tender/yj.png');
} }
/* #ifdef MP-WEIXIN */ /* #ifdef MP-WEIXIN */
/* /*
checkbox .wx-checkbox-input { checkbox .wx-checkbox-input {
border-radius: 20%; border-radius: 20%;
border: 1rpx solid #91A6D7; border: 1rpx solid #91A6D7;
@ -197,25 +195,26 @@
font-size: 30rpx; font-size: 30rpx;
} */ } */
checkbox .wx-checkbox-input { checkbox .wx-checkbox-input {
border-radius: 50% ; border-radius: 50%;
background-color: #D8DFEE ; background-color: #D8DFEE;
width: 38rpx ; width: 38rpx;
height: 38rpx ; height: 38rpx;
color: #fff; color: #fff;
} }
checkbox .wx-checkbox-input.wx-checkbox-input-checked { checkbox .wx-checkbox-input.wx-checkbox-input-checked {
background-color: #2E6CF6; background-color: #2E6CF6;
border-color: #2E6CF6 ; border-color: #2E6CF6;
color: #fff !important; color: #fff !important;
} }
checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
font-size: 30rpx; font-size: 30rpx;
} }
/* #endif */
button::after{ /* #endif */
button::after {
border: none; border: none;
} }
</style> </style>

21
pages/everdayRenven/AnhuiIndex.vue
View File

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

7
pages/everdayRenven/AnhuiServerpart.vue
View File

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

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

@ -1,26 +1,20 @@
<template> <template>
<uni-ec-canvas <uni-ec-canvas class="uni-ec-canvas" id="revenuecharts" ref="revenuecharts" canvas-id="revenuecharts" :ec="ec"
class="uni-ec-canvas" @inited="inited"></uni-ec-canvas>
id="revenuecharts"
ref="revenuecharts"
canvas-id="revenuecharts"
:ec="ec"
@inited="inited"
></uni-ec-canvas>
</template> </template>
<script> <script>
import uniEcCanvas from './uni-ec-canvas/uni-ec-canvas.vue'; import uniEcCanvas from './uni-ec-canvas/uni-ec-canvas.vue';
export default { export default {
props:['data'], props: ['data', 'currentProvinceCode'],
components:{ components: {
uniEcCanvas uniEcCanvas
}, },
computed:{ computed: {
ec(){ ec() {
if(this.data){ if (this.data) {
return { return {
option:{ option: {
tooltip: { tooltip: {
trigger: 'item', trigger: 'item',
formatter: '{b}: {c} ({d}%)' formatter: '{b}: {c} ({d}%)'
@ -31,14 +25,14 @@
type: 'pie', type: 'pie',
selectedMode: 'single', selectedMode: 'single',
radius: [0, '32%'], radius: [0, '32%'],
center: ['50%','50%'], center: ['40%', '50%'],
startAngle: 40, startAngle: 40,
label: { label: {
// position: 'inner', // position: 'inner',
formatter: '{b} \n {d}% ', // formatter: '{b} \n {d}% ',
fontSize: 13, // fontSize: 13,
color: '#D1D1D1', // color: '#D1D1D1',
// show: false, show: false,
}, },
startAngle: 115, startAngle: 115,
labelLine: { labelLine: {
@ -46,7 +40,7 @@
length: 62, length: 62,
length2: 12, length2: 12,
smooth: true, smooth: true,
lineStyle:{ lineStyle: {
color: '#D1D1D1' color: '#D1D1D1'
}, },
@ -54,62 +48,93 @@
data: [ data: [
...this.data[0] ...this.data[0]
], ],
color:['#FEA427','#7786E3','#75B7AD','#9BC9F8','#FFAC37',] color: ['#FEA427', '#7786E3', '#75B7AD', '#9BC9F8', '#FFAC37',]
}, },
{ {
name: '业态', name: '业态',
type: 'pie', type: 'pie',
radius: ['48%', '72%'], radius: ['48%', '72%'],
center: ['50%','50%'], center: ['40%', '50%'],
labelLine: { labelLine: {
length: 30, length: 30,
}, },
label: { label: {
show:false, show: false,
}, },
color: this.data[1].length> 7 ? ['#FFC3CD','#F4A4B2','#FE6582','#FFE7C0','#FEDA9D','#FEC057','#F9C8A0','#FAB176','#ffa25b','#E1C9F7','#CDA6F1', color: this.data[1].length > 7 ? ['#FFC3CD', '#F4A4B2', '#FE6582', '#FFE7C0', '#FEDA9D', '#FEC057', '#F9C8A0', '#FAB176', '#ffa25b', '#E1C9F7', '#CDA6F1',
'#E0E2F6','#C5CDF9','#9AA6EF','#D8ECEA','#8FE5B2','#70D599','#ADE5EE'] : '#E0E2F6', '#C5CDF9', '#9AA6EF', '#D8ECEA', '#8FE5B2', '#70D599', '#ADE5EE'] :
['#70D599', '#FFE7C0', '#ADE5EE','#C5CDF9','#e0e3f7', '#AFB7E6', '#F3B1C9' ], ['#70D599', '#FFE7C0', '#ADE5EE', '#C5CDF9', '#e0e3f7', '#AFB7E6', '#F3B1C9'],
data: [ data: [
...this.data[1] ...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 // 行高
}
}
} }
} }
} }
} }
}, },
methods:{ methods: {
inited(chart){ inited(chart) {
let _this =this let _this = this
// console.log('图表初始化完毕') // console.log('图表初始化完毕')
// console.log('chart实例', this.ec) // console.log('chart实例', this.ec)
chart.on('click',function(params){ chart.on('click', function (params) {
if(params.componentIndex==0){ if (params.componentIndex == 0) {
_this.$emit('selectCate',params.dataIndex+1) _this.$emit('selectCate', params.dataIndex + 1)
} }
// console.log(params) // console.log(params)
}) })
}, },
}, },
} }
</script> </script>
<style scoped> <style scoped>
/* page { /* page {
background-color: #fff; background-color: #fff;
} */ } */
.uni-ec-canvas{ .uni-ec-canvas {
width: 690rpx; width: 690rpx;
height: 526rpx; height: 526rpx;
margin-top: 40rpx; margin-top: 40rpx;
display:block; display: block;
} }
</style> </style>

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

@ -15,6 +15,7 @@ const methods = {
*/ */
// let regionList = [] // 营收上传列表 reginListModel[] // let regionList = [] // 营收上传列表 reginListModel[]
this.groupType = obj.GroupType this.groupType = obj.GroupType
this.provinceCode = obj.ProvinceCode
const requestParamas = { const requestParamas = {
Statistics_Date: obj.time, Statistics_Date: obj.time,
Statistics_Month: obj.month, 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) { // 是服务区营收推送页面 if (isServerPartDetail) { // 是服务区营收推送页面
return _this.getSeverpartReginList(data.Result_Data.List, busniessCounts.Result_Data.List, return _this.getSeverpartReginList(data.Result_Data.List, busniessCounts.Result_Data.List,
tradeData.Result_Data.List, budgetAmount.Result_Data.List) tradeData.Result_Data.List, budgetAmount.Result_Data.List)
@ -112,8 +122,17 @@ const methods = {
oldData.totalOffAmount += newData.TotalOffAmount oldData.totalOffAmount += newData.TotalOffAmount
oldData.mobilePayment += newData.MobilePayment oldData.mobilePayment += newData.MobilePayment
oldData.cashPay += newData.CashPay oldData.cashPay += newData.CashPay
oldData.diffLessPrice += newData.Different_Price_Less // oldData.diffLessPrice += newData.Different_Price_Less
oldData.diffMorePrice += newData.Different_Price_More // 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) { // 商超 if (newData.BusinessType == 1000) { // 商超
oldData.scCount = oldData.scCount ? oldData.scCount + 1 : 1 oldData.scCount = oldData.scCount ? oldData.scCount + 1 : 1
@ -129,8 +148,20 @@ const methods = {
oldData.totalOffAmount = newData.TotalOffAmount oldData.totalOffAmount = newData.TotalOffAmount
oldData.mobilePayment = newData.MobilePayment oldData.mobilePayment = newData.MobilePayment
oldData.cashPay = newData.CashPay oldData.cashPay = newData.CashPay
oldData.diffLessPrice = newData.Different_Price_Less // oldData.diffLessPrice = newData.Different_Price_Less
oldData.diffMorePrice = newData.Different_Price_More // 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) { // 商超 if (newData.BusinessType == 1000) { // 商超

15
pages/everdayRenven/index.vue
View File

@ -1360,11 +1360,24 @@ export default {
if (option.ProvinceCode) { if (option.ProvinceCode) {
// 从推送进入 - 立即判断跳转，避免资源浪费 // 从推送进入 - 立即判断跳转，避免资源浪费
if (toSnhuiPageProvinceCode.indexOf(parseInt(option.ProvinceCode)) > -1) { 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，不加载当前页面数据 // 直接跳转，不显示loading，不加载当前页面数据
const url = "/pages/everdayRenven/AnhuiIndex?ProvinceCode=" + const url = "/pages/everdayRenven/AnhuiIndex?ProvinceCode=" +
option.ProvinceCode + option.ProvinceCode +
"&time=" + "&time=" +
option.time + `${y}-${m}-${d}` +
// option.time +
"&GroupType=" + "&GroupType=" +
option.GroupType + option.GroupType +
"&ServerpartIds=" + "&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> <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="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> <text class="menu-text" :class="{'noFn': !menus[item.id] || menus[item.id]==0}">{{item.name}}</text>
</view> </view>