Ver código fonte

feat: 上下价

2912631854@qq.com 9 meses atrás
pai
commit
bcd224b520

+ 2 - 2
pages/my/houseList.vue

@@ -19,14 +19,14 @@
 						style="width: 210rpx;height: 42rpx; font-size: 30rpx;flex:1" />
 				</view>
 			</view>
-			<view class="shelves">
+			<!-- 	<view class="shelves">
 				<view style="margin-left: 30rpx;">
 					<text style="font-size: 30rpx; ">是否上架</text>
 				</view>
 				<view style="margin-right: 30rpx;">
 					<u-switch v-model="checked" size="50" active-color="#07C160"> </u-switch>
 				</view>
-			</view>
+			</view> -->
 			<!-- 图片上传
 			 -->
 			<view class="uploadPic">

+ 16 - 12
pages/statistics/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page" :style="{'padding-top':mt+'px'}">
 		<c-nav-bar title="统计" :showIcon="false"></c-nav-bar>
-		<view class="hander" @click="show=true">
+		<view class="hander" @click="DateTimes">
 			<!-- 2024年1月 -->
 			<view
 				class="tn-flex tn-flex-col-center  tn-margin-right tn-padding-xs tn-text-sm tn-bg-gray--light tn-radius tn-color-gray--dark"
@@ -66,7 +66,8 @@
 			</view>
 			<view class="Pie_charts" style="min-height: 580rpx;">
 				<!-- <PieCharts></PieCharts> -->
-				<qiun-data-charts type="ring" :opts="optsPied" :chartData="chartDataPied" />
+				<qiun-data-charts :canvas2d='true' type="ring" :opts="optsPied" :chartData="chartDataPied" />
+
 			</view>
 		</view>
 		<view class="echarts-two">
@@ -101,9 +102,12 @@
 		<!-- 	<u-calendar :show="show" :mode="range" :closeOnClickOverlay="true" @close="closeDate"
 			@confirm="confirm"></u-calendar> -->
 
-		<u-calendar class="u-time" confirmDisabledText="确定" :show="show" mode="range" @confirm="confirm"
+
+		<u-calendar class="u-time" confirmDisabledText="确定" :show="showTime" mode="range" @confirm="confirm"
 			@close="closeDate" :closeOnClickOverlay="true"></u-calendar>
 
+
+
 	</view>
 </template>
 
@@ -238,7 +242,7 @@
 
 
 				list: {},
-				show: false,
+				showTime: false,
 				dateTime: ''
 			}
 		},
@@ -263,20 +267,20 @@
 		methods: {
 			confirm(e) {
 				console.log(e);
-				this.show = false
+				this.showTime = false
 				this.dateTime = e[0] + '~' + e[e.length - 1]
-
 				this.fromData.dateDayStart = e[0]
 				this.fromData.dateDayEnd = e[e.length - 1]
 				this.getList()
-
-
 			},
 			closeDate() {
-				this.show = false
+				console.log('456789');
+				this.showTime = false
+			},
+			DateTimes() {
+				console.log('123456');
+				this.showTime = true
 			},
-
-
 
 			getDays(day) {
 				var today = new Date();
@@ -427,7 +431,7 @@
 	}
 
 	.u-popup__content {
-		z-index: 999 !important;
+		z-index: 99999 !important;
 	}
 
 	.u-calendar-month__days__day {

+ 1 - 1
uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue

@@ -1831,6 +1831,6 @@
 		flex: 1;
 		justify-content: center;
 		align-items: center;
-		z-index: 99;
+		z-index: 0;
 	}
 </style>