Browse Source

Merge remote-tracking branch 'origin/master'

wgl 4 years ago
parent
commit
f9a726e33a

+ 47 - 0
src/assets/css/xpwyfyy.css

@@ -4119,4 +4119,51 @@ h3 {
 }
 .vongi-cchai .mui-table-view-chevron .mui-table-view-cell > a:not(.mui-btn){
 	padding:15px
+}
+.vongi-zdto{
+	padding:10px 15px;
+	background:#ffffff;
+	border-bottom:1px #eee solid
+}
+.vongi-pay-list.openfyy-list li{
+	padding:0 10px;
+	margin-bottom:10px
+}
+.vongi-pay-list li .mui-card-content-inner,
+.vongi-pay-list li .mui-card-footer{ 
+	padding:10px 0
+}
+.vongi-pay-list li .mui-card-footer{
+	min-height:initial
+}
+.vongi-pay-list .mui-card-footer::before{
+	background:#eee
+}
+.vongi-pay .vongi-zd{
+	justify-content: center;
+	background:0;
+}
+.vongi-pay .mui-collapse-content .mui-table-view{
+	margin:0
+}
+.vongi-pay .mui-table-view-cell.mui-collapse .mui-table-view .mui-table-view-cell{
+	padding:0 15px;
+	background:#ffffff
+}
+.vongi-pay .mui-table-view-cell.mui-collapse a{
+	background:#eee
+}
+.vongi-pay .openfyy-list .mui-table-view-cell.mui-collapse,
+.vongi-pay .mui-table-view-cell.mui-collapse .mui-collapse-content,
+.vongi-pay .mui-table-view-cell.mui-collapse .mui-table-view .mui-table-view-cell::after{
+	background:0
+}
+
+.vongi-pay .mui-table-view-cell.mui-collapse .mui-collapse-content{
+	padding:0;
+}
+.vongi-zdlist.vongi-zd .mui-table-view-cell{
+	margin:0;
+	border-radius: initial;
+	border-bottom:1px #eee solid
 }

BIN
src/assets/img/payli.png


+ 4 - 2
src/projects/business/views/Master/BusinessTravel/Info.vue

@@ -3,7 +3,7 @@
 		<common @asynCallBack="asynCallBack" :doLoading="true"></common>
 		<top-header :pageTitle="pageTitle"></top-header>
 
-		<div v-if="detail.personName" class="mui-content vongi-qingjiadt">
+		<div v-if="detail.personName" class="mui-content vongi-qingjiadt margin60">
 			<div class="vongi-qingjiadt-head flew-sp">
 				<div class="flew-items">
 					<div class="flew"><img :src="detail.faceImageUrl" width="50" v-viewer /></div>
@@ -51,7 +51,9 @@
 				</div>
 			</div>
 		</div>
-
+		<div class="fyy-footer">
+			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-danger">结束出差</button></div>
+		</div>
 		<loading :visible="isLoading"></loading>
 	</div>
 </template>

+ 4 - 2
src/projects/business/views/Master/Egress/Info.vue

@@ -3,7 +3,7 @@
 		<common @asynCallBack="asynCallBack" :doLoading="true"></common>
 		<top-header :pageTitle="pageTitle"></top-header>
 
-		<div v-if="detail.personName" class="mui-content vongi-qingjiadt">
+		<div v-if="detail.personName" class="mui-content vongi-qingjiadt margin60">
 			<div class="vongi-qingjiadt-head flew-sp">
 				<div class="flew-items">
 					<div class="flew"><img :src="detail.faceImageUrl" width="50" v-viewer /></div>
@@ -61,7 +61,9 @@
 				</template>
 			</form>
 		</div>
-
+		<div class="fyy-footer">
+			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-danger">结束外出</button></div>
+		</div>
 		<loading :visible="isLoading"></loading>
 	</div>
 </template>

+ 123 - 79
src/projects/business/views/Master/Mine/Bill/Info.vue

@@ -1,11 +1,66 @@
 <template>
