From a4ab29645dc57d731b285aa0334ea4fbc6abf63c Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Fri, 30 Jun 2023 09:50:47 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AF=B9=E6=8E=A5=E8=AE=A2=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=202.=E5=AF=B9=E6=8E=A5=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Utils/Api.js                                  |  19 ++
 pages.json                                    |  15 ++
 pages/index/collectNotes/collectNotes.vue     | 186 +++++++++++++++---
 .../merchant-details/merchant-details.vue     |  67 +++++--
 .../index/normal-Merchant/normal-Merchant.vue | 160 +++++++++++++++
 .../open-Divide_accounts.vue                  |   2 +-
 .../order-list-details/order-list-details.vue | 116 ++++++++---
 pages/tabBar/home/home.vue                    |  23 ++-
 pages/welcome/welcome.vue                     |  42 ++--
 9 files changed, 532 insertions(+), 98 deletions(-)
 create mode 100644 pages/index/normal-Merchant/normal-Merchant.vue

diff --git a/Utils/Api.js b/Utils/Api.js
index 1648707..a7aad5c 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -275,3 +275,22 @@ export const reconsider = params => {
 export const getSettleAcctByMer = params => {
 	return POST('GET', `${base}/merSettleAcct/getSettleAcctByMer`, params).then(res => res.data);
 }
+
+// 查询商户渠道平台列表
+export const getMerPlatformList = params => {
+	return POST('GET', `${base}/merPlatform/getMerPlatformList`, params).then(res => res.data);
+}
+
+// 查询商户
+export const getMerList = params => {
+	return POST('GET', `${base}/mer/getMerList`, params).then(res => res.data);
+}
+ // 查询业务员
+export const querySalesmanList = params => {
+	return POST('GET', `${base}/salesman/querySalesmanList`, params).then(res => res.data);
+}
+//查询订单详情
+export const getOrderByOutTradeOrder = params => {
+	return POST('GET', `${base}/tradeOrder/getOrderByOutTradeOrder`, params).then(res => res.data);
+}
+
diff --git a/pages.json b/pages.json
index 9a9c281..73a4567 100644
--- a/pages.json
+++ b/pages.json
@@ -481,6 +481,21 @@
             }
             
         }
