什么玩意

pages.json

@@ -46,7 +46,7 @@
 			"style": {
 				"navigationStyle": "custom",
 				"navigationBarTextStyle": "black",
-				"enablePullDownRefresh":true
+				"enablePullDownRefresh":false
 			}
 
 		}, {

pages/Delivery/Delivery.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<view class="search">
+		<view class="search" style="z-index: 100;">
 			<u-search placeholder="请输入信息搜索配送员" v-model="keyword" @custom="getData" @search="getData"></u-search>
 		</view>
 		<view class="card" v-for="(item,index) in dataList" :key="index">
@@ -59,7 +59,7 @@
 					<view class="name">
 						是否禁用
 					</view>
-					<u-switch class="text" style="margin-left: 20rpx;" v-model="item.status"
+					<u-switch class="text" style="margin-left: 20rpx;z-index: 1;" v-model="item.status"
 						:active-value="item.id + ',1'" :inactive-value="item.id + ',2'" @change="open"
 						active-color="#F6B301" inactive-color="#eee" size="25"></u-switch>
 				</view>
@@ -75,7 +75,7 @@
 		</view>
 
 
-		<view class="bottom-btn">
+		<view class="bottom-btn" style="z-index: 100;">
 			<view class="buttom-dom" @click="create">
 				创建配送员
 			</view>

pages/index/index.vue

@@ -54,7 +54,7 @@
 						今日营业额(元)
 					</view>
 					<view class="item-num">
-						{{data.today_profit}}
+						{{data.today_turnover}}
 					</view>
 				</view>
 				<view class="col" @click="goToTurnOver(2)">
@@ -72,7 +72,7 @@
 						今日盈利明细(元)
 					</view>
 					<view class="item-num">
-						{{data.today_turnover}}
+						{{data.today_profit}}
 					</view>
 				</view>
 			</view>

pages/mine/mine.vue

@@ -139,21 +139,23 @@
 
 		.row {
 			border-bottom: 1rpx #eee solid;
-			padding: 10rpx 0;
+			padding: 10rpx 0;
+			.icon {
+				width: 10%;
+			}
+			
+			.text {
+				width: 50%;
+			}
+			
+			.number {
+				width: 40%;
+				text-align: right;
+			}
 		}
 
 		.list-box {
-			.icon {
-				width: 10%;
-			}
-
-			.text {
-				width: 70%;
-			}
-
-			.money {
-				width: 20%;
-			}
+			
 		}
 	}
 </style>

pages/order/info.vue

@@ -29,7 +29,7 @@
 			<view class="order">
 				<view class="order_a"><text class="order_yuan"></text> <text>取</text></view>
 				<view class="order_b">
-					<view class="order_p">{{info.from_addr.address}}</view>
+					<view class="order_p">{{info.from_addr.location}}</view>
 					<view class="order_c">
 						<view class="order_p1">{{info.from_addr.name}}</view>
 						<view class="order_p2">{{info.from_addr.mobile}}</view>
@@ -39,7 +39,7 @@
 			<view class="order" style="margin-bottom: 20rpx;">
 				<view class="order_a"><text class="order_yuana order_yuan "></text> <text>送</text></view>
 				<view class="order_b">
-					<view class="order_p">{{info.to_addr.address}}</view>
+					<view class="order_p">{{info.to_addr.location}}</view>
 					<view class="order_c">
 						<view class="order_p1">{{info.to_addr.name}}</view>
 						<view class="order_p2">{{info.to_addr.mobile}}</view>
@@ -106,7 +106,7 @@
 						宠物重量
 					</view>
 					<view class="text">
-						{{info.weight}}
+						{{info.weight}}KG
 					</view>
 				</view>
 				<view class="row half">
@@ -114,7 +114,7 @@
 						宠具件数
 					</view>
 					<view class="text">
-						{{info.piece}}
+						{{info.piece}}件
 					</view>
 				</view>
 			</view>
@@ -124,18 +124,21 @@
 						备注信息
 					</view>
 					<view class="text">
-						{{info.remark}}
+						
 					</view>
 				</view>
+			</view>
+			<view class="row">
+				{{info.remark === null ?'无':info.remark}}
 			</view>
-			<view class="row" v-if="info.images.length > 1">
+			<view class="row" v-if="info.images.length > 1" @click="clickImage(info.images)">
 				<view class="row half">
 					<view class="name">
 						宠物图片
 					</view>
 				</view>
 			</view>
-			<view class="image">
+			<view class="image" @click="clickImage(info.images)">
 				<image v-for="(item,index) in info.images" :src="item" class="image-dom" :key="index"></image>
 			</view>
 		</view>
@@ -143,6 +146,22 @@
 		<view class="card">
 			<view class="title">
 				订单信息
+			</view>
+			<view class="row" v-if="isAdmin">
+				<view class="name">
+					订单金额
+				</view>
+				<view class="text" style="color: red;">
+					¥{{info.real_amount}}
+				</view>
+			</view>
+			<view class="row" v-if="isAdmin">
+				<view class="name">
+					优惠金额
+				</view>
+				<view class="text" style="color: red;">
+					¥{{info.discount_amount}}
+				</view>
 			</view>
 			<view class="row">
 				<view class="name">
@@ -157,7 +176,8 @@
 					下单时间
 				</view>
 				<view class="text">
-					{{info.created_at?$u.timeFormat(info.created_at, 'yyyy年mm月dd日 hh时MM分'):"-"}}
+					<!-- {{info.created_at?$u.timeFormat(info.created_at, 'yyyy年mm月dd日 hh时MM分'):"-"}} -->
+					{{info.created_at?info.created_at:"-"}}
 				</view>
 			</view>
 			<view class="row">
@@ -173,7 +193,8 @@
 					支付时间
 				</view>
 				<view class="text">
-					{{info.pay_time?$u.timeFormat(info.pay_time, 'yyyy年mm月dd日 hh时MM分'):'-'}}
+					<!-- {{info.pay_time?$u.timeFormat(info.pay_time, 'yyyy年mm月dd日 hh时MM分'):'-'}} -->
+					{{info.pay_time?info.pay_time:"-"}}
 				</view>
 			</view>
 		</view>
@@ -181,11 +202,13 @@
 		<view class="card" v-if="info.protect_valid">
 			<view class="row">
 				<view class="row half">
-					<image src="http://pet.hdlkeji.com/assets/static/detaila.png" style="width: 30rpx;height: 30rpx;"></image>
+					<image src="http://pet.hdlkeji.com/assets/static/detaila.png" style="width: 30rpx;height: 30rpx;">
+					</image>
 					<view style="margin: 0 20rpx;">宠物安心保</view>
-					<image src="http://pet.hdlkeji.com/assets/static/1/29.png" style="width: 30rpx;height: 30rpx;"></image>
+					<image src="http://pet.hdlkeji.com/assets/static/1/29.png" style="width: 30rpx;height: 30rpx;">
+					</image>
 				</view>
-				<view class="row half yellow">
+				<view class="row half yellow">
 					生效中
 				</view>
 			</view>
@@ -196,118 +219,122 @@
 			</view>
 		</view>
 
-		<view class="card">
+		<view class="card" v-if="info.status >1&&info.senders.length>0">
 			<view class="title">
 				配送信息
 			</view>
-			<view class="row">
+			<view class="row" v-if="info.senders[0].user.nickname">
 				<view class="name">
 					取宠代理
 				</view>
 				<view class="text">
-					{{info.from_addr.name}}
+					{{info.senders[0]?info.senders[0].user.nickname: "-"}}
 				</view>
 			</view>
-			<view class="row">
+			<view class="row" v-if="info.senders[0].user.mobile">
 				<view class="name">
 					联系电话
 				</view>
 				<view class="text">
-					{{info.from_addr.mobile}}
+					{{info.senders[0]?info.senders[0].user.mobile: "-"}}
 				</view>
 			</view>
-			<view class="row">
+			<view class="row" v-if="info.senders[1].user.nickname">
 				<view class="name">
 					派送代理
 				</view>
 				<view class="text">
-					{{info.to_addr.name}}
+					{{info.senders[1]?info.senders[1].user.nickname: "-"}}
 				</view>
 			</view>
-			<view class="row">
+			<view class="row" v-if="info.senders[1].user.mobile">
 				<view class="name">
 					联系方式
 				</view>
 				<view class="text">
-					{{info.to_addr.mobile}}
+					{{info.senders[1]?info.senders[1].user.mobile: "-"}}
 				</view>
 			</view>
-			<view class="row">
+			<view class="row" v-if="">
 				<view class="name">
 					完成时间
 				</view>
-				<view class="text">
-					{{info.completed_at?$u.timeFormat(info.completed_at, 'yyyy年mm月dd日 hh时MM分'):'-'}}
+				<view class="text">
+					{{info.completed_at}}
+					<!-- {{info.completed_at?$u.timeFormat(info.completed_at, 'yyyy年mm月dd日 hh时MM分'):'-'}} -->
 				</view>
 			</view>
 		</view>
 
-		<view class="card" v-if="info.status > 50">
+		<view class="card" v-if="info.status > 50&&info.status <70">
 			<view class="title">
 				结算信息
 			</view>
 			<view class="row">
 				<view class="row half">
 					<view class="name">
