Merge branch 'master' of http://47.92.161.104:10080/zkx/JP-ChargeTeam51 into master

iconfont/iconfont.css

@@ -1,225 +1,225 @@
- @font-face {
-  font-family: 'iconfont';  /* project id 3394761 */
-src: url('?#iefix') format('embedded-opentype'),
- url('http://at.alicdn.com/t/font_3394761_66t9qhyeaj.woff2?t=1653371047948') format('woff2'),
-       url('http://at.alicdn.com/t/font_3394761_66t9qhyeaj.woff?t=1653371047948') format('woff'),
-       url('http://at.alicdn.com/t/font_3394761_66t9qhyeaj.ttf?t=1653371047948') format('truetype'),
-url('#iconfont') format('svg');
-}
-
-
-.iconfont {
-	font-family: "iconfont" !important;
-	font-size: 16px;
-	font-style: normal;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-}
-
-.icon-chongzhi:before {
-	content: "\e633";
-}
-
-.icon-arrow-right-s-line:before {
-	content: "\e600";
-}
-
-.icon-arrow-drop-right-line:before {
-	content: "\e601";
-}
-
-.icon-arrow-left-s-line:before {
-	content: "\e602";
-}
-
-.icon-arrow-drop-up-fill:before {
-	content: "\e603";
-}
-
-.icon-arrow-drop-up-line:before {
-	content: "\e604";
-}
-
-.icon-arrow-up-s-fill:before {
-	content: "\e605";
-}
-
-.icon-charging-pile-fill:before {
-	content: "\e606";
-}
-
-.icon-arrow-up-s-line:before {
-	content: "\e607";
-}
-
-.icon-camera-fill:before {
-	content: "\e608";
-}
-
-.icon-close-line:before {
-	content: "\e609";
-}
-
-.icon-charging-pile-line:before {
-	content: "\e60a";
-}
-
-.icon-close-circle-fill:before {
-	content: "\e60b";
-}
-
-.icon-compass-3-fill:before {
-	content: "\e60c";
-}
-
-.icon-customer-service-2-line:before {
-	content: "\e60d";
-}
-
-.icon-compass-discover-line:before {
-	content: "\e60e";
-}
-
-.icon-error-warning-line:before {
-	content: "\e60f";
-}
-
-.icon-home-3-fill:before {
-	content: "\e610";
-}
-
-.icon-feedback-fill:before {
-	content: "\e611";
-}
-
-.icon-eye-fill:before {
-	content: "\e612";
-}
-
-.icon-list-check-2:before {
-	content: "\e613";
-}
-
-.icon-parking-box-fill:before {
-	content: "\e614";
-}
+@font-face {
+ 	font-family: 'iconfont';
+ 	/* project id 3394761 */
+ 	src:
+ 		url('http://at.alicdn.com/t/font_3394761_gttmqpiz6ov.woff2?t=1653637499858') format('woff2'),
+ 		url('http://at.alicdn.com/t/font_3394761_gttmqpiz6ov.woff?t=1653637499858') format('woff'),
+ 		url('http://at.alicdn.com/t/font_3394761_gttmqpiz6ov.ttf?t=1653637499858') format('truetype');
+ }
+
+
+ .iconfont {
+ 	font-family: "iconfont" !important;
+ 	font-size: 16px;
+ 	font-style: normal;
+ 	-webkit-font-smoothing: antialiased;
+ 	-moz-osx-font-smoothing: grayscale;
+ }
+
+ .icon-chongzhi:before {
+ 	content: "\e633";
+ }
+
+ .icon-arrow-right-s-line:before {
+ 	content: "\e600";
+ }
+
+ .icon-arrow-drop-right-line:before {
+ 	content: "\e601";
+ }
+
+ .icon-arrow-left-s-line:before {
+ 	content: "\e602";
+ }
+
+ .icon-arrow-drop-up-fill:before {
+ 	content: "\e603";
+ }
+
+ .icon-arrow-drop-up-line:before {
+ 	content: "\e604";
+ }
+
+ .icon-arrow-up-s-fill:before {
+ 	content: "\e605";
+ }
+
+ .icon-charging-pile-fill:before {
+ 	content: "\e606";
+ }
+
+ .icon-arrow-up-s-line:before {
+ 	content: "\e607";
+ }
+
+ .icon-camera-fill:before {
+ 	content: "\e608";
+ }
+
+ .icon-close-line:before {
+ 	content: "\e609";
+ }
+
+ .icon-charging-pile-line:before {
+ 	content: "\e60a";
+ }
+
+ .icon-close-circle-fill:before {
+ 	content: "\e60b";
+ }
+
+ .icon-compass-3-fill:before {
+ 	content: "\e60c";
+ }
+
+ .icon-customer-service-2-line:before {
+ 	content: "\e60d";
+ }
+
+ .icon-compass-discover-line:before {
+ 	content: "\e60e";
+ }
+
+ .icon-error-warning-line:before {
+ 	content: "\e60f";
+ }
+
+ .icon-home-3-fill:before {
+ 	content: "\e610";
+ }
+
+ .icon-feedback-fill:before {
+ 	content: "\e611";
+ }
+
+ .icon-eye-fill:before {
+ 	content: "\e612";
+ }
+
+ .icon-list-check-2:before {
+ 	content: "\e613";
+ }
+
+ .icon-parking-box-fill:before {
+ 	content: "\e614";
+ }
 
