zkx 4 năm trước cách đây
mục cha
commit
b0c63ebc82

+ 10 - 10
pages/index/index.vue

@@ -5,14 +5,14 @@
 		<view class="von-index-bar">
 			<view class="text-center mb-1">
 				<h3 >营收统计</h3>
-				<h6>今日收益(元)</h6>
-				<h1>{{revenueStatisticsUp.todayRevenue}}</h1>
+				<h6>今日收益</h6>
+				<h1>{{revenueStatisticsUp.todayRevenue}}</h1>
 			</view>
 			<view class="flex-spal">
 				<text>昨日收益</text>
-				<h3>{{revenueStatisticsUp.yesterdayRevenue}}</h3>
+				<h3>{{revenueStatisticsUp.yesterdayRevenue}}</h3>
 				<text>累计收益</text>
-				<h3>{{revenueStatisticsUp.totalRevenue}}</h3>
+				<h3>{{revenueStatisticsUp.totalRevenue}}</h3>
 			</view>
 		</view>
 		<view class="von-index-row">
@@ -21,26 +21,26 @@
 			</u-cell-group>
 			<u-row>
 			    <u-col :span="6">
-			        <view class="von-index-col">今日售票笔数<h3>{{revenueStatisticsDown.num}}</h3></view>
+			        <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.onlineRevenue}}</h3></view>
 				</u-col>
 			</u-row>
 			<u-row>
 			    <u-col :span="6">
-			        <view class="von-index-col">微信支付收款<h3>{{revenueStatisticsDown.wechatRevenue}}</h3></view>
+			        <view class="von-index-col">微信支付收款<h3>{{revenueStatisticsDown.wechatRevenue}}</h3></view>
 			    </u-col>
 				<u-col :span="6">
-				    <view class="von-index-col">支付宝收款<h3>{{revenueStatisticsDown.alipayRevenue}}</h3></view>
+				    <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>
+			        <view class="von-index-col">现金收款<h3>{{revenueStatisticsDown.cashRevenue}}</h3></view>
 			    </u-col>
 				<u-col :span="6">
-				    <view class="von-index-col">纸质车票收款<h3>{{revenueStatisticsDown.ticketRevenue}}</h3></view>
+				    <view class="von-index-col">纸质车票收款<h3>{{revenueStatisticsDown.ticketRevenue}}</h3></view>
 				</u-col>
 			</u-row>
 		</view>

+ 5 - 5
pages/index/login.js