-<div>
-
-			 <common @asynCallBack="asynCallBack"></common>
-                	<top-header :pageTitle="pageTitle"  ></top-header>
-
-
-			<div class="mui-content vongi-qingjiadt">
+  <div>
+    <common @asynCallBack="asynCallBack"></common>
+    <top-header :pageTitle="pageTitle"></top-header>
+
+	<div class="mui-content vongi-pay vongi-qingjiadt">
+				<div class="vongi-center mui-content-padded margin30">
+					<div class="vongi-zd vongi-zdto flew-items">
+						<img src="~$project/assets/img/payli.png" width="24">
+						<h3>物业服务费</h3>
+					</div>
+					<h1 class="margin10">-121907.50</h1>
+					<h4 class="color55f868">已交费</h4>
+				</div>
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>付款方式</label>
+						<span>对公转账</span>
+					</div>
+					<div class="mui-input-row">
+						<label>缴费单位</label>
+						<span>荆州万乘企业管理咨询有限公司</span>
+					</div>
+					<div class="mui-input-row">
+						<label>订单号</label>
+						<span>00000000</span>
+					</div>
+					<div class="mui-input-row">
+						<label>创建时间</label>
+						<span>2020-11-28 14:13</span>
+					</div>			
+				</form>
+				<ul class="mui-table-view openfyy-list">
+					<li class="mui-table-view-cell mui-collapse">
+						<a class="mui-navigate-right" href="#">账单明细</a>
+						<div class="mui-collapse-content">
+							<ul class="mui-table-view vongi-pay-list openfyy-list">
+								<li class="mui-table-view-cell">
+									<div class=" mui-card-content-inner flew-sp">
+										<div class="mui-media-body">
+											<div class='mui-ellipsis flew-sp flew-items'><span class="color4fc5f7">电费</span>(22733-22678=55度)</div>
+											<p>生活缴费</p>
+										</div>
+										<span class="mui-h2">56.06元</span>
+									</div>
+									<p class="mui-card-footer">起止日期:2020-11-20至2021-05-19</p>
+								</li>
+								<li class="mui-table-view-cell">
+									<div class=" mui-card-content-inner flew-sp">
+										<div class="mui-media-body">
+											<div class='mui-ellipsis flew-sp flew-items'><span class="color4fc5f7">电费</span>(22733-22678=55度)</div>
+											<p>生活缴费</p>
+										</div>
+										<span class="mui-h2">56.06元</span>
+									</div>
+									<p class="mui-card-footer">起止日期:2020-11-20至2021-05-19</p>
+								</li>
+							</ul>
+						</div>
+					</li>					
+				</ul>				
+			</div>
+    <!-- <div class="mui-content vongi-qingjiadt">
 				<form class="mui-input-group vongi-cd-payli">
 					<div class="mui-input-row flew-sp">
 							<h3>{{detail.body}}</h3>
@@ -29,83 +84,72 @@
                 		<span>{{detail.payTime}}</span>
 					</div>
 				</form>
-			</div>
-			           <loading :visible="isLoading"></loading>
-
-</div>
+			</div> -->
+    <loading :visible="isLoading"></loading>
+  </div>
 </template>
 
 
 
 <script>
