Browse Source

Merge branch 'master-0817'

zhengkaixin 2 years ago
parent
commit
3176068cab
89 changed files with 96 additions and 2076 deletions
  1. BIN
      assets/img/Withdrawal_bg.png
  2. 0 1
      assets/img/account-box-fill.svg
  3. 0 0
      assets/img/antFill-crown2.svg
  4. BIN
      assets/img/bgbg.png
  5. BIN
      assets/img/blankpage.png
  6. 0 0
      assets/img/car-fill.svg
  7. 0 3
      assets/img/car_charging.svg
  8. BIN
      assets/img/charge-0.png
  9. BIN
      assets/img/charge-1.png
  10. BIN
      assets/img/charge-2.png
  11. BIN
      assets/img/charge-3.png
  12. BIN
      assets/img/charging_type_1.png
  13. BIN
      assets/img/charging_type_3.png
  14. BIN
      assets/img/charging_type_bike.png
  15. BIN
      assets/img/charging_type_fast.png
  16. BIN
      assets/img/charging_type_slow.png
  17. BIN
      assets/img/ddc.png
  18. BIN
      assets/img/discounts.png
  19. 0 1
      assets/img/edit-2-fill.svg
  20. 0 1
      assets/img/folder-user-fill.svg
  21. BIN
      assets/img/index_header_bg.png
  22. BIN
      assets/img/logo.png
  23. BIN
      assets/img/logo_xiaopengguanjia.png
  24. 0 0
      assets/img/md-cancel@3x.png
  25. BIN
      assets/img/md-verified_user@3x.png
  26. BIN
      assets/img/min_button_select.png
  27. BIN
      assets/img/mine_header_bg.png
  28. 0 1
      assets/img/phone-fill.svg
  29. 6 0
      assets/img/riFill-coupon-3-fill.svg
  30. 6 0
      assets/img/riLine-coupon-3-line.svg
  31. 0 6
      assets/img/riLine-information-line.svg
  32. BIN
      assets/img/shenhe.png
  33. 0 1
      assets/img/spam-3-fill.svg
  34. BIN
      assets/img/topup1.png
  35. BIN
      assets/img/topup2.png
  36. BIN
      assets/img/topup3.png
  37. 1 5
      components/Chargermap.vue
  38. 0 37
      pages/index/index.vue
  39. 2 11
      pages/login/welcome.vue
  40. 1 1
      pages/monthlyCardActivity/monthlyCardBuy.vue
  41. 1 1
      pages/searchPile/chargeProcess/dcCharging.vue
  42. 0 1461
      pages/searchPile/chargeProcess/dcCharging2.vue
  43. 32 3
      pages/searchPile/searchPile.vue
  44. 1 1
      pages/searchPile/searchPileMap.vue
  45. 9 2
      pages/searchPile/stationAndPile/chargePriceDetails.vue
  46. 18 28
      pages/searchPile/stationAndPile/chargingPileDetails.vue
  47. 15 3
      pages/searchPile/stationAndPile/stationDetails.vue
  48. 3 3
      pages/user/dataSet.vue
  49. 0 1
      pages/user/index.vue
  50. 1 1
      pages/user/mine.vue
  51. 0 467
      pages/user/myPile/pileManagement.vue
  52. BIN
      static/img/0314549153.png
  53. BIN
      static/img/06002925191.jpg
  54. BIN
      static/img/0732159953.png
  55. BIN
      static/img/08425983191.png
  56. BIN
      static/img/103613441.jpg
  57. BIN
      static/img/11091323191.jpg
  58. BIN
      static/img/180023631.jpg
  59. BIN
      static/img/9999.jpg
  60. BIN
      static/img/9999.png
  61. BIN
      static/img/AAA.jpg
  62. BIN
      static/img/Frame 198 (1).png
  63. BIN
      static/img/Frame 203.png
  64. BIN
      static/img/Frame 204 (1).png
  65. BIN
      static/img/banner.jpg
  66. BIN
      static/img/banner1.jpg
  67. 0 1
      static/img/file-list-3-fill.svg
  68. BIN
      static/img/head1.png
  69. BIN
      static/img/logo2.png
  70. BIN
      static/img/min_button_select.png
  71. BIN
      static/img/mine_bg.png
  72. BIN
      static/img/picture_upload.png
  73. BIN
      static/img/preview.png
  74. BIN
      static/img/riFill-car-fill@1x.png
  75. 0 6
      static/img/riFill-file-add-fill.svg
  76. BIN
      static/img/riFill-file-list-3-fill@1x.png
  77. 0 6
      static/img/riFill-map-pin-time-fill.svg
  78. 0 6
      static/img/riFill-money-cny-box-fill.svg
  79. 0 6
      static/img/riFill-service-fill.svg
  80. 0 6
      static/img/riFill-shield-user-fill.svg
  81. 0 6
      static/img/riFill-tools-fill.svg
  82. 0 0
      static/img/riLine-edit-box-line2.svg
  83. BIN
      static/img/地图@1x.png
  84. BIN
      static/img/快乐周末游1x (1).png
  85. BIN
      static/img/新闻图.png
  86. BIN
      static/img/瓷片区1.png
  87. BIN
      static/img/瓷片区2.png
  88. BIN
      static/img/电桩管理.png
  89. BIN
      static/img/群组@2x.png

BIN
assets/img/Withdrawal_bg.png


+ 0 - 1
assets/img/account-box-fill.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M3 4.995C3 3.893 3.893 3 4.995 3h14.01C20.107 3 21 3.893 21 4.995v14.01A1.995 1.995 0 0 1 19.005 21H4.995A1.995 1.995 0 0 1 3 19.005V4.995zM6.357 18h11.49a6.992 6.992 0 0 0-5.745-3 6.992 6.992 0 0 0-5.745 3zM12 13a3.5 3.5 0 1 0 0-7 3.5 3.5 0 0 0 0 7z"/></svg>

+ 0 - 0
assets/img/antFill-crown Copy.svg → assets/img/antFill-crown2.svg


BIN
assets/img/bgbg.png


BIN
assets/img/blankpage.png


+ 0 - 0
assets/img/car-fill (1).svg → assets/img/car-fill.svg


+ 0 - 3
assets/img/car_charging.svg

@@ -1,3 +0,0 @@
-<svg width="100" height="40" viewBox="0 0 100 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M0 0H100V40H0V0ZM29.0889 33.6517H74.363C73.4148 31.9925 72.8222 30.2147 72.5852 28.0814C72.5852 25.2369 73.7704 22.6295 75.6667 20.7332C77.563 18.8369 80.1704 17.6517 83.0148 17.6517C85.8593 17.6517 88.4667 18.8369 90.363 20.7332C92.2593 22.6295 93.4444 25.2369 93.4444 28.0814C93.4444 29.7406 93.0889 31.2814 92.3778 32.7036H92.7333C94.9852 31.5184 97.1185 30.0962 98.7778 27.6073L96.5259 15.0443C92.8519 13.3851 86.8074 11.3703 81.9482 10.7777C79.4593 8.05174 76.8519 5.9184 72.9407 4.25914C64.5259 3.19248 58.2444 3.54803 49.237 4.25914C41.5333 6.74803 34.8963 9.711 29.563 13.2666C28.438 13.4154 27.2599 13.5643 26.0461 13.7177C18.5644 14.6633 9.72591 15.7804 3.60741 18.1258L2.06667 28.5554C4.2 30.8073 7.51852 31.9925 10.837 32.7036C10.1259 31.2814 9.77037 29.8591 9.77037 28.1999C9.77037 25.3554 10.9556 22.748 12.8519 20.8517C14.7481 18.9554 17.3556 17.7703 20.2 17.7703C23.0444 17.7703 25.6519 18.9554 27.5481 20.8517C29.4444 22.748 30.6296 25.3554 30.6296 28.1999C30.6296 30.2147 30.1556 31.9925 29.0889 33.6517ZM76.7333 21.6814C78.3926 20.0221 80.763 18.9554 83.2519 18.9554C85.7407 18.9554 87.9926 20.0221 89.7704 21.6814C91.4296 23.3406 92.4963 25.711 92.4963 28.1999C92.4963 30.8073 91.4296 33.0591 89.7704 34.7184C88.1111 36.3777 85.7407 37.4443 83.2519 37.4443C80.6444 37.4443 78.3926 36.3777 76.7333 34.7184C75.0741 33.0591 74.0074 30.6888 74.0074 28.1999C74.0074 25.5925 75.0741 23.3406 76.7333 21.6814ZM13.8 21.6814C15.4593 20.0221 17.8296 18.9554 20.3185 18.9554C22.8074 18.9554 25.1778 20.0221 26.837 21.6814C28.4963 23.3406 29.563 25.711 29.563 28.1999C29.563 30.2849 28.8809 32.1426 27.7591 33.6517C27.4781 34.0298 27.1694 34.386 26.837 34.7184C25.1778 36.3777 22.8074 37.4443 20.3185 37.4443C17.7111 37.4443 15.4593 36.3777 13.8 34.7184C13.2095 34.1279 12.6941 33.4474 12.2751 32.7036C11.5167 31.3571 11.0741 29.8031 11.0741 28.1999C11.0741 25.5925 12.1407 23.3406 13.8 21.6814Z" fill="white"/>
-</svg>

BIN
assets/img/charge-0.png


BIN
assets/img/charge-1.png


BIN
assets/img/charge-2.png


BIN
assets/img/charge-3.png


BIN
assets/img/charging_type_1.png


BIN
assets/img/charging_type_3.png


BIN
assets/img/charging_type_bike.png


BIN
assets/img/charging_type_fast.png


BIN
assets/img/charging_type_slow.png


BIN
assets/img/ddc.png


BIN
assets/img/discounts.png


+ 0 - 1
assets/img/edit-2-fill.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" fill="#FFFFFF" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M9.243 19H21v2H3v-4.243l9.9-9.9 4.242 4.244L9.242 19zm5.07-13.556l2.122-2.122a1 1 0 0 1 1.414 0l2.829 2.829a1 1 0 0 1 0 1.414l-2.122 2.121-4.242-4.242z"/></svg>

+ 0 - 1
assets/img/folder-user-fill.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="#6BC6A7 " viewBox="0 0 24 24" width="18" height="18"><path fill="none" d="M0 0h24v24H0z"/><path d="M12.414 5H21a1 1 0 0 1 1 1v14a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h7.414l2 2zM12 13a2.5 2.5 0 1 0 0-5 2.5 2.5 0 0 0 0 5zm-4 5h8a4 4 0 1 0-8 0z"/></svg>

BIN
assets/img/index_header_bg.png


BIN
assets/img/logo.png


BIN
assets/img/logo_xiaopengguanjia.png


+ 0 - 0
assets/img/md-cancel Copy@3x.png → assets/img/md-cancel@3x.png


BIN
assets/img/md-verified_user@3x.png


BIN
assets/img/min_button_select.png


BIN
assets/img/mine_header_bg.png


+ 0 - 1
assets/img/phone-fill.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="#00B962" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M21 16.42v3.536a1 1 0 0 1-.93.998c-.437.03-.794.046-1.07.046-8.837 0-16-7.163-16-16 0-.276.015-.633.046-1.07A1 1 0 0 1 4.044 3H7.58a.5.5 0 0 1 .498.45c.023.23.044.413.064.552A13.901 13.901 0 0 0 9.35 8.003c.095.2.033.439-.147.567l-2.158 1.542a13.047 13.047 0 0 0 6.844 6.844l1.54-2.154a.462.462 0 0 1 .573-.149 13.901 13.901 0 0 0 4 1.205c.139.02.322.042.55.064a.5.5 0 0 1 .449.498z"/></svg>