+        ,{
+            "path" : "pages/index/normal-Merchant/normal-Merchant",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "商户",
+                "navigationBarTextStyle": "white",
+                "enablePullDownRefresh": false,
+                "onReachBottomDistance": 50,
+                "app-plus": {
+                	"titleNView": false, //禁用原生导航栏
+                	"softinputNavBar": "none"
+                }
+            }
+            
+        }
     ],
 	"subpackages": [{
 		"root": "subPages",
diff --git a/pages/index/collectNotes/collectNotes.vue b/pages/index/collectNotes/collectNotes.vue
index a4b04c5..98b55fa 100644
--- a/pages/index/collectNotes/collectNotes.vue
+++ b/pages/index/collectNotes/collectNotes.vue
@@ -15,6 +15,35 @@
 					<view class="datetim fcorfff">{{enddate}}<i class="down"></i></view>
 				</picker>
 			</view>
+
+			<view class="mart15 width90 alijusstart" v-if="userInfo.secUser.objectType == 2">
+				<view class="fcorfff font14 margleri10 width25 fotlt">业务员 :</view>
+				<picker mode="selector" class="width75" :range="salesmanList" range-key="name"
+					@change="bindDateChange4">
+					<view class="fcorfff fotrt font14" v-if="salesmanname">{{salesmanname}}<i class="down"></i></view>
+					<view class="fcorfff fotrt font14" v-else>请选择<i class="down"></i></view>
+				</picker>
+			</view>
+
+			<view class="mart15 width90 alijusstart"
+				v-if="userInfo.secUser.objectType == 2 || userInfo.secUser.objectType == 3">
+				<view class="fcorfff font14 margleri10 width25 fotlt">商户 :</view>
+				<picker mode="selector" class="width75" :range="merList" range-key="merName" @change="bindDateChange2">
+					<view class="fcorfff fotrt font14" v-if="merName">{{merName}}<i class="down"></i></view>
+					<view class="fcorfff fotrt font14" v-else>请选择<i class="down"></i></view>
+				</picker>
+			</view>
+
+			<view class="mart15 width90 alijusstart"
+				v-if="userInfo.secUser.objectType == 2 || userInfo.secUser.objectType == 3 || userInfo.secUser.objectType == 4">
+				<view class="fcorfff font14 margleri10 width25 fotlt">门店 :</view>
+				<picker mode="selector" class="width75" :range="storeListByMer" range-key="name"
+					@change="bindDateChange3">
+					<view class="fcorfff fotrt font14" v-if="storename">{{storename}}<i class="down"></i></view>
+					<view class="fcorfff fotrt font14" v-else>请选择<i class="down"></i></view>
+				</picker>
+			</view>
+
 			<view class="input-box">
 				<view class="icon search"></view>
 				<input placeholder="请输入订单编号" v-model="orderNo" placeholder-style="color:#c0c0c0;" @input="toSearch()" />
@@ -44,24 +73,32 @@
 		<view v-if="notesList == ''" class="mart60 fotct font14 fcor666">
 			<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
 		</view>
-		<view class="width100 backcorfff" v-for="(item,index) in notesList" :key="index" @click="jumpOderlist()">
-			<view class="width94 height70 alijusstart bor-botm1">
+		<view class="width100 backcorfff" v-for="(item,index) in notesList" :key="index"
+			@click="jumpOderdetails(item.outTradeNo)">
+			<view class="width94 paddtop10 paddbotm10 alijusstart bor-botm1">
 				<view class="width15">
 					<image src="../../../static/img/wechat.png" mode="widthFix" class="iconw40"
 						v-if="item.payMode == 'WECHAT'"></image>
 					<image src="../../../static/img/alipay.png" mode="widthFix" class="iconw40"
 						v-if="item.payMode == 'ALIPAY'"></image>
 				</view>
+
 				<view class="width85">
-					<view class="alijusstart font15 fcor333">
-						<view class="width50 font15 fcor333">扫一扫</view>
-						<view class="width50 fotrt">¥ {{item.tradeAmount}}</view>
+					<view class="font15 fcor666 width100">{{item.outTradeNo}}</view>
+					<view class="alijusstart font14 fcor999">
+						<view class="width50 text1">扫一扫</view>
+						<view class="width50 fotrt">{{statusList[item.status]}}</view>
 					</view>
-					<view class="alijusstart font15 paddtop5 fcor999">
+					<view class="alijusstart font14 paddtop5 fcor999">
+						<view class="width15 text1">{{item.salesmanName}}</view>
+						<view class="width85 fotrt">{{item.storeName}}</view>
+					</view>
+					<view class="alijusstart font14 paddtop5 fcor999">
 						<view class="width70">{{item.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
 						</view>
-						<view class="width30 fotrt">{{statusList[item.status]}}</view>
+						<view class="width30 fotrt">¥ {{item.tradeAmount}}</view>
 					</view>
+
 				</view>
 			</view>
 
@@ -71,8 +108,12 @@
 
 <script>
 	import {
-		getTradeOrderList
+		getTradeOrderList,
+		getMerList,
+		getStoreListByMer,
+		querySalesmanList
 	} from '../../../Utils/Api.js';
+	let app = getApp();
 	export default {
 		data() {
 			const currentDate = this.getDate({
@@ -96,6 +137,16 @@
 				orderNo: '', //订单编号
 				totalPrice: 0, //总价格
 				totalNum: 0, //总笔数
+				userInfo: app.globalData.userInfo, //登录信息
+				merList: [], // 商户列表
+				merno: '', //商户编号
+				merName: '', //商户名称
+				storeListByMer: [], //门店列表
+				storeno: '', //门店编号
+				storename: '', //门店名称,
+				salesmanList: [], //业务员列表
+				salesmanid: '', //业务员id
+				salesmanname: '', //业务员名称
 			}
 		},
 		computed: {
@@ -107,6 +158,18 @@
 			}
 		},
 		onLoad() {
+			//代理商
+			if (this.userInfo.secUser.objectType == 2) {
+				this.querySalesmanList();
+			}
+			//业务员
+			if (this.userInfo.secUser.objectType == 3) {
+				this.getMerList(this.userInfo.secRole.id);
+			}
+			//商户
+			if (this.userInfo.secUser.objectType == 4) {
+				this.getStoreListByMer(this.userInfo.secUser.id);
+			}
 			this.getTradeOrderList();
 		},
 		onReachBottom() {
@@ -114,6 +177,53 @@
 		},
 
 		methods: {
+			//代理商查询业务员
+			querySalesmanList() {
+				let datas = {
+					pageNum: 1,
+					pageSize: 9999,
+					agentId: this.userInfo.agent.id
+				}
+				querySalesmanList(datas).then(res => {
+					if (res.return_code == '000000' && res.return_data.list != '') {
+						this.salesmanList = res.return_data.list;
+						// this.salesmanid = res.return_data.list[0].id;
+						// this.getStoreListByMer(res.return_data.list[0].id);
+						// this.salesmanname = res.return_data.list[0].name;
+					}
+				})
+			},
+			//业务员查询商户
+			getMerList(item) {
+				let datas = {
+					pageNum: 1,
+					pageSize: 9999,
+					salesmanId: item
+				}
+				getMerList(datas).then(res => {
+					if (res.return_code == '000000' && res.return_data.list != '') {
+						this.merList = res.return_data.list;
+						// this.merno = res.return_data.list[0].id;
+						// this.getStoreListByMer(res.return_data.list[0].id);
+						// this.merName = res.return_data.list[0].merName;
+					}
+				})
+			},
+			//商户查询门店
+			getStoreListByMer(item) {
+				let datas = {
+					pageNum: 1,
+					pageSize: 9999,
+					merId: item
+				}
+				getStoreListByMer(datas).then(res => {
+					if (res.return_code == '000000' && res.return_data.list != '') {
+						this.storeListByMer = res.return_data.list;
+						// this.storeno = res.return_data.list[0].id;
+						// this.storename = res.return_data.list[0].name;
+					}
+				})
+			},
 			//时间修改
 			getDate(type) {
 				const date = new Date();
@@ -131,7 +241,7 @@
 				return `${year}-${month}-${day}`;
 			},
 			//选择时间
-			bindDateChange(e) {
+			bindDateChange(e) {
 				this.startdate = e.target.value;
 				this.pageNum = 1;
 				this.notesList = [];
@@ -144,23 +254,52 @@
 				this.notesList = [];
 				this.isNoMoreData = false;
 				this.getTradeOrderList();
-			},
-			toSearch(){
-				this.pageNum = 1;
-				this.notesList = [];
-				this.isNoMoreData = false;
-				this.getTradeOrderList();
+			},
+			//业务员
+			bindDateChange4(e) {
+				this.salesmanid = this.salesmanList[e.target.value].id;
+				this.salesmanname = this.salesmanList[e.target.value].name;
+				this.getMerList(this.salesmanList[e.target.value].id);
+				this.pageNum = 1;
+				this.notesList = [];
+				this.isNoMoreData = false;
+				this.getTradeOrderList();
+			},
+			//商户
+			bindDateChange2(e) {
+				this.merno = this.merList[e.target.value].id;
+				this.merName = this.merList[e.target.value].merName;
+				this.getStoreListByMer(this.merList[e.target.value].id);
+				this.pageNum = 1;
+				this.notesList = [];
+				this.isNoMoreData = false;
+				this.getTradeOrderList();
+			},
+			//门店
+			bindDateChange3(e) {
+				this.storeno = this.storeListByMer[e.target.value].id;
+				this.storename = this.storeListByMer[e.target.value].name;
+				this.pageNum = 1;
+				this.notesList = [];
+				this.isNoMoreData = false;
+				this.getTradeOrderList();
+			},
+
+			toSearch() {
+				this.pageNum = 1;
+				this.notesList = [];
+				this.isNoMoreData = false;
+				this.getTradeOrderList();
 			},
 			//查询列表
-			getTradeOrderList() {
+			getTradeOrderList() {
 				uni.showLoading({
 					title: '加载中...'
 				})
 				if (this.isNoMoreData) {
 					uni.hideLoading()
 					return false;
-				}
-				console.log('1111111111');
+				}
 				let a = new Date(this.startdate).getTime();
 				let b = new Date(this.enddate).getTime();
 				let startTime = a - 28800000;
@@ -172,6 +311,9 @@
 					payTimeE: endTime,
 					outTradeNo: this.orderNo,
 					pageNum: pagenum,
+					// salesmanId:this.salesmanid,
+					// merId: this.merno,
+					// storeId: this.storeno,
 					pageSize: this.pageSize
 				}
 				getTradeOrderList(datas).then(res => {
@@ -196,10 +338,10 @@
 				})
 			},
 			//跳转详情
-			jumpOderlist() {
-				// uni.navigateTo({
-				// 	url: '/pages/index/order-list-details/order-list-details'
-				// })
+			jumpOderdetails(item) {
+				uni.navigateTo({
+					url: '/pages/index/order-list-details/order-list-details?orderid=' + item
+				})
 			}
 		}
 	}
diff --git a/pages/index/merchant-details/merchant-details.vue b/pages/index/merchant-details/merchant-details.vue
index 0848af4..2df20b5 100644
--- a/pages/index/merchant-details/merchant-details.vue
+++ b/pages/index/merchant-details/merchant-details.vue
@@ -3,7 +3,7 @@
 		<!-- tabs栏 -->
 		<view class="backcorfff width100">
 			<QSTabs ref="tabs" :tabs="tabs" animationMode="line2" :current="current" @change="change"
-				activeColor="#089bf5" lineColor="#089bf5" minWidth="374">
+				activeColor="#089bf5" lineColor="#089bf5" minWidth="220">
 			</QSTabs>
 		</view>
 
@@ -16,12 +16,12 @@
 			<view class="notes">
 				<view class="fcor666 width25">商户ID</view>
 				<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.merNo}}</view>
-			</view>
-			<view class="notes">
-				<view class="fcor666 width25">商户名称</view>
-				<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.merName}}</view>
 			</view>
-			
+			<view class="notes">
+				<view class="fcor666 width25">商户名称</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.merName}}</view>
+			</view>
+
 			<view class="notes">
 				<view class="fcor666 width25">商户状态</view>
 				<view class="font14 fcor333 text2 width75 fotrt" v-if="merDesInfo.account.status == 1">正常</view>
