From 5a0242ebc0345a78278ac8d323eda75333102951 Mon Sep 17 00:00:00 2001
From: noendlearning <https://gitee.com/ming_ling_chen>
Date: Sat, 28 Mar 2020 11:41:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E4=BD=9C=E5=8F=B0,?=
 =?UTF-8?q?=E6=88=90=E7=BB=A9=E7=AE=A1=E7=90=86=E4=BB=A5=E5=8F=8A=E6=A0=A1?=
 =?UTF-8?q?=E5=9B=AD=E7=94=9F=E6=B4=BB=E7=9A=84=E7=94=A8=E6=88=B7=E5=8A=A9?=
 =?UTF-8?q?=E6=89=8B=E7=9A=84=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bannerHeader/BannerHeader.vue      |  99 +++++-----
 src/views/application/Application.vue         |   2 +-
 .../childComps/section/Section.vue            |   1 +
 .../campusLife/ctAssistant/CtAssistant.vue    |  17 +-
 .../cashOfferSettings/CashOfferSettings.vue   |  60 +++++-
 .../children/AddBankCard.vue                  |  87 +++++++++
 .../cashOfferSettings/children/MainPage.vue   |  69 +++++++
 .../children/PresentationPassword.vue         |  84 +++++++++
 .../children/SuccessPage.vue                  |  57 ++++++
 .../childCpns/cashWithdrawal/CashPage.vue     | 175 ++++++++++++++++--
 .../cashWithdrawal/CashWithdrawal.vue         |  21 ++-
 .../cashWithdrawal/TransactionRecord.vue      |   7 +-
 src/views/loading/Loading.vue                 |  12 +-
 13 files changed, 612 insertions(+), 79 deletions(-)
 create mode 100644 src/views/campusLife/ctAssistant/childCpns/cashOfferSettings/children/AddBankCard.vue
 create mode 100644 src/views/campusLife/ctAssistant/childCpns/cashOfferSettings/children/MainPage.vue
 create mode 100644 src/views/campusLife/ctAssistant/childCpns/cashOfferSettings/children/PresentationPassword.vue
 create mode 100644 src/views/campusLife/ctAssistant/childCpns/cashOfferSettings/children/SuccessPage.vue

diff --git a/src/components/common/bannerHeader/BannerHeader.vue b/src/components/common/bannerHeader/BannerHeader.vue
index 19afb6f..cd10e0e 100644
--- a/src/components/common/bannerHeader/BannerHeader.vue
+++ b/src/components/common/bannerHeader/BannerHeader.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="header">
 		<div class="logo">
-			<img v-if="imgUrl" :src="imgUrl">
+			<img v-if="user.imgUrl" :src="user.imgUrl">
 			<img v-else src="~assets/logo.png">
 		</div>
 		<div style="display:none" class="center"></div>
@@ -10,21 +10,26 @@
 				<div class="start" @click.stop="search" v-if="isShow"><a-icon type="search" /></div>
 				<div class="search" v-else @click.stop><a-input-search placeholder="搜索功能" style="width: 200px" /></div>
 			</div>
-			<div v-else class="left">
-				<a-icon type="left" />
+			<div v-else class="left" @click="backWork">
+				<a-icon type="left"/>
 			</div>
 			<a-icon class="bell" type="bell" />
 			<a-icon class="settings" type="setting" @click.stop="showDropdown" />
-			<div class="user">
-				<!--<my-head-img  :url="user.headImgUrl" :name="user.nickname"/>-->
+			<div class="user" @click.stop="showInformation">
+				<my-head-img :url="user.headImgUrl" :name="user.nickname"/>
 			</div>
 		</div>
-		<div @click.stop v-show="showDrop" class="dropdown">
-			<div class="item" v-for="item in showDetailList" @click.stop="itemClick(item.url)">
+		<div @click.stop v-if="showDrop" class="dropdown">
+			<div class="item" v-for="item in adminList" @click.stop="itemClick(item.url)">
 				<a-icon class="icon" :type="item.type" />
 				<div>{{item.title}}</div>
 			</div>
 		</div>
+		<div class="information" @click.stop v-if="showInfo">
+			<div>姓名：张三</div>
+			<div>电话：188xxxxxxxx</div>
+			<div>角色：教师</div>
+		</div>
 	</div>
 </template>
 <script>
