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

components/u-navbar/u-navbar.vue

@@ -33,7 +33,7 @@
 		
 		<u-alert-tips type="warning" v-if="descriptionModel=='top'&&descriptionShow" 
 		 :descStyle="{
-			     fontSize: '14px',
+			     fontSize: '28rpx',
 			     color: '#ef7a30',
 		 }" @click="alerttipsCk"
 		 :show-icon="true"  :description="description"></u-alert-tips>

pages/searchPile/chargeProcess/dcCharging.vue

@@ -161,7 +161,7 @@
 		 confirm-text="知道了"
 		 title="【充电SOC限制】" >
 			<view  style="padding: 10px;font-size: 14px;">
-						为保障充电安全，并积极响应主管部门对新能源汽车充电安全工作，从即日起，该站充电设施SOC上限阈值为95%，即充电量达到满充电量95%时，充电设施将自动结束充电。
+						为保障充电安全，并积极响应主管部门对新能源汽车充电安全工作，从即日起，该站充电设施SOC上限阈值为{{chargingStation.maxSoc}}%，即充电量达到满充电量{{chargingStation.maxSoc}}%时，充电设施将自动结束充电。
 					</view>
 		</u-modal>
 		 
@@ -189,12 +189,12 @@
 				</ujp-navbar>
 				
 				<u-alert-tips type="warning"
-				v-if="chargingGun.gunType==1"
+				v-if="chargingGun.gunType==1&&chargingStation.maxSoc"
 				 :descStyle="{
 					     fontSize: '28rpx',
 					     color: '#ef7a30',
 				 }" @click="alerttipsCk2"
-				 :show-icon="true"   description="【充电SOC限制】充电量达到满充电量95%时，充电设施将自动结束充电。点击查看详情>"></u-alert-tips>
+				 :show-icon="true"   :description="'【充电SOC限制】充电量达到满充电量'+chargingStation.maxSoc+'%时，充电设施将自动结束充电。点击查看详情>'"></u-alert-tips>
 				
 				<!-- 充电状态 -->
 				<view class="charge-state">

pages/searchPile/stationAndPile/stationDetails.vue

@@ -5,7 +5,18 @@
 				<span style="font-size: 16px; color: rgb(96, 98, 102);" @click="getChargingStationDetail(false)">刷新</span>
 			</view> -->
 		</ujp-navbar>
-
+		
+		<u-alert-tips type="warning"
+		v-if="stationDetail.station&&stationDetail.station.maxSoc"
+		 :descStyle="{
+			     fontSize: '28rpx',
+			     color: '#ef7a30',
+		 }" 
+		 :show-icon="true"   :description="'【充电SOC限制】为保障充电安全，并积极响应主管部门对新能源汽车充电安全工作，从即日起，该站充电设施SOC上限阈值为'+stationDetail.station.maxSoc+'%，即充电量达到满充电量'+stationDetail.station.maxSoc+'%时，充电设施将自动结束充电。'" >
+		 
+		 </u-alert-tips>
+		
+		
 		<view v-if="stationDetail.station!=null" class="station-details">
 			<u-image border-radius='15rpx' v-if="stationDetail.station != null && stationDetail.station.image != null"
 				class="img" width="30.6%" height="75px" :src="stationDetail.station.image" loading-icon="photo"