XXX

pages.json

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

pages/Delivery/create.vue

@@ -15,7 +15,7 @@
 		<input type="text" placeholder="请输入姓名" class="input-card" v-model="info.name" />
 		<input type="number" maxlength="11" placeholder="请输入联系方式" class="input-card" v-model="info.mobile"  />
 		<input type="text" placeholder="请输入账号" class="input-card" v-model="info.username" />
-		<input type="password" v-if="pageType === 1" placeholder="请输入6-12位密码" class="input-card"
+		<input type="password" v-if="pageType === 1" placeholder="请输入8-12位密码" class="input-card"
 			v-model="info.password" maxlength="12" />
 		<view class="card" style="margin-top: 40rpx;" @click="location">
 			<view class="row">

pages/Marketing/Marketing.vue

@@ -1,64 +1,69 @@
-<template>
-	<view class="content">
-		<view class="card row" @click="goToVipers">
-			<view class="row">
-				<view >
-					会员管理
-				</view>
-			</view>
-			<view>
-				<u-icon name="arrow-right"></u-icon>
-			</view>
-		</view>
-		<view class="card row" @click="goToCoupon">
-			<view class="row">
-				<view >
-					优惠券管理
-				</view>
-			</view>
-			<view>
-				<u-icon name="arrow-right"></u-icon>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			// 优惠券
-			goToCoupon(){
-				uni.navigateTo({
-					url:'./coupon'
-				})
-			},
-			// 前往会员
-			goToVipers(){
-				console.log(111111)
-				uni.navigateTo({
-					url:"./vipers"
-				})
-			}
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	.content{
-		padding-top: 30rpx;
-	}
-	.card{
-		width: 93%;
-		margin: 0 auto;
-		background-color: #FFFFFF;
-		padding: 30rpx;
-		margin-bottom: 40rpx;
+<template>
+	<view class="content">
+		<view class="card row" @click="goToVipers">
+			<view class="row">
+				<view class="row" style="justify-content: flex-start;">
+					<image src="https://pet.hdlkeji.com/assets/static/1/77.png" style="width: 50rpx;height: 50rpx;margin-right: 10rpx;"></image>
+					<view>会员管理</view>
+				</view>
+			</view>
+			<view>
+				<u-icon name="arrow-right"></u-icon>
+			</view>
+		</view>
+		<view class="card row" @click="goToCoupon">
+			<view class="row">
+				<view class="row" style="justify-content: flex-start;">
+					<image src="https://pet.hdlkeji.com/assets/static/1/78.png" style="width: 50rpx;height: 50rpx;margin-right: 10rpx"></image>
+					 <view>优惠券管理</view>
+				</view>
+			</view>
+			<view>
+				<u-icon name="arrow-right"></u-icon>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			// 优惠券
+			goToCoupon() {
+				uni.navigateTo({
+					url: './coupon'
+				})
+			},
+			// 前往会员
+			goToVipers() {
+				console.log(111111)
+				uni.navigateTo({
+					url: "./vipers"
+				})
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		padding-top: 30rpx;
+	}
+
+	.card {
+		width: 93%;
+		margin: 0 auto;
+		background-color: #FFFFFF;
+		padding: 30rpx;
+		margin-bottom: 40rpx;
 		border-radius: 30rpx;
-	}
+		font-family: PingFang SC;
+		font-weight: 500;
+	}
 </style>

pages/Marketing/coupon.vue

@@ -22,10 +22,10 @@
 			<view class="" v-if="checkIndex ===  1">
 				<input type="digit" placeholder="请输入代金券金额" class="input-card" v-model="amount" />
 				<view class="row">
-					<input type="digit" placeholder="请设置起始时间" class="input-card half" disable @click="showStart = true"
+					<input placeholder="请设置起始时间" :disabled="true" class="input-card half" disable @click="showStart = true"
 						v-model="startTime" />
 					-
-					<input type="digit" placeholder="请设置截止时间" class="input-card half" disabled @click="showEnd = true"
+					<input placeholder="请设置截止时间" :disabled="true" class="input-card half" disabled @click="showEnd = true"
 						v-model="endTime" />
 				</view>
 				<input type="digit" placeholder="请输入优惠券数量" class="input-card" v-model="num" />
@@ -36,10 +36,10 @@
 				<input type="digit" placeholder="请输入满多少元" class="input-card" v-model="max" />
 				<input type="digit" placeholder="请输入减多少元" class="input-card" v-model="amount" />
 				<view class="row">
-					<input type="digit" placeholder="请设置起始时间" class="input-card half" disabled @click="showStart = true"
+					<input placeholder="请设置起始时间" :disabled="true" class="input-card half" disabled @click="showStart = true"
 						v-model="startTime" />
 					-
-					<input type="digit" placeholder="请设置截止时间" class="input-card half" disabled @click="showEnd = true"
+					<input placeholder="请设置截止时间" :disabled="true" class="input-card half" disabled @click="showEnd = true"
 						v-model="endTime" />
 				</view>
 				<input type="digit" placeholder="请输入优惠券数量" class="input-card" v-model="num" />
@@ -49,10 +49,10 @@
 			<view class="" v-if="checkIndex === 3">
 				<input type="digit" placeholder="请输入折扣 例:0.8" class="input-card" v-model="amount" />
 				<view class="row">
-					<input type="digit" placeholder="请设置起始时间" class="input-card half" disabled @click="showStart = true"
+					<input placeholder="请设置起始时间" :disabled="true" class="input-card half" disabled @click="showStart = true"
 						v-model="startTime" />
 					-
-					<input type="digit" placeholder="请设置截止时间" class="input-card half" disabled @click="showEnd = true"
+					<input placeholder="请设置截止时间" :disabled="true" class="input-card half" disabled @click="showEnd = true"
 						v-model="endTime" />
 				</view>
 				<input type="digit" placeholder="请输入优惠券数量" class="input-card" v-model="num" />

pages/index/index.vue

@@ -3,8 +3,9 @@
 		<uHeader ref="toRefresh" :userinfo="userinfo" />
 		<!-- 卡片 -->
 		<view class="card">
-			<view class="title">
-				待办事项
+			<view class="title row" style="justify-content: center;">
+				<image src="http://pet.hdlkeji.com/assets/static/1/46.png" style="width: 50rpx;height: 50rpx;margin-right: 20rpx;"></image>
+				<view>待办事项</view>
 			</view>
 			<view class="row">
 				<view class="col"  @click="goToReFund(1)">
@@ -45,8 +46,9 @@
 		</view>
 
 		<view class="card">
-			<view class="title">
-				资金流水
+			<view class="title row" style="justify-content: center;">
+				<image src="http://pet.hdlkeji.com/assets/static/1/76.png" style="height: 50rpx;width: 50rpx;margin-right: 20rpx;"></image>
+				<view>资金流水</view>
 			</view>
 			<view class="row">
 				<view class="col" @click="goToTurnOver(1)">
@@ -112,6 +114,7 @@
 					uni.navigateTo({
 						url:"/pages/turnover/info"
 					})
