From e130e13ef0cc4a827aa2c8d9e47d619a4cea40d0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 10 十一月 2020 10:53:53 +0800
Subject: [PATCH] 订单筛选改变

---
 childPath/dingDan/dingDan.html           | 1085 ++++++++++++++++++++++++++--------------
 childPath/dingDan/dingDan_taoBao_wq.html |  311 +++++++++--
 js/admin-creat.js                        |   11 
 window/0phone/tiXian.html                |    4 
 js/pageHeader.xml                        |    9 
 childPath/system/taobaoAuthLink.html     |   99 +++
 menu.json                                |    5 
 7 files changed, 1,077 insertions(+), 447 deletions(-)

diff --git a/childPath/dingDan/dingDan.html b/childPath/dingDan/dingDan.html
index ce77795..bbee3c8 100644
--- a/childPath/dingDan/dingDan.html
+++ b/childPath/dingDan/dingDan.html
@@ -1,393 +1,710 @@
-<!DOCTYPE html>
-<html>
-	
-	<head>
-		<meta charset="utf-8" />
-		<meta http-equiv="X-UA-Compatible" content="chrome=1"/>
-		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
-		<title>璁㈠崟鎬昏</title>
-		<link rel="stylesheet" type="text/css" href="../../css/doui.min.css"/>
-		<script src="../../js/doui.min.js" type="text/javascript" charset="utf-8"></script>
-		<script src="../../js/requestHost.js" type="text/javascript" charset="utf-8"></script>
-		<script type="text/javascript">
-			doui.importLoad({
-				importArray: [
-					// 闆锋墦涓嶅姩
-					getHostPath() + "js/jquery.min.js",
-					getHostPath() + "js/vue.min.js",
-					// 瀛椾綋鍥炬爣
-					getHostPath() + "fontAdmin/iconfont.css",
-					getHostPath() + "font/iconfont.css",
-					// dom妯℃澘
-					getHostPath() + "css/admin-all.css",
-					getHostPath() + "js/admin-creat.js",
-				],
-			});
-		</script>
-	</head>
-	
-	<body class="fontPC" style="display:none;">
-		<div class="winSizeBox">
-			
-			<!-- =============================================================== 鎼滅储绛涢��(椤堕儴) -->
-			<div id="thisHeader" style="width:7.5rem;"></div>
-			
-			<!-- =============================================================== 琛ㄦ牸 -->
-			<div id="thisTable" class="admin-main-overHeader"></div>
-			
-			<!-- =============================================================== 鏂囦欢涓婁紶 寮规 -->
-			<div v-show="fileWork.show" id="fileUpload" class="layer-dark fboxRow Xcenter Ycenter">
-				<div class="admin-tan-box" style="height:auto;">
-					<!-- 鍏抽棴鎸夐挳 -->
-					<div class="admin-btn-arcS admin-tan-close" @click="fileWork.action_close()"><i class="fi fi-no"></i></div>
-					<!-- 鏍囬 -->
-					<div class="fboxRow Xcenter Ycenter admin-margin"><div class="font18 font-blue">鏂囦欢涓婁紶</div></div>
-					<!-- 鏂囦欢閫夋嫨 -->
-					<div class="fboxRow Xcenter Ycenter admin-margin">
-						<div class="font-cyan">璁㈠崟琛ㄦ牸锛�</div>
-						<div class="inputShell border-1px border-round" style="width:1.2rem;">
-							<input id="myimg" type="file" accept="application/vnd.ms-excel" @change="fileWork.action_change()"/>
-						</div>
-					</div>
-					<!-- 鎻愪氦 鎸夐挳 -->
-					<div class="fboxRow Xcenter Ycenter admin-margin">
-						<div class="admin-btn-roundL bg-green click-scale" @click="fileWork.action_sub()">纭畾涓婁紶</div>
-					</div>
-				</div>
-			</div>
-			
-		</div>
-	</body>
-	
-</html>
-
-
-<script type="text/javascript">
-	
-	// 鏂囦欢涓婁紶vue
-	var vm_file = null;
-	
-	// ==================================================================================== 椤甸潰鏁版嵁
-	doui.onReady({
-		success: function ()
-		{
-			// ----------------------------------------------------- 椤堕儴
-			// 鍒涘缓椤堕儴dom
-			adminDom.header.creat({ el: "#thisHeader", });
-			// 杈撳叆绫诲瀷
-			adminDom.header.select({
-				show: true,
-				list: [
-					{ key: "1", value: "璁㈠崟鍙�" },
-					{ key: "2", value: "鐢ㄦ埛ID" },
-				],
-			});
-			// 杈撳叆鎼滅储
-			adminDom.header.input({ placeholder: "鏍规嵁閫夋嫨濉啓", })
-			// 绛涢�夐」
-			adminDom.header.screen({
-				show: true,
-				list: [
-					
-					{
-						title: "璁㈠崟绫诲瀷", 
-						muchCheck: false, // 鏄惁鍙互澶氶��
-						child: [
-							{ key: [1], value: "鑷喘璁㈠崟", check: false },
-							{ key: [2], value: "鍒嗕韩璁㈠崟", check: false },
-							{ key: [3], value: "鍥㈤槦璁㈠崟", check: false },
-						],
-						input: { type: "number", num: 0 },
-					},
-					{
-						title: "璁㈠崟鐘舵��", 
-						muchCheck: false, // 鏄惁鍙互澶氶��
-						child: [
-							{ key: [1], value: "鏈夋晥", check: false },
-							{ key: [2], value: "鍞悗", check: false },
-							{ key: [3], value: "澶辨晥", check: false },
-						],
-						input: { type: "number", num: 0 },
-					},
-					{
-						title: "鍒拌处鐘舵��", 
-						muchCheck: false, // 鏄惁鍙互澶氶��
-						child: [
-							{ key: [1], value: "鏈埌璐�", check: false },
-							{ key: [2], value: "宸插埌璐�", check: false },
-							{ key: [3], value: "宸插け鏁�", check: false },
-						],
-						input: { type: "number", num: 0 },
-					},
-				
-					{
-						title: "鏀粯鏃堕棿", 
-						muchCheck: false, // 鏄惁鍙互澶氶��
-						child: [],
-						input: { type: "date", num: 2 },
-					},
-					{
-						title: "娓犻亾鏉ユ簮", 
-						muchCheck: false, // 鏄惁鍙互澶氶��
-						child: [
-							{ key: [1], value: "娣樺疂", check: false },
-							{ key: [2], value: "浜笢", check: false },
-							{ key: [3], value: "鎷煎澶�", check: false },
-						],
-						input: { type: "number", num: 0 },
-					},
-					{
-						title: "璁㈠崟椋庨櫓", 
-						muchCheck: false, // 鏄惁鍙互澶氶��
-						child: [
-							{ key: [1], value: "鍚屽晢鍝�", check: false },
-							{ key: [2], value: "鍚屽簵閾�", check: false },
-							{ key: [3], value: "楂橀杩斿埄", check: false },
-						],
-						input: { type: "number", num: 0 },
+<!DOCTYPE html>
+<html>
+
+	<head>
+		<meta charset="utf-8" />
+		<meta http-equiv="X-UA-Compatible" content="chrome=1" />
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<title>璁㈠崟鎬昏</title>
+		<link rel="stylesheet" type="text/css" href="../../css/doui.min.css" />
+		<script src="../../js/doui.min.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../js/requestHost.js" type="text/javascript" charset="utf-8"></script>
+		<script type="text/javascript">
+			doui.importLoad({
+				importArray: [
+					// 闆锋墦涓嶅姩
+					getHostPath() + "js/jquery.min.js",
+					getHostPath() + "js/vue.min.js",
+					// 瀛椾綋鍥炬爣
+					getHostPath() + "fontAdmin/iconfont.css",
+					getHostPath() + "font/iconfont.css",
+					// dom妯℃澘
+					getHostPath() + "css/admin-all.css",
+					getHostPath() + "js/admin-creat.js",
+				],
+			});
+		</script>
+	</head>
+
+	<body class="fontPC" style="display:none;">
+		<div class="winSizeBox">
+
+			<!-- =============================================================== 鎼滅储绛涢��(椤堕儴) -->
+			<div id="thisHeader" style="width:7.5rem;"></div>
+
+			<!-- =============================================================== 琛ㄦ牸 -->
+			<div id="thisTable" class="admin-main-overHeader"></div>
+
+			<!-- =============================================================== 鏂囦欢涓婁紶 寮规 -->
+			<div v-show="fileWork.show" id="fileUpload" class="layer-dark fboxRow Xcenter Ycenter">
+				<div class="admin-tan-box" style="height:auto;">
+					<!-- 鍏抽棴鎸夐挳 -->
+					<div class="admin-btn-arcS admin-tan-close" @click="fileWork.action_close()"><i class="fi fi-no"></i></div>
+					<!-- 鏍囬 -->
+					<div class="fboxRow Xcenter Ycenter admin-margin">
+						<div class="font18 font-blue">鏂囦欢涓婁紶</div>
+					</div>
+					<!-- 鏂囦欢閫夋嫨 -->
+					<div class="fboxRow Xcenter Ycenter admin-margin">
+						<div class="font-cyan">璁㈠崟琛ㄦ牸锛�</div>
+						<div class="inputShell border-1px border-round" style="width:1.2rem;">
+							<input id="myimg" type="file" accept="application/vnd.ms-excel" @change="fileWork.action_change()" />
+						</div>
+					</div>
+					<!-- 鎻愪氦 鎸夐挳 -->
+					<div class="fboxRow Xcenter Ycenter admin-margin">
+						<div class="admin-btn-roundL bg-green click-scale" @click="fileWork.action_sub()">纭畾涓婁紶</div>
+					</div>
+				</div>
+			</div>
+
+		</div>
+	</body>
+
+</html>
+
+
+<script type="text/javascript">
+	// 鏂囦欢涓婁紶vue
+	var vm_file = null;
+
+	// ==================================================================================== 椤甸潰鏁版嵁
+	doui.onReady({
+		success: function() {
+			// ----------------------------------------------------- 椤堕儴
+			// 鍒涘缓椤堕儴dom
+			adminDom.header.creat({
+				el: "#thisHeader",
+			});
+			// 杈撳叆绫诲瀷
+			adminDom.header.select({
+				show: true,
+				list: [{
+						key: "1",
+						value: "璁㈠崟鍙�"
 					},
 					{
-						title: "浠樻閲戦(鏈�澶у��)", 
-						muchCheck: false, // 鏄惁鍙互澶氶��
-						child: [],
-						input: { type: "number", num: 1 },
-					},
-				],
-			});
-			
-			
-			// ----------------------------------------------------- 琛ㄦ牸
-			// 鍒涘缓琛ㄦ牸dom
-			adminDom.table.creat({
-				el: "#thisTable",
-				touchSearch: function(optC)
-				{
-					// 鍙戣捣璇锋眰
-					doui.showLoading({ content: "鍔犺浇鍒楄〃" });
-					doui.request({
-						type: "jsonp",
-						url: gethttp() + "/admin/new/api/v1/order/getUserOrderList",
-						data: {
-							pageIndex: optC.table.page, // 椤电爜
-							pageSize: optC.table.pageSize, // 姣忛〉鏁伴噺
-							keyType: optC.select.result, // 鎼滅储绫诲瀷
-							key: optC.input[0].result, // 鎼滅储鍏抽敭瀛�
-							type: optC.screen[0].result[0], // 璁㈠崟绫诲瀷
-							orderState: optC.screen[1].result[0], // 璁㈠崟鐘舵��
-							state: optC.screen[2].result[0], // 鍒拌处鐘舵��
-							startTime: optC.screen[3].result[0], // 鏃堕棿鏈�灏�
-							endTime: optC.screen[3].result[1]?optC.screen[3].result[1]:'', // 鏃堕棿鏈�澶�
-							sourceType:optC.screen[4].result[0],
-							riskType:optC.screen[5].result[0],
-							payment: optC.screen[6].result[0], // 浠樻閲戦
-						},
-						success: function (res)
-						{
-							doui.hideLoading();
-							if (res.code != 0) { doui.showToast({ content: res.msg }); }
-							else 
-							{
-								// 鐢虫槑 琛ㄦ牸鍐呭鏁版嵁
-								var mo_tr = []; // tr缁�
-								for (var i = 0, mo = res.data.result_list; i < mo.length; i++)
-								{
-									// 褰撳墠琛�
-									var thatTr = {
-										check: false,
-										td: [
-											{ title: "鍟嗗搧鍥剧墖", key: mo[i].commonOrderGoods?mo[i].commonOrderGoods.picture:"", value: mo[i].commonOrderGoods?mo[i].commonOrderGoods.picture:"", dataType: "img" },
-											{ title: "鍟嗗搧鏍囬", key:mo[i].commonOrderGoods.goodsId, value: mo[i].commonOrderGoods.title ,dataType:'link'},
-											{ title: "璁㈠崟鍙�", key: mo[i].orderNo, value: mo[i].orderNo },
-											{ title: "璁㈠崟绫诲瀷", key: mo[i].hongBaoType, value: mo[i].hongBaoType },
-											{ title: "鏀粯閲戦", key: mo[i].payment, value: "锟�"+mo[i].payment },
-											{ title: "鏀粯鏃堕棿", key: mo[i].downTime, value: mo[i].downTime, "class": "font13 font-gray" },
-											{ title: "璁㈠崟鐘舵��", key: mo[i].state, value: mo[i].state },
-											{ title: "鏀惰揣鏃堕棿", key: mo[i].receiveTime, value: mo[i].receiveTime, "class": "font13 font-gray" },
-											{ title: "鏀剁泭閲戦", key: mo[i].hongBao, value: "锟�"+mo[i].hongBao },
-											{ title: "鏀剁泭鐘舵��", key: mo[i].hongBaoState, value: mo[i].hongBaoState },
-											{ title: "鏀剁泭鏃堕棿", key: mo[i].hongBaoDate, value: mo[i].hongBaoDate, "class": "font13 font-gray" },
-											{ title: "鐢ㄦ埛澶村儚", key: mo[i].userPortrait, value: mo[i].userPortrait, dataType: "img", "class": "admin-imgS" },
-											{ title: "鐢ㄦ埛鏄电О", key: mo[i].userName, value: mo[i].userName },
-											{ title: "鐢ㄦ埛ID", key: mo[i].userId, value: mo[i].userId },
-											{ title: "鐩存帴閭�璇蜂汉", key: mo[i].levelOneId, value: "ID:"+mo[i].levelOneId+"  锟�"+mo[i].levelOneMoney },
-											{ title: "闂存帴閭�璇蜂汉", key: mo[i].levelTwoId, value: "ID:"+mo[i].levelTwoId+"  锟�"+mo[i].levelTwoMoney },
-											{ title: "涓�绾у垎绫�", key:mo[i].commonOrderGoods.category1, value: mo[i].commonOrderGoods.category1},
-										],
-									};
-									// 璁㈠崟绫诲瀷
-									if (thatTr.td[3].key == 1) { thatTr.td[3].value = "鑷喘"; thatTr.td[3]["class"] = "font-blue"; }
-									else if (thatTr.td[3].key == 2) { thatTr.td[3].value = "鍒嗕韩"; thatTr.td[3]["class"] = "font-green"; }
-									else if (thatTr.td[3].key == 3) { thatTr.td[3].value = "鍥㈤槦"; thatTr.td[3]["class"] = "font-green"; }
-									//娓犻亾鏍囪瘑
-									
-									
-									// 璁㈠崟鍙峰垎鏋�
-									if (i >= 1) 
-									{
-										if (thatTr.td[2].key == mo[i-1].orderNo) { thatTr.td[2].value = "锛堝悓涓婏級"; thatTr.td[2]["class"] = "font-gray"; }
-									}
-									//鍟嗗搧閾炬帴
-									if(mo[i].sourceType==1)
-									{
-										thatTr.td[3].value=thatTr.td[3].value+" (娣樺疂)";
-										thatTr.td[1].key="https://detail.tmall.com/item.htm?id="+thatTr.td[1].key;
-									}
-									else if(mo[i].sourceType==2)
-									{
-										thatTr.td[3].value=thatTr.td[3].value+" (浜笢)";
-										thatTr.td[1].key="https://item.jd.com/"+thatTr.td[1].key+".html";
-									}
-									else if(mo[i].sourceType==3)
-									{
-										thatTr.td[3].value=thatTr.td[3].value+" (鎷煎澶�)";
-										thatTr.td[1].key="http://yangkeduo.com/goods.html?goods_id="+thatTr.td[1].key;
-									}
-									
-									// 璁㈠崟鐘舵��
-									if (thatTr.td[6].key == 1) { thatTr.td[6].value = "宸蹭粯娆�"; thatTr.td[6]["class"] = "font-orange"; }
-									else if (thatTr.td[6].key == 2) { thatTr.td[6].value = "宸叉敹璐�"; thatTr.td[6]["class"] = "font-green"; }
-									else if (thatTr.td[6].key == 3) { 
-										var drawbackMoney="";
-										if(mo[i].weiQuanBackMoney!=null&&mo[i].weiQuanBackMoney!=undefined)
-										{
-											if(mo[i].weiQuanBackMoney>0)
-											{
-												drawbackMoney="宸叉墸闄�:"+mo[i].weiQuanBackMoney;
-											}else{
-												drawbackMoney="鏈墸闄�:"+Math.abs(mo[i].weiQuanBackMoney);
-											}
-										}
-										
-										thatTr.td[6].value = "璁㈠崟鍞悗#"+ mo[i].weiQuanState+"#"+ drawbackMoney   ; thatTr.td[6]["class"] = "font-red"; 
-									}
-									else if (thatTr.td[6].key == 4) { thatTr.td[6].value = "宸插け鏁�"; thatTr.td[6]["class"] = "font-gray"; }
-									
-									if(mo[i].otherState==1)
-									{
-										thatTr.td[6].value=thatTr.td[6].value+"(鍏嶅崟涓�)";
+						key: "2",
+						value: "鐢ㄦ埛ID"
+					},
+				],
+			});
+			// 杈撳叆鎼滅储
+			adminDom.header.input({
+				placeholder: "鏍规嵁閫夋嫨濉啓",
+			})
+
+			var choiceList = [{
+					title: "璁㈠崟绫诲瀷",
+					muchCheck: true, // 鏄惁鍙互澶氶��
+					child: [{
+							key: [1],
+							value: "鑷喘璁㈠崟",
+							check: false
+						},
+						{
+							key: [2],
+							value: "鍒嗕韩璁㈠崟",
+							check: false
+						},
+						{
+							key: [3],
+							value: "鍥㈤槦璁㈠崟",
+							check: false
+						},
+					],
+					input: {
+						type: "number",
+						num: 0
+					},
+				},
+				{
+					title: "璁㈠崟鐘舵��",
+					muchCheck: false, // 鏄惁鍙互澶氶��
+					child: [{
+							key: [1],
+							value: "鏈夋晥",
+							check: false
+						},
+						{
+							key: [2],
+							value: "鍞悗",
+							check: false
+						},
+						{
+							key: [3],
+							value: "澶辨晥",
+							check: false
+						},
+					],
+					input: {
+						type: "number",
+						num: 0
+					},
+				},
+				{
+					title: "鍒拌处鐘舵��",
+					muchCheck: false, // 鏄惁鍙互澶氶��
+					child: [{
+							key: [1],
+							value: "鏈埌璐�",
+							check: false
+						},
+						{
+							key: [2],
+							value: "宸插埌璐�",
+							check: false
+						},
+						{
+							key: [3],
+							value: "宸插け鏁�",
+							check: false
+						},
+					],
+					input: {
+						type: "number",
+						num: 0
+					},
+				},
+
+				{
+					title: "鏀粯鏃堕棿",
+					muchCheck: false, // 鏄惁鍙互澶氶��
+					child: [],
+					input: {
+						type: "date",
+						num: 2
+					},
+				},
+				{
+					title: "娓犻亾鏉ユ簮",
+					muchCheck: false, // 鏄惁鍙互澶氶��
+					child: [{
+							key: [1],
+							value: "娣樺疂",
+							check: false
+						},
+						{
+							key: [2],
+							value: "浜笢",
+							check: false
+						},
+						{
+							key: [3],
+							value: "鎷煎澶�",
+							check: false
+						},
+						{
+							key: [4],
+							value: "鍞搧浼�",
+							check: false
+						},
+						{
+							key: [5],
+							value: "鑻忓畞",
+							check: false
+						},
+					],
+					input: {
+						type: "number",
+						num: 0
+					},
+				},
+				{
+					title: "璁㈠崟椋庨櫓",
+					muchCheck: false, // 鏄惁鍙互澶氶��
+					child: [{
+							key: [1],
+							value: "鍚屽晢鍝�",
+							check: false
+						},
+						{
+							key: [2],
+							value: "鍚屽簵閾�",
+							check: false
+						},
+						{
+							key: [3],
+							value: "楂橀杩斿埄",
+							check: false
+						},
+					],
+					input: {
+						type: "number",
+						num: 0
+					},
+				},
+				{
+					title: "浠樻閲戦(鏈�澶у��)",
+					muchCheck: false, // 鏄惁鍙互澶氶��
+					child: [],
+					input: {
+						type: "number",
+						num: 1,
+						value:''
+					},
+				}
+			];
+			// 绛涢�夐」
+			adminDom.header.screen({
+				show: true,
+				list: choiceList,
+				btns:[{name:'鍒峰崟椋庨櫓',actionClick:function(){
+						choiceList[0].child[0].check=true;
+						choiceList[0].child[1].check=true
+						choiceList[1].child[0].check=true;
+						choiceList[4].child[0].check=true;
+						choiceList[6].input.value="9";
+				}},{name:'娓呴櫎鎵�閫�',actionClick:function(){
+					choiceList[0].child[0].check=false;
+					choiceList[0].child[1].check=false
+					choiceList[1].child[0].check=false;
+					choiceList[4].child[0].check=false;
+					choiceList[6].input.value="";
+				}}]
+			});
+			
+			// setTimeout(function(){
+			// 	choiceList[0].child[0].check=true;
+			// },10000);
+			
+
+
+			// ----------------------------------------------------- 琛ㄦ牸
+			// 鍒涘缓琛ㄦ牸dom
+			adminDom.table.creat({
+				el: "#thisTable",
+				touchSearch: function(optC) {
+					// 鍙戣捣璇锋眰
+					doui.showLoading({
+						content: "鍔犺浇鍒楄〃"
+					});
+					
+					var types=optC.screen[0].result;
+					console.log("璁㈠崟绫诲瀷锛�"+optC.screen[0].result);
+					
+					doui.request({
+						type: "jsonp",
+						url: gethttp() + "/admin/new/api/v1/order/getUserOrderList",
+						data: {
+							pageIndex: optC.table.page, // 椤电爜
+							pageSize: optC.table.pageSize, // 姣忛〉鏁伴噺
+							keyType: optC.select.result, // 鎼滅储绫诲瀷
+							key: optC.input[0].result, // 鎼滅储鍏抽敭瀛�
+							type: types, // 璁㈠崟绫诲瀷
+							orderState: optC.screen[1].result[0], // 璁㈠崟鐘舵��
+							state: optC.screen[2].result[0], // 鍒拌处鐘舵��
+							startTime: optC.screen[3].result[0], // 鏃堕棿鏈�灏�
+							endTime: optC.screen[3].result[1] ? optC.screen[3].result[1] : '', // 鏃堕棿鏈�澶�
+							sourceType: optC.screen[4].result[0],
+							riskType: optC.screen[5].result[0],
+							payment: optC.screen[6].result[0], // 浠樻閲戦
+						},
+						success: function(res) {
+							doui.hideLoading();
+							if (res.code != 0) {
+								doui.showToast({
+									content: res.msg
+								});
+							} else {
+								// 鐢虫槑 琛ㄦ牸鍐呭鏁版嵁
+								var mo_tr = []; // tr缁�
+								for (var i = 0, mo = res.data.result_list; i < mo.length; i++) {
+									// 褰撳墠琛�
+									var thatTr = {
+										check: false,
+										td: [{
+												title: "鍟嗗搧鍥剧墖",
+												key: mo[i].commonOrderGoods ? mo[i].commonOrderGoods.picture : "",
+												value: mo[i].commonOrderGoods ? mo[i].commonOrderGoods.picture : "",
+												dataType: "img"
+											},
+											{
+												title: "鍟嗗搧鏍囬",
+												key: mo[i].commonOrderGoods.goodsId,
+												value: mo[i].commonOrderGoods.title,
+												dataType: 'link'
+											},
+											{
+												title: "璁㈠崟鍙�",
+												key: mo[i].orderNo,
+												value: mo[i].orderNo
+											},
+											{
+												title: "璁㈠崟绫诲瀷",
+												key: mo[i].hongBaoType,
+												value: mo[i].hongBaoType
+											},
+											{
+												title: "鏀粯閲戦",
+												key: mo[i].payment,
+												value: "锟�" + mo[i].payment
+											},
+											{
+												title: "鏀粯鏃堕棿",
+												key: mo[i].downTime,
+												value: mo[i].downTime,
+												"class": "font13 font-gray"
+											},
+											{
+												title: "璁㈠崟鐘舵��",
+												key: mo[i].state,
+												value: mo[i].state
+											},
+											{
+												title: "鏀惰揣鏃堕棿",
+												key: mo[i].receiveTime,
+												value: mo[i].receiveTime,
+												"class": "font13 font-gray"
+											},
+											{
+												title: "鏀剁泭閲戦",
+												key: mo[i].hongBao,
+												value: "锟�" + mo[i].hongBao
+											},
+											{
+												title: "鏀剁泭鐘舵��",
+												key: mo[i].hongBaoState,
+												value: mo[i].hongBaoState
+											},
+											{
+												title: "鏀剁泭鏃堕棿",
+												key: mo[i].hongBaoDate,
+												value: mo[i].hongBaoDate,
+												"class": "font13 font-gray"
+											},
+											{
+												title: "鐢ㄦ埛澶村儚",
+												key: mo[i].userPortrait,
+												value: mo[i].userPortrait,
+												dataType: "img",
+												"class": "admin-imgS"
+											},
+											{
+												title: "鐢ㄦ埛鏄电О",
+												key: mo[i].userName,
+												value: mo[i].userName
+											},
+											{
+												title: "鐢ㄦ埛ID",
+												key: mo[i].userId,
+												value: mo[i].userId
+											},
+											{
+												title: "鐩存帴閭�璇蜂汉",
+												key: mo[i].levelOneId,
+												value: "ID:" + mo[i].levelOneId + "  锟�" + mo[i].levelOneMoney
+											},
+											{
+												title: "闂存帴閭�璇蜂汉",
+												key: mo[i].levelTwoId,
+												value: "ID:" + mo[i].levelTwoId + "  锟�" + mo[i].levelTwoMoney
+											},
+											{
+												title: "涓�绾у垎绫�",
+												key: mo[i].commonOrderGoods.category1,
+												value: mo[i].commonOrderGoods.category1
+											},
+										],
+									};
+									// 璁㈠崟绫诲瀷
+									if (thatTr.td[3].key == 1) {
+										thatTr.td[3].value = "鑷喘";
+										thatTr.td[3]["class"] = "font-blue";
+									} else if (thatTr.td[3].key == 2) {
+										thatTr.td[3].value = "鍒嗕韩";
+										thatTr.td[3]["class"] = "font-green";
+									} else if (thatTr.td[3].key == 3) {
+										thatTr.td[3].value = "鍥㈤槦";
+										thatTr.td[3]["class"] = "font-green";
+									}
+									//娓犻亾鏍囪瘑
+
+
+									// 璁㈠崟鍙峰垎鏋�
+									if (i >= 1) {
+										if (thatTr.td[2].key == mo[i - 1].orderNo) {
+											thatTr.td[2].value = "锛堝悓涓婏級";
+											thatTr.td[2]["class"] = "font-gray";
+										}
+									}
+									//鍟嗗搧閾炬帴
+									if (mo[i].sourceType == 1) {
+										thatTr.td[3].value = thatTr.td[3].value + " (娣樺疂)";
+										thatTr.td[1].key = "https://detail.tmall.com/item.htm?id=" + thatTr.td[1].key;
+									} else if (mo[i].sourceType == 2) {
+										thatTr.td[3].value = thatTr.td[3].value + " (浜笢)";
+										thatTr.td[1].key = "https://item.jd.com/" + thatTr.td[1].key + ".html";
+									} else if (mo[i].sourceType == 3) {
+										thatTr.td[3].value = thatTr.td[3].value + " (鎷煎澶�)";
+										thatTr.td[1].key = "http://yangkeduo.com/goods.html?goods_id=" + thatTr.td[1].key;
+									}
+
+									// 璁㈠崟鐘舵��
+									if (thatTr.td[6].key == 1) {
+										thatTr.td[6].value = "宸蹭粯娆�";
 										thatTr.td[6]["class"] = "font-orange";
-									}else if(mo[i].otherState==2)
-									{
-										thatTr.td[6].value=thatTr.td[6].value+"(鍏嶅崟鎴愬姛)";
+									} else if (thatTr.td[6].key == 2) {
+										thatTr.td[6].value = "宸叉敹璐�";
+										thatTr.td[6]["class"] = "font-green";
+									} else if (thatTr.td[6].key == 5) {
+										thatTr.td[6].value = "宸叉敹璐�,寰呭叆璐�";
+										thatTr.td[6]["class"] = "font-green";
+									} else if (thatTr.td[6].key == 3) {
+										var drawbackMoney = "";
+										if (mo[i].weiQuanBackMoney != null && mo[i].weiQuanBackMoney != undefined) {
+											if (mo[i].weiQuanBackMoney > 0) {
+												drawbackMoney = "宸叉墸闄�:" + mo[i].weiQuanBackMoney;
+											} else {
+												drawbackMoney = "鏈墸闄�:" + Math.abs(mo[i].weiQuanBackMoney);
+											}
+										}
+
+										thatTr.td[6].value = "璁㈠崟鍞悗#" + mo[i].weiQuanState + "#" + drawbackMoney;
+										thatTr.td[6]["class"] = "font-red";
+									} else if (thatTr.td[6].key == 4) {
+										thatTr.td[6].value = "宸插け鏁�";
+										thatTr.td[6]["class"] = "font-gray";
+									}
+
+									if (mo[i].otherState == 1) {
+										thatTr.td[6].value = thatTr.td[6].value + "(鍏嶅崟涓�)";
+										thatTr.td[6]["class"] = "font-orange";
+									} else if (mo[i].otherState == 2) {
+										thatTr.td[6].value = thatTr.td[6].value + "(鍏嶅崟鎴愬姛)";
 										thatTr.td[6]["class"] = "font-orange";
 									}
-									
-									// 鏀剁泭鐘舵��
-									if (thatTr.td[9].key == 1) { thatTr.td[9].value = "鏈埌璐�"; thatTr.td[9]["class"] = "font-orange"; }
-									else if (thatTr.td[9].key == 2) { thatTr.td[9].value = "宸插埌璐�"; thatTr.td[9]["class"] = "font-green"; }
-									else if (thatTr.td[9].key == 3) { thatTr.td[9].value = "宸插け鏁�"; thatTr.td[9]["class"] = "font-gray"; }
-									// 鍙楃泭浜哄垎鏋�
-									if (!thatTr.td[14].key) { thatTr.td[14].value = "锛堟棤锛�"; thatTr.td[14]["class"] = "font-gray"; }
-									if (!thatTr.td[15].key) { thatTr.td[15].value = "锛堟棤锛�"; thatTr.td[15]["class"] = "font-gray"; }
-									
+
+									// 鏀剁泭鐘舵��
+									if (thatTr.td[9].key == 1) {
+										thatTr.td[9].value = "鏈埌璐�";
+										thatTr.td[9]["class"] = "font-orange";
+									} else if (thatTr.td[9].key == 2) {
+										thatTr.td[9].value = "宸插埌璐�";
+										thatTr.td[9]["class"] = "font-green";
+									} else if (thatTr.td[9].key == 3) {
+										thatTr.td[9].value = "宸插け鏁�";
+										thatTr.td[9]["class"] = "font-gray";
+									}
+									// 鍙楃泭浜哄垎鏋�
+									if (!thatTr.td[14].key) {
+										thatTr.td[14].value = "锛堟棤锛�";
+										thatTr.td[14]["class"] = "font-gray";
+									}
+									if (!thatTr.td[15].key) {
+										thatTr.td[15].value = "锛堟棤锛�";
+										thatTr.td[15]["class"] = "font-gray";
+									}
+
 									if (mo[i].commonOrderGoods.category3 != null && mo[i].commonOrderGoods.category3.length > 0) {
 										thatTr.td[16].value = mo[i].commonOrderGoods.category3;
 									} else if (mo[i].commonOrderGoods.category2 != null && mo[i].commonOrderGoods.category2.length > 0) {
 										thatTr.td[16].value = mo[i].commonOrderGoods.category2;
-									} 
-									
-									// 灏嗗綋鍓嶈鏀惧叆tr缁�
-									mo_tr.push(thatTr);
-								}
-								// 鏇存柊琛ㄦ牸鐨勬暟鎹�
-								adminDom.table.opt({ pageMax: res.data.pe.totalPage }); // 鏈�澶ч〉鐮�
-								adminDom.table.tbody({ tr: mo_tr }); // 鍐呭鏁版嵁
-							}
-						}
-					});
-				}
-			});
-			// 琛ㄦ牸璁剧疆
-			adminDom.table.opt({ showCheck: false, pageSize: 20, });
-			// 琛ㄦ牸澶存帓
-			adminDom.table.thead({
-				th: [
-					{ title: "鍟嗗搧鍥剧墖", width: "0.6rem", orderUp: "", orderDown: "" },
-					{ title: "鍟嗗搧鏍囬", width: "1rem", orderUp: "", orderDown: "" },
-					{ title: "璁㈠崟鍙�", width: "1rem", orderUp: "", orderDown: "" },
-					{ title: "璁㈠崟绫诲瀷", width: "0.6rem", orderUp: "", orderDown: "" },
-					{ title: "鏀粯閲戦", width: "0.6rem", orderUp: "", orderDown: "" },
-					{ title: "鏀粯鏃堕棿", width: "0.6rem", orderUp: "", orderDown: "" },
-					{ title: "璁㈠崟鐘舵��", width: "0.6rem", orderUp: "", orderDown: "" },
-					{ title: "鏀惰揣鏃堕棿", width: "0.6rem", orderUp: "", orderDown: "" },
-					{ title: "鏀剁泭閲戦", width: "0.6rem", orderUp: "", orderDown: "" },
-					{ title: "鏀剁泭鐘舵��", width: "0.6rem", orderUp: "", orderDown: "" },
-					{ title: "鏀剁泭鏃堕棿", width: "0.6rem", orderUp: "", orderDown: "" },
-					{ title: "鐢ㄦ埛澶村儚", width: "0.6rem", orderUp: "", orderDown: "" },
-					{ title: "鐢ㄦ埛鏄电О", width: "0.6rem", orderUp: "", orderDown: "" },
-					{ title: "鐢ㄦ埛ID", width: "0.6rem", orderUp: "", orderDown: "" },
-					{ title: "鐩存帴閭�璇蜂汉", width: "0.6rem", orderUp: "", orderDown: "" },
-					{ title: "闂存帴閭�璇蜂汉", width: "0.6rem", orderUp: "", orderDown: "" },
-					{ title: "鍟嗗搧鍒嗙被", width: "0.6rem", orderUp: "", orderDown: "" },
-				]
-			});
-			// 宸ュ叿鏍�
-			adminDom.table.tools({
-				show: true,
-				list: [
-					{ "title": "涓婁紶璁㈠崟", "name": "add", "icon": "fi fi-cloud-upload" },
-				],
-				touch: function (back)
-				{
-					// 涓婁紶璁㈠崟
-					if (back.toolName == "add")
-					{
-						// 鏄剧ず寮规
-						vm_file.fileWork.show = true;
-					}
-				},
-			});
-			
-			
-			// ----------------------------------------------------- 鏂囦欢涓婁紶寮规
-			vm_file = new Vue({
-				el: "#fileUpload",
-				data: {
-					// 鏂囦欢宸ヤ綔
-					fileWork: {
-						show: false, // 鏄惁鏄剧ず
-						"file": null,
-						// 鍏抽棴鎸夐挳
-						action_close: function () { vm_file.fileWork["file"] = null; $("#myimg").val(); vm_file.fileWork.show = false; },
-						// 鏂囦欢鏀瑰彉
-						action_change: function () { vm_file.fileWork["file"] = $("#myimg")[0].files[0]; },
-						// 纭畾涓婁紶鎸夐挳 鐐瑰嚮
-						action_sub: function () 
-						{
-							if (vm_file.fileWork["file"])
-							{
-								// 鍙戞儏璇锋眰
-								doui.showLoading("姝e湪涓婁紶");
-								doui.upload({
-									url: gethttp() + "/admin/new/api/v1/upload/uploadOrderFile",
-									data: {
-										file: vm_file.fileWork["file"],
-									},
-									// 杩涘害
-									progress: function (res) { doui.showLoading("宸蹭笂浼�"+res.percentage); },
-									// 鎴愬姛
-									success: function (res)
-									{
-										doui.hideLoading();
-										if (res.code != 0) { doui.showToast(res.msg); }
-										else { vm_file.fileWork.action_close(); doui.showToast("涓婁紶鎴愬姛"); vm_table.search(); }
-									},
-								});
-							}
-							else { doui.showToast("璇烽�夋嫨鏂囦欢"); }
-						},
-					},
-				},
-			});
-			
-			
-			// ----------------------------------------------------- 鍒濆琛屼负
-			// 妯℃嫙鎼滅储鐐瑰嚮
-			vm_table.search();
-			
-			
-			document.body.style.display = "block";
-		}
-	});
-	
-</script>
\ No newline at end of file
+									}
+
+									// 灏嗗綋鍓嶈鏀惧叆tr缁�
+									mo_tr.push(thatTr);
+								}
+								// 鏇存柊琛ㄦ牸鐨勬暟鎹�
+								adminDom.table.opt({
+									pageMax: res.data.pe.totalPage
+								}); // 鏈�澶ч〉鐮�
+								adminDom.table.tbody({
+									tr: mo_tr
+								}); // 鍐呭鏁版嵁
+							}
+						}
+					});
+				}
+			});
+			// 琛ㄦ牸璁剧疆
+			adminDom.table.opt({
+				showCheck: false,
+				pageSize: 20,
+			});
+			// 琛ㄦ牸澶存帓
+			adminDom.table.thead({
+				th: [{
+						title: "鍟嗗搧鍥剧墖",
+						width: "0.6rem",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "鍟嗗搧鏍囬",
+						width: "1rem",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "璁㈠崟鍙�",
+						width: "1rem",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "璁㈠崟绫诲瀷",
+						width: "0.6rem",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "鏀粯閲戦",
+						width: "0.6rem",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "鏀粯鏃堕棿",
+						width: "0.6rem",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "璁㈠崟鐘舵��",
+						width: "0.6rem",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "鏀惰揣鏃堕棿",
+						width: "0.6rem",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "鏀剁泭閲戦",
+						width: "0.6rem",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "鏀剁泭鐘舵��",
+						width: "0.6rem",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "鏀剁泭鏃堕棿",
+						width: "0.6rem",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "鐢ㄦ埛澶村儚",
+						width: "0.6rem",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "鐢ㄦ埛鏄电О",
+						width: "0.6rem",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "鐢ㄦ埛ID",
+						width: "0.6rem",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "鐩存帴閭�璇蜂汉",
+						width: "0.6rem",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "闂存帴閭�璇蜂汉",
+						width: "0.6rem",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "鍟嗗搧鍒嗙被",
+						width: "0.6rem",
+						orderUp: "",
+						orderDown: ""
+					},
+				]
+			});
+			// 宸ュ叿鏍�
+			adminDom.table.tools({
+				show: true,
+				list: [{
+					"title": "涓婁紶璁㈠崟",
+					"name": "add",
+					"icon": "fi fi-cloud-upload"
+				}, ],
+				touch: function(back) {
+					// 涓婁紶璁㈠崟
+					if (back.toolName == "add") {
+						// 鏄剧ず寮规
+						vm_file.fileWork.show = true;
+					}
+				},
+			});
+
+
+			// ----------------------------------------------------- 鏂囦欢涓婁紶寮规
+			vm_file = new Vue({
+				el: "#fileUpload",
+				data: {
+					// 鏂囦欢宸ヤ綔
+					fileWork: {
+						show: false, // 鏄惁鏄剧ず
+						"file": null,
+						// 鍏抽棴鎸夐挳
+						action_close: function() {
+							vm_file.fileWork["file"] = null;
+							$("#myimg").val();
+							vm_file.fileWork.show = false;
+						},
+						// 鏂囦欢鏀瑰彉
+						action_change: function() {
+							vm_file.fileWork["file"] = $("#myimg")[0].files[0];
+						},
+						// 纭畾涓婁紶鎸夐挳 鐐瑰嚮
+						action_sub: function() {
+							if (vm_file.fileWork["file"]) {
+								// 鍙戞儏璇锋眰
+								doui.showLoading("姝e湪涓婁紶");
+								doui.upload({
+									url: gethttp() + "/admin/new/api/v1/upload/uploadOrderFile",
+									data: {
+										file: vm_file.fileWork["file"],
+									},
+									// 杩涘害
+									progress: function(res) {
+										doui.showLoading("宸蹭笂浼�" + res.percentage);
+									},
+									// 鎴愬姛
+									success: function(res) {
+										doui.hideLoading();
+										if (res.code != 0) {
+											doui.showToast(res.msg);
+										} else {
+											vm_file.fileWork.action_close();
+											doui.showToast("涓婁紶鎴愬姛");
+											vm_table.search();
+										}
+									},
+								});
+							} else {
+								doui.showToast("璇烽�夋嫨鏂囦欢");
+							}
+						},
+					},
+				},
+			});
+
+
+			// ----------------------------------------------------- 鍒濆琛屼负
+			// 妯℃嫙鎼滅储鐐瑰嚮
+			vm_table.search();
+
+
+			document.body.style.display = "block";
+		}
+	});
+</script>
diff --git a/childPath/dingDan/dingDan_taoBao_wq.html b/childPath/dingDan/dingDan_taoBao_wq.html
index d575dd8..b4b971e 100644
--- a/childPath/dingDan/dingDan_taoBao_wq.html
+++ b/childPath/dingDan/dingDan_taoBao_wq.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
-	
+
 	<head>
 		<meta charset="utf-8" />
