调整

.env.dev.js

@@ -1,6 +1,6 @@
 const UNI_APP = {  
 	BASE_URL: 'https://charging.xiaoxinda.com/charging-station-test/',
-	BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
+	//BASE_URL: 'https://51team.xiaoxinda.com/charging-station-server/',
 	//BASE_URL: 'http://192.168.77.162:8081/charging-station/' ,
 	//BASE_URL: 'http://192.168.77.162:8081/charging-station/' ,
 	

pagesFinance/accountType8/chagingrecord/details.vue

@@ -45,7 +45,7 @@
 			<view class="details-row" v-if="detail.record&&detail.record.userCardId" >
 				<p>会员活动 </p>
 				<span>
-					充电服务费包月卡	
+					折扣卡
 				</span>
 			</view>
 			<view class="details-row"   ><p>订单来源 </p><span>{{detail.record?detail.record.platformText:''}}</span></view>

pagesFinance/accountType8/chagingrecord/index.vue

@@ -258,7 +258,7 @@
 				 tabList: [{
 				 	name: '充电订单'
 				 }, {
-				 	name: '月卡订单'
+				 	name: '折扣卡订单'
 				 }],
 				pageIndex: 1,
 				recordsTotal: 0,

pagesFinance/detailed/details.vue

@@ -45,8 +45,9 @@
 			<view class="details-row" v-if="detail.record&&detail.record.userCardId" >
 				<p>会员活动 </p>
 				<span>
-					充电服务费包月卡	
-				</span>
+					折扣卡<span v-if="detail.monthlyRentCard">-{{detail.monthlyRentCard.name}}</span></span>
+					
+				
 			</view>
 			<view class="details-row"   ><p>订单来源 </p><span>{{detail.record?detail.record.platformText:''}}</span></view>
 			

pagesFinance/detailed/index.vue

@@ -163,7 +163,7 @@
 						<span  style="" v-if="item.phone!='XDT41001000004'" >{{item.userType==1?'游客':''}}{{item.userType==2?'会员':''}}</span>
 						<span  style="" v-if="item.phone=='XDT41001000004'" >哪吒用户</span>
 						
-						<span v-if="item.userCardId" style="color:#FF8B00 ;border-color:#FF8B00;">月卡订单</span>
+						<span v-if="item.userCardId" style="color:#FF8B00 ;border-color:#FF8B00;">折扣卡</span>
 					</view>
 				</view>
 				
@@ -255,7 +255,7 @@
 				 tabList: [{
 				 	name: '充电订单'
 				 }, {
-				 	name: '月卡订单'
+				 	name: '折扣卡订单'
 				 }],
 				pageIndex: 1,
 				recordsTotal: 0,

pagesFinance/detailed/monthlyCardDetails.vue

@@ -15,7 +15,7 @@
 				<span>{{regUserCard.payFee?regUserCard.payFee.toFixed(2):0}}元</span>
 			</view>
 			<view class="details-row">
-				<p>月卡卡号</p>
+				<p>折扣卡卡号</p>
 				<span>{{regUserCard.cardNo}}</span>
 			</view>
 			<view class="details-row">
@@ -51,7 +51,7 @@
 			</view>
 			
 			<view class="details-row">
-				<p>月卡有效期</p>
+				<p>有效期</p>
 				<span>{{regUserCard.startTime?regUserCard.startTime.slice(0,10):''}}至{{regUserCard.endTime?regUserCard.endTime.slice(0,10):''}}</span>
 			</view>
 			

pagesFinance/share/details.vue

@@ -48,7 +48,7 @@
 			<view class="details-row" v-if="detail.chargingUserCardId" >
 				<p>会员活动 </p>
 				<span>
-					充电服务费包月卡	
+					折扣卡	
 				</span>
 			</view>
 		</view>

pagesFinance/share/index.vue

@@ -201,7 +201,7 @@
 				tabList: [{
 					name: '分润记录'
 				}, {
-					name: '月卡分润'
+					name: '折扣卡分润'
 				}],
 				params: {
 					year: true,

pagesFinance/share/monthlyCardDetails.vue

@@ -30,9 +30,13 @@
 			</template>
 			
 			
+			<view class="details-row">
+				<p>折扣卡类型</p>
+				<span>{{regUserCard.classifyText}}</span>
+			</view>
 		
 			<view class="details-row">
-				<p>月卡总金额</p>
+				<p>折扣卡总金额</p>
 				<span>{{regUserCard.payFee?regUserCard.payFee.toFixed(2):0}}元</span>
 			</view>
 			<view class="details-row" v-if="rentCardShareProfit.stationName" >
@@ -46,7 +50,7 @@
 			</view>
 			
 			<view class="details-row">
-				<p>月卡分润金额</p>
+				<p>折扣卡分润金额</p>
 				<span>{{rentCardShareProfit.shareProfitAmount?rentCardShareProfit.shareProfitAmount.toFixed(2):0}}元</span>
 			</view>
 			
@@ -81,11 +85,11 @@
 				<span>{{regUser.carNum?regUser.carNum:'未绑定'}}</span>
 			</view>
 			<view class="details-row">
-				<p>月卡卡号</p>
+				<p>折扣卡卡号</p>
 				<span>{{regUserCard.cardNo}}</span>
 			</view>
 <view class="details-row">
-				<p>月卡有效期</p>
+				<p>有效期</p>
 				<span>{{regUserCard.startTime?regUserCard.startTime.slice(0,10):''}}至{{regUserCard.endTime?regUserCard.endTime.slice(0,10):''}}</span>
 				
 			</view>

pagesFinance/statistics/index.vue

@@ -356,7 +356,7 @@
 						<view class="span2">{{(allMoneySum).toFixed(2)}}<span>元</span></view>
 					</view>
 					<view class="details-row">
-						<view class="span1">总利润<span>(服务费+月卡)</span></view>
+						<view class="span1">总利润<span>(服务费+折扣卡)</span></view>
 						<view class="span2">{{(serviceMoneySum).toFixed(2)}}<span>元</span></view>
 					</view>
 				</view>
@@ -437,7 +437,7 @@
 							<view class="details-row details-row-1">
 
 
-								<view class="span1">月卡收益</view>
+								<view class="span1">折扣卡收益</view>
 								<view class="span2">{{(item.cardMoney).toFixed(2)}}<span>元</span></view>
 
 							</view>
@@ -506,7 +506,7 @@
 					<span>{{indexData2.incomeMap.serviceAmount.toFixed(2)}}元</span>
 				</view>
 				<view class="details-row">
-					<p>月卡收益</p>
+					<p>折扣卡收益</p>
 					<span>{{indexData2.incomeMap.cardIncomeAmount.toFixed(2)}}元</span>
 				</view>
 				<view class="details-row">

pagesFinance/statistics/list.vue

@@ -40,7 +40,7 @@
 						<view class="span2">{{(allMoneySum).toFixed(2)}}<span>元</span></view>
 					</view>
 					<view class="details-row">
-						<view class="span1">总利润<span>(服务费+月卡)</span></view>
+						<view class="span1">总利润<span>(服务费+折扣卡)</span></view>
 						<view class="span2">{{(serviceMoneySum).toFixed(2)}}<span>元</span></view>
 					</view>
 				</view>
@@ -125,7 +125,7 @@
 							<view class="details-row details-row-1">
 
 
-								<view class="span1">月卡收益</view>
+								<view class="span1">折扣卡收益</view>
 								<view class="span2">{{(item.cardMoney).toFixed(2)}}<span>元</span></view>
 
 							</view>

pagesFinance/user/applicationDetails.vue

@@ -110,14 +110,14 @@
 			<view class="withdraw">
 
 				<view class="withdraw-head">
-					<b>月卡分润笔数</b>
+					<b>折扣卡分润笔数</b>
 					<span>
 					{{info.monthlyCardTotal}}笔
 
 					</span>
 				</view>
 				<view class="withdraw-head border-n">
-					<b>月卡收益</b>
+					<b>折扣卡收益</b>
 					<span>
 						{{info.monthlyCardIncome?info.monthlyCardIncome.toFixed(2):0}}元
 						

pagesFinance/user/applicationForWithdrawal.vue

@@ -147,14 +147,14 @@
 			<view class="withdraw">
 
 				<view class="withdraw-head">
-					<b>月卡分润笔数</b>
+					<b>折扣卡分润笔数</b>
 					<span  class="classFFF"  >
 						{{info.monthlyCardTotal}}笔
 
 					</span>
 				</view>
 				<view class="withdraw-head border-n">
-					<b>月卡收益</b>
+					<b>折扣卡收益</b>
 					<span  class="classFFF" >
 						{{info.monthlyCardIncome?info.monthlyCardIncome.toFixed(2):0}}元
 

pagesFinance/user/withdraw.vue

@@ -38,10 +38,10 @@
 				<b>此期间总分润金额</b><span class="whthdraw-price">{{info.amount?info.amount.toFixed(2):0}}元</span>
 			</view>
 			<view class="withdraw-head">
-				<b>此期间累计产生月卡分润数</b><span>{{info.cardTotal}}笔</span>
+				<b>此期间累计产生折扣卡分润数</b><span>{{info.cardTotal}}笔</span>
 			</view>
 			<view class="withdraw-head">
-				<b>此期间累计月卡分润金额</b><span class="whthdraw-price">{{info.cardAmount.toFixed(2)}}元</span>
+				<b>此期间累计折扣卡分润金额</b><span class="whthdraw-price">{{info.cardAmount.toFixed(2)}}元</span>
 			</view>
 			<view class="withdraw-head">
 				<b>分润提现明细表</b><span class="download" @click="ckdownload"><u-icon name="download"></u-icon> 下载</span>

pagesFinance/user/withdrawal/applicationDetails.vue

@@ -110,14 +110,14 @@
 			<view class="withdraw">
 
 				<view class="withdraw-head">
-					<b>月卡分润笔数</b>
+					<b>折扣卡分润笔数</b>
 					<span>
 					{{info.monthlyCardTotal}}笔
 
 					</span>
 				</view>
 				<view class="withdraw-head border-n">
-					<b>月卡收益</b>
+					<b>折扣卡收益</b>
 					<span>
 						{{info.monthlyCardIncome?info.monthlyCardIncome.toFixed(2):0}}元
 						

pagesFinance/user/withdrawal/businessInfo.vue

@@ -243,7 +243,7 @@
 					<view class="uni-input"  v-show="electricityPriceX">{{(info.chargingProfitAmount+info.monthlyCardIncome-electricityPriceX).toFixed(2)}}元
 						<view class="tooltip tooltipleft">
 							<u-icon name="info-circle"></u-icon>
-							  <view class="tooltiptext" style="width: 280px;">桩主/站主收益=充电服务收入+包月卡收入-电费</view>
+							  <view class="tooltiptext" style="width: 280px;">桩主/站主收益=充电服务收入+折扣卡收入-电费</view>
 						
 						</view> 
 					</view> 
@@ -283,14 +283,14 @@
 			<view class="withdraw"  v-if="info.applicationType!=2">
 
 				<view class="withdraw-head">
-					<b>月卡分润笔数</b>
+					<b>折扣卡分润笔数</b>
 					<span  class="classFFF"  >
 						{{info.monthlyCardTotal}}笔
 
 					</span>
 				</view>
 				<view class="withdraw-head border-n">
-					<b>月卡收益</b>
+					<b>折扣卡收益</b>
 					<span  class="classFFF" >
 						{{info.monthlyCardIncome?info.monthlyCardIncome.toFixed(2):0}}元
 
@@ -309,7 +309,7 @@
 						<view class="uni-input"  v-show="electricityPriceX">{{(info.chargingProfitAmount+info.monthlyCardIncome-electricityPriceX).toFixed(2)}}元
 							<view class="tooltip tooltipleft">
 								<u-icon name="info-circle"></u-icon>
-								  <view class="tooltiptext" style="width: 280px;">桩主/站主收益=充电服务收入+包月卡收入-电费</view>
+								  <view class="tooltiptext" style="width: 280px;">桩主/站主收益=充电服务收入+折扣卡收入-电费</view>
 							
 							</view> 
 						</view> 

pagesFinance/user/withdrawal/businessView-1.vue

@@ -92,7 +92,7 @@
 								<view class="uni-input">{{info.totalProfitAmount?info.totalProfitAmount.toFixed(2):0}}元	
 								<view class="tooltip tooltipleft">
 									<u-icon name="info-circle"></u-icon>
-									  <view class="tooltiptext" style="width: 280px;">桩主/站主收益=充电服务收入+包月卡收入-电费</view>
+									  <view class="tooltiptext" style="width: 280px;">桩主/站主收益=充电服务收入+折扣卡收入-电费</view>
 								
 								</view> 
 								</view>

pagesFinance/user/withdrawal/businessView-2.vue

@@ -46,7 +46,7 @@
 							<view class="uni-input">{{info.totalProfitAmount?info.totalProfitAmount.toFixed(2):0}}元
 							<view class="tooltip tooltipleft">
 							<u-icon name="info-circle"></u-icon>
-							  <view class="tooltiptext" style="width: 280px;">桩主/站主收益=充电服务收入+包月卡收入-电费</view>
+							  <view class="tooltiptext" style="width: 280px;">桩主/站主收益=充电服务收入+折扣卡收入-电费</view>
 						
 						</view></view>
 							

pagesFinance/user/withdrawal/businessView-3.vue

@@ -147,13 +147,13 @@
 			<view class="withdraw"   >
 
 				<view class="withdraw-head">
-					<b>月卡分润笔数</b>
+					<b>折扣卡分润笔数</b>
 					<span>
 						<view class="uni-input">{{info.monthlyCardTotal}}笔</view>
 					</span>
 				</view>
 				<view class="withdraw-head border-n">
-					<b>月卡收益</b>
+					<b>折扣卡收益</b>
 					<span>
 						<view class="uni-input">{{info.monthlyCardIncome?info.monthlyCardIncome.toFixed(2):0}}元</view>
 

pagesFinance/user/withdrawal/businessView.vue

@@ -181,13 +181,13 @@
 			<view class="withdraw"   >
 
 				<view class="withdraw-head">
-					<b>月卡分润笔数</b>
+					<b>折扣卡分润笔数</b>
 					<span>
 						<view class="uni-input">{{info.monthlyCardTotal}}笔</view>
 					</span>
 				</view>
 				<view class="withdraw-head border-n">
-					<b>月卡收益</b>
+					<b>折扣卡收益</b>
 					<span>
 						<view class="uni-input">{{info.monthlyCardIncome?info.monthlyCardIncome.toFixed(2):0}}元</view>