XXX

App.vue

@@ -39,4 +39,10 @@
 		font-size: 40rpx;
 		color: #999999;
 	}
+	
+	
+	.feedbackconent-input::-webkit-input-placeholder {
+		color: red;
+		font-size: 30rpx;
+	}
 </style>

main.js

@@ -10,7 +10,8 @@ import uView from "uview-ui";
 Vue.config.productionTip = false;
 Vue.config.productionTip = false;
 
-Vue.prototype.url = 'http://pet.hdlkeji.com/api';  
+Vue.prototype.url = 'http://pet.hdlkeji.com/api';
+Vue.prototype.$EventBus = new Vue();
 
 
 
@@ -27,6 +28,7 @@ app.$mount()
 
 // #ifdef VUE3
 import { createSSRApp } from 'vue'
+
 export function createApp() {
   const app = createSSRApp(App)
   return {

manifest.json

@@ -50,9 +50,12 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxfdc16dfe02d1a38d",
+        "appid" : "wx2f20767b0bbaf91c",
         "setting" : {
-            "urlCheck" : false
+            "urlCheck" : false,
+            "es6" : true,
+            "postcss" : true,
+            "minified" : true
         },
         "usingComponents" : true
     },

pages/Delivery/Delivery.vue

@@ -1,19 +1,18 @@
 <template>
 	<view class="content">
 		<view class="search">
-			<u-search placeholder="请输入信息搜索配送员" v-model="keyword"></u-search>
+			<u-search placeholder="请输入信息搜索配送员" v-model="keyword" @custom="getData" @search="getData"></u-search>
 		</view>
-
-		<view class="card">
-			<view class="row">
-				<view class="row half">
-					<view class="name">
-						公司名称
-					</view>
-					<view class="text">
-						1111
-					</view>
-				</view>
+		<view class="card" v-for="(item,index) in dataList" :key="index">
+			<view class="row">
+				<view class="row half">
+					<view class="name">
+						公司名称
+					</view>
+					<view class="text">
+						{{item.company}}
+					</view>
+				</view>
 			</view>
 			<view class="row">
 				<view class="row half">
@@ -21,7 +20,7 @@
 						姓名
 					</view>
 					<view class="text">
-						1111
+						{{item.name}}
 					</view>
 				</view>
 				<view class="row half">
@@ -29,55 +28,56 @@
 						联系方式
 					</view>
 					<view class="text">
-						1111
+						{{item.mobile}}
 					</view>
 				</view>
-			</view>
-			<view class="row">
-				<view class="row half">
-					<view class="name">
-						账号
-					</view>
-					<view class="text">
-						1111
-					</view>
-				</view>
-			</view>
-			<view class="row">
-				<view class="row half">
-					<view class="name">
-						所属区域
-					</view>
-					<view class="text">
-						1111
-					</view>
-				</view>
 			</view>
 			<view class="row">
 				<view class="row half">
 					<view class="name">
-						是否禁用
+						账号
 					</view>
 					<view class="text">
-						1111
+						{{item.username}}
 					</view>
 				</view>
+			</view>
+			<view class="row">
 				<view class="row half">
-					<view class="btn" @click="del">
-						删除
-					</view>
-					<view class="btn" @click="eidt">
-						编辑
+					<view class="name">
+						所属区域
+					</view>
+					<view class="text">
+						{{item.area[0].name}}
+					</view>
+				</view>
+			</view>
+			<view class="row">
+				<view class="row half">
+					<view class="name">
+						是否禁用
+					</view>
+					<u-switch class="text" style="margin-left: 20rpx;" v-model="item.status"
+						:active-value="item.id + ',1'" :inactive-value="item.id + ',2'" @change="open"
+						active-color="#F6B301" inactive-color="#eee" size="25"></u-switch>
+				</view>
+				<view class="row half">
+					<view class="btn" @click="del(item.id)">
+						删除
+					</view>
+					<view class="btn" @click="eidt(item)">
+						编辑
 					</view>
 				</view>
 			</view>
 		</view>
-	
-		<view class="bottom-btn">
-			<view class="buttom-dom" @click="create">
-				创建配送员
-			</view>
-		</view>
+
+
+		<view class="bottom-btn">
+			<view class="buttom-dom" @click="create">
+				创建配送员
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -85,40 +85,92 @@
 	export default {
 		data() {
 			return {
-				show: false,
-				level: [{
-						cateName: '普通会员',
-						id: 1
-					},
-					{
-						cateName: '黄金会员',
-						id: 2
-					},
-					{
-						cateName: '铂金会员',
-						id: 2
-					},
-					{
-						cateName: '钻石会员',
-						id: 2
-					},
-				]
+				// 搜索条件
+				keyword: "",
+				// 数量
+				limit: 10,
+				// 页码
+				page: 1,
+				// 数据
+				dataList: []
 			}
 		},
-		methods: {
-			// 点击新建
-			create(){
-				uni.navigateTo({
-					url:'./create'
-				})
-			},
-			// 点击删除
-			del(){
-				console.log('del')
+		onLoad() {
+			this.getData()
+		},
+		methods: {
+			// 禁用
+			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()
+						}
+					})
+				}
+				// 关闭
+				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()
+						}
+					})
+				}
+			},
+			// 获取数据列表
+			getData() {
+				this.request("/admin_user/senders", {
+					keyword: this.keyword,
+					limit: this.limit,
+					page: this.page
+				}, "GET").then(res => {
+					console.log(res)
+					if (res.code === 1) {
+						this.dataList = res.data.data
+					}
+				})
+			},
+			// 点击新建
+			create() {
+				uni.navigateTo({
+					url: './create?type=1'
+				})
+			},
+			// 点击删除
+			del(id) {
+				let _this = this;
+				console.log('del')
+				uni.showModal({
+					title: "提示",
+					content: "确定要删除此配送员吗？",
+					showCancel: true,
+					success(e) {
+						if (e.confirm) {
+							console.log('确定')
+							_this.request("/admin_user/delete", {
+								user_id: id
+							}, "GET").then(res => {
+								console.log(res)
+								if (res.code === 1) {
+									_this.$u.toast('操作成功')
+									_this.getData()
+								}
+							})
+						}
+					}
+				})
 			},
 			// 点击编辑
-			eidt() {
-				console.log('edit')
+			eidt(info) {
+				console.log('edit')
+				uni.navigateTo({
+					url: "./create?info=" + JSON.stringify(info) + "&type=2"
+				})
 			}
 		}
 	}
@@ -126,81 +178,83 @@
 
 <style lang="scss">
 	.content {
-		padding-top: 120rpx;
-		overflow-y: scroll;
-	}
+		padding-top: 120rpx;
+		overflow-y: scroll;
+		padding-bottom: 15vh;
 
