XXX

.hbuilderx/launch.json

@@ -0,0 +1,16 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
+    ]
+}

App.vue

@@ -28,4 +28,15 @@
 		align-items: center;
 		justify-content: space-between;
 	}
+	
+	.noOrder{
+		width: 100vw;
+		height: 30vh;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		font-size: 40rpx;
+		color: #999999;
+	}
 </style>

pages.json

@@ -22,7 +22,7 @@
 			"path": "pages/refund/refund",
 			"style": {
 				"navigationBarTitleText": "待处理退款",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
 		}, {

pages/order/info.vue

@@ -135,15 +135,15 @@
 					订单编号
 				</view>
 				<view class="text">
-					111
+					{{info.no}}
 				</view>
 			</view>
 			<view class="row">
 				<view class="name">
 					下单时间
 				</view>
-				<view class="text">
-					111
+				<view class="text">
+					{{info.created_at?$u.timeFormat(info.created_at, 'yyyy年mm月dd日 hh时MM分'):"-"}}
 				</view>
 			</view>
 			<view class="row">
@@ -151,7 +151,7 @@
 					支付方式
 				</view>
 				<view class="text">
-					111
+					{{info.pay_type === 1?"余额":"微信"}}
 				</view>
 			</view>
 			<view class="row">
@@ -159,7 +159,7 @@
 					支付时间
 				</view>
 				<view class="text">
-					111
+					{{info.pay_time?$u.timeFormat(info.pay_time, 'yyyy年mm月dd日 hh时MM分'):'-'}}
 				</view>
 			</view>
 		</view>
@@ -191,7 +191,7 @@
 					取宠代理
 				</view>
 				<view class="text">
-					111
+					{{info.from_addr.name}}
 				</view>
 			</view>
 			<view class="row">
@@ -199,7 +199,7 @@
 					联系电话
 				</view>
 				<view class="text">
-					111
+					{{info.from_addr.mobile}}
 				</view>
 			</view>
 			<view class="row">
@@ -207,7 +207,7 @@
 					派送代理
 				</view>
 				<view class="text">
-					111
+					{{info.to_addr.name}}
 				</view>
 			</view>
 			<view class="row">
@@ -215,20 +215,20 @@
 					联系方式
 				</view>
 				<view class="text">
-					111
+					{{info.to_addr.mobile}}
 				</view>
 			</view>
 			<view class="row">
 				<view class="name">
 					完成时间
 				</view>
-				<view class="text">
-					111
+				<view class="text">
+					{{info.completed_at?$u.timeFormat(info.completed_at, 'yyyy年mm月dd日 hh时MM分'):'-'}}
 				</view>
 			</view>
 		</view>
 
-		<view class="card">
+		<view class="card" v-if="info.status > 50">
 			<view class="title">
 				结算信息
 			</view>
@@ -238,7 +238,7 @@
 						取件费
 					</view>
 					<view class="text red">
-						111
+						{{info.current_sender_order.fee_1}}
 					</view>
 				</view>
 				<view class="row half">
@@ -246,7 +246,7 @@
 						派送费
 					</view>
 					<view class="text red">
-						111
+						{{info.current_sender_order.fee_3}}
 					</view>
 				</view>
 			</view>
@@ -256,7 +256,7 @@
 						运输费
 					</view>
 					<view class="text red">
-						111
+						{{info.current_sender_order.fee_2}}
 					</view>
 				</view>
 				<view class="row half">
@@ -264,7 +264,7 @@
 						寄养费
 					</view>
 					<view class="text red">
-						111
+						{{info.current_sender_order.fee_5}}
 					</view>
 				</view>
 			</view>
@@ -274,7 +274,7 @@
 						宠具费
 					</view>
 					<view class="text red">
-						111
+						{{info.current_sender_order.fee_4}}
 					</view>
 				</view>
 				<view class="row half">
@@ -282,7 +282,7 @@
 						其他
 					</view>
 					<view class="text red">
-						111
+						{{info.current_sender_order.fee_6}}
 					</view>
 				</view>
 			</view>
@@ -292,23 +292,23 @@
 						总计
 					</view>
 					<view class="text red">
-						111
+						{{info.current_sender_order.real_amount}}
 					</view>
 				</view>
 			</view>
 		</view>
 
-		<view class="card">
+		<view class="card" v-if="info.status === 70">
 			<view class="title">
 				退款信息
 			</view>
 			<view class="row">
 				<view class="row">
 					<view class="name">
-						退款原因
+						退款金额
 					</view>
-					<view class="text red">
-						111
+					<view class="text red">
+						{{info.refund_amount||''}}
 					</view>
 				</view>
 			</view>
@@ -317,8 +317,8 @@
 					<view class="name">
 						退款时间
 					</view>
-					<view class="text red">
-						111
+					<view class="text red">
+						{{info.refund_at?$u.timeFormat(info.refund_at, 'yyyy年mm月dd日 hh时MM分'):'-'}}
 					</view>
 				</view>
 			</view>
@@ -328,7 +328,7 @@
 						退款原因
 					</view>
 					<view class="text red">
-						111
+						{{info.refund_reason||''}}
 					</view>
 				</view>
 			</view>
@@ -340,7 +340,7 @@
 				</view>
 			</view>
 			<view class="image">
-				<image src="" class="image-dom"></image>
+				<image src="" class="image-dom" v-for="(item,index) in info.refund_images"></image>
 			</view>
 		</view>
 
@@ -356,7 +356,7 @@
 		</view>
 
 		<view class="bottom-btn">
-			<view class="buttom-dom" @click="create">
+			<view class="buttom-dom" @click="create" v-if="info.status === 1">
 				立即接单
 			</view>
 			<view class="buttom-dom" @click="video">
@@ -374,10 +374,21 @@
 			}
 		},
 		onLoad(e) {
-			let info = JSON.parse(e.info)
-			this.info = info;
+			// let info = JSON.parse(decodeURIComponent(e.info))
+			let id = e.id
+			// this.info = info;
+			this.getData(id);
 		},