-		<meta http-equiv="X-UA-Compatible" content="chrome=1"/>
-		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
+		<meta http-equiv="X-UA-Compatible" content="chrome=1" />
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<title>娣樺疂鍞悗璁㈠崟</title>
-		<link rel="stylesheet" type="text/css" href="../../css/doui.min.css"/>
+		<link rel="stylesheet" type="text/css" href="../../css/doui.min.css" />
 		<script src="../../js/doui.min.js" type="text/javascript" charset="utf-8"></script>
 		<script src="../../js/requestHost.js" type="text/javascript" charset="utf-8"></script>
 		<script type="text/javascript">
@@ -25,115 +25,310 @@
 			});
 		</script>
 	</head>
-	
+
 	<body class="fontPC" style="display:none;">
 		<div class="winSizeBox">
-			
+
 			<!-- =============================================================== 鎼滅储绛涢��(椤堕儴) -->
 			<div id="thisHeader" style="width:7.5rem;"></div>
-			
+
 			<!-- =============================================================== 琛ㄦ牸 -->
 			<div id="thisTable" class="admin-main-overHeader"></div>
 			
+			<!-- =============================================================== 鏂囦欢涓婁紶 寮规 -->
+			<div v-show="fileWork.show" id="fileUpload" class="layer-dark fboxRow Xcenter Ycenter">
+				<div class="admin-tan-box" style="height:auto;">
+					<!-- 鍏抽棴鎸夐挳 -->
+					<div class="admin-btn-arcS admin-tan-close" @click="fileWork.action_close()"><i class="fi fi-no"></i></div>
+					<!-- 鏍囬 -->
+					<div class="fboxRow Xcenter Ycenter admin-margin"><div class="font18 font-blue">鏂囦欢涓婁紶</div></div>
+					<!-- 鏂囦欢閫夋嫨 -->
+					<div class="fboxRow Xcenter Ycenter admin-margin">
+						<div class="font-cyan">缁存潈璁㈠崟琛ㄦ牸锛�</div>
+						<div class="inputShell border-1px border-round" style="width:1.2rem;">
+							<input id="myimg" type="file" accept="application/vnd.ms-excel" @change="fileWork.action_change()"/>
+						</div>
+					</div>
+					<!-- 鎻愪氦 鎸夐挳 -->
+					<div class="fboxRow Xcenter Ycenter admin-margin">
+						<div class="admin-btn-roundL bg-green click-scale" @click="fileWork.action_sub()">纭畾涓婁紶</div>
+					</div>
+				</div>
+			</div>
+
 		</div>
 	</body>