@@ -47,7 +47,10 @@ import {
 				if (this.codeCheckForm()) {
 					this.$refs.common.showLoading()
 					this.subFormCode.openId = this.carhelp.getOpenId();
-					
+					if (process.car.SIMPLE_RUN) {
+						this.subFormCode.openId = "test";
+						
+					}
 					API_user.validateCode(this.subFormCode).then(response => {
 						  
 						if(response.data){
@@ -128,10 +131,7 @@ import {
 			console.log(ob)
 			this.subFormCode.openId = this.carhelp.getOpenId();
 			
-			if (process.car.SIMPLE_RUN) {
-				this.subFormCode.openId = "test";
-				
-			}
+		
 			console.log(this.carhelp.getPrefix())
 			
 				

+ 2 - 2
pages/order/index.vue

@@ -16,9 +16,9 @@
 			</view>
 			<view class="von-sy-content">
 				<view class="von-sy-area">
-					<h5 class="flex-sp">{{profitList.dateDesc}}<text>共收入{{profitList.revenue}}</text></h5>
+					<h5 class="flex-sp">{{profitList.dateDesc}}<text>共收入{{profitList.revenue}}</text></h5>
 					<u-cell-group>
-						<u-cell-item v-for="item,i in profitList.list" :key="i" :title="item.dateDesc" :value="'+'+item.revenue"  @click="gotoUrl(item.dateDesc)" ></u-cell-item>
+						<u-cell-item v-for="item,i in profitList.list" :key="i" :title="item.dateDesc" :value="'+'+item.revenue+'元'"  @click="gotoUrl(item.dateDesc)" ></u-cell-item>
 					</u-cell-group>
 					
 					<view  v-if="isLoading&&profitList.list&&profitList.list.length==0" style="text-align:center;margin-top: 40px;" >

+ 1 - 3
pages/order/info.js

@@ -25,9 +25,7 @@ export default {
 	onLoad(temp) {
 	 
 		this.id = temp.id;
-		if(process.car.SIMPLE_RUN){
-			this.id="1908362f-9685-462c-93bb-200c4997641"
-		}
+		
 	},
 	onReady() {
 		this.getSellDetail();

+ 3 - 3
pages/order/info.vue

@@ -13,11 +13,11 @@
 			<view class="von-form">
 				<view class="von-form-text">
 
-					<p class="flex-sp"><text>{{info.ticketTypeStr}}</text>{{info.ticketFee}}</p>
-					<p class="flex-sp"><text>货票</text>{{info.goodTicketFee}}</p>
+					<p class="flex-sp"><text>{{info.ticketTypeStr}}</text>{{info.ticketFee}}</p>
+					<p class="flex-sp"><text>货票</text>{{info.goodTicketFee}}</p>
 
 				</view>
-				<h4 class="flex-sp">实际票价<text class="red">¥{{info.totalFee}}</text></h4>
+				<h4 class="flex-sp">实际票价<text class="red">¥{{info.totalFee}}</text></h4>
 			</view>
 			<view class="von-forme">
 				<view class="von-forme-item">

+ 1 - 1
pages/order/list.vue

@@ -25,7 +25,7 @@
 						<h5 class="flex-sp">订单编号:{{item.outOrderNo}}<text class="green">{{item.payNameStr}}</text></h5>
 						<view class="von-sp-text">
 							<p><text>线路:</text>{{item.routeName}}</p>
-							<p><text>票价:</text>{{item.payFee}}</p>
+							<p><text>票价:</text>{{item.payFee}}</p>
 							<p><text>时间:</text>{{item.payTime}}</p>
 						</view>
 					</view>

+ 4 - 4
pages/wallet/index.vue

@@ -12,19 +12,19 @@
 		<view class="von-memoney">
 			<view class="von-card-white">
 				<h6 class="">可提现金额</h6>
-				<view class="flex-spal"><h5>¥<text>{{myAccount.withdrawalAmount}}</text></h5><u-button type="primary" @click="gotoTx" >帐户提现</u-button></view>
+				<view class="flex-spal"><h5>¥<text>{{myAccount.withdrawalAmount}}</text></h5><u-button type="primary" @click="gotoTx" >帐户提现</u-button></view>
 				<view class="gard-line flex-spal">
 					<view class="gard-line-item">
 						<text>今日收益</text>
-						<view class="grid-text">{{myAccount.todayRevenue}}</view>
+						<view class="grid-text">{{myAccount.todayRevenue}}</view>
 					</view>
 					<view class="gard-line-item">
 						<text>累计收益</text>
-						<view class="grid-text">{{myAccount.onlineTotalRevenue}}</view>
+						<view class="grid-text">{{myAccount.onlineTotalRevenue}}</view>
 					</view>
 					<view class="gard-line-item">
 						<text>已提现</text>
-						<view class="grid-text">{{myAccount.alreadyWithdrawalAmount}}</view>
+						<view class="grid-text">{{myAccount.alreadyWithdrawalAmount}}</view>
 					</view>
 				</view>
 			</view>

+ 1 - 1
pages/wallet/info.vue

@@ -6,7 +6,7 @@
 		</u-navbar>
 			
 					<view class="von-sp-list von-zj-info">
-						<h5 class="flex-spal">{{info.name}}<h1>{{info.amount}}</h1></h5>
+						<h5 class="flex-spal">{{info.name}}<h1>{{info.amount}}</h1></h5>
 						<view class="von-sp-text">
 							<p class="flex-sp"><text>交易类型</text>{{info.name}}</p>
 							<p class="flex-sp"><text>申请状态</text><text :style="info.status=='1'?'color: green;':'color: orange;'">{{info.statusStr}}</text></p>

+ 1 - 1
pages/wallet/list.vue

@@ -18,7 +18,7 @@
 					<h6>{{item.time}}</h6>
 				</view>
 				<view>
-					{{item.amount}}<text class="icon iconfont icon-ico_listarrow"></text>
+					{{item.amount}}<text class="icon iconfont icon-ico_listarrow"></text>
 				</view>
 			</view>
 				</scroll-view>

+ 1 - 1
pages/wallet/out.vue

@@ -18,7 +18,7 @@
 						<u-input placeholder="请输入提现金额" type="number" :max="myAccount.withdrawalAmount" v-model="txAmount"></u-input>
 					</view>
 				</view>
-				<h5 class="flex-sp">可提现余额¥{{myAccount.withdrawalAmount}}<navigator class="blue" @click="txAmount=myAccount.withdrawalAmount">全部提现</navigator></h5>
+				<h5 class="flex-sp">可提现余额¥{{myAccount.withdrawalAmount}}<navigator class="blue" @click="txAmount=myAccount.withdrawalAmount">全部提现</navigator></h5>
 			</view>
 			<u-button type="primary" style="background-color: #9DC6FF;" @click="myerror"  v-if="!txbool">次日到账,确认提现</u-button>
 			

+ 1 - 1
pages/wallet/success.vue

@@ -12,7 +12,7 @@
 			</view>
 			
 				<view class="von-form-text">
-					<p class="flex-sp"><text>提现金额</text>¥{{txAmount}}</p>
+					<p class="flex-sp"><text>提现金额</text>¥{{txAmount}}</p>
 					<p class="flex-sp"><text>提现方式</text>{{myAccount.account.bankName}}({{show(myAccount.account.bankNumber)}})</p>
 				</view>