USER-20230908AJ\Administrator hace 1 año
padre
commit
0759f2cc9b
Se han modificado 2 ficheros con 8 adiciones y 8 borrados
  1. 6 6
      pages/statistics/module/head_filter.vue
  2. 2 2
      pages/statistics/statistics.vue

+ 6 - 6
pages/statistics/module/head_filter.vue

@@ -4,21 +4,21 @@
 			<view class="filter_item r-100 filter-bg row-justify-c center" @click="startAnimation(1)">
 				<text class="text-color-fff size-28 sys-weight-600 p-r10">{{newUserTypeName}}</text>
 				<image class="white-arrow" :class="arrowItem == 1 && is_flag?'open':''"
-					src="https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/statistics/white-arrow.png" mode="aspectFill"></image>
+					src="/static/img/statistics/white-arrow.png" mode="aspectFill"></image>
 				<!-- 		<uni-icons :animation="animationData" class="dropdown-icon" :type="type" size="16"
 					color="#fff"></uni-icons> -->
 			</view>
 			<view class="filter_item last_item r-100 filter-bg row-justify-c center" @click="startAnimation(2)">
 				<text class="text-color-fff size-28 sys-weight-600 p-r10">{{dateName}}</text>
 				<image class="white-arrow" :class="arrowItem == 2 && is_flag?'open':''"
-					src="https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/statistics/white-arrow.png" mode="aspectFill"></image>
+					src="/static/img/statistics/white-arrow.png" mode="aspectFill"></image>
 			</view>
 			<view>
 				<uni-datetime-picker v-model="daterange" type="daterange" @change="onSelectTime"
 					@touchmove.stop.prevent="moveHandle">
 					<view class="last_item r-100 filter-bg row-justify-c center">
-						<image class="wh-36" src="https://wealfavor-1257406827.cos.ap-beijing.myqcloud.com/new-xcx/statistics/stat-calendar.png" mode="aspectFill"></image>
-						<text class="text-color-fff size-28 sys-weight-600 m-l16">自定义</text>
+						<image class="wh-36" src="/static/img/statistics/stat-calendar.png" mode="aspectFill"></image>
+						<text class="text-color-fff size-28 sys-weight-600 m-l16">日期</text>
 					</view>
 				</uni-datetime-picker>
 			</view>
@@ -62,7 +62,7 @@
 				arrowItem: 0,
 				animation: null,
 				newUserTypeName: '',
-				dateName: '数据',
+				dateName: '数据',
 				dateData: [{
 					'id': 1,
 					'name': '日数据'
@@ -136,7 +136,7 @@
 				} else if (this.dateTypeObj.dateType === 2) {
 					ret = tools.getNextWeek(date, num)
 				} else if (this.dateTypeObj.dateType === 3) {
-					ret = tools.dateTypeObj.getNextMonth(date, num)
+					ret = tools.getNextMonth(date, num)
 				} else if (this.dateTypeObj.dateType === 4) {
 					ret = tools.getNextYear(date, num)
 				}

+ 2 - 2
pages/statistics/statistics.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="total-page page_env page-box container sys-list-background-color"
 		:style="[{'background-size':`100% ${$tools.topHeight()+bgSize}px`},{'background-image':`url(${bg_path})`}]">
-		<Nav :title="timeData[0]+'--'+timeData[1]" :genre="3" :back="false" is_icons is_fixed :bgHeight="bgHeight"
+		<Nav :title="dateTypeObj.dateType===1?timeData[0]:timeData[0]+'--'+timeData[1]" :genre="3" :back="false" is_icons is_fixed :bgHeight="bgHeight"
 			:navsHeight="navsHeight" :opacity="scrollTop" :justify="'left'" :color="'#fff'" :fixedHeight="160">
 			<view class="task-tabs m-t20" :style="{top:`${$tools.topHeight()}px`}">
 				<HeadFilter v-model="dateTypeObj" @onTopSelect="onTopSelect" :user-status-list="userStatusList"
@@ -100,7 +100,7 @@
 				list: [],
 				userStatusList: [],
 				dateTypeObj: {
-					dateType: 4, //时间类型
+					dateType: 1, //时间类型
 					selectDate: '2023-02-25', //自定义的时候传数组,其它传开始日期
 					money_type: 1,
 					censusUserType: 0,