-	import * as API_Pay from '$project/apis/payment'
-	import Common from '$project/components/Common.vue'
-	import Loading from '$project/components/Loading.vue'
-	import TopHeader from '$project/components/TopHeader.vue'
-
-	import {
-		mapGetters,
-		mapMutations
-	} from 'vuex'
-
-	import {
-
-
-	} from '$project/utils'
-	export default {
-		name: 'MasterMineBillInfo',
-		components: {
-			Common,
-			Loading,
-			TopHeader
-		},
-		data() {
-			return {
-				pageTitle: '账单详情',
-
-				qrCodeImg:"",
-				isLoading: false,
-				detail:{},
-				list:[],
-				goodsTpey:{},
-				id:''
-
-			}
-		},
-		created() {
-			this.id=this.$route.query.id;
-
-			},
-		methods:  {
-		getDetail(){
-	        	API_Pay.orderDetail({id:this.id}).then(res=>{
-                    this.detail=res.orderInfo;
-                    this.info=res.goodsTpey;
-                    this.goodsTpey=res.goodsTpey;
-
-                    this.list=JSON.parse(res.orderInfo.detail);
-        		}).catch(error => {
-
-        		})
-		}
-
-		 ,asynCallBack(){},
-		},
-		mounted() {
-            this.getDetail();
-		},
-		destroyed() {
-
-		},
-		computed: {
-			...mapGetters({
-				openId: 'wx_openid',
-				token: 'token',
-				person_data: 'person_data',
-				person_popedom: 'person_popedom',
-			})
-		}
-	}
+import * as API_Pay from "$project/apis/payment";
+import Common from "$project/components/Common.vue";
+import Loading from "$project/components/Loading.vue";
+import TopHeader from "$project/components/TopHeader.vue";
+
+import { mapGetters, mapMutations } from "vuex";
+
+import {} from "$project/utils";
+export default {
+  name: "MasterMineBillInfo",
+  components: {
+    Common,
+    Loading,
+    TopHeader,
+  },
+  data() {
+    return {
+      pageTitle: "账单详情",
+
+      qrCodeImg: "",
+      isLoading: false,
+      detail: {},
+      list: [],
+      goodsTpey: {},
+      id: "",
+    };
+  },
+  created() {
+    this.id = this.$route.query.id;
+  },
+  methods: {
+    getDetail() {
+      API_Pay.orderDetail({ id: this.id })
+        .then((res) => {
+          this.detail = res.orderInfo;
+          this.info = res.goodsTpey;
+          this.goodsTpey = res.goodsTpey;
+
+          this.list = JSON.parse(res.orderInfo.detail);
+        })
+        .catch((error) => {});
+    },
+
+    asynCallBack() {},
+  },
+  mounted() {
+    this.getDetail();
+  },
+  destroyed() {},
+  computed: {
+    ...mapGetters({
+      openId: "wx_openid",
+      token: "token",
+      person_data: "person_data",
+      person_popedom: "person_popedom",
+    }),
+  },
+};
 </script>
 
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>

+ 50 - 2
src/projects/business/views/Master/Mine/Bill/Pay.vue

@@ -4,7 +4,55 @@
     	<top-header :pageTitle="pageTitle"  ></top-header>
 
 			<div class="mui-content vongi-qingjiadt margin60"  >
-				<div class="vongi-cashier flew-sp">
+				<div class="vongi-zd vongi-zdto flew-items">
+					<img src="~$project/assets/img/payli.png" width="24">
+					<h3>物业服务费</h3>
+				</div>
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>缴费单位</label>
+						<span>沙市花园XX物业</span>
+					</div>
+					<div class="mui-input-row">
+						<label>推送用户</label>
+						<span>陈冲</span>
+					</div>
+					<div class="mui-input-row">
+						<label>本期账单总金额</label>
+						<span class="mui-h1 colorfe616c">121907.50</span>
+					</div>
+					<div class="mui-input-row">
+						<label>账单备注</label>
+						<span>线下付款请联系财务室0716-8121234转8000</span>
+					</div>
+
+				</form>
+				<div class="mui-content-padded">
+					<h5 class="flew-sp">账单明细<span class="colorfe616c">请在收到账单5日内交纳如下费用</span></h5>
+				</div>
+				<ul class="mui-table-view vongi-pay-list openfyy-list">
+					<li class="mui-table-view-cell">
+						<div class=" mui-card-content-inner flew-sp">
+							<div class="mui-media-body">
+								<div class='mui-ellipsis flew-sp flew-items'><span class="color4fc5f7">电费</span>(22733-22678=55度)</div>
+								<p>生活缴费</p>
+							</div>
+							<span class="mui-h2">56.06元</span>
+						</div>
+						<p class="mui-card-footer">起止日期:2020-11-20至2021-05-19</p>
+					</li>
+					<li class="mui-table-view-cell">
+						<div class=" mui-card-content-inner flew-sp">
+							<div class="mui-media-body">
+								<div class='mui-ellipsis flew-sp flew-items'><span class="color4fc5f7">电费</span>(22733-22678=55度)</div>
+								<p>生活缴费</p>
+							</div>
+							<span class="mui-h2">56.06元</span>
+						</div>
+						<p class="mui-card-footer">起止日期:2020-11-20至2021-05-19</p>
+					</li>
+				</ul>
+				<!-- <div class="vongi-cashier flew-sp">
 					<div class="vongi-zd flew-items">
 						<div class="mui-media-object">
 							<img :src="goodsTpey.iconPic">
