退款

packageA/pages/user/orderEit.vue

@@ -0,0 +1,179 @@
+<template>
+	<view class="home-getOrder">
+		<form class="form" @submit="orderSubmit">
+			<view class="select-input">
+				<input class="input" style="display:none;" />
+				<text>账户余额：</text><input class="input" name="altAvilBalance" disabled :value="altAvilBalance"/>	
+			</view>
+			<view class="select-input">
+				<input class="input" style="display:none;" />
+				<text>订单编号：</text><input class="input" name="sn" disabled :value="sn"/>	
+			</view>
+			<view class="select-input">
+				<input class="input" style="display:none;" />
+				<text>设备编码：</text><input class="input" name="clientId" :value="clientId" />	
+			</view>
+			<view class="select-input">
+				<input class="input" style="display:none;" />
+				<text>商品名称：</text><input class="input" name="productName" disabled :value="productName" />	
+			</view>
+			<view class="select-input">
+				<input class="input" style="display:none;" />
+				<text>商品价格：</text><input class="input" name="price" disabled :value="price" />	
+			</view>
+			<view class="select-input">
+				<input class="input" style="display:none;" />
+				<text>支付时间：</text><input class="input" name="payDate" disabled :value="payDate"/>	
+			</view>
+			<view class="select-input">
+				<input class="input" style="display:none;" />
+				<text>退款时间：</text><input class="input" name="refundDate" disabled :value="refundDate"/>	
+			</view>
+			<view class="select-input">
+				<input class="input" style="display:none;" />
+				<text>订单状态：</text><input class="input" name="status" disabled :value="status==1?('已支付'):(status==2?'退款中':'已退款')" />	
+			</view>
+			<view class="btn-area">
+				<button type="primary" formType="submit" >退款</button>
+			</view>
+		</form>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return{
+				order:null,
+				sn:null,
+				clientId:null,
+				productName:null,
+				price:null,
+				payDate:null,
+				refundDate:null,
+				status:null,
+				altAvilBalance:null
+			}
+		},
+		onLoad: function(option) {
+			const order = JSON.parse(decodeURIComponent(option.order));
+			this.order = order;
+			this.sn = order.sn;
+			this.clientId = order.clientId;
+			this.productName = order.productName;
+			this.price = order.price;
+			this.payDate = order.payDate;
+			this.refundDate = order.refundDate;
+			this.status = order.status;
+		},
+		onShow() {
+			this.mch();
+			// console.log("订单详情")
+		},
+		methods: {
+			orderSubmit(e) {
+				uni.showModal({
+					title: '退款',
+					content: '确定执行退款操作？',
+					success: (res) => {
+						if (res.confirm) {
+							var order = this.order;
+							var token = uni.getStorageSync("token");
+							uni.request({
+								url: this.serverurl + '/TOrder/refund',
+								data: {
+									"sn": order.sn,
+									"id": order.id,
+								},
+								header: {
+									'token': token
+								},
+								method: "POST",
+								success: (res) => {
+									var message  = res.data.message;
+									if(res.data.code){
+										this.status = 2;
+									}
+									uni.showToast({
+										title: message,
+										duration: 3000
+									});
+								},
+							});
+							
+						} else if (res.cancel) {
+							// console.log('用户点击取消');
+							
+						}
+					}
+				});
+			},
+			mch(){
+				var token = uni.getStorageSync("token");
+				var globalUser = uni.getStorageSync("globalUser");
+				uni.request({
+					url: this.serverurl + '/TJoinpayMch/getMch',
+					data: {
+						"adminId": globalUser.id,
+					},
+					header: {
+						'token': token
+					},
+					method: "POST",
+					success: (res) => {
+						var date  = res.data.data;
+						this.altAvilBalance = date.altAvilBalance;
+					},
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.home-getOrder {
+		padding-top: 50upx;
+	}
+
+	.select-input {
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		font-size: 16px;
+		border-bottom: 1px solid;
+
+		margin: 20upx 30upx 30upx 30upx;
+		// box-shadow: 0upx 0upx 20upx #D3D3D3;
+
+		text {
+			margin-left: 30upx;
+		}
+
+		input {
+			padding-left: 20upx;
+
+			background-color: #FFFFFF;
+			width: 400upx;
+			height: 50upx;
+			// box-shadow: 0upx 0upx 20upx #D3D3D3;
+			// border-radius: 5upx;
+		}
+	}
+
+	.form {
+		width: calc(100% - 100upx);
+		padding: 50upx;
+		// .section{
+		// 	margin:50upx 0;
+		// }
+
+		.btn-area {
+			margin-top: 50upx;
+			padding: 50upx;
+
+			button {
+				background-color: #007AFF;
+			}
+		}
+	}
+</style>

packageA/pages/user/refuse.vue

@@ -0,0 +1,215 @@
+<template>
+	<view class="content">
+		<form @submit="selectSubmit" class="form">
+			<view class="select-input">
+				<input class="input" style="display:none;" />
+				<text>订单编号：</text><input class="input" name="orderMumber" 
+					placeholder="请输入订单编号" />
+			</view>
+			<view class="select-input">
+				<input class="input" style="display:none;" />
+				<text>订单流水：</text><input class="input" name="orderWater" placeholder="请输入订单流水后10位" />
+			</view>
+			<!-- 时间选择器  start -->
+			<mx-date-picker :show="showPicker" :type="type" :value="value" :show-tips="true" :begin-text="'开始'"
+				:end-text="'结束'" :show-seconds="true" @confirm="onSelected" @cancel="onSelected" />
+			<view class="select-input">
+				<input class="input" style="display:none;" />
+				<text @click="onShowDatePicker('rangetime')">开始时间：</text><input class="input" name="startDate"
+					:value="startDate" placeholder="点击左边文字选择" />
+			</view>
+			<view class="select-input">
+				<input class="input" style="display:none;" />
+				<text @click="onShowDatePicker('rangetime')">结束时间：</text><input class="input" name="endDate"
+					:value="endDate" placeholder="点击左边文字选择" />
+			</view>
+			<!-- 时间选择器  end -->
+			<view class="select-input">
+				<text class="select-text">注意:4个信息,至少填写一个,填写的越多,查出来的越准确.时间跨度不能超过两天。</text>
+			</view>
+			<view class="btn-area">
+				<button type="primary" formType="submit">确认</button>
+				<!-- <button type="primary" @click="tran()" >提交</button> -->
+			</view>
+		</form>
+		<view v-show="ok">
+			<uni-collapse :accordion="true">
+				<uni-list v-for="order in orders" :key="order.id">
+					<uni-list-item :title="'商品名称:'+order.productName" :note="'支付时间:'+order.payDate"
+						:rightText="order.status==1?('已支付'):(order.status==2?('退款中'):(order.status==3?('已退款'):(order.status==3?('支付'):('未支付'))))"
+						showArrow clickable @click="trantoedit(order)"></uni-list-item>
+					<!-- <uni-list-item :title="alarmClock.hour" :note="alarmClock.week+'---'+alarmClock.type"
+					 	:rightText="alarmClock.status" clickable @click="onClick(alarmClock.id)" /> -->
+				</uni-list>
+			</uni-collapse>
+		</view>
+	</view>
+</template>
+
+<script>
+	import MxDatePicker from '../../components/mx-datepicker/mx-datepicker.vue';
+	import {
+		dateUtils
+	} from '@/common/util.js';
+	import uniCollapse from '@/components/uni-collapse/uni-collapse.vue';
+	import uniCollapseItem from '@/components/uni-collapse-item/uni-collapse-item.vue';
+	import uniList from '../../uni_modules/uni-list/components/uni-list/uni-list.vue';
+	import uniListItem from '../../uni_modules/uni-list/components/uni-list-item/uni-list-item.vue';
+	import uniIcons from '../../uni_modules/uni-icons/components/uni-icons/uni-icons.vue';
+	export default {
+		components: {
+			MxDatePicker,
+			uniCollapse,
+			uniCollapseItem,
+			uniList,
+			uniListItem,
+			uniIcons
+		},
+		data() {
+			return {
+				ok: false,
+				//时间选择器
+				showPicker: false,
+				date: '2021/01/01',
+				time: '15:00:12',
+				datetime: '2021/01/01 15:00:12',
+				range: [],
+				rangetime: [],
+				startDate: null,
+				endDate: null,
+				type: 'rangetime',
+				orders: [],
+				value: ''
+
+			};
+		},
+		onShow() {
+			var date = new Date();
+			// var daystr = dateUtils.formateDate(date, 'yyyy年MM月dd日');
+			this.date = dateUtils.formateDate(date, 'yyyy/MM/dd');
+			this.time = dateUtils.formateDate(date, 'HH:mm:ss');
+			this.datetime = dateUtils.formateDate(date, 'yyyy/MM/dd HH:mm:ss');
+			this.refse();
+		},
+		computed: {
+			// ...mapState(['isLoading']),
+			// loginBtnLabel(){
+			// 	return this.isLoading ? '':'登录'
+			// }
+
+		},
+		methods: {
+			selectSubmit(e) {
+				// this.ok = true;
+				console.log(e.detail.value);
+				if (e.detail.value.orderMumber != "" || e.detail.value.orderWater != "" || (e.detail.value.startDate !=
+						"" && e.detail.value.endDate != "")) {
+					var orderMumber = e.detail.value.orderMumber;
+					var orderWater = e.detail.value.orderWater;
+					var startDate = e.detail.value.startDate;
+					var endDate = e.detail.value.endDate;
+					if (startDate != "" && endDate != "") {
+						var start = new Date(startDate);
+						var end = new Date(endDate);
+						var t = end.getTime() - start.getTime();
+						if (t > 2 * 24 * 60 * 60 * 1000) {
+							uni.showModal({
+								title: '提示',
+								content: '时间跨度超出范围',
+								success: function(res) {
+									if (res.confirm) {} else if (res.cancel) {}
+								}
+							});
+							return;
+							// console.log("超过2天");
+						} else {
+
+							// console.log("少于2天");
+						}
+
+					}
+					var token = uni.getStorageSync("token");
+					var globalUser = uni.getStorageSync("globalUser");
+					uni.request({
+						url: this.serverurl + '/TOrder/seleceOrder',
+						data: {
+							"sn": orderMumber,
+							"trxNo": orderWater,
+							"adminId": globalUser.id,
+							"createDate": startDate,
+							"modifyDate": endDate,
+						},
+						header: {
+							'token': token
+						},
+						method: "POST",
+						success: (res) => {
+							var orders = res.data.data;
+							// console.log(orders)
+							this.orders = orders;
+							if (orders.length > 0) {
+								this.ok = true;
+							}
+						},
+					});
+				} else {
+					uni.showModal({
+						title: '提示',
+						content: '信息不能为空',
+						success: function(res) {
+							if (res.confirm) {} else if (res.cancel) {}
+						}
+					});
+					return;
+				}
+
+
+			},
+			refse(){
+					var token = uni.getStorageSync("token");
+					var globalUser = uni.getStorageSync("globalUser");
+					uni.request({
+						url: this.serverurl + '/TJoinpayMch/refere',
+						data: {
+							"adminId": globalUser.id,
+						},
+						header: {
+							'token': token
+						},
+						method: "POST",
+						success: (res) => {
+							// var date  = res.data.data;
+						},
+					});
+			},
+			trantoedit(order) {
+				uni.navigateTo({
+					url: 'orderEit?order=' + encodeURIComponent(JSON.stringify(order)),
+				});
+			},
+			onShowDatePicker(type) { //显示
+				this.type = type;
+				this.showPicker = true;
+				this.value = this[type];
+			},
+			onSelected(e) { //选择
+				this.showPicker = false;
+				if (e) {
+					this[this.type] = e.value;
+					//选择的值
+					// console.log('value => '+ e.value);
+					this.startDate = e.value[0];
+					this.endDate = e.value[1];
+					//原始的Date对象
+					// console.log('date => ' + e.date);
+				}
+			}
+
+		}
+
+	}
+</script>
+
+<style lang="scss">
+	@import "../../static/common/selectOrder.scss";
+</style>

packageA/static/common/selectOrder.scss

@@ -0,0 +1,104 @@
+.body {
+		background-color: #FFFFFF;
+		font-size: 16px;
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+	}
+	.select-input{
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		font-size: 16px;
+		margin: 20upx 0 50upx 30upx;
+		input {
+			padding-left: 20upx;
+			padding-top: 10upx;
+			background-color: #FFFFFF;
+			width: 400upx;
+			height: 50upx;
+			box-shadow: 0upx 0upx 20upx #D3D3D3;
+			border-radius: 5upx;
+		}
+	}
+	
+	.item {
+		box-sizing: border-box;
+		width: 100%;
+		height: 40px;
+		line-height: 40px;
+		background-color: #ffffff;
+		position: relative;
+		padding: 0 10upx 0 200upx;
+		text-align: right;
+	}
+	
+	.item .lable {
+		position: absolute;
+		left: 30upx;
+		top: 0px;
+		font-size: 16px;
+	}
+	
+	uni-picker-view-column {
+		font-size: 24rpx;
+	}
+	
+	.filter_input {
+		height: 92rpx;
+		padding-top: 10rpx;
+	}
+	
+	.date_item {
+		float: left;
+		width: 240upx;
+		overflow: hidden;
+		display: inline-block;
+		text-align: center;
+		border: 1px solid #ececec;
+		height: 72rpx;
+		line-height: 72rpx;
+	
+		// font-size: 28rpx;
+		&:last-child {
+			// float: right;
+		}
+	
+		input {
+			height: 72rpx;
+	
+			.uni-input-placeholder {
+				color: #b5b8c2;
+			}
+		}
+	}
+	
+	.filter_inputline {
+		float: left;
+		margin: 0 4rpx;
+		line-height: 72rpx;
+	
+		&:after {
+			content: '—';
+			font-size: 28rpx;
+			color: #848b9a;
+		}
+	}
+	form{
+		width: calc(100% - 100upx);
+		padding: 50upx;
+		.section{
+			margin:50upx 0;
+		}
+		
+		.btn-area{
+			padding: 50upx;
+			padding-top:0upx;
+			button{
+				background-color:#007AFF;
+			}
+		}
+	}
+.select-text{
+	color: #F0AD4E;
+}

pages.json

@@ -245,15 +245,27 @@
 			{
 				"path": "pages/user/timeSelect",
 				"style": {}
-			}
-
-			, {
+			}, {
 				"path": "pages/remote/volume",
 				"style": {
 					"navigationBarTitleText": "音量调节",
 					"enablePullDownRefresh": false
 				}
 
+			}, {
+				"path": "pages/user/refuse",
+				"style": {
+					"navigationBarTitleText": "退款",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "pages/user/orderEit",
+				"style": {
+					"navigationBarTitleText": "详情",
+					"enablePullDownRefresh": false
+				}
+
 			}
 		]
 	}]

pages/Charts/equipmentStatistics.vue

@@ -18,8 +18,9 @@
 				</view>
 			</view>
 			<view class="qiun-charts" style="background-color: #FFFFFF;">
-				<canvas canvas-id="canvaColumn1" id="canvaColumn1" class="charts" disable-scroll=true @touchstart="touchLine1"
-				 @touchmove="moveLine1" @touchend="touchEndLine1" style="background-color: #FFFFFF;"></canvas>
+				<canvas canvas-id="canvaColumn1" id="canvaColumn1" class="charts" disable-scroll=true
+					@touchstart="touchLine1" @touchmove="moveLine1" @touchend="touchEndLine1"
+					style="background-color: #FFFFFF;"></canvas>
 			</view>
 		</view>
 		<view class="line"></view>
@@ -35,8 +36,9 @@
 				</view>
 			</view>
 			<view class="qiun-charts" style="background-color: #FFFFFF;">
-				<canvas canvas-id="canvaColumn2" id="canvaColumn2" class="charts" disable-scroll=true @touchstart="touchLine2"
-				 @touchmove="moveLine2" @touchend="touchEndLine2" style="background-color: #FFFFFF;"></canvas>
+				<canvas canvas-id="canvaColumn2" id="canvaColumn2" class="charts" disable-scroll=true
+					@touchstart="touchLine2" @touchmove="moveLine2" @touchend="touchEndLine2"
+					style="background-color: #FFFFFF;"></canvas>
 			</view>
 		</view>
 		<view class="line"></view>
@@ -52,8 +54,9 @@
 				</view>
 			</view>
 			<view class="qiun-charts" style="background-color: #FFFFFF;">
-				<canvas canvas-id="canvaColumn3" id="canvaColumn3" class="charts" disable-scroll=true @touchstart="touchLine3"
-				 @touchmove="moveLine3" @touchend="touchEndLine3" style="background-color: #FFFFFF;"></canvas>
+				<canvas canvas-id="canvaColumn3" id="canvaColumn3" class="charts" disable-scroll=true
+					@touchstart="touchLine3" @touchmove="moveLine3" @touchend="touchEndLine3"
+					style="background-color: #FFFFFF;"></canvas>
 			</view>
 		</view>
 		<view class="line"></view>
@@ -69,8 +72,9 @@
 				</view>
 			</view>
 			<view class="qiun-charts" style="background-color: #FFFFFF;">
-				<canvas canvas-id="canvaColumn4" id="canvaColumn4" class="charts" disable-scroll=true @touchstart="touchLine4"
-				 @touchmove="moveLine4" @touchend="touchEndLine4" style="background-color: #FFFFFF;"></canvas>
+				<canvas canvas-id="canvaColumn4" id="canvaColumn4" class="charts" disable-scroll=true
+					@touchstart="touchLine4" @touchmove="moveLine4" @touchend="touchEndLine4"
+					style="background-color: #FFFFFF;"></canvas>
 			</view>
 		</view>
 
@@ -88,8 +92,9 @@
 					</view>
 				</view>
 				<view class="qiun-charts2" style="background-color: #FFFFFF;">
-					<canvas canvas-id="canvaColumn5" id="canvaColumn5" class="charts2" disable-scroll=true @touchstart="touchLine5"
-					 @touchmove="moveLine5" @touchend="touchEndLine5" style="background-color: #FFFFFF;"></canvas>
+					<canvas canvas-id="canvaColumn5" id="canvaColumn5" class="charts2" disable-scroll=true
+						@touchstart="touchLine5" @touchmove="moveLine5" @touchend="touchEndLine5"
+						style="background-color: #FFFFFF;"></canvas>
 				</view>
 			</view>
 			<view class="line"></view>
@@ -105,8 +110,9 @@
 					</view>
 				</view>
 				<view class="qiun-charts2" style="background-color: #FFFFFF;">
-					<canvas canvas-id="canvaColumn6" id="canvaColumn6" class="charts2" disable-scroll=true @touchstart="touchLine6"
-					 @touchmove="moveLine6" @touchend="touchEndLine6" style="background-color: #FFFFFF;"></canvas>
+					<canvas canvas-id="canvaColumn6" id="canvaColumn6" class="charts2" disable-scroll=true
+						@touchstart="touchLine6" @touchmove="moveLine6" @touchend="touchEndLine6"
+						style="background-color: #FFFFFF;"></canvas>
 				</view>
 			</view>
 			<view class="line"></view>
@@ -122,8 +128,9 @@
 					</view>
 				</view>
 				<view class="qiun-charts2" style="background-color: #FFFFFF;">
-					<canvas canvas-id="canvaColumn7" id="canvaColumn7" class="charts2" disable-scroll=true @touchstart="touchLine7"
-					 @touchmove="moveLine7" @touchend="touchEndLine7" style="background-color: #FFFFFF;"></canvas>
+					<canvas canvas-id="canvaColumn7" id="canvaColumn7" class="charts2" disable-scroll=true
+						@touchstart="touchLine7" @touchmove="moveLine7" @touchend="touchEndLine7"
+						style="background-color: #FFFFFF;"></canvas>
 				</view>
 			</view>
 			<view class="line"></view>
@@ -139,11 +146,12 @@
 					</view>
 				</view>
 				<view class="qiun-charts2" style="background-color: #FFFFFF;">
-					<canvas canvas-id="canvaColumn8" id="canvaColumn8" class="charts2" disable-scroll=true @touchstart="touchLine8"
-					 @touchmove="moveLine8" @touchend="touchEndLine8" style="background-color: #FFFFFF;"></canvas>
+					<canvas canvas-id="canvaColumn8" id="canvaColumn8" class="charts2" disable-scroll=true
+						@touchstart="touchLine8" @touchmove="moveLine8" @touchend="touchEndLine8"
+						style="background-color: #FFFFFF;"></canvas>
 				</view>
 			</view>
-			
+
 			<!-- 各省销售额 -->
 			<view class="qiun-columns">
 				<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
@@ -157,8 +165,9 @@
 					</view>
 				</view>
 				<view class="qiun-charts2" style="background-color: #FFFFFF;">
-					<canvas canvas-id="canvaColumn9" id="canvaColumn9" class="charts2" disable-scroll=true @touchstart="touchLine9"
-					 @touchmove="moveLine9" @touchend="touchEndLine9" style="background-color: #FFFFFF;"></canvas>
+					<canvas canvas-id="canvaColumn9" id="canvaColumn9" class="charts2" disable-scroll=true
+						@touchstart="touchLine9" @touchmove="moveLine9" @touchend="touchEndLine9"
+						style="background-color: #FFFFFF;"></canvas>
 				</view>
 			</view>
 			<view class="line"></view>
@@ -174,8 +183,9 @@
 					</view>
 				</view>
 				<view class="qiun-charts2" style="background-color: #FFFFFF;">
-					<canvas canvas-id="canvaColumn10" id="canvaColumn10" class="charts2" disable-scroll=true @touchstart="touchLine10"
-					 @touchmove="moveLine10" @touchend="touchEndLine10" style="background-color: #FFFFFF;"></canvas>
+					<canvas canvas-id="canvaColumn10" id="canvaColumn10" class="charts2" disable-scroll=true
+						@touchstart="touchLine10" @touchmove="moveLine10" @touchend="touchEndLine10"
+						style="background-color: #FFFFFF;"></canvas>
 				</view>
 			</view>
 			<view class="line"></view>
@@ -191,8 +201,9 @@
 					</view>
 				</view>
 				<view class="qiun-charts2" style="background-color: #FFFFFF;">
-					<canvas canvas-id="canvaColumn11" id="canvaColumn11" class="charts2" disable-scroll=true @touchstart="touchLine11"
-					 @touchmove="moveLine11" @touchend="touchEndLine11" style="background-color: #FFFFFF;"></canvas>
+					<canvas canvas-id="canvaColumn11" id="canvaColumn11" class="charts2" disable-scroll=true
+						@touchstart="touchLine11" @touchmove="moveLine11" @touchend="touchEndLine11"
+						style="background-color: #FFFFFF;"></canvas>
 				</view>
 			</view>
 			<view class="line"></view>
@@ -208,8 +219,9 @@
 					</view>
 				</view>
 				<view class="qiun-charts2" style="background-color: #FFFFFF;">
-					<canvas canvas-id="canvaColumn12" id="canvaColumn12" class="charts2" disable-scroll=true @touchstart="touchLine12"
-					 @touchmove="moveLine12" @touchend="touchEndLine12" style="background-color: #FFFFFF;"></canvas>
+					<canvas canvas-id="canvaColumn12" id="canvaColumn12" class="charts2" disable-scroll=true
+						@touchstart="touchLine12" @touchmove="moveLine12" @touchend="touchEndLine12"
+						style="background-color: #FFFFFF;"></canvas>
 				</view>
 			</view>
 		</view>
@@ -232,12 +244,12 @@
 	var canvaColumn2 = null;
 	var canvaColumn3 = null;
 	var canvaColumn4 = null;
-	
+
 	var canvaColumn5 = null;
 	var canvaColumn6 = null;
 	var canvaColumn7 = null;
 	var canvaColumn8 = null;
-	
+
 	var canvaColumn9 = null;
 	var canvaColumn10 = null;
 	var canvaColumn11 = null;
@@ -253,8 +265,8 @@
 				cWidth: '',
 				cHeight: '',
 				pixelRatio: 1,
-				tese:0,
-				
+				tese: 0,
+
 				startDate1: '',
 				endDate1: '',
 				startDate2: '',
@@ -263,7 +275,7 @@
 				endDate3: '',
 				startDate4: '',
 				endDate4: '',
-				
+
 				startDate5: '',
 				endDate5: '',
 				startDate6: '',
@@ -272,7 +284,7 @@
 				endDate7: '',
 				startDate8: '',
 				endDate8: '',
-				
+
 				startDate9: '',
 				endDate9: '',
 				startDate10: '',
@@ -292,17 +304,22 @@
 			// this.init2();
 		},
 		onShow() {
-			uni.setNavigationBarTitle({title: this.$t('equipmentStatics.title')});
-			uni.setTabBarItem({ index: 2,text: this.$t('tabs.tab3')});
+			uni.setNavigationBarTitle({
+				title: this.$t('equipmentStatics.title')
+			});
+			uni.setTabBarItem({
+				index: 2,
+				text: this.$t('tabs.tab3')
+			});
 			this.tese = this.tese + 1;
 			var globalUser = uni.getStorageSync("globalUser");
 			if (globalUser.id == '1') {
 				this.show = true
 			}
 			var token = uni.getStorageSync("token");
-			if (token.length>1) {
+			if (token.length > 1) {
 				this.init();
-			}else{
+			} else {
 				uni.reLaunch({
 					url: '../Login/Login',
 				});
@@ -310,7 +327,9 @@
 		},
 
 		methods: {
-			...mapActions('chart', ['getProvince','getProvinceAll', 'getEquipmentStatistics', 'getMainStatistics', 'getMachineNum']),
+			...mapActions('chart', ['getProvince', 'getProvinceAll', 'getEquipmentStatistics', 'getMainStatistics',
+				'getMachineNum'
+			]),
 			async init() {
 				if (this.pname === '') {
 					this.pname = uni.getStorageSync("name");
@@ -323,13 +342,15 @@
 
 				await this.initDateRang(new Date(), 'day');
 				await this.initDateRang(new Date(), 'week');
-				if(this.tese == 1){
+				if (this.tese == 1) {
 					await this.initDateRang(new Date(), 'month');
 					await this.initDateRang(new Date(), 'year');
 				}
+				setTimeout(function() {
+					_self.init2();
+				}, 3000);
+				// await this.init2();
 
-				await this.init2();
-				await this.init3();
 			},
 			async init2() {
 				if (this.pname === '') {
@@ -342,12 +363,16 @@
 				if (this.show == true) {
 					await this.initDateRang2(new Date(), 'day');
 					await this.initDateRang2(new Date(), 'week');
-					if(this.tese == 1){
+					if (this.tese == 1) {
 						await this.initDateRang2(new Date(), 'month');
 						await this.initDateRang2(new Date(), 'year');
 					}
-					
+
 				}
+				setTimeout(function() {
+					_self.init3();
+				}, 9000);
+				// await this.init3();
 			},
 			async init3() {
 				if (this.pname === '') {
@@ -360,11 +385,11 @@
 				if (this.show == true) {
 					await this.initDateRang3(new Date(), 'day');
 					await this.initDateRang3(new Date(), 'week');
-					if(this.tese == 1){
+					if (this.tese == 1) {
 						await this.initDateRang3(new Date(), 'month');
 						await this.initDateRang3(new Date(), 'year');
 					}
-					
+
 				}
 			},
 			initDateRang(day, chartType) {
@@ -424,7 +449,7 @@
 					this.startDate12 = dateUtils.formateDate(dateUtils.getCurrentYearFirstDate(day), 'yyyy/MM/dd');
 					this.endDate12 = dateUtils.formateDate(dateUtils.getCurrentYearLastDate(day), 'yyyy/MM/dd');
 				}
-			
+
 				return this.getProvinceAllData(chartType);
 			},
 			/**上一个 */
@@ -549,7 +574,7 @@
 					day = new Date(this.startDate12);
 					day.setFullYear(day.getFullYear() + 1);
 				}
-			
+
 				this.initDateRang3(day, chartType);
 			},
 			getStatisticsData(chartType) {
@@ -728,7 +753,7 @@
 						}
 					});
 			},
-			
+
 			getProvinceAllData(chartType) {
 				const param = {
 					'chartType': chartType
@@ -757,7 +782,7 @@
 				if (this.equipmentId) {
 					param['equipmentId'] = this.equipmentId;
 				}
-			
+
 				return this.getProvinceAll(param)
 					.then(data => {
 						uni.stopPullDownRefresh();
@@ -773,7 +798,7 @@
 						if (param['chartType'] == 'year') {
 							canvaColumn12 = this.initChart3('canvaColumn12', data);
 						}
-			
+
 					}, _ => {
 						uni.stopPullDownRefresh();
 						if (param['chartType'] == 'day') {
@@ -1094,7 +1119,7 @@
 					});
 				}
 			},
-			
+
 			touchLine9(e) {
 				if (canvaColumn9) {
 					canvaColumn9.scrollStart(e);

pages/User/equipmentStatusList.vue

@@ -153,8 +153,9 @@
 						<view><span>{{$t('equipmentStatusList.area')}}：</span><span>{{equipment.fullName?equipment.fullName:''}}</span></view>
 						<view><span>{{$t('equipmentStatusList.temperature')}}：</span><span>{{equipment.furnaceTm?equipment.furnaceTm:''}}</span></view>
 						<view><span>{{$t('equipmentStatusList.humidity')}}：</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}</span></view>
-						<view><span>音量：</span><span>{{equipment.volume?equipment.volume:''}}</span></view>
 						<view><span>{{$t('equipmentStatusList.equipmentTemperature')}}：</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}</span></view>
+						<view><span>最近刷新时间：</span><span>{{equipment.lastUpdateTime}}</span></view>
+						<view><span>音量：</span><span>{{equipment.volume?equipment.volume:''}}</span></view>
 						<view class="" v-if="equipment.hasTodayAlarm">
 							<view><span>{{$t('equipmentStatusList.alarm')}}：</span></view>
 							<view v-for="(alarm,index) in equipment.alarmList" :key="index">

pages/User/user.vue

@@ -39,6 +39,9 @@
 				<view v-if="show">
 					<uni-list-item :title="$t('user.equipmentname')" @click="updataName()" />
 				</view>
+				<view>
+					<uni-list-item title="退款" @click="refuse()" />
+				</view>
 			</uni-list>
 		</view>
 		<view class="xiugai2">
@@ -167,6 +170,11 @@
 					url: '../../packageA/pages/user/equipmentName',
 				});
 			},
+			refuse(){
+				uni.navigateTo({
+					url: '../../packageA/pages/user/refuse',
+				});
+			},
 			trant() {
 				uni.reLaunch({
 					url: '../WeixinSwicth/WeixinSwicth',