-						取件费
+						取件费 
 					</view>
 					<view class="text red">
-						{{info.current_send_order.fee_1}}
+						¥{{info.current_send_order.fee_1}}
 					</view>
 				</view>
 				<view class="row half">
 					<view class="name">
-						派送费
+						派送费 
 					</view>
 					<view class="text red">
-						{{info.current_send_order.fee_3}}
+						¥{{info.current_send_order.fee_3}}
 					</view>
 				</view>
 			</view>
 			<view class="row">
 				<view class="row half">
 					<view class="name">
-						运输费
+						运输费 
 					</view>
 					<view class="text red">
-						{{info.current_send_order.fee_2}}
+						¥{{info.current_send_order.fee_2}}
 					</view>
 				</view>
 				<view class="row half">
 					<view class="name">
-						寄养费
+						寄养费 
 					</view>
 					<view class="text red">
-						{{info.current_send_order.fee_5}}
+						¥{{info.current_send_order.fee_5}}
 					</view>
 				</view>
 			</view>
 			<view class="row">
 				<view class="row half">
 					<view class="name">
-						宠具费
+						宠具费 
 					</view>
 					<view class="text red">
-						{{info.current_send_order.fee_4}}
+						¥{{info.current_send_order.fee_4}}
 					</view>
 				</view>
 				<view class="row half">
 					<view class="name">
-						其他
+						其他 
 					</view>
 					<view class="text red">
-						{{info.current_send_order.fee_6}}
+						¥{{info.current_send_order.fee_6}}
 					</view>
 				</view>
 			</view>
-			<view class="row">
+			<view class="row ">
 				<view class="row half">
 					<view class="name">
 						总计
 					</view>
 					<view class="text red">
-						{{info.current_send_order.fee_total}}
+						¥{{info.current_send_order.fee_total}}
 					</view>
+				</view>
+				<view class="row half">
+					
 				</view>
 			</view>
 		</view>
@@ -326,13 +353,14 @@
 					</view>
 				</view>
 			</view>
-			<view class="row">
+			<view class="row" v-if="info.refund_at">
 				<view class="row">
 					<view class="name">
 						退款时间
 					</view>
 					<view class="text red">
-						{{info.refund_at?$u.timeFormat(info.refund_at, 'yyyy年mm月dd日 hh时MM分'):'-'}}
+						<!-- {{info.refund_at?$u.timeFormat(info.refund_at, 'yyyy年mm月dd日 hh时MM分'):'-'}} -->
+						{{info.refund_at}}
 					</view>
 				</view>
 			</view>
@@ -341,20 +369,23 @@
 					<view class="name">
 						退款原因
 					</view>
-					<view class="text red">
-						{{info.refund_reason||''}}
+					<view class="text">
+						
 					</view>
 				</view>
+			</view>
+			<view class="row">
+				{{info.refund_reason||''}}
 			</view>
 			<view class="row">
 				<view class="row half">
 					<view class="name">
-						宠物图片
+						退款图片
 					</view>
 				</view>
 			</view>
 			<view class="image">
-				<image :src="item" class="image-dom" v-for="(item,index) in info.refund_images" @click="clickImage"></image>
+				<image :src="item" class="image-dom" v-for="(item,index) in info.refund_images" @click="clickImage(info.refund_images)"></image>
 			</view>
 		</view>
 
@@ -362,15 +393,15 @@
 			<view class="title">
 				备注信息
 			</view>
-			<view class="row">
+			<view class="col">
 				<view class="name" v-for="(item,key) in info.user_remark">
 					{{item.txt}}
 				</view>
 			</view>
 		</view>
 
-		<view class="bottom-btn">
-			<view class="buttom-dom" @click="create(info.id)" v-if="info.status === 1">
+		<view class="bottom-btn" v-if="!(isAdmin&&info.status === 10&&info.status===1&&info.status!==40) && !isAdmin">
+			<view class="buttom-dom" @click="create(info.id)" v-if="info.status === 1 && !isAdmin">
 				立即接单
 			</view>
 			<view class="buttom-dom" @click="video(0,1,info.id)"
