提交

App.vue

@@ -1,5 +1,8 @@
 <script>
-	export default {
+	export default {
+		globalData:{
+			idAdmin:false
+		},
 		onLaunch: function() {
 			console.log('App Launch')
 		},
@@ -19,6 +22,10 @@
 	 .content{
 		background-color: #F8F8F8;
 		min-height: 100vh;
+		.mine-icon{
+			height: 50rpx;
+			width: 50rpx;
+		}
 	 }
 	 
 	.row{
@@ -45,4 +52,5 @@
 		color: red;
 		font-size: 30rpx;
 	}
+	
 </style>

components/u-header.vue

@@ -6,15 +6,17 @@
 				<view class="title">宠365</view>
 			</view>
 		</view>
-		<u-popup v-model="show" mode="left">
+		<u-popup v-model="show" mode="left" v-if="type">
 			<view class="indexa" :style="'top:'+headerHeight+'px'">
 				<view class="sheader_a" @click="side">
 					<image src="http://pet.hdlkeji.com/assets/static/index_icon.png" class="sheader_b" mode=""></image>
-					<image src="http://pet.hdlkeji.com/assets/static/index_logo.png" class="sheader_img" mode=""></image>
+					<image src="http://pet.hdlkeji.com/assets/static/index_logo.png" class="sheader_img" mode="">
+					</image>
 				</view>
 				<view class="indexb">
 					<view class="indexc">
-						<image :src="hasLogin && userinfo.avatar ? userinfo.avatar :'http://pet.hdlkeji.com/assets/static/moren.png'"
+						<image
+							:src="hasLogin && userinfo.avatar ? userinfo.avatar :'http://pet.hdlkeji.com/assets/static/moren.png'"
 							class="indexc_img" mode=""></image>
 						<view class="indexd" @click="GoLogin">
 							<view class="indexd_p">{{ hasLogin? (userinfo.nickname || '未设置昵称') : '立即登录' }}</view>
@@ -24,27 +26,82 @@
 					<view class="indexe">
 						<view class="indexe_a" @click="GoIndex">
 							<view class="indexe_box">
-								<image src="http://pet.hdlkeji.com/assets/static/meun_1.png" class="indexe_icon" mode=""></image>
+								<image src="http://pet.hdlkeji.com/assets/static/meun_1.png" class="indexe_icon"
+									mode=""></image>
 							</view>
 							<view class="indexe_p">代办事项</view>
-						</view>
-						<view class="indexe_a" @click="GoOrder">
-							<view class="indexe_box">
-								<image src="http://pet.hdlkeji.com/assets/static/meun_1.png" class="indexe_icon" mode=""></image>
-							</view>
-							<view class="indexe_p">订单管理</view>
-						</view>
-						<view class="indexe_a" @click="GoMarket">
-							<view class="indexe_box">
-								<image src="http://pet.hdlkeji.com/assets/static/meun_1.png" class="indexe_icon" mode=""></image>
-							</view>
-							<view class="indexe_p">营销设计</view>
-						</view>
-						<view class="indexe_a" @click="GoDelivery">
-							<view class="indexe_box">
-								<image src="http://pet.hdlkeji.com/assets/static/meun_1.png" class="indexe_icon" mode=""></image>
-							</view>
-							<view class="indexe_p">配送员管理</view>
+						</view>
+						<view class="indexe_a" @click="GoOrder">
+							<view class="indexe_box">
+								<image src="http://pet.hdlkeji.com/assets/static/meun_1.png" class="indexe_icon"
+									mode=""></image>
+							</view>
+							<view class="indexe_p">订单管理</view>
+						</view>
+						<view class="indexe_a" @click="GoMarket">
+							<view class="indexe_box">
+								<image src="http://pet.hdlkeji.com/assets/static/meun_1.png" class="indexe_icon"
+									mode=""></image>
+							</view>
+							<view class="indexe_p">营销设计</view>
+						</view>
+						<view class="indexe_a" @click="GoDelivery">
+							<view class="indexe_box">
+								<image src="http://pet.hdlkeji.com/assets/static/meun_1.png" class="indexe_icon"
+									mode=""></image>
+							</view>
+							<view class="indexe_p">配送员管理</view>
+						</view>
+					</view>
+				</view>
+
+			</view>
+		</u-popup>
+		<u-popup v-model="show" mode="left" v-if="!type">
+			<view class="indexa" :style="'top:'+headerHeight+'px'">
+				<view class="sheader_a" @click="side">
+					<image src="http://pet.hdlkeji.com/assets/static/index_icon.png" class="sheader_b" mode=""></image>
+					<image src="http://pet.hdlkeji.com/assets/static/index_logo.png" class="sheader_img" mode="">
+					</image>
+				</view>
+				<view class="indexb">
+					<view class="indexc">
+						<image
+							:src="hasLogin && userinfo.avatar ? userinfo.avatar :'http://pet.hdlkeji.com/assets/static/moren.png'"
+							class="indexc_img" mode=""></image>
+						<view class="indexd" @click="GoLogin">
+							<view class="indexd_p">{{ hasLogin? (userinfo.nickname || '未设置昵称') : '立即登录' }}</view>
+							<view class="indexd_p1" v-if="hasLogin">{{userinfo.mobile}}</view>
+						</view>
+					</view>
+					<view class="indexe">
+						<view class="indexe_a" @click="GoPassword">
+							<view class="indexe_box">
+								<image src="http://pet.hdlkeji.com/assets/static/meun_1.png" class="indexe_icon"
+									mode=""></image>
+							</view>
+							<view class="indexe_p">修改密码</view>
+						</view>
+						<view class="indexe_a" @click="GoWithdeawal">
+							<view class="indexe_box">
+								<image src="http://pet.hdlkeji.com/assets/static/meun_1.png" class="indexe_icon"
+									mode=""></image>
+							</view>
+							<view class="indexe_p">我的钱包</view>
+						</view>
+						<view class="indexe_a" @click="GoMine">
+							<view class="indexe_box">
+								<image src="http://pet.hdlkeji.com/assets/static/meun_1.png" class="indexe_icon"
+									mode=""></image>
+							</view>
+							<view class="indexe_p">完善资料</view>
+						</view>
+						<view class="indexe_a" @click="loginOut">
+							<view class="indexe_box">
+								<image src="http://pet.hdlkeji.com/assets/static/meun_1.png" class="indexe_icon"
+									mode=""></image>
+							</view>
+							<view class="indexe_p">退出登录</view>
 						</view>
 					</view>
 				</view>
@@ -56,7 +113,8 @@
 
 <script>
 	import {
-		getToken
+		getToken,
+		removeToken
 	} from '@/utils/auth';
 	export default {
 		name: "u-header",
@@ -65,7 +123,8 @@
 				headerHeight: 0,
 				show: false,
 				hasLogin: false,
-				userinfo: {}
+				userinfo: {},
+				type: false
 			};
 		},
 		created() {
@@ -77,42 +136,73 @@
 					let navHeight = menuButton.height + navBarPadding
 					this.headerHeight = navHeight + statusBarHeight
 				}
-			})
+			})
 			this.GetUser()