@@ -36,7 +84,7 @@
 						<label style="width:25%">订单号</label>
 						<span style="width:75%" class="mui-ellipsis">{{detail.outOrderNo}}</span>
 					</div>
-				</form>
+				</form> -->
 				<div class="mui-content-padded">
 					<h5>支付方式</h5></div>
 				<form class="mui-input-group margin10">

+ 52 - 3
src/projects/business/views/Master/Mine/Bill/Record.vue

@@ -3,7 +3,56 @@
     <common @asynCallBack="asynCallBack"></common>
     	<top-header :pageTitle="pageTitle"></top-header>
 
-		<div class="mui-content vongi-zd">
+		<div class="mui-content vongi-zd vongi-zdlist">
+			<div class="mui-content-padded">
+				<h5>本月</h5>
+			</div>
+			<ul class="mui-table-view">
+				<li class="mui-table-view-cell">
+					<a>
+						<div class="mui-media-object mui-pull-left">
+							<img src="~$project/assets/img/payli.png">
+						</div>
+						<div class="mui-media-body">
+							<div class='flew-sp flew-items'>
+								<div class="mui-ellipsis mui-col-xs-8">2021年沙市花园车位租赁费花园车位租赁费</div><span class="color55f868">对公转账</span></div>
+							<div class='mui-ellipsis flew-sp mui-h2 flew-items'>56.06<span class="mui-h6">09-16 14:00</span></div>
+						</div>
+					</a>
+				</li>
+			</ul>
+			<div class="mui-content-padded">
+				<h5>九月</h5>
+			</div>
+			<ul class="mui-table-view">
+				<li class="mui-table-view-cell">
+					<a>
+						<div class="mui-media-object mui-pull-left">
+							<img src="~$project/assets/img/payli.png">
+						</div>
+						<div class="mui-media-body">
+							<div class='flew-sp flew-items'>
+								<div class="mui-ellipsis mui-col-xs-8">2021年沙市花园车位租赁费花园车位租赁费</div><span class="color55f868">对公转账</span></div>
+							<div class='mui-ellipsis flew-sp mui-h2 flew-items'>56.06<span class="mui-h6">09-16 14:00</span></div>
+						</div>
+					</a>
+				</li>
+				<li class="mui-table-view-cell">
+					<a>
+						<div class="mui-media-object mui-pull-left">
+							<img src="~$project/assets/img/payli.png">
+						</div>
+						<div class="mui-media-body">
+							<div class='flew-sp flew-items'>
+								<div class="mui-ellipsis mui-col-xs-8">2021年沙市花园车位租赁费花园车位租赁费</div><span class="color55f868">对公转账</span></div>
+							<div class='mui-ellipsis flew-sp mui-h2 flew-items'>56.06<span class="mui-h6">09-16 14:00</span></div>
+						</div>
+					</a>
+				</li>
+			</ul>
+			<NullList :remark="'暂无账单信息'" v-if="!recordList.length"></NullList>
+		</div>
+		<!-- <div class="mui-content vongi-zd">
 
 			<ul class="mui-table-view vongi-zd-list">
 			<template v-for="mod in recordList">
@@ -25,9 +74,9 @@
  			</template>
 
 			</ul>
-			<NullList :remark="'暂无账单信息'" v-if="!recordList.length"></NullList>
+			
 
-		</div>
+		</div> -->
 		           <loading :visible="isLoading"></loading>
 
 </div>