-.icon-navigation-fill:before {
-	content: "\e615";
-}
+ .icon-navigation-fill:before {
+ 	content: "\e615";
+ }
 
-.icon-customer-service-fill:before {
-	content: "\e616";
-}
+ .icon-customer-service-fill:before {
+ 	content: "\e616";
+ }
 
-.icon-information-fill:before {
-	content: "\e617";
-}
+ .icon-information-fill:before {
+ 	content: "\e617";
+ }
 
-.icon-plug-line:before {
-	content: "\e618";
-}
+ .icon-plug-line:before {
+ 	content: "\e618";
+ }
 
-.icon-home-3-line:before {
-	content: "\e619";
-}
+ .icon-home-3-line:before {
+ 	content: "\e619";
+ }
 
-.icon-qr-scan-2-line:before {
-	content: "\e61a";
-}
+ .icon-qr-scan-2-line:before {
+ 	content: "\e61a";
+ }
 
-.icon-qr-scan-line:before {
-	content: "\e61b";
-}
+ .icon-qr-scan-line:before {
+ 	content: "\e61b";
+ }
 
-.icon-parking-box-line:before {
-	content: "\e61c";
-}
+ .icon-parking-box-line:before {
+ 	content: "\e61c";
+ }
 
-.icon-question-line:before {
-	content: "\e61d";
-}
+ .icon-question-line:before {
+ 	content: "\e61d";
+ }
 
-.icon-question-fill:before {
-	content: "\e61e";
-}
+ .icon-question-fill:before {
+ 	content: "\e61e";
+ }
 
-.icon-search-2-line:before {
-	content: "\e61f";
-}
+ .icon-search-2-line:before {
+ 	content: "\e61f";
+ }
 
-.icon-road-map-fill:before {
-	content: "\e620";
-}
+ .icon-road-map-fill:before {
+ 	content: "\e620";
+ }
 
-.icon-store-3-line:before {
-	content: "\e621";
-}
+ .icon-store-3-line:before {
+ 	content: "\e621";
+ }
 
-.icon-road-map-line:before {
-	content: "\e622";
-}
+ .icon-road-map-line:before {
+ 	content: "\e622";
+ }
 
-.icon-settings-4-fill:before {
-	content: "\e623";
-}
+ .icon-settings-4-fill:before {
+ 	content: "\e623";
+ }
 
-.icon-user-2-fill:before {
-	content: "\e624";
-}
+ .icon-user-2-fill:before {
+ 	content: "\e624";
+ }
 