+ 6 - 0
assets/img/riFill-coupon-3-fill.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="20" height="20" style="border-color: rgba(187,187,187,1);border-width: 0px;border-style: solid" filter="none">
+    
+    <g>
+    <path d="M14.667 28c0-1.105-0.895-2-2-2s-2 0.895-2 2v0h-6.667c-0.736 0-1.333-0.597-1.333-1.333v0-21.333c0-0.736 0.597-1.333 1.333-1.333v0h6.667c0 1.105 0.895 2 2 2s2-0.895 2-2v0h13.333c0.736 0 1.333 0.597 1.333 1.333v0 7.333c-1.841 0-3.333 1.492-3.333 3.333s1.492 3.333 3.333 3.333v0 7.333c0 0.736-0.597 1.333-1.333 1.333v0h-13.333zM12.667 14c1.105 0 2-0.895 2-2s-0.895-2-2-2v0c-1.105 0-2 0.895-2 2s0.895 2 2 2v0zM12.667 22c1.105 0 2-0.895 2-2s-0.895-2-2-2v0c-1.105 0-2 0.895-2 2s0.895 2 2 2v0z" fill="rgba(0,184.875,97.92,1)"></path>
+    </g>
+  </svg>

+ 6 - 0
assets/img/riLine-coupon-3-line.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="20" height="20" style="border-color: rgba(187,187,187,1);border-width: 0px;border-style: solid" filter="none">
+    
+    <g>
+    <path d="M2.667 5.333c0-0.736 0.597-1.333 1.333-1.333v0h24c0.736 0 1.333 0.597 1.333 1.333v0 7.333c-1.841 0-3.333 1.492-3.333 3.333s1.492 3.333 3.333 3.333v0 7.333c0 0.736-0.597 1.333-1.333 1.333v0h-24c-0.736 0-1.333-0.597-1.333-1.333v0-21.333zM10.78 25.333c0.282-0.785 1.020-1.336 1.887-1.336s1.605 0.551 1.882 1.322l0.004 0.014h12.113v-3.957c-1.993-1.004-3.336-3.033-3.336-5.376s1.343-4.372 3.301-5.36l0.034-0.016v-3.957h-12.113c-0.282 0.785-1.020 1.336-1.887 1.336s-1.605-0.551-1.882-1.322l-0.004-0.014h-5.447v18.667h5.447zM12.667 14.667c-1.105 0-2-0.895-2-2s0.895-2 2-2v0c1.105 0 2 0.895 2 2s-0.895 2-2 2v0zM12.667 21.333c-1.105 0-2-0.895-2-2s0.895-2 2-2v0c1.105 0 2 0.895 2 2s-0.895 2-2 2v0z" fill="rgba(0,184.875,97.92,1)"></path>
+    </g>
+  </svg>

+ 0 - 6
assets/img/riLine-information-line.svg

@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="16" height="16" style="border-color: rgba(0,0,0,0);border-width: bpx;border-style: undefined" filter="none">
-    
-    <g>
-    <path d="M16 29.333c-7.364 0-13.333-5.969-13.333-13.333s5.969-13.333 13.333-13.333 13.333 5.969 13.333 13.333-5.969 13.333-13.333 13.333zM16 26.667c5.891 0 10.667-4.776 10.667-10.667s-4.776-10.667-10.667-10.667v0c-5.891 0-10.667 4.776-10.667 10.667s4.776 10.667 10.667 10.667v0zM14.667 9.333h2.667v2.667h-2.667v-2.667zM14.667 14.667h2.667v8h-2.667v-8z" fill="rgba(149.94,151.98,157.07999999999998,1)"></path>
-    </g>
-  </svg>

BIN
assets/img/shenhe.png


+ 0 - 1
assets/img/spam-3-fill.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="#00B962" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M15.936 2.5L21.5 8.067v7.87L15.936 21.5h-7.87L2.5 15.936v-7.87L8.066 2.5h7.87zM8 11v2h8v-2H8z"/></svg>

BIN
assets/img/topup1.png


BIN
assets/img/topup2.png


BIN
assets/img/topup3.png


+ 1 - 5
components/Chargermap.vue

@@ -495,11 +495,7 @@
 				_self = this;
 //				console.log('init')
 				var _this = this;