+					return false
 				}
 				uni.navigateTo({
 					url: "/pages/turnover/turnover?type=" + type

pages/order/info.vue

@@ -28,23 +28,31 @@
 			</view>
 			<view class="order">
 				<view class="order_a"><text class="order_yuan"></text> <text>取</text></view>
-				<view class="order_b">
+				<view class="order_b" @click="copy(info.from_addr.location)">
 					<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>
 					</view>
 				</view>
+				<view class="order_c" @click="callPhone(info.from_addr.mobile)">
+					<image src="https://pet.hdlkeji.com/assets/static/phone.png" style="width: 50rpx;height: 50rpx;">
+					</image>
+				</view>
 			</view>
 			<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_b" @click="copy(info.to_addr.location)">
 					<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>
 					</view>
 				</view>
+				<view class="order_c" @click="callPhone(info.to_addr.mobile)">
+					<image src="https://pet.hdlkeji.com/assets/static/phone.png" style="width: 50rpx;height: 50rpx;">
+					</image>
+				</view>
 			</view>
 			<view class="row">
 				<view class="row half">
@@ -124,12 +132,12 @@
 						备注信息
 					</view>
 					<view class="text">
-						
+
 					</view>
 				</view>
-			</view>
-			<view class="row">
-				{{info.remark === null ?'无':info.remark}}
+			</view>
+			<view class="row">
+				{{info.remark === null ?'无':info.remark}}
 			</view>
 			<view class="row" v-if="info.images.length > 1" @click="clickImage(info.images)">
 				<view class="row half">
@@ -146,22 +154,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" 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">
@@ -176,7 +184,7 @@
 					下单时间
 				</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>
@@ -185,7 +193,7 @@
 					支付方式
 				</view>
 				<view class="text">
-					{{info.pay_type === 1?"余额":"微信"}}
+					{{info.pay_type === 1?"余额支付":"微信支付"}}
 				</view>
 			</view>
 			<view class="row">
@@ -193,23 +201,23 @@
 					支付时间
 				</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>
 
-		<view class="card" v-if="info.protect_valid">
+		<view class="card">
 			<view class="row">
 				<view class="row half">
 					<image src="http://pet.hdlkeji.com/assets/static/detaila.png" style="width: 30rpx;height: 30rpx;">
 					</image>
-					<view style="margin: 0 20rpx;">宠物安心保</view>
+					<view class="yellow" style="margin: 0 20rpx;">宠物安心保</view>
 					<image src="http://pet.hdlkeji.com/assets/static/1/29.png" style="width: 30rpx;height: 30rpx;">
 					</image>
 				</view>
 				<view class="row half yellow">
-					生效中
+					{{info.protect_valid?"生效中":"已失效"}}
 				</view>
 			</view>
 			<view class="row">
@@ -235,8 +243,12 @@
 				<view class="name">
 					联系电话
 				</view>
-				<view class="text">
-					{{info.senders[0]?info.senders[0].user.mobile: "-"}}
+				<view class="text row" style="justify-content: space-between;">
+					<view>
+						{{info.senders[0]?info.senders[0].user.mobile: "-"}}
+					</view>
+					<image src="https://pet.hdlkeji.com/assets/static/phone.png" style="width: 30rpx;height: 30rpx;" @click="callPhone(info.senders[0].user.mobile)">
+					</image>
 				</view>
 			</view>
 			<view class="row" v-if="info.senders[1].user.nickname">
@@ -249,17 +261,19 @@
 			</view>
 			<view class="row" v-if="info.senders[1].user.mobile">
 				<view class="name">
-					联系方式
+					联系电话
 				</view>
-				<view class="text">
-					{{info.senders[1]?info.senders[1].user.mobile: "-"}}
+				<view class="text row" style="justify-content: space-between;">
+					<view>{{info.senders[1]?info.senders[1].user.mobile: "-"}}</view>
+					<image src="https://pet.hdlkeji.com/assets/static/phone.png" style="width: 30rpx;height: 30rpx;" @click="callPhone(info.senders[1].user.mobile)">
+					</image>
 				</view>
 			</view>
 			<view class="row" v-if="">
 				<view class="name">
 					完成时间
 				</view>
-				<view class="text">
+				<view class="text">
 					{{info.completed_at}}
 					<!-- {{info.completed_at?$u.timeFormat(info.completed_at, 'yyyy年mm月dd日 hh时MM分'):'-'}} -->
 				</view>
@@ -273,7 +287,7 @@
 			<view class="row">
 				<view class="row half">
 					<view class="name">
-						取件费 
+						取件费
 					</view>
 					<view class="text red">
 						¥{{info.current_send_order.fee_1}}
@@ -281,7 +295,7 @@
 				</view>
 				<view class="row half">
 					<view class="name">
-						派送费 
+						派送费
 					</view>
 					<view class="text red">
 						¥{{info.current_send_order.fee_3}}
@@ -291,7 +305,7 @@
 			<view class="row">
 				<view class="row half">
 					<view class="name">
-						运输费 
+						运输费
 					</view>
 					<view class="text red">
 						¥{{info.current_send_order.fee_2}}
@@ -299,7 +313,7 @@
 				</view>
 				<view class="row half">
 					<view class="name">
-						寄养费 
+						寄养费
 					</view>
 					<view class="text red">
 						¥{{info.current_send_order.fee_5}}
@@ -309,7 +323,7 @@
 			<view class="row">
 				<view class="row half">
 					<view class="name">
-						宠具费 
+						宠具费
 					</view>
 					<view class="text red">
 						¥{{info.current_send_order.fee_4}}
@@ -317,7 +331,7 @@
 				</view>
 				<view class="row half">
 					<view class="name">
-						其他 
+						其他
 					</view>
 					<view class="text red">
 						¥{{info.current_send_order.fee_6}}
@@ -332,14 +346,14 @@
 					<view class="text red">
 						¥{{info.current_send_order.fee_total}}
 					</view>
-				</view>
-				<view class="row half">
-					
+				</view>
+				<view class="row half">
+
 				</view>
 			</view>
 		</view>
 
-		<view class="card" v-if="info.status === 70">
+		<view class="card" v-if="info.status === 80 && info.refund_status > -1">
 			<view class="title">
 				退款信息
 			</view>
@@ -359,7 +373,7 @@
 						退款时间
 					</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>
@@ -370,12 +384,12 @@
 						退款原因
 					</view>
 					<view class="text">
-						
+
 					</view>
 				</view>
-			</view>
-			<view class="row">
-				{{info.refund_reason||''}}
+			</view>
+			<view class="row">
+				{{info.refund_reason||''}}
 			</view>
 			<view class="row">
 				<view class="row half">
@@ -385,22 +399,23 @@
 				</view>
 			</view>
 			<view class="image">
-				<image :src="item" class="image-dom" v-for="(item,index) in info.refund_images" @click="clickImage(info.refund_images)"></image>
+				<image :src="item" class="image-dom" v-for="(item,index) in info.refund_images"
+					@click="clickImage(info.refund_images)"></image>
 			</view>
 		</view>
 
-		<view class="card" style="margin-bottom: 15vh;">
+		<view class="card" style="margin-bottom: 15vh;" v-if="info.user_remark.length>0">
 			<view class="title">
 				备注信息
 			</view>
-			<view class="col">
-				<view class="name" v-for="(item,key) in info.user_remark">
+			<view class="col" style="width: 100%;">
+				<view class="name" v-for="(item,key) in info.user_remark" style="width: 100%;">
 					{{item.txt}}
 				</view>
 			</view>
 		</view>
 
-		<view class="bottom-btn" v-if="!(isAdmin&&info.status === 10&&info.status===1&&info.status!==40) && !isAdmin">
+		<view class="bottom-btn" v-if="!isAdmin">
 			<view class="buttom-dom" @click="create(info.id)" v-if="info.status === 1 && !isAdmin">
 				立即接单
 			</view>
@@ -411,15 +426,39 @@
 			<view class="buttom-dom" @click="video(0,2,info.id)" v-if="info.status === 10 || info.status === 20">
 				上传更多
 			</view>
-			<view class="buttom-dom" @click="video(info.status,3,info.id)" v-if="info.status === 10">
+			<view class="buttom-dom" @click="video(info.status,3,info.id)"
+				v-if="info.status === 10  && info.current_send_order.type === 1">
 				上传取宠视频
 			</view>
-			<view class="buttom-dom" @click="video(info.status,4,info.id)" v-if="info.status === 20">
+			<view class="buttom-dom" @click="video(info.status,4,info.id)"
+				v-if="info.status === 20 && info.current_send_order.type === 1">
 				上传运输视频
 			</view>
-			<view class="buttom-dom" @click="video(info.status,5,info.id)" v-if="info.status === 30">
+			<view class="buttom-dom" @click="video(info.status,5,info.id)"
+				v-if="info.status === 30 && info.current_send_order.type === 2">
 				上传送达视频
 			</view>
+			<view class="buttom-dom" @click="del(info.id)" v-if="info.status === 60 && info.refund_status !== 0">
+				删除订单
+			</view>
+			<view class="buttom-dom" @click="del(info.id)" v-if="info.status === 80 && info.refund_status !== 0">
+				删除订单
+			</view>
+		</view>
+		<view class="bottom-btn" v-if="isAdmin">
+			<view class="buttom-dom" @click.stop="transport(info.id)" v-if="info.status>1">运送详情</view>
+			<view class="buttom-dom" @click="video(0,1,info.id)"
+				v-if="info.status === 1 || info.status === 10 || info.status === 20 || info.status === 30">
+				备注
+			</view>
+			<view class="buttom-dom" @click.stop="push(info.id)" v-if="info.status == 55">结算</view>
+			<view class="buttom-dom" @click.stop="refuse(info.id)" v-if="info.status == 55">拒绝</view>
+			<view class="buttom-dom" @click="del(info.id)" v-if="info.status === 60 && info.refund_status !== 0">
+				删除订单
+			</view>
+			<view class="buttom-dom" @click="del(info.id)" v-if="info.status === 80 && info.refund_status !== 0">
+				删除订单
+			</view>
 		</view>
 	</view>
 </template>
@@ -430,21 +469,90 @@
 			return {
 				// 是否是管理员
 				isAdmin: false,
-				info: {},
-				id:''
+				info: {},
+				id: ''
 			}
 		},
 		onShow() {
-			this.isAdmin = getApp().globalData.isAdmin
-			this.getData(this.id);
+			// this.isAdmin = getApp().globalData.isAdmin
+			// this.getData(this.id);
 		},
 		onLoad(e) {
 			let id = e.id
 			this.isAdmin = getApp().globalData.isAdmin
-			this.getData(id);
+			this.getData(id);
 			this.id = id
 		},
 		methods: {
+			// 拒绝结算
+			refuse(id) {
+				this.request("/admin_order/deal_settle", {
+					id: id,
+					status: 2
+				}, "GET").then(res => {
+					if (res.code === 1) {
+						uni.navigateBack({
+							delta: 1
+						})
+					}
+				})
+			},
+			// 结算
+			push(id) {
+				this.request("/admin_order/deal_settle", {
+					id: id,
+					status: 1
+				}, "GET").then(res => {
+					if (res.code === 1) {
+						uni.navigateBack({
+							delta: 1
+						})
+					}
+				})
+			},
+			// 运行详情
+			transport(id) {
+				uni.navigateTo({
+					url: "./transport?id=" + id + "&admin=" + 1
+				})
+			},
+			// 删除订单
+			del(id) {
+				let url = ""
+				if (this.isAdmin) {
+					url = "/admin_order/order_delete"
+				} else {
+					url = "/sender_order_controller/delete"
+				}
+				this.request(url, {
+					id: id
+				}, "GET").then(res => {
+					if (res.code === 1) {
+						uni.navigateBack({
+							delta: 1
+						})
+					}
+				})
+			},
+			// 点击复制
+			copy(str) {
+				wx.setClipboardData({
+					data: str,
+					success(res) {
+						wx.getClipboardData({
+							success(res) {
+								console.log(res.data) // data
+							}
+						})
+					}
+				})
+			},
+			// 点击拨打电话
+			callPhone(tel) {
+				uni.makePhoneCall({
+					phoneNumber: tel
+				})
+			},
 			// 点击查看图片
 			clickImage(images) {
 				uni.previewImage({
@@ -503,7 +611,7 @@
 				// 		}
 				// 	})
 				// }
-				uni.navigateTo({
+				uni.redirectTo({
 					url: "./video?status=" + status + "&type=" + type + "&id=" + id
 				})
 			}
@@ -514,7 +622,6 @@
 <style lang="scss">
 	.content {
 		padding-top: 40rpx;
-		padding-bottom: 5vh;
 	}
 
 	.yellow {
@@ -526,12 +633,13 @@
 	}
 
 	.row {
-		justify-content: flex-start;
-		.row{
-			.name{
-				min-width: 90rpx;
-				text-align: right;
-			}
+		justify-content: flex-start;
+
+		.row {
+			.name {
+				min-width: 90rpx;
+				text-align: right;
+			}
 		}
 	}
 
@@ -549,13 +657,13 @@
 		justify-content: space-between;
 
 		.name {
-			color: #999;
+			color: #999;
 			min-width: 20%;
 		}
 
 		.text {
-			text-indent: 1em;
-			overflow-x: scroll;
+			text-indent: 1em;
+			overflow-x: scroll;
 			white-space: nowrap;
 		}
 
@@ -600,6 +708,7 @@
 				justify-content: flex-start;
 				align-items: center;
 
+
 				.order_yuan {
 					display: inline-block;
 					width: 14rpx;
@@ -622,9 +731,10 @@
 			}
 
 			.order_b {
-				width: 85%;
+				width: 80%;
 				text-align: left;
 
+
 				.order_p {
 					font-size: 26rpx;
 					font-family: PingFang SC;
@@ -688,8 +798,6 @@
 
 
 	.bottom-btn {
-		position: fixed;
-		bottom: 0;
 		width: 100vw;
 		height: 10vh;
 		background-color: #FFFFFF;

pages/order/order.vue

@@ -9,10 +9,10 @@
 				<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 class="noOrder" v-if="dataA.length < 1">
 							暂无订单～～
 						</view>
-						<view class="card" @click="info(item)" v-for="(item,index) in dataA" :key="index">
+						<view class="card" @click=" isAdmin? info(item) : ''"  v-for="(item,index) in dataA" :key="index">
 							<view class="row">
 								<view style="width:20%;">
 									<view
@@ -112,7 +112,7 @@
 				<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 class="noOrder" v-if="dataB.length < 1">
 							暂无订单～～
 						</view>
 						<view class="card" @click="info(item)" v-for="(item,index) in dataB" :key="index">
@@ -242,7 +242,7 @@
 				<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 class="noOrder" v-if="dataC.length < 1">
 							暂无订单～～
 						</view>
 						<view class="card" @click="info(item)" v-for="(item,index) in dataC" :key="index">
@@ -362,7 +362,7 @@
 				<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 class="noOrder" v-if="dataD.length < 1">
 							暂无订单～～
 						</view>
 						<view class="card" @click="info(item)" v-for="(item,index) in dataD" :key="index">
@@ -459,7 +459,7 @@
 										¥{{item.real_amount}}
 									</view>
 								</view>
-								<view class="row half">
+								<view class="row half" style="justify-content: flex-end;">
 									<view class="btn" @click.stop="del(item.id)">
 										删除
 									</view>
@@ -477,7 +477,7 @@
 				<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 class="noOrder" v-if="dataE.length < 1">
 							暂无订单～～
 						</view>
 						<view class="card" @click="info(item)" v-for="(item,index) in dataE" :key="index">
@@ -572,13 +572,18 @@
 									</view>
 									<view class="text red">
 										¥{{item.real_amount}}
-									</view>
-								</view>
-								<view class="row half">
-									<view class="btn">
-										拒绝
-									</view>
-								</view>
+									</view>
+								</view>
+								<view class="row half" style="justify-content: flex-end;">
+									<view class="btn" @click.stop="del(item.id)">
+										删除
+									</view>
+								</view>
+							</view>
+							<view class="row border" v-if="!isAdmin">
+								<view class="btn" @click.stop="del(item.id)">
+									删除
+								</view>
 							</view>
 						</view>
 					</scroll-view>
@@ -660,7 +665,8 @@
 		},
 		watch: {
 			type(e) {
-				this.getData()
+				this.getData()
+				this.getDataNum()
 			},
 			current(e) {
 				this.page = 1;
@@ -681,15 +687,16 @@
 			this.getData()
 			// 获取订单数量
 			this.getDataNum()
-			let data = getApp().globalData
-			this.isAdmin = data.isAdmin
-			if (!this.isAdmin) {
-				this.getInfo()
-			}
+			
 		},
 		onShow() {
 			this.getData()
-			this.getDataNum()
+			this.getDataNum()
+			let data = getApp().globalData
+			this.isAdmin = data.isAdmin
+			if (!this.isAdmin) {
+				this.getInfo()
+			}
 		},
 		onPullDownRefresh() {
 			this.getDataNum()

pages/order/transport.vue

@@ -16,7 +16,9 @@
 			</view>
 			<view class="list" v-for="(item,key) in data.log" :key="key">
 				<view class="time">
-					{{$u.timeFormat(item.created_at, 'yyyy年mm月dd日 hh时MM分')}}
+					<view>{{$u.timeFormat(item.created_at, 'yyyy年')}}</view>
+					<view>{{$u.timeFormat(item.created_at, 'mm月dd日')}}</view>
+					<view>{{$u.timeFormat(item.created_at, 'hh时MM分')}}</view>
 				</view>
 				<view class="text">
 					<view class="icon-small"></view>

pages/order/video.vue

@@ -5,18 +5,15 @@
 			<view class="feedback-body feedback-uploader" v-if="type!==1">
 				<view class="uni-uploader">
 					<view class="uni-uploader-body">
-						<view class="uni-uploader__files">
-							<!-- 遍历存放图片的数组 -->
-							<block v-for="(video, index) in videoList" :key="index">
-							  <view class="uni-uploader__file" style="position: relative">
-							    <!-- 将数组中的图片url赋值给src属性,并提供点击预览的方法 -->
-							    <video
-							      class="uni-uploader__img"
-							      :src="video"
-							    ></video>
-							    <!-- 点击 x 的时候删除图片 -->
-							    <view class="close-view" @click="close(index)">x</view>
-							  </view>
+						<view class="uni-uploader__files">
+							<!-- 遍历存放图片的数组 -->
+							<block v-for="(video, index) in videoList" :key="index">
+								<view class="uni-uploader__file" style="position: relative">
+									<!-- 将数组中的图片url赋值给src属性,并提供点击预览的方法 -->
+									<video class="uni-uploader__img" :src="video"></video>
+									<!-- 点击 x 的时候删除图片 -->
+									<view class="close-view" @click="close(index)">x</view>
+								</view>
 							</block>
 							<!-- 图片已选中9张时,关闭按钮 -->
 							<view class="uni-uploader__input-box" v-if="videoList.length < 9">
@@ -46,13 +43,21 @@
 				txt: '',
 				// 上传成功返回的视频地址
 				videoList: [],
+				// 是否是管理员
+				isAdmin: false,
 			};
 		},
 		onLoad(e) {
 			console.log(e)
+			this.isAdmin = getApp().globalData.isAdmin
 			this.status = Number(e.status);
 			this.type = Number(e.type);
 			this.id = Number(e.id);
+			if (Number(e.type) === 1) {
+				uni.setNavigationBarTitle({
+					title: "备注"
+				})
+			}
 		},
 		methods: {
 			GetDetail() {
@@ -64,16 +69,22 @@
 				this.mask = !this.mask;
 			},
 			//提交
-			IssueSubmit() {
-				if(this.txt === ''){
-					this.$u.toast('说点什么～')
-					return false
-				}
-				if(this.videoList.length <1 && this.type !== 1){
-					this.$u.toast('请选择上传的视频')
-					return false
+			IssueSubmit() {
+				if (this.txt === '') {
+					this.$u.toast('说点什么～')
+					return false
+				}
+				if (this.videoList.length < 1 && this.type !== 1) {
+					this.$u.toast('请选择上传的视频')
+					return false
 				}
-				this.request("/sender_order_controller/remark", {
+				let url = ""
+				if (this.isAdmin) {
+					url = '/admin_order/order_remark'
+				} else {
+					url = '/sender_order_controller/remark'
+				}
+				this.request(url, {
 					id: this.id,
 					txt: this.txt,
 					status: this.status,
@@ -84,8 +95,14 @@
 						// uni.navigateBack({
 						// 	delta: 2
 						// })
-						uni.redirectTo({
-							url:"./transport?id=" + this.id
+						if (Number(this.type) === 1) {
+							uni.navigateBack({
+								delta:1
+							})
+							return false
+						}
+						uni.redirectTo({
+							url: "./transport?id=" + this.id
 						})
 					}
 				})
@@ -112,10 +129,10 @@
 							header: {
 								"token": uni.getStorageSync("token")
 							},
-							success: (res) => {
-								let rres = JSON.parse(res.data)
-								console.log(rres,22222)
-								this.videoList.push(rres.data.url)
+							success: (res) => {
+								let rres = JSON.parse(res.data)
+								console.log(rres, 22222)
+								this.videoList.push(rres.data.url)
 								uni.hideLoading();
 							},
 							fail: (err) => {
@@ -321,7 +338,7 @@
 	.uni-uploader__img {
 		display: block;
 		width: 168upx;
-		height: 168upx;
+		height: 168upx;
 		margin-bottom: 20upx;
 	}
 

pages/turnover/info.vue

@@ -29,7 +29,7 @@
 
 		<view class="card" v-for="(item,index) in data.list.data" :key="index">
 			<view class="order">
-				<view class="row">
+				<view class="row" style="justify-content: space-between;">
 					<view class="col">
 						<view class="row">
 							<view class="name">
@@ -57,7 +57,7 @@
 						</view>
 					</view>
 					<view class="red">
-						+{{item.profit}}
+						{{item.profit}}
 					</view>
 				</view>
 			</view>

pages/turnover/turnover.vue

@@ -18,7 +18,7 @@
 			</view>
 		</view>
 		<!-- 日营业额 查询日期选择 -->
-		<u-picker v-model="dateShow" mode="time" start-year="2020" :end-year="date.year" :params="dateParams"
+		<u-picker v-model="dateShow" mode="time" start-year="2020"  :params="dateParams"
 			@confirm="dateConfirm"></u-picker>
 		<view class="card">
 			<view class="row">
@@ -38,7 +38,7 @@
 			</view>
 		</view>
 		<!-- 月营业额 查询日期选择 -->
-		<u-picker v-model="monthShow" mode="time" start-year="2020" :end-year="date.year" :params="monthParams"
+		<u-picker v-model="monthShow" mode="time" start-year="2020"  :params="monthParams"
 			@confirm="monthConfirm"></u-picker>
 		<view class="card">
 			<view class="row">
@@ -58,7 +58,7 @@
 			</view>
 		</view>
 		<!-- 年营业额 查询日期选择 -->
-		<u-picker v-model="yearShow" mode="time" start-year="2020" :end-year="date.year" :params="yearParams"
+		<u-picker v-model="yearShow" mode="time" start-year="2020"  :params="yearParams"
 			@confirm="yearConfirm"></u-picker>
 	</view>
 </template>

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

@@ -1,34 +1,35 @@
 {
-  "pages": [
-    "pages/login/login",
-    "pages/index/index",
-    "pages/refund/refund",
-    "pages/turnover/turnover",
-    "pages/turnover/info",
-    "pages/order/order",
-    "pages/order/info",
-    "pages/Marketing/Marketing",
-    "pages/order/transport",
-    "pages/Marketing/coupon",
-    "pages/Marketing/vipers",
-    "pages/Delivery/Delivery",
-    "pages/Delivery/create",
-    "pages/order/perfect",
-    "pages/order/video",
-    "pages/Delivery/location",
-    "pages/mine/mine",
-    "pages/mine/password",
-    "pages/mine/Withdrawal",
-    "pages/order/settle",
-    "pages/webview/webview"
-  ],
-  "subPackages": [],
-  "window": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "uni-app",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8"
-  },
-  "permission": {},
-  "usingComponents": {}
+    "pages": [
+        "pages/login/login",
+        "pages/index/index",
+        "pages/refund/refund",
+        "pages/turnover/turnover",
+        "pages/turnover/info",
+        "pages/order/order",
+        "pages/order/info",
+        "pages/Marketing/Marketing",
+        "pages/order/transport",
+        "pages/Marketing/coupon",
+        "pages/Marketing/vipers",
+        "pages/Delivery/Delivery",
+        "pages/Delivery/create",
+        "pages/order/perfect",
+        "pages/order/video",
+        "pages/Delivery/location",
+        "pages/mine/mine",
+        "pages/mine/password",
+        "pages/mine/Withdrawal",
+        "pages/order/settle",
+        "pages/webview/webview"
+    ],
+    "subPackages": [],
+    "window": {
+        "navigationBarTextStyle": "black",
+        "navigationBarTitleText": "uni-app",
+        "navigationBarBackgroundColor": "#F8F8F8",
+        "backgroundColor": "#F8F8F8"
+    },
+    "permission": {},
+    "usingComponents": {},
+    "sitemapLocation": "sitemap.json"
 }

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-modal/u-modal":1,"uview-ui/components/u-picker/u-picker":1,"uview-ui/components/u-icon/u-icon":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-search/u-search":1,"uview-ui/components/u-switch/u-switch":1,"uview-ui/components/u-checkbox-group/u-checkbox-group":1,"uview-ui/components/u-checkbox/u-checkbox":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-loading/u-loading":1,"uview-ui/components/u-badge/u-badge":1,"uview-ui/components/u-mask/u-mask":1};
+/******/ 		var cssChunks = {"components/u-header":1,"uview-ui/components/u-input/u-input":1,"uview-ui/components/u-picker/u-picker":1,"uview-ui/components/u-icon/u-icon":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-search/u-search":1,"uview-ui/components/u-switch/u-switch":1,"uview-ui/components/u-checkbox-group/u-checkbox-group":1,"uview-ui/components/u-checkbox/u-checkbox":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-badge/u-badge":1,"uview-ui/components/u-mask/u-mask":1,"uview-ui/components/u-loading/u-loading":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-modal/u-modal":"uview-ui/components/u-modal/u-modal","uview-ui/components/u-picker/u-picker":"uview-ui/components/u-picker/u-picker","uview-ui/components/u-icon/u-icon":"uview-ui/components/u-icon/u-icon","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-search/u-search":"uview-ui/components/u-search/u-search","uview-ui/components/u-switch/u-switch":"uview-ui/components/u-switch/u-switch","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-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-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"}[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-picker/u-picker":"uview-ui/components/u-picker/u-picker","uview-ui/components/u-icon/u-icon":"uview-ui/components/u-icon/u-icon","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-search/u-search":"uview-ui/components/u-search/u-search","uview-ui/components/u-switch/u-switch":"uview-ui/components/u-switch/u-switch","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-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-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-loading/u-loading":"uview-ui/components/u-loading/u-loading"}[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/components/u-header.js

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uPopup: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-popup/u-popup */ "uview-ui/components/u-popup/u-popup").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 256))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-popup/u-popup */ "uview-ui/components/u-popup/u-popup").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 257))
     }
   }
 } catch (e) {

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

@@ -96,10 +96,10 @@ var components
 try {
   components = {
     uSearch: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 263))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 264))
     },
     uSwitch: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-switch/u-switch */ "uview-ui/components/u-switch/u-switch").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-switch/u-switch.vue */ 270))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-switch/u-switch */ "uview-ui/components/u-switch/u-switch").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-switch/u-switch.vue */ 271))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/Delivery/create.js

@@ -96,13 +96,13 @@ var components
 try {
   components = {
     uCheckboxGroup: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 277))
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 278))
     },
     uCheckbox: function() {
       return __webpack_require__.e(/*! import() | uview-ui/components/u-checkbox/u-checkbox */ "uview-ui/components/u-checkbox/u-checkbox").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 285))
     },
     uIcon: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 225))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 226))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/Delivery/location.js