-		methods: {
+		methods: {
+			// 获取订单信息
+			getData(id){
+				this.request("/sender_order_controller/detail",{id:id},"GET").then(res=>{
+					console.log(res)
+					if(res.code ===1){
+						this.info = res.data
+					}
+				})
+			},
 			// 点击上传视频
 			video() {
 				uni.navigateTo({

pages/order/order.vue

@@ -144,7 +144,6 @@
 					limit: this.limit,
 					type: this.type
 				}, "GET").then(res => {
-					console.log(res)
 					if (res.code === 1) {
 						this.data = res.data
 					}
@@ -159,7 +158,7 @@
 			// 点击订单
 			info(info) {
 				uni.navigateTo({
-					url: "./info?info=" + JSON.stringify(info)
+					url: "./info?id=" + info.id
 				})
 			},
 			// 点击菜单

pages/refund/refund.vue

@@ -1,32 +1,73 @@
 <template>
-	<view class="content">
-		<view class="noOrder" v-if="dataList.length <1">
-			无
+	<view class="content">
+		<view class="noOrder" v-if="dataList.length <1">
+			暂无数据～～
 		</view>
-		<view class="card" v-for="(item,index) in dataList" :key="index">
-			
-			<!-- 2 -->
-			<view class="row" v-if="type === 2">
-				<view class="col-name">反馈者昵称</view>
-				<view class="col-money">{{item.user.nickname}}</view>
-			</view>
-			<view class="row" v-if="type === 2">
-				<view class="col-name">反馈者手机号</view>
-				<view class="col-money">{{item.user.mobile}}</view>
-			</view>
-			<view class="row" v-if="type === 2">
-				<view class="col-name">反馈时间</view>
-				<view class="col-money">{{item.created_at_text}}</view>
-			</view>
-			<view class="row" v-if="type === 2">
-				<view class="col-name">反馈内容</view>
-				<view class="col-money">{{item.body}}</view>
-			</view>
-			<view class="btn" v-if="type === 2">
-				<view class="btn-dom">
-					已处理
-				</view>
-			</view>
+		<view class="card" v-for="(item,index) in dataList" :key="index">
+			<!-- 1 -->
+			<view class="row" v-if="type === 1">
+				<view class="col-name">取宠代理</view>
+				<view class="col-money">{{item.senders[0].user.name}}</view>
+			</view>
+			<view class="row" v-if="type === 1">
+				<view class="col-name">派送代理</view>
+				<view class="col-money">{{item.senders[1].user.name}}</view>
+			</view>
+			<view class="row" v-if="type === 1">
+				<view class="col-name">结算金额</view>
+				<view class="col-money">{{item.settle_amount}}</view>
+			</view>
+			<view class="row" v-if="type === 1">
+				<view class="col-name">订单金额</view>
+				<view class="col-money">{{item.real_amount}}</view>
+			</view>
+			<view class="row" v-if="type === 1">
+				<view class="col-name">订单编号</view>
+				<view class="col-money">{{item.no}}</view>
+			</view>
+			<view class="row" v-if="type === 1">
+				<view class="col-name">提交时间</view>
+				<view class="col-money">
+					{{item.settle_submit_at?$u.timeFormat(item.settle_submit_at, 'yyyy年mm月dd日 hh时MM分'):"-"}}
+				</view>
+			</view>
+			<view class="btn" v-if="type === 1">
+				<view class="btn-dom" @click="settlement(item.id)">
+					结算
+				</view>
+			</view>
+			<!-- 2 -->
+			<view class="row" v-if="type === 2">
+				<view class="col-name">反馈者昵称</view>
+				<view class="col-money">{{item.user.nickname}}</view>
+			</view>
+			<view class="row" v-if="type === 2">
+				<view class="col-name">反馈者手机号</view>
+				<view class="col-money">{{item.user.mobile}}</view>
+			</view>
+			<view class="row" v-if="type === 2">
+				<view class="col-name">反馈时间</view>
+				<view class="col-money">{{item.created_at_text}}</view>
+			</view>
+			<view class="row" v-if="type === 2">
+				<view class="col-name">反馈内容</view>
+				<view class="col-money">{{item.body}}</view>
+			</view>
+			<view class="btn" v-if="type === 2">
+				<view class="btn-dom" @click="feedback(item.id)">
+					已处理
+				</view>
+			</view>
+
+			<!-- 处理弹窗 -->
+			<u-modal v-model="showfeedback" cancel-text="取消" confirm-text="确定" show-cancel-button="true"
+				@cancel="feedbackcancel" @confirm="feedbackconfirm">
+				<view class="feedbackconent">
+					<u-input v-model="feedbackconent" type="textarea" placeholder-style="font-size: 10px;"
+						placeholder="请输入您的反馈" />
+				</view>
+			</u-modal>
+
 			<!-- 3 -->
 			<view class="row" v-if="type === 3">
 				<view class="col-name">退款账号</view>
@@ -57,44 +98,44 @@
 			</view>
 			<view class="btn" v-if="type === 3">
 
-			</view>
-			<!-- 4 -->
-			<view class="row" v-if="type === 4">
-				<view class="col-name">退款账号</view>
-				<view class="col-money">{{item.user.username}}</view>
-			</view>
-			<view class="row" v-if="type === 4">
-				<view class="col-name">退款金额</view>
-				<view class="col-money">{{item.refund_amount}}</view>
-			</view>
-			<view class="row" v-if="type === 4">
-				<view class="col-name">订单金额</view>
-				<view class="col-money">{{item.real_amount}}</view>
-			</view>
-			<view class="row" v-if="type === 4">
-				<view class="col-name">订单编号</view>
-				<view class="col-money">{{item.no}}</view>
-			</view>
-			<view class="row" v-if="type === 4">
-				<view class="col-name">退款时间</view>
-				<view class="col-money">{{item.refund_apply_at}}</view>
-			</view>
-			<view class="row" v-if="type === 4">
-				<view class="col-name">退款原因</view>
-				<view class="col-money">{{item.refund_reason}}</view>
-			</view>
-			<view class="row" v-if="type === 4 && item.refund_status !== -1">
-				<view class="col-name">退款状态</view>
-				<view class="col-money yellow">
-					{{item.refund_status === 0?"审核中":""}}
-					{{item.refund_status === 1?"功过":""}}
-					{{item.refund_status === 2?"驳回":""}}
-				</view>
-			</view>
-			<view class="btn" v-if="type === 4">
-				<view class="btn-dom">
-					删除
-				</view>
+			</view>
+			<!-- 4 -->
+			<view class="row" v-if="type === 4">
+				<view class="col-name">退款账号</view>
+				<view class="col-money">{{item.user.username}}</view>
+			</view>
+			<view class="row" v-if="type === 4">
+				<view class="col-name">退款金额</view>
+				<view class="col-money">{{item.refund_amount}}</view>
+			</view>
+			<view class="row" v-if="type === 4">
+				<view class="col-name">订单金额</view>
+				<view class="col-money">{{item.real_amount}}</view>
+			</view>
+			<view class="row" v-if="type === 4">
+				<view class="col-name">订单编号</view>
+				<view class="col-money">{{item.no}}</view>
+			</view>
+			<view class="row" v-if="type === 4">
+				<view class="col-name">退款时间</view>
+				<view class="col-money">{{item.refund_apply_at}}</view>
+			</view>
+			<view class="row" v-if="type === 4">
+				<view class="col-name">退款原因</view>
+				<view class="col-money">{{item.refund_reason}}</view>
+			</view>
+			<view class="row" v-if="type === 4 && item.refund_status !== -1">
+				<view class="col-name">退款状态</view>
+				<view class="col-money yellow">
+					{{item.refund_status === 0?"审核中":""}}
+					{{item.refund_status === 1?"功过":""}}
+					{{item.refund_status === 2?"驳回":""}}
+				</view>
+			</view>
+			<view class="btn" v-if="type === 4">
+				<view class="btn-dom">
+					删除
+				</view>
 			</view>
 		</view>
 	</view>
@@ -108,9 +149,14 @@
 				// 页码
 				page: 1,
 				// 数量
-				limit: 10,
-				// 获取数据
-				dataList:[]
+				limit: 10,
+				// 获取数据
+				dataList: [],
+				// 处理反馈
+				showfeedback: false,
+				// 反馈内容
+				feedbackId: '',
+				feedbackconent: ''
 			}
 		},
 		onLoad(e) {
@@ -134,33 +180,96 @@
 				uni.setNavigationBarTitle({
 					title: "售后管理"
 				})
-			}
-			// 获取数据
+			}
+			// 获取数据
 			this.getData()
 		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			this.getData();
+		},
 		methods: {
+			// 确认反馈
+			feedbackconfirm(id) {
+				this.request('/admin_order/deal_feedback', {
+					id: this.feedbackId,
+					body: this.feedbackconent
+				}, "GET").then(res => {
+					if (res.code === 1) {
+						this.feedbackconent = "";
+						this.getData()
+					}
+				})
+			},
+			// 取消反馈
+			feedbackcancel() {
+				this.feedbackconent = '';
+			},
+			// 点击处理反馈
+			feedback(id) {
+				let _this = this;
+				this.showfeedback = true;
+				this.feedbackId = id;
+				console.log(id);
+			},
+			// 点击结算
+			settlement(id) {
+				let _this = this;
+				console.log(id);
+				uni.showModal({
+					title: '提示',
+					content: '是否结算此订单？',
+					cancelText: "驳回",
+					confirmText: "通过",
+					success: function(res) {
+						if (res.confirm) {
+							console.log('用户点击确定');
+							_this.request("/admin_order/deal_settle", {
+								id: id,
+								status: 1
+							}, "GET").then(res => {
+								console.log(res)
+								if (res.code === 1) {
+									_this.getData()
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+							_this.request("/admin_order/deal_settle", {
+								id: id,
+								status: 2
+							}, "GET").then(res => {
+								console.log(res)
+								if (res.code === 1) {
+									_this.getData()
+								}
+							})
+						}
+					}
+				});
+			},
 			// 获取数据
 			getData() {
 				let url = "";
 				if (this.type === 1) {
 					url = "/admin_order/wait_settle"
-				}
-				if (this.type === 2) {
-					url = "/admin_order/feedback"
-				}
-				if (this.type === 3) {
-					url = "/admin_order/refund"
-				}
-				if (this.type === 4) {
-					url = "/admin_order/service"
+				}
+				if (this.type === 2) {
+					url = "/admin_order/feedback"
+				}
+				if (this.type === 3) {
+					url = "/admin_order/refund"
+				}
+				if (this.type === 4) {
+					url = "/admin_order/service"
 				}
 				this.request(url, {
 					page: this.page,
 					limit: this.limit
 				}, "GET").then(res => {
-					console.log(res)
-					if(res.code === 1){
-						this.dataList = res.data.data;
+					uni.stopPullDownRefresh();
+					if (res.code === 1) {
+						this.dataList = res.data.data;
 					}
 				})
 			}
@@ -177,6 +286,14 @@
 		align-items: center;
 		justify-content: flex-start;
 
+		// 输入反馈
+		.feedbackconent {
+			border: 1px red solid;
+			height: 300rpx;
+			font-size: 20rpx;
+			padding: 30rpx;
+		}
+
 		.card {
 			width: 90%;
 			background-color: #FFFFFF;
@@ -197,10 +314,10 @@
 
 				.col-money {
 					width: 70%;
-				}
-				
-				.yellow{
-					color: #F6B301;
+				}
+
+				.yellow {
+					color: #F6B301;
 				}
 			}
 
@@ -217,18 +334,20 @@
 					margin-right: 20rpx;
 					flex-wrap: wrap;
 				}
-			}
-			.btn{
-				display: flex;
-				flex-direction: row;
-				align-items: center;
-				justify-content: flex-end;
-				.btn-dom{
-					background-color: #F6B301;
-					color: #FFFFFF;
-					padding: 10rpx 20rpx;
-					border-radius: 30rpx;
-				}
+			}
+
+			.btn {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-end;
+
+				.btn-dom {
+					background-color: #F6B301;
+					color: #FFFFFF;
+					padding: 10rpx 20rpx;
+					border-radius: 30rpx;
+				}
 			}
 		}
 	}

unpackage/dist/dev/mp-weixin/app.json

@@ -26,5 +26,6 @@
     "navigationBarBackgroundColor": "#F8F8F8",
     "backgroundColor": "#F8F8F8"
   },
-  "usingComponents": {}
+  "usingComponents": {},
+  "sitemapLocation": "sitemap.json"
 }

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -3225,4 +3225,14 @@ u-dropdown {
   align-items: center;
   justify-content: space-between;
 }
