From 5b738fc9b470f4952e7dd2ef9182d9dd8880e610 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Fri, 29 Dec 2023 13:44:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                     |   2 +-
 apis/interfaces/custom.js     |  48 +++++
 pages.json                    |  15 ++
 pages/management/account2.vue | 151 ++++++++++++++++
 pages/work/account2.vue       | 320 ++++++++++++++++++++++++++++++++++
 pages/work/index.vue          |  18 +-
 static/.DS_Store              | Bin 0 -> 6148 bytes
 static/icons/icon_04.png      | Bin 0 -> 5930 bytes
 8 files changed, 547 insertions(+), 7 deletions(-)
 create mode 100644 apis/interfaces/custom.js
 create mode 100644 pages/management/account2.vue
 create mode 100644 pages/work/account2.vue
 create mode 100644 static/.DS_Store
 create mode 100644 static/icons/icon_04.png

diff --git a/README.md b/README.md
index cc51a9e..5d6ca39 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
 # dou-Fire
 
-抖火App
\ No newline at end of file
+抖火App ( 现在线上版本 2023-12-15)
\ No newline at end of file
diff --git a/apis/interfaces/custom.js b/apis/interfaces/custom.js
new file mode 100644
index 0000000..cb7bb0f
--- /dev/null
+++ b/apis/interfaces/custom.js
@@ -0,0 +1,48 @@
+
+/**
+ * Web -zdx
+ * moduleName: 线下业务订单类型
+ */
+
+import { request } from '../index'
+
+// 获取业务类型
+const customTypes = () =>{
+	return request({
+		url: "custom_type/index",
+	})
+}
+
+// 提交办理线下订单
+const customTypeStore = (customType,data) => {
+	return request({
+		url		: `custom_type/${customType}/store`,
+		method	: "POST",
+		data
+	})
+}
+
+
+// 取消线下订单
+const customTypeCancel = (orderId, data) => {
+	return request({
+		url		: `custom_type/order/${orderId}/cancel`,
+		method	: 'DELETE',
+		data
+	})
+}
+
+// 线下订单列表
+const  customTypelists = data => {
+	return request({
+		url		: 'custom_type/order/lists',
+		data
+	})
+}
+
+export {
+	customTypes,
+    customTypeStore,
+    customTypeCancel,
+    customTypelists
+}
diff --git a/pages.json b/pages.json
index d1c42a1..ca38305 100644
--- a/pages.json
+++ b/pages.json
@@ -889,6 +889,13 @@
 			"navigationBarTitleText" : "账户咨询办理",
 			"enablePullDownRefresh" : false
 		}
+	},{
+		"path" : "pages/management/account2",
+		"name" : "MagAccount2",
+		"style" : {
+			"navigationBarTitleText" : "线下账户咨询办理",
+			"enablePullDownRefresh" : false
+		}
 	},
 	{
 		"path" : "pages/management/delegation",
@@ -906,6 +913,14 @@
 			"enablePullDownRefresh" : false,
 			"navigationBarBackgroundColor": "#FFFFFF"
 		}