@@ -32,33 +37,22 @@
   export default {
     name: "BannerHeader",
     components: {MyHeadImg},
-		props: {
-      imgUrl:{
-        type:String,
-				default:''
-			},
-			searchOrBack:{
-        type:Boolean,
-				default:false
-			},
-			adminOrNormal:{
+    props:{
+      searchOrBack:{
         type:Boolean,
         default:false
-			},
-			user:{
-        type:Object,
-				default() {
-          return {}
-				}
-			}
-		},
+      }
+    },
     data()  {
       return {
         isShow:true,
         showDrop:false,
+				showInfo:false,
         user:{
+          imgUrl:'',
+          headImgUrl:'',
           nickname:'张三'
-        },
+				},
 				adminList:[
 					{
 					  title:'组织架构',
@@ -78,42 +72,32 @@
 					{
 					  title:'课程信息',
 						url:'subject',
-            type:'team'
+            type:'schedule'
 					},
 					{
 					  title:'家校通讯录',
 						url:'conAddressBook',
-            type:'team'
+            type:'home'
 					},
 					{
 					  title:'组织管理',
 						url:'conOrgan',
-            type:'team'
+            type:'control'
 					},
 					{
 					  title:'应用管理',
 						url:'conApply',
-            type:'team'
-					}
-				],
-				normalList:[
+            type:'appstore'
+					},
           {
             title:'组织管理',
             url:'conOrgan',
-            type:'team'
-          },
-          {
-            title:'应用管理',
-            url:'conApply',
-            type:'team'
+            type:'usergroup-add'
           }
-				]
+				],
       }
     },
 		computed: {
-			showDetailList() {
-        return this.adminOrNormal?this.adminList:this.normalList;
-			}
 		},
     created() {
       // this.user = JSON.parse(localStorage.getItem('user'))
@@ -131,13 +115,24 @@
       },
       hideDrop () {
         this.showDrop=false;
+        this.showInfo=false;
       },
       showDropdown() {
         this.showDrop=true;
+        this.showInfo=false;
       },
+      showInformation() {
+        this.showInfo=true;
+        this.showDrop=false;
+			},
       itemClick(name) {
         this.$router.push({name})
-			}
+			},
+      backWork(){
+        this.$router.replace({
+          name:'application'
+        })
+      }
     }
   }
 </script>
@@ -199,11 +194,13 @@
 	.user {
 		width: 100px;
 		display: flex;
+		cursor: pointer;
 		align-items: center;
 	}
 	.dropdown{
 		display: flex;
 		flex-wrap: wrap;
+		padding-bottom: 20px;
 		width: 350px;
 		position:absolute;
 		top: 45px;
@@ -224,4 +221,18 @@
 		cursor: pointer;
 		margin-top: 15px;
 	}
+	.information {
+		z-index: 9999;
+		position: absolute;
+		top: 45px;
+		right: 0;
+		padding: 10px 20px;
+		background: #fff;
+		border-radius: 3px;
+		border-top: 6px solid #107fff;
+		box-shadow: 0 0 3px 0 rgba(0,0,0,.22);
+	}
+	.information > div {
+		margin-top: 10px;
+	}
 </style>
\ No newline at end of file
diff --git a/src/views/application/Application.vue b/src/views/application/Application.vue
index c72505e..25172ae 100644
--- a/src/views/application/Application.vue
+++ b/src/views/application/Application.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="index">
-		<banner-header />
+		<banner-header :searchOrBack="true"/>
 		<Section />
 		<div class="container">
 			<div class="item-process"><tec-process /></div>