+.noOrder {
+  width: 100vw;
+  height: 30vh;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  font-size: 40rpx;
+  color: #999999;
+}
 

unpackage/dist/dev/mp-weixin/common/runtime.js

@@ -105,11 +105,11 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"components/u-header":1,"uview-ui/components/u-icon/u-icon":1,"uview-ui/components/u-select/u-select":1,"uview-ui/components/u-subsection/u-subsection":1,"uview-ui/components/u-tabs/u-tabs":1,"uview-ui/components/u-popup/u-popup":1,"uview-ui/components/u-picker/u-picker":1,"uview-ui/components/u-search/u-search":1,"uview-ui/components/u-checkbox-group/u-checkbox-group":1,"uview-ui/components/u-checkbox/u-checkbox":1,"uview-ui/components/u-upload/u-upload":1,"uview-ui/components/u-index-anchor/u-index-anchor":1,"uview-ui/components/u-index-list/u-index-list":1,"uview-ui/components/u-form-item/u-form-item":1,"uview-ui/components/u-input/u-input":1,"uview-ui/components/u-form/u-form":1,"uview-ui/components/u-badge/u-badge":1,"uview-ui/components/u-mask/u-mask":1,"uview-ui/components/u-line-progress/u-line-progress":1};
+/******/ 		var cssChunks = {"components/u-header":1,"uview-ui/components/u-input/u-input":1,"uview-ui/components/u-modal/u-modal":1,"uview-ui/components/u-icon/u-icon":1,"uview-ui/components/u-select/u-select":1,"uview-ui/components/u-subsection/u-subsection":1,"uview-ui/components/u-tabs/u-tabs":1,"uview-ui/components/u-popup/u-popup":1,"uview-ui/components/u-picker/u-picker":1,"uview-ui/components/u-search/u-search":1,"uview-ui/components/u-checkbox-group/u-checkbox-group":1,"uview-ui/components/u-checkbox/u-checkbox":1,"uview-ui/components/u-upload/u-upload":1,"uview-ui/components/u-index-anchor/u-index-anchor":1,"uview-ui/components/u-index-list/u-index-list":1,"uview-ui/components/u-form-item/u-form-item":1,"uview-ui/components/u-form/u-form":1,"uview-ui/components/u-loading/u-loading":1,"uview-ui/components/u-badge/u-badge":1,"uview-ui/components/u-mask/u-mask":1,"uview-ui/components/u-line-progress/u-line-progress":1};
 /******/ 		if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
 /******/ 		else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
 /******/ 			promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
