diff --git a/pages.json b/pages.json
index d9d05ff..48e8df6 100644
--- a/pages.json
+++ b/pages.json
@@ -636,10 +636,16 @@
             "navigationBarTitleText": "订单详情"
           }
         }, 
+		{
+		  "path": "user_invoice_Finance/index",
+		  "style": {
+		    "navigationBarTitleText": "财务公开"
+		  }
+		},
 		{
 		  "path": "user_invoice_order_list/index",
 		  "style": {
-		    "navigationBarTitleText": "订单详情"
+		    "navigationBarTitleText": "财务详情"
 		  }
 		},
 		{
diff --git a/pages/admin/order/index.vue b/pages/admin/order/index.vue
index c44a0b9..506c7d8 100644
--- a/pages/admin/order/index.vue
+++ b/pages/admin/order/index.vue
@@ -1,747 +1,348 @@
 <template>
-	<view class="box">
-		<view class="bg">
-			<view class="head">
-				<view class="head_top">
-					账户余额(元)
-					<image src="@/static/images/yanjing.png" class="yanjing" mode=""></image>
-				</view>
-				<view class="pirc">666666666666</view>
-				<view class="tubiao">
-					<!-- <image src="@/static/images/tishi.png" mode="widthFix"></image> -->
-					<view class="zhi">
-						可提现金额 <span>115.00</span> 元
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="conet">
-			<ul>
-				<li>
-					<span>商户收入(元)</span>
-					<view class="pic">100.00</view>
-				</li>
-				<li class="kuang"><span>冻结金额(元)</span>
-					<view class="pic">100.00</view>
-				</li>
-				<li><span>优惠券补贴(元)</span>
-					<view class="pic">100.00</view>
-				</li>
-				<li><span>退款支出(元)</span>
-					<view class="pic">100.00</view>
-				</li>
-				<li class="kuang"><span>佣金支出(元)</span>
-					<view class="pic">100.00</view>
-				</li>
-				<li><span>平台手续费(元)</span>
-					<view class="pic">100.00</view>
-				</li>
-			</ul>
-		</view>
-		<view class="footer">
-			<view class="footer_top">
-				<view class="top_left">
-					账单数据
-				</view>
-				<view class="top_reight" @click="riqipop">
-					日期选择
-					<u-icon name="arrow-down-fill" color="#999999" size="12" style="margin-left: 3px;"></u-icon>
-				</view>
-			</view>
-			<view class="footer_b">
-				<view class="bon_top">
-					<!-- #ifdef MP-WEIXIN -->
-					<view :class="left" @click="riqi(1)">
-						日账单
-					</view>
-					<view :class="reight" @click="riqi(2)">
-						月账单
-					</view>
-					<!-- #endif -->
-					<!-- #ifdef H5 -->
-					<view :class="this.left" @click.stop="riqi(1)">
-						日账单
-					</view>
-					<view :class="this.reight" @click.stop="riqi(2)">
-						月账单
-					</view>
-					<!-- #endif -->
-					<!-- #ifdef APP-PLUS -->
-					<view :class="this.left" @click.stop="riqi(1)">
-						日账单
-					</view>
-					<view :class="this.reight" @click.stop="riqi(2)">
-						月账单
-					</view>
-					<!-- #endif -->
-				</view>
-				<view v-if="Riqi == 1" class="bon_bon">
-					<scroll-view scroll-y="true" class="scroll-Y">
-						<view class="bon_shuju">
-							<view class="top">
-								<view class="xiangqin" @click="todetails">
-									账单详情
-								</view>
-								<view class="riqi">
-									账单日期:
-									<span>2020.20.22</span>
-								</view>
-							</view>
-							<view class="bottom">
-								<view class="left">
-									收入金额(元)
-									<view>100.00</view>
-								</view>
-								<view class="reight">
-									<p>
-										支出金额: <span>0.00</span> 元
-									</p>
-									<p>
-										入账金额: <span>100.00</span> 元
-									</p>
-								</view>
-							</view>
-						</view>
-					</scroll-view>
-				</view>
-				<view v-else class="bon_bon">
-					<scroll-view scroll-y="true" class="scroll-Y">
-						<view class="bon_shuju">
-							<view class="top">
-								<view class="xiangqin" @click="todetails">
-									账单详情
-								</view>
-								<view class="riqi">
-									账单月份:
-									<span>2020.20</span>
-								</view>
-							</view>
-							<view class="bottom">
-								<view class="left">
-									收入金额(元)
-									<view>100.00</view>
-								</view>
-								<view class="reight">
-									<p>
-										支出金额: <span>0.00</span> 元
-									</p>
-									<p>
-										入账金额: <span>100.00</span> 元
-									</p>
-								</view>
-							</view>
-						</view>
-					</scroll-view>
-				</view>
-			</view>
-		</view>
-		<uni-calendar ref="calendar" :insert="false" @confirm="confirm" />
-	</view>
+  <view>
+    <view class="order-index" ref="container">
+      <view class="header acea-row">
+        <navigator class="item" :url="`/pages/admin/orderList/index?types=1&merId=${mer_id}`" hover-class="none">
+          <view class="num">{{ census.unpaid }}</view>
+          <view>待付款</view>
+        </navigator>
+        <navigator class="item" :url="`/pages/admin/orderList/index?types=2&merId=${mer_id}`" hover-class="none">
+          <view class="num">{{ census.unshipped }}</view>
+          <view>待发货</view>
+        </navigator>
+        <navigator class="item" :url="`/pages/admin/orderList/index?types=3&merId=${mer_id}`" hover-class="none">
+          <view class="num">{{ census.untake }}</view>
+          <view>待收货</view>
+        </navigator>
+        <navigator class="item" :url="`/pages/admin/orderList/index?types=4&merId=${mer_id}`" hover-class="none">
+          <view class="num">{{ census.unevaluate }}</view>
+          <view>待评价</view>
+        </navigator>
+        <navigator class="item" :url="`/pages/admin/orderList/index?types=6&merId=${mer_id}`" hover-class="none">
+          <view class="num">{{ census.refund }}</view>
+          <view>退款</view>
+        </navigator>
+      </view>
+      <view class="wrapper">
+        <view class="title">
+          <span class="iconfont icon-shujutongji"></span>数据统计
+        </view>
+        <view class="list acea-row" v-if="orderData">
+          <navigator class="item" :url="`/pages/admin/statistics/index?type=price&time=today&merId=${mer_id}`"
+            hover-class="none">
+            <view class="num">{{ orderData.today.payPrice }}</view>
+            <view>今日成交额</view>
+          </navigator>
+          <navigator class="item" :url="`/pages/admin/statistics/index?type=price&time=yesterday&merId=${mer_id}`"
+            hover-class="none">
+            <view class="num">{{ orderData.yesterday.payPrice }}</view>
+            <view>昨日成交额</view>
+          </navigator>
+          <navigator class="item" :url="`/pages/admin/statistics/index?type=price&time=month&merId=${mer_id}`"
+            hover-class="none">
+            <view class="num">{{ orderData.month.payPrice  }}</view>
+            <view>本月成交额</view>
+          </navigator>
+          <navigator class="item" :url="`/pages/admin/statistics/index?type=order&time=today&merId=${mer_id}`"
+            hover-class="none">
+            <view class="num">{{ orderData.today.orderNum}}</view>
+            <view>今日订单数</view>
+          </navigator>
+          <navigator class="item" :url="`/pages/admin/statistics/index?type=order&time=yesterday&merId=${mer_id}`"
+            hover-class="none">
+            <view class="num">{{ orderData.yesterday.orderNum }}</view>
+            <view>昨日订单数</view>
+          </navigator>
+          <navigator class="item" :url="`/pages/admin/statistics/index?type=order&time=month&merId=${mer_id}`"
+            hover-class="none">
+            <view class="num">{{ orderData.month.orderNum}}</view>
+            <view>本月订单数</view>
+          </navigator>
+        </view>
+      </view>
+      <view class="public-wrapper">
+        <view class="title">
+          <span class="iconfont icon-xiangxishuju"></span>详细数据
+        </view>
+        <view class="nav acea-row row-between-wrapper">
+          <view class="data">日期</view>
+          <view class="browse">订单数</view>
+          <view class="turnover">成交额</view>
+        </view>
+        <view class="conter">
+          <view class="item acea-row row-between-wrapper" v-for="(item, index) in list" :key="index">
+            <view class="data">{{ item.day }}</view>
+            <view class="browse">{{ item.total }}</view>
+            <view class="turnover">{{ item.pay_price }}</view>
+          </view>
+        </view>
+      </view>
+      <Loading :loaded="loaded" :loading="loading"></Loading>
+    </view>
+  </view>
 </template>
 
 <script>
-	// import {
-	// 	finaHeaderDataApi
-	// } from "@/api/admin";
-	export default {
-		data() {
-			return {
-				mer_id: '',
-				//日期
-				Riqi: 1,
-				left: 'haver',
-				reight: 'reight',
-			}
-		},
-		onLoad(options) {
-			this.mer_id = options.mer_id
-			// this.getHeaderData()
-		},
-		methods: {
-			//跳转详情
-			todetails() {
-				uni.navigateTo({
-					url: `/pages/users/user_invoice_order_list/index?mer_id=${this.mer_id}`
-				})
-			},
-			//日期菜单
-			riqi(e) {
-				this.Riqi = e
-				if (e == 1) {
-					this.left = 'haver'
-					this.reight = 'reight'
-				} else {
-					this.left = 'left'
-					this.reight = 'havers'
-				}
-			},
-			riqipop() {
-				this.$refs.calendar.open();
-			},
-			//日期
-			confirm(e) {
-				console.log(e);
-			},
-			//账单数据
-			// getHeaderData() {
-			// 	finaHeaderDataApi({
-			// 		date: this.tableForm.date
-			// 	}).then(res =>{
-			// 		console.log(res);
-			// 	}).catch(err => {
-			// 	})
-			// },
-		},
-	}
+  import { getStatisticsInfo, getStatisticsMonth, orderStatistics, orderPrice } from "@/api/admin";
+  import Loading from '@/components/Loading/index.vue'
+  export default {
+    name: 'adminOrder',
+    components: {
+      Loading
+    },
+    data() {
+      return {
+        census: {},
+        orderData: {
+          today: {},
+          yesterday: {},
+          month: {}
+        },
+        list: [],
+        where: {
+          page: 1,
+          limit: 15,
+          product_type: ''
+        },
+        loaded: false,
+        loading: false,
+        mer_id: '',
+      }
+    },
+    onLoad(options) {
+      this.where.product_type = options.product_type ?? 0
+      this.mer_id = options.mer_id
+      options.product_type ? uni.setStorageSync("PRODUCT_TYPE", 98) : uni.removeStorageSync("PRODUCT_TYPE");
+      this.getOrderStatistics(this.mer_id);
+      this.getList(this.mer_id)
+    },
+    methods: {
+      getIndex: function() {
+        var that = this;
+        getStatisticsInfo().then(
+          res => {
+            that.census = res.data;
+          },
+          err => {
+            that.$util.Tips({
+              title: err.msg
+            })
+          }
+        );
+      },
+      getList: function(mer_id) {
+        var that = this;
+        if (that.loading || that.loaded) return;
+        that.loading = true;
+        orderPrice(that.where, mer_id).then(
+          res => {
+            that.loading = false;
+            that.loaded = res.data.length < that.where.limit;
+            that.list.push.apply(that.list, res.data);
+            that.where.page = that.where.page + 1;
+          },
+          error => {
+            that.$util.Tips({
+              title: error.msg
+            })
+          },
+          300
+        );
+      },
+      getOrderStatistics: function(mer_id) {
+        let that = this;
+        const data = { product_type: this.where.product_type }
+        console.log('data', data);
+        orderStatistics(mer_id, data).then(
+          res => {
+            that.census = res.data.order;
+            that.orderData = res.data.data;
+          },
+          err => {
+            that.$util.Tips({
+              title: err.msg
+            })
+          }
+        );
+      }
+    },
+    onReachBottom() {
+      this.getList(this.mer_id)
+    }
+  }
 </script>
 
-<style lang="scss" scoped>
-	* {
-		padding: 0;
-		margin: 0;
-	}
-
-	.box {
-		height: 60vh;
-		background-color: #fff;
-	}
-
-	/* #ifdef MP-WEIXIN */
-	.box {
-		height: 60vh;
-		background-color: #fff;
-	}
-
-	/* #endif */
-	.bg {
-		width: 100%;
-		height: 504rpx;
-		background: url(@/static/images/dingdan.png);
-
-		.head {
-			color: white;
-			padding-top: 30px;
-
-			.head_top {
-				width: 100%;
-				height: 40px;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-
-				.yanjing {
-					margin-left: 10px;
-					width: 35rpx;
-					height: 35rpx;
-
-				}
-			}
-
-			.pirc {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				font-size: 60rpx;
-				margin-top: 30rpx;
-			}
-
-			.tubiao {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				position: relative;
-				margin: auto;
-				margin-top: 16px;
-				width: 290rpx;
-				height: 75rpx;
-				background: url(@/static/images/tishi.png);
-
-				.zhi {
-					position: absolute;
-					font-size: 25rpx;
-
-					span {
-						margin-left: 5px;
-						margin-right: 5px;
-					}
-				}
-
-
-			}
-
-			/* #ifdef MP-WEIXIN */
-			.tubiao {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				position: relative;
-				margin: auto;
-				margin-top: 16px;
-				width: 320rpx;
-				height: 80rpx;
-				background: url(@/static/images/tishi.png);
-
-				.zhi {
-					position: absolute;
-					font-size: 25rpx;
-
-					span {
-						margin-left: 5px;
-						margin-right: 5px;
-					}
-				}
-
-
-			}
-
-			/* #endif */
-			/* #ifdef APP-PLUS */
-			.tubiao {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				position: relative;
-				margin: auto;
-				margin-top: 15px;
-				width: 307rpx;
-				height: 78rpx;
-				background: url(@/static/images/tishi.png);
-
-				.zhi {
-					position: absolute;
-					font-size: 25rpx;
-
-					span {
-						margin-left: 5px;
-						margin-right: 5px;
-					}
-				}
-
-
-			}
-
-			/* #endif */
-		}
-
-	}
-
-	.conet {
-		width: 694rpx;
-		height: 252rpx;
-		background-color: white;
-		position: absolute;
-		top: 190px;
-		left: 15px;
-		border-radius: 15px;
-		box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(203, 30, 20, 0.1);
-
-		ul {
-			display: flex;
-			flex-wrap: wrap;
-			list-style: none;
-
-			li {
-				text-align: center;
-				margin-left: 6px;
-				margin-top: 19px;
-				width: 120px;
-
-				span {
-					font-size: 25rpx;
-
-				}
-
-				.pic {
-					font-size: 32rpx;
-					color: #F84221;
-					margin-top: 3px;
-				}
-			}
-
-			.kuang {
-				border-left: 1px solid #999999;
-				border-right: 1px solid #999999;
-			}
-		}
-
-		/* #ifdef MP-WEIXIN */
-		ul {
-			display: flex;
-			flex-wrap: wrap;
-			list-style: none;
-
-			li {
-				text-align: center;
-				margin-left: 6px;
-				margin-top: 15px;
-				width: 105px;
-
-				span {
-					font-size: 25rpx;
-
-				}
-
-				.pic {
-					font-size: 32rpx;
-					color: #F84221;
-					margin-top: 3px;
-				}
-			}
-
-			.kuang {
-				border-left: 1px solid #999999;
-				border-right: 1px solid #999999;
-			}
-		}
-
-		/* #endif */
-		/* #ifdef APP-PLUS */
-		ul {
-			display: flex;
-			flex-wrap: wrap;
-			list-style: none;
-
-			li {
-				text-align: center;
-				margin-left: 6px;
-				margin-top: 15px;
-				width: 115px;
-
-				span {
-					font-size: 25rpx;
-
-				}
-
-				.pic {
-					font-size: 32rpx;
-					color: #F84221;
-					margin-top: 3px;
-				}
-			}
-
-			.kuang {
-				border-left: 1px solid #999999;
-				border-right: 1px solid #999999;
-			}
-		}
-
-		/* #endif */
-	}
-
-	.footer {
-		width: 100%;
-		position: absolute;
-		top: 370px;
-
-		.footer_top {
-			width: 694rpx;
-			display: flex;
-			justify-content: space-between;
-			box-sizing: border-box;
-
-
-			.top_left {
-				font-size: 32rpx;
-				font-weight: bold;
-				margin-left: 20px;
-				padding-left: 5px;
-				border-left: 3px solid #F84221;
-			}
-
-			.top_reight {
-				width: 100px;
-				color: #999999;
-				background-color: #F5F5F5;
-				border-radius: 10px;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-
-			}
-		}
-
-		.footer_b {
-			width: 100%;
-			margin-top: 20px;
-
-			.bon_top {
-				color: #F84221;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-
-				.left {
-					width: 85px;
-					height: 30px;
-					text-align: center;
-					line-height: 30px;
-					font-size: 28rpx;
-					border: 1px solid #F45346;
-					border-radius: 15px 0 0 15px;
-				}
-
-				.reight {
-					width: 85px;
-					height: 30px;
-					text-align: center;
-					line-height: 30px;
-					font-size: 28rpx;
-					border: 1px solid #F45346;
-					border-radius: 0 15px 15px 0;
-				}
-
-				.haver {
-					width: 85px;
-					height: 30px;
-					text-align: center;
-					line-height: 30px;
-					font-size: 28rpx;
-					border: 1px solid #F45346;
-					border-radius: 15px 0 0 15px;
-					color: #fff;
-					background-image: linear-gradient(90deg, #F98649 0%, #F34E45 100%);
-				}
-
-				.havers {
-					width: 85px;
-					height: 30px;
-					text-align: center;
-					line-height: 30px;
-					font-size: 28rpx;
-					border: 1px solid #F45346;
-					border-radius: 0 15px 15px 0;
-					color: #fff;
-					background-image: linear-gradient(90deg, #F34E45 0%, #F98649 100%);
-				}
-			}
-
-		}
-
-		.bon_bon {
-			width: 100%;
-			height: 20px;
-			background-color: #fff;
-			margin-top: 15px;
-
-			.scroll-Y {
-				max-height: 50vh;
-
-				.bon_shuju {
-					padding-top: 10px;
-					padding-bottom: 10px;
-					background-color: #fff;
-					margin-bottom: 20px;
-
-					.top {
-						margin-left: 20px;
-						display: flex;
-						justify-content: flex-start;
-
-						.xiangqin {
-							color: #fff;
-							width: 137rpx;
-							height: 49rpx;
-							text-align: center;
-							line-height: 49rpx;
-							margin-right: 15px;
-							background: linear-gradient(95deg, #F98649 0%, #F34E45 100%);
-							border-radius: 26rpx 26rpx 26rpx 26rpx;
-						}
-
-						.riqi {
-							height: 49rpx;
-							text-align: center;
-							line-height: 49rpx;
-							font-size: 25rpx;
-
-							span {
-								margin-left: 10px;
-							}
-						}
-					}
-
-					.bottom {
-						display: flex;
-						justify-content: space-evenly;
-						margin-top: 20px;
-
-						.left {
-							font-size: 25rpx;
-							color: #666666;
-
-							view {
-								font-size: 42rpx;
-								color: #F84221;
-								font-weight: 500;
-							}
-						}
-
-						.reight {
-							p {
-								margin-bottom: 7px;
-
-								span {
-									margin-left: 6px;
-								}
-							}
-
-						}
-					}
-				}
-			}
-
-
-
-		}
-	}
-
-	/* #ifdef MP-WEIXIN */
-	.footer {
-		width: 100%;
-		position: absolute;
-		top: 340px;
-
-		.footer_top {
-			width: 694rpx;
-			display: flex;
-			justify-content: space-between;
-			box-sizing: border-box;
-
-
-			.top_left {
-				font-size: 32rpx;
-				font-weight: bold;
-				margin-left: 20px;
-				border-left: 3px solid #F84221;
-			}
-
-			.top_reight {
-				width: 100px;
-				color: #999999;
-				background-color: #F5F5F5;
-				border-radius: 10px;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-
-			}
-		}
-
-		.footer_b {
-			width: 100%;
-			margin-top: 20px;
-
-			.bon_top {
-				color: #F84221;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-
-				.left {
-					width: 85px;
-					height: 30px;
-					text-align: center;
-					line-height: 30px;
-					font-size: 28rpx;
-					border: 1px solid #F45346;
-					border-radius: 15px 0 0 15px;
-				}
-
-				.reight {
-					width: 85px;
-					height: 30px;
-					text-align: center;
-					line-height: 30px;
-					font-size: 28rpx;
-					border: 1px solid #F45346;
-					border-radius: 0 15px 15px 0;
-				}
-
-				.haver {
-					color: #fff;
-					background-image: linear-gradient(90deg, #F98649 0%, #F34E45 100%);
-				}
-
-				.havers {
-					color: #fff;
-					background-image: linear-gradient(90deg, #F34E45 0%, #F98649 100%);
-				}
-			}
-		}
-
-		.bon_bon {
-			width: 100%;
-			height: 20px;
-			background-color: #fff;
-			margin-top: 15px;
-
-			.scroll-Y {
-				max-height: 50vh;
-
-				.bon_shuju {
-					padding-top: 10px;
-					padding-bottom: 10px;
-					background-color: #fff;
-					margin-bottom: 20px;
-
-					.top {
-						margin-left: 20px;
-						display: flex;
-						justify-content: flex-start;
-
-						.xiangqin {
-							color: #fff;
-							width: 137rpx;
-							height: 49rpx;
-							text-align: center;
-							line-height: 49rpx;
-							margin-right: 15px;
-							background: linear-gradient(95deg, #F98649 0%, #F34E45 100%);
-							border-radius: 26rpx 26rpx 26rpx 26rpx;
-						}
-
-						.riqi {
-							height: 49rpx;
-							text-align: center;
-							line-height: 49rpx;
-							font-size: 25rpx;
-						}
-					}
-
-					.bottom {
-						display: flex;
-						justify-content: space-evenly;
-						margin-top: 20px;
-
-						.left {
-							font-size: 25rpx;
-							color: #666666;
-
-							view {
-								font-size: 42rpx;
-								color: #F84221;
-								font-weight: 500;
-							}
-						}
-
-						.reight {
-							p {
-								margin-bottom: 7px;
-
-								span {
-									margin-left: 6px;
-								}
-							}
-
-						}
-					}
-				}
-			}
-
-
-
-		}
-	}
-
-	/* #endif */
+<style lang="scss">
+  .popupn {
+    position: fixed;
+    width: 100%;
+    text-align: center;
+    top: 0;
+    left: 0;
+    background: transparent;
+    height: 90rpx;
+    line-height: 90rpx;
+    z-index: 100;
+
+    .spin {
+      display: block;
+      transform: rotate(180deg);
+      font-size: 36rpx;
+    }
+
+    .title {
+      max-width: 560rpx;
+      margin: 0 auto;
+      position: relative;
+      display: inline;
+      padding: 10rpx 30rpx 10rpx 50rpx;
+      background-color: rgba(0, 0, 0, 0.15);
+      border-radius: 30rpx;
+      color: #fff;
+    }
+
+    .iconfont {
+      display: inline-block;
+      position: relative;
+      top: 4rpx;
+      right: 0;
+    }
+
+    .mer_logo {
+      width: 34rpx;
+      height: 34rpx;
+      position: relative;
+      top: 6rpx;
+      right: 10px;
+    }
+
+    .mer_name {
+      display: inline-block;
+      max-width: 650rpx;
+    }
+
+    .invoice-content {
+      background-color: #ffffff;
+    }
+  }
+
+  /*订单首页*/
+  .order-index .header {
+    background-image: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/beijing2.png");
+    background-size: 100% 100%;
+    width: 100%;
+    height: 280upx;
+    padding: 40upx 3upx 0 3upx;
+    box-sizing: border-box;
+  }
+
+  .order-index .header .item {
+    flex: 1;
+    -webkit-flex: 1;
+    -o-flex: 1;
+    -ms-flex: 1;
+    text-align: center;
+    font-size: 24upx;
+    color: #fff;
+  }
+
+  .order-index .header .item .num {
+    font-size: 40upx;
+    margin-bottom: 7upx;
+    height: 60rpx;
+  }
+
+  .order-index .wrapper {
+    width: 690upx;
+    background-color: #fff;
+    border-radius: 10upx;
+    margin: -115upx auto 0 auto;
+    padding-top: 25upx;
+  }
+
+  .order-index .wrapper .title {
+    font-size: 30upx;
+    color: #282828;
+    padding: 0 30upx;
+    margin-bottom: 40upx;
+  }
+
+  .order-index .wrapper .title .iconfont {
+    color: #2291f8;
+    font-size: 40upx;
+    margin-right: 13upx;
+    vertical-align: middle;
+  }
+
+  .order-index .wrapper .list .item {
+    width: 33.33%;
+    text-align: center;
+    font-size: 24upx;
+    color: #999;
+    margin-bottom: 45upx;
+  }
+
+  .order-index .wrapper .list .item .num {
+    font-size: 40upx;
+    color: #333;
+  }
+
+  .public-wrapper .title {
+    font-size: 30upx;
+    color: #282828;
+    padding: 0 30upx;
+    margin-bottom: 20upx;
+  }
+
+  .public-wrapper .title .iconfont {
+    color: #2291f8;
+    font-size: 40upx;
+    margin-right: 13upx;
+    vertical-align: middle;
+  }
+
+  .public-wrapper {
+    margin: 18upx auto 0 auto;
+    width: 690upx;
+    background-color: #fff;
+    border-radius: 10upx;
+    padding-top: 25upx;
+  }
+
+  .public-wrapper .nav {
+    padding: 0 30upx;
+    height: 70upx;
+    line-height: 70upx;
+    font-size: 24upx;
+    color: #999;
+  }
+
+  .public-wrapper .data {
+    width: 210upx;
+    text-align: left;
+  }
+
+  .public-wrapper .browse {
+    width: 192upx;
+    text-align: right;
+  }
+
+  .public-wrapper .turnover {
+    width: 227upx;
+    text-align: right;
+  }
+
+  .public-wrapper .conter {
+    padding: 0 30upx;
+  }
+
+  .public-wrapper .conter .item {
+    border-bottom: 1px solid #f7f7f7;
+    height: 70upx;
+    font-size: 24upx;
+  }
+
+  .public-wrapper .conter .item .turnover {
+    color: #d84242;
+  }
 </style>
\ No newline at end of file
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index fc7d3ce..218e530 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -44,6 +44,11 @@
 						</image>
 						<text class="text">视频教学</text>
 					</view>
+					<view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
+						<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
+						</image>
+						<text class="text">财务公开</text>
+					</view>
 					<!-- <view class="examine" @click="navigator(`/pages/admin/order/index?mer_id=${mer_id}`)">
 						<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
 						</image>
@@ -111,6 +116,11 @@
 							</image>
 							<text class="text">商户设置</text>
 						</view>
+						<view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
+							<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
+							</image>
+							<text class="text">财务公开</text>
+						</view>
 					
 
 					</view>
@@ -177,6 +187,11 @@
 							</image>
 							<text class="text">商户设置</text>
 						</view>
+						<view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
+							<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
+							</image>
+							<text class="text">财务公开</text>
+						</view>
 
 					</view>
 				</view>
diff --git a/pages/users/user_invoice_Finance/index.vue b/pages/users/user_invoice_Finance/index.vue
new file mode 100644
index 0000000..c44a0b9
--- /dev/null
+++ b/pages/users/user_invoice_Finance/index.vue
@@ -0,0 +1,747 @@
+<template>
+	<view class="box">
+		<view class="bg">
+			<view class="head">
+				<view class="head_top">
+					账户余额(元)
+					<image src="@/static/images/yanjing.png" class="yanjing" mode=""></image>
+				</view>
+				<view class="pirc">666666666666</view>
+				<view class="tubiao">
+					<!-- <image src="@/static/images/tishi.png" mode="widthFix"></image> -->
+					<view class="zhi">
+						可提现金额 <span>115.00</span> 元
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="conet">
+			<ul>
+				<li>
+					<span>商户收入(元)</span>
+					<view class="pic">100.00</view>
+				</li>
+				<li class="kuang"><span>冻结金额(元)</span>
+					<view class="pic">100.00</view>
+				</li>
+				<li><span>优惠券补贴(元)</span>
+					<view class="pic">100.00</view>
+				</li>
+				<li><span>退款支出(元)</span>
+					<view class="pic">100.00</view>
+				</li>
+				<li class="kuang"><span>佣金支出(元)</span>
+					<view class="pic">100.00</view>
+				</li>
+				<li><span>平台手续费(元)</span>
+					<view class="pic">100.00</view>
+				</li>
+			</ul>
+		</view>
+		<view class="footer">
+			<view class="footer_top">
+				<view class="top_left">
+					账单数据
+				</view>
+				<view class="top_reight" @click="riqipop">
+					日期选择
+					<u-icon name="arrow-down-fill" color="#999999" size="12" style="margin-left: 3px;"></u-icon>
+				</view>
+			</view>
+			<view class="footer_b">
+				<view class="bon_top">
+					<!-- #ifdef MP-WEIXIN -->
+					<view :class="left" @click="riqi(1)">
+						日账单
+					</view>
+					<view :class="reight" @click="riqi(2)">
+						月账单
+					</view>
+					<!-- #endif -->
+					<!-- #ifdef H5 -->
+					<view :class="this.left" @click.stop="riqi(1)">
+						日账单
+					</view>
+					<view :class="this.reight" @click.stop="riqi(2)">
+						月账单
+					</view>
+					<!-- #endif -->
+					<!-- #ifdef APP-PLUS -->
+					<view :class="this.left" @click.stop="riqi(1)">
+						日账单
+					</view>
+					<view :class="this.reight" @click.stop="riqi(2)">
+						月账单
+					</view>
+					<!-- #endif -->
+				</view>
+				<view v-if="Riqi == 1" class="bon_bon">
+					<scroll-view scroll-y="true" class="scroll-Y">
+						<view class="bon_shuju">
+							<view class="top">
+								<view class="xiangqin" @click="todetails">
+									账单详情
+								</view>
+								<view class="riqi">
+									账单日期:
+									<span>2020.20.22</span>
+								</view>
+							</view>
+							<view class="bottom">
+								<view class="left">
+									收入金额(元)
+									<view>100.00</view>
+								</view>
+								<view class="reight">
+									<p>
+										支出金额: <span>0.00</span> 元
+									</p>
+									<p>
+										入账金额: <span>100.00</span> 元
+									</p>
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+				<view v-else class="bon_bon">
+					<scroll-view scroll-y="true" class="scroll-Y">
+						<view class="bon_shuju">
+							<view class="top">
+								<view class="xiangqin" @click="todetails">
+									账单详情
+								</view>
+								<view class="riqi">
+									账单月份:
+									<span>2020.20</span>
+								</view>
+							</view>
+							<view class="bottom">
+								<view class="left">
+									收入金额(元)
+									<view>100.00</view>
+								</view>
+								<view class="reight">
+									<p>
+										支出金额: <span>0.00</span> 元
+									</p>
+									<p>
+										入账金额: <span>100.00</span> 元
+									</p>
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+		<uni-calendar ref="calendar" :insert="false" @confirm="confirm" />
+	</view>
+</template>
+
+<script>
+	// import {
+	// 	finaHeaderDataApi
+	// } from "@/api/admin";
+	export default {
+		data() {
+			return {
+				mer_id: '',
+				//日期
+				Riqi: 1,
+				left: 'haver',
+				reight: 'reight',
+			}
+		},
+		onLoad(options) {
+			this.mer_id = options.mer_id
+			// this.getHeaderData()
+		},
+		methods: {
+			//跳转详情
+			todetails() {
+				uni.navigateTo({
+					url: `/pages/users/user_invoice_order_list/index?mer_id=${this.mer_id}`
+				})
+			},
+			//日期菜单
+			riqi(e) {
+				this.Riqi = e
+				if (e == 1) {
+					this.left = 'haver'
+					this.reight = 'reight'
+				} else {
+					this.left = 'left'
+					this.reight = 'havers'
+				}
+			},
+			riqipop() {
+				this.$refs.calendar.open();
+			},
+			//日期
+			confirm(e) {
+				console.log(e);
+			},
+			//账单数据
+			// getHeaderData() {
+			// 	finaHeaderDataApi({
+			// 		date: this.tableForm.date
+			// 	}).then(res =>{
+			// 		console.log(res);
+			// 	}).catch(err => {
+			// 	})
+			// },
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	* {
+		padding: 0;
+		margin: 0;
+	}
+
+	.box {
+		height: 60vh;
+		background-color: #fff;
+	}
+
+	/* #ifdef MP-WEIXIN */
+	.box {
+		height: 60vh;
+		background-color: #fff;
+	}
+
+	/* #endif */
+	.bg {
+		width: 100%;
+		height: 504rpx;
+		background: url(@/static/images/dingdan.png);
+
+		.head {
+			color: white;
+			padding-top: 30px;
+
+			.head_top {
+				width: 100%;
+				height: 40px;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.yanjing {
+					margin-left: 10px;
+					width: 35rpx;
+					height: 35rpx;
+
+				}
+			}
+
+			.pirc {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 60rpx;
+				margin-top: 30rpx;
+			}
+
+			.tubiao {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: relative;
+				margin: auto;
+				margin-top: 16px;
+				width: 290rpx;
+				height: 75rpx;
+				background: url(@/static/images/tishi.png);
+
+				.zhi {
+					position: absolute;
+					font-size: 25rpx;
+
+					span {
+						margin-left: 5px;
+						margin-right: 5px;
+					}
+				}
+
+
+			}
+
+			/* #ifdef MP-WEIXIN */
+			.tubiao {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: relative;
+				margin: auto;
+				margin-top: 16px;
+				width: 320rpx;
+				height: 80rpx;
+				background: url(@/static/images/tishi.png);
+
+				.zhi {
+					position: absolute;
+					font-size: 25rpx;
+
+					span {
+						margin-left: 5px;
+						margin-right: 5px;
+					}
+				}
+
+
+			}
+
+			/* #endif */
+			/* #ifdef APP-PLUS */
+			.tubiao {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				position: relative;
+				margin: auto;
+				margin-top: 15px;
+				width: 307rpx;
+				height: 78rpx;
+				background: url(@/static/images/tishi.png);
+
+				.zhi {
+					position: absolute;
+					font-size: 25rpx;
+
+					span {
+						margin-left: 5px;
+						margin-right: 5px;
+					}
+				}
+
+
+			}
+
+			/* #endif */
+		}
+
+	}
+
+	.conet {
+		width: 694rpx;
+		height: 252rpx;
+		background-color: white;
+		position: absolute;
+		top: 190px;
+		left: 15px;
+		border-radius: 15px;
+		box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(203, 30, 20, 0.1);
+
+		ul {
+			display: flex;
+			flex-wrap: wrap;
+			list-style: none;
+
+			li {
+				text-align: center;
+				margin-left: 6px;
+				margin-top: 19px;
+				width: 120px;
+
+				span {
+					font-size: 25rpx;
+
+				}
+
+				.pic {
+					font-size: 32rpx;
+					color: #F84221;
+					margin-top: 3px;
+				}
+			}
+
+			.kuang {
+				border-left: 1px solid #999999;
+				border-right: 1px solid #999999;
+			}
+		}
+
+		/* #ifdef MP-WEIXIN */
+		ul {
+			display: flex;
+			flex-wrap: wrap;
+			list-style: none;
+
+			li {
+				text-align: center;
+				margin-left: 6px;
+				margin-top: 15px;
+				width: 105px;
+
+				span {
+					font-size: 25rpx;
+
+				}
+
+				.pic {
+					font-size: 32rpx;
+					color: #F84221;
+					margin-top: 3px;
+				}
+			}
+
+			.kuang {
+				border-left: 1px solid #999999;
+				border-right: 1px solid #999999;
+			}
+		}
+
+		/* #endif */
+		/* #ifdef APP-PLUS */
+		ul {
+			display: flex;
+			flex-wrap: wrap;
+			list-style: none;
+
+			li {
+				text-align: center;
+				margin-left: 6px;
+				margin-top: 15px;
+				width: 115px;
+
+				span {
+					font-size: 25rpx;
+
+				}
+
+				.pic {
+					font-size: 32rpx;
+					color: #F84221;
+					margin-top: 3px;
+				}
+			}
+
+			.kuang {
+				border-left: 1px solid #999999;
+				border-right: 1px solid #999999;
+			}
+		}
+
+		/* #endif */
+	}
+
+	.footer {
+		width: 100%;
+		position: absolute;
+		top: 370px;
+
+		.footer_top {
+			width: 694rpx;
+			display: flex;
+			justify-content: space-between;
+			box-sizing: border-box;
+
+
+			.top_left {
+				font-size: 32rpx;
+				font-weight: bold;
+				margin-left: 20px;
+				padding-left: 5px;
+				border-left: 3px solid #F84221;
+			}
+
+			.top_reight {
+				width: 100px;
+				color: #999999;
+				background-color: #F5F5F5;
+				border-radius: 10px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+			}
+		}
+
+		.footer_b {
+			width: 100%;
+			margin-top: 20px;
+
+			.bon_top {
+				color: #F84221;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.left {
+					width: 85px;
+					height: 30px;
+					text-align: center;
+					line-height: 30px;
+					font-size: 28rpx;
+					border: 1px solid #F45346;
+					border-radius: 15px 0 0 15px;
+				}
+
+				.reight {
+					width: 85px;
+					height: 30px;
+					text-align: center;
+					line-height: 30px;
+					font-size: 28rpx;
+					border: 1px solid #F45346;
+					border-radius: 0 15px 15px 0;
+				}
+
+				.haver {
+					width: 85px;
+					height: 30px;
+					text-align: center;
+					line-height: 30px;
+					font-size: 28rpx;
+					border: 1px solid #F45346;
+					border-radius: 15px 0 0 15px;
+					color: #fff;
+					background-image: linear-gradient(90deg, #F98649 0%, #F34E45 100%);
+				}
+
+				.havers {
+					width: 85px;
+					height: 30px;
+					text-align: center;
+					line-height: 30px;
+					font-size: 28rpx;
+					border: 1px solid #F45346;
+					border-radius: 0 15px 15px 0;
+					color: #fff;
+					background-image: linear-gradient(90deg, #F34E45 0%, #F98649 100%);
+				}
+			}
+
+		}
+
+		.bon_bon {
+			width: 100%;
+			height: 20px;
+			background-color: #fff;
+			margin-top: 15px;
+
+			.scroll-Y {
+				max-height: 50vh;
+
+				.bon_shuju {
+					padding-top: 10px;
+					padding-bottom: 10px;
+					background-color: #fff;
+					margin-bottom: 20px;
+
+					.top {
+						margin-left: 20px;
+						display: flex;
+						justify-content: flex-start;
+
+						.xiangqin {
+							color: #fff;
+							width: 137rpx;
+							height: 49rpx;
+							text-align: center;
+							line-height: 49rpx;
+							margin-right: 15px;
+							background: linear-gradient(95deg, #F98649 0%, #F34E45 100%);
+							border-radius: 26rpx 26rpx 26rpx 26rpx;
+						}
+
+						.riqi {
+							height: 49rpx;
+							text-align: center;
+							line-height: 49rpx;
+							font-size: 25rpx;
+
+							span {
+								margin-left: 10px;
+							}
+						}
+					}
+
+					.bottom {
+						display: flex;
+						justify-content: space-evenly;
+						margin-top: 20px;
+
+						.left {
+							font-size: 25rpx;
+							color: #666666;
+
+							view {
+								font-size: 42rpx;
+								color: #F84221;
+								font-weight: 500;
+							}
+						}
+
+						.reight {
+							p {
+								margin-bottom: 7px;
+
+								span {
+									margin-left: 6px;
+								}
+							}
+
+						}
+					}
+				}
+			}
+
+
+
+		}
+	}
+
+	/* #ifdef MP-WEIXIN */
+	.footer {
+		width: 100%;
+		position: absolute;
+		top: 340px;
+
+		.footer_top {
+			width: 694rpx;
+			display: flex;
+			justify-content: space-between;
+			box-sizing: border-box;
+
+
+			.top_left {
+				font-size: 32rpx;
+				font-weight: bold;
+				margin-left: 20px;
+				border-left: 3px solid #F84221;
+			}
+
+			.top_reight {
+				width: 100px;
+				color: #999999;
+				background-color: #F5F5F5;
+				border-radius: 10px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+			}
+		}
+
+		.footer_b {
+			width: 100%;
+			margin-top: 20px;
+
+			.bon_top {
+				color: #F84221;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.left {
+					width: 85px;
+					height: 30px;
+					text-align: center;
+					line-height: 30px;
+					font-size: 28rpx;
+					border: 1px solid #F45346;
+					border-radius: 15px 0 0 15px;
+				}
+
+				.reight {
+					width: 85px;
+					height: 30px;
+					text-align: center;
+					line-height: 30px;
+					font-size: 28rpx;
+					border: 1px solid #F45346;
+					border-radius: 0 15px 15px 0;
+				}
+
+				.haver {
+					color: #fff;
+					background-image: linear-gradient(90deg, #F98649 0%, #F34E45 100%);
+				}
+
+				.havers {
+					color: #fff;
+					background-image: linear-gradient(90deg, #F34E45 0%, #F98649 100%);
+				}
+			}
+		}
+
+		.bon_bon {
+			width: 100%;
+			height: 20px;
+			background-color: #fff;
+			margin-top: 15px;
+
+			.scroll-Y {
+				max-height: 50vh;
+
+				.bon_shuju {
+					padding-top: 10px;
+					padding-bottom: 10px;
+					background-color: #fff;
+					margin-bottom: 20px;
+
+					.top {
+						margin-left: 20px;
+						display: flex;
+						justify-content: flex-start;
+
+						.xiangqin {
+							color: #fff;
+							width: 137rpx;
+							height: 49rpx;
+							text-align: center;
+							line-height: 49rpx;
+							margin-right: 15px;
+							background: linear-gradient(95deg, #F98649 0%, #F34E45 100%);
+							border-radius: 26rpx 26rpx 26rpx 26rpx;
+						}
+
+						.riqi {
+							height: 49rpx;
+							text-align: center;
+							line-height: 49rpx;
+							font-size: 25rpx;
+						}
+					}
+
+					.bottom {
+						display: flex;
+						justify-content: space-evenly;
+						margin-top: 20px;
+
+						.left {
+							font-size: 25rpx;
+							color: #666666;
+
+							view {
+								font-size: 42rpx;
+								color: #F84221;
+								font-weight: 500;
+							}
+						}
+
+						.reight {
+							p {
+								margin-bottom: 7px;
+
+								span {
+									margin-left: 6px;
+								}
+							}
+
+						}
+					}
+				}
+			}
+
+
+
+		}
+	}
+
+	/* #endif */
+</style>
\ No newline at end of file
diff --git a/static/images/cwgk.png b/static/images/cwgk.png
new file mode 100644
index 0000000..04ff500
Binary files /dev/null and b/static/images/cwgk.png differ