diff --git a/src/views/application/childComps/section/Section.vue b/src/views/application/childComps/section/Section.vue
index b7732ff..2b5867a 100644
--- a/src/views/application/childComps/section/Section.vue
+++ b/src/views/application/childComps/section/Section.vue
@@ -140,6 +140,7 @@
 	}
 	.summary > div {
 		width: 20%;
+		cursor: pointer;
 	}
 	.show {
 		display: inline-block;
diff --git a/src/views/campusLife/ctAssistant/CtAssistant.vue b/src/views/campusLife/ctAssistant/CtAssistant.vue
index 2053067..fadaef1 100644
--- a/src/views/campusLife/ctAssistant/CtAssistant.vue
+++ b/src/views/campusLife/ctAssistant/CtAssistant.vue
@@ -5,12 +5,14 @@
 			<a-breadcrumb-item><a href="">商户助手</a></a-breadcrumb-item>
 		</a-breadcrumb>
 		<div class="tabs">
-			<a-tabs defaultActiveKey="1">
+			<a-tabs :activeKey="defaultKey" @change="onChange">
 				<a-tab-pane tab="经营分析" key="1">
 					<business-analysis />
 				</a-tab-pane>
 				<a-tab-pane tab="余额提现" key="2">
-					<cash-withdrawal />
+					<cash-withdrawal
+						@forget="recForget"
+					/>
 				</a-tab-pane>
 				<a-tab-pane tab="提现设置" key="3">
 					<cash-offer-settings />
@@ -26,12 +28,23 @@
   import CashOfferSettings from "./childCpns/cashOfferSettings/CashOfferSettings";
   export default {
     name: "CtAssistant",
+		data() {
+      return {
+        defaultKey:'1'
+			}
+		},
     components: {
       CashOfferSettings,
       CashWithdrawal,
       BusinessAnalysis
 		},
 		methods: {
+      onChange(key) {
+        this.defaultKey=key
+			},
+      recForget() {
+				this.defaultKey='3'
+			}
 		}
   }
 </script>
diff --git a/src/views/campusLife/ctAssistant/childCpns/cashOfferSettings/CashOfferSettings.vue b/src/views/campusLife/ctAssistant/childCpns/cashOfferSettings/CashOfferSettings.vue
index a450be2..5d3b4b7 100644
--- a/src/views/campusLife/ctAssistant/childCpns/cashOfferSettings/CashOfferSettings.vue
+++ b/src/views/campusLife/ctAssistant/childCpns/cashOfferSettings/CashOfferSettings.vue
@@ -1,15 +1,67 @@
 <template>
-	<div>
-		333
+	<div :class="currentIndex == 3?'':'setting'">
+		<add-bank-card
+			v-if="currentIndex == 1"
+			@finalSure="finalSure"
+		/>
+		<presentation-password
+			v-else-if="currentIndex == 2"
+			@finish="finish"
+		/>
+		<success-page
+			v-else-if="currentIndex == 3"
+			:title="title"
+			@sure="jumpToMainPage"
+		/>
+		<main-page
+			v-else
+			@addCard="addCard"
+			@presentationPassword="presentationPassword"
+		/>
 	</div>
 </template>
 
 <script>
+  import AddBankCard from "./children/AddBankCard";
+  import MainPage from "./children/MainPage";
+  import SuccessPage from "./children/SuccessPage";
+  import PresentationPassword from "./children/PresentationPassword";
   export default {
-    name: "CashOfferSettings"
+    name: "CashOfferSettings",
+    components: {PresentationPassword, SuccessPage, MainPage, AddBankCard},
+    data() {
+      return {
+				currentIndex: 0,
+        title:''
+			}
+		},
+		methods: {
+      addCard() {
+				this.currentIndex=1;
+			},
+      presentationPassword() {
+        this.currentIndex=2;
+			},
+      finish(text) {
+        this.title=text;
+        this.currentIndex=3;
+			},
+      finalSure(text) {
+        this.title=text;
+        this.currentIndex=3;
+			},
+      jumpToMainPage() {
+        this.currentIndex=0;
+			}
+		}
   }
 </script>
 
 <style scoped>
-
+	.setting {
+		height: 800px;
+		margin: 26px 68px;
+		border-bottom: 40px solid #f0f2f5;
+		background: #fff;
+	}
 </style>
\ No newline at end of file
diff --git a/src/views/campusLife/ctAssistant/childCpns/cashOfferSettings/children/AddBankCard.vue b/src/views/campusLife/ctAssistant/childCpns/cashOfferSettings/children/AddBankCard.vue
new file mode 100644
index 0000000..e82326e
--- /dev/null
+++ b/src/views/campusLife/ctAssistant/childCpns/cashOfferSettings/children/AddBankCard.vue
@@ -0,0 +1,87 @@
+<template>
+	<div class="card-page">
+		<div class="info">
+			<a-icon class="info-icon" theme="filled"  type="info-circle" />
+			<span>请填写以下信息，用于余额提现等功能。</span>
+		</div>
+		<a-form class="form" :form="form" :label-col="{span:5}" :wrapper-col="{span:6}">
+			<a-form-item label="真实姓名">
+				<a-input />
+			</a-form-item>
+			<a-form-item label="身份证号">
+				<a-input />
+			</a-form-item>
+			<a-form-item label="银行卡号">
+				<a-input />
+			</a-form-item>
+			<a-form-item label="手机号码">
+				<a-input />
+			</a-form-item>
+			<a-button class="card-sure" type="primary" @click="sure">确认</a-button>
+			<a-form-item
+				v-if="showCheckCode"
+				class="code"
+				label="手机校验码">
+				<a-input />
+			</a-form-item>
+			<div class="mobile">请填写与商户代表人号码，已验证您是本人操作。</div>
+			<a-button v-if="showCheckCode" class="card-sure" type="primary" @click="finalSure">确认</a-button>
+		</a-form>
+	</div>
+</template>
+
+<script>
+  export default {
+    name: "AddBankCard",
+		data() {
+      return {
+        showCheckCode:false,
+        form:this.$form.createForm(this)
+			}
+		},
+		methods: {
+      sure() {
+        this.showCheckCode=true;
+			},
+      finalSure() {
+				this.$emit('finalSure','添加成功')
+			}
+		}
+  }
+</script>
+
+<style scoped>
+	.info-icon{
+		margin-right: 10px;
+		color: #078FEA;
+	}
+	.card-page {
+		padding: 37px 27px;
+	}
+	.info {
+		height: 40px;
+		line-height: 40px;
+		padding-left: 14px;
+		color: #1890FF;
+		background: #e6f7ff;
+		border-radius: 3px;
+	}
+	.form {
+		position: relative;
+		margin-top: 55px;
+	}
+	.card-sure {
+		width: 140px;
+		height: 40px;
+		margin-left: 220px;
+		background: #169bd5;
+	}
+	.mobile {
+		position: absolute;
+		top: 201px;
+		left: 558px;
+	}
+	.code {
+		margin-top: 25px;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/campusLife/ctAssistant/childCpns/cashOfferSettings/children/MainPage.vue b/src/views/campusLife/ctAssistant/childCpns/cashOfferSettings/children/MainPage.vue
new file mode 100644
index 0000000..c7b41d8
--- /dev/null
+++ b/src/views/campusLife/ctAssistant/childCpns/cashOfferSettings/children/MainPage.vue
@@ -0,0 +1,69 @@
+<template>
+	<div>
+		<div class="alipay">
+			<a-icon class="plus" type="plus" />
+			<div class="add">添加支付宝账户</div>
+			<a-input class="input" />
+			<a-button class="sure" type="primary">确认</a-button>
+		</div>
+		<div class="card" @click="addCard">
+			<a-icon class="plus" type="plus" />
+			<div class="add">添加银行卡</div>
+		</div>
+		<div class="password" @click="presentationPassword">
+			<a-icon class="plus" type="plus" />
+			<div class="add">提现密码</div>
+		</div>
+	</div>
+</template>
+
+<script>
+  export default {
+    name: "MainPage",
+		methods: {
+      addCard() {
+        this.$emit('addCard')
+			},
+      presentationPassword() {
+        this.$emit('presentationPassword')
+			}
+		}
+  }
+</script>
+
+<style scoped>
+	.alipay,.card, .password {
+		display: flex;
+		align-items: center;
+		height: 108px;
+		padding-left: 26px;
+		border-bottom: 2px solid #f4f5f8;
+	}
+	.card, .password {
+		cursor: pointer;
+	}
+	.password {
+		border: none;
+	}
+	.plus {
+		font-size: 36px;
+		color: #0099ff;
+	}
+	.add {
+		margin-left: 32px;
+		font-size: 18px;
+		font-weight: 700;
+		color: #0099ff;
+	}
+	.input {
+		width: 280px;
+		height: 40px;
+		margin-left: 85px;
+	}
+	.sure {
+		width: 140px;
+		height: 40px;
+		margin-left: 136px;
+		background: #169bd5;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/campusLife/ctAssistant/childCpns/cashOfferSettings/children/PresentationPassword.vue b/src/views/campusLife/ctAssistant/childCpns/cashOfferSettings/children/PresentationPassword.vue
new file mode 100644
index 0000000..49fce99
--- /dev/null
+++ b/src/views/campusLife/ctAssistant/childCpns/cashOfferSettings/children/PresentationPassword.vue
@@ -0,0 +1,84 @@
+<template>
+	<div>
+		<div class="password">
+			<a-icon class="plus" type="plus" />
+			<div class="add">提现密码</div>
+		</div>
+		<div class="container">
+			<div>请设置6位数字支付密码</div>
+			<div class="top">
+				<a-input class="input" />
+				<a-input class="input" />
+				<a-input class="input" />
+				<a-input class="input" />
+				<a-input class="input" />
+				<a-input class="input" />
+			</div>
+			<div class="bottom">支付密码不能是重复、连续的数字</div>
+			<div class="text">请再次输入以确认</div>
+			<div class="top">
+				<a-input class="input" />
+				<a-input class="input" />
+				<a-input class="input" />
+				<a-input class="input" />
+				<a-input class="input" />
+				<a-input class="input" />
+			</div>
+			<div class="bottom">支付密码不能是重复、连续的数字</div>
+			<a-button type="primary" class="finish" @click="finish">完成</a-button>
+		</div>
+	</div>
+</template>
+
+<script>
+  export default {
+    name: "PresentationPassword",
+		methods: {
+      finish() {
+        this.$emit('finish','密码设置成功');
+			}
+		}
+  }
+</script>
+
+<style scoped>
+	.password {
+		display: flex;
+		align-items: center;
+		padding-left: 26px;
+	}
+	.plus {
+		font-size: 36px;
+		color: #0099ff;
+	}
+	.add {
+		margin-left: 32px;
+		font-weight: 700;
+		color: #0099ff;
+	}
+	.container {
+		text-align: center;
+		margin-top: 36px;
+	}
+	.input {
+		width: 48px;
+		height: 38px;
+		border-radius: 0px;
+	}
+	.finish {
+		width: 363px;
+		height: 40px;
+		background: #169bd5;
+	}
+	.text {
+		margin-top: 37px;
+	}
+	.top {
+		margin-top: 20px;
+	}
+	.bottom {
+		margin-top: 30px;
+		margin-bottom: 45px;
+		color: #999999;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/campusLife/ctAssistant/childCpns/cashOfferSettings/children/SuccessPage.vue b/src/views/campusLife/ctAssistant/childCpns/cashOfferSettings/children/SuccessPage.vue
new file mode 100644
index 0000000..26a6446
--- /dev/null
+++ b/src/views/campusLife/ctAssistant/childCpns/cashOfferSettings/children/SuccessPage.vue
@@ -0,0 +1,57 @@
+<template>
+	<div class="success">
+		<div class="context">
+			<a-icon class="check" theme="twoTone" twoToneColor="#0099ff" type="check-circle" />
+			<div class="text">{{title}}</div>
+		</div>
+		<div>
+			<a-button class="success-sure" type="primary" @click="sure">确认</a-button>
+		</div>
+	</div>
+</template>
+
+<script>
+  export default {
+    name: "SuccessPage",
+		props: {
+      title:{
+        type:String,
+				default:''
+			}
+		},
+		methods: {
+      sure() {
+        this.$emit('sure')
+			}
+		}
+  }
+</script>
+
+<style scoped>
+	.success {
+		width: 326px;
+		height: 217px;
+		margin: 212px auto;
+		padding-left: 27px;
+		padding-top: 53px;
+		text-align: center;
+		background: #fff;
+	}
+	.context {
+		display: flex;
+		align-items: center;
+	}
+	.check {
+		font-size: 72px;
+	}
+	.text {
+		margin-left: 35px;
+		color: #0099FF;
+	}
+	.success-sure {
+		width: 140px;
+		height: 40px;
+		margin-top: 28px;
+		background: #169bd5;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/campusLife/ctAssistant/childCpns/cashWithdrawal/CashPage.vue b/src/views/campusLife/ctAssistant/childCpns/cashWithdrawal/CashPage.vue
index e8ef38c..bcee13e 100644
--- a/src/views/campusLife/ctAssistant/childCpns/cashWithdrawal/CashPage.vue
+++ b/src/views/campusLife/ctAssistant/childCpns/cashWithdrawal/CashPage.vue
@@ -1,16 +1,58 @@
 <template>
-	<div>
+	<div v-if="isCash" class="page">
 		<div>
 			<span>提现金额：</span>
-			<a-input class="input"/>元
+			<a-input class="money"/>
+			<span class="yuan">元</span>
 		</div>
-		<div>
-			<span>提现方式：</span>
-			<a-radio-group v-model="value">
-				<a-radio :value="1" :style="radioStyle">支付宝提现</a-radio>
-				<a-radio :value="2" :style="radioStyle">银行卡提现</a-radio>
-			</a-radio-group>
+		<div class="method">
+			<div>提现方式：</div>
+			<div>
+				<a-radio-group @change="onChange" class="group" v-model="value">
+					<a-radio class="radio" :value="1"><a-icon type="alipay-circle" />提现到支付宝 6324XXXX@qq.com</a-radio>
+					<a-radio class="radio" :value="2"><a-icon type="bank" />提现到银行卡</a-radio>
+				</a-radio-group>
+				<a-radio-group @change="handleChange" class="group bank" v-model="bankValue">
+					<a-radio class="radio" :disabled="disabled" :value="3">招商银行 尾号：1888储蓄卡</a-radio>
+					<a-radio class="radio" :disabled="disabled" :value="4">请添加银行卡</a-radio>
+				</a-radio-group>
+			</div>
+		</div>
+		<div class="time">
+			<span>到账时间：</span>
+			<span>两小时内到账，具体以银行处理进度为准。</span>
 		</div>
+		<div v-if="showPassword">
+			<div class="content">
+				<div>提现密码：</div>
+				<div class="top">
+					<a-input class="input" />
+					<a-input class="input" />
+					<a-input class="input" />
+					<a-input class="input" />
+					<a-input class="input" />
+					<a-input class="input" />
+				</div>
+			</div>
+			<div class="forget" @click="forget">忘记密码？</div>
+			<a-button type="primary" class="sure" @click="sure">确认</a-button>
+		</div>
+		<a-button v-else type="primary" class="sure" @click="next">下一步</a-button>
+	</div>
+	<div v-else class="finish">
+		<div class="apply">
+			<div><a-icon class="check" type="check-circle" /></div>
+			<div class="wait">提现申请已提交，等待银行处理</div>
+		</div>
+		<div class="date line">2020-03-19 17:00</div>
+		<div class="apply account">
+			<div><a-icon class="check" type="clock-circle" /></div>
+			<div class="wait">
+				<div>提现申请已提交，等待银行处理</div>
+				<div class="date">2020-03-19 17:00</div>
+			</div>
+		</div>
+		<a-button type="primary" class="done" @click="done">完成</a-button>
 	</div>
 </template>
 
@@ -20,18 +62,123 @@
 		data() {
       return	{
         value:1,
-        radioStyle: {
-          display: 'block',
-          height: '30px',
-          lineHeight: '30px',
-        },
+        disabled:true,
+        bankValue:3,
+				showPassword:false,
+				isCash:true
+			}
+		},
+		methods: {
+      onChange(e) {
+        this.disabled=!(e.target.value==2);
+			},
+      handleChange(e) {
+        if(e.target.value==4) {
+          this.forget()
+				}
+			},
+			next() {
+        this.showPassword=true;
+			},
+			sure() {
+        this.isCash=false;
+			},
+			done() {
+        this.isCash=true;
+			},
+      forget() {
+				this.$emit('forget')
 			}
 		}
   }
 </script>
 
 <style scoped>
+	.page {
+		margin: 73px 46px;
+	}
+	.money {
+		width:150px;
+	}
+	.yuan {
+		display: inline-block;
+		margin-left: 10px;
+	}
 	.input {
-		width: 200px;
+		width: 48px;
+		height: 38px;
+		border-radius: 0px;
+	}
+	.method {
+		display: flex;
+		margin-top: 40px;
+	}
+	.group {
+		display: block;
+	}
+	.bank {
+		margin-left: 90px;
+	}
+	.radio {
+		display: block;
+		margin-top: 27px;
+	}
+	.time {
+		margin-top: 35px;
+	}
+	.content {
+		display: flex;
+		margin-top: 44px;
+	}
+	.forget {
+		margin-top: 28px;
+		margin-left: 276px;
+		cursor: pointer;
+	}
+	.sure {
+		width: 140px;
+		height: 40px;
+		margin-top: 36px;
+		margin-left: 130px;
+		background: #169bd5;
+	}
+	.finish {
+		position: relative;
+		margin: 220px 115px;
+	}
+	.check {
+		margin-top: 20px;
+		font-size: 36px;
+		color: #0099ff;
+	}
+	.apply {
+		display: flex;
+		color: #0099ff;
+	}
+	.date {
+		color: #CCCCCC;
+		font-weight: 400;
+		font-family: 'Arial Normal', 'Arial';
+	}
+	.wait {
+		margin-top: 25px;
+		margin-left: 25px;
+	}
+	.line {
+		height: 103px;
+		padding-left: 47px;
+		margin-left: 16px;
+		border-left: 1px solid #0099ff;
+	}
+	.account {
+		position: absolute;
+		top: 140px;
+	}
+	.done {
+		width: 140px;
+		height: 37px;
+		margin-left: 195px;
+		margin-top: 60px;
+		background: #169bd5;
 	}
 </style>
\ No newline at end of file
diff --git a/src/views/campusLife/ctAssistant/childCpns/cashWithdrawal/CashWithdrawal.vue b/src/views/campusLife/ctAssistant/childCpns/cashWithdrawal/CashWithdrawal.vue
index ee8ffb7..1419203 100644
--- a/src/views/campusLife/ctAssistant/childCpns/cashWithdrawal/CashWithdrawal.vue
+++ b/src/views/campusLife/ctAssistant/childCpns/cashWithdrawal/CashWithdrawal.vue
@@ -2,14 +2,17 @@
 	<div class="cash-withdrawal">
 		<div class="cash">余额</div>
 		<div class="total">
-			<span class="count">100000000</span>
+			<span class="count">¥ 126,560.00</span>
 			<a-button type="primary" class="withdrawal" @click="cashWithdrawal">提现</a-button>
 		</div>
+		<cash-page
+			v-if="isCashWithdrawal"
+			@forget="forget"
+		/>
 		<transaction-record
-			v-if="false"
+			v-else
 			:tabData="tabData"
 		/>
-		<cash-page />
 	</div>
 </template>
 
@@ -36,13 +39,16 @@
     components: {CashPage, TransactionRecord},
     data() {
       return {
-
 				tabData,
+				isCashWithdrawal:false
 			}
 		},
 		methods: {
       cashWithdrawal() {
-        console.log(11)
+        this.isCashWithdrawal=true;
+			},
+      forget() {
+				this.$emit('forget')
 			}
 		}
   }
@@ -50,10 +56,11 @@
 
 <style scoped>
 	.cash-withdrawal {
-		height: 500px;
+		height: 1500px;
 		margin-left: 25px;
 		margin-right: 25px;
 		margin-bottom: 150px;
+		padding-left: 33px;
 		background: #fff;
 	}
 	.cash {
@@ -71,8 +78,8 @@
 		color: rgba(0, 0, 0, 0.847);
 	}
 	.total {
-		margin-left: 80px;
 		margin-top: 10px;
+		padding-left: 16px;
 		padding-bottom: 72px;
 		border-bottom: 1px solid #cfcfcf;
 	}
diff --git a/src/views/campusLife/ctAssistant/childCpns/cashWithdrawal/TransactionRecord.vue b/src/views/campusLife/ctAssistant/childCpns/cashWithdrawal/TransactionRecord.vue
index 0f3184c..7b625da 100644
--- a/src/views/campusLife/ctAssistant/childCpns/cashWithdrawal/TransactionRecord.vue
+++ b/src/views/campusLife/ctAssistant/childCpns/cashWithdrawal/TransactionRecord.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="record">
-		<p>交易记录：</p>
+		<p class="cash">提现记录：</p>
 		<tab-checked-info :len="4"><span class="total-price">总销售额总计：100.00元</span></tab-checked-info>
 		<a-table
 			:rowSelection="{selectedRowKeys:selectedRowKeys,onChange:onSelectChange}"
@@ -72,4 +72,9 @@
 		padding: 50px 56px;
 		background: #fff;
 	}
+	.cash {
+		color: #0099FF;
+		font-size: 20px;
+		font-weight: 700;
+	}
 </style>
\ No newline at end of file
diff --git a/src/views/loading/Loading.vue b/src/views/loading/Loading.vue
index 1615b4a..ab59ceb 100644
--- a/src/views/loading/Loading.vue
+++ b/src/views/loading/Loading.vue
@@ -58,12 +58,12 @@
     created() {
       this.id = this.$route.query.corpid
       localStorage.setItem('cropId',this.id)
-      this.signIn()
-      // setTimeout(()=>{
-      //   this.$router.replace({
-      //     name:'application'
-      //   })
-      // },500)
+      // this.signIn()
+      setTimeout(()=>{
+        this.$router.replace({
+          name:'application'
+        })
+      },500)
     }
   }
 </script>
-- 
Gitee