-/******/ 				var href = "" + ({"components/u-header":"components/u-header","uview-ui/components/u-icon/u-icon":"uview-ui/components/u-icon/u-icon","uview-ui/components/u-select/u-select":"uview-ui/components/u-select/u-select","uview-ui/components/u-subsection/u-subsection":"uview-ui/components/u-subsection/u-subsection","uview-ui/components/u-tabs/u-tabs":"uview-ui/components/u-tabs/u-tabs","uview-ui/components/u-popup/u-popup":"uview-ui/components/u-popup/u-popup","uview-ui/components/u-picker/u-picker":"uview-ui/components/u-picker/u-picker","uview-ui/components/u-search/u-search":"uview-ui/components/u-search/u-search","uview-ui/components/u-checkbox-group/u-checkbox-group":"uview-ui/components/u-checkbox-group/u-checkbox-group","uview-ui/components/u-checkbox/u-checkbox":"uview-ui/components/u-checkbox/u-checkbox","uview-ui/components/u-upload/u-upload":"uview-ui/components/u-upload/u-upload","uview-ui/components/u-index-anchor/u-index-anchor":"uview-ui/components/u-index-anchor/u-index-anchor","uview-ui/components/u-index-list/u-index-list":"uview-ui/components/u-index-list/u-index-list","uview-ui/components/u-form-item/u-form-item":"uview-ui/components/u-form-item/u-form-item","uview-ui/components/u-input/u-input":"uview-ui/components/u-input/u-input","uview-ui/components/u-form/u-form":"uview-ui/components/u-form/u-form","uview-ui/components/u-badge/u-badge":"uview-ui/components/u-badge/u-badge","uview-ui/components/u-mask/u-mask":"uview-ui/components/u-mask/u-mask","uview-ui/components/u-line-progress/u-line-progress":"uview-ui/components/u-line-progress/u-line-progress"}[chunkId]||chunkId) + ".wxss";
+/******/ 				var href = "" + ({"components/u-header":"components/u-header","uview-ui/components/u-input/u-input":"uview-ui/components/u-input/u-input","uview-ui/components/u-modal/u-modal":"uview-ui/components/u-modal/u-modal","uview-ui/components/u-icon/u-icon":"uview-ui/components/u-icon/u-icon","uview-ui/components/u-select/u-select":"uview-ui/components/u-select/u-select","uview-ui/components/u-subsection/u-subsection":"uview-ui/components/u-subsection/u-subsection","uview-ui/components/u-tabs/u-tabs":"uview-ui/components/u-tabs/u-tabs","uview-ui/components/u-popup/u-popup":"uview-ui/components/u-popup/u-popup","uview-ui/components/u-picker/u-picker":"uview-ui/components/u-picker/u-picker","uview-ui/components/u-search/u-search":"uview-ui/components/u-search/u-search","uview-ui/components/u-checkbox-group/u-checkbox-group":"uview-ui/components/u-checkbox-group/u-checkbox-group","uview-ui/components/u-checkbox/u-checkbox":"uview-ui/components/u-checkbox/u-checkbox","uview-ui/components/u-upload/u-upload":"uview-ui/components/u-upload/u-upload","uview-ui/components/u-index-anchor/u-index-anchor":"uview-ui/components/u-index-anchor/u-index-anchor","uview-ui/components/u-index-list/u-index-list":"uview-ui/components/u-index-list/u-index-list","uview-ui/components/u-form-item/u-form-item":"uview-ui/components/u-form-item/u-form-item","uview-ui/components/u-form/u-form":"uview-ui/components/u-form/u-form","uview-ui/components/u-loading/u-loading":"uview-ui/components/u-loading/u-loading","uview-ui/components/u-badge/u-badge":"uview-ui/components/u-badge/u-badge","uview-ui/components/u-mask/u-mask":"uview-ui/components/u-mask/u-mask","uview-ui/components/u-line-progress/u-line-progress":"uview-ui/components/u-line-progress/u-line-progress"}[chunkId]||chunkId) + ".wxss";
 /******/ 				var fullhref = __webpack_require__.p + href;
 /******/ 				var existingLinkTags = document.getElementsByTagName("link");
 /******/ 				for(var i = 0; i < existingLinkTags.length; i++) {

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -3107,7 +3107,7 @@ function getConfig() {
 
 /***/ }),
 