-	.search {
-		padding: 30rpx;
-		background-color: #FFFFFF;
-		position: fixed;
-		top: 0;
-		width: 100vw;
-	}
-
-	.card {
-		background-color: #FFFFFF;
-		width: 93%;
-		margin: 0 auto;
-		margin-top: 40rpx;
-		padding: 30rpx;
-		border-radius: 30rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: space-between;
-		&:not(:last-child){
-			margin-bottom: 15vh;
-		}
-		
-		.row{
-			margin-bottom: 10rpx;
-		}
-		.row:nth-child(5){
-			margin-bottom: 0;
+		.search {
+			padding: 30rpx;
+			background-color: #FFFFFF;
+			position: fixed;
+			top: 0;
+			width: 100vw;
 		}
 
-		.half {
-			width: 50%;
-			justify-content: flex-start;
+		.card {
+			background-color: #FFFFFF;
+			width: 93%;
+			margin: 0 auto;
+			margin-top: 40rpx;
+			padding: 30rpx;
+			border-radius: 30rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: space-between;
+
+			.row {
+				margin-bottom: 10rpx;
+			}
 
-			.name {
-				color: #999;
+			.row:nth-child(5) {
+				margin-bottom: 0;
 			}
 
-			.text {
-				text-indent: 1em;
+			.half {
+				width: 50%;
+				justify-content: flex-start;
+
+				.name {
+					color: #999;
+				}
+
+				.text {
+					text-indent: 1em;
+				}
+
+				.btn {
+					width: 100%;
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: flex-end;
+				}
 			}
+		}
+
 
-			.btn {
-				width: 100%;
-				display: flex;
-				flex-direction: row;
-				align-items: center;
-				justify-content: flex-end;
+		.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;
 			}
 		}
+
 	}
-	
-	.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/Delivery/create.vue

@@ -5,22 +5,25 @@
 				<view>
 					运送方式（多选）
 				</view>
-				<u-checkbox-group v-model="type">
-					<u-checkbox shape="square" :name="1">{{'快车'}}</u-checkbox>
-					<u-checkbox shape="square" :name="2">{{'空运'}}</u-checkbox>
-					<u-checkbox shape="square" :name="3">{{'专车'}}</u-checkbox>
+				<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>
 				</u-checkbox-group>
 			</view>
 		</view>
-		<input type="digit" placeholder="请输入公司名称" class="input-card" />
-		<input type="digit" placeholder="请输入姓名" class="input-card" />
-		<input type="digit" placeholder="请输入联系方式" class="input-card" />
-		<input type="digit" placeholder="请输入账号" class="input-card" />
-		<input type="digit" placeholder="请输入6-12位密码" class="input-card" />
+		<input type="text" placeholder="请输入公司名称" class="input-card" v-model="info.company" />
+		<input type="text" placeholder="请输入姓名" class="input-card" v-model="info.name" />
+		<input type="text" 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"
+			v-model="info.password" />
 		<view class="card" style="margin-top: 40rpx;" @click="location">
 			<view class="row">
-				<view>请选择配送区域</view>
-				<view class="">11</view>
+				<view>请选择配送区域</view>
+				
+				<view class="">
+					<u-icon name="arrow-right"></u-icon>
+				</view>
 			</view>
 		</view>
 
@@ -43,19 +46,148 @@
 				type: [],
 				// 1添加 2修改
 				pageType: 1,
+				// 编辑的信息
+				info: {},
+				// 配送类型
+				send: [{
+						name: '快车',
+						value: 'fast',
+						checked: false,
+					},
+					{
+						name: '空运',
+						value: 'air',
+						checked: false,
+					},
+					{
+						name: '专车',
+						value: 'special',
+						checked: false,
+					},
+				]
+			}
+		},
+		onLoad(e) {
+			this.pageType = Number(e.type);
+			if (this.pageType === 2) {
+				uni.setNavigationBarTitle({
+					title: "编辑信息"
+				})
+				this.info = JSON.parse(e.info);
+				this.setSend()
 			}
 		},
-		methods: {
-			// 点击配送区域
-			location(){
-				uni.navigateTo({
-					url:"./location"
+		methods: {
+			// 获取配送类型
+			setSend() {
+				let data = this.info.send
+				for (let s of data) {
+					if (s.type === "air") {
+						this.send[1].checked = true
+					}
+					if (s.type === "fast") {
+						this.send[2].checked = true
+					}
+					if (s.type === "special") {
+						this.send[0].checked = true
+					}
+				}
+			},
+			// 点击配送区域
+			location() {
+				this.$EventBus.$on('listenSetArea',(res)=>{
+					let data = this.info;
+					data.area = res;
+					this.info = data
+					this.$forceUpdate()
 				})
+				uni.navigateTo({
+					url: "./location"
+				})
 			},
 			// 确认新增
-			create() {},
+			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() {}
+			edit() {
+				console.log(this.info, 2222)
+				let send = [];
+				for (let s of this.send) {
+					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,
+					}
+					console.log(data,333)
+					this.request("/admin_user/store",data,"POST").then(res=>{
+						console.log(res)
+					})
+				}
+			}
 		}
 	}
 </script>
@@ -77,33 +209,35 @@
 
 	.input-card {
 		background-color: #fff;
-		width: 93%;
+		width: 90%;
 		height: 80rpx;
 		border-radius: 20rpx;
 		margin: 0 auto;
 		margin-top: 40rpx;
-		text-indent: 1em;
 		padding: 10rpx 0;
-	}
-	.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;
-		}
+		padding-left: 1em;
+	}
+
+	.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/Delivery/location.vue

@@ -1,88 +1,140 @@
 <template>
-	<view class="content">
-		<u-index-list :scrollTop="scrollTop" class="scroll-list">
-			<view v-for="(item, index) in area" :key="index" class="list-box">
-				<u-index-anchor :index="item.index" />
-				<view v-for="(item,index) in item.child" :key="index" class="address_name row">
-					<view>{{item.title}}</view>
-					<view class="icon"></view>
-				</view>
-			</view>
-		</u-index-list>
-		<view class="bottom-btn">
-			<view class="buttom-dom row">
-				<view class="all">
-					全选
-				</view>
-				<view class="push">
-					确定
-				</view>
-			</view>
-		</view>
+	<view class="content">
+		<u-index-list :scrollTop="scrollTop" class="scroll-list">
+			<view v-for="(item, index) in area" :key="index" class="list-box">
+				<u-index-anchor :index="item.index" />
+				<view v-for="(iitem,iindex) in item.child" :key="iindex" class="address_name row"
+					@click="checked(index,iindex)">
+					<view :style="iitem.checked?'color:#F6B301':''">{{iitem.title}}</view>
+					<view class="icon">
+						<u-icon v-if="iitem.checked" name="checkmark-circle" color="#F6B301"></u-icon>
+					</view>
+				</view>
+			</view>
+		</u-index-list>
+		<view class="bottom-btn">
+			<view class="buttom-dom row">
+				<view class="all" @click="checkAll">
+					全选
+				</view>
+				<view class="push" @click="push">
+					确定
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
-<script>
-	import { area } from "@/utils/area.js"
+<script>
+	// import { area } from "@/utils/area.js"
 	export default {
 		data() {
 			return {
-				scrollTop: 0,
-				area: area
+				scrollTop: 0,
+				area: [],
 			}
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
 		},
+		onLoad() {
+			this.getLocation()
+		},
 		methods: {
-
+			// 点击确定
+			push() {
+				let data = []
+				for (let key in this.area) {
+					for (let s of this.area[key].child) {
+						if(s.checked){
+							data.push(s.id)
+						}
+					}
+				}
+				this.$EventBus.$emit('listenSetArea',data)
+				uni.navigateBack({
+					delta:1
+				})
+			},
+			// 是否选中
+			checked(index, iindex) {
+				this.area[index].child[iindex].checked = !this.area[index].child[iindex].checked;
+				this.$forceUpdate()
+			},
+			// 全选
+			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
+				this.$forceUpdate()
+			},
+			// 获取位置信息
+			getLocation() {
+				this.request("/common/area_sort", {}, "GET").then(res => {
+					if (res.code === 1) {
+						this.area = res.data
+					}
+				})
+			}
 		}
 	}
 </script>
 
