优化+bug

components/cell/index.css

@@ -2,7 +2,7 @@
 .cell{position: relative;margin-right: 13rpx;}
 .cell-bg{width: 68rpx;height: 132rpx;position: relative;z-index: 1;}
 .cell-gou{width: 30rpx;height: 27rpx;position: absolute;right: 27rpx;bottom: 23rpx;}
-.cell-q{position: absolute;top: 17rpx;left: 7rpx;right: 7rpx;bottom: 7rpx;z-index: 2;}
+.cell-q{position: absolute;top: 20rpx;left: 7rpx;right: 7rpx;bottom: 7rpx;z-index: 2;}
 .cell-qs{position: absolute;bottom: 0;left: 0;width: 100%;background-color: #EB5C20;border-radius: 5rpx;}
 .full{background-color: #0FCB27;}
 .soc-label{

machineAndCell/machineDetail/machineDetail.vue

@@ -17,49 +17,57 @@
 			<view class="item ddflex">
 				<view class="label">机柜温度</view>
 				<view class="item-input fflex">
-					{{cabInfo.cabTemp}}C
+					<block v-if="cabInfo.cabTemp">{{cabInfo.cabTemp}}℃</block>
+					<view v-else>未知</view>
 				</view>
 			</view>
 			<view class="item ddflex">
 				<view class="label">机柜电压</view>
 				<view class="item-input fflex">
-					{{cabInfo.cabVol}}V
+					<block v-if="cabInfo.cabVol">{{cabInfo.cabVol}}V</block>
+					<view v-else>未知</view>
 				</view>
 			</view>
 			<view class="item ddflex">
 				<view class="label">当前电流</view>
 				<view class="item-input fflex">
-					{{cabInfo.cabCur}}A
+					<block v-if="cabInfo.cabCur">{{cabInfo.cabCur}}A</block>
+					<view v-else>未知</view>
 				</view>
 			</view>
 			<view class="item ddflex">
 				<view class="label">信号强度</view>
 				<view class="item-input fflex">
-					{{cabInfo.dbm}}
+					<block v-if="cabInfo.dbm">{{cabInfo.dbm}}</block>
+					<view v-else>未知</view>
 				</view>
 			</view>
 			<view class="item ddflex">
 				<view class="label">电表度数</view>
 				<view class="item-input fflex">
-					{{cabInfo.emKwh}}KWH
+					<block v-if="cabInfo.emKwh">{{cabInfo.emKwh}}KWH</block>
+					<view v-else>未知</view>
 				</view>
 			</view>
 			<view class="item ddflex">
 				<view class="label">仓门数量</view>
 				<view class="item-input fflex">
-					{{cabInfo.doorCount}}
+					<block v-if="cabInfo.doorCount">{{cabInfo.doorCount}}</block>
+					<view v-else>未知</view>
 				</view>
 			</view>
 			<view class="item ddflex">
 				<view class="label">空仓数量</view>
 				<view class="item-input fflex">
-					{{cabInfo.nullDoorCount}}
+					<block v-if="cabInfo.nullDoorCount">{{cabInfo.nullDoorCount}}</block>
+					<view v-else>未知</view>
 				</view>
 			</view>
 			<view class="item ddflex">
 				<view class="label">可用电池数量</view>
 				<view class="item-input fflex">
-					{{cabInfo.useDoorCount}}
+					<block v-if="cabInfo.useDoorCount">{{cabInfo.useDoorCount}}</block>
+					<view v-else>未知</view>
 				</view>
 			</view>
 			<!-- <view class="item ddflex">

machineAndCell/machineItemManage/machineItemManage.css

@@ -1,5 +1,5 @@
 page{
-	background-color: #fff;
+	/* background-color: #fff; */
 }
 .option-box{
 	background: #FFFFFF;

mine/myUser/myUser.css

@@ -56,6 +56,7 @@ page{
 	width: 88rpx;
 	height: 88rpx;
 	margin-right: 20rpx;
+	border-radius: 100%;
 }
 .user-nickName{
 	line-height: 45rpx;

mine/myUser/myUser.vue

@@ -3,7 +3,7 @@
 		<view class="search-box ddflex">
 			<view class="search-input ddflex fflex">
 				<image class="search-input-icon" src="../../static/pages/images/search.png"></image>
-				<input class="fflex" v-model="searchValue" confirm-type="search" @confirm="searchFn"  placeholder="请输入用户昵称或电话"/>
+				<input class="fflex" v-model="searchValue" confirm-type="search" @confirm="searchFn"  placeholder="请输入用户昵称或姓名"/>
 				<view class="search-btn" @click="searchFn">搜索</view>
 			</view>
 		</view>
@@ -11,7 +11,7 @@
 		<view>
 			<view class="user-item ddflex" v-for="item,index in groupList">
 				<view class="ddflex">
-					<image class="user-header" src="../../static/images/userimg.png"></image>
+					<image class="user-header" :src="item.avatar?item.avatar:'../../static/images/userimg.png'"></image>
 					<view class="fflex">
 						<view class="user-nickName">{{item.nickName}}</view>
 						<view class="user-phone">{{item.realName?item.realName:''}}<text v-if="item.mobile">({{item.mobile}})</text></view>

pages/cell/cell.vue

@@ -109,7 +109,7 @@
 				</view>
 				<scroll-view :scroll-y="true" @scrolltolower="loadLeftData" class="pop-content fflex">
 					<view :class="'pop-content-item '+(actMerchant.id==item.id?'pop-content-active':'')" v-for="(item,index) in merchantList" @click="changePop(item)">
-						<view class="pop-content-name">{{item.name}}</view>
+						<view class="pop-content-name tover">{{item.name}}</view>
 						<image class="pop-content-icon" src=""></image>
 					</view>
 				</scroll-view>

pages/index/index.css

@@ -158,6 +158,6 @@ page {
 	margin: 30rpx auto;
 }
 
-.wei-login{font-size: 24rpx;color: #333;text-align: center;padding: 0 30rpx 60rpx;}
+.wei-login{font-size: 24rpx;color: #333;text-align: center;padding: 0 30rpx 60rpx;margin-top: 80rpx;}
 .wei-login image{width: 495rpx;height: 424rpx;margin: 0 auto 20rpx;}
-.cart-login{border: 1rpx solid var(--mina);font-size: 30rpx;color: var(--mina);font-weight: bold;height: 80rpx;line-height: 80rpx;border-radius: 40rpx;width: 260rpx;margin: 65rpx auto 0;}
+.cart-login{border: 1px solid var(--mina);font-size: 30rpx;color: var(--mina);font-weight: bold;height: 80rpx;line-height: 80rpx;border-radius: 40rpx;width: 260rpx;margin: 65rpx auto 0;}

pages/index/index.vue

@@ -101,13 +101,13 @@
 		<!-- 图表统计 -->
 		<view class="echart-box">
 			<view class="echart-box-header ddflex">
-				<view class="echart-box-title">商家营业额排名</view>
-				<view class="echart-box-timeType ddflex">
+				<view class="echart-box-title">营业额排名</view>
+				<!-- <view class="echart-box-timeType ddflex">
 					<view :class="'echart-box-timeType-item '+(storeType==1?'echart-box-timeType-item-acitve':'')"
 						@click="storeTypeChange(1)">商户</view>
 					<view :class="'echart-box-timeType-item '+(storeType==2?'echart-box-timeType-item-acitve':'')"
 						@click="storeTypeChange(2)">门店</view>
-				</view>
+				</view> -->
 			</view>
 			<view>
 				<l-echart ref="chart2" @finished="init"></l-echart>
@@ -293,7 +293,7 @@
 					grid: {
 						left: 0,
 						right: 5,
-						bottom: 40,
+						bottom: 10,
 						top: 40,
 						containLabel: true
 					},
@@ -324,13 +324,14 @@
 						axisLine: {
 							lineStyle: {
 								color: '#999999'
-							}
+							},
+							show: false,
 						},
 						axisLabel: {
 							color: '#666666',
 							// inside:true,
 							width:10,
-							padding: [-20, 0, 0, 0],
+							padding: [-20, 0, 0, -4],
 							verticalAlign:'top',
 							align:'left',
 							inside:true
@@ -356,7 +357,7 @@
 							// 颜色
 							color: '#FF770F',
 							// 给bar设置倒角
-							barBorderRadius: [0, 15, 15, 0]
+							barBorderRadius: [15, 15, 15, 15]
 						}
 					}]
 				},
@@ -417,6 +418,9 @@
 
 				// 已租设备
 				option4: {
+					tooltip: {
+						show:false
+					},
 					title: {
 						text: '已租设备',
 						textStyle: {
@@ -429,6 +433,7 @@
 					series: [{
 						type: 'pie',
 						radius: ['60%', '70%'],
+						silent:true,
 						label: {
 							normal: {
 								show: true,
@@ -476,6 +481,7 @@
 						type: 'pie',
 						center: ['50%', '50%'],
 						radius: ['60%', '70%'],
+						silent:true,
 						label: {
 							normal: {
 								show: true,
@@ -523,6 +529,7 @@
 						type: 'pie',
 						center: ['50%', '50%'],
 						radius: ['60%', '70%'],
+						silent:true,
 						label: {
 							normal: {
 								show: true,
@@ -570,13 +577,13 @@
 		async onShow() {
 			if(req.isLogins(false)){
 				this.isLogin = true
+				this.getUserInfo()
 				await this.getEchartData()
 				await this.getStatisticData()
 				await this.getStoreData()
 				
 				this.init()
 				
-				this.getUserInfo()
 			}else{
 				this.isLogin = false
 			}

pages/machine/machine.vue

@@ -60,7 +60,7 @@
 				</view>
 				<scroll-view :scroll-y="true" @scrolltolower="loadLeftData" class="pop-content fflex">
 					<view :class="'pop-content-item '+(actMerchant.id==item.id?'pop-content-active':'')" v-for="(item,index) in merchantList" @click="changePop(item)">
-						<view class="pop-content-name">{{item.name}}</view>
+						<view class="pop-content-name tover">{{item.name}}</view>
 						<image class="pop-content-icon" src=""></image>
 					</view>
 				</scroll-view>

pages/machineLook/machineLook.vue

@@ -112,7 +112,7 @@
 				</view>
 				<scroll-view :scroll-y="true" @scrolltolower="loadLeftData" class="pop-content fflex">
 					<view :class="'pop-content-item '+(actMerchant.id==item.id?'pop-content-active':'')" v-for="(item,index) in merchantList" @click="changePop(item)">
-						<view class="pop-content-name">{{item.name}}</view>
+						<view class="pop-content-name tover">{{item.name}}</view>
 						<image class="pop-content-icon" src=""></image>
 					</view>
 				</scroll-view>

pages/operationData/operationData.vue

@@ -583,6 +583,7 @@
 				}
 				if(this.queryType==3){
 					api = '/admin/v2/store/pageData'
+					if(req.getStorage('userInfo').merchantId) queryParams.merchantId = req.getStorage('userInfo').merchantId
 				}
 				req.getRequest(
 					api,

pages/order/order.css

@@ -61,7 +61,7 @@
 
 /* 搜索 */
 .search-box{
-	padding: 30rpx 30rpx 0;
+	padding: 30rpx 0rpx 0;
 }
 .search-saoma{
 	width: 40rpx;

pages/order/order.vue

@@ -40,10 +40,10 @@
 			<view class="order-item" v-for="item,index in groupList" @click="jumpUrl('/pages/orderDetail/orderDetail?id='+item.id)">
 				<view class="ddflex order-item-header">
 					<view class="order-time">{{item.leaseTime}}</view>
-					<!-- <block>
-						<view v-if="index!=1" class="order-state">线下-待确认</view>
-						<view v-else class="order-state" style="color: #0FCB27;">微信-支付成功</view>
-					</block> -->
+					<block>
+						<view v-if="item.status==2"  class="order-state" style="color: #0FCB27;">已完成</view>
+						<view v-else class="order-state">未完成</view>
+					</block>
 				</view>
 				<view class="order-item-body">
 					<view class="order-item-content ddflex">
@@ -72,11 +72,11 @@
 					</view>
 					<view class="order-item-content ddflex">
 						<view class="order-item-content-label">租借时长</view>
-						<view class="order-item-content-data fflex tover">{{item.time?item.time+'小时':'/'}}</view>
+						<view class="order-item-content-data fflex tover">{{item.time?item.time+'小时':'-'}}</view>
 					</view>
 					<view class="order-item-content ddflex">
 						<view class="order-item-content-label">应付金额</view>
-						<view class="order-item-content-data fflex tover" style="color: #EB5C20;">{{(item.totalMoney||item.totalMoney===0||item.totalMoney==='0')?item.totalMoney+'元':'/'}}</view>
+						<view class="order-item-content-data fflex tover" style="color: #EB5C20;">{{(item.totalMoney||item.totalMoney===0||item.totalMoney==='0')?item.totalMoney+'元':'-'}}</view>
 					</view>
 				</view>
 				<!-- <view v-if="index!=1" class="order-btns ddflex">
@@ -101,7 +101,7 @@
 				</view>
 				<scroll-view :scroll-y="true" @scrolltolower="loadLeftData" class="pop-content fflex">
 					<view :class="'pop-content-item '+(actMerchant.id==item.id?'pop-content-active':'')" v-for="(item,index) in merchantList" @click="changePop(item)">
-						<view class="pop-content-name">{{item.name}}</view>
+						<view class="pop-content-name tover">{{item.name}}</view>
 						<image class="pop-content-icon" src=""></image>
 					</view>
 				</scroll-view>

pages/orderDetail/orderDetail.vue

@@ -14,7 +14,7 @@
 		<view class="info-box">
 			<view class="info-item ddflex">
 				<view class="info-item-label">使用时长</view>
-				<view class="info-item-data fflex tover">{{info.type==2?'一次':info.lease.time?info.lease.time+'分钟':'/'}}</view>
+				<view class="info-item-data fflex tover">{{info.type==2?'一次':info.lease.time?info.lease.time+'分钟':'-'}}</view>
 			</view>
 			<view class="info-item ddflex">
 				<view class="info-item-label">计费方式</view>
@@ -22,23 +22,23 @@
 			</view>
 			<view class="info-item ddflex">
 				<view class="info-item-label">使用费用</view>
-				<view class="info-item-data fflex tover">{{info.realMoney?'￥'+info.realMoney:'/'}}</view>
+				<view class="info-item-data fflex tover">{{info.realMoney?'￥'+info.realMoney:'-'}}</view>
 			</view>
 			<view class="info-item ddflex">
 				<view class="info-item-label">超时</view>
-				<view class="info-item-data fflex tover">{{info.timeoutTime?info.timeoutTime+'小时':'/'}}</view>
+				<view class="info-item-data fflex tover">{{info.timeoutTime?info.timeoutTime+'小时':'-'}}</view>
 			</view>
 			<view class="info-item ddflex">
 				<view class="info-item-label">超时费用</view>
-				<view class="info-item-data fflex tover">{{info.timeoutMoney?'￥'+info.timeoutMoney:'/'}}</view>
+				<view class="info-item-data fflex tover">{{info.timeoutMoney?'￥'+info.timeoutMoney:'-'}}</view>
 			</view>	
 			<view class="info-item ddflex">
 				<view class="info-item-label">订单总额</view>
-				<view class="info-item-data fflex tover act-color">{{info.totalMoney?'￥'+info.totalMoney:'/'}}</view>
+				<view class="info-item-data fflex tover act-color">{{info.totalMoney?'￥'+info.totalMoney:'-'}}</view>
 			</view>
 			<view class="info-item ddflex">
 				<view class="info-item-label">支付方式</view>
-				<view class="info-item-data fflex tover">{{info.payType==1?'钱包支付':info.payType==2?'微信支付':info.payType==3?'汇付':'/'}}</view>
+				<view class="info-item-data fflex tover">{{info.payType==1?'钱包支付':info.payType==2?'微信支付':info.payType==3?'汇付':'-'}}</view>
 			</view>
 			<view class="info-item dflex">
 				<view class="info-item-label">收费标准</view>
@@ -72,7 +72,7 @@
 			</view>
 			<view class="info-item ddflex mag-b50">
 				<view class="info-item-label">归还时间</view>
-				<view class="info-item-data fflex tover">{{info.lease.returnTime?info.lease.returnTime:'/'}}</view>
+				<view class="info-item-data fflex tover">{{info.lease.returnTime?info.lease.returnTime:'-'}}</view>
 			</view>
 			<view class="info-item ddflex">
 				<view class="info-item-label">电池ID</view>
@@ -96,15 +96,15 @@
 			</view>
 			<view class="info-item ddflex">
 				<view class="info-item-label">归还门店</view>
-				<view class="info-item-data fflex tover">{{info.lease.returnStoreName?info.lease.returnStoreName:'/'}}</view>
+				<view class="info-item-data fflex tover">{{info.lease.returnStoreName?info.lease.returnStoreName:'-'}}</view>
 			</view>
 			<view class="info-item dflex">
 				<view class="info-item-label">归还地点</view>
-				<view class="info-item-data fflex">{{info.lease.returnStoreAddress?info.lease.returnStoreAddress:'/'}}</view>
+				<view class="info-item-data fflex">{{info.lease.returnStoreAddress?info.lease.returnStoreAddress:'-'}}</view>
 			</view>
 			<view class="info-item ddflex mag-b50">
 				<view class="info-item-label">归还机柜</view>
-				<view class="info-item-data fflex tover">{{info.lease.returnDevId?info.lease.returnDevId:'/'}}</view>
+				<view class="info-item-data fflex tover">{{info.lease.returnDevId?info.lease.returnDevId:'-'}}</view>
 			</view>
 			<!-- <view class="info-item ddflex">
 				<view class="info-item-label">用户手机号</view>

pages/orderLook/orderLook.css

@@ -61,7 +61,7 @@
 
 /* 搜索 */
 .search-box{
-	padding: 30rpx 30rpx 0;
+	padding: 30rpx 0rpx 0;
 }
 .search-saoma{
 	width: 40rpx;

pages/orderLook/orderLook.vue

@@ -104,7 +104,7 @@
 				</view>
 				<scroll-view :scroll-y="true" @scrolltolower="loadLeftData" class="pop-content fflex">
 					<view :class="'pop-content-item '+(actMerchant.id==item.id?'pop-content-active':'')" v-for="(item,index) in merchantList" @click="changePop(item)">
-						<view class="pop-content-name">{{item.name}}</view>
+						<view class="pop-content-name tover">{{item.name}}</view>
 						<image class="pop-content-icon" src=""></image>
 					</view>
 				</scroll-view>

warning/orderAlarm/orderAlarm.vue

@@ -20,9 +20,9 @@
 			<view class="order-item" v-for="item,index in groupList"
 				@click="jumpUrl('/pages/orderDetail/orderDetail?id='+item)">
 				<view class="ddflex order-item-header">
-					<view class="order-time">类型：{{item.exceptionCause}}</view>
+					<view class="order-time">类型：{{item.type==2?'按次计费':item.type==3?'按时计费':''}}</view>
 					<block>
-						<view v-if="item.isException==0" class="order-state">待处理</view>
+						<view v-if="item.isException==2" class="order-state">待处理</view>
 						<view v-else class="order-state" style="color: #0FCB27;border: 2rpx solid #0FCB27;">已处理</view>
 					</block>
 				</view>
@@ -36,24 +36,24 @@
 						<view class="order-item-content-data fflex tover">
 							{{item.finishStatus==0?'未结束':item.finishStatus==1?'自动结束':'人工结束'}}</view>
 					</view>
-					<view class="order-item-content ddflex">
+					<!-- <view class="order-item-content ddflex">
 						<view class="order-item-content-label">机柜编号：</view>
 						<view class="order-item-content-data fflex tover">{{item.leaseDevId}}</view>
-					</view>
+					</view> -->
 					<view class="order-item-content ddflex">
 						<view class="order-item-content-label">电池编号：</view>
 						<view class="order-item-content-data fflex tover">{{item.batteryId}}</view>
 					</view>
 					<view class="order-item-content ddflex">
 						<view class="order-item-content-label">描述：</view>
-						<view class="order-item-content-data fflex tover">{{item.exceptionCause}}</view>
+						<view class="order-item-content-data fflex tover">{{item.exceptionCause?item.exceptionCause:'无'}}</view>
 					</view>
 				</view>
 				<view v-if="item.isException!==0" class="order-btns ddflex">
 					<view class="order-btn-time">2022-12-31 17:16:37</view>
 					<view style="justify-content: flex-end;" class="ddflex">
-						<view class="order-btn" v-if="item.status>1&&item.refundStatus==0" @click.stop="openPop(item,'退款')">退款</view>
-						<view class="order-btn" v-else @click.stop="openPop(item,'结算')">结算</view>
+						<view class="order-btn" v-if="item.status==3&&item.refundStatus==0" @click.stop="openPop(item,'退款')">退款</view>
+						<view class="order-btn" v-if="item.status==0||item.status==1" @click.stop="openPop(item,'结算')">结算</view>
 						<view class="order-btn" @click.stop="finishOrder">处理</view>
 					</view>
 				</view>

warning/userAlarm/userAlarm.vue

@@ -12,11 +12,19 @@
 			<view class="order-item-body">
 				<view class="order-item-content ddflex">
 					<view class="order-item-content-label">机柜编号</view>
-					<view class="order-item-content-data fflex tover">{{item.devId?item.devId:'/'}}</view>
+					<view class="order-item-content-data fflex tover">{{item.devId?item.devId:'-'}}</view>
+				</view>
+				<view class="order-item-content ddflex">
+					<view class="order-item-content-label">机柜名</view>
+					<view class="order-item-content-data fflex tover">{{item.storeName?item.storeName:'未知'}}</view>
+				</view>
+				<view class="order-item-content dflex">
+					<view class="order-item-content-label">机柜地址</view>
+					<view class="order-item-content-data fflex">{{item.storeAddress?item.storeAddress:'未知'}}</view>
 				</view>
 				<view class="order-item-content ddflex">
 					<view class="order-item-content-label">电池ID</view>
-					<view class="order-item-content-data fflex tover">{{item.batteryId?item.batteryId:'/'}}</view>
+					<view class="order-item-content-data fflex tover">{{item.batteryId?item.batteryId:'-'}}</view>
 				</view>
 				<view class="order-item-content ddflex">
 					<view class="order-item-content-label">报障问题</view>