-/***/ 161:
+/***/ 162:
 /*!***************************************************************!*\
   !*** /Users/kiys/Desktop/parkService-wxapp/pet/utils/area.js ***!
   \***************************************************************/
@@ -5557,7 +5557,7 @@ new Router().route;exports.default = _default;
 
 /***/ }),
 
-/***/ 242:
+/***/ 243:
 /*!********************************************************************************!*\
   !*** /Users/kiys/Desktop/parkService-wxapp/pet/uview-ui/libs/util/province.js ***!
   \********************************************************************************/
@@ -5569,7 +5569,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 
 /***/ }),
 
-/***/ 243:
+/***/ 244:
 /*!****************************************************************************!*\
   !*** /Users/kiys/Desktop/parkService-wxapp/pet/uview-ui/libs/util/city.js ***!
   \****************************************************************************/
@@ -5581,7 +5581,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 
 /***/ }),
 
-/***/ 244:
+/***/ 245:
 /*!****************************************************************************!*\
   !*** /Users/kiys/Desktop/parkService-wxapp/pet/uview-ui/libs/util/area.js ***!
   \****************************************************************************/
@@ -5655,7 +5655,7 @@ timeFormat;exports.default = _default;
 
 /***/ }),
 
-/***/ 252:
+/***/ 253:
 /*!*******************************************************************************!*\
   !*** /Users/kiys/Desktop/parkService-wxapp/pet/uview-ui/libs/util/emitter.js ***!
   \*******************************************************************************/