-<style lang="scss">
-	.scroll-list{
-		height: 90vh;
-		.list-box{
-			margin-bottom: 80rpx;
-		}
-	}
-	.bottom-btn{
-		position: fixed;
-		bottom: 0;
-		width: 100vw;
-		height: 10vh;
-		background-color: #FFFFFF;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		.row{
-			justify-content: center;
-			.all{
-				width: 50%;
-				text-align: center;
-			}
-			.push{
-				width: 50%;
-				text-align: center;
-			}
-		}
-		.buttom-dom{
-			height: 80rpx;
-			width: 93%;
-			background-color: #F6B301;
-			color: #FFFFFF;
-			text-align: center;
-			line-height: 80rpx;
-			color: #FFFFFF;
-			border-radius: 80rpx;
-		}
-	}
-	.address_name{
-		padding: 30rpx;
-		.icon{
-			margin-right: 30rpx;
-		}
+<style lang="scss">
+	.scroll-list {
+		height: 90vh;
+
+		.list-box {
+			margin-bottom: 80rpx;
+		}
+	}
+
+	.bottom-btn {
+		position: fixed;
+		bottom: 0;
+		width: 100vw;
+		height: 10vh;
+		background-color: #FFFFFF;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+
+		.row {
+			justify-content: center;
+
+			.all {
+				width: 50%;
+				text-align: center;
+			}
+
+			.push {
+				width: 50%;
+				text-align: center;
+			}
+		}
+
+		.buttom-dom {
+			height: 80rpx;
+			width: 93%;
+			background-color: #F6B301;
+			color: #FFFFFF;
+			text-align: center;
+			line-height: 80rpx;
+			color: #FFFFFF;
+			border-radius: 80rpx;
+		}
+	}
+
+	.address_name {
+		padding: 30rpx;
+
+		.icon {
+			margin-right: 30rpx;
+		}
 	}
 </style>

pages/Marketing/coupon.vue

@@ -1,146 +1,307 @@
-<template>
-	<view class="content">
-		<view class="scroll">
-			<view class="title">
-				选择优惠券种类
-			</view>
-			<view class="card row">
-				<view :class="checkIndex === 1?'type type-color':'type'" @click="checkIndex = 1">
-					代金券
-				</view>
-				<view :class="checkIndex === 2?'type type-color':'type'" @click="checkIndex = 2">
-					满减券
-				</view>
-				<view :class="checkIndex === 3?'type type-color':'type'" @click="checkIndex = 3">
-					折扣券
-				</view>
-				<view :class="checkIndex === 4?'type type-color':'type'" @click="checkIndex = 4">
-					新用户下单券
-				</view>	
-			</view>
-			<!-- 代金券 -->
-			<view class="" v-if="checkIndex ===  1">
-				<input type="digit" placeholder="请输入代金券金额" class="input-card" />
-				<view class="row">
-					<input type="digit" placeholder="请设置起始时间" class="input-card half" />
-					-
-					<input type="digit" placeholder="请设置截止时间" class="input-card half" />
-				</view>
-				<input type="digit" placeholder="请输入优惠券数量" class="input-card" />
-			</view>
-			
-			<!-- 满减券 -->
-			<view class="" v-if="checkIndex === 2">
-				<input type="digit" placeholder="请输入满多少元" class="input-card" />
-				<input type="digit" placeholder="请输入减多少元" class="input-card" />
-				 <view class="row">
-				 	<input type="digit" placeholder="请设置起始时间" class="input-card half" />
-					-
-					<input type="digit" placeholder="请设置截止时间" class="input-card half" />
-				 </view>
-				 <input type="digit" placeholder="请输入优惠券数量" class="input-card" />
-			</view>
-			
-			<!-- 折扣券 -->
-			<view class="" v-if="checkIndex === 3">
-				<input type="digit" placeholder="请输入折扣 例:0.8" class="input-card" />
-				 <view class="row">
-				 	<input type="digit" placeholder="请设置起始时间" class="input-card half" />
-					-
-					<input type="digit" placeholder="请设置截止时间" class="input-card half" />
-				 </view>
-				 <input type="digit" placeholder="请输入优惠券数量" class="input-card" />
-			</view>
-		</view>
-		<view class="bottom-btn">
-			<view class="button-dom">
-				设置优惠券
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				// 当前选择的优惠券类型
-				checkIndex: 1,
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	.title{
-		font-size: 36rpx;
-		width: 93%;
-		margin: 0 auto;
-		padding: 20rpx 0;
-	}
-	.scroll{
-		height: 90vh;
-		overflow-y: scroll;
-	}
-	.bottom-btn{
-		height: 10vh;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		.button-dom{
-			background-color: #F6B301;
-			color: #FFFFFF;
-			border-radius: 50rpx;
-			height: 80rpx;
-			width: 93%;
-			text-align: center;
-			line-height: 80rpx;
-		}
-	}
-	.card{
-		background-color: #FFFFFF;
-		width: 93%;
-		margin: 0 auto;
-		padding: 30rpx;
-		flex-wrap: wrap;
-		padding: 30rpx;
-		height: 240rpx;
-		border-radius: 30rpx;
-		.type{
-			width: 45%;
-			background-color: #FFE3A0;
-			padding: 20rpx;
-			color: #E68500;
-			margin-bottom: 20rpx;
-			text-align: center;
-			border-radius: 20rpx;
-		}
-		.type-color{
-			background-color: #F6B301;
-			color: #FFFFFF;
-		}
-	}
-	.input-card{
-		background-color: #fff;
-		width: 93%;
-		height: 80rpx;
-		border-radius: 20rpx;
-		margin: 0 auto;
-		margin-top: 30rpx;
-		text-indent: 1em;
-	}
-	.row{
-		width: 93%;
-		margin: 0 auto;
-	}
-	.half{
-		width: 40%;
-		padding: 0;
-		margin: 0;
-		margin-top: 30rpx;
-	}
+<template>
+	<view class="content">
+		<view class="scroll">
+			<view class="title">
+				选择优惠券种类
+			</view>
+			<view class="card row">
+				<view :class="checkIndex === 1?'type type-color':'type'" @click="checkIndex = 1">
+					代金券
+				</view>
+				<view :class="checkIndex === 2?'type type-color':'type'" @click="checkIndex = 2">
+					满减券
+				</view>
+				<view :class="checkIndex === 3?'type type-color':'type'" @click="checkIndex = 3">
+					折扣券
+				</view>
+				<view :class="checkIndex === 4?'type type-color':'type'" @click="checkIndex = 4">
+					新用户下单券
+				</view>
+			</view>
+			<!-- 代金券 -->
+			<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"
+						v-model="startTime" />
+					-
+					<input type="digit" placeholder="请设置截止时间" class="input-card half" disabled @click="showEnd = true"
+						v-model="endTime" />
+				</view>
+				<input type="digit" placeholder="请输入优惠券数量" class="input-card" v-model="num" />
+			</view>
+
+			<!-- 满减券 -->
+			<view class="" v-if="checkIndex === 2">
+				<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"
+						v-model="startTime" />
+					-
+					<input type="digit" placeholder="请设置截止时间" class="input-card half" disabled @click="showEnd = true"
+						v-model="endTime" />
+				</view>
+				<input type="digit" placeholder="请输入优惠券数量" class="input-card" v-model="num" />
+			</view>
+
+			<!-- 折扣券 -->
+			<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"
+						v-model="startTime" />
+					-
+					<input type="digit" placeholder="请设置截止时间" class="input-card half" disabled @click="showEnd = true"
+						v-model="endTime" />
+				</view>
+				<input type="digit" placeholder="请输入优惠券数量" class="input-card" v-model="num" />
+			</view>
+		</view>
+		<view class="bottom-btn">
+			<view class="button-dom" @click="push">
+				设置优惠券
+			</view>
+		</view>
+
+		<!-- 日营业额 查询日期选择 -->
+		<u-picker v-model="showStart" mode="time" start-year="2020" :params="dateParams" @confirm="startConfirm">
+		</u-picker>
+
+		<!-- 日营业额 查询日期选择 -->
+		<u-picker v-model="showEnd" mode="time" start-year="2020" :params="dateParams" @confirm="endConfirm"></u-picker>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// 当前选择的优惠券类型
+				checkIndex: 1,
+				// 设置开始时间
+				showStart: false,
+				// 设置结束时间
+				showEnd: false,
+				// 时间格式化
+				dateParams: {
+					year: true,
+					month: true,
+					day: true,
+					hour: false,
+					minute: false,
+					second: false
+				},
+				// 满多少金额
+				max: "",
+				// 开始时间
+				startTime: "",
+				// 结束时间
+				endTime: "",
+				// 金额 折扣
+				amount: "",
+				// 数量
+				num: "",
+			}
+		},
+		methods: {
+			// 提交数据
+			push() {
+				let _this = this;
+				if (this.startTime === "") {
+					this.$u.toast('请选择开始时间')
+					return false;
+				}
+				if (this.endTime === "") {
+					this.$u.toast('请选择结束时间')
+					return false;
+				}
+				if (this.num === "") {
+					this.$u.toast('请输入优惠券数量')
+					return false;
+				}
+				if (this.checkIndex === 1) {
+					if (this.amount === "") {
+						this.$u.toast('请输入代金券金额')
+						return false;
+					}
+					this.request("/admin_coupon/set", {
+						type: 1,
+						max: '',
+						amount: this.amount,
+						start_time: this.startTime,
+						end_time: this.endTime,
+						num: this.num
+					}, "GET").then(res => {
+						console.log(res)
+						if (res.code === 1) {
+							_this.$u.toast('添加成功')
+							// 开始时间
+							_this.startTime = ""
+							// 结束时间
+							_this.endTime = ""
+							// 金额 折扣
+							_this.amount = ""
+							// 数量
+							_this.num = ""
+						}
+					})
+				}
+				if (this.checkIndex === 2) {
+					if (this.max === "") {
+						this.$u.toast('请输入条件金额')
+						return false;
+					}
+					if (this.amount === "") {
+						this.$u.toast('请输入满减的金额')
+						return false;
+					}
+					this.request("/admin_coupon/set", {
+						type: 2,
+						max: this.max,
+						amount: this.amount,
+						start_time: this.startTime,
+						end_time: this.endTime,
+						num: this.num
+					}, "GET").then(res => {
+						console.log(res)
+						if (res.code === 1) {
+							_this.$u.toast('添加成功')
+							// 开始时间
+							_this.startTime = ""
+							// 结束时间
+							_this.endTime = ""
+							// 金额 折扣
+							_this.amount = ""
+							// 数量
+							_this.num = ""
+							// 满
+							_this.max = ""
+						}
+					})
+				}
+				if (this.checkIndex === 3) {
+					if (this.amount === "") {
+						this.$u.toast('请输入折扣')
+						return false;
+					}
+					this.request("/admin_coupon/set", {
+						type: 3,
+						amount: this.amount,
+						start_time: this.startTime,
+						end_time: this.endTime,
+						num: this.num
+					}, "GET").then(res => {
+						console.log(res)
+						if (res.code === 1) {
+							_this.$u.toast('添加成功')
+							// 开始时间
+							_this.startTime = ""
+							// 结束时间
+							_this.endTime = ""
+							// 金额 折扣
+							_this.amount = ""
+							// 数量
+							_this.num = ""
+						}
+					})
+				}
+				if (this.checkIndex === 4) {
+
+				}
+
+			},
+			// 开始时间
+			startConfirm(e) {
+				console.log(e)
+				this.startTime = e.year + "-" + e.month + "-" + e.day
+			},
+			// 结束时间
+			endConfirm(e) {
+				console.log(e)
+				this.endTime = e.year + "-" + e.month + "-" + e.day
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.title {
+		font-size: 36rpx;
+		width: 93%;
+		margin: 0 auto;
+		padding: 20rpx 0;
+	}
+
+	.scroll {
+		height: 90vh;
+		overflow-y: scroll;
+	}
+
+	.bottom-btn {
+		height: 10vh;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+
+		.button-dom {
+			background-color: #F6B301;
+			color: #FFFFFF;
+			border-radius: 50rpx;
+			height: 80rpx;
+			width: 93%;
+			text-align: center;
+			line-height: 80rpx;
+		}
+	}
+
+	.card {
+		background-color: #FFFFFF;
+		width: 93%;
+		margin: 0 auto;
+		padding: 30rpx;
+		flex-wrap: wrap;
+		padding: 30rpx;
+		height: 240rpx;
+		border-radius: 30rpx;
+
+		.type {
+			width: 45%;
+			background-color: #FFE3A0;
+			padding: 20rpx;
+			color: #E68500;
+			margin-bottom: 20rpx;
+			text-align: center;
+			border-radius: 20rpx;
+		}
+
+		.type-color {
+			background-color: #F6B301;
+			color: #FFFFFF;
+		}
+	}
+
+	.input-card {
+		background-color: #fff;
+		width: 93%;
+		height: 80rpx;
+		border-radius: 20rpx;
+		margin: 0 auto;
+		margin-top: 30rpx;
+		text-indent: 1em;
+	}
+
+	.row {
+		width: 93%;
+		margin: 0 auto;
+	}
+
+	.half {
+		width: 40%;
+		padding: 0;
+		margin: 0;
+		margin-top: 30rpx;
+	}
 </style>

pages/Marketing/vipers.vue

@@ -1,17 +1,17 @@
 <template>
 	<view class="content">
 		<view class="search">
-			<u-search placeholder="请输入信息搜索会员" v-model="keyword"></u-search>
+			<u-search placeholder="请输入信息搜索会员" v-model="name" @custom="getData"></u-search>
 		</view>
 
-		<view class="card">
+		<view class="card" v-for="(item,index) in dataList" :key="index">
 			<view class="row">
 				<view class="row half">
 					<view class="name">
 						昵称
 					</view>
 					<view class="text">
-						1111
+						{{item.nickname}}
 					</view>
 				</view>
 				<view class="row half">
@@ -19,7 +19,7 @@
 						手机号
 					</view>
 					<view class="text">
-						1111
+						{{item.mobile}}
 					</view>
 				</view>
 			</view>
@@ -29,10 +29,10 @@
 						会员等级
 					</view>
 					<view class="text">
-						1111
+						{{item.level_text}}
 					</view>
 				</view>
-				<view class="row half" @click="eidt">
+				<view class="row half" @click="eidt(item.id)">
 					<view class="btn">
 						编辑
 					</view>
@@ -42,7 +42,7 @@
 
 
 		<!-- 会员等级选择 -->
-		<u-picker mode="selector" v-model="show" :range="level" range-key="cateName" title="设置会员等级"></u-picker>
+		<u-picker mode="selector" v-model="show" :range="level" range-key="cateName" title="设置会员等级" @confirm="set" @cancel="cancel"></u-picker>
 	</view>
 </template>
 
@@ -53,27 +53,72 @@
 				show: false,
 				level: [{
 						cateName: '普通会员',
-						id: 1
+						id: 0
 					},
 					{
 						cateName: '黄金会员',
-						id: 2
+						id: 1
 					},
 					{
 						cateName: '铂金会员',
-						id: 2
+						id: 10
 					},
 					{
 						cateName: '钻石会员',
-						id: 2
+						id: 20
 					},
-				]
+				],
+				dataList:[],
+				name:"",
+				userId:'',
 			}