@@ -396,51 +427,53 @@
 <script>
 	export default {
 		data() {
-			return {
-				// 是否是管理员
+			return {
+				// 是否是管理员
 				isAdmin: false,
-				info: {}
+				info: {},
+				id:''
 			}
-		},
-		onShow() {
-			this.isAdmin = getApp().globalData.isAdmin
-			this.getData(id);
+		},
+		onShow() {
+			this.isAdmin = getApp().globalData.isAdmin
+			this.getData(this.id);
 		},
 		onLoad(e) {
-			let id = e.id
+			let id = e.id
 			this.isAdmin = getApp().globalData.isAdmin
-			this.getData(id);
+			this.getData(id);
+			this.id = id
 		},
-		methods: {
-			// 点击查看图片
-			clickImage(){
-				uni.previewImage({
-					urls:this.info.refund_images
-				})
-			},
-			// 点击立即接单
-			create(id) {
-				this.request("/sender_order_controller/get", {
-					id: id
-				}, "POST").then(res => {
-					if (res.code === 1) {
-						this.$u.toast('接单成功')
-						setTimeout(function() {
-							uni.navigateBack({
-								delta:1
-							})
-						}, 2000);
-					}
-				})
+		methods: {
+			// 点击查看图片
+			clickImage(images) {
+				uni.previewImage({
+					urls: images
+				})
+			},
+			// 点击立即接单
+			create(id) {
+				this.request("/sender_order_controller/get", {
+					id: id
+				}, "POST").then(res => {
+					if (res.code === 1) {
+						this.$u.toast('接单成功')
+						setTimeout(function() {
+							uni.navigateBack({
+								delta: 1
+							})
+						}, 2000);
+					}
+				})
 			},
 			// 获取订单信息
-			getData(id) {
-				// 判断是否是管理员
-				let url = '';
-				if(!this.isAdmin){
-					url = "/sender_order_controller/detail"
-				}else{
-					url = "/admin_order/order_detail"
+			getData(id) {
+				// 判断是否是管理员
+				let url = '';
+				if (!this.isAdmin) {
+					url = "/sender_order_controller/detail"
+				} else {
+					url = "/admin_order/order_detail"
 				}
 				this.request(url, {
 					id: id
@@ -454,24 +487,24 @@
 			// 点击上传视频
 			video(status, type, id) {
 				// status 的订单状态 10取宠视频 20 运输视频 30送宠视频 
-				// type 1 备注 2上传更多 3上传取宠视频 4上传运输视频 5上传送达视频
-				// function gotoPage(){
-				// 	uni.navigateTo({
-				// 		url: "./video?status=" + status + "&type=" + type + "&id=" + id
-				// 	})
-				// }
-				// if(type === 3){
-				// 	uni.showModal({
-				// 		title:"确认宠物已到达正在配送？",
-				// 		success(res) {
-				// 			if(res.confirm){
-				// 				gotoPage()
-				// 			}
-				// 		}
-				// 	})
-				// }
-				uni.navigateTo({
-					url: "./video?status=" + status + "&type=" + type + "&id=" + id
+				// type 1 备注 2上传更多 3上传取宠视频 4上传运输视频 5上传送达视频
+				// function gotoPage(){
+				// 	uni.navigateTo({
+				// 		url: "./video?status=" + status + "&type=" + type + "&id=" + id
+				// 	})
+				// }
+				// if(type === 3){
+				// 	uni.showModal({
+				// 		title:"确认宠物已到达正在配送？",
+				// 		success(res) {
+				// 			if(res.confirm){
+				// 				gotoPage()
+				// 			}
+				// 		}
+				// 	})
+				// }
+				uni.navigateTo({
+					url: "./video?status=" + status + "&type=" + type + "&id=" + id
 				})
 			}
 		}
@@ -482,16 +515,24 @@
 	.content {
 		padding-top: 40rpx;
 		padding-bottom: 5vh;
-	}
-	.yellow{
-		color: #F6B403;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: flex-end !important;
 	}
+
+	.yellow {
+		color: #F6B403;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: flex-end !important;
+	}
+
 	.row {
-		justify-content: flex-start;
+		justify-content: flex-start;
+		.row{
+			.name{
+				min-width: 90rpx;
+				text-align: right;
+			}
+		}
 	}
 
 	.card {
@@ -508,11 +549,14 @@
 		justify-content: space-between;
 
 		.name {
-			color: #999;
+			color: #999;
+			min-width: 20%;
 		}
 
 		.text {
-			text-indent: 1em;
+			text-indent: 1em;
+			overflow-x: scroll;
+			white-space: nowrap;
 		}
 
 		.red {
@@ -631,13 +675,14 @@
 		flex-direction: row;
 		align-items: center;
 		justify-content: flex-start;
+		flex-wrap: wrap;
 
 		.image-dom {
 			width: 120rpx;
 			height: 120rpx;
 			border: 1px #eee solid;
 			margin-right: 20rpx;
-			flex-wrap: wrap;
+			margin-bottom: 20rpx;
 		}
 	}
 
@@ -662,7 +707,7 @@
 			line-height: 70rpx;
 			color: #FFFFFF;
 			border-radius: 70rpx;
-			margin: 0 40rpx;
+			margin: 0 40rpx;
 			padding: 0 10rpx;
 		}
 	}

pages/order/order.vue

@@ -6,116 +6,191 @@
 				@change="change" bg-color="#F7E8CB" active-color="#E68500"></u-tabs>
 			<swiper :interval="3000" :duration="1000" :current="current" class="order-list-box" @change="touchChange">
 				<!-- 待接单 -->
-				<swiper-item style="height: 100%;overflow-y: scroll;">
-					<view class="noOrder" v-if="data.data.length < 1">
-						暂无订单～～
-					</view>
-					<view class="card" @click="info(item)" v-for="(item,index) in data.data" :key="index">
-						<view class="row center">
-							<view class="big-text">
-								{{item.from_city}}
-							</view>
-							<view class="image">
-								<image src="http://pet.hdlkeji.com/assets/static/1/95.png" style="width: 50rpx;height: 20rpx;"></image>
-							</view>
-							<view class="big-text">
-								{{item.to_city}}
-							</view>
+				<swiper-item style="height: 100%;">
+					<scroll-view :scroll-top="50" scroll-y="true" style=" height:100%;" @scrolltoupper="upper"
+						@scrolltolower="lower">
+						<view class="noOrder" v-if="data.data.length < 1">
+							暂无订单～～
 						</view>
-						<view class="row">
-							<view class="row half">
-								<view class="name">
-									宠物类别
+						<view class="card" @click="info(item)" v-for="(item,index) in dataA" :key="index">
+							<view class="row">
+								<view style="width:20%;">
+									<view
+										:class="item.freight==='fast'?'type_name green':item.freight === 'air'?'type_name blue':'type_name yellow' ">
+										{{item.freight === 'fast'?'快车':item.freight === 'air'?'空运':'专车'}}
+									</view>
 								</view>
-								<view class="text">
-									{{item.pet_category}}
+								<view class="row"
+									style="width: 60%; justify-content: flex-start; overflow: hidden; white-space:nowrap;text-overflow:ellipsis;">
+									<view class="name" style="width:20%;">
+										订单号
+									</view>
+									<view class="text" style="text-indent: 1em;">
+										{{item.no}}
+									</view>
+								</view>
+								<view class="type_status">
+									抢单中
+									<u-icon name="arrow-right"></u-icon>
 								</view>
 							</view>
-							<view class="row half">
-								<view class="name">
-									宠物规格
+							<view class="row center" style="width: 60%;">
+								<view class="big-text">
+									{{item.from_city}}
 								</view>
-								<view class="text">
-									{{item.spec}}
+								<view class="image">
+									<image src="http://pet.hdlkeji.com/assets/static/1/95.png"
+										style="width: 50rpx;height: 20rpx;"></image>
+								</view>
+								<view class="big-text">
+									{{item.to_city}}
 								</view>
 							</view>
-						</view>
-						<view class="row">
-							<view class="row half" style="width: 100%;">
+							<view class="row">
+								<view class="row" style="width:100%;">
+									<view class="name">
+										宠物类别
+									</view>
+									<view class="text">
+										{{item.pet_category}}
+									</view>
+								</view>
+								<!-- <view class="row half" style="width:100%;">
 								<view class="name">
-									取宠时间
+									宠具规格
 								</view>
 								<view class="text">
-									{{item.agree_date}}
-									{{item.agree_time}}
+									{{item.spec}}
 								</view>
+							</view> -->
 							</view>
-						</view>
-						<view class="row">
-							<view class="row half" style="width: 100%;">
-								<view class="name">
-									订单号
+							<view class="row">
+								<view class="row " style="width: 100%;">
+									<view class="name">
+										宠具规格
+									</view>
+									<view class="text">
+										{{item.spec}}*
+										{{item.num}}件
+									</view>
 								</view>
-								<view class="text">
-									{{item.no}}
+							</view>
+							<view class="row">
+								<view class="row " style="width: 100%;">
+									<view class="name">
+										取宠时间
+									</view>
+									<view class="text">
+										{{item.agree_date}}
+										{{item.agree_time}}
+									</view>
+									<view class="length">{{item.distance}}KM</view>
 								</view>
 							</view>
-						</view>
-						<!--  如果是配送员 接 收 都是接单操作 -->
-						<view class="row border" v-if="!isAdmin">
-							<view class="btn" @click.stop="getOrder(item.id)">
-								立即接单
+
+							<!--  如果是配送员 接 收 都是接单操作 -->
+							<view class="row border" v-if="!isAdmin">
+								<view class="btn" @click.stop="getOrder(item.id)">
+									立即接单
+								</view>
+							</view>
+							<view class="row border" v-if="isAdmin">
+								<view class="row half">
+									<view class="name">
+										订单金额
+									</view>
+									<view class="text red">
+										¥{{item.real_amount}}
+									</view>
+								</view>
+								<view class="row half"></view>
 							</view>
 						</view>
-					</view>
+					</scroll-view>
 				</swiper-item>
 				<!-- 进行中 -->
-				<swiper-item style="height: 100%;overflow-y: scroll;">
-					<view class="noOrder" v-if="data.data.length < 1">
-						暂无订单～～
-					</view>
-					<view class="card" @click="info(item)" v-for="(item,index) in data.data" :key="index">
-						<view class="row center">
-							<view class="big-text">
-								{{item.from_city}}
-							</view>
-							<view class="image">
-								<image src="http://pet.hdlkeji.com/assets/static/1/95.png" style="width: 40rpx;height: 20rpx;"></image>
-							</view>
-							<view class="big-text">
-								{{item.to_city}}
-							</view>
+				<swiper-item style="height: 100%;">
+					<scroll-view :scroll-top="50" scroll-y="true" style=" height:100%;" @scrolltoupper="upper"
+						@scrolltolower="lower">
+						<view class="noOrder" v-if="data.data.length < 1">
+							暂无订单～～
 						</view>
-						<view class="row">
-							<view class="row half">
-								<view class="name">
-									宠物类别
+						<view class="card" @click="info(item)" v-for="(item,index) in dataB" :key="index">
+							<view class="row">
+								<view style="width:20%;">
+									<view
+										:class="item.freight==='fast'?'type_name green':item.freight === 'air'?'type_name blue':'type_name yellow' ">
+										{{item.freight === 'fast'?'快车':item.freight === 'air'?'空运':'专车'}}
+									</view>
 								</view>
-								<view class="text">
-									{{item.pet_category}}
+								<view class="row"
+									style="width: 60%; justify-content: flex-start; overflow: hidden; white-space:nowrap;text-overflow:ellipsis;">
+									<view class="name" style="width:20%;">
+										订单号
+									</view>
+									<view class="text" style="text-indent: 1em;">
+										{{item.no}}
+									</view>
+								</view>
+								<view class="type_status">
+									{{item.status === 10?'取宠中':item.status === 20?'运输中':item.status === 30?'送宠中':item.status === 40?'待确认':item.status === 70?'退款中':''}}
+									<u-icon name="arrow-right"></u-icon>
+								</view>
+							</view>
+							<view class="row center">
+								<view class="big-text">
+									{{item.from_city}}
+								</view>
+								<view class="image">
+									<image src="http://pet.hdlkeji.com/assets/static/1/95.png"
+										style="width: 40rpx;height: 20rpx;"></image>
+								</view>
+								<view class="big-text">
+									{{item.to_city}}
 								</view>
 							</view>
-							<view class="row half">
+							<view class="row">
+								<view class="row " style="width:100%;">
+									<view class="name">
+										宠物类别
+									</view>
+									<view class="text">
+										{{item.pet_category}}
+									</view>
+								</view>
+								<!-- <view class="row half" style="width:100%;">
 								<view class="name">
-									宠物规格
+									宠具规格
 								</view>
 								<view class="text">
 									{{item.spec}}
 								</view>
+							</view> -->
 							</view>
-						</view>
-						<view class="row">
-							<view class="row half" style="width: 100%;">
-								<view class="name">
-									取宠时间
+							<view class="row">
+								<view class="row " style="width: 100%;">
+									<view class="name">
+										宠具规格
+									</view>
+									<view class="text">
+										{{item.spec}}*
+										{{item.num}}件
+									</view>
 								</view>
-								<view class="text">
-									{{item.agree_date}}
-									{{item.agree_time}}
+							</view>
+							<view class="row">
+								<view class="row " style="width: 100%;">
+									<view class="name">
+										取宠时间
+									</view>
+									<view class="text">
+										{{item.agree_date}}
+										{{item.agree_time}}
+									</view>
+									<view class="length">{{item.distance}}KM</view>
 								</view>
 							</view>
-						</view>
-						<view class="row">
+							<!-- <view class="row">
 							<view class="row half" style="width: 100%;">
 								<view class="name">
 									订单号
@@ -124,71 +199,130 @@
 									{{item.no}}
 								</view>
 							</view>
+						</view> -->
+							<!-- 判断位配送员 -->
+							<view class="row border" v-if="!isAdmin">
+								<!-- 判断已经接单 并且 配送员位取宠人 -->
+								<view class="btn" v-if="item.status === 10 && item.current_send_order.type === 1">
+									上传取宠视频
+								</view>
+								<view class="btn" v-if="item.status === 20 && item.current_send_order.type === 1">
+									上传运宠视频
+								</view>
+								<!-- 判断已经接单 并且 配送员位取宠人 -->
+								<view class="btn" v-if="item.status === 30 && item.current_send_order.type === 2">
+									上传送达视频
+								</view>
+							</view>
+							<!-- <view class="row border" v-if="isAdmin">
+								<view class="btn" v-if="item.status === 70">
+									同意退款
+								</view>
+								<view class="btn" v-if="item.status === 70">
+									拒绝退款
+								</view>
+							</view> -->
+							<view class="row border" v-if="isAdmin">
+								<view class="row half">
+									<view class="name">
+										订单金额
+									</view>
+									<view class="text red">
+										¥{{item.real_amount}}
+									</view>
+								</view>
+								<view class="row half" style="justify-content: flex-end;">
+									<view class="btn" @click.stop="transport(item.id)">运送详情</view>
+								</view>
+							</view>
 						</view>
-						<!-- 判断位配送员 -->
-						<view class="row border" v-if="!isAdmin">
-							<!-- 判断已经接单 并且 配送员位取宠人 -->
-							<view class="btn" v-if="item.status === 10 && item.current_send_order.type === 1">
-								上传取宠视频
-							</view>
-							<view class="btn" v-if="item.status === 20 && item.current_send_order.type === 1">
-								上传运宠视频
-							</view>
-							<!-- 判断已经接单 并且 配送员位取宠人 -->
-							<view class="btn" v-if="item.status === 30 && item.current_send_order.type === 2">
-								上传送达视频
-							</view>
-							
-						</view>
-					</view>
+					</scroll-view>
 				</swiper-item>
 				<!-- 已完成 -->
-				<swiper-item style="height: 100%;overflow-y: scroll;">
-					<view class="noOrder" v-if="data.data.length < 1">
-						暂无订单～～
-					</view>
-					<view class="card" @click="info(item)" v-for="(item,index) in data.data" :key="index">
-						<view class="row center">
-							<view class="big-text">
-								{{item.from_city}}
-							</view>
-							<view class="image">
-								<image src="http://pet.hdlkeji.com/assets/static/1/95.png" style="width: 50rpx;height: 20rpx;"></image>
-							</view>
-							<view class="big-text">
-								{{item.to_city}}
-							</view>
+				<swiper-item style="height: 100%;">
+					<scroll-view :scroll-top="50" scroll-y="true" style=" height:100%;" @scrolltoupper="upper"
+						@scrolltolower="lower">
+						<view class="noOrder" v-if="data.data.length < 1">
+							暂无订单～～
 						</view>
-						<view class="row">
-							<view class="row half">
-								<view class="name">
-									宠物类别
+						<view class="card" @click="info(item)" v-for="(item,index) in dataC" :key="index">
+							<view class="row">
+								<view class="row">
+									<view style="width:20%">
+										<view
+											:class="item.freight==='fast'?'type_name green':item.freight === 'air'?'type_name blue':'type_name yellow' ">
+											{{item.freight === 'fast'?'快车':item.freight === 'air'?'空运':'专车'}}
+										</view>
+									</view>
+									<view class="row"
+										style="width: 60%; justify-content: flex-start; overflow: hidden; white-space:nowrap;text-overflow:ellipsis;">
+										<view class="name">
+											订单号
+										</view>
+										<view class="text" style="text-indent: 1em;">
+											{{item.no}}
+										</view>
+									</view>
+									<view class="type_status">
+										{{item.status === 50?'待结算':item.status === 60?'已结算':item.status === 65?'拒绝结算':''}}
+										<u-icon name="arrow-right"></u-icon>
+									</view>
 								</view>
-								<view class="text">
-									{{item.pet_category}}
+							</view>
+							<view class="row center">
+								<view class="big-text">
+									{{item.from_city}}
+								</view>
+								<view class="image">
+									<image src="http://pet.hdlkeji.com/assets/static/1/95.png"
+										style="width: 50rpx;height: 20rpx;"></image>
+								</view>
+								<view class="big-text">
+									{{item.to_city}}
 								</view>
 							</view>
-							<view class="row half">
+							<view class="row">
+								<view class="row " style="width:100%;">
+									<view class="name">
+										宠物类别
+									</view>
+									<view class="text">
+										{{item.pet_category}}
+									</view>
+								</view>
+								<!-- <view class="row half" style="width:100%;">
 								<view class="name">
-									宠物规格
+									宠具规格
 								</view>
 								<view class="text">
 									{{item.spec}}
 								</view>
+							</view> -->
 							</view>
-						</view>
-						<view class="row">
-							<view class="row half" style="width: 100%;">
-								<view class="name">
-									取宠时间
+							<view class="row">
+								<view class="row " style="width: 100%;">
+									<view class="name">
+										宠具规格
+									</view>
+									<view class="text">
+										{{item.spec}}*
+										{{item.num}}件
+									</view>
 								</view>
-								<view class="text">
-									{{item.agree_date}}
-									{{item.agree_time}}
+							</view>
+							<view class="row">
+								<view class="row " style="width: 100%;">
+									<view class="name">
+										取宠时间
+									</view>
+									<view class="text">
+										{{item.agree_date}}
+										{{item.agree_time}}
+									</view>
+									<view class="length">{{item.distance}}KM</view>
 								</view>
 							</view>
-						</view>
-						<view class="row">
+							<!-- <view class="row">
 							<view class="row half" style="width: 100%;">
 								<view class="name">
 									订单号
@@ -197,69 +331,116 @@
 									{{item.no}}
 								</view>
 							</view>
-						</view>
-						<view class="row border" v-if="isAdmin">
-							<view class="btn" @click.stop="refuse(item.id)">
-								拒绝
-							</view>
-							<view class="btn" @click.stop="push(item.id)">
-								结算
+						</view> -->
+							<view class="row border" v-if="!isAdmin">
+								<view class="btn" @click.stop="settle(item.id)">
+									申请结算
+								</view>
 							</view>
-						</view>
-						<view class="row border" v-if="!isAdmin">
-							<view class="btn" @click.stop="settle(item.id)">
-								申请结算
+							<view class="row border" v-if="isAdmin && item.status === 55">
+								<view class="row half">
+									<view class="name">
+										订单金额
+									</view>
+									<view class="text red">
+										¥{{item.real_amount}}
+									</view>
+								</view>
+								<view class="row half">
+									<view class="btn" @click.stop="refuse(item.id)">
+										拒绝
+									</view>
+									<view class="btn" @click.stop="push(item.id)">
+										结算
+									</view>
+								</view>
 							</view>
 						</view>
-					</view>
+					</scroll-view>
 				</swiper-item>
 				<!--  已结算 -->
-				<swiper-item style="height: 100%;overflow-y: scroll;">
-					<view class="noOrder" v-if="data.data.length < 1">
-						暂无订单～～
-					</view>
-					<view class="card" @click="info(item)" v-for="(item,index) in data.data" :key="index">
-						<view class="row center">
-							<view class="big-text">
-								{{item.from_city}}
-							</view>
-							<view class="image">
-								<image src="http://pet.hdlkeji.com/assets/static/1/95.png" style="width: 50rpx;height: 20rpx;"></image>
-							</view>
-							<view class="big-text">
-								{{item.to_city}}
-							</view>
+				<swiper-item style="height: 100%;">
+					<scroll-view :scroll-top="50" scroll-y="true" style=" height:100%;" @scrolltoupper="upper"
+						@scrolltolower="lower">
+						<view class="noOrder" v-if="data.data.length < 1">
+							暂无订单～～
 						</view>
-						<view class="row">
-							<view class="row half">
-								<view class="name">
-									宠物类别
+						<view class="card" @click="info(item)" v-for="(item,index) in dataD" :key="index">
+							<view class="row">
+								<view style="width:20%;">
+									<view
+										:class="item.freight==='fast'?'type_name green':item.freight === 'air'?'type_name blue':'type_name yellow' ">
+										{{item.freight === 'fast'?'快车':item.freight === 'air'?'空运':'专车'}}
+									</view>
 								</view>
-								<view class="text">
-									{{item.pet_category}}
+								<view class="row"
+									style="width: 60%; justify-content: flex-start; overflow: hidden; white-space:nowrap;text-overflow:ellipsis;">
+									<view class="name" style="width:20%;">
+										订单号
+									</view>
+									<view class="text" style="text-indent: 1em;">
+										{{item.no}}
+									</view>
+								</view>
+								<view class="type_status">
+									已结算
+									<u-icon name="arrow-right"></u-icon>
 								</view>
 							</view>
-							<view class="row half">
+							<view class="row center">
+								<view class="big-text">
+									{{item.from_city}}
+								</view>
+								<view class="image">
+									<image src="http://pet.hdlkeji.com/assets/static/1/95.png"
+										style="width: 50rpx;height: 20rpx;"></image>
+								</view>
+								<view class="big-text">
+									{{item.to_city}}
+								</view>
+							</view>
+							<view class="row">
+								<view class="row " style="width:100%;">
+									<view class="name">
+										宠物类别
+									</view>
+									<view class="text">
+										{{item.pet_category}}
+									</view>
+								</view>
+								<!-- <view class="row half" style="width:100%;">
 								<view class="name">
-									宠物规格
+									宠具规格
 								</view>
 								<view class="text">
 									{{item.spec}}
 								</view>
+							</view> -->
 							</view>
-						</view>
-						<view class="row">
-							<view class="row half" style="width: 100%;">
-								<view class="name">
-									取宠时间
+							<view class="row">
+								<view class="row " style="width: 100%;">
+									<view class="name">
+										宠具规格
+									</view>
+									<view class="text">
+										{{item.spec}}*
+										{{item.num}}件
+									</view>
 								</view>
-								<view class="text">
-									{{item.agree_date}}
-									{{item.agree_time}}
+							</view>
+							<view class="row">
+								<view class="row " style="width: 100%;">
+									<view class="name">
+										取宠时间
+									</view>
+									<view class="text">
+										{{item.agree_date}}
+										{{item.agree_time}}
+									</view>
+									<view class="length">{{item.distance}}KM</view>
 								</view>
 							</view>
-						</view>
-						<view class="row">
+							<!-- <view class="row">
 							<view class="row half" style="width: 100%;">
 								<view class="name">
 									订单号
@@ -268,65 +449,113 @@
 									{{item.no}}
 								</view>
 							</view>
-						</view>
-						<view class="row border" v-if="isAdmin">
-							<view class="btn" @click.stop="del(item.id)">
-								删除
-							</view>
-						</view>
-						<view class="row border" v-if="!isAdmin">
-							<view class="btn"  @click.stop="del(item.id)">
-								删除
-							</view>
-						</view>
-					</view>
-				</swiper-item>
-				<swiper-item style="height: 100%;overflow-y: scroll;">
-					<view class="noOrder" v-if="data.data.length < 1">
-						暂无订单～～
-					</view>
-					<view class="card" @click="info(item)" v-for="(item,index) in data.data" :key="index">
-						<view class="row center">
-							<view class="big-text">
-								{{item.from_city}}
-							</view>
-							<view class="image">
-								<image src="http://pet.hdlkeji.com/assets/static/1/95.png" style="width: 50rpx;height: 20rpx;"></image>
+						</view> -->
+							<view class="row border" v-if="isAdmin">
+								<view class="row half">
+									<view class="name">
+										订单金额
+									</view>
+									<view class="text red">
+										¥{{item.real_amount}}
+									</view>
+								</view>
+								<view class="row half">
+									<view class="btn" @click.stop="del(item.id)">
+										删除
+									</view>
+								</view>
 							</view>
-							<view class="big-text">
-								{{item.to_city}}
+							<view class="row border" v-if="!isAdmin">
+								<view class="btn" @click.stop="del(item.id)">
+									删除
+								</view>
 							</view>
 						</view>
-						<view class="row">
-							<view class="row half">
-								<view class="name">
-									宠物类别
+					</scroll-view>
+				</swiper-item>
+				<!-- 已取消 -->
+				<swiper-item style="height: 100%;">
+					<scroll-view :scroll-top="50" scroll-y="true" style=" height:100%;" @scrolltoupper="upper"
+						@scrolltolower="lower">
+						<view class="noOrder" v-if="data.data.length < 1">
+							暂无订单～～
+						</view>
+						<view class="card" @click="info(item)" v-for="(item,index) in dataE" :key="index">
+							<view class="row">
+								<view style="width:20%;">
+									<view
+										:class="item.freight==='fast'?'type_name green':item.freight === 'air'?'type_name blue':'type_name yellow' ">
+										{{item.freight === 'fast'?'快车':item.freight === 'air'?'空运':'专车'}}
+									</view>
 								</view>
-								<view class="text">
-									{{item.pet_category}}
+								<view class="row"
+									style="width: 60%; justify-content: flex-start; overflow: hidden; white-space:nowrap;text-overflow:ellipsis;">
+									<view class="name" style="width:20%;">
+										订单号
+									</view>
+									<view class="text" style="text-indent: 1em;">
+										{{item.no}}
+									</view>
+								</view>
+								<view class="type_status">
+									已取消
+									<u-icon name="arrow-right"></u-icon>
+								</view>
+							</view>
+							<view class="row center">
+								<view class="big-text">
+									{{item.from_city}}
+								</view>
+								<view class="image">
+									<image src="http://pet.hdlkeji.com/assets/static/1/95.png"
+										style="width: 50rpx;height: 20rpx;"></image>
+								</view>
+								<view class="big-text">
+									{{item.to_city}}
 								</view>
 							</view>
-							<view class="row half">
+							<view class="row">
+								<view class="row " style="width:100%;">
+									<view class="name">
+										宠物类别
+									</view>
+									<view class="text">
+										{{item.pet_category}}
+									</view>
+								</view>
+								<!-- <view class="row half" style="width:100%;">
 								<view class="name">
-									宠物规格
+									宠具规格
 								</view>
 								<view class="text">
 									{{item.spec}}
 								</view>
+							</view> -->
 							</view>
-						</view>
-						<view class="row">
-							<view class="row half" style="width: 100%;">
-								<view class="name">
-									取宠时间
+							<view class="row">
+								<view class="row " style="width: 100%;">
+									<view class="name">
+										宠具规格
+									</view>
+									<view class="text">
+										{{item.spec}}*
+										{{item.num}}件
+									</view>
 								</view>
-								<view class="text">
-									{{item.agree_date}}
-									{{item.agree_time}}
+							</view>
+							<view class="row">
+								<view class="row " style="width: 100%;">
+									<view class="name">
+										取宠时间
+									</view>
+									<view class="text">
+										{{item.agree_date}}
+										{{item.agree_time}}
+									</view>
+									<view class="length">{{item.distance}}KM</view>
 								</view>
 							</view>
-						</view>
-						<view class="row">
+							<!-- <view class="row">
 							<view class="row half" style="width: 100%;">
 								<view class="name">
 									订单号
@@ -335,13 +564,24 @@
 									{{item.no}}
 								</view>
 							</view>
-						</view>
-						<view class="row border" v-if="isAdmin">
-							<view class="btn">
-								拒绝
+						</view> -->
+							<view class="row border" v-if="isAdmin">
+								<view class="row half">
+									<view class="name">
+										订单金额
+									</view>
+									<view class="text red">
+										¥{{item.real_amount}}
+									</view>
+								</view>
+								<view class="row half">
+									<view class="btn">
+										拒绝
+									</view>
+								</view>
 							</view>
 						</view>
-					</view>
+					</scroll-view>
 				</swiper-item>
 			</swiper>
 		</view>
@@ -403,10 +643,15 @@
 				],
 				// 弹窗
 				show: false,
+				last_page: 1,
 				page: 1,
-				limit: 100,
+				limit: 10,
 				type: 1,
-				data: {},
+				dataA: [],
+				dataB: [],
+				dataC: [],
+				dataD: [],
+				dataE: [],
 				// 是否是管理员
 				isAdmin: false,
 				// 顶部高度
@@ -416,6 +661,9 @@
 		watch: {
 			type(e) {
 				this.getData()
+			},
+			current(e) {
+				this.page = 1;
 			}
 		},
 		created() {
@@ -448,6 +696,28 @@
 			this.getData()
 		},
 		methods: {
+			// 运行详情
+			transport(id) {
+				uni.navigateTo({
+					url: "./transport?id=" + id + "&admin=" + 1
+				})
+			},
+			// 滑动
+			upper() {
+				// console.log(1111)
+				this.page = 1
+				this.getData()
+			},
+			// 滑动
+			lower() {
+				console.log(this.page, this.last_page)
+				if (this.page < this.last_page) {
+					this.page += 1;
+					this.getData()
+				} else {
+					this.$u.toast('没有更多数据了')
+				}
+			},
 			// 删除订单
 			del(id) {
 				let url = ""
@@ -536,6 +806,11 @@
 			},
 			// 获取订单列表
 			getData() {
+				this.dataA = [];
+				this.dataB = [];
+				this.dataC = [];
+				this.dataD = [];
+				this.dataE = [];
 				let url = "";
 				if (this.isAdmin) {
 					url = "/admin_order/orders";
@@ -549,7 +824,22 @@
 				}, "GET").then(res => {
 					uni.stopPullDownRefresh();
 					if (res.code === 1) {
-						this.data = res.data
+						if (this.current === 0) {
+							this.dataA = [...this.dataA, ...res.data.data]
+						}
+						if (this.current === 1) {
+							this.dataB = [...this.dataB, ...res.data.data]
+						}
+						if (this.current === 2) {
+							this.dataC = [...this.dataC, ...res.data.data]
+						}
+						if (this.current === 3) {
+							this.dataD = [...this.dataD, ...res.data.data]
+						}
+						if (this.current === 4) {
+							this.dataE = [...this.dataE, ...res.data.data]
+						}
+						this.last_page = res.data.last_page
 						this.list[this.current].cate_count = res.data.total
 					}
 				})
@@ -606,6 +896,10 @@
 			padding-top: 20rpx;
 
 		}
+
+		.red {
+			color: red;
+		}
 	}
 
 	.menu-top {
@@ -633,8 +927,34 @@
 		background-color: #FFFFFF;
 		border-radius: 30rpx;
 
+		.type_name {
+			width: 4em;
+			text-align: center;
+		}
+
+		.type_status {
+			width: 20%;
+			text-align: center;
+		}
+
+		.green {
+			color: #42C308;
+			border: 1px #42C308 solid;
+		}
+
+		.yellow {
+			color: #F7B314;
+			border: 1px #F7B314 solid;
+		}
+
+		.blue {
+			color: #49BEFA;
+			border: 1px #49BEFA solid;
+		}
+
 		.center {
 			width: 60%;
+			position: relative;
 
 			.image {
 				width: 50rpx;
@@ -643,7 +963,24 @@
 		}
 
 		.row {
+			position: relative;
 			margin: 8rpx 0;
+
+			.length {
+				position: absolute;
+				right: 20rpx;
+			}
+
+			.name {
+				color: #999;
+				width: 20%;
+				// border: 1px blue solid;
+			}
+
+			.text {
+				width: 80%;
+				// border: 1px green solid;
+			}
 		}
 
 		.half {
@@ -652,10 +989,13 @@
 
 			.name {
 				color: #999;
+				width: 40%;
+				// border: 1px red solid;
 			}
 
 			.text {
-				text-indent: 1em;
+				width: 60%;
+				// border: 1px yellow solid;
 			}
 		}
 
@@ -672,8 +1012,8 @@
 			color: #FFFFFF;
 			margin: 20rpx 20rpx 0 20rpx;
 			padding: 10rpx 30rpx;
-			border-radius: 50rpx;
-			min-width: 120rpx;
+			border-radius: 50rpx;
+			min-width: 120rpx;
 			text-align: center;
 		}
 	}

pages/order/settle.vue

@@ -3,22 +3,22 @@
 		<view class="card">
 			<u-form :model="form" ref="uForm">
 				<u-form-item label-align="right" label="取件费：" prop="fee_1" label-width="150">
-					<input v-model="form.fee_1" @blur="inputed" />
+					<input v-model="form.fee_1" @blur="inputed" placeholder="请填写取件费" />
 				</u-form-item>
 				<u-form-item label-align="right" label="运输费：" prop="fee_2" label-width="150">
-					<input v-model="form.fee_2" @blur="inputed" />
+					<input v-model="form.fee_2" @blur="inputed" placeholder="请填写运输费" />
 				</u-form-item>
 				<u-form-item label-align="right" label="派送费：" prop="fee_3" label-width="150">
-					<input v-model="form.fee_3" @blur="inputed" />
+					<input v-model="form.fee_3" @blur="inputed" placeholder="请填写派送费" />
 				</u-form-item>
 				<u-form-item label-align="right" label="笼具费：" prop="fee_4" label-width="150">
-					<input v-model="form.fee_4" @blur="inputed" />
+					<input v-model="form.fee_4" @blur="inputed" placeholder="请填写笼具费" />
 				</u-form-item>
 				<u-form-item label-align="right" label="寄养费：" prop="fee_5" label-width="150">
-					<input v-model="form.fee_5" @blur="inputed" />
+					<input v-model="form.fee_5" @blur="inputed" placeholder="请填写寄养费" />
 				</u-form-item>
 				<u-form-item label-align="right" label="其他：" prop="fee_6" label-width="150">
-					<input v-model="form.fee_6" @blur="inputed" />
+					<input v-model="form.fee_6" @blur="inputed" placeholder="请填写其他" />
 				</u-form-item>
 				<u-form-item label-align="right" label="合计" label-width="150" :border-bottom="false">
 					<input disabled="true" v-model="money" />

pages/order/transport.vue

@@ -41,16 +41,28 @@
 		data() {
 			return {
 				id: "",
+				admin: 0,
 				data: {}
 			}
 		},
-		onLoad(e) {
-			this.id = e.id || 2
+		onLoad(e) {
+			console.log(e)
+			this.id = e.id;
+			if(Number(e.admin)){
+				this.admin = Number(e.admin)
+			}
 			this.getData();
 		},
-		methods: {
-			getData() {
-				this.request("/sender_order_controller/send_detail", {
+		methods: {
+			
+			getData() {
+				let url = "";
+				if(this.admin){
+					url = "/admin_order/send_detail";
+				}else{
+					url="/sender_order_controller/send_detail"
+				}
+				this.request(url, {
 					id: this.id
 				}, "GET").then(res => {
 					// console.log(res)
@@ -68,10 +80,9 @@
 	.content {
 		background-color: #F8F8F8;
 
-		
+
 
 		.body {
-			margin-top: 50rpx;
 			background-color: #FFFFFF;
 			width: 100%;
 			min-height: 100vh;
@@ -100,6 +111,7 @@
 					justify-content: flex-start;
 					position: relative;
 					padding-bottom: 60rpx;
+
 					.icon-big {
 						width: 50rpx;
 						height: 50rpx;

pages/refund/refund.vue

@@ -7,11 +7,11 @@
 			<!-- 1 -->
 			<view class="row" v-if="type === 1">
 				<view class="col-name">取宠代理</view>
-				<view class="col-money">{{item.senders[0].user.name}}</view>
+				<view class="col-money">{{item.senders[0].user.nickname}}</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 class="col-money">{{item.senders[1].user.nickname}}</view>
 			</view>
 			<view class="row" v-if="type === 1">
 				<view class="col-name">结算金额</view>
@@ -82,7 +82,7 @@
 			</view>
 			<view class="row" v-if="type === 3">
 				<view class="col-name">订单编号</view>
-				<view class="col-money">{{item.id}}</view>
+				<view class="col-money">{{item.no}}</view>
 			</view>
 			<view class="row" v-if="type === 3">
 				<view class="col-name">退款时间</view>
@@ -92,7 +92,7 @@
 				<view class="col-name">退款原因</view>
 				<view class="col-money">{{item.refund_reason}}</view>
 			</view>
-			<view class="image" v-if="type === 3">
+			<view class="image" v-if="type === 3" @click="clickImage(item.refund_images)">
 				<image v-for="(iitem,index) in item.refund_images" :src="iitem" class="image-dom" :key="index"></image>
 			</view>
 			<view class="btn" v-if="type === 3">
@@ -193,6 +193,12 @@
 			this.getData();
 		},
 		methods: {
+			// 点击查看图片
+			clickImage(images) {
+				uni.previewImage({
+					urls: images
+				})
+			},
 			// 点击删除订单
 			delorder(id){
 				this.request("/admin_order/order_delete",{id:id},"GET").then(res=>{
@@ -376,7 +382,9 @@
 				}
 
 				.col-money {
-					width: 70%;
+					width: 70%;
+					overflow-x: scroll;
+					white-space: nowrap;
 				}
 
 				.yellow {
@@ -389,13 +397,14 @@
 				flex-direction: row;
 				align-items: center;
 				justify-content: flex-start;
+					flex-wrap: wrap;
 
 				.image-dom {
 					width: 120rpx;
 					height: 120rpx;
 					border: 1px #eee solid;
-					margin-right: 20rpx;
-					flex-wrap: wrap;
+					margin-right: 20rpx;
+					margin-bottom: 20rpx;
 				}
 			}
 

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

@@ -57,9 +57,7 @@ text {
   font-size: 34rpx;
 }
 .u-flex {
-
   display: flex;
-
   flex-direction: row;
   align-items: center;
 }
@@ -103,9 +101,7 @@ text {
   text-align: right;
 }
 .u-flex-col {
-
   display: flex;
-
   flex-direction: column;
 }
 .u-flex-0 {
@@ -3081,9 +3077,7 @@ page {
 .u-border-top-bottom:after,
 .u-border-top:after,
 .u-border:after {
-
   content: ' ';
-
   position: absolute;
   left: 0;
   top: 0;
@@ -3120,9 +3114,7 @@ page {
 /* start--clearfix--start */
 .u-clearfix:after,
 .clearfix:after {
-
   content: '';
-
   display: table;
   clear: both;
 }
@@ -3135,14 +3127,6 @@ page {
 }
 /* end--高斯模糊tabbar底部处理--end */
 /* start--提升H5端uni.toast()的层级，避免被uView的modal等遮盖--start */
-
-
-
-
-
-
-
-
 /* end--提升H5端uni.toast()的层级，避免被uView的modal等遮盖--end */
 /* start--去除button的所有默认样式--start */
 .u-reset-button {
@@ -3156,13 +3140,6 @@ page {
   border: none;
 }
 /* end--去除button的所有默认样式--end */
-
-
-
-
-
-
-
 /* start--微信小程序编译后页面有组件名的元素，特别处理--start */
 u-td, u-th {
   flex: 1;
@@ -3189,30 +3166,8 @@ u-switch {
 u-dropdown {
   flex: 1;
 }
-
 /* end-微信小程序编译后页面有组件名的元素，特别处理--end */
-
-
-
-
-
 /* start--头条小程序编译后页面有组件名的元素，特别处理--start */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 /* end-头条小程序编译后页面有组件名的元素，特别处理--end */
 .content {
   background-color: #F8F8F8;

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

@@ -324,7 +324,7 @@ var promiseInterceptor = {
 
 
 var SYNC_API_RE =
-/^\$|Window$|WindowStyle$|sendNativeEvent|restoreGlobal|getCurrentSubNVue|getMenuButtonBoundingClientRect|^report|interceptors|Interceptor$|getSubNVueById|requireNativePlugin|upx2px|hideKeyboard|canIUse|^create|Sync$|Manager$|base64ToArrayBuffer|arrayBufferToBase64|getLocale|setLocale/;
+/^\$|Window$|WindowStyle$|sendHostEvent|sendNativeEvent|restoreGlobal|getCurrentSubNVue|getMenuButtonBoundingClientRect|^report|interceptors|Interceptor$|getSubNVueById|requireNativePlugin|upx2px|hideKeyboard|canIUse|^create|Sync$|Manager$|base64ToArrayBuffer|arrayBufferToBase64|getLocale|setLocale/;
 
 var CONTEXT_API_RE = /^create|Manager$/;
 
@@ -1380,12 +1380,34 @@ function handleEvent(event) {var _this = this;
   }
 }
 
+var messages = {};
+
 var locale;
 
 {
   locale = wx.getSystemInfoSync().language;
 }
 
+function initI18nMessages() {
+  if (!isEnableLocale()) {
+    return;
+  }
+  var localeKeys = Object.keys(__uniConfig.locales);
+  if (localeKeys.length) {
+    localeKeys.forEach(function (locale) {
+      var curMessages = messages[locale];
+      var userMessages = __uniConfig.locales[locale];
+      if (curMessages) {
+        Object.assign(curMessages, userMessages);
+      } else {
+        messages[locale] = userMessages;
+      }
+    });
+  }
+}
+
+initI18nMessages();
+
 var i18n = (0, _uniI18n.initVueI18n)(
 locale,
 {});
@@ -1428,6 +1450,19 @@ function initAppLocale(Vue, appVm, locale) {
 
 }
 
+function isEnableLocale() {
+  return typeof __uniConfig !== 'undefined' && __uniConfig.locales && !!Object.keys(__uniConfig.locales).length;
+}
+
+// export function initI18n() {
+//   const localeKeys = Object.keys(__uniConfig.locales || {})
+//   if (localeKeys.length) {
+//     localeKeys.forEach((locale) =>
+//       i18n.add(locale, __uniConfig.locales[locale])
+//     )
+//   }
+// }
+
 var eventChannels = {};
 
 var eventChannelStack = [];
@@ -8649,10 +8684,10 @@ function updateChildComponent (
     // keep a copy of raw propsData
     vm.$options.propsData = propsData;
   }
-  
+
   // fixed by xxxxxx update properties(mp runtime)
   vm._$updateProperties && vm._$updateProperties(vm);
-  
+
   // update listeners
   listeners = listeners || emptyObject;
   var oldListeners = vm.$options._parentListeners;
@@ -9183,7 +9218,7 @@ function initProps (vm, propsOptions) {
             }
             //fixed by xxxxxx __next_tick_pending,uni://form-field 时不告警
             if(
-                key === 'value' && 
+                key === 'value' &&
                 Array.isArray(vm.$options.behaviors) &&
                 vm.$options.behaviors.indexOf('uni://form-field') !== -1
               ){
@@ -9195,7 +9230,7 @@ function initProps (vm, propsOptions) {
             var $parent = vm.$parent;
             while($parent){
               if($parent.__next_tick_pending){
-                return  
+                return
               }
               $parent = $parent.$parent;
             }
@@ -9523,10 +9558,10 @@ function initMixin (Vue) {
     initEvents(vm);
     initRender(vm);
     callHook(vm, 'beforeCreate');
-    !vm._$fallback && initInjections(vm); // resolve injections before data/props  
+    !vm._$fallback && initInjections(vm); // resolve injections before data/props
     initState(vm);
     !vm._$fallback && initProvide(vm); // resolve provide after data/props
-    !vm._$fallback && callHook(vm, 'created');      
+    !vm._$fallback && callHook(vm, 'created');
 
     /* istanbul ignore if */
     if ( true && config.performance && mark) {
@@ -10252,7 +10287,7 @@ function mountComponent$1(
       }
     }
   }
-  
+
   !vm._$fallback && callHook(vm, 'beforeMount');
 
   var updateComponent = function () {
@@ -10451,14 +10486,16 @@ function internalMixin(Vue) {
     if (!target) {
       target = this;
     }
-    target[key] = value;
+    // 解决动态属性添加
+    Vue.set(target, key, value)
   };
 
   Vue.prototype.__set_sync = function(target, key, value) {
     if (!target) {
       target = this;
     }
-    target[key] = value;
+    // 解决动态属性添加
+    Vue.set(target, key, value)
   };
 
   Vue.prototype.__get_orig = function(item) {
@@ -10591,7 +10628,7 @@ Vue.prototype.__patch__ = patch;
 // public mount method
 Vue.prototype.$mount = function(
     el ,
-    hydrating 
+    hydrating
 ) {
     return mountComponent$1(this, el, hydrating)
 };

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

@@ -1 +1 @@
-<view class="content"><u-header class="vue-ref" vue-id="8dd740cc-1" userinfo="{{userinfo}}" data-ref="toRefresh" bind:__l="__l"></u-header><view class="card"><view class="title">待办事项</view><view class="row"><view data-event-opts="{{[['tap',[['goToReFund',[1]]]]]}}" class="col" bindtap="__e"><view class="item-title">待结算(笔)</view><view class="item-num">{{''+data.settle+''}}</view></view><view data-event-opts="{{[['tap',[['goToReFund',[2]]]]]}}" class="col" bindtap="__e"><view class="item-title">待处理的反馈建议(条)</view><view class="item-num">{{''+data.feedback+''}}</view></view></view><view class="row"><view data-event-opts="{{[['tap',[['goToReFund',[3]]]]]}}" class="col" bindtap="__e"><view class="item-title">待处理的退款(笔)</view><view class="item-num">{{''+data.refund+''}}</view></view><view data-event-opts="{{[['tap',[['goToReFund',[4]]]]]}}" class="col" bindtap="__e"><view class="item-title">售后管理(条)</view><view class="item-num">{{''+data.service+''}}</view></view></view></view><view class="card"><view class="title">资金流水</view><view class="row"><view data-event-opts="{{[['tap',[['goToTurnOver',[1]]]]]}}" class="col" bindtap="__e"><view class="item-title">今日营业额(元)</view><view class="item-num">{{''+data.today_profit+''}}</view></view><view data-event-opts="{{[['tap',[['goToTurnOver',[2]]]]]}}" class="col" bindtap="__e"><view class="item-title">今日结算金额(元)</view><view class="item-num">{{''+data.today_settled+''}}</view></view></view><view class="row"><view data-event-opts="{{[['tap',[['goToTurnOver',[3]]]]]}}" class="col" bindtap="__e"><view class="item-title">今日盈利明细(元)</view><view class="item-num">{{''+data.today_turnover+''}}</view></view></view></view></view>
+<view class="content"><u-header class="vue-ref" vue-id="8dd740cc-1" userinfo="{{userinfo}}" data-ref="toRefresh" bind:__l="__l"></u-header><view class="card"><view class="title">待办事项</view><view class="row"><view data-event-opts="{{[['tap',[['goToReFund',[1]]]]]}}" class="col" bindtap="__e"><view class="item-title">待结算(笔)</view><view class="item-num">{{''+data.settle+''}}</view></view><view data-event-opts="{{[['tap',[['goToReFund',[2]]]]]}}" class="col" bindtap="__e"><view class="item-title">待处理的反馈建议(条)</view><view class="item-num">{{''+data.feedback+''}}</view></view></view><view class="row"><view data-event-opts="{{[['tap',[['goToReFund',[3]]]]]}}" class="col" bindtap="__e"><view class="item-title">待处理的退款(笔)</view><view class="item-num">{{''+data.refund+''}}</view></view><view data-event-opts="{{[['tap',[['goToReFund',[4]]]]]}}" class="col" bindtap="__e"><view class="item-title">售后管理(条)</view><view class="item-num">{{''+data.service+''}}</view></view></view></view><view class="card"><view class="title">资金流水</view><view class="row"><view data-event-opts="{{[['tap',[['goToTurnOver',[1]]]]]}}" class="col" bindtap="__e"><view class="item-title">今日营业额(元)</view><view class="item-num">{{''+data.today_turnover+''}}</view></view><view data-event-opts="{{[['tap',[['goToTurnOver',[2]]]]]}}" class="col" bindtap="__e"><view class="item-title">今日结算金额(元)</view><view class="item-num">{{''+data.today_settled+''}}</view></view></view><view class="row"><view data-event-opts="{{[['tap',[['goToTurnOver',[3]]]]]}}" class="col" bindtap="__e"><view class="item-title">今日盈利明细(元)</view><view class="item-num">{{''+data.today_profit+''}}</view></view></view></view></view>

unpackage/dist/dev/mp-weixin/pages/login/login.wxml

@@ -1 +1 @@
-<view class="content"><image class="login_img" src="http://pet.hdlkeji.com/assets/static/bg.png" mode></image><view class="logina"><view class="logina_a"><view class="logina_p">账号</view><input class="logina_inp" type="text" value="{{account}}" placeholder="请输入账号" data-event-opts="{{[['input',[['__set_model',['','account','$event',[]]]]]]}}" bindinput="__e"/></view><view class="logina_a"><view class="logina_p">密码</view><input class="logina_inp" type="password" value="{{password}}" placeholder="请输入密码" data-event-opts="{{[['input',[['__set_model',['','password','$event',[]]]]]]}}" bindinput="__e"/></view><view class="logina_d"><view data-event-opts="{{[['tap',[['onlogin',['$event']]]]]}}" class="{{['logina_btn',phone.length>=11&&ver_code.length>=4?'bgcolor':'bgcolore']}}" bindtap="__e">登录</view></view><view class="logina_e"><checkbox-group data-event-opts="{{[['change',[['read',['$event']]]]]}}" bindchange="__e"><checkbox style="transform:scale(0.6);" checked="{{cb}}"></checkbox>阅读并同意<text data-event-opts="{{[['tap',[['goToAgreement',['$event']]]]]}}" catchtap="__e">《宠365用户协议》</text></checkbox-group></view></view></view>
+<view class="content"><image class="login_img" src="http://pet.hdlkeji.com/assets/static/bg.png" mode></image><view class="logina"><view class="logina_a"><view class="logina_p">账号</view><input class="logina_inp" value="{{account}}" placeholder="请输入账号" data-event-opts="{{[['input',[['__set_model',['','account','$event',[]]]]]]}}" bindinput="__e"/></view><view class="logina_a"><view class="logina_p">密码</view><input class="logina_inp" type="password" value="{{password}}" placeholder="请输入密码" data-event-opts="{{[['input',[['__set_model',['','password','$event',[]]]]]]}}" bindinput="__e"/></view><view class="logina_d"><view data-event-opts="{{[['tap',[['onlogin',['$event']]]]]}}" class="{{['logina_btn',phone.length>=11&&ver_code.length>=4?'bgcolor':'bgcolore']}}" bindtap="__e">登录</view></view><view class="logina_e"><checkbox-group data-event-opts="{{[['change',[['read',['$event']]]]]}}" bindchange="__e"><checkbox style="transform:scale(0.6);" checked="{{cb}}"></checkbox>阅读并同意<text data-event-opts="{{[['tap',[['goToAgreement',['$event']]]]]}}" catchtap="__e">《宠365用户协议》</text></checkbox-group></view></view></view>

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

@@ -70,13 +70,14 @@
   border-bottom: 1rpx #eee solid;
   padding: 10rpx 0;
 }
-.list .list-box .icon {
+.list .row .icon {
   width: 10%;
 }
-.list .list-box .text {
-  width: 70%;
+.list .row .text {
+  width: 50%;
 }
-.list .list-box .money {
-  width: 20%;
+.list .row .number {
+  width: 40%;
+  text-align: right;
 }
 

unpackage/dist/dev/mp-weixin/pages/order/info.wxss

@@ -39,6 +39,10 @@
 .row {
   justify-content: flex-start;
 }
+.row .row .name {
+  min-width: 90rpx;
+  text-align: right;
+}
 .card {
   background-color: #FFFFFF;
   width: 93%;
@@ -53,9 +57,12 @@
 }
 .card .name {
   color: #999;
+  min-width: 20%;
 }
 .card .text {
   text-indent: 1em;
+  overflow-x: scroll;
+  white-space: nowrap;
 }
 .card .red {
   color: red;
@@ -155,13 +162,14 @@
   flex-direction: row;
   align-items: center;
   justify-content: flex-start;
+  flex-wrap: wrap;
 }
 .image .image-dom {
   width: 120rpx;
   height: 120rpx;
   border: 1px #eee solid;
   margin-right: 20rpx;
-  flex-wrap: wrap;
+  margin-bottom: 20rpx;
 }
 .bottom-btn {
   position: fixed;

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

@@ -1,9 +1,10 @@
 {
   "navigationStyle": "custom",
   "navigationBarTextStyle": "black",
-  "enablePullDownRefresh": true,
+  "enablePullDownRefresh": false,
   "usingComponents": {
     "u-tabs": "/uview-ui/components/u-tabs/u-tabs",
+    "u-icon": "/uview-ui/components/u-icon/u-icon",
     "u-popup": "/uview-ui/components/u-popup/u-popup",
     "u-header": "/components/u-header"
   }

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

@@ -33,6 +33,9 @@
   background-color: #F8F8F8;
   padding-top: 20rpx;
 }
+.content .red {
+  color: red;
+}
 .menu-top {
   width: 100%;
   background-color: #FFFFFF;
@@ -56,25 +59,59 @@
   background-color: #FFFFFF;
   border-radius: 30rpx;
 }
+.card .type_name {
+  width: 4em;
+  text-align: center;
+}
+.card .type_status {
+  width: 20%;
+  text-align: center;
+}
+.card .green {
+  color: #42C308;
+  border: 1px #42C308 solid;
+}
+.card .yellow {
+  color: #F7B314;
+  border: 1px #F7B314 solid;
+}
+.card .blue {
+  color: #49BEFA;
+  border: 1px #49BEFA solid;
+}
 .card .center {
   width: 60%;
+  position: relative;
 }
 .card .center .image {
   width: 50rpx;
   height: 40rpx;
 }
 .card .row {
+  position: relative;
   margin: 8rpx 0;
 }
+.card .row .length {
+  position: absolute;
+  right: 20rpx;
+}
+.card .row .name {
+  color: #999;
+  width: 20%;
+}
+.card .row .text {
+  width: 80%;
+}
 .card .half {
   width: 50%;
   justify-content: flex-start;
 }
 .card .half .name {
   color: #999;
+  width: 40%;
 }
 .card .half .text {
-  text-indent: 1em;
+  width: 60%;
 }
 .card .border {
   border-top: 1px #eee solid;

unpackage/dist/dev/mp-weixin/pages/order/transport.wxss

@@ -31,7 +31,6 @@ page,
 }
 page .body,
 .content .body {
-  margin-top: 50rpx;
   background-color: #FFFFFF;
   width: 100%;
   min-height: 100vh;

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

@@ -65,6 +65,8 @@
 }
 .content .card .row .col-money {
   width: 70%;
+  overflow-x: scroll;
+  white-space: nowrap;
 }
 .content .card .row .yellow {
   color: #F6B301;
@@ -74,13 +76,14 @@
   flex-direction: row;
   align-items: center;
   justify-content: flex-start;
+  flex-wrap: wrap;
 }
 .content .card .image .image-dom {
   width: 120rpx;
   height: 120rpx;
   border: 1px #eee solid;
   margin-right: 20rpx;
-  flex-wrap: wrap;
+  margin-bottom: 20rpx;
 }
 .content .card .btn {
   display: flex;

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

@@ -6,8 +6,40 @@
   "setting": {
     "urlCheck": false,
     "es6": true,
+    "enhance": true,
     "postcss": true,
-    "minified": true
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": false,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "lazyloadPlaceholderEnable": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "enableEngineNative": false,
+    "useIsolateContext": true,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "disableUseStrict": false,
+    "showES6CompileOption": false,
+    "useCompilerPlugins": false,
+    "minifyWXML": true
   },
   "compileType": "miniprogram",
   "libVersion": "",
@@ -15,19 +47,15 @@
   "projectname": "pet",
   "condition": {
     "search": {
-      "current": -1,
       "list": []
     },
     "conversation": {
-      "current": -1,
       "list": []
     },
     "game": {
-      "current": -1,
       "list": []
     },
     "miniprogram": {
-      "current": -1,
       "list": []
     }
   }

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

@@ -14,15 +14,9 @@
       "list": [
         {
           "name": "",
-          "pathName": "pages/order/order",
+          "pathName": "pages/index/index",
           "query": "",
           "scene": null
-        },
-        {
-          "name": "",
-          "pathName": "pages/turnover/turnover",
-          "query": "type=1",
-          "scene": null
         }
       ]
     }

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

@@ -36,10 +36,8 @@
 .u-checkbox__icon-wrap.data-v-54acf820 {
   color: #606266;
   flex: none;
-
   display: flex;
   flex-direction: row;
-
   align-items: center;
   justify-content: center;
   box-sizing: border-box;

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

@@ -26,10 +26,8 @@
 /* 透明度 */
 /* 文章场景相关 */
 .u-form-item.data-v-006449ec {
-
   display: flex;
   flex-direction: row;
-
   padding: 20rpx 0;
   font-size: 28rpx;
   color: #303133;
@@ -41,23 +39,18 @@
   border-color: #fa3534;
 }
 .u-form-item__body.data-v-006449ec {
-
   display: flex;
   flex-direction: row;
 }
 .u-form-item--left.data-v-006449ec {
-
   display: flex;
   flex-direction: row;
-
   align-items: center;
 }
 .u-form-item--left__content.data-v-006449ec {
   position: relative;
-
   display: flex;
   flex-direction: row;
-
   align-items: center;
   padding-right: 10rpx;
   flex: 1;
@@ -73,10 +66,8 @@
   padding-top: 6rpx;
 }
 .u-form-item--left__content__label.data-v-006449ec {
-
   display: flex;
   flex-direction: row;
-
   align-items: center;
   flex: 1;
 }
@@ -84,10 +75,8 @@
   flex: 1;
 }
 .u-form-item--right__content.data-v-006449ec {
-
   display: flex;
   flex-direction: row;
-
   align-items: center;
   flex: 1;
 }