@@ -6017,7 +6017,7 @@ color;exports.default = _default;
 
 /***/ }),
 
-/***/ 295:
+/***/ 296:
 /*!***************************************************************************************!*\
   !*** /Users/kiys/Desktop/parkService-wxapp/pet/uview-ui/libs/util/async-validator.js ***!
   \***************************************************************************************/
@@ -7380,11 +7380,11 @@ Schema.warning = warning;
 Schema.messages = messages;var _default =
 
 Schema;exports.default = _default;
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/node-libs-browser/mock/process.js */ 296)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../../../../../../../Applications/HBuilderX.app/Contents/HBuilderX/plugins/uniapp-cli/node_modules/node-libs-browser/mock/process.js */ 297)))
 
 /***/ }),
 
-/***/ 296:
+/***/ 297:
 /*!********************************************************!*\
   !*** ./node_modules/node-libs-browser/mock/process.js ***!
   \********************************************************/
@@ -7415,7 +7415,7 @@ exports.binding = function (name) {
     var path;
     exports.cwd = function () { return cwd };
     exports.chdir = function (dir) {
-        if (!path) path = __webpack_require__(/*! path */ 297);
+        if (!path) path = __webpack_require__(/*! path */ 298);
         cwd = path.resolve(dir, cwd);
     };
 })();