+		},
+		onLoad(){
+			this.getData()
 		},
-		methods: {
+		methods: {
+			// 设置会员等级
+			set(e){
+				console.log(e,1111)
+				let level = 0;
+				if(e[0]=== 0){
+					level = 0;
+				}
+				if(e[0]=== 1){
+					level = 1;
+				}
+				if(e[0]=== 2){
+					level = 10;
+				}
+				if(e[0]=== 3){
+					level = 20;
+				}
+				this.request("/admin_user/setLevel",{user_id:this.userId,level:level},"GET").then(res=>{
+					console.log(res)
+					if(res.code === 1){
+						this.$u.toast('操作成功')
+						this.getData()
+					}else{
+						this.$u.toast(res.msg)
+					}
+				})
+			},
+			// 取消设置会员等级
+			cancel(){
+				this.userId = ""
+			},
+			// 获取数据列表
+			getData(){
+				this.request("/admin_user/list",{keyword:this.name},"GET").then(res=>{
+					if(res.code === 1){
+						this.dataList = res.data.data
+					}
+				})
+			},
 			// 点击编辑
-			eidt() {
-				this.show = true
+			eidt(id) {
+				this.show = true
+				this .userId = id;
 			}
 		}
 	}

pages/index/index.vue

@@ -93,7 +93,7 @@
 				data: {},
 			}
 		},
