7.0

.env.dev.js

@@ -12,12 +12,12 @@ const UNI_APP = {
 	//openId:"zkxtest",//zkx
 	
 	openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//zkx
-	//openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",//杨所
+	openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",//杨所
 	//openId:"oK9Wr56vX9nP_B56_Pyigg5n5Ce8",//
 	//openId:"oK9Wr5_2USr1yP4MRew9KbJA0-ng",//老板
 	
-	//openId:"oK9Wr5wkU3OwWhQ7mRrLZ5MDZNHo",
-	//		openId:"oK9Wr50ojExHjOTC_wFcuAEI9s-M",
+	openId:"oK9Wr5wkU3OwWhQ7mRrLZ5MDZNHo",
+			openId:"oK9Wr50ojExHjOTC_wFcuAEI9s-M",
 	//openId:"oK9Wr55J1J1eL6BqI2tW749NTxNU",//zq
 	//openId:"abcd",
 	//小鹏管家appid

main.js

@@ -181,22 +181,22 @@ Vue.mixin({
 	},
 	methods: {
 		discountRatio10(value){
-			//value=19.66;
+			//value=80;
 			var val=value;
-			if([10,20,30,40,50,60,70,80,90].indexOf(value)!=-1){
-				val=value/10
-			}
-			if(value<10){
-				val=value/10
-			}
+			// if([10,20,30,40,50,60,70,80,90].indexOf(value)!=-1){
+				
+			// }
+			val=value/10
 			if(val||val==0){
 				val=""+val
-				if(val.indexOf(".")>-1){
-					if(value<10){
-						val= val.substring(0,val.indexOf(".")+2);
-					}else{
-						val= val.substring(0,val.indexOf("."));
-					}
+				if(val.indexOf(".")>-1){
+					val= val.substring(0,val.indexOf(".")+2);
+					// if(value<10){
+						
+					// }else{
+					// 	val= val.substring(0,val.indexOf("."));
+						
+					// }
 					
 					if(parseInt(val)==parseFloat(val)){
 						val=parseInt(val);
@@ -204,7 +204,9 @@ Vue.mixin({
 				}
 			
 			}
-			
+			if([10,20,30,40,50,60,70,80,90].indexOf(value)!=-1){
+				val=val+".0"
+			}
 			return val
 		},
 		gotoUrl(url) {

pages/index/index.vue

@@ -394,12 +394,12 @@
 					{{stationData.address}}
 				</view>
 				<view class="sign" v-else>
+					<view class="sign-tag sign-0" v-if="stationData.isRecommend">推荐</view>
+					<view class="sign-tag sign-5" v-if="stationData.isAlways">常用</view>	
+					
+					
 					<template v-if="personInfo&&personInfo.userType!=1">
-						<!-- 	 -->
-						<view class="sign-tag sign-0" v-if="stationData.isRecommend">推荐</view>
-						<view class="sign-tag sign-5" v-if="stationData.isAlways">常用</view>	
-						
-						
+						<!-- 	 -->
 						<view class="sign-1"
 							v-if="stationData.giveDiscount&&stationData.discountRatio&&stationData.discountRatio!=100">
 							会员服务费{{discountRatio10(stationData.discountRatio)}}折</view>
@@ -408,9 +408,9 @@
 							v-if="stationData.nightLowPriceEnabled">
 							夜间超低价</view>
 
-						<view class="sign-2" v-if="stationData.tagList.length != 0"
-							v-for="(tagName,tagIndex) in stationData.tagList" :key="tagIndex">{{tagName}}</view>
 					</template>
+					<view class="sign-2" v-if="stationData.tagList.length != 0"
+						v-for="(tagName,tagIndex) in stationData.tagList" :key="tagIndex">{{tagName}}</view>
 				</view>
 				<view class="price-free oldTextClass">
 					<view class="price">