@@ -30,10 +30,10 @@
 			<view class="notes">
 				<view class="fcor666 width25">联系人</view>
 				<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.account.userName}}</view>
-			</view>
-			<view class="notes">
-				<view class="fcor666 width25">手机号</view>
-				<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.regPhone}}</view>
+			</view>
+			<view class="notes">
+				<view class="fcor666 width25">手机号</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.regPhone}}</view>
 			</view>
 			<!-- <view class="notes">
 				<view class="fcor666 width25">身份证号</view>
@@ -50,7 +50,7 @@
 
 		</view>
 		<!-- 门店信息 -->
-		<view class="mart15 width100" v-else>
+		<view class="mart15 width100" v-if="current == 1">
 			<view class="width94 backcorfff border-r mart15" v-for="(item,index) in storeList" :key="index"
 				@click="jumpstoredes(item.id)">
 				<view class="notes" style="border-bottom: 0px;">
@@ -98,6 +98,19 @@
 				<view class="lin10"></view>
 			</view>
 		</view>
+		<!-- 渠道列表 -->
+		<view class="mart15 width100" v-if="current == 2">
+			<!-- v-for="(item,indexplt) in merPlatformList" :key="indexplt" -->
+			<view class="width94 backcorfff border-r mart15" v-for="(item,indexplt) in merPlatformList" :key="indexplt">
+				<view class="notes" style="border-bottom: 0px;">
+					<view class="width100 margle">
+						<view class="font16 fcor333" v-if="item.platformType == 1">渠道名称: 拉克拉</view>
+						<view class="font14 fcor999 mart5">商户号: {{item.cupNo}}</view>
+						<view class="font14 fcor999 mart5">终端号: {{item.merPlatformTerm.termNo}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
 		<view class="subbtn" @tap="updateFigMerBasis()" v-if="current == 0">修改结算</view>
 	</view>
 </template>
@@ -106,7 +119,8 @@
 	import QSTabs from '../../../components/QS-tabs/QS-tabs.vue';
 	import {
 		getMerDetail,
-		getStoreListByMer
+		getStoreListByMer,
+		getMerPlatformList
 	} from '../../../Utils/Api.js';
 	export default {
 		components: {
@@ -114,11 +128,12 @@
 		},
 		data() {
 			return {
-				tabs: ["商户信息", "门店信息"],
+				tabs: ["商户信息", "门店信息", "渠道列表"],
 				current: 0, // tabs默认值
 				storeList: [], // 门店数据
 				merid: '', // 商户id
-				merDesInfo: '' // 门店信息
+				merDesInfo: '', // 门店信息
+				merPlatformList: '' //渠道列表
 
 			}
 		},
@@ -134,6 +149,9 @@
 				if (index == 1) {
 					this.getStoreListByMer();
 				}
+				if (index == 2) {
+					this.getMerPlatformList();
+				}
 			},
 			//查询商户信息
 			getMerDetail(item) {
@@ -179,6 +197,27 @@
 					}
 				})
 			},