@@ -7429,7 +7429,7 @@ exports.features = {};
 
 /***/ }),
 
-/***/ 297:
+/***/ 298:
 /*!***********************************************!*\
   !*** ./node_modules/path-browserify/index.js ***!
   \***********************************************/
@@ -7739,7 +7739,7 @@ var substr = 'ab'.substr(-1) === 'b'
     }
 ;
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../node-libs-browser/mock/process.js */ 296)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../node-libs-browser/mock/process.js */ 297)))
 
 /***/ }),
 
@@ -14001,31 +14001,6 @@ function getParent(name, keys) {
 
 /***/ }),
 
-/***/ 366:
-/*!***************************************************************!*\
-  !*** /Users/kiys/Desktop/parkService-wxapp/pet/utils/time.js ***!
-  \***************************************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.getDate = getDate;function getDate() {
-  var date,month,year = "";
-
-  date = new Date().getDate();
-  month = new Date().getMonth();
-  year = new Date().getFullYear();
-
-  console.log(date, month, year);
-  return {
-    date: date,
-    month: month,
-    year: year };
-
-}
-
-/***/ }),
-
 /***/ 37:
 /*!***********************************************************************************!*\
   !*** /Users/kiys/Desktop/parkService-wxapp/pet/uview-ui/libs/function/$parent.js ***!
@@ -14684,6 +14659,31 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 
 
 
+/***/ }),
+
+/***/ 73:
+/*!***************************************************************!*\
+  !*** /Users/kiys/Desktop/parkService-wxapp/pet/utils/time.js ***!
+  \***************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });exports.getDate = getDate;function getDate() {
+  var date,month,year = "";
+
+  date = new Date().getDate();
+  month = new Date().getMonth();
+  year = new Date().getFullYear();
+
+  console.log(date, month, year);
+  return {
+    date: date,
+    month: month,
+    year: year };
+
+}
+
 /***/ })
 
 }]);

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -130,7 +130,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uHeader = function uHeader() {Promise.all(/*! require.ensure | components/u-header */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/u-header")]).then((function () {return resolve(__webpack_require__(/*! ../../components/u-header.vue */ 188));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var uHeader = function uHeader() {Promise.all(/*! require.ensure | components/u-header */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/u-header")]).then((function () {return resolve(__webpack_require__(/*! ../../components/u-header.vue */ 189));}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);};var _default =
 
 
 

unpackage/dist/dev/mp-weixin/pages/refund/refund.json

@@ -1,6 +1,9 @@
 {
   "navigationBarTitleText": "待处理退款",
-  "enablePullDownRefresh": false,
+  "enablePullDownRefresh": true,
   "navigationBarBackgroundColor": "#FFFFFF",
-  "usingComponents": {}
+  "usingComponents": {
+    "u-modal": "/uview-ui/components/u-modal/u-modal",
+    "u-input": "/uview-ui/components/u-input/u-input"
+  }
 }

unpackage/dist/dev/mp-weixin/pages/refund/refund.wxss

@@ -33,6 +33,12 @@
   align-items: center;
   justify-content: flex-start;
 }