-		onLoad() {
+		onShow() {
 			this.getDo()
 		},
 		methods: {

pages/refund/refund.vue

@@ -63,41 +63,45 @@
 			<u-modal v-model="showfeedback" cancel-text="取消" confirm-text="确定" show-cancel-button="true"
 				@cancel="feedbackcancel" @confirm="feedbackconfirm">
 				<view class="feedbackconent">
-					<u-input v-model="feedbackconent" type="textarea" placeholder-style="font-size: 10px;"
-						placeholder="请输入您的反馈" />
+					<textarea v-model="feedbackconent" placeholder="请输入反馈信息" class="feedbackconent-input" />
 				</view>
 			</u-modal>
 
 			<!-- 3 -->
 			<view class="row" v-if="type === 3">
 				<view class="col-name">退款账号</view>
-				<view class="col-money">2</view>
+				<view class="col-money">{{item.user.username}}</view>
 			</view>
 			<view class="row" v-if="type === 3">
 				<view class="col-name">退款金额</view>
-				<view class="col-money">2</view>
+				<view class="col-money">{{item.refund_amount}}</view>
 			</view>
 			<view class="row" v-if="type === 3">
 				<view class="col-name">订单金额</view>
-				<view class="col-money">2</view>
+				<view class="col-money">{{item.real_amount}}</view>
 			</view>
 			<view class="row" v-if="type === 3">
 				<view class="col-name">订单编号</view>
-				<view class="col-money">2</view>
+				<view class="col-money">{{item.id}}</view>
 			</view>
 			<view class="row" v-if="type === 3">
 				<view class="col-name">退款时间</view>
-				<view class="col-money">2</view>
+				<view class="col-money">{{item.refund_apply_at}}</view>
 			</view>
 			<view class="row" v-if="type === 3">
 				<view class="col-name">退款原因</view>
-				<view class="col-money">2</view>
+				<view class="col-money">{{item.refund_reason}}</view>
 			</view>
 			<view class="image" v-if="type === 3">
-				<image src="" class="image-dom"></image>
+				<image v-for="(iitem,index) in item.refund_images" :src="iitem" class="image-dom" :key="index"></image>
 			</view>
 			<view class="btn" v-if="type === 3">
-
+				<view class="btn-dom" @click="refuse(item.id)">
+					拒绝
+				</view>
+				<view class="btn-dom" @click="agree(item.id)">
+					同意
+				</view>
 			</view>
 			<!-- 4 -->
 			<view class="row" v-if="type === 4">
@@ -128,12 +132,12 @@
 				<view class="col-name">退款状态</view>
 				<view class="col-money yellow">
 					{{item.refund_status === 0?"审核中":""}}
-					{{item.refund_status === 1?"功过":""}}
+					{{item.refund_status === 1?"通过":""}}
 					{{item.refund_status === 2?"驳回":""}}
 				</view>
 			</view>
-			<view class="btn" v-if="type === 4">
-				<view class="btn-dom">
+			<view class="btn" v-if="type === 4 && item.status === 80">
+				<view class="btn-dom" @click="delorder(item.id)"> 
 					删除
 				</view>
 			</view>
@@ -188,14 +192,59 @@
 		onPullDownRefresh() {
 			this.getData();
 		},
-		methods: {
+		methods: {
+			// 点击删除订单
+			delorder(id){
+				this.request("/admin_order/order_delete",{id:id},"GET").then(res=>{
+					if(res.code === 1){
+						this.$u.toast('操作成功')
+						this.getData()
+					}
+				})
+			},
+			// 点击拒绝退款
+			refuse(id){
+				let _this = this
+				uni.showModal({
+					title:"确定要拒绝退款吗？",
+					showCancel:true,
+					success(e) {
+						if(e.confirm){
+							_this.request("/admin_order/deal_refund",{id:id,status:2},"GET").then(res=>{
+								if(res.code === 1){
+									_this.$u.toast("操作成功")
+									_this.getData()
+								}
+							})
+						}
+					}
+				})
+			},
+			// 点击同意退款
+			agree(id){
+				let _this = this
+				uni.showModal({
+					title:"确定要同意退款吗？",
+					showCancel:true,
+					success(e) {
+						if(e.confirm){
+							_this.request("/admin_order/deal_refund",{id:id,status:1},"GET").then(res=>{
+								if(res.code === 1){
+									_this.$u.toast("操作成功")
+									_this.getData()
+								}
+							})
+						}
+					}
+				})
+			},
 			// 确认反馈
 			feedbackconfirm(id) {
 				this.request('/admin_order/deal_feedback', {
 					id: this.feedbackId,
 					body: this.feedbackconent
 				}, "GET").then(res => {
-					if (res.code === 1) {
+					if (res.code === 1) {
 						this.feedbackconent = "";
 						this.getData()
 					}
@@ -288,12 +337,22 @@
 
 		// 输入反馈
 		.feedbackconent {
-			border: 1px red solid;
 			height: 300rpx;
-			font-size: 20rpx;
-			padding: 30rpx;
+			font-size: 30rpx;
+			padding: 10rpx;
+
+			.feedbackconent-input {
+				width: 100%;
+				height: 100%;
+			}
+
+			.feedbackconent-input::-webkit-input-placeholder {
+				color: red;
+				font-size: 30rpx;
+			}
 		}
 
+
 		.card {
 			width: 90%;
 			background-color: #FFFFFF;
@@ -346,7 +405,8 @@
 					background-color: #F6B301;
 					color: #FFFFFF;
 					padding: 10rpx 20rpx;
-					border-radius: 30rpx;
+					border-radius: 30rpx;
+					margin-left: 50rpx;
 				}
 			}
 		}

pages/turnover/info.vue

@@ -5,10 +5,10 @@
 				<view class="col">
 					<view class="checkDom">
 						<u-subsection :list="list" :current="type -1" active-color="#FFFFFF" inactive-color="#000000"
-							bg-color="#FFFFFF" button-color="#FAB309"></u-subsection>
+							bg-color="#FFFFFF" button-color="#FAB309" @change="changeType"></u-subsection>
 					</view>
 				</view>
-				<view class="col" @click="showPop = true">
+				<view class="col" @click="type ===1?dateShow=true:type===2?monthShow=true:type===3?yearShow=true:''">
 					{{time}}
 					<u-icon name="arrow-right"></u-icon>
 				</view>
@@ -62,10 +62,15 @@
 				</view>
 			</view>
 		</view>
-
-		<!-- 时间选择 -->
-		<u-select mode="mutil-column-auto" :list="Dates" v-model="showPop" label-name="title" value-name="id"
-			title="选择日期" @confirm="checkTime"></u-select>
+		<!-- 日营业额 查询日期选择 -->
+		<u-picker v-model="dateShow" mode="time" start-year="2020" :end-year="date.year" :params="dateParams"
+			@confirm="dateConfirm"></u-picker>
+		<!-- 月营业额 查询日期选择 -->
+		<u-picker v-model="monthShow" mode="time" start-year="2020" :end-year="date.year" :params="monthParams"
+			@confirm="monthConfirm"></u-picker>
+		<!-- 年 -->
+		<u-picker v-model="yearShow" mode="time" start-year="2020" :end-year="date.year" :params="yearParams"
+			@confirm="yearConfirm"></u-picker>
 	</view>
 </template>
 
@@ -78,6 +83,7 @@
 			return {
 				type: 1,
 				timeName: '日盈利金额',
+				date: {},
 				time: "",
 				list: [{
 						name: '日'
@@ -89,13 +95,36 @@
 						name: '年'
 					}
 				],
-				// 选择时间
-				showPop: false,
-				// 可选择的集合
-				Dates: [{
-					id: 1,
-					title: '1'
-				}],
+				// 日营业额 查询日期选择
+				dateShow: false,
+				dateParams: {
+					year: true,
+					month: true,
+					day: true,
+					hour: false,
+					minute: false,
+					second: false
+				},
+				// 月营业额 查询日期选择
+				monthShow: false,
+				monthParams: {
+					year: true,
+					month: true,
+					day: false,
+					hour: false,
+					minute: false,
+					second: false
+				},
+				// 年营业额 查询日期选择
+				yearShow: false,
+				yearParams: {
+					year: true,
+					month: false,
+					day: false,
+					hour: false,
+					minute: false,
+					second: false
+				},
 				// 获取的盈利数据
 				data: {},
 				page: 1,
@@ -103,8 +132,8 @@
 			}
 		},
 		onLoad(e) {
-			let date = getDate()
-			this.time = date.year + "-" + date.month + "-" + date.date;
+			this.date = getDate()
+			this.time = this.date.year + "-" + this.date.month + "-" + this.date.date
 			this.getMoney(this.type, this.time)
 		},
 		watch: {
@@ -124,9 +153,46 @@
 						this.timeName = '日盈利金额'
 						break;
 				}
+				this.date = getDate();
+				this.getMoney(this.type, this.time);
 			}
 		},
 		methods: {
+			// 确认选择日期
+			dateConfirm(e) {
+				console.log(e)
+				this.time = e.year + "-" + e.month + "-" + e.day
+				this.getMoney()
+				this.getMoney(this.type, this.time)
+			},
+			// 确认选择月份
+			monthConfirm(e) {
+				console.log(e)
+				this.time = e.year + "-" + e.month
+				this.getMoney()
+				this.getMoney(this.type, this.time)
+			},
+			// 确认选择年份
+			yearConfirm(e) {
+				console.log(e)
+				this.time = e.year
+				this.getMoney()
+				this.getMoney(this.type, this.time)
+			},
+			// 切换时间类型
+			changeType(e) {
+				console.log(e)
+				this.type = e + 1;
+				if (e === 0) {
+					this.time = this.date.year + "-" + this.date.month + "-" + this.date.date
+				}
+				if (e === 1) {
+					this.time = this.date.year + "-" + this.date.month
+				}
+				if (e === 2) {
+					this.time = this.date.year
+				}
+			},
 			// 获取盈利金额
 			getMoney(type, time) {
 				this.request("/admin_order/profit", {

pages/turnover/turnover.vue

@@ -5,7 +5,7 @@
 				<view class="col">
 					{{type === 1?"日营业额":"日结算金额"}}
 				</view>
-				<view class="col">
+				<view class="col" @click="dateShow = true">
 					{{date.year}}-{{date.month}}-{{date.date}}
 					<u-icon name="arrow-right"></u-icon>
 				</view>
@@ -17,12 +17,15 @@
 				</view>
 			</view>
 		</view>
+		<!-- 日营业额 查询日期选择 -->
+		<u-picker v-model="dateShow" mode="time" start-year="2020" :end-year="date.year" :params="dateParams"
+			@confirm="dateConfirm"></u-picker>
 		<view class="card">
 			<view class="row">
 				<view class="col">
 					{{type === 1?"月营业额":"月结算金额"}}
 				</view>
-				<view class="col">
+				<view class="col" @click="monthShow = true">
 					{{date.year}}-{{date.month}}
 					<u-icon name="arrow-right"></u-icon>
 				</view>
@@ -34,12 +37,15 @@
 				</view>
 			</view>
 		</view>
+		<!-- 月营业额 查询日期选择 -->
+		<u-picker v-model="monthShow" mode="time" start-year="2020" :end-year="date.year" :params="monthParams"
+			@confirm="monthConfirm"></u-picker>
 		<view class="card">
 			<view class="row">
 				<view class="col">
 					{{type === 1?"年营业额":"年结算金额"}}
 				</view>
-				<view class="col">
+				<view class="col" @click="yearShow = true">
 					{{date.year}}
 					<u-icon name="arrow-right"></u-icon>
 				</view>
@@ -51,6 +57,9 @@
 				</view>
 			</view>
 		</view>
+		<!-- 年营业额 查询日期选择 -->
+		<u-picker v-model="yearShow" mode="time" start-year="2020" :end-year="date.year" :params="yearParams"
+			@confirm="yearConfirm"></u-picker>
 	</view>
 </template>
 
@@ -69,7 +78,38 @@
 				// 月营业额
 				monthmoney: "",
 				// 年营业额
-				yearmoney: ""
+				yearmoney: "",
+				// 日营业额 查询日期选择
+				dateShow: false,
+				dateParams: {
+					year: true,
+					month: true,
+					day: true,
+					hour: false,
+					minute: false,
+					second: false
+				},
+				// 月营业额 查询日期选择
+				monthShow: false,
+				monthParams: {
+					year: true,
+					month: true,
+					day: false,
+					hour: false,
+					minute: false,
+					second: false
+				},
+				// 年营业额 查询日期选择
+				yearShow: false,
+				yearParams: {
+					year: true,
+					month: false,
+					day: false,
+					hour: false,
+					minute: false,
+					second: false
+				},
+
 			}
 		},
 		onLoad(e) {
@@ -88,7 +128,42 @@
 			// 获取数据
 			this.getData();
 		},
+		watch: {
+			date(e) {
+				this.getData()
+			}
+		},
 		methods: {
+			// 确认选择日期
+			dateConfirm(e) {
+				console.log(e)
+				let date = {
+					date: e.day,
+					month: e.month,
+					year: e.year,
+				};
+				this.date = date;
+			},
+			// 确认选择月份
+			monthConfirm(e) {
+				console.log(e)
+				let date = {
+					date: 1,
+					month: e.month,
+					year: e.year,
+				};
+				this.date = date;
+			},
+			// 确认选择年份
+			yearConfirm(e) {
+				console.log(e)
+				let date = {
+					date: 1,
+					month: 1,
+					year: e.year,
+				};
+				this.date = date;
+			},
 			// 获取数据
 			getData() {
 				let _this = this;

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

@@ -24,9 +24,10 @@ var _uviewUi = _interopRequireDefault(__webpack_require__(/*! uview-ui */ 17));
 
 
 
+
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 3));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}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;}wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__; //引入异步请求函数
 _vue.default.prototype.request = _request.default.request; //挂载到全局
-_vue.default.config.productionTip = false;_vue.default.config.productionTip = false;_vue.default.prototype.url = 'http://pet.hdlkeji.com/api';_vue.default.config.productionTip = false;_App.default.mpType = 'app';
+_vue.default.config.productionTip = false;_vue.default.config.productionTip = false;_vue.default.prototype.url = 'http://pet.hdlkeji.com/api';_vue.default.prototype.$EventBus = new _vue.default();_vue.default.config.productionTip = false;_App.default.mpType = 'app';
 _vue.default.use(_uviewUi.default);
 var app = new _vue.default(_objectSpread({},
 _App.default));

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

@@ -3235,4 +3235,8 @@ u-dropdown {
   font-size: 40rpx;
   color: #999999;
 }
+.feedbackconent-input::-webkit-input-placeholder {
+  color: red;
+  font-size: 30rpx;
+}
 

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

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

@@ -96,7 +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 */ 231))
+      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 */ 240))
+    },
+    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 */ 247))
     }
   }
 } catch (e) {
@@ -240,40 +243,92 @@ var _default =
 {
   data: function data() {
     return {
-      show: false,
-      level: [{
-        cateName: '普通会员',
-        id: 1 },
-
-      {
-        cateName: '黄金会员',
-        id: 2 },
-
-      {
-        cateName: '铂金会员',
-        id: 2 },
-
-      {
-        cateName: '钻石会员',
-        id: 2 }] };
-
-
+      // 搜索条件
+      keyword: "",
+      // 数量
+      limit: 10,
+      // 页码
+      page: 1,
+      // 数据
+      dataList: [] };
 
   },
+  onLoad: function onLoad() {
+    this.getData();
+  },
   methods: {
+    // 禁用
+    open: function open(e) {
+      var _this = this;
+      var data = e.split(',');
+      // 开启
+      if (data[1] === '1') {
+        this.request("/admin_user/enable", { user_id: data[0], status: 'normal' }, "GET").then(function (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(function (res) {
+          console.log(res);
+          if (res.code === 1) {
+            _this.getData();
+          }
+        });
+      }
+    },
+    // 获取数据列表
+    getData: function getData() {var _this2 = this;
+      this.request("/admin_user/senders", {
+        keyword: this.keyword,
+        limit: this.limit,
+        page: this.page },
+      "GET").then(function (res) {
+        console.log(res);
+        if (res.code === 1) {
+          _this2.dataList = res.data.data;
+        }
+      });
+    },
     // 点击新建
     create: function create() {
       uni.navigateTo({
-        url: './create' });
+        url: './create?type=1' });
 
     },
     // 点击删除
-    del: function del() {
+    del: function del(id) {
+      var _this = this;
       console.log('del');
+      uni.showModal({
+        title: "提示",
+        content: "确定要删除此配送员吗？",
+        showCancel: true,
+        success: function success(e) {
+          if (e.confirm) {
+            console.log('确定');
+            _this.request("/admin_user/delete", {
+              user_id: id },
+            "GET").then(function (res) {
+              console.log(res);
+              if (res.code === 1) {
+                _this.$u.toast('操作成功');
+                _this.getData();
+              }
+            });
+          }
+        } });
+
     },
     // 点击编辑
-    eidt: function eidt() {
+    eidt: function eidt(info) {
       console.log('edit');
+      uni.navigateTo({
+        url: "./create?info=" + JSON.stringify(info) + "&type=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/Delivery/Delivery.json

@@ -3,6 +3,7 @@
   "enablePullDownRefresh": false,
   "navigationBarBackgroundColor": "#FFFFFF",
   "usingComponents": {
-    "u-search": "/uview-ui/components/u-search/u-search"
+    "u-search": "/uview-ui/components/u-search/u-search",
+    "u-switch": "/uview-ui/components/u-switch/u-switch"
   }
 }

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

@@ -28,15 +28,16 @@
 .content {
   padding-top: 120rpx;
   overflow-y: scroll;
+  padding-bottom: 15vh;
 }
-.search {
+.content .search {
   padding: 30rpx;
   background-color: #FFFFFF;
   position: fixed;
   top: 0;
   width: 100vw;
 }
-.card {
+.content .card {
   background-color: #FFFFFF;
   width: 93%;
   margin: 0 auto;
@@ -48,33 +49,30 @@
   align-items: center;
   justify-content: space-between;
 }
-.card:not(:last-child) {
-  margin-bottom: 15vh;
-}
-.card .row {
+.content .card .row {
   margin-bottom: 10rpx;
 }
-.card .row:nth-child(5) {
+.content .card .row:nth-child(5) {
   margin-bottom: 0;
 }
-.card .half {
+.content .card .half {
   width: 50%;
   justify-content: flex-start;
 }
-.card .half .name {
+.content .card .half .name {
   color: #999;
 }
-.card .half .text {
+.content .card .half .text {
   text-indent: 1em;
 }
-.card .half .btn {
+.content .card .half .btn {
   width: 100%;
   display: flex;
   flex-direction: row;
   align-items: center;
   justify-content: flex-end;
 }
-.bottom-btn {
+.content .bottom-btn {
   position: fixed;
   bottom: 0;
   width: 100vw;
@@ -85,7 +83,7 @@
   align-items: center;
   justify-content: center;
 }
-.bottom-btn .buttom-dom {
+.content .bottom-btn .buttom-dom {
   height: 80rpx;
   width: 93%;
   background-color: #F6B301;

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

@@ -96,10 +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 */ 248))
+      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 */ 254))
     },
     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 */ 256))
+      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 */ 262))
+    },
+    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 */ 202))
     }
   }
 } catch (e) {
@@ -156,7 +159,10 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0; //
+/* WEBPACK VAR INJECTION */(function(uni) {Object.defineProperty(exports, "__esModule", { value: true });exports.default = void 0;function _createForOfIteratorHelper(o, allowArrayLike) {var it;if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) {if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {if (it) o = it;var i = 0;var F = function F() {};return { s: F, n: function n() {if (i >= o.length) return { done: true };return { done: false, value: o[i++] };}, e: function e(_e) {throw _e;}, f: F };}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");}var normalCompletion = true,didErr = false,err;return { s: function s() {it = o[Symbol.iterator]();}, n: function n() {var step = it.next();normalCompletion = step.done;return step;}, e: function e(_e2) {didErr = true;err = _e2;}, f: function f() {try {if (!normalCompletion && it.return != null) it.return();} finally {if (didErr) throw err;}} };}function _unsupportedIterableToArray(o, minLen) {if (!o) return;if (typeof o === "string") return _arrayLikeToArray(o, minLen);var n = Object.prototype.toString.call(o).slice(8, -1);if (n === "Object" && o.constructor) n = o.constructor.name;if (n === "Map" || n === "Set") return Array.from(o);if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);}function _arrayLikeToArray(arr, len) {if (len == null || len > arr.length) len = arr.length;for (var i = 0, arr2 = new Array(len); i < len; i++) {arr2[i] = arr[i];}return arr2;} //
+//
+//
+//
 //
 //
 //
@@ -200,20 +206,149 @@ var _default =
       // 运送类型
       type: [],
       // 1添加 2修改
-      pageType: 1 };
+      pageType: 1,
+      // 编辑的信息
+      info: {},
+      // 配送类型
+      send: [{
+        name: '快车',
+        value: 'fast',
+        checked: false },
+
+      {
+        name: '空运',
+        value: 'air',
+        checked: false },
+
+      {
+        name: '专车',
+        value: 'special',
+        checked: false }] };
 
+
+
+  },
+  onLoad: function onLoad(e) {
+    this.pageType = Number(e.type);
+    if (this.pageType === 2) {
+      uni.setNavigationBarTitle({
+        title: "编辑信息" });
+
+      this.info = JSON.parse(e.info);
+      this.setSend();
+    }
   },
   methods: {
+    // 获取配送类型
+    setSend: function setSend() {
+      var data = this.info.send;var _iterator = _createForOfIteratorHelper(
+      data),_step;try {for (_iterator.s(); !(_step = _iterator.n()).done;) {var s = _step.value;
+          if (s.type === "air") {
+            this.send[1].checked = true;
+          }
+          if (s.type === "fast") {
+            this.send[2].checked = true;
+          }
+          if (s.type === "special") {
+            this.send[0].checked = true;
+          }
+        }} catch (err) {_iterator.e(err);} finally {_iterator.f();}
+    },
     // 点击配送区域
-    location: function location() {
+    location: function location() {var _this = this;
+      this.$EventBus.$on('listenSetArea', function (res) {
+        var data = _this.info;
+        data.area = res;
+        _this.info = data;
+        _this.$forceUpdate();
+      });
       uni.navigateTo({
         url: "./location" });
 
     },
     // 确认新增
-    create: function create() {},
+    create: function create() {var _this2 = this;
+      var data = [];var _iterator2 = _createForOfIteratorHelper(
+      this.send),_step2;try {for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {var s = _step2.value;
+          if (s.checked) {
+            data.push(s.value);
+          }
+        }} catch (err) {_iterator2.e(err);} finally {_iterator2.f();}
+      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(function (res) {
+        if (res.code === 1) {
+          _this2.$u.toast('添加成功');
+          _this2.info = {};
+          uni.navigateBack({
+            delta: res });
+
+        }
+      });
+    },
     // 确认修改
-    edit: function edit() {} } };exports.default = _default;
+    edit: function edit() {
+      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);
+          }
+        }} catch (err) {_iterator3.e(err);} finally {_iterator3.f();}
+      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);
+        });
+      }
+      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);
+        });
+      }
+    } } };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/create.json

