修整

components/mix-tree/mix-tree.vue

@@ -1,151 +0,0 @@
-<!-- <template>
-	<view class="content">
-		<view class="mix-tree-list">
-			<block v-for="(item, index) in treeList" :key="index">
-				<view 
-					class="mix-tree-item"
-					:style="[{
-							paddingLeft: item.rank*15 + 'px',
-							zIndex: item.rank*-1 +50
-						}]"
-					:class="{
-							border: treeParams.border === true,
-							show: item.show,
-							last: item.lastRank,
-							showchild: item.showChild
-						}"
-					@click.stop="treeItemTap(item, index)"
-				>
-					<image class="mix-tree-icon" :src="item.lastRank ? treeParams.lastIcon : item.showChild ? treeParams.currentIcon : treeParams.defaultIcon"></image>
-					{{item.name}}
-				</view>
-			</block>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		props: {
-			list: {
-				type: Array,
-				default(){
-					return [];
-				}
-			},
-			params: {
-				type: Object,
-				default(){
-					return {}
-				}
-			}
-		},
-		data() {
-			return {
-				treeList: [],
-				treeParams: {
-					defaultIcon: '/static/mix-tree/defaultIcon.png',
-					currentIcon: '/static/mix-tree/currentIcon.png',
-					lastIcon: '',
-					border: false
-				}
-			}
-		},
-		watch: {
-			list(list){
-				
-				this.treeParams = Object.assign(this.treeParams, this.params);
-				console.log(this.treeParams, this.params);
-				this.renderTreeList(list);
-			}
-		},
-		methods: {
-			//扁平化树结构
-			renderTreeList(list=[], rank=0, parentId=[]){
-				list.forEach(item=>{
-					this.treeList.push({
-						id: item.id,
-						name: item.name,
-						parentId,  // 父级id数组
-						rank,  // 层级
-						showChild: false,  //子级是否显示
-						show: rank === 0  // 自身是否显示
-					})
-					if(Array.isArray(item.children) && item.children.length > 0){
-						let parents = [...parentId];
-						parents.push(item.id);
-						this.renderTreeList(item.children, rank+1, parents);
-					}else{
-						this.treeList[this.treeList.length-1].lastRank = true;
-					}
-				})
-			},
-			// 点击
-			treeItemTap(item){
-				let list = this.treeList;
-				let id = item.id;
-				if(item.lastRank === true){
-					//点击最后一级时触发事件
-					this.$emit('treeItemClick', item);
-					return;
-				}
-				item.showChild = !item.showChild;
-				list.forEach(childItem=>{
-					if(item.showChild === false){
-						//隐藏所有子级
-						if(!childItem.parentId.includes(id)){
-							return;
-						}
-						if(childItem.lastRank !== true){
-							childItem.showChild = false;
-						}
-						childItem.show = false;
-					}else{
-						if(childItem.parentId[childItem.parentId.length-1] === id){
-							childItem.show = true;
-						}
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style>
-	.mix-tree-list{
-		display: flex;
-		flex-direction: column;
-		padding-left: 30upx;
-	}
-	.mix-tree-item{
-		display: flex;
-		align-items: center;
-		font-size: 30upx;
-		color: #333;
-		height: 0;
-		opacity: 0;
-		transition: .2s;
-		position: relative;
-	}
-	.mix-tree-item.border{
-		border-bottom: 1px solid #eee;
-	}
-	.mix-tree-item.show{
-		height: 80upx;
-		opacity: 1;
-	}
-	.mix-tree-icon{
-		width: 26upx;
-		height: 26upx;
-		margin-right: 8upx;
-		opacity: .9;
-	}
-	
-	.mix-tree-item.showchild:before{
-		transform: rotate(90deg);
-	}
-	.mix-tree-item.last:before{
-		opacity: 0;
-	}
-</style>
- -->

configs/env.js

@@ -9,15 +9,21 @@ let configs = {
 if (process.env.NODE_ENV === 'development') {
 	// 测试环境
 	configs = Object.assign(configs, {
-		// baseUrl: 'https://app.sunzee.com.cn/cleanMachineServer',
-		baseUrl: 'http://127.0.0.1:8090',
+		// baseUrl: 'http://app.sunzee.com.cn:8090/cleanMachineServer',
+		baseUrl: 'https://app.sunzee.com.cn:9443/cleanMachineServer',
+		// baseUrl: 'http://127.0.0.1:8090/cleanMachineServer',
+		// baseUrl:'http://sunzee.myqnapcloud.com:8090/cleanMachineServer'
+		// baseUrl:'http://192.168.0.184:8090/cleanMachineServer'
+				// baseUrl: 'https://clean.sunzee.com.cn/cleanMachineServer',
 	});
 }
 
 if (process.env.NODE_ENV === 'production') {
     // 生产环境
 	configs = Object.assign(configs, {
-		baseUrl: 'https://app.sunzee.com.cn/cleanMachineServer',
+		// baseUrl: 'https://app.sunzee.com.cn/cleanMachineServer',
+		// baseUrl: 'http://app.sunzee.com.cn:8090/cleanMachineServer',
+		baseUrl: 'https://app.sunzee.com.cn:9443/cleanMachineServer',
 		// isProduction: true,
 	});
 }

main.js

@@ -22,8 +22,13 @@ const i18n = new VueI18n({
 
 App.mpType = 'app'
 
-Vue.prototype.serverurl="http://127.0.0.1:8090";
-// Vue.prototype.serverurl="https://app.sunzee.com.cn/cleanMachineServer";
+// Vue.prototype.serverurl="http://127.0.0.1:8090/cleanMachineServer";
+// Vue.prototype.serverurl="http://sunzee.myqnapcloud.com:8090/cleanMachineServer";
+// Vue.prototype.serverurl="http://192.168.0.184:8090/cleanMachineServer";
+// Vue.prototype.serverurl="https://app.sunzee.com.cn:8090/cleanMachineServer";
+// Vue.prototype.serverurl="http://app.sunzee.com.cn:8090/cleanMachineServer";
+Vue.prototype.serverurl="https://app.sunzee.com.cn:9443/cleanMachineServer";
+// Vue.prototype.serverurl="https://clean.sunzee.com.cn/cleanMachineServer";
 Vue.prototype.$store = store;
 Vue.prototype._i18n = i18n;
 const app = new Vue({

pages.json

@@ -117,20 +117,20 @@
 				"navigationBarTitleText":"修改设备名称"
 			}
 		},
-		{
-			"path": "pages/Charts/elseStatistics",
-			"style": {
-				"navigationBarTitleText": "统计图表"
-			}
-		},
-		{
-			"path": "pages/Charts/equipmentStatistics",
-			"style": {
-				"navigationBarTitleText": "销售排行"
-			}
-		}
+		// {
+		// 	"path": "pages/Charts/elseStatistics",
+		// 	"style": {
+		// 		"navigationBarTitleText": "统计图表"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/Charts/equipmentStatistics",
+		// 	"style": {
+		// 		"navigationBarTitleText": "销售排行"
+		// 	}
+		// }
         
-        ,{
+        {
             "path" : "pages/WeixinSwicth/WeixinSwicth",
             "style" : {
 				// "navigationStyle": "custom",

pages/Charts/elseStatistics.vue

@@ -1,50 +0,0 @@
-<!-- 单一统计图表 -->
-<template>
-	<view>
-		<mainStatistics :pname="pnameData" :equipmentId="equipmentIdData" :adminId="adminIdData"></mainStatistics>
-	</view>
-</template>
-
-<script>
-	import { mapState, mapActions, mapMutations } from 'vuex';
-	import {mainStatistics} from '@/pages/Charts/mainStatistics';
-	export default {
-		name: 'elseStatistics',
-		data() {
-			return {
-				equipmentId: '',
-				adminId: '',
-				pname: '',
-			}
-		},
-		computed: {
-			...mapState(['loginUser']),
-			equipmentIdData:{
-				get(){
-					return this.equipmentId;
-				}
-			},
-			adminIdData:{
-				get(){
-					return this.adminId;
-				}
-			},
-			pnameData:{
-				get(){
-					return this.pname;
-				}
-			},
-		},
-		onLoad(option){
-			this.equipmentId = option['equipmentId'];
-			this.adminId = option['adminId'];
-			this.pname = option['pname'];
-		},
-		mounted() {
-		},
-		methods: {
-		}
-	}
-</script>
-<style>
-</style>

pages/Charts/mainStatistics.vue

@@ -121,7 +121,7 @@
 										<view style="position: relative;" v-for="equipment in merchant.equipmentList" :key="equipment.id">
 											<span class="status-css" :class="equipment.hasTodayAlarm===true?statusError : statusNormal"></span>
 											<uni-collapse-item :title="getEquipmentTitle(equipment)">
-												<view style="padding: 20upx;background-color: antiquewhite;">
+												<view style="padding: 20upx;background-color: #F8F8F8;">
 													<view class="swithBox" v-if="equipment.isSleep">
 														<view class="swichFont">睡眠状态：机器已睡眠</view>
 														<view class="switch">
@@ -149,10 +149,14 @@
 													</view>
 													<view class="line1"></view>
 													<view><span>机器唯一码：</span><span>{{equipment.clientId}}</span></view>
-													<view><span>所在地：</span><span>{{equipment.fullName?equipment.fullName:''}}</span></view>
-													<view><span>炉头温度：</span><span>{{equipment.furnaceTm?equipment.furnaceTm:''}}</span></view>
-													<view><span>柜内湿度：</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}</span></view>
-													<view><span>柜内温度：</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}</span></view>
+													<!-- <view><span>所在地：</span><span>{{equipment.fullName?equipment.fullName:''}}</span></view> -->
+													<view><span>清洁剂余量：</span><span>{{equipment.cleaner?equipment.cleaner:''}}</span></view>
+													<view><span>消毒水余量：</span><span>{{equipment.disinfectant?equipment.disinfectant:''}}</span></view>
+													<view><span>机器到期时间：</span><span>{{equipment.overdueDate?equipment.overdueDate:''}}</span></view>
+													<view><span>机器剩余使用次数：</span><span>{{equipment.remaining?equipment.remaining:''}}</span></view>
+													<view><span>机器温度：</span><span>{{equipment.furnaceTm?equipment.furnaceTm:''}}</span></view>
+													<view><span>室内湿度：</span><span>{{equipment.cabinetHd?equipment.cabinetHd:''}}</span></view>
+													<view><span>室内温度：</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}</span></view>
 													<view v-if="equipment.hasTodayAlarm">
 														<view><span>报警内容：</span></view>
 														<view v-for="(alarm,index) in equipment.alarmList" :key="index">
@@ -185,7 +189,7 @@
 						<span class="status-css" :class="equipment.hasTodayAlarm===true?statusError : statusNormal"></span>
 						<uni-collapse-item :title="getEquipmentTitle(equipment)">
 							<!-- 睡眠 -->
-							<view style="padding: 20upx;background-color: antiquewhite;">
+							<view style="padding: 20upx;background-color:#F8F8F8;">
 								<view class="swithBox" v-if="equipment.isSleep">
 									<view class="swichFont">{{$t('equipmentStatusList.sleep')}}</view>
 									<view class="switch">
@@ -226,7 +230,12 @@
 								</view>
 			
 								<view><span>{{$t('equipmentStatusList.equipmentNo')}}：</span><span>{{equipment.clientId}}</span></view>
-								<view><span>{{$t('equipmentStatusList.area')}}：</span><span>{{equipment.fullName?equipment.fullName:''}}</span></view>
+								<!-- <view><span>{{$t('equipmentStatusList.area')}}：</span><span>{{equipment.fullName?equipment.fullName:''}}</span></view>
+								 -->
+								 <view><span>清洁剂余量：</span><span>{{equipment.cleaner?equipment.cleaner:''}}</span></view>
+								 <view><span>消毒水余量：</span><span>{{equipment.disinfectant?equipment.disinfectant:''}}</span></view>
+								 <view><span>机器到期时间：</span><span>{{equipment.overdueDate?equipment.overdueDate:''}}</span></view>
+								 <view><span>机器剩余使用次数：</span><span>{{equipment.remaining?equipment.remaining:''}}</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>{{$t('equipmentStatusList.equipmentTemperature')}}：</span><span>{{equipment.cabinetTm?equipment.cabinetTm:''}}</span></view>

pages/Setting/Setting.vue

@@ -4,10 +4,10 @@
 			<view class="titlelist" style="position: relative;" v-for="equipment in merchantList[0].equipmentList" :key="equipment.id">
 				<uni-collapse-item :title="getEquipmentTitle(equipment)">
 					<uni-list>
-						<uni-list-item title="使用统计" note="单台机器的使用次数统计" @click="useStatistics(equipment.id,equipment.name)" thumb="../../static/img/统计.png"></uni-list-item>
-						<uni-list-item title="清洗规则" note="设定机器每天的清洗时间段(单台机器)" @click="rule(equipment.id,equipment.name,equipment.rule)" thumb="../../static/img/任务.png"></uni-list-item>
-						<uni-list-item title="支付" note="按天数/次数支付(单台机器)" show-extra-icon="true" @click="pay(equipment.id,equipment.name)" thumb="../../static/img/支付.png"></uni-list-item>
-						<uni-list-item title="参数调整" thumb="../../static/img/参数.png"></uni-list-item>
+						<uni-list-item title="使用统计" note="单台机器的使用次数统计" @click="useStatistics(equipment.id,equipment.name)" thumb="../../static/img/tongji.png"></uni-list-item>
+						<uni-list-item title="清洗规则" note="设定机器每天的清洗时间段(单台机器)" @click="rule(equipment.id,equipment.name,equipment.rule)" thumb="../../static/img/renwu.png"></uni-list-item>
+						<uni-list-item title="支付" note="按天数/次数支付(单台机器)" show-extra-icon="true" @click="pay(equipment.id,equipment.name)" thumb="../../static/img/pay.png"></uni-list-item>
+						<uni-list-item title="参数调整" thumb="../../static/img/canshu.png"></uni-list-item>
 					</uni-list>
 				</uni-collapse-item>
 			</view>

pages/Setting/cleanRule.vue

@@ -133,70 +133,70 @@
 			...mapActions('chart', ['updateRule']),
 			btnConfirm0(e) {
 				console.log('确定时间为：', e);
-				this.time0 = e.value;
+				this.time0 = e.key;
 			},
 			btnCancel0() {
 				this.time0 = '';
 			},
 
 			btnConfirm1(e) {
-				this.time1 = e.value;
+				this.time1 = e.key;
 			},
 			btnCancel1() {
 				this.time1 = '';
 			},
 
 			btnConfirm2(e) {
-				this.time2 = e.value;
+				this.time2 = e.key;
 			},
 			btnCancel2() {
 				this.time2 = '';
 			},
 
 			btnConfirm3(e) {
-				this.time3 = e.value;
+				this.time3 = e.key;
 			},
 			btnCancel3() {
 				this.time3 = '';
 			},
 
 			btnConfirm4(e) {
-				this.time4 = e.value;
+				this.time4 = e.key;
 			},
 			btnCancel4() {
 				this.time4 = '';
 			},
 
 			btnConfirm5(e) {
-				this.time5 = e.value;
+				this.time5 = e.key;
 			},
 			btnCancel5() {
 				this.time5 = '';
 			},
 
 			btnConfirm6(e) {
-				this.time6 = e.value;
+				this.time6 = e.key;
 			},
 			btnCancel6() {
 				this.time6 = '';
 			},
 
 			btnConfirm7(e) {
-				this.time7 = e.value;
+				this.time7 = e.key;
 			},
 			btnCancel7() {
 				this.time7 = '';
 			},
 
 			btnConfirm8(e) {
-				this.time8 = e.value;
+				this.time8 = e.key;
 			},
 			btnCancel8() {
 				this.time8 = '';
 			},
 
 			btnConfirm9(e) {
-				this.time9 = e.value;
+				this.time9 = e.key;
 			},
 			btnCancel9() {
 				this.time9 = '';

pages/Setting/singleStatistics.vue

@@ -109,7 +109,7 @@
 		mapActions,
 		mapMutations
 	} from 'vuex';
-	import uCharts from '@/components/u-charts/u-charts.js';
+	// import uCharts from '@/components/u-charts/u-charts.js';
 	import uniCollapse from '@/components/uni-collapse/uni-collapse.vue'
 	import uniCollapseItem from '@/components/uni-collapse-item/uni-collapse-item.vue'
 	import uniList from '@/components/uni-list/uni-list.vue'

pages/User/equipmentSratisticsList.vue

@@ -83,7 +83,6 @@
 				// console.log('getEquipmentListData')
 				this.getEquipmentListByUser(this.globalUser)
 				.then(data => {
-					debugger
 					this.merchantList = data;
 					console.log('getEquipmentListData',this.merchantList)
 					uni.stopPullDownRefresh();

pages/User/user.vue

@@ -21,11 +21,11 @@
 		</view>
 		<view class="">
 			<uni-list>
-				<view v-if="ifForeign">
+				<!-- <view v-if="ifForeign">
 					<view v-if="gid">
 						<uni-list-item title="优惠码" @click="open()" />
 					</view>
-				</view>
+				</view> -->
 				<view v-if="show">
 					<uni-list-item :title="$t('user.equipmentname')" @click="updataName()" />
 				</view>