@@ -102,7 +102,7 @@ try {
       return __webpack_require__.e(/*! import() | uview-ui/components/u-index-anchor/u-index-anchor */ "uview-ui/components/u-index-anchor/u-index-anchor").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-index-anchor/u-index-anchor.vue */ 299))
     },
     uIcon: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 225))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 226))
     }
   }
 } catch (e) {

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

@@ -96,7 +96,7 @@ var components
 try {
   components = {
     uIcon: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 225))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 226))
     }
   }
 } catch (e) {
@@ -178,6 +178,8 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
 var _default =
 {
   data: function data() {

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

@@ -1 +1 @@
-<view class="content"><view data-event-opts="{{[['tap',[['goToVipers',['$event']]]]]}}" class="card row" bindtap="__e"><view class="row"><view>会员管理</view></view><view><u-icon vue-id="226487b2-1" name="arrow-right" bind:__l="__l"></u-icon></view></view><view data-event-opts="{{[['tap',[['goToCoupon',['$event']]]]]}}" class="card row" bindtap="__e"><view class="row"><view>优惠券管理</view></view><view><u-icon vue-id="226487b2-2" name="arrow-right" bind:__l="__l"></u-icon></view></view></view>
+<view class="content"><view data-event-opts="{{[['tap',[['goToVipers',['$event']]]]]}}" class="card row" bindtap="__e"><view class="row"><view class="row" style="justify-content:flex-start;"><image style="width:50rpx;height:50rpx;margin-right:10rpx;" src="https://pet.hdlkeji.com/assets/static/1/77.png"></image><view>会员管理</view></view></view><view><u-icon vue-id="226487b2-1" name="arrow-right" bind:__l="__l"></u-icon></view></view><view data-event-opts="{{[['tap',[['goToCoupon',['$event']]]]]}}" class="card row" bindtap="__e"><view class="row"><view class="row" style="justify-content:flex-start;"><image style="width:50rpx;height:50rpx;margin-right:10rpx;" src="https://pet.hdlkeji.com/assets/static/1/78.png"></image><view>优惠券管理</view></view></view><view><u-icon vue-id="226487b2-2" name="arrow-right" bind:__l="__l"></u-icon></view></view></view>

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

@@ -35,5 +35,7 @@
   padding: 30rpx;
   margin-bottom: 40rpx;
   border-radius: 30rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
 }
 

unpackage/dist/dev/mp-weixin/pages/Marketing/coupon.js

@@ -96,7 +96,7 @@ var components
 try {
   components = {
     uPicker: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-picker/u-picker.vue */ 232))
+      return Promise.all(/*! import() | uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-picker/u-picker.vue */ 233))
     }
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/Marketing/vipers.js