@@ -4,6 +4,7 @@
   "navigationBarBackgroundColor": "#FFFFFF",
   "usingComponents": {
     "u-checkbox-group": "/uview-ui/components/u-checkbox-group/u-checkbox-group",
-    "u-checkbox": "/uview-ui/components/u-checkbox/u-checkbox"
+    "u-checkbox": "/uview-ui/components/u-checkbox/u-checkbox",
+    "u-icon": "/uview-ui/components/u-icon/u-icon"
   }
 }

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

@@ -39,13 +39,13 @@
 }
 .input-card {
   background-color: #fff;
-  width: 93%;
+  width: 90%;
   height: 80rpx;
   border-radius: 20rpx;
   margin: 0 auto;
   margin-top: 40rpx;
-  text-indent: 1em;
   padding: 10rpx 0;
+  padding-left: 1em;
 }
 .bottom-btn {
   position: fixed;

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

@@ -4,6 +4,7 @@
   "navigationBarBackgroundColor": "#FFFFFF",
   "usingComponents": {
     "u-index-list": "/uview-ui/components/u-index-list/u-index-list",
-    "u-index-anchor": "/uview-ui/components/u-index-anchor/u-index-anchor"
+    "u-index-anchor": "/uview-ui/components/u-index-anchor/u-index-anchor",
+    "u-icon": "/uview-ui/components/u-icon/u-icon"
   }
 }

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="item" wx:for-index="index" wx:key="index"><view class="address_name row"><view>{{item.title}}</view><view class="icon"></view></view></block></view></block></u-index-list><view class="bottom-btn"><view class="buttom-dom row"><view class="all">全选</view><view class="push">确定</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',[['checkAll',['$event']]]]]}}" class="all" bindtap="__e">全选</view><view data-event-opts="{{[['tap',[['push',['$event']]]]]}}" class="push" bindtap="__e">确定</view></view></view></view>

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 */ 196))
+      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 */ 202))
     }
   }
 } catch (e) {

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

@@ -93,6 +93,29 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return recyclableRender; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "components", function() { return components; });
 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 */ 209))
+    }
+  }
+} catch (e) {
+  if (
+    e.message.indexOf("Cannot find module") !== -1 &&
+    e.message.indexOf(".vue") !== -1
+  ) {
+    console.error(e.message)
+    console.error("1. 排查组件名称拼写是否正确")
+    console.error(
+      "2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"
+    )
+    console.error(
+      "3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件"
+    )
+  } else {
+    throw e
+  }
+}
 var render = function() {
   var _vm = this
   var _h = _vm.$createElement
@@ -113,6 +136,30 @@ var render = function() {
     _vm.e3 = function($event) {
       _vm.checkIndex = 4
     }
+
+    _vm.e4 = function($event) {
+      _vm.showStart = true
+    }
+
+    _vm.e5 = function($event) {
+      _vm.showEnd = true
+    }
+
+    _vm.e6 = function($event) {
+      _vm.showStart = true
+    }
+
+    _vm.e7 = function($event) {
+      _vm.showEnd = true
+    }
+
+    _vm.e8 = function($event) {
+      _vm.showStart = true
+    }
+
+    _vm.e9 = function($event) {
+      _vm.showEnd = true
+    }
   }
 }
 var recyclableRender = false
@@ -209,15 +256,168 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default =
 {
   data: function data() {
     return {
       // 当前选择的优惠券类型
-      checkIndex: 1 };
+      checkIndex: 1,
+      // 设置开始时间
+      showStart: false,
+      // 设置结束时间
+      showEnd: false,
+      // 时间格式化
+      dateParams: {
+        year: true,
+        month: true,
+        day: true,
+        hour: false,
+        minute: false,
+        second: false },
+
+      // 满多少金额
+      max: "",
+      // 开始时间
+      startTime: "",
+      // 结束时间
+      endTime: "",
+      // 金额 折扣
+      amount: "",
+      // 数量
+      num: "" };
 
   },