-.icon-todo-line:before {
-	content: "\e625";
-}
+ .icon-todo-line:before {
+ 	content: "\e625";
+ }
 
-.icon-todo-fill:before {
-	content: "\e626";
-}
+ .icon-todo-fill:before {
+ 	content: "\e626";
+ }
 
-.icon-user-5-line:before {
-	content: "\e627";
-}
+ .icon-user-5-line:before {
+ 	content: "\e627";
+ }
 
-.icon-user-5-fill:before {
-	content: "\e628";
-}
+ .icon-user-5-fill:before {
+ 	content: "\e628";
+ }
 
-.icon-wallet-3-line:before {
-	content: "\e629";
-}
+ .icon-wallet-3-line:before {
+ 	content: "\e629";
+ }
 
-.icon-arrow-drop-down-fill:before {
-	content: "\e62a";
-}
+ .icon-arrow-drop-down-fill:before {
+ 	content: "\e62a";
+ }
 
-.icon-arrow-down-s-fill:before {
-	content: "\e62b";
-}
+ .icon-arrow-down-s-fill:before {
+ 	content: "\e62b";
+ }
 
-.icon-arrow-down-s-line:before {
-	content: "\e62c";
-}
+ .icon-arrow-down-s-line:before {
+ 	content: "\e62c";
+ }
 
-.icon-wechat-pay-fill:before {
-	content: "\e62d";
-}
+ .icon-wechat-pay-fill:before {
+ 	content: "\e62d";
+ }
 
-.icon-arrow-drop-down-line:before {
-	content: "\e62e";
-}
+ .icon-arrow-drop-down-line:before {
+ 	content: "\e62e";
+ }
 
-.icon-arrow-drop-left-fill:before {
-	content: "\e62f";
-}
+ .icon-arrow-drop-left-fill:before {
+ 	content: "\e62f";
+ }
 
-.icon-alipay-fill:before {
-	content: "\e630";
-}
+ .icon-alipay-fill:before {
+ 	content: "\e630";
+ }
 
-.icon-arrow-drop-left-line:before {
-	content: "\e631";
-}
+ .icon-arrow-drop-left-line:before {
+ 	content: "\e631";
+ }
 
-.icon-arrow-drop-right-fill:before {
-	content: "\e632";
-}
+ .icon-arrow-drop-right-fill:before {
+ 	content: "\e632";
+ }

pages/article/newsNotice.vue

@@ -17,7 +17,7 @@
 			<view class="news-content" v-for="(item,index) in newsList" :key="item.id" @click="gotoUrl('pages/article/articleDetails?id=' + item.id)">
 				<view class="content-text">
 					{{item.title}}
-					<view class="news-time">{{item.createTime.slice(5)}}</view>
+					<view class="news-time">{{item.createTime ? item.createTime.slice(5,16) : ''}}</view>
 				</view>
 				<view class="content-img">
 					<img :src="item.pic ? item.pic : 'static/img/image_default.png'" alt="">
@@ -180,9 +180,8 @@
 			;
 	
 			.content-img {
-				width: 100px;
-				height: 80px;
-	            background-color: #777777;
+				width: 48.74%;
+				height: 100%;
 				border-radius: 4px;
 				overflow: hidden;
 	
@@ -193,9 +192,9 @@
 			}
 	
 			.news-time {
-				margin-top: 12px;
+				margin-top: 20%;
 				color: #999999;
-				width: 80px;
+				width: 100px;
 				height: 20px;
 				font-size: 14px;
 			}

pages/index/index.vue

@@ -56,7 +56,6 @@
 				<img src="static/img/Frame 198 (1).png" alt="">
 			</view>
 			<view class="text"> 
-				
 				<view class="station-title">
 					<text class="title-left" v-if="stationData.type == '1'" style="background-color: #9D9FFF;">快充</text>
 					<text class="title-left" v-if="stationData.type == '2'" style="background-color: #00B962;">慢充</text>