+.content .feedbackconent {
+  border: 1px red solid;
+  height: 300rpx;
+  font-size: 20rpx;
+  padding: 30rpx;
+}
 .content .card {
   width: 90%;
   background-color: #FFFFFF;

unpackage/dist/dev/mp-weixin/project.config.json

@@ -38,7 +38,8 @@
     "minifyWXSS": true,
     "disableUseStrict": false,
     "showES6CompileOption": false,
-    "useCompilerPlugins": false
+    "useCompilerPlugins": false,
+    "minifyWXML": true
   },
   "compileType": "miniprogram",
   "libVersion": "",

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -13,27 +13,9 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/order/order",
-          "pathName": "pages/order/order",
-          "query": "",
-          "scene": null
-        },
-        {
           "name": "pages/order/info",
           "pathName": "pages/order/info",
-          "query": "info=%7B%22id%22%3A1%7D",
-          "scene": null
-        },
-        {
-          "name": "pages/Delivery/create",
-          "pathName": "pages/Delivery/create",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "pages/mine/password",
-          "pathName": "pages/mine/password",
-          "query": "",
+          "query": "id=16",
           "scene": null
         },
         {

unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading/u-loading.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}

unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading/u-loading.wxml

@@ -0,0 +1 @@
+<block wx:if="{{show}}"><view class="{{['u-loading','data-v-2c9bf24a',mode=='circle'?'u-loading-circle':'u-loading-flower']}}" style="{{$root.s0}}"></view></block>

unpackage/dist/dev/mp-weixin/uview-ui/components/u-loading/u-loading.wxss

@@ -0,0 +1,80 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* uni.scss */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.u-loading-circle.data-v-2c9bf24a {
+  display: inline-flex;
+  vertical-align: middle;
+  width: 28rpx;
+  height: 28rpx;
+  background: 0 0;
+  border-radius: 50%;
+  border: 2px solid;
+  border-color: #e5e5e5 #e5e5e5 #e5e5e5 #8f8d8e;
+  -webkit-animation: u-circle-data-v-2c9bf24a 1s linear infinite;
+          animation: u-circle-data-v-2c9bf24a 1s linear infinite;
+}
+.u-loading-flower.data-v-2c9bf24a {
+  width: 20px;
+  height: 20px;
+  display: inline-block;
+  vertical-align: middle;
+  -webkit-animation: a 1s steps(12) infinite;
+  animation: u-flower-data-v-2c9bf24a 1s steps(12) infinite;
+  background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;
+  background-size: 100%;
+}
+@-webkit-keyframes u-flower-data-v-2c9bf24a {
+0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+}
+to {
+    -webkit-transform: rotate(1turn);
+    transform: rotate(1turn);
+}
+}
+@keyframes u-flower-data-v-2c9bf24a {
+0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+}
+to {
+    -webkit-transform: rotate(1turn);
+    transform: rotate(1turn);
+}
+}
+@-webkit-keyframes u-circle-data-v-2c9bf24a {
+0% {
+    -webkit-transform: rotate(0);
+            transform: rotate(0);
+}
+100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg);
+}
+}
+

unpackage/dist/dev/mp-weixin/uview-ui/components/u-modal/u-modal.json

@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "u-popup": "/uview-ui/components/u-popup/u-popup",
+    "u-loading": "/uview-ui/components/u-loading/u-loading"
+  },
+  "component": true
+}

unpackage/dist/dev/mp-weixin/uview-ui/components/u-modal/u-modal.wxss

@@ -0,0 +1,64 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* uni.scss */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.u-model.data-v-3626fcec {
+  height: auto;
+  overflow: hidden;
+  font-size: 32rpx;
+  background-color: #fff;
+}
+.u-model__btn--hover.data-v-3626fcec {
+  background-color: #e6e6e6;
+}
+.u-model__title.data-v-3626fcec {
+  padding-top: 48rpx;
+  font-weight: 500;
+  text-align: center;
+  color: #303133;
+}
+.u-model__content__message.data-v-3626fcec {
+  padding: 48rpx;
+  font-size: 30rpx;
+  text-align: center;
+  color: #606266;
+}
+.u-model__footer.data-v-3626fcec {
+
+  display: flex;
+  flex-direction: row;
+}
+.u-model__footer__button.data-v-3626fcec {
+  flex: 1;
+  height: 100rpx;
+  line-height: 100rpx;
+  font-size: 32rpx;
+  box-sizing: border-box;
+  cursor: pointer;
+  text-align: center;
+  border-radius: 4rpx;
+}
+