+			//查询渠道列表
+			getMerPlatformList() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				let datas = {
+					merId: this.merid
+				}
+				getMerPlatformList(datas).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000' && res.return_data) {
+						this.merPlatformList = res.return_data;
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							duration: 2000,
+							icon: 'none'
+						})
+					}
+				})
+			},
 			//跳转门店详情
 			jumpstoredes(item) {
 				uni.navigateTo({
diff --git a/pages/index/normal-Merchant/normal-Merchant.vue b/pages/index/normal-Merchant/normal-Merchant.vue
new file mode 100644
index 0000000..dff8c99
--- /dev/null
+++ b/pages/index/normal-Merchant/normal-Merchant.vue
@@ -0,0 +1,160 @@
+<template>
+	<view>
+		<view class="mart20 width100">
+			<view v-if="merchantlist == '' " class="mart60 fotct font14 fcor666">
+				<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
+			</view>
+			<view class="width94 backcorfff border-r mart15" v-for="(item,index) in merchantlist" :key="index"
+				@click="jumpmerdes(item.id)">
+				<view class="notes">
+					<image src="../../../static/img/merchantstu.png" mode="widthFix" class="iconw40"></image>
+					<view class="width60 margle">
+						<view class="font14 fcor333">{{item.merName}}</view>
+						<view class="font12 fcor999">
+							{{item.createTime | timeFormat('yyyy-mm-dd')}}
+							{{item.createTime | timeFormat('hh:mm')}}
+						</view>
+					</view>
+					<!-- <view class="statucs font14">正常</view> -->
+				</view>
+				<view class="notes">
+					<view class="width30 fcor333 font15">联系人</view>
+					<view class="width30 fcor999 font15" v-if="item.regName">{{item.regName}}</view>
+					<view class="width30 fcor999 font15" v-else>-</view>
+				</view>
+				<view class="height45 width100 paddbotm10">
+					<button class="btns mart10 margle10" @click.stop="openAccounts(item.id)">开通分账</button>
+					<button class="btns mart10 margle10" @click.stop="bindMerchants(item.id)">分账接收方</button>
+					<button class="btns mart10 margle10" @click.stop="jumpEquityActivity(item.id)">权益活动</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getMerListBySalesman,
+		getMerLedgerApply
+	} from '../../../Utils/Api.js';
+	export default {
+		data() {
+			return {
+				merchantlist: [],
+				pageNum: 1,
+				pagesize: 10,
+				isLoadMore: false, //是否加载中
+			}
+		},
+		onShow() {
+			this.merchantlist = [];
+			this.pageNum = 1;
+			this.getMerListBySalesman();
+		},
+		onReachBottom() { //上拉触底函数
+			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+				this.isLoadMore = true
+				this.pageNum += 1
+				this.getMerListBySalesman()
+			}
+		},
+		methods: {
+			//查询商户列表
+			getMerListBySalesman() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let datas = {
+					merStatus: 1,
+					pageNum: this.pageNum,
+					pageSize: this.pagesize,
+				}
+				getMerListBySalesman(datas).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000' && res.return_data.list) {
+						this.merchantlist = this.merchantlist.concat(res.return_data.list);
+						if (res.return_data.pages == this.pageNum) {
+							this.isLoadMore = true;
+						} else {
+							this.isLoadMore = false
+						}
+					} else {
+						this.isLoadMore = true
+					}
+				});
+			},
+			//跳转详情
+			jumpmerdes(ids) {
+				uni.navigateTo({
+					url: '/pages/index/merchant-details/merchant-details?id=' + ids
+				})
+			}, //开通分账
+			openAccounts(item) {
+				uni.navigateTo({
+					url: '/pages/index/open-Divide_accounts/open-Divide_accounts?id=' + item
+				})
+			},
+			//绑定商户
+			bindMerchants(item) {
+				//查询商户分账详情
+				let datas = {
+					merId: item,
+					platformType: 1
+				}
+				getMerLedgerApply(datas).then(res => {
+					if (res.return_code == '000000') {
+						uni.navigateTo({
+							url: '/pages/index/bindMerchants/bindMerchants?id=' + res.return_data.id +
+								'&merId=' + item
+						})
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							duration: 2000,
+							icon: 'none'
+						})
+					}
+				})
+			},
+			//跳转权益活动
+			jumpEquityActivity(item) {
+				uni.navigateTo({
+					url: '/pages/index/equity-activities/equity-activities?id=' + item
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f6f6f6;
+	}
+
+	.notes {
+		width: calc(100% - 40upx);
+		display: flex;
+		align-items: center;
+		padding: 20upx 0 20upx 20upx;
+	}
+
+	//正常状态
+	.statucs {
+		background-color: #e9f9e5;
+		color: #84b878;
+		text-align: center;
+		padding: 2px 5px;
+	}
+
+	.btns {
+		width: 21%;
+		float: left;
+		height: 35px;
+		line-height: 35px;
+		background-color: #0083f5;
+		color: #FFFFFF;
+		font-weight: bold;
+		font-size: 12px;
+		padding: 0px;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/open-Divide_accounts/open-Divide_accounts.vue b/pages/index/open-Divide_accounts/open-Divide_accounts.vue
index cd3a0cc..642ff6d 100644
--- a/pages/index/open-Divide_accounts/open-Divide_accounts.vue
+++ b/pages/index/open-Divide_accounts/open-Divide_accounts.vue
@@ -188,7 +188,7 @@
 								"merId": this.merId,
 								"platformType": 1,
 								"splitLowestRatio": this.splitLowestRatio,
-								"splitEntrustFilePath": this.powerofattorney[0]
+								"splitEntrustFilePath": this.powerofattorney
 							}
 							merLedgerApply(datas).then(res => {
 								uni.hideLoading();
diff --git a/pages/index/order-list-details/order-list-details.vue b/pages/index/order-list-details/order-list-details.vue
index 279178d..320f02c 100644
--- a/pages/index/order-list-details/order-list-details.vue
+++ b/pages/index/order-list-details/order-list-details.vue
@@ -1,41 +1,67 @@
 <template>
 	<view>
-		<view class="mart15 width100 backcorfff">
+		<view class="mart5 width100 backcorfff">
 			<view class="notes">
-				<view class="fcor666 width25">账号</view>
-				<view class="font14 fcor333 text2 width75 fotrt">账号名称</view>
-			</view>
-			<view class="notes">
-				<view class="fcor666 width25">账号</view>
-				<view class="font14 fcor333 text2 width75 fotrt">账号名称</view>
-			</view>
-			<view class="notes">
-				<view class="fcor666 width25">账号</view>
-				<view class="font14 fcor333 text2 width75 fotrt">账号名称</view>
+				<view class="fcor666 width25">商户名称</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.merName}}</view>
+			</view>
+			<view class="notes">
+				<view class="fcor666 width25">门店名称</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.storeName}}</view>
+			</view>
+			<view class="notes">
+				<view class="fcor666 width25">交易模式</view>
+				<view class="font14 fcor333 text2 width75 fotrt" v-if="orderByOutTradeOrder.payMode == 'ALIPAY' ">支付宝</view>
+				<view class="font14 fcor333 text2 width75 fotrt" v-if="orderByOutTradeOrder.payMode == 'WECHAT' ">微信</view>
+			</view>
+			<view class="notes">
+				<view class="fcor666 width25">支付时间</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.payTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}</view>
 			</view>