@@ -96,10 +96,10 @@ var components
 try {
   components = {
     uSearch: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 263))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-search/u-search */ "uview-ui/components/u-search/u-search").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-search/u-search.vue */ 264))
     },
     uPicker: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-picker/u-picker.vue */ 232))
+      return Promise.all(/*! import() | uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-picker/u-picker.vue */ 233))
     }
   }
 } catch (e) {

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

@@ -214,6 +214,8 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
 {
   components: {
     uHeader: uHeader },
@@ -244,6 +246,7 @@ __webpack_require__.r(__webpack_exports__);
         uni.navigateTo({
           url: "/pages/turnover/info" });
 
+        return false;
       }
       uni.navigateTo({
         url: "/pages/turnover/turnover?type=" + type });

unpackage/dist/dev/mp-weixin/pages/mine/password.js

@@ -102,7 +102,7 @@ try {
       return Promise.all(/*! import() | uview-ui/components/u-form-item/u-form-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-form-item/u-form-item")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-form-item/u-form-item.vue */ 313))
     },
     uInput: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 323))
+      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 218))
     }
   }
 } catch (e) {

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

@@ -556,6 +556,45 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default =
 {
   data: function data() {
@@ -567,8 +606,8 @@ var _default =
 
   },
   onShow: function onShow() {
-    this.isAdmin = getApp().globalData.isAdmin;
-    this.getData(this.id);
+    // this.isAdmin = getApp().globalData.isAdmin
+    // this.getData(this.id);
   },
   onLoad: function onLoad(e) {
     var id = e.id;
@@ -577,6 +616,75 @@ var _default =
     this.id = id;
   },
   methods: {
+    // 拒绝结算
+    refuse: function refuse(id) {
+      this.request("/admin_order/deal_settle", {
+        id: id,
+        status: 2 },
+      "GET").then(function (res) {
+        if (res.code === 1) {
+          uni.navigateBack({
+            delta: 1 });
+
+        }
+      });
+    },
+    // 结算
+    push: function push(id) {
+      this.request("/admin_order/deal_settle", {
+        id: id,
+        status: 1 },
+      "GET").then(function (res) {
+        if (res.code === 1) {
+          uni.navigateBack({
+            delta: 1 });
+
+        }
+      });
+    },
+    // 运行详情
+    transport: function transport(id) {
+      uni.navigateTo({
+        url: "./transport?id=" + id + "&admin=" + 1 });
+
+    },
+    // 删除订单
+    del: function del(id) {
+      var url = "";
+      if (this.isAdmin) {
+        url = "/admin_order/order_delete";
+      } else {
+        url = "/sender_order_controller/delete";
+      }
+      this.request(url, {
+        id: id },
+      "GET").then(function (res) {
+        if (res.code === 1) {
+          uni.navigateBack({
+            delta: 1 });
+
+        }
+      });
+    },
+    // 点击复制
+    copy: function copy(str) {
+      wx.setClipboardData({
+        data: str,
+        success: function success(res) {
+          wx.getClipboardData({
+            success: function success(res) {
+              console.log(res.data); // data
+            } });
+
+        } });
+
+    },
+    // 点击拨打电话
+    callPhone: function callPhone(tel) {
+      uni.makePhoneCall({
+        phoneNumber: tel });
+
+    },
     // 点击查看图片
     clickImage: function clickImage(images) {
       uni.previewImage({
@@ -635,7 +743,7 @@ var _default =
       // 		}
       // 	})
       // }
-      uni.navigateTo({
+      uni.redirectTo({
         url: "./video?status=" + status + "&type=" + type + "&id=" + id });
 
     } } };exports.default = _default;

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

@@ -27,7 +27,6 @@
 /* 文章场景相关 */
 .content {
   padding-top: 40rpx;
-  padding-bottom: 5vh;
 }
 .yellow {
   color: #F6B403;
@@ -118,7 +117,7 @@
   margin-right: 10rpx;
 }
 .card .order .order_b {
-  width: 85%;
+  width: 80%;
   text-align: left;
 }
 .card .order .order_b .order_p {
@@ -172,8 +171,6 @@
   margin-bottom: 20rpx;
 }
 .bottom-btn {
-  position: fixed;
-  bottom: 0;
   width: 100vw;
   height: 10vh;
   background-color: #FFFFFF;

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

@@ -96,13 +96,13 @@ var components
 try {
   components = {
     uTabs: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs/u-tabs.vue */ 249))
+      return Promise.all(/*! import() | uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-tabs/u-tabs.vue */ 250))
     },
     uIcon: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 225))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 226))
     },
     uPopup: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-popup/u-popup */ "uview-ui/components/u-popup/u-popup").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 256))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-popup/u-popup */ "uview-ui/components/u-popup/u-popup").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-popup/u-popup.vue */ 257))
     }
   }
 } catch (e) {
@@ -126,6 +126,17 @@ var render = function() {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
+  if (!_vm._isMounted) {
+    _vm.e0 = function($event, item) {
+      var _temp = arguments[arguments.length - 1].currentTarget.dataset,
+        _temp2 = _temp.eventParams || _temp["event-params"],
+        item = _temp2.item
+
+      var _temp, _temp2
+
+      _vm.isAdmin ? _vm.info(item) : ""
+    }
+  }
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -771,6 +782,11 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
+
+
+
 {
   components: {
     uHeader: uHeader },
@@ -822,6 +838,7 @@ __webpack_require__.r(__webpack_exports__);
   watch: {
     type: function type(e) {
       this.getData();
+      this.getDataNum();
     },
     current: function current(e) {
       this.page = 1;
@@ -842,16 +859,17 @@ __webpack_require__.r(__webpack_exports__);
     this.getData();
     // 获取订单数量
     this.getDataNum();
+
+  },
+  onShow: function onShow() {
+    this.getData();
+    this.getDataNum();
     var data = getApp().globalData;
     this.isAdmin = data.isAdmin;
     if (!this.isAdmin) {
       this.getInfo();
     }
   },
-  onShow: function onShow() {
-    this.getData();
-    this.getDataNum();
-  },
   onPullDownRefresh: function onPullDownRefresh() {
     this.getDataNum();
     this.getData();

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

@@ -1,7 +1,7 @@
 {
   "navigationStyle": "custom",
   "navigationBarTextStyle": "black",
-  "enablePullDownRefresh": false,
+  "enablePullDownRefresh": true,
   "usingComponents": {
     "u-tabs": "/uview-ui/components/u-tabs/u-tabs",
     "u-icon": "/uview-ui/components/u-icon/u-icon",

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

@@ -100,10 +100,14 @@ var render = function() {
   var l0 = _vm.__map(_vm.data.log, function(item, key) {
     var $orig = _vm.__get_orig(item)
 
-    var g0 = _vm.$u.timeFormat(item.created_at, "yyyy年mm月dd日 hh时MM分")
+    var g0 = _vm.$u.timeFormat(item.created_at, "yyyy年")
+    var g1 = _vm.$u.timeFormat(item.created_at, "mm月dd日")
+    var g2 = _vm.$u.timeFormat(item.created_at, "hh时MM分")
     return {
       $orig: $orig,
-      g0: g0
+      g0: g0,
+      g1: g1,
+      g2: g2
     }
   })
 
@@ -186,6 +190,8 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 //
 //
 //
+//
+//
 var _default =
 {
   data: function data() {

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

@@ -1 +1 @@
-<view class="content"><view class="body"><view class="list" style="padding-top:20rpx;"><view class="time"></view><view class="text"><view class="icon-big">收</view><view class="icon-text">{{'【收宠地址】'+data.addr+''}}</view></view></view><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="key" wx:key="key"><view class="list"><view class="time">{{''+item.g0+''}}</view><view class="text"><view class="icon-small"></view><view class="icon-text"><view>{{'【'+item.$orig.status+"】"+item.$orig.txt+''}}</view><view style="display:flex;flex-direction:row;align-items:center;justify-content:flex-start;"><block wx:for="{{item.$orig.media}}" wx:for-item="iitem" wx:for-index="kkey" wx:key="kkey"><video style="width:120rpx;height:120rpx;margin-left:20rpx;" src="{{iitem}}" controls="{{true}}"></video></block></view></view></view></view></block></view></view>
+<view class="content"><view class="body"><view class="list" style="padding-top:20rpx;"><view class="time"></view><view class="text"><view class="icon-big">收</view><view class="icon-text">{{'【收宠地址】'+data.addr+''}}</view></view></view><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="key" wx:key="key"><view class="list"><view class="time"><view>{{item.g0}}</view><view>{{item.g1}}</view><view>{{item.g2}}</view></view><view class="text"><view class="icon-small"></view><view class="icon-text"><view>{{'【'+item.$orig.status+"】"+item.$orig.txt+''}}</view><view style="display:flex;flex-direction:row;align-items:center;justify-content:flex-start;"><block wx:for="{{item.$orig.media}}" wx:for-item="iitem" wx:for-index="kkey" wx:key="kkey"><video style="width:120rpx;height:120rpx;margin-left:20rpx;" src="{{iitem}}" controls="{{true}}"></video></block></view></view></view></view></block></view></view>

unpackage/dist/dev/mp-weixin/pages/order/video.js

@@ -165,9 +165,6 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
-//
-//
-//
 var _default =
 {
   data: function data() {
@@ -177,14 +174,22 @@ var _default =
       type: "",
       txt: '',
       // 上传成功返回的视频地址
-      videoList: [] };
+      videoList: [],
+      // 是否是管理员
+      isAdmin: false };
 
   },
   onLoad: function onLoad(e) {
     console.log(e);
+    this.isAdmin = getApp().globalData.isAdmin;
     this.status = Number(e.status);
     this.type = Number(e.type);
     this.id = Number(e.id);
+    if (Number(e.type) === 1) {
+      uni.setNavigationBarTitle({
+        title: "备注" });
+
+    }
   },
   methods: {
     GetDetail: function GetDetail() {
@@ -205,7 +210,13 @@ var _default =
         this.$u.toast('请选择上传的视频');
         return false;
       }
-      this.request("/sender_order_controller/remark", {
+      var url = "";
+      if (this.isAdmin) {
+        url = '/admin_order/order_remark';
+      } else {
+        url = '/sender_order_controller/remark';
+      }
+      this.request(url, {
         id: this.id,
         txt: this.txt,
         status: this.status,
@@ -216,6 +227,12 @@ var _default =
           // uni.navigateBack({
           // 	delta: 2
           // })
+          if (Number(_this2.type) === 1) {
+            uni.navigateBack({
+              delta: 1 });
+
+            return false;
+          }
           uni.redirectTo({
             url: "./transport?id=" + _this2.id });
 

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

@@ -95,8 +95,8 @@ __webpack_require__.r(__webpack_exports__);
 var components
 try {
   components = {
-    uModal: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-modal/u-modal */ "uview-ui/components/u-modal/u-modal").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-modal/u-modal.vue */ 218))
+    uInput: function() {
+      return Promise.all(/*! import() | uview-ui/components/u-input/u-input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-input/u-input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-input/u-input.vue */ 218))
     }
   }
 } catch (e) {
@@ -133,6 +133,23 @@ var render = function() {
     }
   })
 
+  if (!_vm._isMounted) {
+    _vm.e0 = function($event) {
+      _vm.show_money = false
+    }
+
+    _vm.e1 = function($event, item) {
+      var _temp = arguments[arguments.length - 1].currentTarget.dataset,
+        _temp2 = _temp.eventParams || _temp["event-params"],
+        item = _temp2.item
+
+      var _temp, _temp2
+
+      _vm.show_money = true
+      _vm.order_id = item.id
+    }
+  }
+
   _vm.$mp.data = Object.assign(
     {},
     {
@@ -321,6 +338,22 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default =
 {
   data: function data() {
@@ -336,7 +369,13 @@ var _default =
       showfeedback: false,
       // 反馈内容
       feedbackId: '',
-      feedbackconent: '' };
+      feedbackconent: '',
+      // 是否显示输入退款金额弹窗
+      show_money: false,
+      // 输入的退款金额
+      amount: "",
+      // 订单id
+      order_id: "" };
 
   },
   onLoad: function onLoad(e) {
@@ -377,7 +416,9 @@ var _default =
     },
     // 点击删除订单
     delorder: function delorder(id) {var _this2 = this;
-      this.request("/admin_order/order_delete", { id: id }, "GET").then(function (res) {
+      this.request("/admin_order/order_delete", {
+        id: id },
+      "GET").then(function (res) {
         if (res.code === 1) {
           _this2.$u.toast('操作成功');
           _this2.getData();
@@ -392,7 +433,10 @@ var _default =
         showCancel: true,
         success: function success(e) {
           if (e.confirm) {
-            _this.request("/admin_order/deal_refund", { id: id, status: 2 }, "GET").then(function (res) {
+            _this.request("/admin_order/deal_refund", {
+              id: id,
+              status: 2 },
+            "GET").then(function (res) {
               if (res.code === 1) {
                 _this.$u.toast("操作成功");
                 _this.getData();
@@ -403,22 +447,43 @@ var _default =
 
     },
     // 点击同意退款
-    agree: function agree(id) {
+    agree: function agree() {
       var _this = this;
-      uni.showModal({
-        title: "确定要同意退款吗？",
-        showCancel: true,
-        success: function success(e) {
-          if (e.confirm) {
-            _this.request("/admin_order/deal_refund", { id: id, status: 1 }, "GET").then(function (res) {
-              if (res.code === 1) {
-                _this.$u.toast("操作成功");
-                _this.getData();
-              }
-            });
-          }
-        } });
+      if (this.amount === "") {
+        uni.showToast({
+          icon: "none",
+          title: "请输入退款金额" });
 
+        return false;
+      }
+      _this.request("/admin_order/deal_refund", {
+        id: _this.order_id,
+        status: 1,
+        amount: _this.amount },
+      "GET").then(function (res) {
+        if (res.code === 1) {
+          _this.$u.toast("操作成功");
+          _this.getData();
+        }
+      });
+      // uni.showModal({
+      // 	title: "确定要同意退款吗？",
+      // 	showCancel: true,
+      // 	success(e) {
+      // 		if (e.confirm) {
+      // 			_this.request("/admin_order/deal_refund", {
+      // 				id: _this.order_id,
+      // 				status: 1,
+      // 				amount: _this.amount
+      // 			}, "GET").then(res => {
+      // 				if (res.code === 1) {
+      // 					_this.$u.toast("操作成功")
+      // 					_this.getData()
+      // 				}
+      // 			})
+      // 		}
+      // 	}
+      // })
     },
     // 确认反馈
     feedbackconfirm: function feedbackconfirm(id) {var _this3 = this;
@@ -437,16 +502,16 @@ var _default =
       });
     },
     // 取消反馈
-    feedbackcancel: function feedbackcancel() {
-      this.feedbackconent = '';
-    },
+    // feedbackcancel() {
+    // 	this.feedbackconent = '';
+    // },
     // 点击处理反馈
-    feedback: function feedback(id) {
-      var _this = this;
-      this.showfeedback = true;
-      this.feedbackId = id;
-      console.log(id);
-    },
+    // feedback(id) {
+    // 	let _this = this;
+    // 	this.showfeedback = true;
+    // 	this.feedbackId = id;
+    // 	console.log(id);
+    // },
     // 点击结算
     settlement: function settlement(id) {
       var _this = this;

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

@@ -3,6 +3,6 @@
   "enablePullDownRefresh": true,
   "navigationBarBackgroundColor": "#FFFFFF",
   "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,11 @@
   align-items: center;
   justify-content: flex-start;
 }
+.content .amount {
+  border: 2rpx #eee solid;
+  width: 80%;
+  margin: 20rpx 10%;
+}
 .content .feedbackconent {
   height: 300rpx;
   font-size: 30rpx;
@@ -53,6 +58,65 @@
   padding: 30rpx;
   border-radius: 20rpx;
 }
+.content .card .mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 999999;
+}
+.content .card .mask .mask_a {
+  background-color: #fff;
+  width: 518rpx;
+  height: 360rpx;
+  position: absolute;
+  top: 40%;
+  left: 50%;
+  -webkit-transform: translate(-50%, -50%);
+          transform: translate(-50%, -50%);
+  text-align: center;
+}
+.content .card .mask .mask_a .mask_p {
+  font-size: 28rpx;
+  color: #111111;
+  line-height: 45rpx;
+}
+.content .card .mask .mask_a .mask_p1 {
+  font-size: 28rpx;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  line-height: 45rpx;
+  color: #0052C1;
+  opacity: 1;
+}
+.content .card .mask .mask_a .mask_b {
+  width: 386rpx;
+  height: 60rpx;
+  margin: 0 auto;
+  background: #F6B301;
+  opacity: 1;
+  border-radius: 66rpx;
+  line-height: 60rpx;
+  text-align: center;
+  font-size: 26rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
+  margin-top: 35rpx;
+}
+.content .card .mask .mask_a .colse {
+  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAqCAYAAADFw8lbAAAAAXNSR0IArs4c6QAABVJJREFUWEe1mVHIZVMUx///ojx4oAhlQlGEIjNFTMjITEaZ8kBNMTEZeUBGERMPU0ZMKGXKJ8rIFGrKKELIFIWQETJCPIxSPHhQppZ+19pf557v3HP2vfPdVaevvrvP3v+99lr//9rrWDNaRBwl6XJJayWdKekESafm87ekPyT9JumQpAOS9tr+Zsbl5GlfjIhrJN0iab2kY6d8/2dJb0l6wvaP07xbDTQiLmIBSVc0Fhh5StLn6Tm8hxfZQPHwyZKuSs/jceywpAVJj9j+vQbwINCIYNHnJN2YE/4labuk123joWqLiJWSbpV0myRC5x9JD9neOTRJL9CIOE3SPknn5aR4dKdtwM5sEUFMPy7p+pxkt6TNtgHeaROBRsSlkl6TxNFxxNdN68GhnUQEifhqhsonkjbYJnyWWCfQBPlBHg8evck2mbzsFhFnS3ojmeM7SattwxhjtgRoRJwu6eP05FOS7rNN8M/NIoLEA+zFknDQ1e01x4Bm4gCSmMSTHMVcQZbdRwQh9mny8ILtzU3PtIG+ktlNTF4yr+OedDQRcYGkjzJmN9p+uYxdBJo8+Vlm9znLnTi1cRMRiMkLyctnFCZoAn0/yXy77W21E89jXER8IQnv3m/7MdYYAU1ZRNrgR3bRy5MZy9dKOmgbVeq1rAtuztjfZfv7vhciAvXDcYt4CtASm1uHVCIXJejZMXa37ad74g4FYv4bcgzUgzN66S4i3pG0BhWz/bxz4T8zgFfYRqsnWtLXT60BnWBz7ibI8ho5AGf2rYPMIt1UXRsACmrQH7B9fuUxNj1aXhkD2wOykyfb60YEBcyvkvD8iQBFc7dSaNQmUXIeMYSqNG0Etgfkfknrho69TBgROIRCZh1AUQRqS7Qckq+yHrBsGoUpMVnmmwokL0XEs5K28AAUJWJiCJ7CoNp6wLbnmBpkAn2YmnVUt0YEiYG+k4lT1Zc5GdLXFQYze7Jx9IX8FwD6b1ZJR8+q6xn4P0g6puXKg5IurI3JjoQiJAnNfQCFmo6TdPwQ0XfFRE/idLJBdVz9H6PcKqC3PQDFE1TcZ9nGA9VWAfKIwEbEnZKe4QFo0fgrbcNxVTZAQdSXndRVNXkOioixZCrySRW/p2aiIZ5MlZvIszVrZKK+JGmjpE149MG8VS4pVqeMyTEKGhKFGrANRloFUKr5r7mP214xNEFEPEr51RrXyZM9YNfYfq9vrQauQ7ZPKdUTmoq2rrJN8TzRIuLbVvz1kvkEsIt15qSF2iddgBapola8YwDok5R2OaZKcRIshQ+nR5mHQyaKS+YADoGNuLftLUD5Bz9glGC9NBUR6Djcu7uvadDccEQgBtSwVGlDtejtknZRmCeew82rSPHqqP4bitV5/Z4bQtaR5pE3WasJlB8YwM7X2n57XmAqQ2u/7dVlbPu6fG927DialUN3m+XeSERwr3oxu31Uc4uJ3dUpKSRLfDB4SXtluQEmudPrKm2kTbYBvGhdQDl6VIUatbdxtVyAWw25HbYfaM89qUlGvNKxgA247K23/dVyAWuxAcdNU5fbKt1DpHxJG6mv7UhhQUuQOzYxu6XZYjlS0JndqFzh5B2Stk2qiYcauewS2uLqin2Z9/gPZwWaZE7XmSsGJ4f3aOKOxWTV0bcHRQQVDLdVJsbepZgdVd6VPfiIODc7zFwvCCkMZbtnSLbHeHTIQ3lUd2VBgioVg0J46BQji7BE+dhA+ADqsryXlXdgFPquIzKvscGPDR3eBSQSSu+J5kXtJxw2wnX8zTyJqfquUwNtZSxURrJxiz0p/+LF8kEM7/6S+t5blQ159T+oXVj5IHylVQAAAABJRU5ErkJggg==") no-repeat center center;
+  background-size: 42rpx 42rpx;
+  width: 42rpx;
+  height: 42rpx;
+  position: absolute;
+  bottom: -80rpx;
+  left: 50%;
+  -webkit-transform: translateX(-50%);
+          transform: translateX(-50%);
+}
 .content .card .row {
   display: flex;
   flex-direction: row;

unpackage/dist/dev/mp-weixin/pages/turnover/info.js

@@ -96,13 +96,13 @@ var components
 try {
   components = {
     uSubsection: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-subsection/u-subsection */ "uview-ui/components/u-subsection/u-subsection").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 242))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-subsection/u-subsection */ "uview-ui/components/u-subsection/u-subsection").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-subsection/u-subsection.vue */ 243))
     },
     uIcon: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 225))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 226))
     },
     uPicker: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-picker/u-picker.vue */ 232))
+      return Promise.all(/*! import() | uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-picker/u-picker.vue */ 233))
     }
   }
 } catch (e) {

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

@@ -96,10 +96,10 @@ var components
 try {
   components = {
     uIcon: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 225))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 226))
     },
     uPicker: function() {
-      return Promise.all(/*! import() | uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-picker/u-picker.vue */ 232))
+      return Promise.all(/*! import() | uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-picker/u-picker.vue */ 233))
     }
   }
 } catch (e) {

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

@@ -1,34 +1,62 @@
 {
-  "description": "项目配置文件。",
-  "packOptions": {
-    "ignore": []
-  },
-  "setting": {
-    "urlCheck": false,
-    "es6": true,
-    "postcss": true,
-    "minified": true
-  },
-  "compileType": "miniprogram",
-  "libVersion": "",
-  "appid": "wx626ffe02cf1f0710",
-  "projectname": "pet",
-  "condition": {
-    "search": {
-      "current": -1,
-      "list": []
+    "description": "项目配置文件。",
+    "packOptions": {
+        "ignore": []
     },
-    "conversation": {
-      "current": -1,
-      "list": []
+    "setting": {
+        "urlCheck": false,
+        "es6": true,
+        "enhance": true,
+        "postcss": 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": ""
+        },
+        "useIsolateContext": true,
+        "userConfirmedBundleSwitch": false,
+        "packNpmManually": false,
+        "packNpmRelationList": [],
+        "minifyWXSS": true,
+        "disableUseStrict": false,
+        "showES6CompileOption": false,
+        "useCompilerPlugins": false,
+        "ignoreUploadUnusedFiles": true,
+        "minifyWXML": true
     },
-    "game": {
-      "current": -1,
-      "list": []
-    },
-    "miniprogram": {
-      "current": -1,
-      "list": []
+    "compileType": "miniprogram",
+    "libVersion": "",
+    "appid": "wx626ffe02cf1f0710",
+    "projectname": "pet",
+    "condition": {
+        "search": {
+            "list": []
+        },
+        "conversation": {
+            "list": []
+        },
+        "game": {
+            "list": []
+        },
+        "miniprogram": {
+            "list": []
+        }
     }
-  }
 }

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

@@ -22,6 +22,13 @@
                     "name": "",
                     "pathName": "pages/order/order",
                     "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/Marketing/Marketing",
+                    "query": "",
                     "scene": null,
                     "launchMode": "default"
                 }

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

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uIcon: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 225))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 226))
     }
   }
 } catch (e) {

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

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uIcon: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 225))
+      return __webpack_require__.e(/*! import() | uview-ui/components/u-icon/u-icon */ "uview-ui/components/u-icon/u-icon").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-icon/u-icon.vue */ 226))
     }
   }
 } catch (e) {
@@ -212,7 +212,7 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 
 
 
-var _emitter = _interopRequireDefault(__webpack_require__(/*! ../../libs/util/emitter.js */ 282));
+var _emitter = _interopRequireDefault(__webpack_require__(/*! ../../libs/util/emitter.js */ 223));
 var _asyncValidator = _interopRequireDefault(__webpack_require__(/*! ../../libs/util/async-validator */ 318));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}
 // 去除警告信息
 _asyncValidator.default.warning = function () {};

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

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