+	},{
+		"path" : "pages/work/account2",
+		"name" : "AccountWork2",
+		"style" : {
+			"navigationBarTitleText" : " 线下订单",
+			"enablePullDownRefresh" : false,
+			"navigationBarBackgroundColor": "#FFFFFF"
+		}
 	},{
 		"path" : "pages/work/delegation",
 		"name" : "DelegationWork",
diff --git a/pages/management/account2.vue b/pages/management/account2.vue
new file mode 100644
index 0000000..6e899f0
--- /dev/null
+++ b/pages/management/account2.vue
@@ -0,0 +1,151 @@
+<template>
+	<view class="from-content">
+		<view class="from-block" v-if="pickerArr.length > 0" >
+			<view class="from-block-item">
+				<label>办理业务</label>
+				<picker class="from-block-val" :range="pickerArr" :value="pickerIndex" range-key="title" @change="pickerIndex = $event.detail.value">
+					<view class="from-block-picker nowrap">{{pickerArr[pickerIndex].title}}
+						<u-icon class="from-block-picker-icon" name="arrow-down" color="#555" size="15"></u-icon>
+					</view>
+				</picker>
+			</view>
+			<view class="from-block-item">
+				<label>业务描述</label>
+				<view class="from-block-val">{{pickerArr[pickerIndex].subtitle}}</view>
+			</view>
+            <view class="from-block-item">
+            	<label>服务费</label>
+            	<input class="from-block-val from-block-input" type="number" placeholder="请输入客户服务费(元)" v-model="price" />
+            </view>
+		</view>
+		<view class="from-block">
+			<view class="from-block-item">
+				<label>客户姓名</label>
+				<input class="from-block-val from-block-input" placeholder="请输入客户姓名" v-model="name" />
+			</view>
+			<view class="from-block-item">
+				<label>手机号码</label>
+				<input class="from-block-val from-block-input" type="number" placeholder="请输入客户手机号码" v-model="phone" />
+			</view>
+		</view>
+		<button class="from-btn" @click="onSubmit">提交办理</button>
+	</view>
+</template>
+
+<script>
+	import { customTypes,customTypeStore } from '@/apis/interfaces/custom.js'
+	export default {
+		data() {
+			return {
+				pickerArr	: [],
+				pickerIndex	: 0,
+				name		: '',
+				phone		: '',
+                price       : ''
+			};
+		},
+		onLoad() {
+			uni.showLoading({
+				title: '加载中...',
+				mask : true
+			})
+			customTypes().then(res => {
+                console.log(res)
+                uni.hideLoading()
+                this.pickerArr = res;
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
+			})
+		},
+		methods: {
+			// 提交表单
+			onSubmit(){
+				let { name, phone, pickerArr, pickerIndex,price} = this
+				
+                if(price === ''){
+                	uni.showToast({
+                		title: '请输入服务费金额',
+                		icon : 'none'
+                	})
+                	return
+                }
+				if(name === ''){
+					uni.showToast({
+						title: '请输入客户姓名',
+						icon : 'none'
+					})
+					return
+				}
+				if(phone === ''){
+					uni.showToast({
+						title: '请输入客户手机号码',
+						icon : 'none'
+					})
+					return
+				}
+				uni.showLoading({
+					title: "提交中...",
+					mask : true
+				})
+                let params = {
+                    name    :   name,
+                    mobile  :   phone,
+                    price   :   price
+                }
+				customTypeStore(pickerArr[pickerIndex].id,params).then(res => {
+					let { order_type, order_id, order_no } = res;
+					this.$Router.replace({
+						name	: 'Pay',
+						params	: {
+							paytype		: 'synthesize',
+							orderId		: order_id,
+							orderType	: order_type.replace(/\\/g, '-')
+						},
+					})
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none',
+                        mask:true,
+                        duration:3000
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.from-content{
+		min-height: 100vh;
+		padding: 30rpx;
+		background: #f7f8f9;
+	}
+	.from-block{
+		background: white;
+		border-radius: 20rpx;
+		margin-bottom: 30rpx;
+		padding: 0 30rpx;
+	}
+	.from-block-item{
+		min-height: 70rpx;
+		display: flex;
+		font-size: 32rpx;
+		border-bottom: solid 1rpx #f3f3f3; 
+		padding: 15rpx 0;
+		&:last-child{ border: none; }
+		label{ width: 200rpx; line-height: 70rpx; }
+		.from-block-val{ width: calc(100% - 200rpx); text-align: right; line-height: 70rpx;
+			&.price{ color: $main-color; font-weight: bold; }
+		}
+		.from-block-input{ height: 70rpx; font-size: 32rpx; }
+		.from-block-picker{ padding-right: 50rpx; position: relative; }
+		.from-block-picker-icon{ position: absolute; right: 0; top: 50%; margin-top: -15rpx; }
+	}
+	.from-btn{ width: 100%; background-color: $main-color; color: white; line-height: 95rpx; height: 95rpx; border-radius: 45rpx; font-size: 32rpx; font-weight: bold;
+		&::after{ display: none; }
+	}
+</style>
diff --git a/pages/work/account2.vue b/pages/work/account2.vue
new file mode 100644
index 0000000..ed316c8
--- /dev/null
+++ b/pages/work/account2.vue
@@ -0,0 +1,320 @@
+<template>
+	<view class="content">
+		<!-- tabs -->
+		<u-sticky bgColor="#FFF" zIndex="9" >
+			<u-tabs
+				:current="tabsCurrent"
+				:list="tabs"
+				keyName="value"
+				lineColor="#446EFE"
+				:scrollable="tabs.length > 5"
+				:activeStyle="{
+					color: '#111',
+					fontWeight: 'bold',
+					fontSize: '32rpx'
+				}"
+				:inactiveStyle="{
+					color: '#606266',
+					fontSize: '30rpx'
+				}"
+				@click="onTabs"
+			></u-tabs>
+		</u-sticky>
+		<!-- 订单列表 -->
+		<view class="orders" v-if="orders.length > 0">
+			<view class="orders-item" v-for="(item, index) in orders" :key="index">
+				<view class="orders-flex">
+					<view class="no nowrap" @click="copyNo(item.order_no)">
+						{{item.order_no}}
+					</view>
+					<view class="state">{{item.status.text}}</view>
+				</view>
+				<view class="orders-content">
+					<view class="orders-content-item">
+						<label>业务名称</label>
+						<view class="nowrap">{{item.item.title}}</view>
+					</view>
+					<view class="orders-content-item">
+						<label>客户姓名</label>
+						<view class="nowrap">{{item.name}}</view>
+					</view>
+					<view class="orders-content-item">
+						<label>手机号码</label>
+						<view class="nowrap">{{item.mobile}}</view>
+					</view>
+					<view class="orders-content-item">
+						<label>创建时间</label>
+						<view class="nowrap">{{item.created_at}}</view>
+					</view>
+					<view class="orders-content-item" v-if="item.paid_at != ''">
+						<label>支付时间</label>
+						<view class="nowrap">{{item.paid_at}}</view>
+					</view>
+				</view>
+				<view class="orders-flex">
+					<view class="price">￥{{item.price}}</view>
+					<view class="btns">
+						<view class="btns-item border" v-if="item.can.cancel" @click="onCancel(item)">取消订单</view>
+						<view class="btns-item" v-if="item.can.pay" @click="onPay(item)">立即支付</view>
+					</view>
+				</view>
+			</view>
+			<!-- 分页 -->
+			<u-loadmore v-if="pagesShow" :status="status" />
+		</view>
+		<!-- 订单是空的 -->
+		<view class="order-null" v-else>
+			<u-empty
+				mode="order"
+				icon="http://cdn.uviewui.com/uview/empty/order.png"
+				text="暂无相关订单"
+			>
+			</u-empty>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { customTypelists, customTypeCancel } from '@/apis/interfaces/custom.js'
+	export default {
+		data() {
+			return {
+				tabs		: [{ id: '', value: '全部' }],
+				tabsCurrent	: 0,
+				tabsId		: '',
+				orders		: [],
+				pagesShow	: false,
+				page		: {
+					current	: 1,
+					has_more: false,
+				},
+				status		: ''
+			};
+		},
+		onShow() {
+			this.getOrder()
+		},
+		methods: {
+			// 筛选分类
+			onTabs(e){
+				let { id, index } = e;
+				this.tabsCurrent = index
+				this.tabsId		 = id
+				this.page		 = { current: 1, has_more: false }
+				this.getOrder()
+			},
+			// 获取订单列表
+			getOrder(){
+				let { tabsId, tabs, orders, page } = this
+				customTypelists({
+					manager: 1,
+					status : tabsId,
+					page   : page.current
+				}).then(res => {
+                    console.log(res)
+					let { status, lists } = res;
+					this.tabs   	= [{ id: '', value: '全部' }].concat(status)
+					this.orders 	= lists.page.current == 1 ? lists.data : this.orders.concat(lists.data)
+					this.page		= lists.page
+					this.pagesShow 	= false
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			},
+			// 取消订单
+			onCancel(e){
+				let { order_id } = e;
+				uni.showModal({
+					title		: "提示",
+					content		: "确认取消当前订单嘛？",
+					cancelText	: "取消",
+					confirmColor: "#446EFE",
+					success 	: modalRes => {
+						if(modalRes.confirm){
+							uni.showLoading({
+								title: "加载中...",
+								mask : true
+							})
+							customTypeCancel(order_id).then(res => {
+								uni.showToast({
+									title: '订单已取消',
+									icon : 'none'
+								})
+								this.page = { current: 1, has_more: false }
+								this.getOrder()
+							}).catch(err => {
+								console.log(err)
+								uni.showToast({
+									title: err.message,
+									icon : 'none'
+								})
+							})
+						}
+					}
+				})
+			},
+			// 复制订单号码
+			copyNo(no){
+				uni.setClipboardData({
+					data	: no,
+					success	: res => {
+						uni.showToast({
+							title: '订单号已复制',
+							icon : 'none'
+						})
+					}
+				})
+			},
+			// 去支付
+			onPay(obj){
+				let { order_id, order_type, paid_at } = obj
+				if(paid_at == ''){
+					this.$Router.push({
+						name	: 'Pay',
+						params	: {
+							paytype		: 'synthesize',
+							orderId		: order_id,
+							orderType	: order_type.replace(/\\/g, '-')
+						},
+					})
+				}
+			}
+		},
+		onReachBottom() {
+			this.pagesShow = true;
+			if(this.page.has_more){
+				this.status    = 'loading';
+				this.page.current++
+				this.getOrder()
+				return
+			}
+			this.status    = 'nomore';
+		}
+	}
+</script>
+
+<style lang="scss">
+	// 订单列表
+	.orders{
+		padding: 30rpx 0 10rpx;
+		.orders-item{
+			margin: 0 30rpx 20rpx;
+			background-color: white;
+			border-radius: $radius;
+		}
+		.orders-content{
+			padding: 20rpx 30rpx;
+			&-item{
+				line-height: 70rpx;
+				display: flex;
+				justify-content: space-between;
+				font-size: 30rpx;
+				color: #111111;
+				label{
+					color: #999999;
+				}
+				.orders-content-btn{
+					color: $main-color;
+				}
+				&.orders-content-bottom{
+					padding-right: 40rpx;
+					position: relative;
+					.orders-content-icon{
+						position: absolute;
+						right: 0;
+						top: 0;
+					}
+				}
+			}
+			&-type{
+				text{
+					margin-right: 30rpx;
+					position: relative;
+					display: inline-block;
+					&::after{
+						position: absolute;
+						content: "/";
+						width: 30rpx;
+						text-align: center;
+						font-size: 30rpx;
+						top: 0;
+						right: -30rpx;
+					}
+					&:last-child{
+						margin-right: 0;
+						&::after{
+							display: none;
+						}
+					}
+				}
+			}
+			&-block{
+				background: rgba(68, 110, 254, .03);
+				padding: 20rpx;
+				font-size: 28rpx;
+				border-radius: 10rpx;
+				margin: 10rpx 0;
+				.item-flex{
+					display: flex;
+					justify-content: space-between;
+					line-height: 50rpx;
+				}
+			}
+		}
+		.orders-flex{
+			border-bottom: solid 1rpx #F6F6F6;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 20rpx $padding;
+			&:last-child{
+				border-top: solid 1rpx #F6F6F6;
+				border-bottom: none;
+			}
+			.no{
+				font-size: 30rpx;
+				color: #111;
+				line-height: 60rpx;
+				width: calc(100% - 150rpx);
+			}
+			.state{
+				color: $main-color;
+				font-weight: bold;
+				font-size: 30rpx;
+				line-height: 60rpx;
+				width: 150rpx;
+				text-align: right;
+			}
+			.price{
+				font-weight: bold;
+				color: $main-color;
+			}
+			.btns{
+				width: 400rpx;
+				text-align: right;
+				.btns-item{
+					display: inline-block;
+					height: 70rpx;
+					line-height: 70rpx;
+					background: $main-color;
+					color: white;
+					border-radius: 35rpx;
+					padding: 0 30rpx;
+					font-size: 30rpx;
+					&.border{
+						border: solid 1rpx $main-color;
+						color: $main-color;
+						background: white;
+						height: 68rpx;
+						line-height: 68rpx;
+						&::after{ display: none;}
+					}
+					&:last-child{ margin-left: 30rpx; }
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/work/index.vue b/pages/work/index.vue
index c2b929c..a9f323d 100644
--- a/pages/work/index.vue
+++ b/pages/work/index.vue
@@ -64,7 +64,6 @@
 				</u-popup>
 			</block>
 			<!-- 管理中台 -->
-			<!-- <block v-else> -->
 				<view class="flex">
 					<view class="flex-item" @click="onNav('ConsultWork')">
 						<image class="flex-icon" src="/static/icons/icon_00.png" mode="aspectFill"></image>
@@ -116,15 +115,22 @@
 						</view>
 						<view class="flex-btn">去查看</view>
 					</view>
+                    <view class="flex-item" @click="onNav('AccountWork2')">
+                    	<image class="flex-icon" src="/static/icons/icon_04.png" mode="aspectFill"></image>
+                    	<view class="flex-title">
+                    		<view class="flex-name">线下订单</view>
+                    		<view class="flex-tips">线下咨询类订单</view>
+                    	</view>
+                    	<view class="flex-btn">去查看</view>
+                    </view>
 				</view>
-			<!-- </block> -->
 		</view>
 		<!-- 未登录 -->
 		<view v-else class="auth-null">
 			<u-empty
-			        mode="permission"
-			        icon="https://douhuo-storage.oss-cn-beijing.aliyuncs.com/images/2023/06/06/c95ebcf8641fcbd413f990d661f638cb.gif"
-					text="暂未登录"
+                mode="permission"
+                icon="https://douhuo-storage.oss-cn-beijing.aliyuncs.com/images/2023/06/06/c95ebcf8641fcbd413f990d661f638cb.gif"
+                text="暂未登录"
 			/>
 			<button class="auth-null-btn" size="mini" @click="onNav('Auth')">登录</button>
 		</view>
@@ -255,7 +261,7 @@
 					success : res => {
 						switch (res.tapIndex){
 							case 0:
-								this.onNav('OfflineCreate')
+								this.onNav('MagAccount2')
 								break;
 							case 1:
 								this.onNav('OrderCreate', { type: 'self' })
diff --git a/static/.DS_Store b/static/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..fbdad5f073522fbdff5687dd003470386493950e
GIT binary patch
literal 6148
zcmeHK%}T>S5Z<+|-BN@c6nYGJEm*bw;U&cS0!H+pQWH}&7_+5G&7l->))(?gd>&_Z
zH_&46C}L+|_nV!c-OLBsAI2DWr{OMR7Gq36L*%Gb2%0NhYbF?xt2xpjPsc$lgNkYX
zrU}2j!6Np+Bum)h_kRTAI7+i#?~||9>W%fLXo|MD^PXhxWqvkIU4L?eqf05{pw#`~
zDjMZOYx7JdnI9#iiAspV5ro`cM@cAiS5A{KRk@yah?Zy#t<G$AaCF?Y`}_TQ*Pfm1
z^-w>Y&s$<^d*}3G_#D3^@=X)TfpH}p21|GcWuc;1Z<53^c?4^jQAQFH1H=F^Kn$!V
z1Liys?bR%wswM`Afgc#a{lSKY=ol<Cs;vV$ygsA9j)(#}z9kTCgO0&MBX~f#P6gDd
z+&nS3P6xYf;v9p8MxD;MS{ddsE0>QKu2u)Tt-=|1G*V9t5Ch8$)b!B8^Zy)vnaW50
zate)z0b<~vF~I8sZ{R{v=4|~|9-g%}w0meM7+0VI0{YS=00y{^bd*#3ZPX#oF<5BC
US<tT10qG*32%(M`_yq>O0Kk??`Tzg`

literal 0
HcmV?d00001

diff --git a/static/icons/icon_04.png b/static/icons/icon_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a2ca1628f41d88c2671e5b5dc48e7e1dbd8e240
GIT binary patch
literal 5930
zcmc&&2{@GN+n;GfWsS;KjFFU#*;iYPZHR>I;+>gy7%?-=45p+;r9D}alu8TIqUE$x
zMw>WUBPB{wN{JSZRQ%tebh`fMe4Xq1&h>roHOn*4z2EomzMtos&E8(F>QfA+z+f<S
zrkj%w^c|siPf~_HJ9Z~fp|8n8w;(YLrmCZO!(n@J^`ON@o?oCO&~qW3Er_)OI06=E
zC5;tA+%TApy;KOWmw^%_3ykFPZBe}?Whf+%V~YwPd15_<3^0o4wo(N8uJrO_uUy8a
zaZvVlNE;~~QV<JD0HicFhA*Z|ZBe6o>CjrSjX@ztStQGBQ4R`&$UskTBtswqkz^|@
znvKO0kQAB~j!Y!sDV9h)7LUc?pce^^qtJ;|IsuRT_MjkZA`X}C<K*(q7WB&&6(x}f
z=@?8xLV{HS!Ac;C#NcQ&8U~BU;PGgP11(;`mjF^UUu^nagA*ubi+Dl_PryeiGy*I^
zoWvFdc{&zCtkBbQTrpq#Em2U)Fj7E>!C7H3v9XG{M!CfjAMl48f5|QOTOkB7KA>0-
zCt`yTyXg;M=Xl8Sw;29`uyZ`fmyC-;ssEpazuV!k$N7YDqL|S%ao89z28@ODiJ_Qq
z;{gey1QLNbO7J(T$H}9K_-;VL<Ni$&6qKJ>K`HNVSQV6UR;UK_MIs&qMIgpWz>ZTm
z%5<_tK`~o#cpN&LLdDSl78OmTaPVj%6$heOL@IzLvI#UijZ7nxSp<c53O#?8A44Zc
zz=m{;$3o}g@DwtO3!*6$ECJ0X5D91+9w4HrR1yo1ClK)@Ea$s6CSNQ8_-ydIH#|ra
z0i@t?0GWcukpT*t2(n3N8i7DYv#4Yu2(s`13*?T<(-|TVkO)M60zu68j`04TaU_EQ
zbpVcnoa+g&d3;3~=KV<ubOI!xEeh%p0vd-$V<~<(GM#{<lkoGgR5}(r#_B2H@VF~}
zX2p^Ga3nejM<<ehVuc!%14w{hGIQ8;u0RwEKv?C)0+Ap_$d5!Jf25Bgh!Kb&!;p7S
z(tqqT84PccfXj=42x1>sM<mmkLB>I~LF27(D5L@#iXua$1r*(Ai~7D9sOXlMxUo$N
z9t%CtSb&~yLP5Wv{~#~n^B}MBD5L^i^ifBBp+N^Z1lbzh^X5sxm_R2UgfQ`_6EyOl
zDM3F|6f<uORG^3#4{}^Yf>`9}5TNt^0vIeZ4$GloX=pNuLqHQr3Sdx4IH-Oc0EcDK
z*c<|su`ziFl;be}8<=uI4vtIYpow?@k0wC4M6(otWwA*tA`x1Wh>-7N+64dG=E01I
z>c$g8kX`X@0Q-W=zpY|;kS%C}(E;{YrNjV~5rqSa&A&<qg~TEQBqAG)XG6_G;}B_R
z0EZjx69B+b2^6-XPsZdEqCf}{Kck%p9SW515FTR_3%HU5Km<BOLNNO8mcrw$NXWSX
zJU&N|AcneWOo$x?@FPL!aKoS!VJc36{|bgJ;Kzd^$&Y}9fCzxjG*BeAMR65nAMXXE
zM1TZ@!WbTV6vvo&KIhx1G2RP*Z-+Amr0=f%*~+*J$bZq^FN;KD19*@{fJPtyf@ls4
zDiW0pouq66l?@QMTpUQDe)snOyGXwb=ASm80<k{_^A|(&pCS(T^927lG4~6YDUdi0
z%YOrN|Bk(1mg%1zpks;rKP?kRF&oB49%gLt|ColOv_IV@p-D2j1zk}U%kjH0^ke*X
z4f3I>BZBVE4~l0cKv!}m)5*b4n%lE4QRvsCFJHrSLuw*BCn`Da(sClQ(k5+TxaQkL
z#|0lxdEkEQ7{TlOJ$mrTeY}yVeW~%cI|6$as#Ia0Z96z}jvBo}-L8PdcAY&f&2_R_
zh7->*!>qS@kLSqX`v=vJlUl_!S4(Dp;l6$IVRe^v*CX3Ma(h45T%N~ZFhb3iADI)J
zTv@X--Q4&KCOz64W~s6Z)~sP)gLt28iF9537FMS&-Dn&lBgkJpt)RDOY<L{pYG-{1
zW|cYd#KgBsZ(+OO^E7s5!aLQCO;_2z{G=sRlNw7ksY)N|d9F@AF2!)GF9@IHIJtkj
z5%SSH?VfvxQuQ|zG$z2!RZEgCSU1aNwin825ysx0BC_44rA?dmcWGT+Qc`wF*Z|9s
z*UCP~$?|6rL0;_+AMG@4wl-E!z4Y@8F4uk4xGY~<ISqy}=`SLqThGDWldmpNKP^A~
z#_2a$QM28V{VrIZOeKBlEthrp%ye}(TVtZh-SzMS_!{NMFs@!&f*BT3)a!L*xay@r
z-Xwkd5pUm`tg0JsU$^>Ae5n^<;;q_x%!G{+&Tr6AUE<|WlKZqDkfUyWFgMtmHV_#7
zhtqV#PK1h#l_ECB-*PM2`G{6o44;w?yjZoj%X7vH(;i>F-pTQ5X~~1km>{XPPwKgQ
zjnZo|6|gl*{zXy5$w3oKjcRqDk>u;-rd8bwy^Ks!D}!y6=bCvfTWYqgdGpf?n;>4+
z`@2F<0)khz=_Y;wspIpdEp$Vf3Mxsj8Wyz4aKK`ybkn&=y?V92**dlPxpQYAd-Pq7
z>=tThPsVF6)StQb@GN12s_y6Zv&LUiT|%0ei&Ao4Va;`l_fF1Qk;a`9mZ!e?Y}}60
zsp$C~fEsD|jK*LhL87)h?S;)SEcAWl^6RQ9W$Q~`l%EZ1IrJet{wt$zum6b5FVD!i
z_wl4;6Y24(c3y$^w+Hd($pl#ojy*0r2w&bh5h?P&NhcZ_x1TK7d~XmLx8gW6WSdH$
z@s|x*@C)6$MCTB8{HCmoRjXPp;_h*l^=*Bpe8(}PVCOrP_OP$v?hWtxnFFv6{@VA4
zZW~6}?qT{?l-9j!PETu<4CSX9a7^25wD_=|Z5wJ!uV`l+&>3p0i?ZH9k?*^bu{X>!
z)>AF~BX6r-Y*z$g8hmS<*`m(3kxGcT(7VDp&Zpu0h8bJ8jhNFnbYGg_7<oO*<tF`R
zBQelUm0z{)I*;vIFKj<`OXcKOc13#p(bupi5v=~y>)YjzBM`I0P9#*S9j)3}6(kH<
zEIF_(a*A~AZGk3Q+qlscjgPl)RgR?ZYksKwTx&?PZvWRkhaxQe5<A_R-DY`sB%i9@
zb;DTJrY;J7pHuIfiJwGT;M4iZFR>lILu%@ov42WPRYY6pQJxlK_U_AC(X!G>;gXb3
zL4BbUPuxwokW0(yYxH^5u#^t>+-ykha(FrSPWp7@yVF;+;)~<2y;~QQg8_?Ety8L~
zL6GpP&2=o_c`?T`keeReU6_5Aq94Ksw$60xbL@!|KYjIDyC}KuW85JRl-q9jj71xD
zEp(Qwq+<NGc=0o}5S@!svX5&o7D<*CYqzz|HktqYz$w{71J%U%Mh07xI8bG}fJxrT
zseE>Li*MD#drlW4?UpoGTNNATwIG&F)BQ;7zy7=V!TYF|ft-Z9(}!~chWbD4%AwW=
z`Oc<aAuSS~SGCw}k!d+SzVSwqaWG|A8XfYy#JanwYNg!t%9Z5f%0~x|Rtrb!Cp@Zc
zu@`&}qBUEI@y-DhVKvNydvr;6hUQY6gG=9THE&#H-(*z(kQYjjqf??&&r@n&(`v0g
zIc*4Q@O6$XTwV=ZvSok4Z(-^7i7~jw6Unw0e}C!h>_YU5yRdHl;XEF%qdDMd;Ck3#
z3+>>IYC-m$Q*GVBQ<*N7$KE^tv07yvz4!})UlZW*%KD!E<@ff%+QW|zKR+!;6&0-U
zM(btnL0z%lJYV^eNkC6&RP#2s`ZI3vRzA6dMcqc2@+A_>HJ825yszi}ZX6tQCjQ7Q
zyWYub%22vo@aU_&V~M3o;fO0~)1sdp^+zR6i5ZZG8(g=46hGxk+1l;5($Xz5Pq`i5
z*KcsfPDQ;=oymu#y&Fu%oM_gKu{TUyOHMRs&B|4NnNnxvw*2&ry{PTHq~&u~g`0*&
z{H9W{Oes+!+2LTl-T=wdsk*qceEXF7e*T@W^=knu$D{CRFSfp`XCc)&9ywpdMn2R?
zn>msla@r)4>`*V3eDdoM{{FObTk=5E!#BxGl>IN~)Y(qxhcI>6D~oeXJERIpNqx#;
zl4D4HuT@;tg=&uK!kg>;j_aQ)a^K0l@vQmg@MHG#w8)noy!?_Ej#sB@Fpk25v32Uz
zr}dW4<TYo}Z(lV#O>;M>)bWT|S3c8zep}(|#JU<(&#V_)q>BPXXPo8v#SCrG^Ic~C
z{nznjAye$Jjs3Ehp^;DT>@C#lo>?*4>`TKcr(b^B`$^f%<KZ;kyuQ}{gS{s$WRYrJ
zdP$9}eUDcs6<>InWV-0KVLS3{N(ugVZqTAtYL>lf2UpR*47seZGuK&t{_crYr|;9u
z!(zR(oirP27F>d_lqE=x6c%2mbfuK7xm5jSSj%vWnMU6u_YV$|H47w0wQV0h`n*UV
znDsS1WOGZtnNi?=mH8Fh%WEZjnEliw{Q+X?)z#Nf=R6+VoBO05OkhaW05G}HGc&9l
zbE3FQCCygdhMwOVGJ(P9W7eIDN?6w!aqPwL$RQ1lu$^5M))8^_yUT_z=|+dN@8hnx
zTI6Tj`;iqsxa0YYRYjR|4w&{>Z^?pBkoP7B#JRhBCV%z-o=P5~^B-YMZtPL6ti9-w
zZM<jQu8r63+1!8N|I)Icn5XBVbcdPU=HtJ6v!;OE8oT&Vk8Y#P<d1Xqu#vZEJ>gaZ
z<pPT)MpB}I*`3ENn&AVLa4f|)^*Zk~R^@F#Yjk%edGPt-Puc#RRTBe#t2HhcmE}cI
z-mRFi@q*>=3p1NiH&}4h)-0H_G^s}E=>f*uxp?;zdk0IELxql+*Bq!>q4Q_J>nji5
zE|ZO(RCTIfTBpXz;t#C6ma3E6qrGot#|l*I0ZV^#Z^Ro)aSgWms<1(xwm3U8dsf@C
z4p<-eh~~3bDaI-@Ut@!Z!0VZtruSTPm{)R(mMu1KSUq)f1x(%PfvA33TX=b4Pu+`-
z3EkuaJ0E_{I(*B9xy_AT`Yer-X4p@?y<ou{-~O<gf(Zkf?)nv1eG1mSacV(Z#M?Yt
z1e;DRO-b@SC7Jx;w@&P|FG%d{vwK(05=dohOnRp4SS$CLe6DQj=(}x%fDZ~N=Z0n<
zj`iQL9@W#rn$)M^=C!y&cDEob&xluesn{}}ZGBQsk!hxV{z`Yx4o_9J)kfT@PP^5l
z&%=`92Hi4yhm^~8)7TN-@m>8IyVaF$IS?A`mKP2lRch`|_v{)#481L)>d(wjE!?Xc
zy_blx&VMxJ^)Wia3w{x9KE3upRIXFYvz=`^aizHJa)Zu2*qkEgmV>zax+m-6Hl8=N
zh6NAN=D<&x^as>@#y;Kg5pJ)14Ix#(Q=;8B;SZDk`&TS-B$Gze9}d>yo-EEdZ5*ia
zrD;9(p3$e;^e~`oBcu3@k_cYZ>~hnVtyJiUBFWFYX?3_ixjC%ev8!xGQTF28ZOnd?
zsd@PJd1}Map@-o0C2E`1x&?tT$%YQ)R_)U}Yo;0|w?)laLvzzS^u)#KNq|uJT<cOv
zm?!MAtjCpnBE))CE4)>f6tH9R2H7+DXZgXWH=2^B>6`_0d@3())J%I+W~EZ>Fw|nU
z>C`;qhl22~{mQmCTn#&p(-67J!-&T8_WYp3K~n>mY9lJcr@D8&3Rz;V_&1yB?B!JK
H7_s(0Xk9-C

literal 0
HcmV?d00001


From 9f1ff579ce21d79a467869a2378d5b632ffcd682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?=
 <tmoct5@noreply.git.yuzhankeji.cn>
Date: Tue, 2 Jan 2024 13:51:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=20'static/.DS=5FStore'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/.DS_Store | Bin 6148 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 static/.DS_Store

diff --git a/static/.DS_Store b/static/.DS_Store
deleted file mode 100644
index fbdad5f073522fbdff5687dd003470386493950e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%}T>S5Z<+|-BN@c6nYGJEm*bw;U&cS0!H+pQWH}&7_+5G&7l->))(?gd>&_Z
zH_&46C}L+|_nV!c-OLBsAI2DWr{OMR7Gq36L*%Gb2%0NhYbF?xt2xpjPsc$lgNkYX
zrU}2j!6Np+Bum)h_kRTAI7+i#?~||9>W%fLXo|MD^PXhxWqvkIU4L?eqf05{pw#`~
zDjMZOYx7JdnI9#iiAspV5ro`cM@cAiS5A{KRk@yah?Zy#t<G$AaCF?Y`}_TQ*Pfm1
z^-w>Y&s$<^d*}3G_#D3^@=X)TfpH}p21|GcWuc;1Z<53^c?4^jQAQFH1H=F^Kn$!V
z1Liys?bR%wswM`Afgc#a{lSKY=ol<Cs;vV$ygsA9j)(#}z9kTCgO0&MBX~f#P6gDd
z+&nS3P6xYf;v9p8MxD;MS{ddsE0>QKu2u)Tt-=|1G*V9t5Ch8$)b!B8^Zy)vnaW50
zate)z0b<~vF~I8sZ{R{v=4|~|9-g%}w0meM7+0VI0{YS=00y{^bd*#3ZPX#oF<5BC
US<tT10qG*32%(M`_yq>O0Kk??`Tzg`