-//				this.positionIcon = require('@/static/img/location.png')
-//				this.personIcon = require("@/static/img/charger_selected.png")
-				// this.chargerIcon = require("@/static/img/charger.png");
-				// this.chargerSelectedIcon =  require("@/static/img/charger_selected_circle.png");
-				
+
 				MapLoader().then(AMap => {
 					
 					this.AMap=AMap;

+ 0 - 37
pages/index/index.vue

@@ -183,44 +183,7 @@
 				</view>
 				
 			</view>
-			<!-- 站点 -->
-			<!-- <view class="station"  v-for="(stationData,i) in stationList" :key="i"
-				@click="gotoUrl('pages/searchPile/stationAndPile/stationDetails?id=' + stationData.id)">
-				<view class="img-box">
-					<img src="static/img/Frame 198 (1).png" alt="">
-				</view>
-				<view class="text">
-					
-					<view class="station-title">
-						<text class="title-left oldTextjp2" oldstyle="font-size: 14px;background-color: #9D9FFF;" v-if="stationData.type == '1'" style="background-color: #9D9FFF;">快充</text>
-						<text class="title-left oldTextjp2" oldstyle="font-size: 14px;background-color: #00B962;" v-if="stationData.type == '2'" style="background-color: #00B962;">慢充</text>
-						<text class="title-left oldTextjp2" oldstyle="font-size: 14px;background-color: #00BAC8;" v-if="stationData.type == '1,2'" style="background-color: #00BAC8;">快/慢</text>
-						<text class="title-right oldTextjp" oldstyle="font-size: 20px;">{{stationData.name}}</text>
-					</view>
-			
-					<view class="station-price">
-						<view class="price-left">{{stationData.costPrice}}</view>
-						<view class="price-right">
-							元/度 起 
-						</view>
-					</view>
 			
-					<view class="park">
-						<text class="park-p">p</text>
-						<text class="park-text oldTextjp2" oldstyle="font-size: 14px;">2小时停车免费</text>
-					</view>
-					<view class="count">
-						<view class="count-left">
-							<span class="oldTextjp2" oldstyle="font-size: 16px;">空闲{{stationData.availableNum}}/</span>
-							<span class="oldTextjp" oldstyle="font-size: 16px;">总数{{stationData.totalNum}}</span>
-						</view>
-						<view class="count-right oldTextjp" oldstyle="font-size: 16px;">
-							<text class="iconfont">&#xe615;</text>
-							{{stationData.distance!=null&&stationData.distance>0.1 ? stationData.distance.toFixed(1)+'公里':'小于100米'}}
-						</view>
-					</view>
-				</view>
-			</view> -->
 			
 		</template>
 		<!-- 定位 -->

+ 2 - 11
pages/login/welcome.vue

@@ -22,15 +22,7 @@
  			<view class="welcome-foot">
 				<u-image width="185px" height="48px" src="../../static/img/logo.png"></u-image>
 			</view>
-			<!-- <view class="welcome-state2">
-				<view class="welcome-logo">
-					<u-image width="200px" height="50px" src="../../static/img/logo2.png"></u-image>
-				</view>
-				<view class="welcome-btn">
-					<u-button class="welcomeBtn" shape="circle">用户登录</u-button>
-					<p>随便逛逛</p>
-				</view>
-			</view> -->
+		
 		</view>
 	</view>
 </template>
@@ -239,8 +231,7 @@
 </script>
 <style>
 	page{
-		/* background:url(../../static/img/welcome_bg.png) no-repeat;
-		background-size:100%; */
+		
 		background-color: #ffffff;
 	}
 </style>

+ 1 - 1
pages/monthlyCardActivity/monthlyCardBuy.vue

@@ -39,7 +39,7 @@
 					<view class="title">
 						<text class="img">
 							<img  v-if="item.id==cardId" src="../../assets/img/antFill-crown@3x.png" alt="">
-							<img   v-else src="../../assets/img/antFill-crown Copy.svg" alt="">
+							<img   v-else src="../../assets/img/antFill-crown2.svg" alt="">
 							 
 						</text>{{item.name}}
 					</view>

+ 1 - 1
pages/searchPile/chargeProcess/dcCharging.vue

@@ -393,7 +393,7 @@
 						</view>
 						<view class="detail">
 							<p class="electrovalence"><text class="num">{{chargingRecord.userCardId?price.electricityPrice.toFixed(2):price.costPrice.toFixed(2)}}</text> 元/度</p>
-							<p class="electrovalence-monthlyCard">电价:{{price.electricityPrice}} | 服务费:{{chargingRecord.userCardId?0+'(包月卡)':price.servicePrice}}</p>
+							<p class="electrovalence-monthlyCard">电价:{{price.electricityPrice}} | 服务费:{{chargingRecord.userCardId?0+'(包月卡)':(chargingStation.giveDiscount?'折后'+price.discountServicePrice:price.servicePrice)}}</p>
 						</view>
 					
 					</view>

+ 0 - 1461
pages/searchPile/chargeProcess/dcCharging2.vue

@@ -1,1461 +0,0 @@
-<template>
-	<view>
-		<view v-if="chargingRecord.status==2" style="background-color: #fff; " >
-			<ujp-navbar title="充电结束">
-			</ujp-navbar>
-			<view class="progress-bar2">
-				<u-circle-progress width="300" active-color="green" duration='20'  :percent="100" border-width="20">
-					<view class="u-progress-content">
-						 
-						<text class='u-progress-info' v-if="chargingGun.gunType==1">
-							<p style="text-align: center;">{{chargingRecord.endSoc}}%</p>
-							<p class="progress-text">当前电量</p>
-						</text>
-						
-						<text class='u-progress-info' v-if="chargingGun.gunType==2">
-							<p style="text-align: center;">{{chargingRecord.electricQuantity/10000}}</p>
-							<p class="progress-text">已充电量(度)</p>
-						</text>
-						
-					</view>
-
-					
-				</u-circle-progress>
-			</view>
-<!-- 充电信息 -->
-			
-				<!-- <view class="charge-infos">
-					<view class="item">
-						<view class="title">
-							充电金额
-						</view>
-						<view class="content">
-							50.00
-						</view>
-					</view>
-					<view class="item">
-						<view class="title">
-							充电时长
-						</view>
-						<view class="content">
-							00.00.00
-						</view>
-					</view>
-					<view class="item">
-						<view class="title">
-							优惠金额
-						</view>
-						<view class="content discounts">
-							-6.00元
-						</view>
-					</view>
-					<view class="item">
-						<view class="title">
-							会员活动
-						</view>
-						<view class="content">
-							充电服务费包月卡
-						</view>
-					</view>
-				</view> -->
-				 <view class="info" >
-					<view class="info-name">
-						充电时长
-					</view>
-					<view class="info-text">
-						{{getPercent2()}}
-					</view>
-				</view>
-				<view class="info" >
-					<view class="info-name">
-						充电金额
-					</view>
-					<view class="info-text">
-						{{chargingRecord.actualFee.toFixed(2)}}元
-					</view>
-				</view>
-				<view class="info" v-if="chargingRecord.discountAmount">
-					<view class="info-name">
-						优惠金额
-					</view>
-					<view class="info-text" style="color:red">
-						{{chargingRecord.discountAmount.toFixed(2)}}元
-					</view>
-				</view>
-				
-				<view class="info" v-if="chargingRecord.remark">
-					<view class="info-name">
-						结束原因
-					</view>
-					<view class="info-text" style="color: red;"  >
-						{{chargingRecord.remark}}
-					</view>
-				</view>
-				
-				
-				
-				
-		
-			
-		<!-- 	
-			<view
-			
-			style="
-				margin-top: 20px;
-				text-align: center;
-				padding: 0 45px;
-				padding-bottom: 40px;
-				color:#9e9e9e;
-			">
-				<span style="color: red;">*</span>实际充电金额与所选金额会略有出入,最终结算金额将以实际充入电量为准。
-			</view> -->
-			
-			<view class="bottom">
-				<u-button size="default"  style="background-color:#53b56b"
-				 shape="circle" @click="gotoMain(0)"  >返回首页</u-button>
-				<u-button  style="background-color:#53b56b"
-				size="default" shape="circle" @click="gotoMain(1)">查看订单详情</u-button>
-			</view>
-				<u-line color="#E6E6E6 100%" length="81%" margin="auto"/>
-			<!-- 反馈 -->
-			<view class="feedback">
-				<view class="title-1">
-					您对本次充电服务还满意吗?
-				</view>
-				<view class="title-2">
-					请在下方描述您所遇到的问题,或填写您的反馈意见。我们将对优质内容的反馈者发放奖励!
-				</view>
-				<textarea value="" v-model="message" placeholder="请填写反馈内容" />
-				<u-button class="submit" type="success" @click="submitMessage()">提交</u-button>
-			</view>
-			<u-line color="#E6E6E6 100%" length="81%" margin="auto"/>
-			
-			<view class="info"  >
-				<view class="info-name">
-					优惠券
-				</view>
-				<view class="info-text" style="color:red">
-					{{couponObj&&couponObj.status=='1'?couponObj.text:'未使用'}}
-				</view>
-			</view>
-			<view class="info" v-if="userCardBool" >
-				<view class="info-name">
-					会员活动
-				</view>
-				<view class="info-text">
-					充电服务费包月卡
-				</view>
-			</view>
-			<u-divider  color="#B6BDC3" style="margin-bottom:20px;" bg-color="#ffffff">已经到底了</u-divider>
-			
-			
-			<view>
-				<u-toast ref="uToast" />
-			</view>
-		</view>
-
-		<view style="background-color: #fff; padding-bottom: 0px;" 
-		 class="progress-bar-main" v-else>
-			<view>
-				<ujp-navbar title="充电中">
-					<view class="to-recharge" @click="gotoUrl('pages/user/finance/recharge')">
-						去充值
-					</view>
-				</ujp-navbar>
-				<!-- 充电状态 -->
-				<view class="charge-state">
-					<view class="progress-bar">
-						<u-circle-progress width="440" active-color="#53b56b" :percent="percent?percent:percentValue" border-width="35">
-					
-							
-							<view class="u-progress-content" v-if="chargingRecord.status==4">
-								<text class='u-progress-info' v-if="waitNum==1">排队中</text>
-								<text class='u-progress-info' v-else >前方等待{{waitNum-1}}位</text>
-							</view>
-							
-							<view class="u-progress-content" v-else>
-								
-								<text class='u-progress-info'  >
-									<view v-if="chargingGun.gunType==1" style="
-											font-size: 40px;
-											font-weight: bold;
-											color: #009B52 ;
-										" >{{percent}}<span style="font-size: 16px;">%</span></view>
-									<view v-if="chargingGun.gunType==2"
-									style="
-											font-size: 30px;
-											font-weight: bold;
-											color: #009B52 ;
-										"
-									
-									>{{chargingRecord.statusText}}</view>
-									<view style="
-											font-size: 16px;
-											font-weight: bold;
-										" 	>已充费用{{chargingRecord.dueFee?chargingRecord.dueFee.toFixed(2):'0.00'}}元</view>
-								</text>
- 								
-								
-							</view>
-							
-							<view class="bot"></view>
-						</u-circle-progress>
-					</view>
-				<!-- 	<view class="img">
-						<img src="../../../assets/img/Group (2).png" alt="">
-					</view>
-					<view class="state-infos">
-						<view class="state">
-							<text><img src="../../../assets/img/if-flash.svg" alt=""></text>充电中...
-						</view>
-						<view class="electric-quantity">
-							<p>当前电量</p>
-							<view class="percent">
-								60<text>%</text>
-							</view>
-						</view>
-						<view class="charge-time">
-							<p>充电时长</p>
-							<view class="time">
-								00:24:01
-							</view>
-						</view>
-			
-					</view> -->
-			
-				</view>
-				<!-- 充电信息 -->
-				<view class="charge-info">
-					<view class="info-item">
-						<view class="content">
-							{{timer}}
-						</view>
-						<view class="name">
-							充电时长
-						</view>
-					</view>
-					<view class="info-item">
-						<view class="content">
-							{{chargingGun.kwh}}
-						</view>
-						<view class="name">
-							已充电量(度)
-						</view>
-					</view>
-					<view class="info-item">
-						<view class="content">
-							{{detail.balance>0&&chargingRecord.dueFee?((detail.balance*1000-chargingRecord.dueFee*1000)/1000).toFixed(2):'0.00'}}
-						</view>
-						<view class="name">
-							账户余额(元)
-						</view>
-					</view>
-					
-					
-				</view>
-				<!-- 其他信息 -->
-				<view class="else-infos">
-					<view class="item">
-						<view class="title">
-							充电车辆
-						</view>
-						<view class="detail">
-							{{chargingRecord.carNumber}}
-						</view>
-			
-					</view>
-					<view class="item">
-						<view class="title">
-							<p class="price">当前价格</p>
-							<p class="time">{{price.startTime}}-{{price.endTime}}</p>
-						</view>
-						<view class="detail">
-							<p class="electrovalence"><text class="num">{{chargingRecord.userCardId?price.electricityPrice.toFixed(2):price.costPrice.toFixed(2)}}</text> 元/度</p>
-							<p class="electrovalence-monthlyCard">电价:{{price.electricityPrice}} | 服务费:{{chargingRecord.userCardId?0+'(包月卡)':price.servicePrice}}</p>
-						</view>
-					
-					</view>
-					<view class="item">
-						<view class="title">
-							{{chargingRecord.chargeStrategy==0?'充电模式':''}}
-							{{chargingRecord.chargeStrategy==2?'充电金额':''}}
-						</view>
-						<view class="detail">
-							{{chargingRecord.chargeStrategy==0?'充满自停':''}}
-								{{chargingRecord.chargeStrategy==2?chargingRecord.estimateFee.toFixed(2):'0.00'}}元
-							
-						</view>
-					
-					</view>
-					<view class="item">
-						<view class="title">
-							优惠券
-						</view>
-						<view class="detail">
-							
-							{{couponObj&&couponObj.useText?couponObj.useText:'未使用优惠券'}}
-							
-						</view>
-					
-					</view>
-					<view class="item"  v-if="userCardBool" >
-						<view class="title">
-							会员活动
-						</view>
-						<view class="detail">
-							充电免服务费包月卡
-						</view>
-					
-					</view>
-					<view class="item">
-						<view class="title">
-							站点
-						</view>
-						<view class="detail">
-							 {{chargingRecord.stationName}}/{{chargingRecord.deviceName}}
-						</view>
-					
-					</view>
-					
-					<view class="item" v-if="false">
-						<view class="title">
-							占位费说明
-						</view>
-						<view class="detail">
-							停止充电后30分钟即开始收取占位费用,1元/分钟
-						</view>			
-					</view>
-			
-				</view>
-			
-			 <view class="bottom">
-				 <view class="img-box" @click="show = true">
-					 <img src="../../../assets/img/customer-service-2-line.svg" alt="">
-				 	
-				 </view>
-				 <button  
-				 :style="(chargingRecord.status=='0'||chargingRecord.status=='1'||chargingRecord.status=='4')?'':'background-color: #b3abab;'"
-				 style="width: 80%;"
-				 @click="submit" >结束充电</button>
-				
-				<view class="img-box" v-if="false">
-				 	<img src="../../../assets/img/tools-fill.svg" alt="">
-				 </view>
-			 	
-			 </view>
-			<u-modal v-model="show" @confirm="confirmPhone"
-			:confirm-text="confirmText"  confirm-color="#606266"
-				:show-cancel-button="true" ref="uModal" :asyncClose="true" :title="title" :content="consumerPhone">
-			</u-modal>
-			
-			<u-modal v-model="show2" @confirm="gotoGz" 
-			cancel-text="暂不关注"  @cancel="cancelGz"
-			confirm-text="前往关注"
-			
-			 confirm-color="#53b56b"
-				:show-cancel-button="true" 
-				ref="uModal2" :asyncClose="true" 
-				 >
-				<view style="padding: 15px;"
-				
-				>请关注<span style=" color:  #53b56b;">{{projectName}}</span>公众号,以便第一时间收到充电结束消息提醒</view>
-			</u-modal>
-			
-			</view>
-			
-			<view v-if="false">
-				
-			
-			<ujp-navbar title="充电详情">
-			</ujp-navbar>
-			
-			<view class="iconfont tittle-font" @click="show = true">
-				&#xe616;
-			</view>
-			
-
-
-			<view class="progress-bar">
-				<u-circle-progress width="440" active-color="green" :percent="percent?percent:percentValue" border-width="50">
-
-					
-					<view class="u-progress-content" v-if="chargingRecord.status==4">
-						<text class='u-progress-info' v-if="waitNum==1">排队中</text>
-						<text class='u-progress-info' v-else >前方等待{{waitNum-1}}位</text>
-					</view>
-					<view class="u-progress-content" v-else-if="chargingGun.gunType==1">
-						
-						<text class='u-progress-info'>{{percent}}%</text>
-					</view>
-					<view class="u-progress-content" v-else-if="chargingGun.gunType==2">
-						
-						<text class='u-progress-info'>{{chargingRecord.statusText}}...</text>
-					</view>
-					<view class="bot"></view>
-				</u-circle-progress>
-			</view>
-			<view class="starting"  v-if="chargingGun.gunType==1">
-				
-				<span  v-if="chargingRecord.status==4">
-					可用功率不足,您可以换桩或继续排队等待...
-				</span>
-				<span v-else>
-					{{chargingRecord.statusText}}...
-				</span>
-			</view>
-
-
-			<view class="timer">
-				{{timer}}
-			</view>
-			<view class="charged">
-				已充电{{chargingGun.kwh}}度
-			</view>
-			<view class="cost">
-				<view class="">
-					<view class="cost-top">
-						{{chargingRecord.dueFee?chargingRecord.dueFee.toFixed(2):'0.00'}}元
-					</view>
-					<view class="cost-bottom "  >
-						实时费用
-					</view>
-				</view>
-				<view class="line"></view>
-				<view class="">
-					<view class="cost-top">
-						{{detail.balance>0?detail.balance.toFixed(2):'0.00'}}元
-						<view class="iconfont cost-font" @click="gotoUrl('pages/user/finance/recharge')" >&#xe633;</view>
-					</view>
-					<view class="cost-bottom">
-						账户余额
-					</view>
-				</view>
-			</view>
-			<view class="power">
-				<view>
-					<view class="power-num">
-						{{chargingRecord.chargeVoltage?chargingRecord.chargeVoltage:0}}v
-					</view>
-					<view class="power-text">
-						电压
-					</view>
-				</view>
-				<view class="line"></view>
-				<view>
-					<view class="power-num">
-						{{chargingRecord.chargingPower?chargingRecord.chargingPower/1000:0}}kW
-					</view>
-					<view class="power-text">
-						功率
-					</view>
-				</view>
-				<view class="line"></view>
-				<view>
-					<view class="power-num">
-						{{chargingRecord.chargeAmpere?chargingRecord.chargeAmpere:0}}A
-					</view>
-					<view class="power-text">
-						电流
-					</view>
-				</view>
-			</view>
-			<view class="info" >
-				<view class="info-name">
-					{{chargingRecord.chargeStrategy==0?'充电模式':''}}
-					{{chargingRecord.chargeStrategy==2?'充电金额':''}}
-				</view>
-				<view class="info-text" >
-					{{chargingRecord.chargeStrategy==0?'充满自停':''}}
-					{{chargingRecord.chargeStrategy==2?chargingRecord.estimateFee.toFixed(2):'0.00'}}元
-				</view>
-			</view>
-			
-			<view class="info" >
-				<view class="info-name">
-					优惠券
-				</view>
-				<view class="info-text" style="color:red">
-					{{couponObj&&couponObj.useText?couponObj.useText:'未使用'}}
-				</view>
-			</view>
-			<view class="info" v-if="chargingRecord.carNumber">
-				<view class="info-name">
-					充电车辆
-				</view>
-				<view class="info-text">
-					{{chargingRecord.carNumber}}
-				</view>
-			</view>
-			<view class="info">
-				<view class="info-name">
-					站点
-				</view>
-				<view class="info-text">
-					 {{chargingRecord.stationName}}
-				</view>
-			</view>
-			<view class="info">
-				<view class="info-name">
-					充电桩
-				</view>
-				<view class="info-text">
-					 {{chargingRecord.deviceName}}枪{{chargingRecord.channelNo}} 
-					
-				</view>
-			</view>
-			
-			<view class="info" v-if="price" style="line-height: 23px;">
-				<view class="info-text" style="text-align: left;"  >
-					<view style="font-weight: bold;font-size: 20px;">当前价格</view>
-					<view class="info-name2" >
-						{{price.startTime}}-{{price.endTime}}
-					</view>
-				</view>
-				<view class="info-text"  style="line-height: 23px;">
-					<view><span style="color: #FF3D00;font-size: 20px;"><b>{{price.costPrice.toFixed(2)}}</b></span>元/度</view>
-					
-					<view class="info-name2">
-						电价:{{price.electricityPrice.toFixed(2)}}元 | 服务费:{{price.servicePrice.toFixed(2)}}元
-					</view>
-				</view>
-				
-				
-				
-			</view>
-			
-			
-		 
-			<view class="bottom2" >
-				<u-button type="primary"  @click="submit"
-				 :style="(chargingRecord.status==0||chargingRecord.status==1||chargingRecord.status==4)?'background-color: #00b962':'background-color: #9be6c2;'"
-				 shape="circle" >结束充电</u-button>
-			</view>
-
-			<u-modal v-model="show" @confirm="confirmPhone" 
-			:confirm-text="confirmText"  confirm-color="#606266"
-				:show-cancel-button="true" ref="uModal" :asyncClose="true" :title="title" :content="consumerPhone">
-			</u-modal>
-			
-			<u-modal v-model="show2" @confirm="gotoGz" 
-			cancel-text="暂不关注"  @cancel="cancelGz"
-			confirm-text="前往关注"
-			
-			 confirm-color="#53b56b"
-				:show-cancel-button="true" 
-				ref="uModal2" :asyncClose="true" 
-				 >
-				<view style="padding: 15px;"
-				
-				>请关注<span style=" color:  #53b56b;">{{projectName}}</span>公众号,以便第一时间收到充电结束消息提醒</view>
-			</u-modal>
- 			</view>
-		</view>
-	</view>
-</template>
-
-
-<script>
-	var formatNum=function(num) {
-		let res = Number(num);
-		return res < 10 ? '0' + res : res;
-	};
-	import * as api from "@/apis/site.js"
-	
-	import * as API from '@/apis/chargeProcess.js'
-	import * as API_weixin from '@/apis/weixin.js'
-	import * as userAPI from '@/apis/user.js'
-	
-	import {
-		newDate,
-		secondsDistance,
-		hourDistanceArr
-	} from '@/utils'
-	export default {
-		data() {
-			return {
-				message: '',
-				elderMode:false,
-				timer:'',
-				title: '联系客服',
-				content: '0716-8123456',
-				confirmText: '拨打电话',
-				detail:{},
-				percent: 0,
-				percentValue: 0,
-				show3:false,
-				consumerPhone: "",
-				id: "",
-				chargingGun: {},
-				chargingRecord: {},
-				couponObj:{},
-				show: false,
-				show2: false,
-				isReady:true,
-				waitNum:'',
-				projectName:"",
-				userCard:null,
-				price:null,
-			}
-		},
-		onLoad(op) {
-			this.projectName=process.car.ProjectName;
-			
-			var plus=this.carhelp.getPersonInfoPlus()
-			if(plus){
-				this.userCard=plus.userCard;
-			}
-			if (op.id) {
-				this.id = op.id;
-				this.init()
-				this.getInfo()
-			}
-			var consumerPhone = this.carhelp.getConfig().consumerPhone
-			// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
-			if (consumerPhone) {
-				this.consumerPhone = consumerPhone
-			}
-			
-
-		},
-		onShow() {
-		
-			if(!this.isReady){
-				this.isReady=true;
-				this.addpercent();
-				this.getInfo()
-			}
-			
-		},
-		onHide() {
-			this.isReady=false;
-			console.log("onHide")
-			},
-		onUnload() {
-				console.log("onUnload")
-			this.isReady=false;
-		},
-		onReady() {
-			this.elderMode = this.carhelp.get('getElderModeClass')  == '长辈模式';
-			if(this.elderMode)
-				this.theme('elder')
-			else
-				this.theme('standard')
-				
-			this.addpercent()
-		},
-		computed:{
-			userCardBool(){
-				if(this.chargingRecord&&this.chargingRecord.userCardId){
-					
-					return true;
-				}
-				return false
-			}
-		},
-		methods: {
-			getChargingStationPrice(id){
-				 
-				if(!id||id==undefined){
-					return 
-				}
-				//id='e012f9fe-90a8-4a47-bb64-26ea139c3c05'
-				api.getChargingStationPrice({
-					stationId:id
-				}).then((res)=>{
-					let date = new Date();
-					let hours = date.getHours();
-					let minutes = date.getMinutes();
-					let seconds = date.getSeconds();
-					let date_str =  formatNum(hours)+ ':'+ formatNum(minutes);//+ ' ' +formatWeek;
-					if(res.data.prices&&res.data.prices.length){
-						
-						for(var i in  res.data.prices[0].priceList){
-							var item=res.data.prices[0].priceList[i];
-							if(date_str>=item.startTime &&  date_str<= item.endTime)
-							{
-								this.price=	item								
-							}
-						}
-						
-					}
-					
-					
-					
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			},
-			showToast() {
-				this.$refs.uToast.show({
-					title: '提交成功',
-					type: 'success'
-				})
-			},
-			submitMessage() {
-				if(!this.message) {
-					uni.showToast({
-						title: "请填写反馈内容",
-						icon: "none"
-					})
-					return
-				}
-				
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				userAPI.feedback({content: this.message}).then(response => {
-					uni.hideLoading()
-					this.message = '';
-					this.showToast();
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			},
-			theme(type) {
-				
-			  if(type == 'elder')	
-			  {
-				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
-				 
-			  }
-			  else
-			  {
-				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
-				 
-				  
-			  } 
-			},
-			cancelGz(){
-				this.carhelp.setGzDate()
-			},
-			gotoGz(){
-				this.carhelp.setGzDate()
-				var url="https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
-				window.location.href=url
-				
-			},
-			gotoMain(i){
-				if(i==0){
-					uni.reLaunch({
-						url:"/pages/index/index"
-					})
-				}
-				if(i==1){
-					uni.navigateTo({
-					
-						url:"/pages/record/details?id="+this.id
-					})
-				}
-			},
-			addpercent(){
-				this.timer=this.getPercent()
-				if(this.isReady){
-					setTimeout(()=>{	
-						this.percentValue++;
-						if(this.percentValue>=100){
-							this.percentValue=0;
-						}
-						this.addpercent()
-					},100)
-				}
-			},
-			getPercent2() {
-				var ms=this.chargingRecord.chargingMinute*60;
-				
-				var Hour = parseInt(Math.floor(ms / (60 * 60)));
-				var Fen = parseInt(Math.floor(ms % (60 * 60) / 60));
-				var S = parseInt(Math.floor(ms % (60) ));
-				
-				var obj = (Hour > 9 ? "" : "0") + Hour + ":" + (Fen > 9 ? "" : "0") + Fen+ ":" + (S > 9 ? "" : "0") + S
-				 
-			
-				return obj;
-			},
-			getPercent() {
-				if(!this.chargingRecord.startTime){
-					return '00:00:00'
-				}
-				var Hour=0;
-				var Fen=0;
-				var S=0;
-				if (this.chargingRecord.status == 1) {
-					var second = secondsDistance(newDate(this.chargingRecord.startTime));
-				
-				var ms=second;
-				
-				 Hour = parseInt(Math.floor(ms / (60 * 60)));
-				 Fen = parseInt(Math.floor(ms % (60 * 60) / 60));
-				 S = parseInt(Math.floor(ms % (60) ));
-				
-				 }
-				 var obj = (Hour > 9 ? "" : "0") + Hour + ":" + (Fen > 9 ? "" : "0") + Fen+ ":" + (S > 9 ? "" : "0") + S
-				 
-			
-				return obj;
-			},
-			init() {
-				 
-			
-				API.personalCenter().then((res) => {
-					this.detail = res.data
-					 
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			},
-			checkSubscribe(){
-				API_weixin.checkSubscribe({
-					openId: this.carhelp.getOpenId() 
-				}).then((res) => {
-					
-					if(res.data=="0"){
-						
-						this.show2=true;
-					}else{
-						this.carhelp.setGzDate() 
-					}
-					
-					//setGzDate
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-				
-			},
-			confirmPhone() {
-				this.show = false;
-				uni.makePhoneCall({
-					phoneNumber: this.consumerPhone //仅为示例
-				});
-			},
-			getInfo() {
-				// uni.showLoading({
-				// 	title: "加载中",
-				// 	mask: true,
-				// })
-				API.chargingDetail({
-					id: this.id
-				}).then((res) => {
-					
-					this.chargingRecord = res.data.chargingRecord
-					//(this.chargingRecord)
-					this.couponObj= res.data.coupon
-					this.chargingGun = res.data.chargingGun
-					this.waitNum=res.data.chargingRecord.waitNum;
-					this.getChargingStationPrice(this.chargingGun.stationId )
-					//this.isReady = true;
-					//直流
-					if(this.chargingGun.gunType==1){
-						
-						if (this.chargingRecord.status == 1) {
-							this.percent=this.chargingGun.soc
-							
-							
-						}
-					}else if(this.chargingGun.gunType==2){
-						//交流
-					}
-					if (this.chargingRecord.status == 1) {
-						if(this.carhelp.getGzDate()&&!this.show2){
-							
-							this.checkSubscribe()
-							
-						}
-					}
-					
-					if(this.isReady&&this.chargingRecord.status!=2){
-						var time=500;
-						if(this.chargingRecord.status==0){
-							
-						}else{
-							time=3000;
-							this.init();
-						}
-						
-						setTimeout(()=>{
-							this.getInfo();
-						},time)
-					}
-					uni.hideLoading()
-
-				}).catch(error => {
-					uni.showToast({
-						title: error
-					})
-				})
-			},
-			submit() {
-				if(this.chargingRecord.status==0||this.chargingRecord.status==1||this.chargingRecord.status==4){
-					
-				}else{
-					return
-				}
-				uni.showModal({
-					title: '提示',
-					content: '确认结束充电?',
-					success: res => {
-						if (res.confirm) {
-							//付钱  改为组件
-							this.confirm()
-				
-						} else if (res.cancel) {
-							//('用户点击取消');
-						}
-					}
-				});
-			},
-			confirm() {
-			
-				////(JSON.stringify(this.submitForm))
-				
-				
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-			
-				//this.submitForm.deviceNo = this.detail.deviceNo;
-				API.stopCarCharging({
-					chargingRecordId:this.chargingRecord.id
-				}).then((res) => {
-					this.getInfo()
-				}).catch(error => {
-					
-					uni.showToast({
-						title: error
-					})
-			
-				})
-			},
-
-		}
-
-	}
-</script>
-<style>
-	page {
-		background: #fff;
-		padding-bottom: 50px;
-	}
-</style>
-<style lang="scss" scoped>
-	.progress-bar-main{
-		.info-name2{
-			color: #777777 ;
-			font-size:14px;
-		}
-		.info-name{
-			font-weight:bold;
-			font-size: 20px;
-			
-		}
-	}
-
-	@import "@/_theme.scss";
-	.tittle-font {
-		@include themeify{
-			font-size: themed('font-size7');
-		}
-/*		font-size: 24px;*/
-		position: fixed;
-		top: 12px;
-		right: 16px;
-		z-index: 99999;
-
-	}
-
-	.bot {
-		width:100%;
-		height:0;
-		padding-top: 100%;
-		border: 2px #00b962 dotted;
-		border-radius:100%;
-		box-sizing: border-box;
-		position: absolute;
-		top: 0px;
-		left: 0px;
-		right: 0px;
-		margin: auto;
-	}
-
-	.progress-bar {
-
-		text-align: center;
-		    margin-top: 20px;
-		/deep/.u-circle-progress {
-			
-			position: relative;
-			// min-width:220px;
-			// min-height: 220px;
-		}
-
-		.u-progress-content {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-		}
-
-
-		.u-progress-dot {
-			width: 16rpx;
-			height: 16rpx;
-			border-radius: 50%;
-			background-color: #fb9126;
-		}
-
-		.u-progress-info {
-			@include themeify{
-				font-size: themed('font-size6');
-			}
-/*			font-size: 22px;*/
-			padding-left: 16rpx;
-			letter-spacing: 2rpx;
-			color: rgba(51, 51, 51, 100);
-		}
-
-		/deep/.u-progress-dot[data-v-05b104e0] {
-			display: none;
-		}
-
-		/deep/.u-circle-progress[data-v-cab6fc66] {
-			margin: 30px;
-		}
-
-	}
-
-	.starting {
-/*		height: 22px;*/
-		color: rgba(0, 185, 98, 100);
-		@include themeify{
-			font-size: themed('font-size3');
-			height:themed('font-size6');
-		}
-/*		font-size: 16px;*/
-		text-align: center;
-		margin-top: 10px;
-	}
-
-	.timer {
-		height: 43px;
-		color: rgba(51, 51, 51, 100);
-		@include themeify{
-			font-size: themed('font-size13'); 
-		}
-/*		font-size: 36px;*/
-		text-align: center;
-		margin-top: 40px;
-	}
-
-	.charged {
-/*		height: 20px;*/
-		color: rgba(153, 153, 153, 100);
-		@include themeify{
-			font-size: themed('font-size2'); 
-			height:themed('font-size5')
-		}
-/*		font-size: 14px;*/
-		text-align: center;
-		margin-top: 4px;
-	}
-
-	.cost {
-		// width: 50%;
-		padding: 0 50px;
-		margin-top: 16px;
-		    margin: auto;
-		    width: 280px;
-		display: flex;
-		justify-content: space-between;
-
-		.cost-top {
-			line-height: 33px;
-			text-align: center;
-			@include themeify{
-				font-size: themed('font-size7');  
-			}
-/*			font-size: 24px;*/
-			position: relative;
-
-			.cost-font {
-				position: absolute;
-				top: 0;
-				right: -25px;
-				color: #ff6200;
-				@include themeify{
-					font-size: themed('font-size7');  
-				}
-/*				font-size: 24px*/
-			}
-		}
-
-		.cost-bottom {
-			@include themeify{
-				line-height: themed('font-size5');  
-			}
-/*			line-height: 20px;*/
-			color: #999999;
-			text-align: center;
-		}
-	}
-
-	.line {
-		width: 0;
-		height: 36px;
-		border: 1px solid rgba(237, 237, 237, 100);
-		margin-top: 10px;
-		background-color: #ededed;
-	}
-
-	.power {
-		display: flex;
-		justify-content: space-around;
-		padding: 0 55px;
-		margin-top: 40px;
-
-		.power-num {
-/*			height: 27px;*/
-			color: rgba(51, 51, 51, 100);
-			@include themeify{
-				font-size: themed('font-size5');  
-				height: themed('font-size9');  	
-			}
-/*			font-size: 20px;*/
-			text-align: center;
-		}
-
-		.power-text {
-/*			height: 20px;*/
-			color: rgba(153, 153, 153, 100);
-			@include themeify{
-				font-size: themed('font-size2');  
-				height: themed('font-size5');  	
-			}
-/*			font-size: 14px;*/
-			text-align: center;
-		}
-	}
-
-	.info {
-		display: flex;
-		justify-content: space-between;
-		margin: 0 40px;
-		// height: 48px;
-		line-height: 48px;
-		background-color: rgba(255, 255, 255, 100);
-		color: rgba(16, 16, 16, 100);
-		border-bottom: 1px solid #ededed;
-
-		.info-text {
-			@include themeify{
-				line-height: themed('font-size7');   
-			}
-/*			line-height: 23px;*/
-			padding: 13px 0 12px;
-			//width: 200px;
-			text-align: right;
-		}
-	}
-	.charge-infos{
-		padding: 20px 36px;
-		margin: 0 auto;
-		.item{
-			display: flex;
-			justify-content: space-between;
-			color: rgba(102, 102, 102, 100);
-			font-size: 18px;
-			margin-bottom: 12px;
-			.discounts{
-				color:red
-			}
-		}
-	}
-
-	.bottom2 {
-	
-		padding: 12px 20px;
-		background-color: #fff;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		margin: auto;
-
-		 
-	}
-
-
-	.progress-bar2 {
-			text-align: center;
-			margin-top: 20px;
-
-		/deep/.u-circle-progress {
-		//	margin-left: 23.3% !important;
-			position: relative;
-
-		}
-
-		.u-progress-content {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-		}
-
-
-		.u-progress-dot {
-			width: 16rpx;
-			height: 16rpx;
-			border-radius: 50%;
-			background-color: #fb9126;
-		}
-
-		.u-progress-info {
-			display: block;
-			@include themeify{
-				font-size: themed('font-size11');   
-			}
-/*			font-size: 32px;*/
-			padding-left: 16rpx;
-			letter-spacing: 2rpx;
-			color: rgba(51, 51, 51, 100);
-
-			.progress-text {
-				@include themeify{
-					font-size: themed('font-size2');   
-				}
-/*				font-size: 14px;*/
-				text-align: center;
-				color: #666666;
-			}
-		}
-
-		/deep/.u-progress-dot[data-v-05b104e0] {
-			display: none;
-		}
-
-		/deep/.u-circle-progress[data-v-cab6fc66] {
-			margin: 30px;
-		}
-
-	}
-
-	.time-price {
-		display: flex;
-		justify-content: space-between;
-		padding: 0 65px;
-
-		.item-num {
-/*			height: 33px;*/
-			color: rgba(51, 51, 51, 100);
-			@include themeify{
-				font-size: themed('font-size7');   
-				height:themed('font-size12')
-			}
-/*			font-size: 24px;*/
-			text-align: center;
-		}
-
-		.item-text {
-			eight: 20px;
-			color: rgba(153, 153, 153, 100);
-			@include themeify{
-				font-size: themed('font-size2');   
-			}
-/*			font-size: 14px;*/
-			text-align: center;
-		}
-	}
-
-	// .bottom {
-	// 	background-color: #fff;
-	// 	display: flex;
-	// 	width: 91.4%;
-	// 	padding: 0 16px;
-	// 	margin:0 auto 40px;
-
-	// 	.u-size-default {
-	// 		border: 1px solid rgba(0, 185, 98, 100);
-	// 		color: #00b962;	
-	// 		width: 44%;
-	// 	}
-	// }
-
-// 反馈
-.feedback{
-	padding: 20px 36px ;
-	.title-1{
-		color: rgba(16, 16, 16, 100);
-		font-size: 18px;
-	}
-	.title-2{
-		color: rgba(102, 102, 102, 100);
-		margin-top: 8px;
-		line-height: 20px;
-	}
-	textarea{
-		margin-top: 16px;
-		width: 93.5%;
-		height: 100px;
-		background-color: rgba(228, 228, 228, 100);
-		color: rgba(153, 153, 153, 100);
-		font-size: 16px;
-		border-radius: 12px;
-		padding: 12px;
-		line-height: 23px;
-		
-	}
-	.submit{
-		height: 44px;
-		line-height: 26px;
-		border-radius: 50px;
-		background-color: rgba(0, 185, 98, 100);
-		color: rgba(255, 255, 255, 100);
-		font-size: 18px;
-		margin-top: 16px;
-	}
-}
-
-
-</style>
-
-
-
-<style lang="scss" scoped>
-	page {
-		background-color: #f6f8f8;
-		padding-bottom: 60px;
-	}
-.to-recharge{
-	position: absolute;
-	right: 22px;
-	color: #333333
-}
-	// 充电状态
-	.charge-state {
-		
-		width: 100%;
-		
-
-
-	}
-
-	// 充电信息
-	.charge-info {
-		background-color: #ffffff;
-		width: 88.2%;
-		padding: 20px 10px 4px 7px;
-		margin: 24px auto 0;
-		box-shadow: 0px 2px 8px 0px #1A095A34;
-		border-radius: 12px;
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: space-between;
-
-		.info-item {
-			width: 33%;
-			text-align: center;
-			margin-bottom: 14px;
-
-			.content {
-				line-height: 33px;
-				color: rgba(51, 51, 51, 100);
-				font-size: 24px;
-                font-weight: 550;
-			}
-
-			.name {
-				line-height: 22px;
-				color: rgba(119, 119, 119, 100);
-				font-size: 16px;
-
-			}
-		}
-	}
-
-	//其他信息
-	.else-infos {
-		padding: 0 12px;
-		background-color: #ffffff;
-		width: 88.2%;
-		margin: 16px auto 0;
-		border-radius: 12px;
-		.item{
-			display: flex;
-			justify-content: space-between;
-			line-height: 23px;
-			padding: 10px 0 10px 0;
-			border-bottom: 1px solid #E9EBEE;
-			.title{
-				// width: 100px;
-				width: 26.6vw;
-				color: rgba(16, 16, 16, 100);
-				font-size: 18px;
-				font-weight: 550;
-				.time{
-					font-size: 13px;
-					color: #666666 100%;
-					font-weight: normal;
-				}
-			}
-			.detail{
-				// width: 197px;
-				width: 52.5vw;
-				color: rgba(16, 16, 16, 100);
-				font-size: 16px;
-				text-align: right;
-				.electrovalence{
-					.num{
-						color: rgba(255, 61, 0, 100);
-						margin-right: 4px;
-					}
-				}
-				
-				.electrovalence-monthlyCard{
-					font-size: 14px;
-					color: #959595;
-				}
-			}
-			
-		}
-
-	}
-	// 底部按钮
-	.bottom{
-		background:white ;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		display: flex;
-		padding: 12px 24px;
-		padding-bottom: 12px;
-		    z-index: 999;
-		.img-box{
-			width: 48px;
-			height: 48px;
-			padding: 12px 0;
-			background-color: rgba(210, 215, 213, 100);
-			text-align: center;
-			border-radius: 999px;
-			
-			img{
-				
-			}
-		}
-		button{
-			width: 60.8%;
-			background-color: black;
-			color: #fff;
-			height: 48px;
-			border-radius: 50px;
-			font-size: 18px;
-		}
-	}
-</style>

+ 32 - 3
pages/searchPile/searchPile.vue

@@ -155,6 +155,16 @@
 							<text class="park-p" style="color: #FFFFFF;">p</text>
 							<text class="park-text">{{item.parkingDescription}}</text>
 						</view>	
+						<view class="park" >
+							<!-- <text class="park-p" style="color: #FFFFFF;">p</text> -->
+							<img src="@/assets/img/riFill-coupon-3-fill.svg">
+							<view class="park-text park-text2">
+								<view class="park-text3"> 
+									本站<span v-if="item.giveDiscount" >服务费{{item.discountRatio/10}}折,</span>支持包月卡、服务费代金券和超级代金券等优惠活动
+									
+								</view>
+							</view>
+						</view>	
 					</view>
 					<view class="img-box">
 						<img :src="item.image" alt="">
@@ -855,14 +865,19 @@ export default {
 //									longitude: 112.28541 + i * 0.001,
 //									latitude: 30.308354 + i * 0.01
 									};
-						if(items[i].id != null)
-							obj.id = items[i].id;
+						if(items[i].id != null){
+								obj.id = items[i].id;
+								obj=items[i];
+						}
+						
 						else
 							continue;
 						if(items[i].type.indexOf("1")>=0 && items[i].type.indexOf("2")>=0)
 						{
 							obj.type = '快/慢'
 						}
+						
+						
 						if(items[i].name!=null)
 							obj.name = items[i].name;
 						if(items[i].address!=null)
@@ -885,6 +900,7 @@ export default {
 						if(items[i].image != null){
 							obj.image = items[i].image;
 						}
+						
 						if(items[i].parkingDescription != null){
 							obj.parkingDescription = items[i].parkingDescription;
 						}
@@ -944,8 +960,11 @@ export default {
 	//									longitude: 112.28541 + i * 0.001,
 	//									latitude: 30.308354 + i * 0.01
 								};
-							if(items[i].id != null)
+							if(items[i].id != null){
 								obj.id = items[i].id;
+								obj = items[i];
+							}
+								
 							else
 								continue;
 							if(items[i].type.indexOf("1")>=0 && items[i].type.indexOf("2")>=0)
@@ -1648,6 +1667,16 @@ font-weight: 600;
 		margin-top: 2px;
 	}
 	
+	.park-text2 {
+		    width: 140%;
+		}
+		.park-text3 {
+			    white-space: nowrap;
+			 
+			 
+			    text-overflow: ellipsis;
+			    overflow: hidden;
+			}
 	 .map {
 		width: 100%;
 	 

+ 1 - 1
pages/searchPile/searchPileMap.vue

@@ -49,7 +49,7 @@
 			<view class="station-icon3"><text class="iconfont">&#xe606;</text>
 				<view class="corner3"></view>
 			</view>
-			<img src="static/img/地图@1x.png" alt="">
+		
 		</view>
 
 		<view class="charing-slow">

+ 9 - 2
pages/searchPile/stationAndPile/chargePriceDetails.vue

@@ -19,9 +19,14 @@
 								<text class="unit">元/度</text>
 							</view>
 						</view>
-						<view class="unitPrice-serviceCharge">
+						<view class="unitPrice-serviceCharge" v-if="!chargingStation.giveDiscount">
 							充电单价:{{item.single_price.toFixed(2)}}元 | 服务费:{{item.service_price.toFixed(2)}}元
 						</view>
+						<view class="unitPrice-serviceCharge" v-if="chargingStation.giveDiscount">
+							
+							充电单价:{{item.electricityPrice.toFixed(2)}}元 | 服务费:折后{{item.discountServicePrice}}元(折前{{item.servicePrice.toFixed(2)}})
+						
+						</view>
 						<view v-if="item.current" class="product_tip">
 							<view class="product_tip_bg"></view>
 							<p>当前</p>
@@ -54,6 +59,7 @@
 				id:"",
 				type:"",
 				elderMode:false,
+				chargingStation:{},
 				list:[],
 				items:[],
 				current: 0,
@@ -85,6 +91,7 @@
 //					//('data'+JSON.stringify(res))
 					if(res.result){
 						let data = res.data;
+						_self.chargingStation=res.data.chargingStation;
 						if(data.prices){
 							//('data'+JSON.stringify(data.prices))
 								
@@ -114,7 +121,7 @@
 									let _subitem = _item.priceList[j];
 									//('priceList'+JSON.stringify(_subitem))
 									
-									let subitem = {time:'00:00-07:00',single_price:0,service_price:0,price:0};
+									let subitem =_subitem;
 									subitem.time = _subitem.startTime + '-'+_subitem.endTime;
 									subitem.single_price = _subitem.electricityPrice;
 									subitem.service_price = _subitem.servicePrice;

+ 18 - 28
pages/searchPile/stationAndPile/chargingPileDetails.vue

@@ -37,16 +37,19 @@
 							</view>
 						</view>
 						<view class="content">
-							当前时段:{{price.startTime}}~{{price.endTime}}    费用为{{price.costPrice.toFixed(2)}} 元/度(含电费{{price.electricityPrice.toFixed(2)}}元/度 + 服务费{{price.servicePrice.toFixed(2)}}元/度)
+							当前时段:{{price.startTime}}~{{price.endTime}}    费用为<span style="color: #00b962;">{{price.costPrice.toFixed(2)}} </span>元/度
+							<span v-if="station.giveDiscount">(含电费{{price.electricityPrice.toFixed(2)}}元/度 + 服务费{{price.discountServicePrice.toFixed(2)}}元/度(折前价{{price.servicePrice.toFixed(2)}}元/度))</span>
+							
+							<span v-if="!station.giveDiscount">(含电费{{price.electricityPrice.toFixed(2)}}元/度 + 服务费{{price.servicePrice.toFixed(2)}}元/度)</span>
 							
 						</view>
 					</view>
-					<view class="item" v-if="false">
+					<view class="item" v-if="station.parkingDescription" >
 						<view class="title">
 							停车费用
 						</view>
-						<view class="content">
-							充电免停2小时停车费(临牌车不享受免停)
+						<view class="content" v-html="station.parkingSimpleDescription?station.parkingSimpleDescription:station.parkingDescription">
+							 
 						</view>
 					</view>
 					
@@ -78,6 +81,8 @@
 				</view>
 				<view class="price" v-if="price">
 					<text>{{price.costPrice.toFixed(2)}}</text><text class="unit">元/度</text>
+					<text class="unit"   v-if="station.giveDiscount" >(折前价{{((price.electricityPrice*1000+price.servicePrice*1000)/1000).toFixed(2)}}元/度)</text>
+					
 				</view>
 				<view class="address">
 					{{detail.stationAddress}}
@@ -95,8 +100,7 @@
 			
 				{{canUse?'充电服务费包月卡':'此充电站不支持月卡服务'}}
 				
-				<view v-if="!vinCk()" style="color: red;">vin码不一致,无法享受月卡服务</view>
-			
+				 
 			</view>
 			
 		</view>
@@ -128,7 +132,7 @@
 			</view>
 			<view class="car-number">
 				{{car?car.carNum:''}}
-				<img   v-if="!car" @click="carDet(car?car.carNum:'')" src="../../../static/img/riLine-edit-box-line Copy.svg" alt="">
+				<img   v-if="!car" @click="carDet(car?car.carNum:'')" src="../../../static/img/riLine-edit-box-line2.svg" alt="">
 			</view>
 		</view>
 
@@ -149,20 +153,7 @@
 		<!-- 弹窗 -->
 		<view>
 
-		<u-modal v-model="showVin"  class="showOss"
-		    confirm-text="知道了"
-		:show-title="false"  >
-			<view class="slot-content">
-				
-					<u-image width="120px"  style="margin: auto;"
-					mode="widthFix"  
-					src="@/static/img/充电中-缺省页.png"></u-image>
-					<view style="padding:0 40px;font-size: 36rpx;">
-						系统检测出当前充电车辆与包月卡所绑定的车辆不一致,该车辆可以正常充电,但无法享受包月卡免服务费优惠。
-						
-					</view>
-			</view>
-		</u-modal>
+		 
 		
 		
 			<u-modal v-model="show" @confirm="confirmPhone" :confirm-text="confirmText" confirm-color="#606266"
@@ -185,6 +176,7 @@
 	export default {
 		data() {
 			return {
+				station:{},
 				step:0,
 				isInsert:false,
 				isReady: false,
@@ -315,9 +307,7 @@
 					
 					if(this.userCardBool){
 						//检查vin码
-						if(!this.vinCk()){
-							this.showVin=true;
-						}
+						 
 					}
 					
 				}).catch(error2 => {
@@ -339,6 +329,7 @@
 						uni.hideLoading()
 					this.gunDetail= res.data;
 					this.detail = res.data.device
+					this.station = res.data.station
 					this.prices = res.data.prices
 					this.price=res.data.price
 					this.gun = res.data.gun
@@ -390,9 +381,7 @@
 							'&deviceNo=' + this.detail.deviceNo + "&gun=" + this.gun.channelNo + "&carNumber=" + (
 								this.car ? this.car.carNum : '');
 					
-					if(!this.vinCk()){
-						url+="&vin=no"
-					}
+					 
 					uni.navigateTo({
 						url: url
 					})
@@ -528,7 +517,8 @@
 				margin-top: 12px;
 
 				.unit {
-					font-size: 16px
+					font-size: 16px;
+					color: #666666;
 				}
 			}
 

+ 15 - 3
pages/searchPile/stationAndPile/stationDetails.vue

@@ -42,7 +42,16 @@
 				<view class="item-text oldTextjp2" oldstyle="font-size: 16px;">
 					{{stationDetail.station.describe}}
 				</view>
-			</view>
+			</view>
+			
+			<view class="details-item">
+				<img class="iconfont font5" src="@/assets/img/riLine-coupon-3-line.svg"  style="width: 40rpx;" >
+				<!-- <view class="iconfont font5" style="color: #ffad79;">&#xe621;</view> -->
+				<view class="item-text oldTextjp2" oldstyle="font-size: 16px;">
+					本站<span v-if="stationDetail.station.giveDiscount">服务费{{stationDetail.station.discountRatio/10}}折,</span>支持包月卡、服务费代金券和超级代金券等优惠活动
+				</view>
+			</view>
+			
 			<view class="station-address" @click="map">
 				<img src="static/img/Frame 201.png" alt="">
 				<view class="address-text  oldTextjp" oldstyle="font-size: 16px;">
@@ -262,8 +271,11 @@
 									<text class="unit">元/度</text>
 								</view>
 							</view>
-							<view class="unitPrice-serviceCharge">
-								充电单价:{{item.electricityPrice.toFixed(2)}}元 | 服务费:{{item.servicePrice.toFixed(2)}}元
+							<view class="unitPrice-serviceCharge" v-if="stationDetail.station.giveDiscount">
+								充电单价:{{item.electricityPrice.toFixed(2)}}元 | 服务费:折后{{item.discountServicePrice}}元(折前{{item.servicePrice.toFixed(2)}})
+							</view>
+							<view class="unitPrice-serviceCharge" v-if="!stationDetail.station.giveDiscount">
+								充电单价:{{item.electricityPrice.toFixed(2)}}元 | 服务费:{{item.servicePrice.toFixed(2)}}元
 							</view>
 							<view v-if="item.current" class="product_tip">
 								<view class="product_tip_bg"></view>

+ 3 - 3
pages/user/dataSet.vue

@@ -129,7 +129,7 @@
 			<!-- 车辆信息 -->
 			<view class="userCell-item">
 				<view class="userCell-title oldTextjp" oldstyle="font-size: 20px;">
-					<text class="user"><img style="visibility: middle;;" src="../../assets/img/car-fill (1).svg"
+					<text class="user"><img style="visibility: middle;;" src="../../assets/img/car-fill.svg"
 							alt=""></text>
 					<p class="oldTextjp" oldstyle="font-size: 18px;">车辆信息</p>
 				</view>
@@ -193,7 +193,7 @@
 					<p>修改昵称</p>
 
 					<textarea name="" id="" cols="30" rows="10" v-model="name1"></textarea>
-					<img class="canc" src="../../assets/img/md-cancel Copy@3x.png" alt="" @click="nickNameReset">
+					<img class="canc" src="../../assets/img/md-cancel@3x.png" alt="" @click="nickNameReset">
 					<u-button type="success" @click="nickNameSubmit">保存</u-button>
 				</view>
 			</view>
@@ -206,7 +206,7 @@
 					<p>请填写真实姓名</p>
 		
 					<textarea name="" id="" cols="30" rows="10" v-model="name2"></textarea>
-					<img class="canc" src="../../assets/img/md-cancel Copy@3x.png" alt="" @click="realNameReset">
+					<img class="canc" src="../../assets/img/md-cancel@3x.png" alt="" @click="realNameReset">
 					<u-button type="success" @click="realNameSubmit">保存</u-button>
 				</view>
 			</view>

+ 0 - 1
pages/user/index.vue

@@ -572,7 +572,6 @@
 </script>
 <style>
 	page{
-		background:url(../../assets/img/index_header_bg.png) no-repeat top center #f7f7f7;
 		background-size: 100%;
 	}
 </style>

+ 1 - 1
pages/user/mine.vue

@@ -100,7 +100,7 @@
 		</view>
 		<!-- 优惠 -->
 		<view class="discounts">
-			<img src="../../assets/img/discounts.png" alt="">
+			
 
 		</view>
 	<!-- 菜单 -->

+ 0 - 467
pages/user/myPile/pileManagement.vue

@@ -1,467 +0,0 @@
-<template>
-	<view>
-		<ujp-navbar title="电桩管理">
-			<view class="delete">删除</view>
-		</ujp-navbar>
-		<view class="details">
-			<view class="name">
-				大润发顶楼停车场01号直流80kW
-			</view>
-			<view class="info">
-				<view class="info-text">
-					<p>2015国标 |<text class="dc-fast"> 直流快充 </text> | 80kW</p>
-					<p class="tag-items">
-						<view class="tag">
-							对外开放
-						</view>
-						<view class="tag">
-							可预约
-						</view>
-						<view class="tag">
-							设备在线
-						</view>
-					</p>
-				</view>
-				<view class="info-img">
-					<img src="../../../static/img/电桩管理.png" alt="">
-				</view>
-			</view>
-
-			<view class="station-address">
-				<img src="static/img/Frame 201.png" alt="">
-				<view class="address-text">
-					湖北省荆州市沙市区江津东路附155号
-				</view>
-
-				<view class="navigation">
-					<view class="iconfont address-font">
-						&#xe60c;
-
-					</view>
-					<view class="view-map">导航</view>
-
-				</view>
-
-			</view>
-			
-			<u-cell-group  >
-				<u-cell-item title="联系人" :arrow="false" value="李先生 15500001111"></u-cell-item>
-				<u-cell-item  title="电价" :arrow="false" value="1.25元/度(12:00-14:00)"> </u-cell-item>
-				<view class="price-detail">
-					价格详情
-				</view>
-				<u-cell-item  title="停车费" :arrow="false" value="新能源车2小时停车费"></u-cell-item>
-			</u-cell-group>
-
-		</view>
-
-<!-- 充电枪选项 -->
-<view class="gun-options">
-	<u-tabs :list="list1" :is-scroll="false" :current="current" @change="change" bar-width="125" inactive-color="#777777" active-color="#101010"></u-tabs>
-	<view class="tab-equipment" v-show="current==0">
-		<view class="equipment-top">
-			<text class="name">1号充电枪</text>  
-			<text class="switch"><u-switch v-model="checked" size="40" active-color="#FF7300"></u-switch></text>
-			<text class="radio"> 	
-			开启共享</text>
-		</view>
-		<view class="state">
-			<view class="state-item">
-				工作状态:充电中 <text class="bot1"></text>
-			</view>
-			<view class="state-item">
-				工作状态:正常 <text class="bot1 bot2"></text>
-			</view>
-			<view class="state-item">
-				工作状态:故障 <text class="bot1 bot2"></text>
-			</view>
-			<view class="state-item">
-				工作状态:联网 <text class="bot1 bot2"></text>
-			</view>
-			<view class="iconfont more"><text class="set" >设置</text>&#xe600;</view>
-		</view>
-		
-	</view>	
-	
-	<view class="tab-equipment"  v-show="current==0">
-		<view class="equipment-top">
-			<text class="name">2号充电枪</text>  
-			<text class="switch"><u-switch v-model="checked" size="40" active-color="#FF7300"></u-switch></text>
-			<text class="radio"> 	
-			开启共享</text>
-		</view>
-		<view class="state">
-			<view class="state-item">
-				工作状态:空闲 <text class="bot1 bot2"></text>
-			</view>
-			<view class="state-item">
-				工作状态:正常 <text class="bot1 bot2"></text>
-			</view>
-			<view class="state-item">
-				工作状态:故障 <text class="bot1 bot2"></text>
-			</view>
-			<view class="state-item">
-				工作状态:联网 <text class="bot1 bot2"></text>
-			</view>
-			<view class="iconfont more"><text class="set" >设置</text>&#xe600;</view>
-		</view>
-		
-	</view>
-	<!-- 分润比例 -->
-	<view class="share" v-show="current==1">
-		<view class="title" >
-			<text class="line"></text>分润比列
-		</view>
-		<view class="item">
-			<view >
-				投资方
-			</view>
-			<view >
-				93% 
-			</view>
-		</view>
-		<view class="item">
-			<view >
-				平台收益
-			</view>
-			<view >
-				7%
-			</view>
-		</view>
-		
-	</view>
-	<!-- 设备信息 -->
-	<view class="equipment-info" v-show="current==2">
-	  <view class="title" >
-	  	<text class="line"></text>设备相关信息
-	  </view>
-	  <view class="item">
-		  <view class="">
-		  	设备型号
-		  </view>
-		  <view class="">
-		  	HCD0001-A
-		  </view>
-	  	
-	  </view>
-	  <view class="item">
-	  		  <view class="">
-	  		  	初次安装时间
-	  		  </view>
-	  		  <view class="">
-	  		  	2022-04-1
-	  		  </view>
-	  	
-	  </view>
-	  <view class="item">
-	  		  <view class="">
-	  		  	输出功率范围(瓦)
-	  		  </view>
-	  		  <view class="">
-	  		  	100-400
-	  		  </view>
-	  	
-	  </view>
-	
-
-	</view>
-	
-</view>
-
-<view class="bottom">
-	<u-button type="success" shape="circle">保存</u-button>
-</view>
-	</view>
-</template>
-<script>
-	export default {
-		data() {
-			return {
-				list1: [{
-					name: '设备列表'
-				}, {
-					name: '分润比例'
-				},{
-					name:'设备信息'
-				}],
-				list2: [{
-					name: '是'
-				}, {
-					name: '否'
-				}],
-				timeList:[{
-					name:"10分钟"
-				},
-				{
-					name:"20分钟"
-				},
-				{
-					name:"30分钟"
-				}],
-				current: 0,
-					checked: false,
-			}
-		},
-		methods: {
-			change(index) {
-				this.current = index;
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		padding-bottom: 233px;
-	}
-	.delete {
-		margin-left: 85.3%;
-		color: #cccccc;
-		font-size: 12px
-	}
-
-	.details {
-		width: 100%;
-		background-color: #fff;
-		padding: 16px 0 0px 16px;
-
-		.name {
-			height: 20px;
-			color: rgba(16, 16, 16, 100);
-			font-size: 20px;
-			font-weight: 600;
-		}
-
-		.info {
-			height: 75px;
-			line-height: 16px;
-			color: rgba(102, 102, 102, 100);
-			font-size: 16px;
-			margin-top: 12px;
-			display: flex;
-
-			// justify-content: space-between;
-			.dc-fast {
-
-				color: #CDC0FF;
-				margin: 0 4px;
-			}
-
-			.info-text {
-				width: 69%;
-				height: 100%;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-between;
-
-				.tag-items {
-					display: flex;
-					// justify-content: space-between;
-				}
-
-				.tag {
-					line-height: 26px;
-					border-radius: 4px;
-					background-color: rgba(255, 255, 255, 100);
-					color: rgba(119, 119, 119, 100);
-					text-align: center;
-					border: 1px solid rgba(119, 119, 119, 100);
-					padding: 0 4px;
-					margin-right: 8px;
-
-				}
-			}
-
-			.info-img {
-				// margin-left: 35px;
-			}
-		}
-
-		.station-address {
-			width: 100%;
-
-			margin-top: 17px;
-			position: relative;
-
-			img {
-				width: 100%;
-				height: 100%;
-			}
-
-			.address-text {
-				line-height: 40px;
-				position: absolute;
-				top: 0px;
-				left: 0;
-				font-size: 16px
-			}
-
-			.navigation {
-				position: absolute;
-				top: 0;
-				right: 28px;
-			}
-
-			.address-font {
-				font-size: 28px;
-				color: #4e94ff;
-
-
-			}
-
-			.view-map {
-				font-size: 12px;
-				text-align: center;
-
-			}
-		}
-		/deep/.u-cell__value{
-			text-align: left;
-			margin-left: 16px;
-			color: #101010;
-			 font-size: 16px;
-		}
-		/deep/.u-cell_title{
-			width: 15% !important;
-		    font-size: 16px;
-			color: #777777;
-		}
-		.u-cell{
-			position: relative;
-			    padding: 13px 16px 13px 0 ;
-		}
-		.price-detail{
-			width: 56px;
-			height: 20px;
-			color: rgba(22, 119, 255, 100);
-			font-size: 14px;
-			position: absolute;
-			top: 70px;
-			right: 20px;
-		}
-	}
-
-
-// 充电枪选项
-.gun-options{
-	background-color: #fff;
-	margin-top: 12px;
-	.tab-equipment{
-		background-color: #fff;
-		padding: 16px 16px 16px 0;
-		margin-left: 16px ;
-		border-bottom: 1px solid #E5E7EA;
-		position: relative;
-		.equipment-top{
-			line-height: 27px;
-			position: relative;
-		}
-		.name{
-			line-height: 20px;
-			line-height: 20px;
-			font-weight: 600;
-			color: rgba(16, 16, 16, 100);
-		}
-		.radio{
-			margin-left: 54px;
-			
-			
-		}
-		.switch{
-			position:absolute;
-			top: 3px;
-			left: 21%;
-		}
-		.state{
-			margin-top: 12px;
-			display: flex;
-			justify-content: space-between;
-			width: 75%;
-			flex-wrap: wrap;
-			.state-item{
-				height: 20px;
-				line-height: 20px;
-				margin-top: 4px;
-				color: rgba(16, 16, 16, 100);
-				.bot1{
-					display: inline-block;
-					width: 12px;
-					height: 12px;
-					margin-left: 2px;
-					background-color: rgba(255, 115, 0, 100);
-					border-radius: 999px;
-					
-				}
-				.bot2{
-					background-color: rgba(0, 185, 98, 100);
-				}
-				
-				
-			}
-			.more{
-				
-				line-height: 24px;
-				font-size: 24px;
-				color: #b3b3b3;
-				position: absolute;
-				right: 20px;
-				top: 16px;
-			
-				.set{
-					display: inline-block;
-					width: 30px;
-					font-size: 14px;
-					color: #1677ff;
-			        position: absolute;
-					top: 0;
-					left: -29px;
-					
-				}
-			}
-			
-		}
-	}
-	/deep/.u-tab-bar{
-		background-color: #00B962 !important;
-	}
-.share{
-	padding: 16px;
-    
-}
-	
-.equipment-info{
-	padding: 16px;
-}
-.title{
-	font-size: 16px;
-	font-weight: 600;
-	.line{
-		display: inline-block;
-		height:12px;
-		width: 4px;
-		background-color: #00B962;
-		margin-right: 8px;
-	}
-	
-	}
-	.item{
-			display: flex;
-			justify-content: space-between;
-			margin-top: 20px;
-		}
-}
-.bottom{
-	width: 100%;
-	height: 64px;
-	background-color: #fff;
-	position: fixed;
-	bottom: 0;
-	display: flex;
-	.u-btn{
-		width: 91.4%;
-		height: 40px;
-		margin: auto;
-	}
-}
-
-</style>

BIN
static/img/0314549153.png


BIN
static/img/06002925191.jpg


BIN
static/img/0732159953.png


BIN
static/img/08425983191.png


BIN
static/img/103613441.jpg


BIN
static/img/11091323191.jpg


BIN
static/img/180023631.jpg


BIN
static/img/9999.jpg


BIN
static/img/9999.png


BIN
static/img/AAA.jpg


BIN
static/img/Frame 198 (1).png


BIN
static/img/Frame 203.png


BIN
static/img/Frame 204 (1).png


BIN
static/img/banner.jpg


BIN
static/img/banner1.jpg


+ 0 - 1
static/img/file-list-3-fill.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24"><path fill="none" d="M0 0h24v24H0z"/><path d="M19 22H5a3 3 0 0 1-3-3V3a1 1 0 0 1 1-1h14a1 1 0 0 1 1 1v12h4v4a3 3 0 0 1-3 3zm-1-5v2a1 1 0 0 0 2 0v-2h-2zM6 7v2h8V7H6zm0 4v2h8v-2H6zm0 4v2h5v-2H6z" fill="rgba(157,159,255,1)"/></svg>

BIN
static/img/head1.png


BIN
static/img/logo2.png


BIN
static/img/min_button_select.png


BIN
static/img/mine_bg.png


BIN
static/img/picture_upload.png


BIN
static/img/preview.png


BIN
static/img/riFill-car-fill@1x.png


+ 0 - 6
static/img/riFill-file-add-fill.svg

@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="36" height="36" style="border-color: rgba(187,187,187,1);border-width: 0px;border-style: solid" filter="none">
-    
-    <g>
-    <path d="M21.333 2.667l6.667 6.667v18.677c-0.001 0.731-0.593 1.323-1.324 1.323h-21.352c-0.729-0.005-1.318-0.594-1.324-1.322v-24.022c0-0.731 0.593-1.323 1.324-1.323h16.009zM14.667 14.667h-4v2.667h4v4h2.667v-4h4v-2.667h-4v-4h-2.667v4z" fill="rgba(74.97,210.11999999999998,192.01500000000001,1)"></path>
-    </g>
-  </svg>

BIN
static/img/riFill-file-list-3-fill@1x.png


+ 0 - 6
static/img/riFill-map-pin-time-fill.svg

@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="36" height="36" style="border-color: rgba(187,187,187,1);border-width: 0px;border-style: solid" filter="none">
-    
-    <g>
-    <path d="M17.333 14.667v-6.667h-2.667v9.333h8v-2.667h-5.333zM24.485 23.152l-8.485 8.485-8.485-8.485c-2.172-2.172-3.515-5.172-3.515-8.485 0-6.627 5.373-12 12-12s12 5.373 12 12c0 3.314-1.343 6.314-3.515 8.485v0z" fill="rgba(88.99499999999999,217.005,109.905,1)"></path>
-    </g>
-  </svg>

+ 0 - 6
static/img/riFill-money-cny-box-fill.svg

@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="36" height="36" style="border-color: rgba(187,187,187,1);border-width: 0px;border-style: solid" filter="none">
-    
-    <g>
-    <path d="M4 4h24c0.736 0 1.333 0.597 1.333 1.333v0 21.333c0 0.736-0.597 1.333-1.333 1.333v0h-24c-0.736 0-1.333-0.597-1.333-1.333v0-21.333c0-0.736 0.597-1.333 1.333-1.333v0zM17.333 17.333v-1.333h4v-2.667h-3.448l2.829-2.828-1.887-1.887-2.828 2.829-2.828-2.829-1.887 1.888 2.829 2.827h-3.448v2.667h4v1.333h-4v2.667h4v2.667h2.667v-2.667h4v-2.667h-4z" fill="rgba(110.925,164.985,255,1)"></path>
-    </g>
-  </svg>

+ 0 - 6
static/img/riFill-service-fill.svg

@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="36" height="36" style="border-color: rgba(187,187,187,1);border-width: 0px;border-style: solid" filter="none">
-    
-    <g>
-    <path d="M18.828 13.973c-0.241-0.241-0.575-0.39-0.943-0.39s-0.701 0.149-0.943 0.39v0l-0.943 0.941c-0.486 0.502-1.165 0.814-1.918 0.814-1.473 0-2.667-1.194-2.667-2.667 0-0.753 0.312-1.433 0.813-1.917l0.001-0.001 7.507-7.509c0.578-0.137 1.241-0.216 1.922-0.216 4.786 0 8.667 3.88 8.667 8.667 0 2.159-0.79 4.134-2.096 5.651l0.010-0.011-2.811 2.847-6.6-6.6zM4.215 5.957c1.569-1.569 3.737-2.539 6.131-2.539 1.683 0 3.255 0.48 4.585 1.31l-0.037-0.021-4.551 4.552c-0.967 0.966-1.566 2.3-1.566 3.775 0 2.946 2.388 5.333 5.333 5.333 1.381 0 2.64-0.525 3.588-1.387l-0.004 0.004 0.192-0.183 5.657 5.656-5.657 5.657c-0.483 0.482-1.149 0.781-1.885 0.781s-1.403-0.298-1.885-0.781l-9.901-9.901c-1.568-1.568-2.538-3.735-2.538-6.128s0.97-4.56 2.538-6.128v0z" fill="rgba(157.07999999999998,159.12,255,1)"></path>
-    </g>
-  </svg>

+ 0 - 6
static/img/riFill-shield-user-fill.svg

@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="36" height="36" style="border-color: rgba(187,187,187,1);border-width: 0px;border-style: solid" filter="none">
-    
-    <g>
-    <path d="M5.044 3.768l10.956-2.435 10.956 2.435c0.602 0.137 1.044 0.668 1.044 1.301v0 13.316c-0 2.764-1.402 5.201-3.534 6.638l-0.028 0.018-8.437 5.625-8.437-5.625c-2.16-1.455-3.562-3.891-3.563-6.655v-13.317c0-0.634 0.442-1.164 1.035-1.3l0.009-0.002zM16 14.667c1.841 0 3.333-1.492 3.333-3.333s-1.492-3.333-3.333-3.333v0c-1.841 0-3.333 1.492-3.333 3.333s1.492 3.333 3.333 3.333v0zM10.036 21.333h11.928c-0.342-3.019-2.881-5.344-5.964-5.344s-5.622 2.325-5.961 5.316l-0.003 0.027z" fill="rgba(88.99499999999999,217.005,109.905,1)"></path>
-    </g>
-  </svg>

+ 0 - 6
static/img/riFill-tools-fill.svg

@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="36" height="36" style="border-color: rgba(187,187,187,1);border-width: 0px;border-style: solid" filter="none">
-    
-    <g>
-    <path d="M7.107 4.361c0.467-0.172 1.006-0.271 1.568-0.271 2.577 0 4.667 2.089 4.667 4.667 0 0.563-0.1 1.103-0.282 1.602l0.010-0.032 14.46 14.46-2.829 2.828-14.46-14.459c-0.467 0.172-1.006 0.271-1.568 0.271-2.577 0-4.667-2.089-4.667-4.667 0-0.563 0.1-1.103 0.282-1.602l-0.010 0.032 2.981 2.983c0.364 0.377 0.874 0.611 1.439 0.611 1.105 0 2-0.895 2-2 0-0.565-0.234-1.074-0.61-1.438l-0.001-0.001-2.981-2.985zM20.929 6.873l4.243-2.357 1.885 1.885-2.357 4.243-2.357 0.472-2.827 2.828-1.887-1.885 2.828-2.828 0.472-2.357zM11.501 17.244l2.828 2.829-6.6 6.6c-0.361 0.358-0.859 0.579-1.408 0.579-1.105 0-2-0.895-2-2 0-0.482 0.17-0.924 0.454-1.269l-0.003 0.003 0.129-0.143 6.6-6.6z" fill="rgba(110.925,164.985,255,1)"></path>
-    </g>
-  </svg>

+ 0 - 0
static/img/riLine-edit-box-line Copy.svg → static/img/riLine-edit-box-line2.svg


BIN
static/img/地图@1x.png


BIN
static/img/快乐周末游1x (1).png


BIN
static/img/新闻图.png


BIN
static/img/瓷片区1.png


BIN
static/img/瓷片区2.png


BIN
static/img/电桩管理.png


BIN
static/img/群组@2x.png