xhj 3 年之前
父節點
當前提交
74bc4b3dc8

+ 17 - 12
mine/page/page.vue

@@ -4,6 +4,7 @@
 		<view class="title" v-if="title&&!isHetong">{{ title }}</view>
 		<view class="" style="padding: 30rpx 30rpx 50rpx;" v-if="isHetong">
 			<rich-text :nodes="params"></rich-text>
+			<image style="width: 500rpx;height: 300rpx;" mode="aspectFit" :src="signUrl"></image>
 		</view>
 		<view class="content" v-else>
 			<rich-text :nodes="params"></rich-text>
@@ -25,7 +26,8 @@
 				isYinsi: false, //隐私政策
 				isHetong: false, //合同
 				params: '',
-				hetongId: null
+				hetongId: null,
+				signUrl:null
 			};
 		},
 
@@ -70,24 +72,26 @@
 						data.content = data.content.replace(/{partyb}/, data.partyb);
 						data.content = data.content.replace(/{card_no}/, data.partybCardNo);
 						data.content = data.content.replace(/{partyb_mobile}/, data.partybPhone);
-						data.leaseStart = data.leaseStart.split('-');
-						data.content = data.content.replace(/{hire_begin}/, data.leaseStart[0] + '年' + data
-							.leaseStart[1] + '月' + data.leaseStart[2]);
+						if(data.leaseStart){
+							data.leaseStart = data.leaseStart.split('-');
+						}
+						data.content = data.content.replace(/{hire_begin}/, data.leaseStart ? data.leaseStart[0] + '年' + data
+							.leaseStart[1] + '月' + data.leaseStart[2] : '____');
 						if (data.leaseEnd) {
 							data.leaseEnd = data.leaseEnd.split('-');
 						}
+						let time = '';
 						data.content = data.content.replace(/{hire_end}/, data.leaseEnd ? data.leaseEnd[0] + '年' +
 							data.leaseEnd[1] + '月' + data.leaseEnd[2] : '____');
 						if (data.leaseTime) {
 							data.leaseTime = this.getTime(data.leaseTime);
-						}
-						let time = '';
-						if (data.leaseTime[0] == 0 && data.leaseTime[1] == 0) time = '01分钟';
-						if (data.leaseTime[0] > 0) {
-							time += data.leaseTime[0] + '小时';
-						}
-						if (data.leaseTime[1] >= 0) {
-							time += data.leaseTime[1] + '分钟';
+							if (data.leaseTime[0] == 0 && data.leaseTime[1] == 0) time = '01分钟';
+							if (data.leaseTime[0] > 0) {
+								time += data.leaseTime[0] + '小时';
+							}
+							if (data.leaseTime[1] >= 0) {
+								time += data.leaseTime[1] + '分钟';
+							}
 						}
 						data.content = data.content.replace(/{hire_duration}/, time ? time : '____');
 						data.content = data.content.replace(/{battery_model}/, data.batteryModel);
@@ -96,6 +100,7 @@
 						data.content = data.content.replace(/{hire_price}/, data.leaseMoney);
 						data.content = data.content.replace(/{order_sign}/, '');
 						that.params = data.content;
+						that.signUrl = data.signUrl;
 					});
 				}
 			},

+ 1 - 1
pages/cell/cell.vue

@@ -3,7 +3,7 @@
 		<view class="top-box">
 			<view class="top-title" :style="'height: '+ systems.navigationHeight + 'rpx;padding-top:' + systems.ktxStatusHeight + 'rpx;'+'line-height: '+ systems.navigationHeight + 'rpx;'">
 				<view v-if="!userInfo.storeId&&actMerchant" @click="showPop=true" class="ddflex" >
-					<view>{{actMerchant.name}}</view>
+					<view class="tover" style="max-width: 400rpx;">{{actMerchant.name}}</view>
 					<image class="dow-ssicon" src="../../static/pages/images/dow-ssicon.png"></image>
 				</view>
 				<view v-else>电池</view>

+ 1 - 1
pages/machine/machine.vue

@@ -3,7 +3,7 @@
 		<view class="top-box">
 			<view class="top-title" :style="'height: '+ systems.navigationHeight + 'rpx;padding-top:' + systems.ktxStatusHeight + 'rpx;'+'line-height: '+ systems.navigationHeight + 'rpx;'">
 				<view v-if="!userInfo.storeId&&actMerchant" @click="showPop=true" class="ddflex">
-					<view>{{actMerchant.name}}</view>
+					<view class="tover" style="max-width: 400rpx;">{{actMerchant.name}}</view>
 					<image class="dow-ssicon" src="../../static/pages/images/dow-ssicon.png"></image>
 				</view>
 				<view v-else>机柜</view>

+ 1 - 1
pages/machineLook/machineLook.vue

@@ -6,7 +6,7 @@
 					<image style="width: 48rpx;height: 48rpx;margin: auto;margin-right: 20rpx;" src="../../static/pages/images/back.png"></image>
 				</view>
 				<view v-if="!storeId&&actMerchant" @click="showPop=true" class="ddflex fflex" :style="'height: '+ systems.navigationHeight + 'rpx;padding-top:' + systems.ktxStatusHeight + 'rpx;'+'line-height: '+ systems.navigationHeight + 'rpx;'">