-			<view class="notes">
-				<view class="fcor666 width25">账号</view>
-				<view class="font14 fcor333 text2 width75 fotrt">账号名称</view>
+			<view class="notes">
+				<view class="fcor666 width25">商户交易单号</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.outTradeNo}}</view>
+			</view>
+			<view class="notes">
+				<view class="fcor666 width25">账户端交易单号</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.accTradeNo}}</view>
+			</view>
+			<view class="notes">
+				<view class="fcor666 width25">交易状态</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{statusList[orderByOutTradeOrder.status]}}</view>
+			</view>
+			<view class="notes">
+				<view class="fcor666 width25">交易金额</view>
+				<view class="font14 fcor333 text2 width75 fotrt">¥ {{orderByOutTradeOrder.tradeAmount}}</view>
+			</view>
+			<view class="notes" v-if="orderByOutTradeOrder.storeDiscountPrice">
+				<view class="fcor666 width25">门店优惠</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.storeDiscountPrice}}</view>
+			</view>
+			
+			<view class="notes" v-if="orderByOutTradeOrder.userPhone">
+				<view class="fcor666 width25">客户手机号</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.userPhone}}</view>
 			</view>
-			<view class="notes">
-				<view class="fcor666 width25">账号</view>
-				<view class="font14 fcor333 text2 width75 fotrt">账号名称</view>
+			<view class="notes" v-if="orderByOutTradeOrder.userDiscountPrice">
+				<view class="fcor666 width25">客户优惠券优惠</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.userDiscountPrice}}</view>
 			</view>
 			<view class="notes">
