Преглед на файлове

Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-huozhuapp

gjy преди 2 години
родител
ревизия
d5bc7fd799
променени са 7 файла, в които са добавени 252 реда и са изтрити 106 реда
  1. 2 2
      config/index.js
  2. 3 2
      pages/mine/company/index.vue
  3. 79 45
      pages/mine/myAccount/bill.vue
  4. 117 37
      pages/mine/myAccount/index.vue
  5. 50 19
      pages/mine/myAccount/withdrawal.vue
  6. 1 1
      pages/release/release.vue
  7. BIN
      static/images/myAccount/qian.png

+ 2 - 2
config/index.js

@@ -1,6 +1,6 @@
 const dev = {
-	baseUrlNew: 'https://apitest.eliangeyun.com',
-	// baseUrlNew: 'http://192.168.110.9:8099',
+	// baseUrlNew: 'https://apitest.eliangeyun.com',
+	baseUrlNew: 'http://192.168.110.9:8099',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

+ 3 - 2
pages/mine/company/index.vue

@@ -140,8 +140,9 @@
 		height: 42px;
 		margin: 36px auto 0;
 		color: #fff;
-
-		background: url(../../../static/mine/company/Mask@3x.png);
+		// background: url(../../../static/mine/company/Mask@3x.png);
+		background: #2772FB ;
+		border-radius: 44rpx;
 		background-size: 100%;
 		line-height: 42px;
 	}

+ 79 - 45
pages/mine/myAccount/bill.vue

@@ -1,23 +1,32 @@
 <template>
 	<view class="center">
-		<view style='border-bottom:1px solid #ccc;' class="" @click="dataShow = true">{{data}}</view>
+		<view @click="dataShow = true" class="data_top">{{data}} 年
+			<image src="../../../static/images/myimg/gengduo1@3x.png" mode=""
+				style="width:12rpx ;height: 20rpx;margin-left: 20rpx;"></image>
+		</view>
 		<u-picker :show="dataShow" :columns="columns" @confirm="dataChange" @cancel="dataShow = false"
 			@close="dataShow = false"></u-picker>
-			<view v-if='formlist.length>0'>
-				<view class="formData" v-for="(item,index) in formlist">
-					<view class="flex row">
-						<view class="left-text">{{item.types}}</view>
-						<view class="flex right-text">
-							{{item.amountMoney}}
-						</view>
+		<view v-if='formlist.length>0' class="dataInfo_css">
+			<view class="formData" v-for="(item,index) in formlist">
+				<view class="flex row">
+					<view class="left-text">{{item.types}}</view>
+					<view class="flex right-text">
+						{{item.amountMoney}}
+					</view>
+				</view>
+				<view class="flex">
+					<view class="order_no">
+						{{item.orderNo?item.orderNo:""}}
 					</view>
 					<view class="date_css">
 						{{item.createDate}}
 					</view>
 
 				</view>
+
 			</view>
-		<view v-else style='text-align:center;padding:10px;'>暂无账单</view>
+		</view>
+		<view v-else class="noBill">暂无账单</view>
 
 	</view>
 </template>
