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

assets/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
-  font-family: "custom-icon"; /* Project id 3394761 */
-  src: url('//at.alicdn.com/t/font_3394761_w1c95e1w8al.woff2?t=1652514847529') format('woff2'),
-       url('//at.alicdn.com/t/font_3394761_w1c95e1w8al.woff?t=1652514847529') format('woff'),
-       url('//at.alicdn.com/t/font_3394761_w1c95e1w8al.ttf?t=1652514847529') format('truetype');
+  font-family: 'custom-icon';  /* Project id 3394761 */
+  src: url('//at.alicdn.com/t/font_3394761_66t9qhyeaj.woff2?t=1653371047948') format('woff2'),
+       url('//at.alicdn.com/t/font_3394761_66t9qhyeaj.woff?t=1653371047948') format('woff'),
+       url('//at.alicdn.com/t/font_3394761_66t9qhyeaj.ttf?t=1653371047948') format('truetype');
 }
 
 .custom-icon {

iconfont/iconfont.css

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

pages/article/articleDetails.vue

@@ -13,9 +13,7 @@
 					<text class="iconfont">&#xe612;</text><text class="num">{{newsDetail.readNum}}</text>
 				</view>
 			</view>
-			<view class="news-content">
-				{{newsDetail.content}}
-			</view>
+			<view class="news-content" v-html="newsDetail.content"></view>
 		</view>
 	</view>
 </template>

pages/index/index.vue

@@ -463,8 +463,8 @@
 
 	// 选项列表
 	.option-list {
+		width: 91.4%;
 		padding-top: 18px;
-		width: 343px;
 		height: 100px;
 		line-height: 20px;
 		border-radius: 8px;
@@ -498,7 +498,7 @@
 
 	// 站点
 	.station {
-		// width: 343px;
+		width:91.4%;
 		height: 120px;
 		margin-top: 70px;
 

pages/searchPile/searchPile.vue

@@ -243,6 +243,9 @@
 
 			</view>
 		</view>
+		<view class="position-box">
+			<view class="iconfont position" >&#xe634;</view>
+		</view>
 		<Tabbar :current="1"></Tabbar> 
 	</view>
 </template>
@@ -1249,4 +1252,22 @@ export default {
 	.distance-font {
 		font-size: 16px
 	}
+	
+	.position{
+		color: #1677ff;
+		font-size: 14px
+	}
+	.position-box{
+		position:absolute;
+		top: 341px;
+		right: 118px;
+		width: 16px;
+		height: 16px;
+		/* line-height: 20px; */
+		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/searchPile/searchPileMap.vue

@@ -77,9 +77,9 @@
 					<text class="iconfont distance-font">&#xe615;</text><text class="text">1.2公里 3分钟</text>
 				</view>
 			</view>
-			<view class="img-box"><img src="static/img/定位.png" alt=""></view>
+			<view class="img-box"><img src="/static/img/location.png" alt=""></view>
 		</view>
-
+         <view class="iconfont position" >&#xe634;</view>
 		<u-tabbar v-model="current" :list="tabbarList" active-color="#009143"></u-tabbar>
 	</view>
 </template>
@@ -430,7 +430,16 @@
 		top: 377px;
 		right: 16px;
 		img{
+			width: 24px;
+			height: 24px;
 			vertical-align:middle;
 		}
 	}
+	.position{
+		position:fixed;
+		top: 341px;
+		right: 118px;
+		font-size: 16px;
+		color: #1677ff;
+	}
 </style>

pages/searchPile/stationAndPile/stationDetails.vue

@@ -635,15 +635,17 @@
 		left: 0;
 		bottom: 0;
 		padding: 12px 16px;
+		display: flex;
+		justify-content: space-between;
 		.button1{
-			width: 165px;
+			width: 44%;
 			height: 32px;
 			border: 1px solid rgba(0, 185, 98, 100);
 			color: rgba(0, 185, 98, 100);
 			font-size: 14px;
 		}
 		.button2{
-			width: 165px;
+			width: 44%;
 			height: 32px;
 			border-radius: 50px;
 			background-color: rgba(0, 185, 98, 100);