-				<view class="fcor666 width25">账号</view>
-				<view class="font14 fcor333 text2 width75 fotrt">账号名称</view>
+				<view class="fcor666 width25">交易实际金额</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.tradeActualAmount}}</view>
 			</view>
-			<view class="notes">
-				<view class="fcor666 width25">账号</view>
-				<view class="font14 fcor333 text2 width75 fotrt">账号名称</view>
+			<view class="notes" v-if="orderByOutTradeOrder.feeRate">
+				<view class="fcor666 width25">交易费率</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.feeRate}}</view>
 			</view>
 			<view class="notes">
-				<view class="fcor666 width25">账号</view>
-				<view class="font14 fcor333 text2 width75 fotrt">账号名称</view>
+				<view class="fcor666 width25">交易创建方式</view>
+				<view class="font14 fcor333 text2 width75 fotrt">扫一扫</view>
 			</view>
-			<view class="notes">
-				<view class="fcor666 width25">账号</view>
-				<view class="font14 fcor333 text2 width75 fotrt">账号名称</view>
+			<view class="notes" v-if="orderByOutTradeOrder.platformMerNo">
+				<view class="fcor666 width25">平台商户号</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{orderByOutTradeOrder.platformMerNo}}</view>
 			</view>
 			
 		</view>
@@ -43,14 +69,44 @@
 </template>
 
 <script>