-					<view>{{actMerchant.name}}</view>
+					<view class="tover" style="max-width: 400rpx;">{{actMerchant.name}}</view>
 					<image class="dow-ssicon" src="../../static/pages/images/dow-ssicon.png"></image>
 				</view>
 				<view v-else :style="'height: '+ systems.navigationHeight + 'rpx;padding-top:' + systems.ktxStatusHeight + 'rpx;'+'line-height: '+ systems.navigationHeight + 'rpx;'">设备</view>

+ 2 - 2
pages/order/order.vue

@@ -3,7 +3,7 @@
 		<view class="top-box">
 			<view class="top-title" :style="'height: '+ systems.navigationHeight + 'rpx;padding-top:' + systems.ktxStatusHeight + 'rpx;'+'line-height: '+ systems.navigationHeight + 'rpx;'">
 				<view v-if="!userInfo.storeId&&actMerchant" @click="showPop=true" class="ddflex">
-					<view>{{actMerchant.name}}</view>
+					<view class="tover" style="max-width: 400rpx;">{{actMerchant.name}}</view>
 					<image class="dow-ssicon" src="../../static/pages/images/dow-ssicon.png"></image>
 				</view>
 				<view v-else>订单</view>
@@ -72,7 +72,7 @@
 					</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>

+ 2 - 0
pages/orderDetail/orderDetail.css

@@ -17,6 +17,8 @@ page{
 }
 .symbol{
 	font-size: 38rpx;
+	line-height: 60rpx;
+    margin-top: 50rpx;
 }
 .money{
 	line-height: 100rpx;

+ 1 - 1
pages/orderDetail/orderDetail.vue

@@ -26,7 +26,7 @@
 			</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>

+ 9 - 9
pages/orderLook/orderLook.vue

@@ -6,7 +6,7 @@
 					<image style="width: 48rpx;height: 48rpx;margin: auto;margin-right: 20rpx;" src="../../static/pages/images/back.png"></image>
 				</view>
 				<view v-if="!storeId&&actMerchant" @click="showPop=true" class="ddflex" :style="'height: '+ systems.navigationHeight + 'rpx;padding-top:' + systems.ktxStatusHeight + 'rpx;'+'line-height: '+ systems.navigationHeight + 'rpx;'">
-					<view>{{actMerchant.name}}</view>
+					<view class="tover" style="max-width: 400rpx;">{{actMerchant.name}}</view>
 					<image class="dow-ssicon" src="../../static/pages/images/dow-ssicon.png"></image>
 				</view>
 				<view v-else :style="'height: '+ systems.navigationHeight + 'rpx;padding-top:' + systems.ktxStatusHeight + 'rpx;'+'line-height: '+ systems.navigationHeight + 'rpx;'">订单</view>
@@ -43,10 +43,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">
@@ -65,21 +65,21 @@
 						<view class="order-item-content-label">电池ID</view>
 						<view class="order-item-content-data fflex tover">{{item.batteryId}}</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">60V 30Ah</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.realName}} {{item.phone}}</view>
 					</view>
 					<view class="order-item-content ddflex">
 						<view class="order-item-content-label">租借时长</view>
-						<view class="order-item-content-data fflex tover">{{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.payMoney}}元</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">

二進制
static/pages/images/play.png


+ 13 - 0
warning/userAlarm/userAlarm.css

@@ -49,10 +49,23 @@
 	border-radius: 0rpx 0rpx 0rpx 0rpx;
 	opacity: 1;
 	margin-right: calc((100% - (3 * 193rpx)) / 2);
+	margin-bottom: 20rpx;
 }
 .images:nth-child(3n){
 	margin-right: 0;
 }
+.video{
+	width: 100%;height: 300rpx;border-radius: 10rpx;overflow: hidden;
+	position: relative;
+}
+.play-icon{
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%,-50%);
+	width: 100rpx;
+	height: 100rpx;
+}
 .order-item-content{
 	margin: 20rpx 0;
 	justify-content: space-between;

+ 18 - 2
warning/userAlarm/userAlarm.vue

@@ -37,7 +37,11 @@
 					{{item.content?item.content:'暂无'}}
 				</view>
 				<view class="images-box ddflex">
-					<image class="images" v-for="it in imageList" :src="it"></image>
+					<image class="images" v-for="it,idx in item.imageList" :src="it" mode="aspectFill" @click="previewImg(item.imageList,idx)"></image>
+					<view class="video" v-if="false">
+						<image style="width: 100%;height: 100%;"></image>
+						<image class="play-icon" src="../../static/images/play.png"></image>
+					</view>
 				</view>
 			</view>
 			<view v-if="item.status!=1" class="order-btns ddflex">
@@ -140,6 +144,11 @@
 					queryParams,
 					data => {
 						if (data != null && data.list.length > 0) {
+							data.list.map(item=>{
+								if(item.imageList.length>0){
+									item.imageList = item.imageList.filter(item => item)
+								}
+							})
 							if (!isPage) {
 								this.groupList = data.list
 							} else {
@@ -170,7 +179,14 @@
 						}
 					}
 				})
-			}
+			},
+			previewImg(list,index) {
+				uni.previewImage({
+					current: index,
+					// 当前显示图片的http链接
+					urls: list
+				});
+			},
 		},
 		mounted() {
 		},