@@ -94,43 +103,68 @@
 
 <style lang="scss" scoped>
 	.center {
-		padding: 20rpx;
-
-		.formData {
-			.tips {
-				text-align: right;
-				border-bottom: 2rpx solid #e6e6e6;
-				height: 60rpx;
-			}
-
-			.row {
-				margin: 30rpx 0;
-			}
-
-			.left-text {
-				// background: red;
-				width: 40%;
-				color: #333333;
-				display: flex;
-				align-items: center;
-			}
-
-			.right-text {
-				width: 60%;
-				justify-content: flex-end;
-			}
-
-			.date_css {
-				text-align: right;
+		// padding:0 20rpx;
+		background: #F5F6FA;
+		height: calc(100vh - 9.9vh);
+		.data_top{
+			padding: 20rpx 30rpx 0;
+			background: #ffffff;
+			height: 80rpx;
+		}
+		.dataInfo_css{
+			padding: 10rpx 30rpx 20px;
+			background: #ffffff;
+			width: 85%;
+			border-radius: 20rpx;
+			margin: 20rpx auto;
+			
+			.formData {
+				height: 140rpx;
+				border-bottom: 2rpx solid #EEEEEE ;
+				.tips {
+					text-align: right;
+					border-bottom: 2rpx solid #e6e6e6;
+					height: 60rpx;
+				}
+			
+				.row {
+					margin: 30rpx 0;
+				}
+			
+				.left-text {
+					// background: red;
+					width: 40%;
+					color: #333333;
+					display: flex;
+					align-items: center;
+				}
+			
+				.right-text {
+					width: 60%;
+					justify-content: flex-end;
+				}
+			
+				.order_no {
+					width: 50%;
+					color: #999999 ;
+					font-size: 28rpx;
+				}
+			
+				.date_css {
+					width: 50%;
+					text-align: right;
+					color: #999999 ;
+					font-size: 28rpx;
+				}
 			}
 		}
+		.noBill{
+			text-align:center;padding:10px;
+			background: #FFFFFF;
+			width: 90%;
+			margin: 20rpx auto;
+			border-radius: 20rpx;
+			height: 70rpx;
+		}
 	}
 </style>
-uni.setStorageSync('userInfo', res.data)
-helper.getListByUserId()
-that.$store.commit('login', res.data)
-// that.liangxinLogin()
-uni.switchTab({
-url: '/pages/order/index'
-});
-uni.hideLoading()

+ 117 - 37
pages/mine/myAccount/index.vue

@@ -1,24 +1,30 @@
 <template>
 	<view class="center">
-		<view class="" v-if="accountType == '2'">
-			{{dataInfo.companyName}}
-		</view>
-		<view class="flex account">
-			<view class="account_info">
-				可用余额
-				<view class="money">
-					{{dataInfo.accountBalance?dataInfo.accountBalance:0}}元
-				</view>
+		<view v-if="accountType == 1">
+			<view class="account">
+				<image src="../../../static/images/myAccount/qian.png" mode="" class="account_img"></image>
+			</view>
+			<view class="money">可用余额</view>
+			<view class="money_number">{{dataInfo.accountBalance?dataInfo.accountBalance:0}}<span class="yuan">元</span>
+			</view>
+			<view class="money_no">(已冻结:<span class="number">{{dataInfo.frozenAmount?dataInfo.frozenAmount:0}}</span>元)
 			</view>
-			<view class="account_info">
-				已冻结
-				<view class="money">
-					{{dataInfo.frozenAmount?dataInfo.frozenAmount:0}}元
+			<view class="next_btn" @click="withdrawal">提现</view>
+		</view>
+		<view v-else>
+			<view class="company_account">
+				<view class="company_money">可用余额(元)</view>
+				<view class="flex company_center">
+					<view class="company_money_number">{{dataInfo.accountBalance?dataInfo.accountBalance:0}}</view>
+					<view class="company_next" @click="withdrawal">
+						<view class="btn">
+							提现
+						</view>
+					</view>
 				</view>
+				<view class="company_money_no">(已冻结:{{dataInfo.frozenAmount?dataInfo.frozenAmount:0}} 元)</view>
 			</view>
 		</view>
-		<u-button type="primary" text="提现" @click="withdrawal"></u-button>
-
 	</view>
 </template>
 
@@ -28,50 +34,45 @@
 			return {
 				dataInfo: {},
 				accountType: '', //accountType  1个人 2企业
-				id:"",//如果是企业  公司id
-
+				id: "", //如果是企业  公司id
 			}
 		},
 		onLoad(options) {
 			if (options.id) { //我的企业进来的
 				this.accountType = '2'
 				this.id = options.id
-				console.log(this.dataInfo)
-			} else {  //个人账户
+			} else { //个人账户
 				this.accountType = '1'
 			}
 		},
 		onShow() {
-			
-				this.getList()
-			
-
+			this.getList()
 		},
 		onNavigationBarButtonTap(e) {
-			uni.$u.route('/pages/mine/myAccount/bill?type=' + this.accountType+'&id='+this.id)
+			uni.$u.route('/pages/mine/myAccount/bill?type=' + this.accountType + '&id=' + this.id)
 		},
 		methods: {
 			getList() {
-				if(this.accountType == '1'){
+				if (this.accountType == '1') {
 					this.$request.baseRequest('get', '/cargoOwnerInfo/selectAccount', {
 						commonId: uni.getStorageSync("userInfo").id
 					}).then(res => {
 						this.dataInfo = res.data
 					})
-				}else if(this.accountType == '2'){
+				} else if (this.accountType == '2') {
 					this.$request.baseRequest('get', '/cargoOwnerInfo/selectAccountBalance', {
-						id:this.id,
-						flag:this.accountType
+						id: this.id,
+						flag: this.accountType
 					}).then(res => {
 						this.dataInfo = res.data
 					})
 				}
 			},
 			withdrawal() {
-				if(this.accountType == '1'){
-					uni.$u.route("/pages/mine/myAccount/withdrawal?id=" + this.dataInfo.id +"&flag=" + this.accountType)
-				}else if(this.accountType == '2'){
-					uni.$u.route("/pages/mine/myAccount/withdrawal?id=" + this.id +"&flag=" + this.accountType)
+				if (this.accountType == '1') {
+					uni.$u.route("/pages/mine/myAccount/withdrawal?id=" + this.dataInfo.id + "&flag=" + this.accountType)
+				} else if (this.accountType == '2') {
+					uni.$u.route("/pages/mine/myAccount/withdrawal?id=" + this.id + "&flag=" + this.accountType)
 				}
 			},
 		}
@@ -81,20 +82,99 @@
 <style lang="scss" scoped>
 	.center {
 		padding: 20rpx;
+		text-align: center;
 
 		.account {
+			width: 100%;
+			height: 250rpx;
 			margin-top: 30rpx;
+			margin: 0 auto;
+			text-align: center;
 
-			.account_info {
-				width: 50%;
-				text-align: center;
+			.account_img {
+				width: 100rpx;
+				height: 100rpx;
+				margin-top: 200rpx;
 			}
+		}
+
+		.money {
+			margin-top: 90rpx;
+			font-size: 32rpx;
+			// margin: 40rpx;
+		}
+
+		.money_number {
+			font-size: 68rpx;
+			font-weight: 500;
+			margin-top: 20rpx;
 
-			.money {
-				margin: 40rpx;
+			.yuan {
+				font-size: 36rpx;
+				margin-left: 6rpx;
 			}
 		}
 
+		.money_no {
+			margin-top: 20rpx;
+			color: #999999;
+			font-size: 28rpx;
+
+			.number {
+				color: #2a74fb;
+				margin: 0 10rpx;
+			}
+		}
 
+		.next_btn {
+			background: #2772FB;
+			color: #FFFFFF;
+			padding: 25rpx 0;
+			border-radius: 60rpx;
+			margin-top: 100rpx;
+		}
+
+		// 公司账户
+		.company_account {
+			padding-top: 60rpx;
+			text-align: left;
+			color: #FFFFFF;
+			height: 280rpx;
+			border-radius: 10rpx;
+			background: linear-gradient(45deg, #2873fb, #4385fd, #5f98ff);
+
+			.company_money {
+				margin-left: 40rpx;
+				font-size: 30rpx;
+			}
+
+			.company_center {
+				margin: 20rpx;
+
+				.company_money_number {
+					width: 50%;
+					font-size: 70rpx;
+					margin-left: 20rpx;
+				}
+
+				.company_next {
+					width: 50%;
+					text-align: center;
+					line-height: 60rpx;
+					color: #2772FB;
+				}
+
+				.btn {
+					padding: 12rpx 0;
+					width: 180rpx;
+					background: #ffffff;
+					margin: 0 auto;
+					border-radius: 30px;
+				}
+			}
+			.company_money_no {
+				margin-left: 40rpx;
+			}
+		}
 	}
 </style>

+ 50 - 19
pages/mine/myAccount/withdrawal.vue

@@ -1,18 +1,26 @@
 <template>
 	<view class="center">
 		<view class="formData">
-			<view class="flex row">
-				<view class="left-text">提现金额</view>
-				<view class="flex right-text">
-					<u--input placeholder="输入提现金额" inputAlign='right' border="none" clearable
-						v-model="formInfo.amountMoney" type="number">
-					</u--input>
+			<view class="formData_top">
+				<view class="flex row">
+					<view class="left-text">提现金额</view>
+					<view class="flex right-text">
+						<u--input placeholder="输入提现金额" inputAlign='right' border="none" clearable
+							v-model="formInfo.amountMoney" type="number">
+						</u--input>
+					</view>
+				</view>
+				<view class="tips flex">
+					
+					<view style="width: 60%;">
+						<span class="qian">¥</span>
+						可提现{{usableMoney}}元
+					</view>
+					<view style="color: #007AFF;text-align: right;width: 40%;margin-top: 30rpx;" @click="writeIn">全部提现</view>
 				</view>
 			</view>
-			<view class="tips">
-				可提现金额{{usableMoney}}元,<span style="color: #007AFF;" @click="writeIn">全部提现</span>
-			</view>
-			<view class="flex row">
+			<view class="formData_bottom">
+				<view class="flex row">
 				<view class="left-text">提现到银行卡</view>
 				<view class="flex right-text" @click="bankChange">
 					{{formInfo.bankDeposit?formInfo.bankDeposit:"请选择收款账户"}} {{bankNo}}
@@ -51,12 +59,15 @@
 					</u--input>
 				</view>
 			</view>
+			</view>
+
+			
 		</view>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :closeOnClickOverlay='true'
 			:showCancelButton='showCancelButton' confirmColor='#2772FB' @confirm="confirmClick" @close="cancelClick"
 			@cancel="cancelClick"></u-modal>
-		<u-button type="primary" text="提交" @click="submit"></u-button>
+		<u-button type="primary" text="提交" @click="submit" class="btn_css"></u-button>
 	</view>
 </template>
 
@@ -121,7 +132,7 @@
 					id: this.id,
 					flag: this.flag
 				}).then(res => {
-					this.usableMoney = Number(res.data.accountBalance) 
+					this.usableMoney = Number(res.data.accountBalance)
 				})
 			},
 			writeIn() {
@@ -212,17 +223,37 @@
 <style lang="scss" scoped>
 	.center {
 		padding: 20rpx;
+		background: #F5F6FA;
+		height: calc(100vh - 9.9vh);
 
-		// .row {
-		// 	margin: 30rpx;
-		// }
+		.btn_css{
+			margin-top: 45rpx;
+		}
 		.formData {
-			.tips {
-				text-align: right;
-				border-bottom: 2rpx solid #e6e6e6;
-				height: 60rpx;
+			.formData_top {
+				background: #ffffff;
+				height: 200rpx;
+				padding: 10rpx 30rpx;
+				border-radius: 20rpx;
+
+				.tips {
+					width: 100%;
+					height: 60rpx;
+					color: #C6CBD5 ;
+					.qian {
+						font-size: 62rpx;
+						color: #333333 ;
+					}
+				}
+			}
+			.formData_bottom{
+					background: #ffffff;
+					padding: 10rpx 30rpx;
+					border-radius: 20rpx;
+					margin-top: 20rpx;
 			}
 
+
 			.row {
 				margin: 30rpx 0;
 			}

+ 1 - 1
pages/release/release.vue

@@ -143,7 +143,7 @@
 			<view class="row">
 				<view class="left">重量(吨)</view>
 				<view class="right flex">
-					<input type="text" value="" placeholder="输入预计发运重量" class="number" v-model="dataObj.weight"
+					<input type="number" value="" placeholder="输入预计发运重量" class="number" v-model="dataObj.weight"
 						style="text-align: right;" />
 				</view>
 			</view>

BIN
static/images/myAccount/qian.png