-  methods: {} };exports.default = _default;
+  methods: {
+    // 提交数据
+    push: function push() {
+      var _this = this;
+      if (this.startTime === "") {
+        this.$u.toast('请选择开始时间');
+        return false;
+      }
+      if (this.endTime === "") {
+        this.$u.toast('请选择结束时间');
+        return false;
+      }
+      if (this.num === "") {
+        this.$u.toast('请输入优惠券数量');
+        return false;
+      }
+      if (this.checkIndex === 1) {
+        if (this.amount === "") {
+          this.$u.toast('请输入代金券金额');
+          return false;
+        }
+        this.request("/admin_coupon/set", {
+          type: 1,
+          max: '',
+          amount: this.amount,
+          start_time: this.startTime,
+          end_time: this.endTime,
+          num: this.num },
+        "GET").then(function (res) {
+          console.log(res);
+          if (res.code === 1) {
+            _this.$u.toast('添加成功');
+            // 开始时间
+            _this.startTime = "";
+            // 结束时间
+            _this.endTime = "";
+            // 金额 折扣
+            _this.amount = "";
+            // 数量
+            _this.num = "";
+          }
+        });
+      }
+      if (this.checkIndex === 2) {
+        if (this.max === "") {
+          this.$u.toast('请输入条件金额');
+          return false;
+        }
+        if (this.amount === "") {
+          this.$u.toast('请输入满减的金额');
+          return false;
+        }
+        this.request("/admin_coupon/set", {
+          type: 2,
+          max: this.max,
+          amount: this.amount,
+          start_time: this.startTime,
+          end_time: this.endTime,
+          num: this.num },
+        "GET").then(function (res) {
+          console.log(res);
+          if (res.code === 1) {
+            _this.$u.toast('添加成功');
+            // 开始时间
+            _this.startTime = "";
+            // 结束时间
+            _this.endTime = "";
+            // 金额 折扣
+            _this.amount = "";
+            // 数量
+            _this.num = "";
+            // 满
+            _this.max = "";
+          }
+        });
+      }
+      if (this.checkIndex === 3) {
+        if (this.amount === "") {
+          this.$u.toast('请输入折扣');
+          return false;
+        }
+        this.request("/admin_coupon/set", {
+          type: 3,
+          amount: this.amount,
+          start_time: this.startTime,
+          end_time: this.endTime,
+          num: this.num },
+        "GET").then(function (res) {
+          console.log(res);
+          if (res.code === 1) {
+            _this.$u.toast('添加成功');
+            // 开始时间
+            _this.startTime = "";
+            // 结束时间
+            _this.endTime = "";
+            // 金额 折扣
+            _this.amount = "";
+            // 数量
+            _this.num = "";
+          }
+        });
+      }
+      if (this.checkIndex === 4) {
+
+      }
+
+    },
+    // 开始时间
+    startConfirm: function startConfirm(e) {
+      console.log(e);
+      this.startTime = e.year + "-" + e.month + "-" + e.day;
+    },
+    // 结束时间
+    endConfirm: function endConfirm(e) {
+      console.log(e);
+      this.endTime = e.year + "-" + e.month + "-" + e.day;
+    } } };exports.default = _default;
 
 /***/ }),
 

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

@@ -2,5 +2,7 @@
   "navigationBarTitleText": "优惠券",
   "enablePullDownRefresh": false,
   "navigationBarBackgroundColor": "#FFFFFF",
-  "usingComponents": {}
+  "usingComponents": {
+    "u-picker": "/uview-ui/components/u-picker/u-picker"
+  }
 }

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 */ 231))
+      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 */ 240))
     },
     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 */ 238))
+      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 */ 209))
     }
   }
 } catch (e) {
@@ -211,27 +211,72 @@ var _default =
       show: false,
       level: [{
         cateName: '普通会员',
-        id: 1 },
+        id: 0 },
 
       {
         cateName: '黄金会员',
-        id: 2 },
+        id: 1 },
 
       {
         cateName: '铂金会员',
-        id: 2 },
+        id: 10 },
 
       {
         cateName: '钻石会员',
-        id: 2 }] };
+        id: 20 }],
 
 
+      dataList: [],
+      name: "",
+      userId: '' };
 
   },
+  onLoad: function onLoad() {
+    this.getData();
+  },
   methods: {
+    // 设置会员等级
+    set: function set(e) {var _this = this;
+      console.log(e, 1111);
+      var level = 0;
+      if (e[0] === 0) {
+        level = 0;
+      }
+      if (e[0] === 1) {
+        level = 1;
+      }
+      if (e[0] === 2) {
+        level = 10;
+      }
+      if (e[0] === 3) {
+        level = 20;
+      }
+      this.request("/admin_user/setLevel", { user_id: this.userId, level: level }, "GET").then(function (res) {
+        console.log(res);
+        if (res.code === 1) {
+          _this.$u.toast('操作成功');
+          _this.getData();
+        } else {
+          _this.$u.toast(res.msg);
+        }
+      });
+    },
+    // 取消设置会员等级
+    cancel: function cancel() {
+      this.userId = "";
+    },
+    // 获取数据列表
+    getData: function getData() {var _this2 = this;
+      this.request("/admin_user/list", { keyword: this.name }, "GET").then(function (res) {
+        if (res.code === 1) {
+          _this2.dataList = res.data.data;
+        }
+      });
+    },
     // 点击编辑
-    eidt: function eidt() {
+    eidt: function eidt(id) {
       this.show = true;
+      this.userId = id;
     } } };exports.default = _default;
 
 /***/ }),

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

@@ -1 +1 @@
-<view class="content"><view class="search"><u-search bind:input="__e" vue-id="1fe8429b-1" placeholder="请输入信息搜索会员" value="{{keyword}}" data-event-opts="{{[['^input',[['__set_model',['','keyword','$event',[]]]]]]}}" bind:__l="__l"></u-search></view><view class="card"><view class="row"><view class="row half"><view class="name">昵称</view><view class="text">1111</view></view><view class="row half"><view class="name">手机号</view><view class="text">1111</view></view></view><view class="row"><view class="row half"><view class="name">会员等级</view><view class="text">1111</view></view><view data-event-opts="{{[['tap',[['eidt',['$event']]]]]}}" class="row half" bindtap="__e"><view class="btn">编辑</view></view></view></view><u-picker bind:input="__e" vue-id="1fe8429b-2" mode="selector" range="{{level}}" range-key="cateName" title="设置会员等级" value="{{show}}" data-event-opts="{{[['^input',[['__set_model',['','show','$event',[]]]]]]}}" bind:__l="__l"></u-picker></view>
+<view class="content"><view class="search"><u-search vue-id="1fe8429b-1" placeholder="请输入信息搜索会员" value="{{name}}" data-event-opts="{{[['^custom',[['getData']]],['^input',[['__set_model',['','name','$event',[]]]]]]}}" bind:custom="__e" bind:input="__e" bind:__l="__l"></u-search></view><block wx:for="{{dataList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="card"><view class="row"><view class="row half"><view class="name">昵称</view><view class="text">{{''+item.nickname+''}}</view></view><view class="row half"><view class="name">手机号</view><view class="text">{{''+item.mobile+''}}</view></view></view><view class="row"><view class="row half"><view class="name">会员等级</view><view class="text">{{''+item.level_text+''}}</view></view><view data-event-opts="{{[['tap',[['eidt',['$0'],[[['dataList','',index,'id']]]]]]]}}" class="row half" bindtap="__e"><view class="btn">编辑</view></view></view></view></block><u-picker vue-id="1fe8429b-2" mode="selector" range="{{level}}" range-key="cateName" title="设置会员等级" value="{{show}}" data-event-opts="{{[['^confirm',[['set']]],['^cancel',[['cancel']]],['^input',[['__set_model',['','show','$event',[]]]]]]}}" bind:confirm="__e" bind:cancel="__e" bind:input="__e" bind:__l="__l"></u-picker></view>

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

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

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

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

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

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

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

@@ -3,7 +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"
+    "u-modal": "/uview-ui/components/u-modal/u-modal"
   }
 }

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

@@ -34,10 +34,17 @@
   justify-content: flex-start;
 }
 .content .feedbackconent {
-  border: 1px red solid;
   height: 300rpx;
-  font-size: 20rpx;
-  padding: 30rpx;
+  font-size: 30rpx;
+  padding: 10rpx;
+}
+.content .feedbackconent .feedbackconent-input {
+  width: 100%;
+  height: 100%;
+}
+.content .feedbackconent .feedbackconent-input::-webkit-input-placeholder {
+  color: red;
+  font-size: 30rpx;
 }
 .content .card {
   width: 90%;
@@ -86,5 +93,6 @@
   color: #FFFFFF;
   padding: 10rpx 20rpx;
   border-radius: 30rpx;
+  margin-left: 50rpx;
 }
 

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 */ 203))
+      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 */ 219))
     },
     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 */ 196))
+      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 */ 202))
     },
