管理端班次

.env.dev.js

@@ -1,6 +1,7 @@
 const UNI_APP = {  
+	BASE_URL: 'http://121.37.187.149/smart-bus-server/' ,
 	
-    BASE_URL: 'https://ykt-test.xiaoxinda.com/smart-bus-server/' ,
+  //  BASE_URL: 'https://ykt-test.xiaoxinda.com/smart-bus-server/' ,
 	NODE_ENV :"dev",
 	SIMPLE_RUN:true,// 无视权限控制跳转页面   ， 用于样式人员快速访问各种功能 ，快速测试等
 	//企业联合会微信appid

.env.test.js

@@ -1,8 +1,8 @@
 const UNI_APP = {  
-	BASE_URL: 'http://192.168.33.120:8087/smart-bus-server/' ,
+	//BASE_URL: 'http://192.168.33.120:8087/smart-bus-server/' ,
 	//BASE_URL: 'https://xpgjapi.xiaoxinda.com/' ,
 	//BASE_URL: 'https://ykt-test.xiaoxinda.com/smart-bus-server/' ,
-	//BASE_URL: 'http://121.37.187.149/smart-bus-server/' ,
+	BASE_URL: 'http://121.37.187.149/smart-bus-server/' ,
 	
 	NODE_ENV :"test",
 	SIMPLE_RUN:true,

pages.json

@@ -89,6 +89,24 @@
             
         }
        
+        ,{
+            "path" : "pages/class/list",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/class/info",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	 
 	"globalStyle": {

pages/class/info.vue

@@ -0,0 +1,25 @@
+<template>
+	<view>
+		<car-common   ref="common"  ></car-common>
+		<u-navbar   title="当班营收详情" :is-back="true" >
+				<view class="slot-wrap"></view>	
+		</u-navbar>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/class/list.vue

@@ -0,0 +1,25 @@
+<template>
+	<view>
+		<car-common   ref="common"  ></car-common>
+		<u-navbar   title="班次统计" :is-back="true" >
+				<view class="slot-wrap"></view>	
+		</u-navbar>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/index/index.js

@@ -3,17 +3,59 @@ import * as API  from '@/apis/merchant.js'
 	export default {
 		data() {
 			return {
-				 
+				 selectList: [{
+				 		id: '',
+				 		licensePlateNumber: '全部车辆'
+				 	},
+				 ],
+				 	show1: false,
+				 selectForm: { 
+				 	select1: '',
+				 	select1Name: '全部车辆',
+				},
 				revenueStatisticsDown:{},
 				revenueStatisticsUp:{},
 			}
 		},
 		methods: { 
+			getMerchantVehicleList() {
+				this.$refs.common.showLoading()
+				API.merchantVehicleList().then(response => {
+					var selectList1 = [{
+							id: '',
+							licensePlateNumber: '全部车辆'
+						},
+						...response.data
+					]
+					// selectList1
+					this.selectList = selectList1;
+					this.$refs.common.showLoading(false);
+					//this.getProfitList();
+					this.getRevenueStatisticsUp();
+				}).catch(error => {
+					this.$refs.common.showLoading(false, error);
+				})
+			},
+			show1confirm(op) {
+			
+				var i = op[0];
+				this.selectForm.select1Index=i;
+				var obj = this.selectList[i]
+			
+				this.selectForm.select1 = obj.id;
+				this.selectForm.select1Name = obj.licensePlateNumber;
+				//this.getProfitList();
+			},
 			gotoUrl(){
 				uni.switchTab({
 				    url: '/pages/order/index'
 				});
 			},
+			gotoUrl2(){
+				uni.navigateTo({
+				    url: '/pages/class/list'
+				});
+			},
 			getRevenueStatisticsDown(){
 				this.$refs.common.showLoading()				
 				API.revenueStatisticsDown().then(response => {
@@ -48,7 +90,8 @@ import * as API  from '@/apis/merchant.js'
 		onLoad(temp) {
 			
 		},onReady(){
-				this.getRevenueStatisticsUp();
+			this.getMerchantVehicleList()
+				
 		}
 	}
 

pages/index/index.vue

@@ -1,10 +1,11 @@
 <template>
 	<view>
 		<car-common   ref="common"  ></car-common>
+		<u-picker v-model="show1" mode="selector" @confirm="show1confirm"  :default-selector="[selectForm.select1Index]" :range="selectList" range-key="licensePlateNumber"></u-picker>
 		
 		<view class="von-index-bar">
 			<view class="text-center mb-1">
-				<h3 >营收统计</h3>
+				<h3 @click="show1=true" >{{selectForm.select1Name}}<text class="icon iconfont icon-xiajiantou"></text></h3>
 				<h6>今日收益</h6>
 				<h1>{{revenueStatisticsUp.todayRevenue}}元</h1>
 			</view>
@@ -17,17 +18,19 @@
 		</view>
 		<view class="von-index-row">
 			<u-cell-group>
-				<u-cell-item title="收益明细" @click="gotoUrl"  ></u-cell-item>
+				<u-cell-item title="收益明细" style="width: 49%;background-color: transparent;float: left;" @click="gotoUrl"  ></u-cell-item>
+				<u-cell-item title="班次营收统计"  style="width: 49%;background-color: transparent;" @click="gotoUrl2"  ></u-cell-item>
+				
 			</u-cell-group>
 			<u-row>
 			    <u-col :span="6">
 			        <view class="von-index-col">今日售票笔数<h3>{{revenueStatisticsDown.num}}笔</h3></view>
 			    </u-col>
 				<u-col :span="6">
-				    <view class="von-index-col">线上购票收款<h3>{{revenueStatisticsDown.onlineRevenue}}元</h3></view>
+				    <view class="von-index-col">现金收款<h3>{{revenueStatisticsDown.cashRevenue}}元</h3></view>
 				</u-col>
 			</u-row>
-			<u-row>
+			<u-row v-if="revenueStatisticsDown.wechatRevenue||revenueStatisticsDown.alipayRevenue">
 			    <u-col :span="6">
 			        <view class="von-index-col">微信支付收款<h3>{{revenueStatisticsDown.wechatRevenue}}元</h3></view>
 			    </u-col>
@@ -35,10 +38,11 @@
 				    <view class="von-index-col">支付宝收款<h3>{{revenueStatisticsDown.alipayRevenue}}元</h3></view>
 				</u-col>
 			</u-row>
-			<u-row>
-			    <u-col :span="6">
-			        <view class="von-index-col">现金收款<h3>{{revenueStatisticsDown.cashRevenue}}元</h3></view>
-			    </u-col>
+			<u-row v-if="revenueStatisticsDown.onlineRevenue||revenueStatisticsDown.ticketRevenue">
+			   
+			   <u-col :span="6">
+			       <view class="von-index-col">线上购票收款<h3>{{revenueStatisticsDown.onlineRevenue}}元</h3></view>
+			   </u-col>
 				<u-col :span="6">
 				    <view class="von-index-col">纸质车票收款<h3>{{revenueStatisticsDown.ticketRevenue}}元</h3></view>
 				</u-col>

utils/request.js

@@ -28,20 +28,23 @@ const request = (options) => {
 			//防止连续请求多个接口时loading闪现
 			let [error, res] = response;
 			
-			if (res.data.code == 415&&res.data.message=='请先注册信息') {
-				carhelp.signOut()
-				uni.redirectTo({
-					url: '/pages/index/login'
-				})
-				return;
-			}
-			if (res.data.message=='请重新登录'&&!res.data.result) {
-				carhelp.signOut()
-				uni.redirectTo({
-					url: '/pages/index/login'
-				})
-				return;
+			if (!process.car.SIMPLE_RUN) {
+				if (res.data.code == 415&&res.data.message=='请先注册信息') {
+					carhelp.signOut()
+					uni.redirectTo({
+						url: '/pages/index/login'
+					})
+					return;
+				}
+				if (res.data.message=='请重新登录'&&!res.data.result) {
+					carhelp.signOut()
+					uni.redirectTo({
+						url: '/pages/index/login'
+					})
+					return;
+				}
 			}
+			
 			if (res.data.code != 200) {
 				reject(res.data.message)
 			} else {