-	
+
 </html>
 
 
 <script type="text/javascript">
-	
 	// 鏂囦欢涓婁紶vue
 	var vm_file = null;
-	
+
 	// ==================================================================================== 椤甸潰鏁版嵁
 	doui.onReady({
-		success: function ()
-		{
+		success: function() {
 			// ----------------------------------------------------- 椤堕儴
 			// 鍒涘缓椤堕儴dom
-			adminDom.header.creat({ el: "#thisHeader", });
+			adminDom.header.creat({
+				el: "#thisHeader",
+			});
 			// 杈撳叆鎼滅储
-			adminDom.header.input({ placeholder: "璇峰~鍐欏噯纭殑璁㈠崟鍙�", })
+			adminDom.header.input({
+				placeholder: "璇峰~鍐欏噯纭殑璁㈠崟鍙�",
+			})
 			// ----------------------------------------------------- 琛ㄦ牸
 			// 鍒涘缓琛ㄦ牸dom
 			adminDom.table.creat({
 				el: "#thisTable",
-				touchSearch: function(optC)
-				{
+				touchSearch: function(optC) {
 					// 鍙戣捣璇锋眰
-					doui.showLoading({ content: "鍔犺浇鍒楄〃" });
+					doui.showLoading({
+						content: "鍔犺浇鍒楄〃"
+					});
 					doui.request({
 						type: "jsonp",
-						url: gethttp()+ "/admin/new/api/v1/taobaoOrder/listTaoBaoWQOrder",//gethttp()
+						url: gethttp() + "/admin/new/api/v1/taobaoOrder/listTaoBaoWQOrder", //gethttp()
 						data: {
 							pageIndex: optC.table.page, // 椤电爜
 							key: optC.input[0].result, // 鎼滅储鍏抽敭瀛�
 						},
-						success: function (res)
-						{
+						success: function(res) {
 							doui.hideLoading();
-							if (res.code != 0) { doui.showToast({ content: res.msg }); }
-							else 
-							{
+							if (res.code != 0) {
+								doui.showToast({
+									content: res.msg
+								});
+							} else {
 								// 鐢虫槑 琛ㄦ牸鍐呭鏁版嵁
 								var mo_tr = []; // tr缁�
-								for (var i = 0, mo = res.data.result_list; i < mo.length; i++)
-								{
+								for (var i = 0, mo = res.data.result_list; i < mo.length; i++) {
 									// 褰撳墠琛�
 									var thatTr = {
 										check: false,
-										td: [
-											{ title: "鍟嗗搧鏍囬", key:mo[i].goodsName, value: mo[i].goodsName},
-											{ title: "璁㈠崟鍙�", key: mo[i].orderId, value: mo[i].orderId },
-											{ title: "瀛愯鍗曞彿", key: mo[i].orderItemId, value: mo[i].orderItemId },
-											{ title: "鍞悗閲戦", key: mo[i].money, value: "锟�"+ mo[i].money },
-											{ title: "杩旇繕缁欏晢瀹堕噾棰�", key: mo[i].fanMoney, value: "锟�"+ mo[i].fanMoney},
-											{ title: "鍞悗鐘舵��", key: mo[i].state, value: mo[i].state },
-											{ title: "缁撶畻鏃堕棿", key: mo[i].jieSuanTime, value: mo[i].jieSuanTime },
-											{ title: "鍞悗鏃堕棿", key: mo[i].weiQuanTime, value: mo[i].weiQuanTime },
-											{ title: "鍞悗瀹屾垚鏃堕棿", key: mo[i].weiQuanFinishTime, value:mo[i].weiQuanFinishTime },
-											{ title: "鏈湴鍒涘缓鏃堕棿", key: mo[i].createTime, value: mo[i].createTime },
-											{ title: "鏈湴鏇存柊鏃堕棿", key: mo[i].updateTime, value: mo[i].updateTime },
+										td: [{
+												title: "鍟嗗搧鏍囬",
+												key: mo[i].goodsName,
+												value: mo[i].goodsName
+											},
+											{
+												title: "璁㈠崟鍙�",
+												key: mo[i].orderId,
+												value: mo[i].orderId
+											},
+											{
+												title: "瀛愯鍗曞彿",
+												key: mo[i].orderItemId,
+												value: mo[i].orderItemId
+											},
+											{
+												title: "鍞悗閲戦",
+												key: mo[i].money,
+												value: "锟�" + mo[i].money
+											},
+											{
+												title: "杩旇繕缁欏晢瀹堕噾棰�",
+												key: mo[i].fanMoney,
+												value: "锟�" + mo[i].fanMoney
+											},
+											{
+												title: "鍞悗鐘舵��",
+												key: mo[i].state,
+												value: mo[i].state
+											},
+											{
+												title: "缁撶畻鏃堕棿",
+												key: mo[i].jieSuanTime,
+												value: mo[i].jieSuanTime
+											},
+											{
+												title: "鍞悗鏃堕棿",
+												key: mo[i].weiQuanTime,
+												value: mo[i].weiQuanTime
+											},
+											{
+												title: "鍞悗瀹屾垚鏃堕棿",
+												key: mo[i].weiQuanFinishTime,
+												value: mo[i].weiQuanFinishTime
+											},
+											{
+												title: "鏈湴鍒涘缓鏃堕棿",
+												key: mo[i].createTime,
+												value: mo[i].createTime
+											},
+											{
+												title: "鏈湴鏇存柊鏃堕棿",
+												key: mo[i].updateTime,
+												value: mo[i].updateTime
+											},
 										],
 									};
-									
-									
-									if(thatTr.td[4].key==null||thatTr.td[4].key==''||thatTr.td[4].key==undefined){thatTr.td[4].value="锛堟殏鏃狅級" }
-									if(thatTr.td[8].key==null||thatTr.td[8].key==''||thatTr.td[8].key==undefined){thatTr.td[8].value="锛堟殏鏃狅級" }
+
+
+									if (thatTr.td[4].key == null || thatTr.td[4].key == '' || thatTr.td[4].key == undefined) {
+										thatTr.td[4].value = "锛堟殏鏃狅級"
+									}
+									if (thatTr.td[8].key == null || thatTr.td[8].key == '' || thatTr.td[8].key == undefined) {
+										thatTr.td[8].value = "锛堟殏鏃狅級"
+									}
 									// 灏嗗綋鍓嶈鏀惧叆tr缁�
 									mo_tr.push(thatTr);
 								}
 								// 鏇存柊琛ㄦ牸鐨勬暟鎹�
-								adminDom.table.opt({ pageMax: res.data.pe.totalPage }); // 鏈�澶ч〉鐮�
-								adminDom.table.tbody({ tr: mo_tr }); // 鍐呭鏁版嵁
+								adminDom.table.opt({
+									pageMax: res.data.pe.totalPage
+								}); // 鏈�澶ч〉鐮�
+								adminDom.table.tbody({
+									tr: mo_tr
+								}); // 鍐呭鏁版嵁
 							}
 						}
 					});
 				}
 			});
 			// 琛ㄦ牸璁剧疆
-			adminDom.table.opt({ showCheck: false, pageSize: 20, });
+			adminDom.table.opt({
+				showCheck: false,
+				pageSize: 20,
+			});
 			// 琛ㄦ牸澶存帓
 			adminDom.table.thead({
-				th: [
-					{ title: "鍟嗗搧鏍囬", width: "", orderUp: "", orderDown: "" },
-					{ title: "璁㈠崟鍙�", width: "", orderUp: "", orderDown: "" },
-					{ title: "瀛愯鍗曞彿", width: "", orderUp: "", orderDown: "" },
-					{ title: "鍞悗閲戦", width: "", orderUp: "", orderDown: "" },
-					{ title: "杩旇繕缁欏晢瀹堕噾棰�", width: "", orderUp: "", orderDown: "" },
-					{ title: "鍞悗鐘舵��", width: "", orderUp: "", orderDown: "" },
-					{ title: "缁撶畻鏃堕棿", width: "", orderUp: "", orderDown: "" },
-					{ title: "鍞悗鏃堕棿", width: "", orderUp: "", orderDown: "" },
-					{ title: "鍞悗瀹屾垚鏃堕棿", width: "", orderUp: "", orderDown: "" },
-					{ title: "鏈湴鍒涘缓鏃堕棿", width: "", orderUp: "", orderDown: "" },
-					{ title: "鏈湴鏇存柊鏃堕棿", width: "", orderUp: "", orderDown: "" }
+				th: [{
+						title: "鍟嗗搧鏍囬",
+						width: "",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "璁㈠崟鍙�",
+						width: "",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "瀛愯鍗曞彿",
+						width: "",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "鍞悗閲戦",
+						width: "",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "杩旇繕缁欏晢瀹堕噾棰�",
+						width: "",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "鍞悗鐘舵��",
+						width: "",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "缁撶畻鏃堕棿",
+						width: "",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "鍞悗鏃堕棿",
+						width: "",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "鍞悗瀹屾垚鏃堕棿",
+						width: "",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "鏈湴鍒涘缓鏃堕棿",
+						width: "",
+						orderUp: "",
+						orderDown: ""
+					},
+					{
+						title: "鏈湴鏇存柊鏃堕棿",
+						width: "",
+						orderUp: "",
+						orderDown: ""
+					}
 				]
 			});
+
+			// 宸ュ叿鏍�
+			adminDom.table.tools({
+				show: true,
+				list: [{
+					"title": "涓婁紶缁存潈璁㈠崟",
+					"name": "add",
+					"icon": "fi fi-cloud-upload"
+				}, ],
+				touch: function(back) {
+					// 鏇存柊璁㈠崟
+					if (back.toolName == "add") {
+						// 鏄剧ず寮规
+						vm_file.fileWork.show = true;
+					}
+				},
+			});
+			
+			
+			// ----------------------------------------------------- 鏂囦欢涓婁紶寮规
+			vm_file = new Vue({
+				el: "#fileUpload",
+				data: {
+					// 鏂囦欢宸ヤ綔
+					fileWork: {
+						show: false, // 鏄惁鏄剧ず
+						"file": null,
+						// 鍏抽棴鎸夐挳
+						action_close: function () { vm_file.fileWork["file"] = null; $("#myimg").val(); vm_file.fileWork.show = false; },
+						// 鏂囦欢鏀瑰彉
+						action_change: function () { vm_file.fileWork["file"] = $("#myimg")[0].files[0]; },
+						// 纭畾涓婁紶鎸夐挳 鐐瑰嚮
+						action_sub: function () 
+						{
+							if (vm_file.fileWork["file"])
+							{
+								// 鍙戞儏璇锋眰
+								doui.showLoading("姝e湪涓婁紶");
+								doui.upload({
+									url: gethttp() + "/admin/new/api/v1/taobaoOrder/uploadWQOrderFile",
+									data: {
+										file: vm_file.fileWork["file"],
+									},
+									// 杩涘害
+									progress: function (res) { doui.showLoading("宸蹭笂浼�"+res.percentage); },
+									// 鎴愬姛
+									success: function (res)
+									{
+										doui.hideLoading();
+										if (res.code != 0) { doui.showToast(res.msg); }
+										else { vm_file.fileWork.action_close(); doui.showToast("涓婁紶鎴愬姛"); vm_table.search(); }
+									},
+								});
+							}
+							else { doui.showToast("璇烽�夋嫨鏂囦欢"); }
+						},
+					},
+				},
+			});
+
+
 			// 妯℃嫙鎼滅储鐐瑰嚮
 			vm_table.search();
+
+
+
 			document.body.style.display = "block";
 		}
 	});
-	
-</script>
\ No newline at end of file
+</script>
diff --git a/childPath/system/taobaoAuthLink.html b/childPath/system/taobaoAuthLink.html
new file mode 100644
index 0000000..178fba8
--- /dev/null
+++ b/childPath/system/taobaoAuthLink.html
@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<html>
+
+	<head>
+		<meta charset="utf-8" />
+		<meta http-equiv="X-UA-Compatible" content="chrome=1" />
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<title>绯荤粺杞摼</title>
+		<link rel="stylesheet" type="text/css" href="../../css/doui.min.css" />
+		<script src="../../js/doui.min.js" type="text/javascript" charset="utf-8"></script>
+		<script src="../../js/requestHost.js" type="text/javascript" charset="utf-8"></script>
+		<link rel="stylesheet" type="text/css" href="../../layui/css/layui.css" />
+		<script src="../../layui/layui.all.js" type="text/javascript" charset="utf-8"></script>
+		<script type="text/javascript">
+			doui.importLoad({
+				importArray: [
+					// 闆锋墦涓嶅姩
+					getHostPath() + "js/jquery.min.js",
+					getHostPath() + "js/vue.min.js",
+					// 瀛椾綋鍥炬爣
+					getHostPath() + "fontAdmin/iconfont.css",
+					getHostPath() + "font/iconfont.css",
+					// dom妯℃澘
+					getHostPath() + "css/admin-all.css",
+					getHostPath() + "js/admin-creat.js",
+				],
+			});
+		</script>
+	</head>
+
+	<body class="fontPC" style="padding-top: 0.2rem;">
+
+		<form class="layui-form" action="">
+			<div class="layui-form-item">
+				<label class="layui-form-label">鐢ㄦ埛ID</label>
+				<div class="layui-input-block">
+					<input type="text" name="uid" required lay-verify="required" placeholder="璇疯緭鍏ョ敤鎴稩D" autocomplete="off" class="layui-input"
+					 style="width: 1rem !important;">
+				</div>
+			</div>
+			<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">鎺堟潈閾炬帴</label>
+				<div class="layui-input-block" style="position: relative;">
+					<textarea name="content" class="layui-textarea" rows="5"></textarea>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-input-block">
+					<button class="layui-btn" lay-submit lay-filter="formDemo">绔嬪嵆鎻愪氦</button>
+					<button type="reset" class="layui-btn layui-btn-primary">閲嶇疆</button>
+				</div>
+			</div>
+		</form>
+
+
+	</body>
+
+</html>
+
+
+<script>
+	//Demo
+	layui.use('form', function() {
+		var form = layui.form;
+		//鐩戝惉鎻愪氦
+		form.on('submit(formDemo)', function(data) {
+			doui.showLoading("姝e湪鑾峰彇鎺堟潈閾炬帴...");
+			doui.request({
+				type: "jsonp",
+				url: gethttp() + "/admin/new/api/v1/config/getTaoBaoAuthLink",
+				data: data.field,
+				success: function(res) {
+					doui.hideLoading();
+					if (res.code != 0) {
+						layer.msg(res.msg);
+					} else {
+						$("textarea").val(res.data.url);
+						doui.showToast("鑾峰彇鎴愬姛");
+					}
+				}
+			});
+
+			return false;
+		});
+		setTimeout(function() {
+			form.render();
+		}, 100);
+
+	});
+</script>
+
+<script type="text/javascript">
+	// ==================================================================================== 椤甸潰鏁版嵁
+	doui.onReady({
+		success: function() {
+
+		}
+	});
+</script>
diff --git a/js/admin-creat.js b/js/admin-creat.js
index 8592513..b75d176 100644
--- a/js/admin-creat.js
+++ b/js/admin-creat.js
@@ -127,7 +127,8 @@
 					// 绛涢�夐」
 					screen: { 
 						show: false, // 鏄惁鏄剧ず
-						list: [], // 鍙�夊垪琛�
+						list: [], // 鍙�夊垪琛�
+						btns:[],//鎸夐挳鍒楄〃
 						touch: function () {}, // 浜嬩欢瑙﹀彂
 						// 灞曞紑 / 鏀惰捣 鐐瑰嚮
 						action_show: function () { $(".admin-header-screen").toggleClass("displayNone"); },
@@ -147,7 +148,10 @@
 							// 鑾峰彇褰撳墠缁撴灉
 							var thisScreen = vm_header.resultGet();
 							vm_header.screen.touch(thisScreen.screen);
-						},
+						},
+						action_btnClick:function(item){
+							item.actionClick();
+						}
 					},
 				},
 				// 棰濆鏂规硶
@@ -292,7 +296,8 @@
 			*/
 			if (typeof(objC.show)!="undefined") { vm_header.screen.show = objC.show; }
 			if (typeof(objC.list)!="undefined") { vm_header.screen.list = objC.list; }
-			if (typeof(objC.touch)!="undefined") { vm_header.screen.touch = objC.touch; }
+			if (typeof(objC.touch)!="undefined") { vm_header.screen.touch = objC.touch; }
+			if (typeof(objC.btns)!="undefined") { vm_header.screen.btns = objC.btns; }
 		},
 	},
 	
diff --git a/js/pageHeader.xml b/js/pageHeader.xml
index b9bbe5a..79e4e63 100644
--- a/js/pageHeader.xml
+++ b/js/pageHeader.xml
@@ -41,11 +41,18 @@
 				<div v-if="item.input.num>0" :id="'adminHeaderOpt'+index" class="fboxRow Xstart Ycenter admin-marginLeft">
 					<div v-for="(item2,index2) in item.input.num" class="fboxRow Xstart Ycenter admin-marginRight">
 						<div v-if="index2>=1" class="font-gray admin-marginRight">~</div>
-						<div class="inputShell admin-opt-input"><input :type="item.input.type"/></div>
+						<div class="inputShell admin-opt-input"><input :type="item.input.type" :value="item.input.value!=undefined?item.input.value:''"/></div>
 					</div>
 				</div>
 			</div>
 		</div>
+		
+		<!--蹇嵎鎸夐挳 -->
+		<div v-if="screen.btns!=null && screen.btns.length>0" style="display:flex">
+		 <div v-for="(item,index) in screen.btns" style="display:flex">
+			  <div class="admin-opt-xuan btn" style="background:#01AAED;color:white;" @click="screen.action_btnClick(item)">{{item.name}}</div>
+		 </div>
+		</div>
 	</div>
 	
 </div>
diff --git a/menu.json b/menu.json
index d04b123..61bf43f 100644
--- a/menu.json
+++ b/menu.json
@@ -560,6 +560,11 @@
 				"value": "鏂囨杞摼",
 				"href": "childPath/system/convertLink.html",
 				"child": []
+			},
+			{
+				"value": "娣樺疂鎺堟潈閾炬帴鑾峰彇",
+				"href": "childPath/system/taobaoAuthLink.html",
+				"child": []
 			}
 		]
 	}
diff --git a/window/0phone/tiXian.html b/window/0phone/tiXian.html
index 419085a..45cb62f 100644
--- a/window/0phone/tiXian.html
+++ b/window/0phone/tiXian.html
@@ -60,7 +60,9 @@
 							<!--ID-->
 							<div class="font22 font-gray nodeMarginCol">ID锛歿{item.extract.userInfo.id}}</div>
 						</div>
-						<div class="flex1"></div>
+						<div class="flex1" style="margin-left: 20px;color: gray;margin-top: 10px;">
+							{{item.system}}
+						</div>
 						<!--鎻愮幇璁板綍-->
 						<!--<div class="fboxRow Xstart Ycenter">
 							<div class="font22 font-gray nodeMarginRow">鎻愮幇璁板綍</div>

--
Gitblit v1.8.0