@@ -593,6 +592,7 @@
 				.price-left {
 					width: 40px;
 					height: 20px;
+					line-height: 20px;
 					color: rgba(255, 98, 0, 100);
 					font-size: 20px;
 					text-align: left;
@@ -601,7 +601,7 @@
 
 				.price-right {
 					height: 20px;
-					line-height: 20px;
+					line-height: 14px;
 					margin-left: 2px;
 					margin-top: 3px;
 					color: rgba(102, 102, 102, 100);
@@ -853,20 +853,19 @@
 			;
 
 			.content-img {
-				width: 26.7%;
-				height: 80px;
-				background-color: #777777;
+				width: 40.57%;
+				height: 100%;
 				border-radius: 4px;
 				overflow: hidden;
 
 				img {
 					width: 100%;
-					height: 100%;
+					height: 80%;
 				}
 			}
 
 			.news-time {
-				margin-top: 12px;
+				margin-top: 26%;
 				color: #999999;
 				width: 80px;
 				height: 20px;

pages/searchPile/searchPile.vue

@@ -1,13 +1,13 @@
 <template>
 	<view>
-		<u-navbar :is-back="false" :height="nav_height" style="background-color: bisque;">
+		<u-navbar :is-back="false" height="88" style="background-color: bisque;">
 			<view style="display: flex;flex-direction: column; width: 100%;height: 100%;">
 				<view style="display: flex;flex-direction: row; height: 100%; align-items: center;margin-top:0rpx;padding-top: 0rpx;padding-bottom: 20rpx;">
 					<view style="margin-left:20rpx;width: 160rpx;">
 						<uni-combox ref="city" :border="false" v-model="area" :candidates="cities" @updateModel='updateCity' @updateSelector="updateCitySelector"></uni-combox> 
  					</view>
 					<view style="margin-left: 20rpx;margin-right: 20rpx; flex:1" >
-						<u-search height="88" placeholder="搜索站点名称" v-model="keyword" :showAction="false"  @focus="navigate"></u-search></view>
+						<u-search placeholder="搜索站点名称" v-model="keyword" :showAction="false"  @focus="navigate"></u-search></view>
 					<view style="margin-right: 20rpx;" v-show="viewMode" @click="listMode">
 						<text class="iconfont">&#xe613;</text> <text class="list">列表</text>
 <!--						<u-icon name="list-dot" size="26" color="#c0c4cc"></u-icon>
@@ -179,7 +179,7 @@
 				<view>
 					<Chargermap @onMoveStart="moveStart"   @onMoveEnd="moveEnd" ref="amap" @onClicked="onClicked" @onload="mapdown" @clickMap="clickMap"></Chargermap>
 					<!--@location="location"-->
-					<u-image style='position:absolute;z-index:1023;right:40rpx;bottom:520rpx;' src="@/static/img/location.png" width="60rpx" height="60rpx" @click="setCenter"></u-image>
+					<u-image style='position:absolute;z-index:1023;right:20px;bottom:260px;' src="@/static/img/location.png" width="30px" height="30px" @click="setCenter"></u-image>
 					 
 				</view>
 				<view v-if="stationsmap.length>0" class="chargerCard" style="border-radius: 20rpx;" > 
@@ -278,7 +278,6 @@ export default {
 	},
 	data() {
 		return { 
-			nav_height:88,
 			showCity:false,
 			showType:false,
 			showRadius:false,
@@ -344,12 +343,6 @@ export default {
 	},
 	onLoad(op) {
 		_self = this;
-		
-		//var rpx = 40/(uni.upx2px(100)/100);
-		// 验证上面rpx的值
-		var px = uni.upx2px(176); 
-		this.nav_height = px;
-		
 		console.log('longitude0  ' + _self.longitude);
 		console.log('latitude0  ' + _self.latitude);
 		if (op != null) {
@@ -1140,7 +1133,7 @@ export default {
 	text-align: center;
 	justify-content: center;
 	align-items: center;
-	/* width: 250rpx; */
+	width: 250rpx;
 	display: flex;
 	flex-direction: row;
 }

pages/searchPile/searchPileMap.vue

@@ -441,18 +441,14 @@
 	}
 	.position{
 		color: #1677ff;
-		font-size: 14px
+		font-size: 16px
 	}
 	.position-box{
 		position:absolute;
 		top: 341px;
 		right: 118px;
 		width: 16px;
-		height: 16px;
-		background-color: rgba(22, 119, 255, 100);
-		text-align: center;
-		box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.4);
-		border: 2px solid rgba(255, 255, 255, 100);
-		border-radius: 999px;
+	
+		
 	}
 </style>

pages/user/finance/balance.vue

@@ -12,7 +12,10 @@
 						<font>总金额(元)</font><u-icon name="question-line" custom-prefix="custom-icon" color="#fff" size="32" @click="show=true"></u-icon>
 					</view>
 					<view>
-						<u-modal v-model="show" :content="content" :confirm-text="confirmText">
+						<u-modal v-model="show" :confirm-text="confirmText" confirm-color="#00B962">
+							<view class="slot-content">
+								<rich-text :nodes="content"></rich-text>
+							</view>
 						</u-modal>
 					</view>
 					<view class="balanceCard-main">
@@ -65,7 +68,7 @@
 				userId: '',
 				show: false,
 				confirmText: '知道了',
-				content: '总余额=可用金额+冻结金额。使用预付费充电时，在充电过程中会冻结部分金额，充电完成后将剩余金额返还至余额账户，每笔预充金额的冻结时间不超过96小时。',
+				content: `总余额=可用金额+冻结金额。使用预付费充电时，在充电过程中会冻结部分金额，充电完成后将剩余金额返还至余额账户，每笔预充金额的冻结时间不超过96小时。`,
 				personAccount: {},
 				accountList: [],
 			}
@@ -137,6 +140,14 @@
 </script>
 
 <style lang="scss" scoped>
+	.slot-content {
+		font-size: 28rpx;
+		color: $u-content-color;
+		padding-left: 30rpx;
+		padding-right: 30rpx;
+		padding-top: 20px;
+		padding-bottom: 20px;
+	}
 	.slot-wrap{
 		flex: 1;
 	}

pages/user/finance/recharge.vue

@@ -52,10 +52,17 @@
 			<img id="qrcode" style="display: none;" >
 					
 			<view class="recharge-btn">
-				<u-checkbox-group>
-					<u-checkbox active-color="green" v-model="checked" shape="circle" @change="checkboxChange()">我已阅读并同意《充值协议》</u-checkbox>
-				</u-checkbox-group>
-				<u-button class="success-btn" shape="circle" type="success" @click="rechargeNow">
+				<view>
+					<u-checkbox-group>
+						<u-checkbox active-color="green" v-model="checked" shape="circle" @change="checkboxChange()"></u-checkbox>
+					</u-checkbox-group>
+					我已阅读并同意<span @click="gotoUrl('pages/article/details?code=CZXY')" style="color:#00B962" >《充值协议》</span>
+					
+				</view>
+				
+				<u-button
+				 :class="checked?'success-btn':'nosuccess-btn'"
+				shape="circle" type="success" @click="rechargeNow">
 					<span>立即充值</span>
 				</u-button>
 			</view>
@@ -263,6 +270,12 @@
 				})
 			},
 			rechargeNow() {
+				if(!this.checked){
+					uni.showToast({
+						title:"请同意《充值协议》后进行充值"
+					})
+					return
+				}
 				uni.showLoading({
 					title: "加载中",
 					mask: true,
@@ -404,4 +417,12 @@
 		border-color: #00B962 !important;
 		color: #fff !important;
 	}
+	.nosuccess-btn {
+		margin-top: 10px;
+		background-color: #a7dbc2 !important;
+	
+		flex: 1;
+		border-color: #a7dbc2 !important;
+		color: #fff !important;
+	}
 </style>