-    uSelect: function() {
-      return __webpack_require__.e(/*! import() | uview-ui/components/u-select/u-select */ "uview-ui/components/u-select/u-select").then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-select/u-select.vue */ 210))
+    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 */ 209))
     }
   }
 } catch (e) {
@@ -128,7 +128,13 @@ var render = function() {
   var _c = _vm._self._c || _h
   if (!_vm._isMounted) {
     _vm.e0 = function($event) {
-      _vm.showPop = true
+      _vm.type === 1
+        ? (_vm.dateShow = true)
+        : _vm.type === 2
+        ? (_vm.monthShow = true)
+        : _vm.type === 3
+        ? (_vm.yearShow = true)
+        : ""
     }
   }
 }
@@ -236,6 +242,11 @@ Object.defineProperty(exports, "__esModule", { value: true });exports.default =
 
 
 
+
+
+
+
+
 var _time = __webpack_require__(/*! @/utils/time.js */ 73); //
 //
 //
@@ -307,11 +318,67 @@ var _time = __webpack_require__(/*! @/utils/time.js */ 73); //
 //
 //
 //
-var _default = { data: function data() {return { type: 1, timeName: '日盈利金额', time: "", list: [{ name: '日' }, { name: '月' }, { name: '年' }], // 选择时间
-      showPop: false, // 可选择的集合
-      Dates: [{ id: 1, title: '1' }], // 获取的盈利数据
-      data: {}, page: 1, limit: 10 };}, onLoad: function onLoad(e) {var date = (0, _time.getDate)();this.time = date.year + "-" + date.month + "-" + date.date;this.getMoney(this.type, this.time);}, watch: { type: function type(e) {console.log(e);switch (e) {case 1:this.timeName = '日盈利金额';break;case 2:this.timeName = '月盈利金额';break;case 3:this.timeName = '年盈利金额';break;default:this.timeName = '日盈利金额';break;}} }, methods: { // 获取盈利金额
-    getMoney: function getMoney(type, time) {var _this = this;this.request("/admin_order/profit", { type: type === 1 ? 'day' : type === 2 ? 'month' : type === 3 ? 'year' : 'day', date: time, page: this.page, limit: this.limit }, "GET").then(function (res) {console.log(res);if (res.code === 1) {_this.data = res.data;}});} } };exports.default = _default;
+//
+//
+//
+//
+//
+var _default = { data: function data() {return { type: 1, timeName: '日盈利金额', date: {}, time: "", list: [{ name: '日' }, { name: '月' }, { name: '年' }], // 日营业额 查询日期选择
+      dateShow: false, dateParams: { year: true, month: true, day: true, hour: false, minute: false, second: false }, // 月营业额 查询日期选择
+      monthShow: false, monthParams: { year: true, month: true, day: false, hour: false, minute: false, second: false }, // 年营业额 查询日期选择
+      yearShow: false, yearParams: { year: true, month: false, day: false, hour: false, minute: false, second: false }, // 获取的盈利数据
+      data: {}, page: 1, limit: 10 };}, onLoad: function onLoad(e) {this.date = (0, _time.getDate)();this.time = this.date.year + "-" + this.date.month + "-" + this.date.date;this.getMoney(this.type, this.time);}, watch: { type: function type(e) {console.log(e);switch (e) {case 1:this.timeName = '日盈利金额';break;case 2:this.timeName = '月盈利金额';break;case 3:this.timeName = '年盈利金额';break;default:this.timeName = '日盈利金额';break;}this.date = (0, _time.getDate)();this.getMoney(this.type, this.time);} },
+
+  methods: {
+    // 确认选择日期
+    dateConfirm: function dateConfirm(e) {
+      console.log(e);
+      this.time = e.year + "-" + e.month + "-" + e.day;
+      this.getMoney();
+      this.getMoney(this.type, this.time);
+    },
+    // 确认选择月份
+    monthConfirm: function monthConfirm(e) {
+      console.log(e);
+      this.time = e.year + "-" + e.month;
+      this.getMoney();
+      this.getMoney(this.type, this.time);
+    },
+    // 确认选择年份
+    yearConfirm: function yearConfirm(e) {
+      console.log(e);
+      this.time = e.year;
+      this.getMoney();
+      this.getMoney(this.type, this.time);
+    },
+    // 切换时间类型
+    changeType: function changeType(e) {
+      console.log(e);
+      this.type = e + 1;
+      if (e === 0) {
+        this.time = this.date.year + "-" + this.date.month + "-" + this.date.date;
+      }
+      if (e === 1) {
+        this.time = this.date.year + "-" + this.date.month;
+      }
+      if (e === 2) {
+        this.time = this.date.year;
+      }
+    },
+    // 获取盈利金额
+    getMoney: function getMoney(type, time) {var _this = this;
+      this.request("/admin_order/profit", {
+        type: type === 1 ? 'day' : type === 2 ? 'month' : type === 3 ? 'year' : 'day',
+        date: time,
+        page: this.page,
+        limit: this.limit },
+      "GET").then(function (res) {
+        console.log(res);
+        if (res.code === 1) {
+          _this.data = res.data;
+        }
+      });
+    } } };exports.default = _default;
 
 /***/ }),
 

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

@@ -5,6 +5,6 @@
   "usingComponents": {
     "u-subsection": "/uview-ui/components/u-subsection/u-subsection",
     "u-icon": "/uview-ui/components/u-icon/u-icon",
-    "u-select": "/uview-ui/components/u-select/u-select"
+    "u-picker": "/uview-ui/components/u-picker/u-picker"
   }
 }

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

@@ -96,7 +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 */ 196))
+      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 */ 202))
+    },
+    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 */ 209))
     }
   }
 } catch (e) {
@@ -120,6 +123,19 @@ var render = function() {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
+  if (!_vm._isMounted) {
+    _vm.e0 = function($event) {
+      _vm.dateShow = true
+    }
+
+    _vm.e1 = function($event) {
+      _vm.monthShow = true
+    }
+
+    _vm.e2 = function($event) {
+      _vm.yearShow = true
+    }
+  }
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -210,6 +226,15 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
+
+
+
+
+
+
+
+
 var _time = __webpack_require__(/*! @/utils/time.js */ 73); //
 //
 //
@@ -266,14 +291,80 @@ var _time = __webpack_require__(/*! @/utils/time.js */ 73); //
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = { data: function data() {return { date: {}, // 页面类型
       type: '', // 日营业额
       daymoney: "", // 月营业额
       monthmoney: "", // 年营业额
-      yearmoney: "" };}, onLoad: function onLoad(e) {this.type = Number(e.type);if (this.type === 1) {uni.setNavigationBarTitle({ title: "营业额" });} else {uni.setNavigationBarTitle({ title: "结算金额" });} // 获取当前日期
+      yearmoney: "", // 日营业额 查询日期选择
+      dateShow: false, dateParams: { year: true, month: true, day: true, hour: false, minute: false, second: false }, // 月营业额 查询日期选择
+      monthShow: false, monthParams: { year: true, month: true, day: false, hour: false, minute: false, second: false }, // 年营业额 查询日期选择
+      yearShow: false, yearParams: { year: true, month: false, day: false, hour: false, minute: false, second: false } };}, onLoad: function onLoad(e) {this.type = Number(e.type);if (this.type === 1) {uni.setNavigationBarTitle({ title: "营业额" });} else {uni.setNavigationBarTitle({ title: "结算金额" });} // 获取当前日期
     this.date = (0, _time.getDate)(); // 获取数据
-    this.getData();}, methods: { // 获取数据
-    getData: function getData() {var _this2 = this;var _this = this;if (this.type === 1) {this.request("/admin_order/turnover", { type: "day", date: _this.date.year + "-" + _this.date.month + "-" + _this.date.date }, "GET").then(function (res) {console.log(res);if (res.code === 1) {_this2.daymoney = res.data.amount;}});this.request("/admin_order/turnover", { type: "month", date: _this.date.year + "-" + _this.date.month }, "GET").then(function (res) {console.log(res);if (res.code === 1) {_this2.monthmoney = res.data.amount;}});this.request("/admin_order/turnover", { type: "year", date: _this.date.year }, "GET").then(function (res) {console.log(res);if (res.code === 1) {_this2.yearmoney = res.data.amount;}
+    this.getData();}, watch: { date: function date(e) {this.getData();} }, methods: { // 确认选择日期
+    dateConfirm: function dateConfirm(e) {console.log(e);var date = { date: e.day, month: e.month,
+        year: e.year };
+
+      this.date = date;
+    },
+    // 确认选择月份
+    monthConfirm: function monthConfirm(e) {
+      console.log(e);
+      var date = {
+        date: 1,
+        month: e.month,
+        year: e.year };
+
+      this.date = date;
+    },
+    // 确认选择年份
+    yearConfirm: function yearConfirm(e) {
+      console.log(e);
+      var date = {
+        date: 1,
+        month: 1,
+        year: e.year };
+
+      this.date = date;
+    },
+    // 获取数据
+    getData: function getData() {var _this2 = this;
+      var _this = this;
+      if (this.type === 1) {
+        this.request("/admin_order/turnover", {
+          type: "day",
+          date: _this.date.year + "-" + _this.date.month + "-" + _this.date.date },
+        "GET").then(function (res) {
+          console.log(res);
+          if (res.code === 1) {
+            _this2.daymoney = res.data.amount;
+          }
+        });
+        this.request("/admin_order/turnover", {
+          type: "month",
+          date: _this.date.year + "-" + _this.date.month },
+        "GET").then(function (res) {
+          console.log(res);
+          if (res.code === 1) {
+            _this2.monthmoney = res.data.amount;
+          }
+        });
+        this.request("/admin_order/turnover", {
+          type: "year",
+          date: _this.date.year },
+        "GET").then(function (res) {
+          console.log(res);
+          if (res.code === 1) {
+            _this2.yearmoney = res.data.amount;
+          }
         });
       }
       if (this.type === 2) {

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

@@ -3,6 +3,7 @@
   "enablePullDownRefresh": false,
   "navigationBarBackgroundColor": "#FFFFFF",
   "usingComponents": {
-    "u-icon": "/uview-ui/components/u-icon/u-icon"
+    "u-icon": "/uview-ui/components/u-icon/u-icon",
+    "u-picker": "/uview-ui/components/u-picker/u-picker"
   }
 }

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

@@ -43,7 +43,7 @@
   },
   "compileType": "miniprogram",
   "libVersion": "",
-  "appid": "wxfdc16dfe02d1a38d",
+  "appid": "wx2f20767b0bbaf91c",
   "projectname": "pet",
   "condition": {
     "search": {

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

@@ -13,9 +13,9 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/order/info",
-          "pathName": "pages/order/info",
-          "query": "id=16",
+          "name": "pages/Marketing/coupon",
+          "pathName": "pages/Marketing/coupon",
+          "query": "",
           "scene": null
         },
         {
@@ -23,6 +23,24 @@
           "pathName": "pages/index/index",
           "query": "",
           "scene": null
+        },
+        {
+          "name": "pages/Delivery/Delivery",
+          "pathName": "pages/Delivery/Delivery",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "pages/Delivery/location",
+          "pathName": "pages/Delivery/location",
+          "query": "",
+          "scene": null
+        },
+        {
+          "name": "pages/Delivery/create",
+          "pathName": "pages/Delivery/create",
+          "query": "type=1",
+          "scene": null
         }
       ]
     }