+	import {
+		getOrderByOutTradeOrder
+	} from '../../../Utils/Api.js';
 	export default {
 		data() {
-			return {
-
+			return {
+				statusList: {
+					1: "待支付",
+					2: "支付中",
+					3: "支付成功",
+					4: "支付失败",
+					5: "已取消",
+					6: "已退款"
+				},
+				orderid: '', //交易流水号，
+				orderByOutTradeOrder: '' //详情
 			}
 		},
+		onLoad(options) {
+			this.orderid = options.orderid;
+			this.getOrderByOutTradeOrder();
+		},
 		methods: {
-
+			//查询详情
+			getOrderByOutTradeOrder() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				let datas = {
+					outTradeOrder: this.orderid
+				}
+				getOrderByOutTradeOrder(datas).then(res => {
+					if (res.return_code == '000000') {
+						this.orderByOutTradeOrder = res.return_data.order;
+					}
+					uni.hideLoading();
+				})
+			}
 		}
 	}
 </script>
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 385637c..56c1f08 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -18,15 +18,14 @@
 				<image mode="widthFix" class="margle iconw" src="../../../static/img/jt.png"></image>
 			</view>
 			<!-- 业务员 -->
-			<view class="font28 fcorfff mart20 width94" v-if="userInfo.secUser.objectType ==  3">总收益</view>
-			<view class="font28 fcorfff mart15 width94" v-if="userInfo.secUser.objectType ==  3">¥<text
-					class="margle font40">0.00</text></view>
+			<view class="font28 fcorfff mart20 width94" v-if="userInfo.secUser.objectType ==  3"></view>
+			<view class="font28 fcorfff mart15 width94" v-if="userInfo.secUser.objectType ==  3"></view>
 			<!-- 非业务员 -->
 			<view class="font15 height40 fcorfff mart20 width94" v-if="userInfo.secUser.objectType !=  3">今日总收入</view>
 			<view class="font28 fcorfff mart15 width94" v-if="userInfo.secUser.objectType !=  3">¥<text
 					class="margle font40">{{auditnum.tradePrice}}</text></view>
 			<!-- 业务员 -->