+			let data = getApp().globalData
+			// console.log(data)
+			this.type = data.isAdmin;
 		},
 		methods: {
-			// 代办事项
-			GoIndex(){
-				uni.navigateTo({
-					url:'/pages/index/index'
-				})
-			},
-			GoDelivery(){
-				uni.navigateTo({
-					url:'/pages/Delivery/Delivery'
+			// 点击退出登录
+			loginOut(){
+				getApp.globalData = {
+					isAdmin:false
+				}
+				removeToken()
+				uni.reLaunch({
+					url:"/pages/login/login"
 				})
 			},
-			// 点击营销设置
-			GoMarket(){
+			// 点击完善信息
+			GoMine(){
 				uni.navigateTo({
-					url:'/pages/Marketing/Marketing'
+					url:'/pages/order/perfect'
 				})
-			},
-			// 点击前往订单页面
-			GoOrder(){
+			},
+			// 点击我的钱包
+			GoWithdeawal() {
 				uni.navigateTo({
-					url:'/pages/order/order'
-				})
-			},
-			//去登陆
-			GoLogin() {
-				var token = getToken();
-				if (!token) {
-					this.side()
-					uni.navigateTo({
-						url: '../login/login'
-					})
-				}
+					url:'/pages/mine/mine'
+				})
+			},
+			// 点击修改密码
+			GoPassword() {
+				uni.navigateTo({
+					url: "/pages/mine/password"
+				})
+			},
+			// 代办事项
+			GoIndex() {
+				uni.navigateTo({
+					url: '/pages/index/index'
+				})
+			},
+			GoDelivery() {
+				uni.navigateTo({
+					url: '/pages/Delivery/Delivery'
+				})
+			},
+			// 点击营销设置
+			GoMarket() {
+				uni.navigateTo({
+					url: '/pages/Marketing/Marketing'
+				})
+			},
+			// 点击前往订单页面
+			GoOrder() {
+				uni.navigateTo({
+					url: '/pages/order/order'
+				})
+			},
+			//去登陆
+			GoLogin() {
+				var token = getToken();
+				if (!token) {
+					this.side()
+					uni.navigateTo({
+						url: '../login/login'
+					})
+				}
 			},
 			//获取用户信息
 			GetUser() {
@@ -121,6 +211,7 @@
 					if (token) {
 						this.userinfo = res.data
 						this.hasLogin = true
+						console.log(this.userinfo)
 					}
 
 				});
@@ -139,6 +230,8 @@
 
 	.indexa {
 		position: relative;
+		min-width: 68vw;
+
 		.sheader_a {
 			margin-top: -60rpx;
 			width: 100%;
@@ -272,7 +365,7 @@
 			width: 100%;
 			color: #000000;
 			z-index: 99;
-			// background: linear-gradient(360deg, rgba(236, 236, 236, 0) 0%, #FFFFFF 100%);
+			// background: linear-gradient(360deg, rgba(236, 236, 236, 0) 0%, #FFFFFF 100%);
 			background-color: #FFFFFF;
 
 			.sheader_a {

pages/Delivery/Delivery.vue

@@ -43,12 +43,14 @@
 				</view>
 			</view>
 			<view class="row">
-				<view class="row half">
+				<view class="row locationName">
 					<view class="name">
 						所属区域
 					</view>
 					<view class="text">
-						{{item.area[0].name}}
+						<view v-for="(obj,key) in item.area">
+							{{obj.name}}
+						</view>
 					</view>
 				</view>
 			</view>
@@ -95,30 +97,39 @@
 				dataList: []
 			}
 		},
+		onShow() {
+			this.getData()
+		},
 		onLoad() {
 			this.getData()
 		},
 		methods: {
 			// 禁用
-			open(e) {
+			open(e) {
 				let _this = this
 				let data = e.split(',')
 				// 开启
 				if (data[1] === '1') {
-					this.request("/admin_user/enable",{user_id:data[0],status:'normal'},"GET").then(res=>{
-						console.log(res)
-						if(res.code === 1){
-							_this.getData()
-						}
+					this.request("/admin_user/enable", {
+						user_id: data[0],
+						status: 'normal'
+					}, "GET").then(res => {
+						console.log(res)
+						if (res.code === 1) {
+							_this.getData()
+						}
 					})
 				}
 				// 关闭
 				if (data[1] === '2') {
-					this.request("/admin_user/enable",{user_id:data[0],status:'hidden'},"GET").then(res=>{
-						console.log(res)
-						if(res.code === 1){
-							_this.getData()
-						}
+					this.request("/admin_user/enable", {
+						user_id: data[0],
+						status: 'hidden'
+					}, "GET").then(res => {
+						console.log(res)
+						if (res.code === 1) {
+							_this.getData()
+						}
 					})
 				}
 			},
@@ -206,6 +217,23 @@
 				margin-bottom: 10rpx;
 			}
 
+			.locationName {
+				width: 100%;
+				justify-content: flex-start;
+
+				.text {
+					text-indent: 1em;
+					width: 80%;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: flex-start;
+					white-space: nowrap;
+				}
+			}
+
 			.row:nth-child(5) {
 				margin-bottom: 0;
 			}

pages/Delivery/create.vue

@@ -7,7 +7,7 @@
 				</view>
 				<u-checkbox-group>
 					<u-checkbox shape="square" v-for="(item,index) in send" :name="item.name" v-model="item.checked"
-						:key="index">{{item.name}}</u-checkbox>
+						:key="index" color="#F6B301">{{item.name}}</u-checkbox>
 				</u-checkbox-group>
 			</view>
 		</view>
@@ -19,8 +19,7 @@
 			v-model="info.password" />
 		<view class="card" style="margin-top: 40rpx;" @click="location">
 			<view class="row">
-				<view>请选择配送区域</view>
-				
+				<view>请选择配送区域</view>
 				<view class="">
 					<u-icon name="arrow-right"></u-icon>
 				</view>
@@ -86,68 +85,82 @@
 						this.send[1].checked = true
 					}
 					if (s.type === "fast") {
-						this.send[2].checked = true
+						this.send[0].checked = true
 					}
 					if (s.type === "special") {
-						this.send[0].checked = true
+						this.send[1].checked = true
 					}
-				}
+				}
+				this.$forceUpdate()
 			},
 			// 点击配送区域
-			location() {
-				this.$EventBus.$on('listenSetArea',(res)=>{
-					let data = this.info;
-					data.area = res;
-					this.info = data
-					this.$forceUpdate()
-				})
-				uni.navigateTo({
-					url: "./location"
+			location() {
+				this.$EventBus.$on('listenSetArea', (res) => {
+					let data = this.info;
+					data.area = res;
+					this.info = data
+					this.$forceUpdate()
 				})
+				// 新增
+				if (this.pageType === 1) {
+					uni.navigateTo({
+						url: "./location"
+					})
+				}
+				// 编辑
+				if (this.pageType === 2) {
+					uni.navigateTo({
+						url: "./location?area=" + JSON.stringify(this.info.area)
+					})
+				}
 			},
 			// 确认新增
-			create() {
-				let data = [];
-				for (let s of this.send) {
-					if(s.checked){
-						data.push(s.value)
-					}
-				}
-				this.info.send = data;
-				this.$forceUpdate()
-				if(this.info.send.length === 0){
-					this.$u.toast('请选择运送方式')
-					return false
-				}
-				if( !this.info.area || this.info.area.length === 0){
-					this.$u.toast('请选择配送区域')
-					return false
-				}
-				if(this.info.company === ''){
-					this.$u.toast('请填写公司名称')
-					return false
-				}if(this.info.name === ''){
-					this.$u.toast('请填写姓名')
-					return false
-				}if(this.info.mobile === ''){
-					this.$u.toast('请填写联系方式')
-					return false
-				}if(this.info.username === ''){
-					this.$u.toast('请填写账号')
-					return false
-				}if(this.info.password === ''){
-					this.$u.toast('请填写密码')
-					return false
-				}
-				this.request("/admin_user/store",this.info,"POST").then(res=>{
-					if(res.code === 1){
-						this.$u.toast('添加成功')
-						this.info = {}
-						uni.navigateBack({
-							delta:res
-						})
-					}
-				})
+			create() {
+				let data = [];
+				for (let s of this.send) {
+					if (s.checked) {
+						data.push(s.value)
+					}
+				}
+				this.info.send = data;
+				this.$forceUpdate()
+				if (this.info.send.length === 0) {
+					this.$u.toast('请选择运送方式')
+					return false
+				}
+				if (!this.info.area || this.info.area.length === 0) {
+					this.$u.toast('请选择配送区域')
+					return false
+				}
+				if (this.info.company === '') {
+					this.$u.toast('请填写公司名称')
+					return false
+				}
+				if (this.info.name === '') {
+					this.$u.toast('请填写姓名')
+					return false
+				}
+				if (this.info.mobile === '') {
+					this.$u.toast('请填写联系方式')
+					return false
+				}
+				if (this.info.username === '') {
+					this.$u.toast('请填写账号')
+					return false
+				}
+				if (this.info.password === '') {
+					this.$u.toast('请填写密码')
+					return false
+				}
+				this.request("/admin_user/store", this.info, "POST").then(res => {
+					if (res.code === 1) {
+						this.$u.toast('添加成功')
+						this.info = {}
+						uni.navigateBack({
+							delta: res
+						})
+					}
+				})
 			},
 			// 确认修改
 			edit() {
@@ -157,36 +170,64 @@
 					if (s.checked) {
 						send.push(s.value)
 					}
-				}
-				let data = {};
-				if(this.pageType === 1){
-					data = {
-						send: send,
-						company: this.info.company,
-						name: this.info.name,
-						mobile: this.info.mobile,
-						username: this.info.username,
-						area: this.info.area,
-					}
-					this.request("/admin_user/store",data,"POST").then(res=>{
-						console.log(res)
-					})
-				}
-				if(this.pageType === 2){
-					data = {
-						id: this.info.id,
-						send: send,
-						company: this.info.company,
-						name: this.info.name,
-						mobile: this.info.mobile,
-						username: this.info.username,
-						area: this.info.area,
+				}
+				
+				let area = [];
+				console.log(typeof this.info.area[0])
+				if(typeof this.info.area[0] === 'object'){
+					for (let s of this.info.area) {
+						area.push(s.id)
 					}
-					console.log(data,333)
-					this.request("/admin_user/store",data,"POST").then(res=>{
-						console.log(res)
-					})
+				}else{
+					// 没有修改区域
+					area = this.info.area
 				}
+				let data = {};
+				this.$forceUpdate()
+				if (send.length === 0) {
+					this.$u.toast('请选择运送方式')
+					return false
+				}
+				if (!this.info.area || this.info.area.length === 0) {
+					this.$u.toast('请选择配送区域')
+					return false
+				}
+				if (this.info.company === '') {
+					this.$u.toast('请填写公司名称')
+					return false
+				}
+				if (this.info.name === '') {
+					this.$u.toast('请填写姓名')
+					return false
+				}
+				if (this.info.mobile === '') {
+					this.$u.toast('请填写联系方式')
+					return false
+				}
+				if (this.info.username === '') {
+					this.$u.toast('请填写账号')
+					return false
+				}
+				data = {
+					id: this.info.id,
+					send: send,
+					company: this.info.company,
+					name: this.info.name,
+					mobile: this.info.mobile,
+					username: this.info.username,
+					area: area,
+				}
+				this.request("/admin_user/store", data, "POST").then(res => {
+					console.log(res)
+					if (res.code === 1) {
+						this.$u.toast('操作成功')
+						setTimeout(()=>{
+							uni.navigateBack({
+								delta:1
+							})
+						},2000)
+					}
+				})
 			}
 		}
 	}

pages/Delivery/location.vue

@@ -14,9 +14,9 @@
 		</u-index-list>
 		<view class="bottom-btn">
 			<view class="buttom-dom row">
-				<view class="all" @click="checkAll">
+				<!-- <view class="all" @click="checkAll">
 					全选
-				</view>
+				</view> -->
 				<view class="push" @click="push">
 					确定
 				</view>
@@ -31,14 +31,21 @@
 		data() {
 			return {
 				scrollTop: 0,
-				area: [],
+				area: [],
+				type:1,
+				checkedArea:[]
 			}
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
-		onLoad() {
-			this.getLocation()
+		onLoad(e) {
+			this.getLocation()
+			console.log(e)
+			if(e.area){
+				this.type = 2
+				this.checkedArea = JSON.parse(e.area)
+			}
 		},
 		methods: {
 			// 点击确定
@@ -63,20 +70,33 @@
 			},
 			// 全选
 			checkAll() {
-				let data = this.area
-				for (let key in data) {
-					for (let ikey in data[key].child) {
-						data[key].child[ikey].checked = true
-					}
-				}
-				this.area = data
+				let data = this.area
+				for (let key in data) {
+					for (let ikey in data[key].child) {
+						data[key].child[ikey].checked = true
+					}
+				}
+				this.area = data
 				this.$forceUpdate()
 			},
 			// 获取位置信息
 			getLocation() {
 				this.request("/common/area_sort", {}, "GET").then(res => {
 					if (res.code === 1) {
-						this.area = res.data
+						this.area = res.data
+						if(this.type ===2){
+							let data = this.area
+							let checked = this.checkedArea
+							for (let key in data) {
+								for (let ikey in data[key].child) {
+									for (let s of checked) {
+										if(data[key].child[ikey].id === s.id){
+											data[key].child[ikey].checked = true
+										}
+									}
+								}
+							}
+						}
 					}
 				})
 			}

pages/mine/Withdrawal.vue

@@ -1,108 +1,139 @@
-<template>
-	<view class="content">
-		<view class="card">
-			<view class="money-num">
-				9999.00
-			</view>
-			<view class="money-text">
-				可提现金额
-			</view>
-			<view class="title">
-				提现金额
-			</view>
-			<view class="money-input row">
-				<view class="icon">1</view>
-				<input type="number" class="input" />
-				<view class="all">全部</view>
-			</view>
-		</view>
-		
-		<view class="bottom-btn">
-			<view class="buttom-dom" @click="push" >
-				确认
-			</view>
-		</view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
+<template>
+	<view class="content">
+		<view class="card">
+			<view class="money-num">
+				{{info.money}}
+			</view>
+			<view class="money-text">
+				可提现金额
+			</view>
+			<view class="title">
+				提现金额
+			</view>
+			<view class="money-input row">
+				<view class="icon">¥</view>
+				<input type="number" class="input" v-model="money" />
+				<view class="all">全部</view>
+			</view>
+		</view>
+
+		<view class="bottom-btn">
+			<view class="buttom-dom" @click="push">
+				确认
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// 提现金额
+				money:0,
+				// 用户信息
+				info: {}
+			}
 		},
+		onLoad() {
+			this.getUserInfo()
+		},
 		methods: {
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	.content{
-		padding-top: 40rpx;
-	}
-	.card{
-		background-color: #FFFFFF;
-		width: 93%;
-		margin: 0 auto;
-		padding: 30rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: space-around;
-		.money-num{
-			width: 100%;
-			text-align: center;
-			font-weight: bold;
-			font-size: 50rpx;
-		}
-		.money-text{
-			color: #999;
-		}
-		.title{
-			width: 100%;
-			
-		}
-		.money-input{
-			border-bottom: 1rpx #eee solid;
-			width: 100%;
-			padding: 20rpx;
-			margin-bottom: 50rpx;
-			.icon{
-				width: 10%;
-			}
-			.input{
-				width: 70%;
-			}
-			.all{
-				width: 20%;
-				text-align: center;
-				color: #F6B301;
-			}
-		}
-	}
-	
-	.bottom-btn{
-		position: fixed;
-		bottom: 0;
-		width: 100vw;
-		height: 10vh;
-		background-color: #FFFFFF;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		.buttom-dom{
-			height: 80rpx;
-			width: 93%;
-			background-color: #F6B301;
-			color: #FFFFFF;
-			text-align: center;
-			line-height: 80rpx;
-			color: #FFFFFF;
-			border-radius: 80rpx;
-		}
-	}
+			// 获取可提现金额
+			getUserInfo(){
+				this.request("/user/index",{},"POST").then(res=>{
+					if(res.code === 1){
+						this.info =  res.data
+					}
+				})
+			},
+			// 点击充值
+			push(){
+				this.request("/user_money_controller/take_cash",{money:this.money},"POST").then(res=>{
+					if(res.code === 1){
+						this.$u.toast('充值成功')
+						this.money = 0
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		padding-top: 40rpx;
+	}
+
+	.card {
+		background-color: #FFFFFF;
+		width: 93%;
+		margin: 0 auto;
+		padding: 30rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: space-around;
+
+		.money-num {
+			width: 100%;
+			text-align: center;
+			font-weight: bold;
+			font-size: 50rpx;
+		}
+
+		.money-text {
+			color: #999;
+		}
+
+		.title {
+			width: 100%;
+
+		}
+
+		.money-input {
+			border-bottom: 1rpx #eee solid;
+			width: 100%;
+			padding: 20rpx;
+			margin-bottom: 50rpx;
+
+			.icon {
+				width: 10%;
+			}
+
+			.input {
+				width: 70%;
+			}
+
+			.all {
+				width: 20%;
+				text-align: center;
+				color: #F6B301;
+			}
+		}
+	}
+
+	.bottom-btn {
+		position: fixed;
+		bottom: 0;
+		width: 100vw;
+		height: 10vh;
+		background-color: #FFFFFF;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+
+		.buttom-dom {
+			height: 80rpx;
+			width: 93%;
+			background-color: #F6B301;
+			color: #FFFFFF;
+			text-align: center;
+			line-height: 80rpx;
+			color: #FFFFFF;
+			border-radius: 80rpx;
+		}
+	}
 </style>

pages/mine/mine.vue

@@ -1,114 +1,151 @@
-<template>
-	<view class="content">
-		<view class="card">
-			<view class="title">
-				总资产
-			</view>
-			<view class="row">
-				<view class="big">
-					999.00
-				</view>
-				<view class="btn" @click="withdrawal">
-					提现
-				</view>
-			</view>
-		</view>
-		<view class="list">
-			<view class="title">
-				余额明细
-			</view>
-			<view class="list-box">
-				<view class="row">
-					<view class="icon">
-						1
-					</view>
-					<view class="text">
-						<view class="">
-							111
-						</view>
-						<view class="">
-							222
-						</view>
-					</view>
-					<view class="number">
-						1000.00
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			// 点击提现
-			withdrawal(){
-				uni.navigateTo({
-					url:'./Withdrawal'
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.content{
-		padding-top: 40rpx;
-	}
-	.card{
-		width: 93%;
-		height: 300rpx;
-		margin: 0 auto;
-		border: 1px red solid;
-		border-radius: 40rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: space-around;
-		padding: 40rpx;
-		.title{
-			width: 100%;
-			font-weight: bold;
-		}
-		.big{
-			font-size: 50rpx;
-		}
-		.btn{
-			background-color: #111111;
-			color: #F6B301;
-			padding: 10rpx 30rpx ;
-			border-radius: 20rpx;
-		}
-	}
-
-	.list{
-		width: 93%;
-		margin: 0 auto;
-		margin-top: 30rpx;
-		.title{
-			font-size: 40rpx;
-			font-weight: bold;
-		}
-		.row{
-			border-bottom: 1rpx #eee solid;
-			padding: 10rpx 0;
-		}
-		.list-box{
-			.icon{
-				width: 10%;
-			}
-			.text{
-				width: 70%;
-			}
-			.money{
-				width: 20%;
-			}
-		}
-	}
+<template>
+	<view class="content">
+		<view class="card">
+			<view class="title">
+				总资产
+			</view>
+			<view class="row">
+				<view class="big">
+					{{userInfo.money}}
+				</view>
+				<view class="btn" @click="withdrawal">
+					提现
+				</view>
+			</view>
+		</view>
+		<view class="list">
+			<view class="title">
+				余额明细
+			</view>
+			<view class="list-box">
+				<view class="row" v-for="(item,index) in history" :key="index">
+					<view class="icon">
+						<image src="http://pet.hdlkeji.com/assets/static/1/79.png" class="mine-icon"></image>
+					</view>
+					<view class="text">
+						<view class="">
+							{{item.type_text}}
+						</view>
+						<view class="">
+							{{item.createtime}}
+						</view>
+					</view>
+					<view class="number">
+						{{item.money}}
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// 用户信息
+				userInfo: {},
+				// 钱包历史
+				history: [],
+				page: 1,
+				limit: 20
+			}
+		},
+		onLoad() {
+			this.getUserInfo()
+			this.getHistory()
+		},
+		methods: {
+			// 获取会员信息
+			getUserInfo() {
+				this.request("/user/index", {}, "GET").then(res => {
+					if (res.code === 1) {
+						this.userInfo = res.data
+					}
+				})
+			},
+			// 获取金额日志
+			getHistory() {
+				this.request("/user_money_controller/log", {
+					page: this.page,
+					limit: this.limit
+				}, "GET").then(res => {
+					if (res.code === 1) {
+						this.history = res.data.data
+					}
+				})
+			},
+			// 点击提现
+			withdrawal() {
+				uni.navigateTo({
+					url: './Withdrawal'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		padding-top: 40rpx;
+	}
+
+	.card {
+		width: 93%;
+		height: 300rpx;
+		margin: 0 auto;
+		border: 1px #999 solid;
+		border-radius: 40rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: space-around;
+		padding: 40rpx;
+
+		.title {
+			width: 100%;
+			font-weight: bold;
+		}
+
+		.big {
+			font-size: 50rpx;
+		}
+
+		.btn {
+			background-color: #111111;
+			color: #F6B301;
+			padding: 10rpx 30rpx;
+			border-radius: 20rpx;
+		}
+	}
+
+	.list {
+		width: 93%;
+		margin: 0 auto;
+		margin-top: 30rpx;
+
+		.title {
+			font-size: 40rpx;
+			font-weight: bold;
+		}
+
+		.row {
+			border-bottom: 1rpx #eee solid;
+			padding: 10rpx 0;
+		}
+
+		.list-box {
+			.icon {
+				width: 10%;
+			}
+
+			.text {
+				width: 70%;
+			}
+
+			.money {
+				width: 20%;
+			}
+		}
+	}
 </style>

pages/order/info.vue

@@ -26,11 +26,25 @@
 			<view class="title">
 				托运信息
 			</view>
-			<view class="card min-card">
-				1
+			<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_c">
+						<view class="order_p1">{{info.from_addr.name}}</view>
+						<view class="order_p2">{{info.from_addr.mobile}}</view>
+					</view>
+				</view>
 			</view>
-			<view class="card min-card">
-				1
+			<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_c">
+						<view class="order_p1">{{info.to_addr.name}}</view>
+						<view class="order_p2">{{info.to_addr.mobile}}</view>
+					</view>
+				</view>
 			</view>
 			<view class="row">
 				<view class="row half">
@@ -122,7 +136,7 @@
 				</view>
 			</view>
 			<view class="image">
-				<image v-for="(item,index) in info.images" :src="item.url" class="image-dom" :key="index"></image>
+				<image v-for="(item,index) in info.images" :src="item" class="image-dom" :key="index"></image>
 			</view>
 		</view>
 
@@ -142,7 +156,7 @@
 				<view class="name">
 					下单时间
 				</view>
-				<view class="text">
+				<view class="text">
 					{{info.created_at?$u.timeFormat(info.created_at, 'yyyy年mm月dd日 hh时MM分'):"-"}}
 				</view>
 			</view>
@@ -222,7 +236,7 @@
 				<view class="name">
 					完成时间
 				</view>
-				<view class="text">
+				<view class="text">
 					{{info.completed_at?$u.timeFormat(info.completed_at, 'yyyy年mm月dd日 hh时MM分'):'-'}}
 				</view>
 			</view>
@@ -307,7 +321,7 @@
 					<view class="name">
 						退款金额
 					</view>
-					<view class="text red">
+					<view class="text red">
 						{{info.refund_amount||''}}
 					</view>
 				</view>
@@ -317,7 +331,7 @@
 					<view class="name">
 						退款时间
 					</view>
-					<view class="text red">
+					<view class="text red">
 						{{info.refund_at?$u.timeFormat(info.refund_at, 'yyyy年mm月dd日 hh时MM分'):'-'}}
 					</view>
 				</view>
@@ -359,8 +373,21 @@
 			<view class="buttom-dom" @click="create" v-if="info.status === 1">
 				立即接单
 			</view>
-			<view class="buttom-dom" @click="video">
-				上传视频
+			<view class="buttom-dom" @click="video(0,1,info.id)"
+				v-if="info.status === 10 || info.status === 20 || info.status === 30">
+				备注
+			</view>
+			<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>
+			<view class="buttom-dom" @click="video(info.status,4,info.id)" v-if="info.status === 20">
+				上传运输视频
+			</view>
+			<view class="buttom-dom" @click="video(info.status,5,info.id)" v-if="info.status === 30">
+				上传送达视频
 			</view>
 		</view>
 	</view>
@@ -374,25 +401,29 @@
 			}
 		},
 		onLoad(e) {
-			// let info = JSON.parse(decodeURIComponent(e.info))
+			// let info = JSON.parse(decodeURIComponent(e.info))
 			let id = e.id
-			// this.info = info;
+			// this.info = info;
 			this.getData(id);
 		},
-		methods: {
-			// 获取订单信息
-			getData(id){
-				this.request("/sender_order_controller/detail",{id:id},"GET").then(res=>{
-					console.log(res)
-					if(res.code ===1){
-						this.info = res.data
-					}
-				})
+		methods: {
+			// 获取订单信息
+			getData(id) {
+				this.request("/sender_order_controller/detail", {
+					id: id
+				}, "GET").then(res => {
+					console.log(res)
+					if (res.code === 1) {
+						this.info = res.data
+					}
+				})
 			},
 			// 点击上传视频
-			video() {
+			video(status, type, id) {
+				// status 的订单状态 10取宠视频 20 运输视频 30送宠视频 
+				// type 1 备注 2上传更多 3上传取宠视频 4上传运输视频 5上传送达视频
 				uni.navigateTo({
-					url: "./video"
+					url: "./video?status=" + status + "&type=" + type + "&id=" + id
 				})
 			}
 		}
@@ -446,6 +477,95 @@
 		}
 	}
 
+	.card {
+		.order {
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			// height: 100rpx;
+			background: #F5F6FB;
+			opacity: 1;
+			padding: 14rpx 24rpx;
+			box-sizing: border-box;
+			border-radius: 16rpx;
+			margin-bottom: 10rpx;
+
+			.order_a {
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				line-height: 36rpx;
+				color: #1F4971;
+				opacity: 1;
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+
+				.order_yuan {
+					display: inline-block;
+					width: 14rpx;
+					height: 14rpx;
+					background: #F6B403;
+					border-radius: 50%;
+					opacity: 1;
+					margin-right: 10rpx;
+				}
+
+				.order_yuana {
+					display: inline-block;
+					width: 14rpx;
+					height: 14rpx;
+					background: #F54948;
+					border-radius: 50%;
+					opacity: 1;
+					margin-right: 10rpx;
+				}
+			}
+
+			.order_b {
+				width: 85%;
+				text-align: left;
+
+				.order_p {
+					font-size: 26rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					line-height: 36rpx;
+					color: #111111;
+					opacity: 1;
+				}
+
+				.order_c {
+					display: flex;
+					justify-content: flex-start;
+					align-items: center;
+					margin-top: 6rpx;
+
+					.order_p1 {
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						line-height: 36rpx;
+						color: #111111;
+						opacity: 1;
+					}
+
+					.order_p2 {
+						font-size: 26rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						line-height: 36rpx;
+						color: #111111;
+						opacity: 1;
+						margin-left: 40rpx;
+
+					}
+				}
+			}
+		}
+	}
+
 	.min-card {
 		width: 100%;
 		background-color: #F8F8F8;

pages/order/order.vue

@@ -5,73 +5,360 @@
 			<u-tabs :list="list" name="cate_name" count="cate_count" :is-scroll="false" :current="current"
 				@change="change" bg-color="#F7E8CB" active-color="#E68500"></u-tabs>
 		</view>
-		<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}}
+		<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="image">
-					-
+				<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">
+							-
+						</view>
+						<view class="big-text">
+							{{item.to_city}}
+						</view>
+					</view>
+					<view class="row">
+						<view class="row half">
+							<view class="name">
+								宠物类别
+							</view>
+							<view class="text">
+								{{item.pet_category}}
+							</view>
+						</view>
+						<view class="row half">
+							<view class="name">
+								宠物规格
+							</view>
+							<view class="text">
+								{{item.spec}}
+							</view>
+						</view>
+					</view>
+					<view class="row">
+						<view class="row half" style="width: 100%;">
+							<view class="name">
+								取宠时间
+							</view>
+							<view class="text">
+								{{item.agree_date}}
+								{{item.agree_time}}
+							</view>
+						</view>
+					</view>
+					<view class="row">
+						<view class="row half" style="width: 100%;">
+							<view class="name">
+								订单号
+							</view>
+							<view class="text">
+								{{item.no}}
+							</view>
+						</view>
+					</view>
+					<view class="row border" v-if="isAdmin">
+						<view class="btn">
+							拒绝
+						</view>
+						<view class="btn">
+							备注
+						</view>
+						<view class="btn">
+							结算
+						</view>
+					</view>
+					<view class="row border" v-if="!isAdmin">
+						<view class="btn" @click.stop="getOrder(item.id)" >
+							立即接单
+						</view>
+					</view>
 				</view>
-				<view class="big-text">
-					{{item.to_city}}
+			</swiper-item>
+			<swiper-item style="height: 100%;overflow-y: scroll;">
+				<view class="noOrder" v-if="data.data.length < 1">
+					暂无订单～～
 				</view>
-			</view>
-			<view class="row">
-				<view class="row half">
-					<view class="name">
-						宠物类别
+				<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">
+							-
+						</view>
+						<view class="big-text">
+							{{item.to_city}}
+						</view>
 					</view>
-					<view class="text">
-						{{item.pet_category}}
+					<view class="row">
+						<view class="row half">
+							<view class="name">
+								宠物类别
+							</view>
+							<view class="text">
+								{{item.pet_category}}
+							</view>
+						</view>
+						<view class="row half">
+							<view class="name">
+								宠物规格
+							</view>
+							<view class="text">
+								{{item.spec}}
+							</view>
+						</view>
 					</view>
-				</view>
-				<view class="row half">
-					<view class="name">
-						宠物规格
+					<view class="row">
+						<view class="row half" style="width: 100%;">
+							<view class="name">
+								取宠时间
+							</view>
+							<view class="text">
+								{{item.agree_date}}
+								{{item.agree_time}}
+							</view>
+						</view>
 					</view>
-					<view class="text">
-						{{item.spec}}
+					<view class="row">
+						<view class="row half" style="width: 100%;">
+							<view class="name">
+								订单号
+							</view>
+							<view class="text">
+								{{item.no}}
+							</view>
+						</view>
+					</view>
+					<view class="row border" v-if="isAdmin">
+						<view class="btn">
+							拒绝
+						</view>
+					</view>
+					<view class="row border" v-if="!isAdmin">
+						<view class="btn" v-if="item.status === 10">
+							上传取宠视频
+						</view>
 					</view>
 				</view>
-			</view>
-			<view class="row">
-				<view class="row half" style="width: 100%;">
-					<view class="name">
-						取宠时间
+			</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">
+							-
+						</view>
+						<view class="big-text">
+							{{item.to_city}}
+						</view>
 					</view>
-					<view class="text">
-						{{item.agree_date}}
-						{{item.agree_time}}
+					<view class="row">
+						<view class="row half">
+							<view class="name">
+								宠物类别
+							</view>
+							<view class="text">
+								{{item.pet_category}}
+							</view>
+						</view>
+						<view class="row half">
+							<view class="name">
+								宠物规格
+							</view>
+							<view class="text">
+								{{item.spec}}
+							</view>
+						</view>
+					</view>
+					<view class="row">
+						<view class="row half" style="width: 100%;">
+							<view class="name">
+								取宠时间
+							</view>
+							<view class="text">
+								{{item.agree_date}}
+								{{item.agree_time}}
+							</view>
+						</view>
+					</view>
+					<view class="row">
+						<view class="row half" style="width: 100%;">
+							<view class="name">
+								订单号
+							</view>
+							<view class="text">
+								{{item.no}}
+							</view>
+						</view>
+					</view>
+					<view class="row border" v-if="!isAdmin">
+						<view class="btn">
+							拒绝
+						</view>
+						<view class="btn">
+							备注
+						</view>
+						<view class="btn">
+							结算
+						</view>
 					</view>
 				</view>
-			</view>
-			<view class="row">
-				<view class="row half" style="width: 100%;">
-					<view class="name">
-						订单号
+			</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">
+							-
+						</view>
+						<view class="big-text">
+							{{item.to_city}}
+						</view>
 					</view>
-					<view class="text">
-						{{item.no}}
+					<view class="row">
+						<view class="row half">
+							<view class="name">
+								宠物类别
+							</view>
+							<view class="text">
+								{{item.pet_category}}
+							</view>
+						</view>
+						<view class="row half">
+							<view class="name">
+								宠物规格
+							</view>
+							<view class="text">
+								{{item.spec}}
+							</view>
+						</view>
+					</view>
+					<view class="row">
+						<view class="row half" style="width: 100%;">
+							<view class="name">
+								取宠时间
+							</view>
+							<view class="text">
+								{{item.agree_date}}
+								{{item.agree_time}}
+							</view>
+						</view>
+					</view>
+					<view class="row">
+						<view class="row half" style="width: 100%;">
+							<view class="name">
+								订单号
+							</view>
+							<view class="text">
+								{{item.no}}
+							</view>
+						</view>
+					</view>
+					<view class="row border" v-if="isAdmin">
+						<view class="btn">
+							拒绝
+						</view>
+						<view class="btn">
+							备注
+						</view>
+						<view class="btn">
+							结算
+						</view>
 					</view>
 				</view>
-			</view>
-			<view class="row border">
-				<view class="btn">
-					立即接单
+			</swiper-item>
+			<swiper-item style="height: 100%;overflow-y: scroll;">
+				<view class="noOrder" v-if="data.data.length < 1">
+					暂无订单～～
 				</view>
-			</view>
-		</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">
+							-
+						</view>
+						<view class="big-text">
+							{{item.to_city}}
+						</view>
+					</view>
+					<view class="row">
+						<view class="row half">
+							<view class="name">
+								宠物类别
+							</view>
+							<view class="text">
+								{{item.pet_category}}
+							</view>
+						</view>
+						<view class="row half">
+							<view class="name">
+								宠物规格
+							</view>
+							<view class="text">
+								{{item.spec}}
+							</view>
+						</view>
+					</view>
+					<view class="row">
+						<view class="row half" style="width: 100%;">
+							<view class="name">
+								取宠时间
+							</view>
+							<view class="text">
+								{{item.agree_date}}
+								{{item.agree_time}}
+							</view>
+						</view>
+					</view>
+					<view class="row">
+						<view class="row half" style="width: 100%;">
+							<view class="name">
+								订单号
+							</view>
+							<view class="text">
+								{{item.no}}
+							</view>
+						</view>
+					</view>
+					<view class="row border" v-if="isAdmin">
+						<view class="btn">
+							拒绝
+						</view>
+						<view class="btn">
+							备注
+						</view>
+						<view class="btn">
+							结算
+						</view>
+					</view>
+				</view>
+			</swiper-item>
+		</swiper>
+
 
 
 		<!-- 弹窗 -->
 		<u-popup v-model="show" :show-cancel-button="true" mode="center" :border-radius="50" closeable>
 			<view class="u-update-content">
 				<view class="u-update-top">
-					1
+					<image src="http://pet.hdlkeji.com/assets/static/1/111.png" class="top-image"></image>
 				</view>
 				<view class="u-update-bottom">
 					<view class="text">
@@ -113,39 +400,92 @@
 					},
 					{
 						cate_name: '已结算',
-						cate_count: 1
+						cate_count: 0
 					},
 					{
 						cate_name: '已取消',
-						cate_count: 1
+						cate_count: 0
 					}
 				],
 				// 弹窗
-				show: true,
+				show: false,
 				page: 1,
 				limit: 10,
 				type: 1,
-				data: {}
+				data: {},
+				// 是否是管理员
+				isAdmin: false
+			}
+		},
+		watch: {
+			type(e) {
+				this.getData()
 			}
-		},
-		watch:{
-			type(e){
-				this.getData()
-			}
 		},
 		onLoad() {
-			this.getData()
+			this.getData()
+			// 获取订单数量
+			this.getDataNum()
+			let data = getApp().globalData
+			this.isAdmin = data.isAdmin
+			if(!this.isAdmin){
+				this.getInfo()
+			}
+		},
+		onShow() {
+			this.getDataNum()
 		},
-		methods: {
+		methods: {
+			// 获取会员信息
+			getInfo(){
+				this.request('/user/index',{},"GET").then(res=>{
+					if(res.code ===  1){
+						if(res.data.need_verification){
+							this.show = true
+						}
+					}
+				})
+			},
+			// 点击立即接单
+			getOrder(id) {
+				this.request("/sender_order_controller/get", {
+					id: id
+				}, "POST").then(res => {
+					if(res.code === 1){
+						this.getData()
+						this.getDataNum()
+					}
+				})
+			},
+			// 获取订单数量
+			getDataNum(){
+				this.request("/sender_order_controller/nums",{},"GET").then(res=>{
+					console.log(res)
+					if(res.code === 1){
+						this.list[0].cate_count = res.data[1]
+						this.list[1].cate_count = res.data[2]
+						this.list[2].cate_count = res.data[3]
+						this.list[3].cate_count = res.data[4]
+						this.list[4].cate_count = res.data[5]
+					}
+				})
+			},
 			// 获取订单列表
 			getData() {
-				this.request("/admin_order/orders", {
+				let url = "";
+				if (this.isAdmin) {
+					url = "/admin_order/orders";
+				} else {
+					url = "/sender_order_controller/list";
+				}
+				this.request(url, {
 					page: this.page,
 					limit: this.limit,
 					type: this.type
 				}, "GET").then(res => {
 					if (res.code === 1) {
 						this.data = res.data
+						this.list[this.current].cate_count = res.data.total
 					}
 				})
 			},
@@ -161,6 +501,11 @@
 					url: "./info?id=" + info.id
 				})
 			},
+			// 滑动切换
+			touchChange(e) {
+				this.current = e.detail.current
+				this.type = e.detail.current + 1
+			},
 			// 点击菜单
 			change(e) {
 				console.log(e)
@@ -169,19 +514,15 @@
 					this.type = 1
 				}
 				if (e === 1) {
-
 					this.type = 2
 				}
 				if (e === 2) {
-
 					this.type = 3
 				}
 				if (e === 3) {
-
 					this.type = 4
 				}
 				if (e === 4) {
-
 					this.type = 5
 				}
 
@@ -193,6 +534,10 @@
 <style lang="scss">
 	.content {
 		padding-top: 260rpx;
+
+		.order-list-box {
+			height: 80vh;
+		}
 	}
 
 	.menu-top {
@@ -272,13 +617,23 @@
 	}
 
 	// 弹窗
-	.u-update-content {
+	.u-update-content {
 		width: 500rpx;
 		height: 650rpx;
-		padding: 40rpx;
+		padding: 40rpx;
+		background-image: url("http://pet.hdlkeji.com/assets/static/1/110.png");
+		background-size: 100% 100%;
 
 		.u-update-top {
-			height: 50%;
+			height: 50%;
+			display: flex;
+			position: relative;
+			.top-image{
+				height: 300rpx;
+				width: 300rpx;
+				position: absolute;
+				left: 100rpx;
+			}
 		}
 
 		.u-update-bottom {

pages/order/perfect.vue

@@ -5,11 +5,11 @@
 				上传身份证
 			</view>
 			<view class="top row">
-				<view class="left">
-
+				<view class="left" @click="chooseImg(1)">
+					<image class="image-dom" :src="cardLeft" v-if="cardLeft !== ''"></image>
 				</view>
-				<view class="right">
-
+				<view class="right" @click="chooseImg(2)">
+					<image class="image-dom" :src="cardRight" v-if="cardRight !== ''"></image>
 				</view>
 			</view>
 		</view>
@@ -19,29 +19,96 @@
 				上传营业执照
 			</view>
 			<view class="bottom row">
-				<view class="image">
-					
+				<view class="image" @click="chooseImg(3)">
+					<image class="image-dom" :src="imgBottom" v-if="imgBottom !== ''"></image>
 				</view>
 			</view>
-		</view>
-		
-		<view class="bottom-btn">
-			<view class="btn">
-				完善
-			</view>
+		</view>
+
+		<view class="bottom-btn">
+			<view class="btn" @click="push">
+				完善
+			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		getToken
+	} from "@/utils/auth.js";
 	export default {
 		data() {
 			return {
-
+				// 身份证正面
+				cardLeft: "",
+				// 身份证反面
+				cardRight: "",
+				// 营业执照
+				imgBottom: ""
 			}
 		},
 		methods: {
+			// 点击确认
+			push() {
+				if (this.cardLeft === '') {
+					this.$u.toast('请上传身份证正面')
+					return false
+				}
+				if (this.cardRight === '') {
+					this.$u.toast('请上传身份证正面')
+					return false
+				}
+				if (this.imgBottom === '') {
+					this.$u.toast('请上传身份证正面')
+					return false
+				}
 
+				this.request('/sender/verification', {
+					id_z: this.cardLeft,
+					id_f: this.cardRight,
+					license: this.imgBottom,
+				}, "POST").then(res => {
+					if (res.code === 1) {
+						this.$u.toast('完善成功')
+						setTimeout(()=>{
+							uni.navigateBack({
+								delta:1
+							})
+						},2000)
+					}
+				})
+
+			},
+			// 点击选择图片
+			chooseImg(type) {
+				let _this = this
+				uni.chooseImage({
+					success(e) {
+						console.log(e)
+						uni.uploadFile({
+							url: 'http://pet.hdlkeji.com/api/common/upload', //仅为示例，非真实的接口地址
+							filePath: e.tempFilePaths[0],
+							header: {
+								"token": getToken()
+							},
+							name: 'file',
+							success: (res) => {
+								console.log(res, 11111)
+								if (type === 1) {
+									_this.cardLeft = e.tempFilePaths[0]
+								}
+								if (type === 2) {
+									_this.cardRight = e.tempFilePaths[0]
+								}
+								if (type === 3) {
+									_this.imgBottom = e.tempFilePaths[0]
+								}
+							}
+						})
+					}
+				})
+			}
 		}
 	}
 </script>
@@ -53,9 +120,10 @@
 		.title {
 			font-size: 36rpx;
 
-		}
-		.margin-top{
-			margin-top: 40rpx;
+		}
+
+		.margin-top {
+			margin-top: 40rpx;
 		}
 	}
 
@@ -70,43 +138,61 @@
 			.left {
 				width: 300rpx;
 				height: 200rpx;
-				border: 1px red solid;
+				background-image: url("http://pet.hdlkeji.com/assets/static/1/107.png");
+				background-size: 100% 100%;
+				background-repeat: no-repeat;
 			}
 
 			.right {
 				width: 300rpx;
 				height: 200rpx;
-				border: 1px red solid;
+				background-image: url("http://pet.hdlkeji.com/assets/static/1/106.png");
+				background-size: 100% 100%;
+				background-repeat: no-repeat;
 			}
-		}
-		.bottom{
-			.image{
-				border: 1px red solid;
-				height: 300rpx;
-				width: 700rpx;
-			}
+		}
+
+		.bottom {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: center;
+
+			.image {
+				height: 300rpx;
+				width: 600rpx;
+				background-image: url("http://pet.hdlkeji.com/assets/static/1/82.png");
+				background-size: 100% 100%;
+				background-repeat: no-repeat;
+			}
+		}
+	}
+
+	.image-dom {
+		width: 100%;
+		height: 100%;
+	}
+
+	// 完成按钮
+	.bottom-btn {
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+		height: 10vh;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		background-color: #FFFFFF;
+
+		.btn {
+			width: 100%;
+			color: #E68500;
+			background-color: #FFE3A0;
+			height: 80rpx;
+			border-radius: 50rpx;
+			text-align: center;
+			line-height: 80rpx;
 		}
 	}
-	
-	// 完成按钮
-	.bottom-btn{	
-		position: fixed;
-		bottom: 0;
-		width: 100%;
-		height: 10vh;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		background-color: #FFFFFF;
-		.btn{
-			width: 100%;
-			color: #E68500;
-			background-color: #FFE3A0;
-			height: 80rpx;
-			border-radius: 50rpx;
-			text-align: center;
-			line-height: 80rpx;
-		}
-	}
 </style>

pages/order/video.vue

@@ -1,60 +1,105 @@
-<template>
-	<view class="content">
-		<view class="card">
-			<textarea placeholder="请描述一下宠物的实时状态" />
-			<u-upload ref="uUpload" :action="action" :auto-upload="false" ></u-upload>
-		</view>
-		<view class="bottom-btn">
-			<view class="btn">
-				完善
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
+<template>
+	<view class="content">
+		<view class="card">
+			<textarea placeholder="请描述一下宠物的实时状态" v-model="txt" />
+			<u-upload ref="uUpload" name="file" :header="header" :max-count="9" :action="action" :auto-upload="true" @on-uploaded="uploaded">
+			</u-upload>
+		</view>
+		<view class="bottom-btn">
+			<view class="btn" @click="push">
+				确定上传
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getToken
+	} from "@/utils/auth.js";
+	export default {
+		data() {
+			return {
+				header: {
+					"Content-Type": "multipart/form-data;",
+					"token": getToken()
+				},
+				id: "",
+				status: "",
+				type: "",
+				action: "http://pet.hdlkeji.com/api/common/upload",
+				// 上传的图片列表
+				imageList: [],
+			}
+		},
+		onLoad(e) {
+			console.log(e)
+			this.status = Number(e.status);
+			this.type = Number(e.type);
+			this.id = Number(e.id);
+			// console.log(this.status,this.type)
+		},
 		methods: {
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	.content{
-		padding-top: 30rpx;
-	}
-	.card{
-		width: 93%;
-		padding: 30rpx;
-		margin: 0 auto;
-		background-color: #FFFFFF;
-		border-radius: 30rpx;
-	}
-	// 完成按钮
-	.bottom-btn{	
-		position: fixed;
-		bottom: 0;
-		width: 100%;
-		height: 10vh;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		background-color: #FFFFFF;
-		.btn{
-			width: 100%;
-			color: #E68500;
-			background-color: #FFE3A0;
-			height: 80rpx;
-			border-radius: 50rpx;
-			text-align: center;
-			line-height: 80rpx;
-		}
-	}
+			// 上传完成
+			uploaded(e){
+				console.log(e)
+				let data = this.imageList
+				data.push(e[0].response.data.url)
+				this.imageList = data
+			},
+			// 确认提交
+			push() {
+				this.request("/sender_order_controller/remark", {
+					id: this.id,
+					txt: this.txt,
+					status: this.status,
+					media: this.imageList
+				}, "POST").then(res => {
+					console.log(res)
+					if(res.code === 1){
+						uni.navigateBack({
+							delta:2
+						})
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		padding-top: 30rpx;
+	}
+
+	.card {
+		width: 93%;
+		padding: 30rpx;
+		margin: 0 auto;
+		background-color: #FFFFFF;
+		border-radius: 30rpx;
+	}
+
+	// 完成按钮
+	.bottom-btn {
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+		height: 10vh;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		background-color: #FFFFFF;
+
+		.btn {
+			width: 100%;
+			color: #E68500;
+			background-color: #FFE3A0;
+			height: 80rpx;
+			border-radius: 50rpx;
+			text-align: center;
+			line-height: 80rpx;
+		}
+	}
 </style>

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

@@ -105,6 +105,9 @@ __webpack_require__.r(__webpack_exports__);
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;var _default =
 {
+  globalData: {
+    idAdmin: false },
+
   onLaunch: function onLaunch() {
     console.log('App Launch');
   },

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

@@ -3218,6 +3218,10 @@ u-dropdown {
   background-color: #F8F8F8;
   min-height: 100vh;
 }
+.content .mine-icon {
+  height: 50rpx;
+  width: 50rpx;
+}
 .row {
   width: 100%;
   display: flex;

unpackage/dist/dev/mp-weixin/components/u-header.js

@@ -194,6 +194,63 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 var _auth = __webpack_require__(/*! @/utils/auth */ 16); //
 //
 //
@@ -250,23 +307,75 @@ var _auth = __webpack_require__(/*! @/utils/auth */ 16); //
 //
 //
 //
-var _default = { name: "u-header", data: function data() {return { headerHeight: 0, show: false, hasLogin: false, userinfo: {} };}, created: function created() {var _this = this;uni.getSystemInfo({ success: function success(res) {var menuButton = uni.getMenuButtonBoundingClientRect(); // 胶囊
-        var navBarPadding = (menuButton.top - res.statusBarHeight) * 2;var statusBarHeight = res.statusBarHeight;var navHeight = menuButton.height + navBarPadding;_this.headerHeight = navHeight + statusBarHeight;} });this.GetUser();}, methods: { // 代办事项
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+var _default = { name: "u-header", data: function data() {return { headerHeight: 0, show: false, hasLogin: false, userinfo: {}, type: false };}, created: function created() {var _this = this;uni.getSystemInfo({ success: function success(res) {var menuButton = uni.getMenuButtonBoundingClientRect(); // 胶囊
+        var navBarPadding = (menuButton.top - res.statusBarHeight) * 2;var statusBarHeight = res.statusBarHeight;var navHeight = menuButton.height + navBarPadding;_this.headerHeight = navHeight + statusBarHeight;} });this.GetUser();var data = getApp().globalData; // console.log(data)
+    this.type = data.isAdmin;}, methods: { // 点击退出登录
+    loginOut: function loginOut() {getApp.globalData = { isAdmin: false };(0, _auth.removeToken)();uni.reLaunch({ url: "/pages/login/login" });}, // 点击完善信息
+    GoMine: function GoMine() {uni.navigateTo({ url: '/pages/order/perfect' });}, // 点击我的钱包
+    GoWithdeawal: function GoWithdeawal() {uni.navigateTo({ url: '/pages/mine/mine' });}, // 点击修改密码
+    GoPassword: function GoPassword() {uni.navigateTo({ url: "/pages/mine/password" });}, // 代办事项
     GoIndex: function GoIndex() {uni.navigateTo({ url: '/pages/index/index' });}, GoDelivery: function GoDelivery() {uni.navigateTo({ url: '/pages/Delivery/Delivery' });}, // 点击营销设置
     GoMarket: function GoMarket() {uni.navigateTo({ url: '/pages/Marketing/Marketing' });}, // 点击前往订单页面
     GoOrder: function GoOrder() {uni.navigateTo({ url: '/pages/order/order' });}, //去登陆
     GoLogin: function GoLogin() {var token = (0, _auth.getToken)();if (!token) {this.side();uni.navigateTo({ url: '../login/login' });}}, //获取用户信息
-    GetUser: function GetUser() {var _this2 = this;this.request('/user/index', '', 'post').then(function (res) {var token = (0, _auth.getToken)();
-        if (token) {
-          _this2.userinfo = res.data;
-          _this2.hasLogin = true;
-        }
-
-      });
-    },
-    side: function side() {
-      this.show = !this.show;
-    } } };exports.default = _default;
+    GetUser: function GetUser() {var _this2 = this;this.request('/user/index', '', 'post').then(function (res) {var token = (0, _auth.getToken)();if (token) {_this2.userinfo = res.data;_this2.hasLogin = true;console.log(_this2.userinfo);}});}, side: function side() {this.show = !this.show;} } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),

unpackage/dist/dev/mp-weixin/components/u-header.wxss

@@ -30,6 +30,7 @@
 }
 .indexa {
   position: relative;
+  min-width: 68vw;
 }
 .indexa .sheader_a {
   margin-top: -60rpx;

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

@@ -239,6 +239,8 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
 var _default =
 {
   data: function data() {
@@ -253,6 +255,9 @@ var _default =
       dataList: [] };
 
   },
+  onShow: function onShow() {
+    this.getData();
+  },
   onLoad: function onLoad() {
     this.getData();
   },
@@ -263,7 +268,10 @@ var _default =
       var data = e.split(',');
       // 开启
       if (data[1] === '1') {
-        this.request("/admin_user/enable", { user_id: data[0], status: 'normal' }, "GET").then(function (res) {
+        this.request("/admin_user/enable", {
+          user_id: data[0],
+          status: 'normal' },
+        "GET").then(function (res) {
           console.log(res);
           if (res.code === 1) {
             _this.getData();
@@ -272,7 +280,10 @@ var _default =
       }
       // 关闭
       if (data[1] === '2') {
-        this.request("/admin_user/enable", { user_id: data[0], status: 'hidden' }, "GET").then(function (res) {
+        this.request("/admin_user/enable", {
+          user_id: data[0],
+          status: 'hidden' },
+        "GET").then(function (res) {
           console.log(res);
           if (res.code === 1) {
             _this.getData();

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

@@ -52,6 +52,21 @@
 .content .card .row {
   margin-bottom: 10rpx;
 }
+.content .card .locationName {
+  width: 100%;
+  justify-content: flex-start;
+}
+.content .card .locationName .text {
+  text-indent: 1em;
+  width: 80%;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-start;
+  white-space: nowrap;
+}
 .content .card .row:nth-child(5) {
   margin-bottom: 0;
 }

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

@@ -198,7 +198,6 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
-//
 var _default =
 {
   data: function data() {
@@ -247,12 +246,13 @@ var _default =
             this.send[1].checked = true;
           }
           if (s.type === "fast") {
-            this.send[2].checked = true;
+            this.send[0].checked = true;
           }
           if (s.type === "special") {
-            this.send[0].checked = true;
+            this.send[1].checked = true;
           }
         }} catch (err) {_iterator.e(err);} finally {_iterator.f();}
+      this.$forceUpdate();
     },
     // 点击配送区域
     location: function location() {var _this = this;
@@ -262,9 +262,18 @@ var _default =
         _this.info = data;
         _this.$forceUpdate();
       });
-      uni.navigateTo({
-        url: "./location" });
+      // 新增
+      if (this.pageType === 1) {
+        uni.navigateTo({
+          url: "./location" });
 
+      }
+      // 编辑
+      if (this.pageType === 2) {
+        uni.navigateTo({
+          url: "./location?area=" + JSON.stringify(this.info.area) });
+
+      }
     },
     // 确认新增
     create: function create() {var _this2 = this;
@@ -287,16 +296,20 @@ var _default =
       if (this.info.company === '') {
         this.$u.toast('请填写公司名称');
         return false;
-      }if (this.info.name === '') {
+      }
+      if (this.info.name === '') {
         this.$u.toast('请填写姓名');
         return false;
-      }if (this.info.mobile === '') {
+      }
+      if (this.info.mobile === '') {
         this.$u.toast('请填写联系方式');
         return false;
-      }if (this.info.username === '') {
+      }
+      if (this.info.username === '') {
         this.$u.toast('请填写账号');
         return false;
-      }if (this.info.password === '') {
+      }
+      if (this.info.password === '') {
         this.$u.toast('请填写密码');
         return false;
       }
@@ -311,43 +324,71 @@ var _default =
       });
     },
     // 确认修改
-    edit: function edit() {
+    edit: function edit() {var _this3 = this;
       console.log(this.info, 2222);
       var send = [];var _iterator3 = _createForOfIteratorHelper(
-      this.send),_step3;try {for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {var s = _step3.value;
-          if (s.checked) {
-            send.push(s.value);
+      this.send),_step3;try {for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {var _s = _step3.value;
+          if (_s.checked) {
+            send.push(_s.value);
           }
         }} catch (err) {_iterator3.e(err);} finally {_iterator3.f();}
+
+      var area = [];
+      console.log(typeof this.info.area[0]);
+      if (typeof this.info.area[0] === 'object') {var _iterator4 = _createForOfIteratorHelper(
+        this.info.area),_step4;try {for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {var s = _step4.value;
+            area.push(s.id);
+          }} catch (err) {_iterator4.e(err);} finally {_iterator4.f();}
+      } else {
+        // 没有修改区域
+        area = this.info.area;
+      }
       var data = {};
-      if (this.pageType === 1) {
-        data = {
-          send: send,
-          company: this.info.company,
-          name: this.info.name,
-          mobile: this.info.mobile,
-          username: this.info.username,
-          area: this.info.area };
-
-        this.request("/admin_user/store", data, "POST").then(function (res) {
-          console.log(res);
-        });
+      this.$forceUpdate();
+      if (send.length === 0) {
+        this.$u.toast('请选择运送方式');
+        return false;
       }
-      if (this.pageType === 2) {
-        data = {
-          id: this.info.id,
-          send: send,
-          company: this.info.company,
-          name: this.info.name,
-          mobile: this.info.mobile,
-          username: this.info.username,
-          area: this.info.area };
-
-        console.log(data, 333);
-        this.request("/admin_user/store", data, "POST").then(function (res) {
-          console.log(res);
-        });
+      if (!this.info.area || this.info.area.length === 0) {
+        this.$u.toast('请选择配送区域');
+        return false;
+      }
+      if (this.info.company === '') {
+        this.$u.toast('请填写公司名称');
+        return false;
+      }
+      if (this.info.name === '') {
+        this.$u.toast('请填写姓名');
+        return false;
       }
+      if (this.info.mobile === '') {
+        this.$u.toast('请填写联系方式');
+        return false;
+      }
+      if (this.info.username === '') {
+        this.$u.toast('请填写账号');
+        return false;
+      }
+      data = {
+        id: this.info.id,
+        send: send,
+        company: this.info.company,
+        name: this.info.name,
+        mobile: this.info.mobile,
+        username: this.info.username,
+        area: area };
+
+      this.request("/admin_user/store", data, "POST").then(function (res) {
+        console.log(res);
+        if (res.code === 1) {
+          _this3.$u.toast('操作成功');
+          setTimeout(function () {
+            uni.navigateBack({
+              delta: 1 });
+
+          }, 2000);
+        }
+      });
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

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

@@ -192,14 +192,21 @@ var _default = {
   data: function data() {
     return {
       scrollTop: 0,
-      area: [] };
+      area: [],
+      type: 1,
+      checkedArea: [] };
 
   },
   onPageScroll: function onPageScroll(e) {
     this.scrollTop = e.scrollTop;
   },
-  onLoad: function onLoad() {
+  onLoad: function onLoad(e) {
     this.getLocation();
+    console.log(e);
+    if (e.area) {
+      this.type = 2;
+      this.checkedArea = JSON.parse(e.area);
+    }
   },
   methods: {
     // 点击确定
@@ -238,6 +245,19 @@ var _default = {
       this.request("/common/area_sort", {}, "GET").then(function (res) {
         if (res.code === 1) {
           _this.area = res.data;
+          if (_this.type === 2) {
+            var data = _this.area;
+            var checked = _this.checkedArea;
+            for (var key in data) {
+              for (var ikey in data[key].child) {var _iterator2 = _createForOfIteratorHelper(
+                checked),_step2;try {for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {var s = _step2.value;
+                    if (data[key].child[ikey].id === s.id) {
+                      data[key].child[ikey].checked = true;
+                    }
+                  }} catch (err) {_iterator2.e(err);} finally {_iterator2.f();}
+              }
+            }
+          }
         }
       });
     } } };exports.default = _default;

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

@@ -1 +1 @@
-<view class="content"><u-index-list class="scroll-list" vue-id="71da31bf-1" scrollTop="{{scrollTop}}" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{area}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="list-box"><u-index-anchor vue-id="{{('71da31bf-2-'+index)+','+('71da31bf-1')}}" index="{{item.index}}" bind:__l="__l"></u-index-anchor><block wx:for="{{item.child}}" wx:for-item="iitem" wx:for-index="iindex" wx:key="iindex"><view data-event-opts="{{[['tap',[['checked',[index,iindex]]]]]}}" class="address_name row" bindtap="__e"><view style="{{(iitem.checked?'color:#F6B301':'')}}">{{iitem.title}}</view><view class="icon"><block wx:if="{{iitem.checked}}"><u-icon vue-id="{{('71da31bf-3-'+index+'-'+iindex)+','+('71da31bf-1')}}" name="checkmark-circle" color="#F6B301" bind:__l="__l"></u-icon></block></view></view></block></view></block></u-index-list><view class="bottom-btn"><view class="buttom-dom row"><view data-event-opts="{{[['tap',[['checkAll',['$event']]]]]}}" class="all" bindtap="__e">全选</view><view data-event-opts="{{[['tap',[['push',['$event']]]]]}}" class="push" bindtap="__e">确定</view></view></view></view>
+<view class="content"><u-index-list class="scroll-list" vue-id="71da31bf-1" scrollTop="{{scrollTop}}" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{area}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="list-box"><u-index-anchor vue-id="{{('71da31bf-2-'+index)+','+('71da31bf-1')}}" index="{{item.index}}" bind:__l="__l"></u-index-anchor><block wx:for="{{item.child}}" wx:for-item="iitem" wx:for-index="iindex" wx:key="iindex"><view data-event-opts="{{[['tap',[['checked',[index,iindex]]]]]}}" class="address_name row" bindtap="__e"><view style="{{(iitem.checked?'color:#F6B301':'')}}">{{iitem.title}}</view><view class="icon"><block wx:if="{{iitem.checked}}"><u-icon vue-id="{{('71da31bf-3-'+index+'-'+iindex)+','+('71da31bf-1')}}" name="checkmark-circle" color="#F6B301" bind:__l="__l"></u-icon></block></view></view></block></view></block></u-index-list><view class="bottom-btn"><view class="buttom-dom row"><view data-event-opts="{{[['tap',[['push',['$event']]]]]}}" class="push" bindtap="__e">确定</view></view></view></view>

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

@@ -160,31 +160,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 var _auth = __webpack_require__(/*! ../../utils/auth */ 16); //
 //
 //
@@ -214,34 +189,36 @@ var _auth = __webpack_require__(/*! ../../utils/auth */ 16); //
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
 var _default = { data: function data() {return { codeName: "发送验证码", isCode: true, account: "", password: "" };}, methods: { onlogin: function onlogin() {//登录
-      var that = this;if (that.phone == "") {uni.showToast({ title: "请输入账号", icon: "none" });return;}if (that.password == "") {uni.showToast({ title: "请输入密码", icon: "none" });return;}uni.showLoading({ title: "登录中..." });that.request("/user/login", { account: that.account, password: that.password, type: 2 }, "post").then(function (res) {uni.hideLoading();(0, _auth.setToken)(res.data.userinfo.token); //模拟存储token
-        uni.showToast({ title: "登录成功" });that.navTimeBack(res.data.is_admin);});}, navTimeBack: function navTimeBack(type) {console.log(type);if (type) {setTimeout(function () {uni.reLaunch({ url: '/pages/index/index' });
+      var that = this;if (that.phone == "") {uni.showToast({ title: "请输入账号", icon: "none" });return;}if (that.password == "") {uni.showToast({ title: "请输入密码", icon: "none" });return;}uni.showLoading({
+        title: "登录中..." });
+
+      that.
+      request(
+      "/user/login", {
+        account: that.account,
+        password: that.password,
+        type: 2 },
+
+      "post").
+
+      then(function (res) {
+        uni.hideLoading();
+        (0, _auth.setToken)(res.data.userinfo.token); //模拟存储token
+        getApp().globalData = { isAdmin: res.data.is_admin };
+        uni.showToast({
+          title: "登录成功" });
+
+        that.navTimeBack(res.data.is_admin);
+      });
+    },
+    navTimeBack: function navTimeBack(type) {
+      console.log(type);
+      if (type) {
+        setTimeout(function () {
+          uni.reLaunch({
+            url: '/pages/index/index' });
+
         }, 2000);
       } else {
         setTimeout(function () {
@@ -283,8 +260,7 @@ var _default = { data: function data() {return { codeName: "发送验证码", is
       var that = this;
       that.
       request(
-      "/sms/send",
-      {
+      "/sms/send", {
         mobile: that.phone,
         event: "mobilelogin" },
 

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

@@ -161,11 +161,34 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 var _default =
 {
   data: function data() {
-    return {};
-
+    return {
+      // 提现金额
+      money: 0,
+      // 用户信息
+      info: {} };
 
   },
-  methods: {} };exports.default = _default;
+  onLoad: function onLoad() {
+    this.getUserInfo();
+  },
+  methods: {
+    // 获取可提现金额
+    getUserInfo: function getUserInfo() {var _this = this;
+      this.request("/user/index", {}, "POST").then(function (res) {
+        if (res.code === 1) {
+          _this.info = res.data;
+        }
+      });
+    },
+    // 点击充值
+    push: function push() {var _this2 = this;
+      this.request("/user_money_controller/take_cash", { money: this.money }, "POST").then(function (res) {
+        if (res.code === 1) {
+          _this2.$u.toast('充值成功');
+          _this2.money = 0;
+        }
+      });
+    } } };exports.default = _default;
 
 /***/ }),
 

unpackage/dist/dev/mp-weixin/pages/mine/Withdrawal.wxml

@@ -1 +1 @@
-<view class="content"><view class="card"><view class="money-num">9999.00</view><view class="money-text">可提现金额</view><view class="title">提现金额</view><view class="money-input row"><view class="icon">1</view><input class="input" type="number"/><view class="all">全部</view></view></view><view class="bottom-btn"><view data-event-opts="{{[['tap',[['push',['$event']]]]]}}" class="buttom-dom" bindtap="__e">确认</view></view></view>
+<view class="content"><view class="card"><view class="money-num">{{''+info.money+''}}</view><view class="money-text">可提现金额</view><view class="title">提现金额</view><view class="money-input row"><view class="icon">¥</view><input class="input" type="number" data-event-opts="{{[['input',[['__set_model',['','money','$event',[]]]]]]}}" value="{{money}}" bindinput="__e"/><view class="all">全部</view></view></view><view class="bottom-btn"><view data-event-opts="{{[['tap',[['push',['$event']]]]]}}" class="buttom-dom" bindtap="__e">确认</view></view></view>

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

@@ -174,11 +174,39 @@ __webpack_require__.r(__webpack_exports__);
 var _default =
 {
   data: function data() {
-    return {};
-
+    return {
+      // 用户信息
+      userInfo: {},
+      // 钱包历史
+      history: [],
+      page: 1,
+      limit: 20 };
 
   },
+  onLoad: function onLoad() {
+    this.getUserInfo();
+    this.getHistory();
+  },
   methods: {
+    // 获取会员信息
+    getUserInfo: function getUserInfo() {var _this = this;
+      this.request("/user/index", {}, "GET").then(function (res) {
+        if (res.code === 1) {
+          _this.userInfo = res.data;
+        }
+      });
+    },
+    // 获取金额日志
+    getHistory: function getHistory() {var _this2 = this;
+      this.request("/user_money_controller/log", {
+        page: this.page,
+        limit: this.limit },
+      "GET").then(function (res) {
+        if (res.code === 1) {
+          _this2.history = res.data.data;
+        }
+      });
+    },
     // 点击提现
     withdrawal: function withdrawal() {
       uni.navigateTo({

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

@@ -1 +1 @@
-<view class="content"><view class="card"><view class="title">总资产</view><view class="row"><view class="big">999.00</view><view data-event-opts="{{[['tap',[['withdrawal',['$event']]]]]}}" class="btn" bindtap="__e">提现</view></view></view><view class="list"><view class="title">余额明细</view><view class="list-box"><view class="row"><view class="icon">1</view><view class="text"><view>111</view><view>222</view></view><view class="number">1000.00</view></view></view></view></view>
+<view class="content"><view class="card"><view class="title">总资产</view><view class="row"><view class="big">{{''+userInfo.money+''}}</view><view data-event-opts="{{[['tap',[['withdrawal',['$event']]]]]}}" class="btn" bindtap="__e">提现</view></view></view><view class="list"><view class="title">余额明细</view><view class="list-box"><block wx:for="{{history}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="row"><view class="icon"><image class="mine-icon" src="http://pet.hdlkeji.com/assets/static/1/79.png"></image></view><view class="text"><view>{{''+item.type_text+''}}</view><view>{{''+item.createtime+''}}</view></view><view class="number">{{''+item.money+''}}</view></view></block></view></view></view>

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

@@ -32,7 +32,7 @@
   width: 93%;
   height: 300rpx;
   margin: 0 auto;
-  border: 1px red solid;
+  border: 1px #999 solid;
   border-radius: 40rpx;
   display: flex;
   flex-direction: column;

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

@@ -522,6 +522,33 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default =
 {
   data: function data() {
@@ -538,7 +565,9 @@ var _default =
   methods: {
     // 获取订单信息
     getData: function getData(id) {var _this = this;
-      this.request("/sender_order_controller/detail", { id: id }, "GET").then(function (res) {
+      this.request("/sender_order_controller/detail", {
+        id: id },
+      "GET").then(function (res) {
         console.log(res);
         if (res.code === 1) {
           _this.info = res.data;
@@ -546,9 +575,11 @@ var _default =
       });
     },
     // 点击上传视频
-    video: function video() {
+    video: function video(status, type, id) {
+      // status 的订单状态 10取宠视频 20 运输视频 30送宠视频 
+      // type 1 备注 2上传更多 3上传取宠视频 4上传运输视频 5上传送达视频
       uni.navigateTo({
-        url: "./video" });
+        url: "./video?status=" + status + "&type=" + type + "&id=" + id });
 
     } } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))

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

@@ -62,6 +62,82 @@
 .card .row {
   margin-bottom: 20rpx;
 }
+.card .order {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background: #F5F6FB;
+  opacity: 1;
+  padding: 14rpx 24rpx;
+  box-sizing: border-box;
+  border-radius: 16rpx;
+  margin-bottom: 10rpx;
+}
+.card .order .order_a {
+  font-size: 26rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  line-height: 36rpx;
+  color: #1F4971;
+  opacity: 1;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+.card .order .order_a .order_yuan {
+  display: inline-block;
+  width: 14rpx;
+  height: 14rpx;
+  background: #F6B403;
+  border-radius: 50%;
+  opacity: 1;
+  margin-right: 10rpx;
+}
+.card .order .order_a .order_yuana {
+  display: inline-block;
+  width: 14rpx;
+  height: 14rpx;
+  background: #F54948;
+  border-radius: 50%;
+  opacity: 1;
+  margin-right: 10rpx;
+}
+.card .order .order_b {
+  width: 85%;
+  text-align: left;
+}
+.card .order .order_b .order_p {
+  font-size: 26rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  line-height: 36rpx;
+  color: #111111;
+  opacity: 1;
+}
+.card .order .order_b .order_c {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  margin-top: 6rpx;
+}
+.card .order .order_b .order_c .order_p1 {
+  font-size: 26rpx;
+  font-family: PingFang SC;
+  font-weight: 400;
+  line-height: 36rpx;
+  color: #111111;
+  opacity: 1;
+}
+.card .order .order_b .order_c .order_p2 {
+  font-size: 26rpx;
+  font-family: PingFang SC;
+  font-weight: 400;
+  line-height: 36rpx;
+  color: #111111;
+  opacity: 1;
+  margin-left: 40rpx;
+}
 .min-card {
   width: 100%;
   background-color: #F8F8F8;

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

@@ -247,6 +247,293 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 {
   components: {
     uHeader: uHeader },
@@ -271,19 +558,21 @@ __webpack_require__.r(__webpack_exports__);
 
       {
         cate_name: '已结算',
-        cate_count: 1 },
+        cate_count: 0 },
 
       {
         cate_name: '已取消',
-        cate_count: 1 }],
+        cate_count: 0 }],
 
 
       // 弹窗
-      show: true,
+      show: false,
       page: 1,
       limit: 10,
       type: 1,
-      data: {} };
+      data: {},
+      // 是否是管理员
+      isAdmin: false };
 
   },
   watch: {
@@ -293,17 +582,68 @@ __webpack_require__.r(__webpack_exports__);
 
   onLoad: function onLoad() {
     this.getData();
+    // 获取订单数量
+    this.getDataNum();
+    var data = getApp().globalData;
+    this.isAdmin = data.isAdmin;
+    if (!this.isAdmin) {
+      this.getInfo();
+    }
+  },
+  onShow: function onShow() {
+    this.getDataNum();
   },
   methods: {
+    // 获取会员信息
+    getInfo: function getInfo() {var _this = this;
+      this.request('/user/index', {}, "GET").then(function (res) {
+        if (res.code === 1) {
+          if (res.data.need_verification) {
+            _this.show = true;
+          }
+        }
+      });
+    },
+    // 点击立即接单
+    getOrder: function getOrder(id) {var _this2 = this;
+      this.request("/sender_order_controller/get", {
+        id: id },
+      "POST").then(function (res) {
+        if (res.code === 1) {
+          _this2.getData();
+          _this2.getDataNum();
+        }
+      });
+    },
+    // 获取订单数量
+    getDataNum: function getDataNum() {var _this3 = this;
+      this.request("/sender_order_controller/nums", {}, "GET").then(function (res) {
+        console.log(res);
+        if (res.code === 1) {
+          _this3.list[0].cate_count = res.data[1];
+          _this3.list[1].cate_count = res.data[2];
+          _this3.list[2].cate_count = res.data[3];
+          _this3.list[3].cate_count = res.data[4];
+          _this3.list[4].cate_count = res.data[5];
+        }
+      });
+    },
     // 获取订单列表
-    getData: function getData() {var _this = this;
-      this.request("/admin_order/orders", {
+    getData: function getData() {var _this4 = this;
+      var url = "";
+      if (this.isAdmin) {
+        url = "/admin_order/orders";
+      } else {
+        url = "/sender_order_controller/list";
+      }
+      this.request(url, {
         page: this.page,
         limit: this.limit,
         type: this.type },
       "GET").then(function (res) {
         if (res.code === 1) {
-          _this.data = res.data;
+          _this4.data = res.data;
+          _this4.list[_this4.current].cate_count = res.data.total;
         }
       });
     },
@@ -319,6 +659,11 @@ __webpack_require__.r(__webpack_exports__);
         url: "./info?id=" + _info.id });
 
     },
+    // 滑动切换
+    touchChange: function touchChange(e) {
+      this.current = e.detail.current;
+      this.type = e.detail.current + 1;
+    },
     // 点击菜单
     change: function change(e) {
       console.log(e);
@@ -327,19 +672,15 @@ __webpack_require__.r(__webpack_exports__);
         this.type = 1;
       }
       if (e === 1) {
-
         this.type = 2;
       }
       if (e === 2) {
-
         this.type = 3;
       }
       if (e === 3) {
-
         this.type = 4;
       }
       if (e === 4) {
-
         this.type = 5;
       }
 

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

@@ -28,6 +28,9 @@
 .content {
   padding-top: 260rpx;
 }
+.content .order-list-box {
+  height: 80vh;
+}
 .menu-top {
   position: fixed;
   top: 140rpx;
@@ -96,9 +99,19 @@
   width: 500rpx;
   height: 650rpx;
   padding: 40rpx;
+  background-image: url("http://pet.hdlkeji.com/assets/static/1/110.png");
+  background-size: 100% 100%;
 }
 .u-update-content .u-update-top {
   height: 50%;
+  display: flex;
+  position: relative;
+}
+.u-update-content .u-update-top .top-image {
+  height: 300rpx;
+  width: 300rpx;
+  position: absolute;
+  left: 100rpx;
 }
 .u-update-content .u-update-bottom {
   height: 50%;

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

@@ -130,7 +130,43 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0; //
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+var _auth = __webpack_require__(/*! @/utils/auth.js */ 16); //
 //
 //
 //
@@ -165,14 +201,47 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 //
 //
 //
-var _default =
-{
-  data: function data() {
-    return {};
+var _default = { data: function data() {return { // 身份证正面
+      cardLeft: "", // 身份证反面
+      cardRight: "", // 营业执照
+      imgBottom: "" };}, methods: { // 点击确认
+    push: function push() {var _this2 = this;if (this.cardLeft === '') {this.$u.toast('请上传身份证正面');return false;}if (this.cardRight === '') {this.$u.toast('请上传身份证正面');return false;}if (this.imgBottom === '') {this.$u.toast('请上传身份证正面');return false;}this.request('/sender/verification', { id_z: this.cardLeft, id_f: this.cardRight, license: this.imgBottom }, "POST").then(function (res) {if (res.code === 1) {_this2.$u.toast('完善成功');setTimeout(function () {uni.navigateBack({ delta: 1 });
+
+          }, 2000);
+        }
+      });
+
+    },
+    // 点击选择图片
+    chooseImg: function chooseImg(type) {
+      var _this = this;
+      uni.chooseImage({
+        success: function success(e) {
+          console.log(e);
+          uni.uploadFile({
+            url: 'http://pet.hdlkeji.com/api/common/upload', //仅为示例，非真实的接口地址
+            filePath: e.tempFilePaths[0],
+            header: {
+              "token": (0, _auth.getToken)() },
+
+            name: 'file',
+            success: function success(res) {
+              console.log(res, 11111);
+              if (type === 1) {
+                _this.cardLeft = e.tempFilePaths[0];
+              }
+              if (type === 2) {
+                _this.cardRight = e.tempFilePaths[0];
+              }
+              if (type === 3) {
+                _this.imgBottom = e.tempFilePaths[0];
+              }
+            } });
 
+        } });
 
-  },
-  methods: {} };exports.default = _default;
+    } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
 

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

@@ -1 +1 @@
-<view class="content"><view class="card"><view class="title">上传身份证</view><view class="top row"><view class="left"></view><view class="right"></view></view></view><view class="card margin-top"><view class="title">上传营业执照</view><view class="bottom row"><view class="image"></view></view></view><view class="bottom-btn"><view class="btn">完善</view></view></view>
+<view class="content"><view class="card"><view class="title">上传身份证</view><view class="top row"><view data-event-opts="{{[['tap',[['chooseImg',[1]]]]]}}" class="left" bindtap="__e"><block wx:if="{{cardLeft!==''}}"><image class="image-dom" src="{{cardLeft}}"></image></block></view><view data-event-opts="{{[['tap',[['chooseImg',[2]]]]]}}" class="right" bindtap="__e"><block wx:if="{{cardRight!==''}}"><image class="image-dom" src="{{cardRight}}"></image></block></view></view></view><view class="card margin-top"><view class="title">上传营业执照</view><view class="bottom row"><view data-event-opts="{{[['tap',[['chooseImg',[3]]]]]}}" class="image" bindtap="__e"><block wx:if="{{imgBottom!==''}}"><image class="image-dom" src="{{imgBottom}}"></image></block></view></view></view><view class="bottom-btn"><view data-event-opts="{{[['tap',[['push',['$event']]]]]}}" class="btn" bindtap="__e">完善</view></view></view>

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

@@ -44,17 +44,33 @@
 .card .top .left {
   width: 300rpx;
   height: 200rpx;
-  border: 1px red solid;
+  background-image: url("http://pet.hdlkeji.com/assets/static/1/107.png");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
 }
 .card .top .right {
   width: 300rpx;
   height: 200rpx;
-  border: 1px red solid;
+  background-image: url("http://pet.hdlkeji.com/assets/static/1/106.png");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+}
+.card .bottom {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
 }
 .card .bottom .image {
-  border: 1px red solid;
   height: 300rpx;
-  width: 700rpx;
+  width: 600rpx;
+  background-image: url("http://pet.hdlkeji.com/assets/static/1/82.png");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+}
+.image-dom {
+  width: 100%;
+  height: 100%;
 }
 .bottom-btn {
   position: fixed;

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

@@ -153,7 +153,23 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0; //
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+var _auth = __webpack_require__(/*! @/utils/auth.js */ 16); //
 //
 //
 //
@@ -167,14 +183,42 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 //
 //
 //
-var _default =
-{
-  data: function data() {
-    return {};
-
-
+//
+var _default = { data: function data() {return { header: { "Content-Type": "multipart/form-data;", "token": (0, _auth.getToken)() }, id: "", status: "", type: "", action: "http://pet.hdlkeji.com/api/common/upload", // 上传的图片列表
+      imageList: [] };
+  },
+  onLoad: function onLoad(e) {
+    console.log(e);
+    this.status = Number(e.status);
+    this.type = Number(e.type);
+    this.id = Number(e.id);
+    // console.log(this.status,this.type)
   },
-  methods: {} };exports.default = _default;
+  methods: {
+    // 上传完成
+    uploaded: function uploaded(e) {
+      console.log(e);
+      var data = this.imageList;
+      data.push(e[0].response.data.url);
+      this.imageList = data;
+    },
+    // 确认提交
+    push: function push() {
+      this.request("/sender_order_controller/remark", {
+        id: this.id,
+        txt: this.txt,
+        status: this.status,
+        media: this.imageList },
+      "POST").then(function (res) {
+        console.log(res);
+        if (res.code === 1) {
+          uni.navigateBack({
+            delta: 2 });
+
+        }
+      });
+    } } };exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 
 /***/ }),
 

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

@@ -1 +1 @@
-<view class="content"><view class="card"><textarea placeholder="请描述一下宠物的实时状态"></textarea><u-upload class="vue-ref" vue-id="a2675cd6-1" action="{{action}}" auto-upload="{{false}}" data-ref="uUpload" bind:__l="__l"></u-upload></view><view class="bottom-btn"><view class="btn">完善</view></view></view>
+<view class="content"><view class="card"><textarea placeholder="请描述一下宠物的实时状态" data-event-opts="{{[['input',[['__set_model',['','txt','$event',[]]]]]]}}" value="{{txt}}" bindinput="__e"></textarea><u-upload class="vue-ref" vue-id="a2675cd6-1" name="file" header="{{header}}" max-count="{{9}}" action="{{action}}" auto-upload="{{true}}" data-ref="uUpload" data-event-opts="{{[['^onUploaded',[['uploaded']]]]}}" bind:onUploaded="__e" bind:__l="__l"></u-upload></view><view class="bottom-btn"><view data-event-opts="{{[['tap',[['push',['$event']]]]]}}" class="btn" bindtap="__e">确定上传</view></view></view>

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

@@ -41,6 +41,12 @@
           "pathName": "pages/Delivery/create",
           "query": "type=1",
           "scene": null
+        },
+        {
+          "name": "pages/order/order",
+          "pathName": "pages/order/order",
+          "query": "",
+          "scene": null
         }
       ]
     }