-			<view class="width94 mart15" v-if="userInfo.secUser.objectType ==  3">
+			<view class="width94 mart80" v-if="userInfo.secUser.objectType ==  3" @click.stop="jumpaudt">
 				<view class="width50 fcorfff font14 flleft">
 					<view class="width100">进件成功数量</view>
 					<view class="width100 mart15 font22">{{auditnum.contractSuccess}}</view>
@@ -94,9 +93,13 @@
 						img: '../../../static/img/home3.png'
 					},
 					{
-						title: '商户管理',
+						title: '进件管理',
 						url: '../../index/merchant-management/merchant-management',
 						img: '../../../static/img/home4.png'
+					}, {
+						title: '商户管理',
+						url: '../../index/normal-Merchant/normal-Merchant',
+						img: '../../../static/img/home4.png'
 					}, {
 						title: '我的设备',
 						url: '../../index/mineService/mineService?id=3',
@@ -154,11 +157,11 @@
 					title: '结算审核',
 					url: '../../index/review-Settlement/review-Settlement',
 					img: '../../../static/img/home1.png'
-				}]
-				// , {
-				// 	title: '权益活动',
-				// 	url: '../../index/equity-activity-review/equity-activity-review',
-				// 	img: '../../../static/img/home5.png'
+				}]
+				// , {
+				// 	title: '权益活动',
+				// 	url: '../../index/equity-activity-review/equity-activity-review',
+				// 	img: '../../../static/img/home5.png'
 				// }
 				return;
 			}
diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue
index 9c93c9d..b38752b 100644
--- a/pages/welcome/welcome.vue
+++ b/pages/welcome/welcome.vue
@@ -17,28 +17,28 @@
 		},
 		onLoad(options) {
 			let that = this;
-			// uni.reLaunch({
-			// 	url: '../tabBar/home/home'
-			// })
+			uni.reLaunch({
+				url: '../tabBar/home/home'
+			})
 			// #ifdef H5
-			let arr1 = window.location.href;
-			let arr2 = arr1.split('=');
-			if (arr2[2]) {
-				var arr3 = arr2[2].split('&');
-				if (arr3[0] != undefined && arr3[0]) {
-					app.globalData.h5code = arr3[0];
-					uni.setStorage({
-						key: "h5code",
-						data: arr3[0]
-					})
-				}
-			} else {
-				// 获取openid
-				that.jumpcdx();
-			}
-			if (app.globalData.h5code) {
-				that.getAccessToken();
-			}
+			// let arr1 = window.location.href;
+			// let arr2 = arr1.split('=');
+			// if (arr2[2]) {
+			// 	var arr3 = arr2[2].split('&');
+			// 	if (arr3[0] != undefined && arr3[0]) {
+			// 		app.globalData.h5code = arr3[0];
+			// 		uni.setStorage({
+			// 			key: "h5code",
+			// 			data: arr3[0]
+			// 		})
+			// 	}
+			// } else {
+			// 	// 获取openid
+			// 	that.jumpcdx();
+			// }
+			// if (app.globalData.h5code) {
+			// 	that.getAccessToken();
+			// }
 			// #endif
 		},
 		methods: {