diff --git a/App.vue b/App.vue
index 48a6792..7cb8b06 100644
--- a/App.vue
+++ b/App.vue
@@ -15,7 +15,8 @@
 			// imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
 			// imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
 			userInfo: "",
-			brestUserInfo : '',
+			brestUserInfo : '',
+			bresthighAgent:'',
 			openId: '',
 			code: '',
 			token: '',
diff --git a/Utils/Api.js b/Utils/Api.js
index 2e4bb98..1476a3d 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -412,10 +412,37 @@ export const getAgentSalesPriceCount = params => {
 export const sendUserPass = params => {
 	return POSTBREST('POST', `${brestBase}/secUser/sendUserPass`, params).then(res => res.data);
 }
-
-
-
-
+
+//增加子代理商
+export const insertChildAgent = params => {
+	return POSTBREST('POST', `${brestBase}/highAgent/insertChildAgent`, params).then(res => res.data);
+}
+
+//变更代理商状态
+export const changeAgentStatus = params => {
+	return POSTBREST('GET', `${brestBase}/highAgent/changeAgentStatus`, params).then(res => res.data);
+}
+
+//查询子级代理商列表
+export const getChildAgentList = params => {
+	return POSTBREST('GET', `${brestBase}/highAgent/getChildAgentList`, params).then(res => res.data);
+}
+
+//分发给子代理商
+export const assignCouponChildAgent = params => {
+	return POSTBREST('POST', `${brestBase}/highCouponAgent/assignCouponChildAgent`, params).then(res => res.data);
+}
+
+//根据代理商 查询卡券
+export const getCouponByAgent = params => {
+	return POSTBREST('GET', `${brestBase}/highCouponAgent/getCouponByAgent`, params).then(res => res.data);
+}
+
+//根据卡券与代理商关系 查询分发记录
+export const getRecordByCouponAgentId = params => {
+	return POSTBREST('GET', `${brestBase}/highCouponAgent/getRecordByCouponAgentId`, params).then(res => res.data);
+}
+
 
 
 // 话费
diff --git a/components/cartcontrol.vue b/components/cartcontrol.vue
new file mode 100644
index 0000000..0764f6d
--- /dev/null
+++ b/components/cartcontrol.vue
@@ -0,0 +1,67 @@
+<template>
+	<view style="display: flex;flex-direction: row;height: 27px;">
+		<view class="food-control">
+			<view class="cont" style="margin-top: 2px;" @click="decreaseCart(food)" v-show="food.count>0">
+				<image src="../qianzhu-KFC/static/imgs/reduce.png" mode="" style="width: 22px;height: 22px;"></image>
+			</view>
+			<!-- <text style="padding: 0 4px;" v-show="food.count>0">{{food.count}}</text> -->
+			<input type="number" maxlength="3"
+					style="margin: 0 2px;width: 36px;padding: 0 1px;border-radius: 3px;" v-show="food.count>0"
+					v-model="food.count"  @input="inputCart(food)"/>
+		</view>
+		<view style="flex: 1;margin-top: 2px; " class="cont" @click="addCart(food)">
+			<image src="../qianzhu-KFC/static/imgs/plus.png" style="width: 22px;height: 22px;color: #CCCCCC;" mode=""></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	// import Vue from 'vue'
+	export default {
+		props: {
+			food: {
+				type: Object,
+			}
+		},
+		data() {
+			return {
+			};
+		},
+		methods: {
+			addCart: function(item) {
+				this.$emit('add',item)
+			},
+			decreaseCart(item) {
+				this.$emit('dec',item)
+			},
+			inputCart(item) {
+				this.fcount = item.count
+				if (item.count >= 999) {
+					uni.showToast({
+						title: "该宝贝不能购买更多了~"
+					})
+					return false;
+				} else {
+					this.$emit('input', item)
+				}
+			
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.food-control {
+		display: flex;
+		flex: 1;
+		justify-content: space-around;
+	}
+
+	.cont {
+		width: 22px;
+		height: 22px;
+		box-sizing: border-box;
+		border-radius: 50%;
+		text-align: center;
+	}
+</style>
diff --git a/components/shopcart.vue b/components/shopcart.vue
new file mode 100644
index 0000000..7467260
--- /dev/null
+++ b/components/shopcart.vue
@@ -0,0 +1,303 @@
+<template>
+	<view class="shopcart">
+		<!-- @click="toggleList" -->
+		<view class="cartBottom">
+			<view class="carIcon" @click="toggleList">
+				<view class="iconBox" :class="getAllCount ? 'active' : '' ">
+					<text class="allcount" v-if="getAllCount">{{getAllCount}}</text>
+					<image src="../qianzhu-KFC/static/imgs/kfcicon.png" mode="" class="img"></image>
+				</view>
+			</view>
+			<view class="middle" @click="toggleList">
+				<text class="price" :class="getAllCount ?　'active': ''">￥{{getAllPrice}}</text>
+				<text class="deliveryPrice" style="font-size: 12px;">免配送费|支持自取</text>
+			</view>
+			<view class="BtnRight" @click="buyList">
+				选好了
+				<!-- <button :type="buyType" style="border-radius: 20rpx;" :disabled="buyDis" @click="buyList"></button> -->
+			</view>
+		</view>
+		<!-- 选择的商品 -->
+		<view class="cartList" v-show="isShowList && getList.length">
+			<view class="title">
+				<text class="font15 fcor666">已选餐品</text>
+				<view class="font12 fcor999" @click="delShopcart">
+					清空
+				</view>
+			</view>
+			<scroll-view scroll-y style="max-height: 280px;">
+				<view class="list">
+					<view class="list-text alijusstart" v-for="(item,index) in getList" :key="index">
+						<view class="width40">
+							<image src="../qianzhu-KFC/static/imgs/kfc1.png" mode="widthFix" class="width100"></image>
+						</view>
+						<view class="width30 fotlt">
+							<view class="width100 fcor999 font14">
+								{{item.name}}
+							</view>
+							<view class="width100 fcoreb5  font16 mart10">
+								￥<text class="fontwig6">{{item.price}}</text>
+							</view>
+						</view>
+						<cartcontrol :food="item" @add="addCart" @dec="decreaseCart" @input="inputCart"></cartcontrol>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<view class="listMask" v-show="isShowList && getList.length" @click="toggleList"></view>
+	</view>
+</template>
+
+<script>
+	import cartcontrol from '@/components/cartcontrol.vue'
+	// import {mul} from '@/utils/lib'
+	export default {
+		props: {
+			buyType: 'default',
+			buyDis: true,
+			goods: {
+				type: Array
+			}
+		},
+		data() {
+			return {
+				isShowList: false,
+			};
+		},
+		components: {
+			cartcontrol
+		},
+		computed: {
+			getList() {
+				let result = [];
+				this.goods.forEach((good) => {
+					good.foods.forEach((food) => {
+						if (food.count) {
+							result.push(food)
+							// console.log('res', JSON.stringify(result))
+						}
+					})
+				})
+				return result
+			},
+			// 获得购物车所有商品数量
+			getAllCount() {
+				let result = 0;
+				this.getList.forEach((food) => {
+					result += food.count
+				})
+				return result
+			},
+
+
+
+			// 总价
+			getAllPrice() {
+				let result = 0;
+				let result1 = 0;
+				this.goods.forEach((good) => {
+					good.foods.forEach((food) => {
+						result1 += this.accMul(food.count, food.price)
+						result = result1.toFixed(2);
+					})
+				})
+				return result
+			}
+		},
+		methods: {
+			// 解决浮点数 运算出现多位小数
+			accMul(arg1, arg2) {
+				let m = 0,
+					s1 = '',
+					s2 = '';
+				if (arg1 && arg1 != null)
+					s1 = arg1.toString();
+				if (arg2 && arg2 != null)
+					s2 = arg2.toString();
+				// console.log('m1',s2.replace('.',''))
+				try {
+					m += s1.split('.')[1].length
+				} catch (e) {}
+				try {
+					m += s2.split('.')[1].length
+				} catch (e) {}
+
+				return Number(s1.replace('.', '')) * Number(s2.replace('.', '')) / Math.pow(10, m);
+			},
+
+
+			toggleList() {
+				if (this.getList.length) {
+					this.isShowList = !this.isShowList;
+				}
+			},
+			buyList() {
+				// if (this.getList.length) {
+				// 	console.log("getAllPrice：" + this.getAllPrice)
+				// 	console.log('buyList：' + JSON.stringify(this.getList))
+				// 	uni.showToast({
+				// 		title: "总价格：" + this.getAllPrice
+				// 	})
+
+				// } else {
+
+				// }
+				uni.navigateTo({
+					// url:'/qianzhu-KFC/confirmOrder/confirmOrder'
+					url:'/qianzhu-KFC/order-details/order-details'
+				})
+			},
+			delShopcart() {
+				this.$emit('delAll');
+			},
+			addCart: function(item) {
+				this.$emit('add', item)
+			},
+			decreaseCart(item) {
+				this.$emit('dec', item)
+			},
+			inputCart(item) {
+				this.fcount = item.count
+				if (item.count >= 999) {
+					uni.showToast({
+						title: "该宝贝不能购买更多了~"
+					})
+					return false;
+				} else {
+					this.$emit('input', item)
+				}
+
+			}
+
+		},
+	}
+</script>
+
+<style scoped>
+	.list-text {
+		display: flex;
+		flex-direction: row;
+	}
+
+	.shopcart .cartBottom {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		height: 54px;
+		z-index: 99;
+		display: flex;
+		background-color: #141d27;
+	}
+
+	.carIcon {
+		flex: 1;
+	}
+
+	.iconBox {
+		position: absolute;
+		bottom: 22px;
+		left: 18px;
+		z-index: 101;
+		background-color: rgb(70, 73, 75);
+		border-radius: 50%;
+		height: 48px;
+		width: 48px;
+		line-height: 55px;
+		/* border: 6px solid #141d27; */
+	}
+
+	.iconBox .allcount {
+		position: absolute;
+		right: -6px;
+		top: 0;
+		display: inline-block;
+		padding: 0 6px;
+		font-size: 9px;
+		line-height: 16px;
+		font-weight: 400;
+		border-radius: 10px;
+		background-color: #f01414;
+		color: #ffffff;
+	}
+
+	.img {
+		font-size: 24px;
+		line-height: 24px;
+		width: 30px;
+		height: 30px;
+		padding-left: 6px;
+		padding-top: 6px;
+		color: #cccccc;
+		border-radius: 50%;
+	}
+
+	.carIcon .active {
+		background-color: #00a0dc;
+	}
+
+	.middle {
+		display: flex;
+		flex-direction: column;
+		flex: 2;
+		color: #ffffff;
+	}
+
+	.BtnRight {
+		flex: 1;
+		border-radius: 26px;
+		margin: 18rpx;
+		z-index: 99999;
+		background-color: #c72a20;
+		color: #fff;
+		text-align: center;
+		line-height: 36px;
+		height: 36px;
+		font-size: 14px;
+	}
+
+	.cartList {
+		position: fixed;
+		bottom: 54px;
+		left: 0;
+		right: 0;
+		z-index: 90;
+	}
+
+	.cartList .title,
+	.cartList .list-text {
+		display: flex;
+		flex-direction: row;
+	}
+
+	.cartList .title {
+		background: #ffffff;
+		justify-content: space-between;
+		padding: 10px 14px;
+		border-radius: 15px 15px 0 0;
+	}
+
+	.cartList .list-text {
+		padding: 10px 6px 5px 8px;
+		text-align: center;
+		border-bottom: 1px solid #f4f4f4;
+	}
+
+	.list {
+		background: #ffffff;
+		padding-bottom: 10px;
+	}
+
+
+	/* 遮布 */
+	.listMask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 89;
+		opacity: 0.5;
+		background: #6a7076;
+	}
+</style>
diff --git a/pages.json b/pages.json
index da2b650..a2b3e10 100644
--- a/pages.json
+++ b/pages.json
@@ -461,7 +461,8 @@
 				"navigationBarTextStyle": "white"
 			}
 		}
-    ],
+
+	],
 	"subpackages": [{
 		"root": "subPages",
 		"pages": [{
@@ -681,44 +682,133 @@
 					"navigationBarTextStyle": "white"
 				}
 
+			}, {
+				"path": "agenthome/agenthome",
+				"style": {
+					"enablePullDownRefresh": false,
+					"navigationBarTitleText": "代理商",
+					"backgroundTextStyle": "light",
+					"navigationBarBackgroundColor": "#0083f5",
+					"backgroundColorTop": "#0083f5",
+					"navigationBarTextStyle": "white"
+				}
+
+			}, {
+				"path": "agentmanage/agentmanage",
+				"style": {
+					"enablePullDownRefresh": false,
+					"navigationBarTitleText": "代理商管理",
+					"backgroundTextStyle": "light",
+					"navigationBarBackgroundColor": "#0083f5",
+					"backgroundColorTop": "#0083f5",
+					"navigationBarTextStyle": "white"
+				}
+
+			}, {
+				"path": "addAgent/addAgent",
+				"style": {
+					"enablePullDownRefresh": false,
+					"navigationBarTitleText": "添加代理商",
+					"backgroundTextStyle": "light",
+					"navigationBarBackgroundColor": "#0083f5",
+					"backgroundColorTop": "#0083f5",
+					"navigationBarTextStyle": "white"
+				}
+
+			}, {
+				"path": "agentDistribution/agentDistribution",
+				"style": {
+					"enablePullDownRefresh": false,
+					"navigationBarTitleText": "分销代理商",
+					"backgroundTextStyle": "light",
+					"navigationBarBackgroundColor": "#0083f5",
+					"backgroundColorTop": "#0083f5",
+					"navigationBarTextStyle": "white"
+				}
+
+			}, {
+				"path": "agentCardList/agentCardList",
+				"style": {
+					"enablePullDownRefresh": false,
+					"navigationBarTitleText": "分发卡券列表",
+					"backgroundTextStyle": "light",
+					"navigationBarBackgroundColor": "#0083f5",
+					"backgroundColorTop": "#0083f5",
+					"navigationBarTextStyle": "white"
+				}
+			}, {
+				"path": "agentcardsDetails/agentcardsDetails",
+				"style": {
+					"enablePullDownRefresh": false,
+					"navigationBarTitleText": "分发记录",
+					"backgroundTextStyle": "light",
+					"navigationBarBackgroundColor": "#0083f5",
+					"backgroundColorTop": "#0083f5",
+					"navigationBarTextStyle": "white"
+				}
+
 			}
 		]
 	}, {
 		"root": "qianzhu-KFC",
 		"pages": [{
-            "path" : "home/home",
-            "style" :                                                                                    
-            {
-               "enablePullDownRefresh": false,
-               "navigationBarTitleText": "肯德基",
-               "backgroundTextStyle": "light",
-               "navigationBarBackgroundColor": "#ffffff",
-               "navigationBarTextStyle": "black"
-            }
-            
-        },{
-            "path" : "address/address",
-            "style" :                                                                                    
-            {
-                "enablePullDownRefresh": false,
-                "navigationBarTitleText": "肯德基在线点餐",
-                "backgroundTextStyle": "light",
-                "navigationBarBackgroundColor": "#ffffff",
-                "navigationBarTextStyle": "black"
-            }
-            
-        },{
-            "path" : "update-address/update-address",
-            "style" :                                                                                    
-            {
-              "enablePullDownRefresh": false,
-              "backgroundTextStyle": "light",
-              "navigationBarBackgroundColor": "#ffffff",
-              "navigationBarTextStyle": "black"
-            }
-            
-        }
-		]
+			"path": "home/home",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "肯德基",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+
+		}, {
+			"path": "address/address",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "肯德基在线点餐",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+
+		}, {
+			"path": "update-address/update-address",
+			"style": {
+				"enablePullDownRefresh": false,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+
+		}, {
+			"path": "buffet-order/buffet-order",
+			"style": {
+				"navigationBarTitleText": "选择餐厅",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "menu-list/menu-list",
+			"style": {
+				"navigationBarTitleText": "菜单",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "confirmOrder/confirmOrder",
+			"style": {
+				"navigationBarTitleText": "肯德基在线点餐",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "order-details/order-details",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"enablePullDownRefresh": false
+			}
+
+		}]
 	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
diff --git a/pages/goods/coupons-info-details/coupons-info-details.vue b/pages/goods/coupons-info-details/coupons-info-details.vue
index 522400d..f1b7fdc 100644
--- a/pages/goods/coupons-info-details/coupons-info-details.vue
+++ b/pages/goods/coupons-info-details/coupons-info-details.vue
@@ -23,8 +23,8 @@
 		</view>
 		<view class="width90 mart5 font13 fcor666" v-if="couponDesInfo.couponAgentCode.remark != null ">
 			备注:{{couponDesInfo.couponAgentCode.remark}}</view>
-		<view class="width100" v-if="couponDesInfo.couponInfo.couponSource != 4 && couponDesInfo.couponCode">
-			<view class="width90 mart5 font13 fcor666" v-if="couponDesInfo.couponCode.storeName != null">
+		<view class="width100" v-if="couponDesInfo.couponInfo.couponSource != 4">
+			<view class="width90 mart5 font13 fcor666" v-if="couponDesInfo.couponCode != null">
 				加油站点:{{couponDesInfo.couponCode.storeName}}</view>
 			<view class="line1 mart15"></view>
 			<view class="width100" v-if="couponDesInfo.couponAgentCode.type == 1">
@@ -113,10 +113,12 @@
 					uni.hideLoading()
 					if (res.return_code == '000000') {
 						this.couponDesInfo = res.return_data;
-						if (res.return_data.couponInfo.couponSource != 4 && res.return_data.couponCode) {
-							this.oneTime = res.return_data.couponCode.receiveTime;
-							this.twoTime = res.return_data.couponCode.useEndTime;
-							this.threeTime = res.return_data.couponCode.consumeTime;
+						if (res.return_data.couponInfo.couponSource != 4) {
+							if(res.return_data.couponCode != null){
+								this.oneTime = res.return_data.couponCode.receiveTime;
+								this.twoTime = res.return_data.couponCode.useEndTime;
+								this.threeTime = res.return_data.couponCode.consumeTime;
+							}
 							return;
 						}
 						this.oneTime = res.return_data.couponCodeOther.activeTime;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index eb0334c..0e0d340 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -181,10 +181,12 @@
 							})
 						} else {
 							uni.navigateTo({
-								url: '/pages/user/minePromotion/minePromotion'
+								// url: '/pages/user/minePromotion/minePromotion'
+								url:'/subPages/agenthome/agenthome'
 							})
 						}
-						app.globalData.brestUserInfo = res.return_data.object.secUser;
+						app.globalData.brestUserInfo = res.return_data.object.secUser;
+						app.globalData.bresthighAgent = res.return_data.object.highAgent;
 						app.globalData.brestToken = res.return_data.uniqueCode;
 					} else {
 						uni.hideLoading();
diff --git a/pages/login/resetpasswd.vue b/pages/login/resetpasswd.vue
index 0a74c7f..a51228e 100644
--- a/pages/login/resetpasswd.vue
+++ b/pages/login/resetpasswd.vue
@@ -1,168 +1,147 @@
 <template>
 	<view>
-        <view class="logo">
+		<view class="logo">
 			<view class="img">
-				<image mode="widthFix" src="data:image/png;base64,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"></image>
+				<image mode="widthFix"
+					src="data:image/png;base64,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">
+				</image>
 			</view>
 		</view>
 		<view class="form re">
 			<view class="username">
 				<!-- <view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">{{getCodeText}}</view> -->
-				<input placeholder="请输入旧密码" v-model="phoneNumber" placeholder-style="color: #333333;"/>
+				<input placeholder="请输入旧密码" v-model="phoneNumber" placeholder-style="color: #333333;" />
 			</view>
 			<view class="code">
-				<input placeholder="请输入新密码" v-model="code"  password=true placeholder-style="color: #333333;"/>
+				<input placeholder="请输入新密码" v-model="code" password=true placeholder-style="color: #333333;" />
 			</view>
 			<view class="password">
-				<input placeholder="确认新密码" v-model="passwd" password=true placeholder-style="color: #333333;"/>
+				<input placeholder="确认新密码" v-model="passwd" password=true placeholder-style="color: #333333;" />
 			</view>
 			<view class="btn" @click="sendUserPass">重置密码</view>
 
 		</view>
-		
+
 	</view>
 </template>
 
 <script>
 	import md5 from "@/common/SDK/md5.min.js";
-		let app = getApp()
+	let app = getApp()
 	import {
 		sendUserPass
 	} from "../../Utils/Api.js";
 	export default {
 		data() {
 			return {
-				phoneNumber:"",
-				code:'',
-				passwd:"",
-				getCodeText:'获取验证码',
-				getCodeBtnColor:"#ffffff",
-				getCodeisWaiting:false
+				phoneNumber: "",
+				code: '',
+				passwd: "",
+				getCodeText: '获取验证码',
+				getCodeBtnColor: "#ffffff",
+				getCodeisWaiting: false
 			}
 		},
-		onLoad() {
-		},
+		onLoad() {},
 		methods: {
-			Timer(){},
-			getCode(){
-				if(this.getCodeisWaiting){
-					return ;
+			Timer() {},
+			getCode() {
+				if (this.getCodeisWaiting) {
+					return;
+				}
+				if (!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.phoneNumber))) {
+					uni.showToast({
+						title: '请填写正确手机号码',
+						icon: "none"
+					});
+					return false;
 				}
-				if(!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.phoneNumber))){ 
-					uni.showToast({title: '请填写正确手机号码',icon:"none"});
-					return false; 
-				} 
 				this.getCodeText = "发送中..."
 				this.getCodeisWaiting = true;
 				this.getCodeBtnColor = "rgba(255,255,255,0.5)"
 				//示例用定时器模拟请求效果
-				setTimeout(()=>{
-					uni.showToast({title: '验证码已发送',icon:"none"});
+				setTimeout(() => {
+					uni.showToast({
+						title: '验证码已发送',
+						icon: "none"
+					});
 					//示例默认1234，生产中请删除这一句。
-					this.code=1234;
+					this.code = 1234;
 					this.setTimer();
-				},1000)
-				
-				
+				}, 1000)
+
+
 			},
-			setTimer(){
+			setTimer() {
 				let holdTime = 60;
 				this.getCodeText = "重新获取(60)"
-				this.Timer = setInterval(()=>{
-					if(holdTime<=0){
+				this.Timer = setInterval(() => {
+					if (holdTime <= 0) {
 						this.getCodeisWaiting = false;
 						this.getCodeBtnColor = "#ffffff";
 						this.getCodeText = "获取验证码"
 						clearInterval(this.Timer);
-						return ;
+						return;
 					}
-					this.getCodeText = "重新获取("+holdTime+")"
+					this.getCodeText = "重新获取(" + holdTime + ")"
 					holdTime--;
-					
-				},1000)
-			},
-			doReset(){
-				uni.hideKeyboard()
-				//模板示例部分验证规则
-				if(!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.phoneNumber))){ 
-					uni.showToast({title: '请填写正确手机号码',icon:"none"});
-					return false; 
-				} 
 
-				//示例验证码，实际使用中应为请求服务器比对验证码是否正确。
-				if(this.code!=1234){ 
-					uni.showToast({title: '验证码不正确',icon:"none"});
-					return false; 
-				}
-				uni.showLoading({
-					title: '提交中...'
-				})
-				//模板示例修改本地储存的用户信息，实际使用中请替换为上传服务器修改。
-				setTimeout(()=>{
-					uni.getStorage({
-						key: 'UserList',
-						success: (res)=>{
-							uni.hideLoading()
-							for(let i in res.data){
-								let row = res.data[i];
-								if(row.username==this.phoneNumber){
-									//修改记录，密码md5
-									res.data[i].passwd = md5(this.passwd);
-									uni.setStorage({
-										key: 'UserList',
-										data: res.data,
-										success: function () {
-											uni.showToast({title: '密码已重置',icon:"success"});
-											setTimeout(()=>{
-												uni.navigateBack();
-											},1000)
-										}
-									});
-									return ;
-								}
-							}
-							uni.showToast({title: '手机号码未注册',icon:"none"});
-							
-						},
-						fail:function(e){
-							uni.hideLoading()
-							uni.showToast({title: '手机号码未注册',icon:"none"});
-						}
-					});
-				},1000)
-				
-				
+				}, 1000)
 			},
 			//修改密码
 			sendUserPass() {
-				if(this.phoneNumber == ''){
-					uni.showToast({title: '请输入旧密码',icon:"none"});
-					return false; 
+				if (this.phoneNumber == '') {
+					uni.showToast({
+						title: '请输入旧密码',
+						icon: "none"
+					});
+					return false;
 				}
-				if(this.code == ''){
-					uni.showToast({title: '请输入新密码',icon:"none"});
-					return false; 
+				if (this.code == '') {
+					uni.showToast({
+						title: '请输入新密码',
+						icon: "none"
+					});
+					return false;
 				}
-				if(this.passwd == ''){
-					uni.showToast({title: '请确认新密码',icon:"none"});
-					return false; 
+				if (this.passwd == '') {
+					uni.showToast({
+						title: '请确认新密码',
+						icon: "none"
+					});
+					return false;
 				}
-				if(this.passwd != this.code){
-					uni.showToast({title: '您输入的两次不相同',icon:"none"});
-					return false; 
+				if (this.passwd != this.code) {
+					uni.showToast({
+						title: '您输入的两次不相同',
+						icon: "none"
+					});
+					return false;
 				}
 				let datas = {
 					userId: app.globalData.brestUserInfo.id,
 					oldPassword: this.phoneNumber,
-					newPassword : this.passwd
+					newPassword: this.passwd
 				}
 				sendUserPass(datas).then(res => {
 					if (res.return_code == '000000') {
-					uni.setStorage({
-						key: "pasNum",
-						data: this.passwd
-					})
-					uni.navigateBack()
+						uni.setStorage({
+							key: "pasNum",
+							data: this.passwd
+						})
+						uni.showToast({
+							title: '密码修改成功,请重新登录',
+							icon: 'none',
+							duration: 2000,
+							success() {
+								setTimeout(() => {
+									uni.navigateBack({
+										delta: 2
+									})
+								}, 1500);
+							}
+						})
+
 					} else {
 						uni.showToast({
 							title: res.return_msg,
@@ -177,6 +156,4 @@
 
 <style lang="scss">
 	@import "../../static/css/login.scss";
-
-	
-</style>
+</style>
diff --git a/pages/user/minePromotion/minePromotion.vue b/pages/user/minePromotion/minePromotion.vue
index 350abac..319b124 100644
--- a/pages/user/minePromotion/minePromotion.vue
+++ b/pages/user/minePromotion/minePromotion.vue
@@ -181,7 +181,7 @@
 					<view class="promotion_xg flleft" style="margin-left: -6px;"></view>
 				</view>
 			</view>
-			<view class="promotion_kc width90 mart20">
+			<!-- 	<view class="promotion_kc width90 mart20">
 				<image class="flleft pro_img mart15 margle" :src="imagewxUrl+imgadres">
 				</image>
 				<view class="pro_cont paddtop15">
@@ -205,7 +205,7 @@
 						{{mers.noUsedPrice}}
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<!-- 兑换码统计 -->
 			<!-- <view class="width100 mart20">
 				<view class="width90 mart10 fcor333 font14 fontwig6 height22">
@@ -243,7 +243,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="btnw50 mart50 marb30" @click="toPage()">修改密码</view>
+		<view class="width100 height40p"></view>
 	</view>
 </template>
 
@@ -263,20 +263,20 @@
 				imagewxUrl: app.globalData.imageWxImg,
 				imgadres: 'wenj.png',
 				agentList: [], //总统计
-				minepros: [], //分发数据
-				couponList:[], //兑换码数据
-				couponCont:[], //卡券数据
+				minepros: [], //分发数据
+				couponList: [], //兑换码数据
+				couponCont: [], //卡券数据
 				tabs: ["销售码", "兑换码"], //切换操作
 				current: 1, //默认
 			}
 		},
-		onLoad() {
+		onLoad(options) {
 			// this.getAgentCount(1);
-			// this.getAgentConvertCodeCount();
-		},
-		onShow() {
-			this.getAgentCount(1);
-			this.getAgentConvertCodeCount();
+			// this.getAgentConvertCodeCount();
+		},
+		onShow() {
+			this.getAgentCount(1);
+			this.getAgentConvertCodeCount();
 		},
 		methods: {
 			//查询代理商信息
@@ -346,12 +346,6 @@
 				uni.navigateTo({
 					url: '../agentCoupons/agentCoupons?id=' + item + '&couponsId=' + items + '&typeid=' + itemtype
 				})
-			},
-			//修改密码
-			toPage(page) {
-				uni.navigateTo({
-					url: '../../login/resetpasswd'
-				});
 			}
 		}
 	}
diff --git a/qianzhu-KFC/address/address.vue b/qianzhu-KFC/address/address.vue
index 9ac6786..a2114bd 100644
--- a/qianzhu-KFC/address/address.vue
+++ b/qianzhu-KFC/address/address.vue
@@ -3,7 +3,7 @@
 		<view class="width100 height90 headsbg backcorfff" @click="jumpupadess('add')">
 			<view class="height20"></view>
 			<view class="width90 height40 alijus font15 fcor666 border1co6">
-				<image mode="widthFix" class="icon30 marRight20" src="../static/imgs/add.png"></image>添加新地址
+				<image mode="widthFix" class="icon30 marRight20" src="../static/imgs/plus.png"></image>添加新地址
 			</view>
 		</view>
 
@@ -22,7 +22,9 @@
 				@click.stop="jumpupadess('edit')"></image>
 		</view>
 		<view class="height70"></view>
-		<view class="width100 height50 dispost font15 fotct">确认</view>
+		<view class="width100 height50 dispost font15 fotct" @click="jumpshop()">确认</view>
+		
+		<view class="width100 foot-cs"></view>
 	</view>
 </template>
 
@@ -48,6 +50,20 @@
 					return;
 				}
 				this.chageid = item;
+			},
+			//跳转商品
+			jumpshop() {
+				if (!this.chageid) {
+					uni.showToast({
+						title: '请选择配送地址',
+						duration: 2000,
+						icon: 'none'
+					})
+					return;
+				}
+				uni.navigateTo({
+					url: '../menu-list/menu-list'
+				})
 			}
 		}
 	}
@@ -88,7 +104,7 @@
 		display: flex;
 		align-items: center;
 		background: #fff;
-		position: relative;
+		position: relative;
 		border: 1px solid #c32a20;
 	}
 
@@ -135,5 +151,8 @@
 		bottom: 0px;
 		border-radius: 15px 15px 0px 0px;
 		color: #fff;
+	}
+	.foot-cs{
+		
 	}
 </style>
diff --git a/qianzhu-KFC/buffet-order/buffet-order.vue b/qianzhu-KFC/buffet-order/buffet-order.vue
new file mode 100644
index 0000000..dc5fb8f
--- /dev/null
+++ b/qianzhu-KFC/buffet-order/buffet-order.vue
@@ -0,0 +1,124 @@
+<template>
+	<view>
+		<view class="width100 height120 headsbg backcorfff" @click="jumpupadess('add')">
+			<view class="height20"></view>
+			<view class="width100 fotct font18 fcor666">自助餐厅,不支持外卖</view>
+			<image src="../static/imgs/buffstu.png" mode="widthFix" class="width100"></image>
+		</view>
+
+		<view class="input-box mart20 width90">
+			<input placeholder="请输入关键字搜索" placeholder-style="color:#c0c0c0;" />
+			<view class="icon search"></view>
+		</view>
+
+		<view class="mart20 width80 alijusstart fotct marb20">
+			<view class="width50 fcor333 font16" :class="collection == 1?'colorc8':'fcor333'" @click="changestu(1)">附近餐厅
+				<text class="bufbtn" :class="collection == 1?'backgrdc8':'backcor33'">97</text>
+			</view>
+			<view class="width50 fcor333 font16" :class="collection == 2?'colorc8':'fcor333'" @click="changestu(2)">
+				收藏的餐厅
+				<text class="bufbtn" :class="collection == 2?'backgrdc8':'backcor33'">0</text>
+			</view>
+		</view>
+
+		<view class="mart10 width90 height90 borderrs backcorfff" v-for="(item,index) in kcfShopList" :key="index"
+			@click="jumpmenulist()">
+			<view class="paddtop10 width90 alijusstart">
+				<view class="width80p font16 fcor333 fontwig6">时代天街</view>
+				<view class="width20 fotrt">
+					<!-- <image mode="widthFix" class="icon20" src="../static/imgs/nocollection.png"></image> -->
+					<image mode="widthFix" class="icon20" src="../static/imgs/collection.png"></image>
+				</view>
+			</view>
+			<view class="width90 mart5 font12 fcor999">前门西大街正阳市场1号楼中部</view>
+			<view class="width90 mart5 alijusstart">
+				<image class="icon15" src="../static/imgs/location.png" mode="widthFix"></image>
+				<text class="margle font14 fcor666">0.2km</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				collection: 1, //是否收藏
+				kcfShopList: [1, 2, 3, 4, 5, 6, 7, 8, 9] //肯德基列表
+			}
+		},
+		methods: {
+			//更换状态
+			changestu(item) {
+				this.collection = item;
+			},
+			//跳转菜单
+			jumpmenulist() {
+				uni.navigateTo({
+					url: '../menu-list/menu-list'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f0f0f0;
+	}
+
+	.headsbg {
+		border-radius: 0 0 30px 30px;
+	}
+
+	.colorc8 {
+		color: #c82b1f;
+	}
+
+	.backgrdc8 {
+		background-color: #c82b1f;
+	}
+
+	.borderrs {
+		border-radius: 10px;
+	}
+
+
+	.bufbtn {
+		padding-left: 7px;
+		padding-right: 7px;
+		padding-top: 1px;
+		padding-bottom: 1px;
+		font-size: 12px;
+		color: #ffffff;
+		border-radius: 15px;
+	}
+
+	.input-box {
+		height: 70rpx;
+		background-color: #ffffff;
+		border-radius: 30rpx;
+		position: relative;
+		display: flex;
+		align-items: center;
+
+		.icon {
+			display: flex;
+			align-items: center;
+			position: absolute;
+			top: 0;
+			right: 0;
+			width: 60upx;
+			height: 60upx;
+			font-size: 34upx;
+			color: #c0c0c0;
+		}
+
+		input {
+			padding-left: 28upx;
+			height: 28upx;
+			font-size: 28upx;
+			width: 100%;
+		}
+	}
+</style>
diff --git a/qianzhu-KFC/confirmOrder/confirmOrder.vue b/qianzhu-KFC/confirmOrder/confirmOrder.vue
new file mode 100644
index 0000000..ac0584c
--- /dev/null
+++ b/qianzhu-KFC/confirmOrder/confirmOrder.vue
@@ -0,0 +1,125 @@
+<template>
+	<view>
+		<view class="width100 height120 headsbg backcorfff fotct">
+			<view class="height20"></view>
+			<view class="width100  font18 fcor666">时代天街</view>
+			<image src="../static/imgs/location.png" mode="widthFix" class="icon20 mart5"></image>
+			<view class="width100 mart5 font12 fcor666">时代天街时代天街时代天街时代天街</view>
+		</view>
+		<view class="width96 mart20 colorc3 font12 fotct">
+			注:约5分钟后取餐,请尽快到餐厅取餐哦
+		</view>
+
+		<view class="concont width94 mart10 backcorfff">
+			<view class="width94 paddtop10 font14">
+				餐品详情
+			</view>
+			<view class="width100 bor-botm1 mart10 marb10"></view>
+			<view class="width100">
+				<view class="width100 alijusstart mart10 bor-botm1" v-for="(item,index) in orderList" :key="index">
+					<view class="width30">
+						<image src="../static/imgs/kfc2.png" mode="widthFix" class="width100"></image>
+					</view>
+					<view class="width40 font13 fcor666">香辣鸡腿堡</view>
+					<view class="width10 font12 fcor999">x1</view>
+					<view class="width20">
+						<view class="width100 fcor333 font12">¥<text class="fontwig6 font16">16.8</text></view>
+						<view class="width100 fcor999 font12" style="text-decoration: line-through;">¥17.8</view>
+					</view>
+				</view>
+				<view class="width90 fotrt height50 font13 fcor999">
+					共 <text class="fcor333 fontwig6" style="margin: 0px 5px;"> 1 </text> 件 小计: <text
+						class="font16 colorc3 fontwig6 margle"> ¥16.8</text>
+				</view>
+			</view>
+		</view>
+
+		<view class="concont width94 mart10 backcorfff">
+			<view class="width94 alijusstart paddtop10 font14 fcor666">
+				<view class="width50">联系电话</view>
+				<view class="width50 fotrt">15583658692</view>
+			</view>
+			<view class="width94 font12 fcor999 mart5 paddbotm10">经用于接收取餐码,请正确填写</view>
+		</view>
+
+		<view class="concont width94 mart20 backcorfff marb100">
+			<view class="width94 paddtop10 font14 fcor333 fontwig6">
+				就餐方式
+			</view>
+			<view class="width94 mart20 paddbotm20 alijusstart">
+				<view class="takemode height30 alijus fcor999" :class="sttypeid == 1?'aftermode':''" @click="changedissr(1)">
+					<image src="../static/imgs/menu3.png" mode="widthFix" class="icon20"></image>
+					<view class="font14  margle10">店内就餐</view>
+				</view>
+				<view class="takemode height30 alijus fcor999" style="margin-left: 4%;" :class="sttypeid == 2?'aftermode':''" @click="changedissr(2)">
+					<image src="../static/imgs/menu2.png" mode="widthFix" class="icon20"></image>
+					<view class="font14  margle10">打包带走</view>
+				</view>
+			</view>
+		</view>
+		
+		
+		<view class="footbtn width100 height50 backcor33">
+			<view class="width94 alijusstart">
+				<view class="width70 fcorfff">
+					合计: ¥<text class="font16 fontwig6" style="margin: 0px 6px;">16.8</text> <text class="font12">已省 ¥1.7</text>
+				</view>
+				<view class="width30 fotrt">
+					<view class="btnpay fotct font13 fcorfff">去支付</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				orderList: [1, 2, 3, 4, 5],
+				sttypeid:1
+			}
+		},
+		methods: {
+			//选择方式
+			changedissr(item){
+				this.sttypeid = item;
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f0f0f0;
+	}
+
+	.headsbg {
+		border-radius: 0 0 30px 30px;
+	}
+
+	.concont {
+		border-radius: 12px;
+	}
+	
+	.footbtn{
+		bottom: 0px;
+		position: fixed;
+	}
+	.btnpay{
+		width: 90px;
+		background-color: #c72a20;
+		border-radius: 22px;
+		height: 36px;
+		line-height: 36px;
+	}
+	.takemode{
+		width: 48%;
+		border-radius: 5px;
+		border: 1px solid #999999;
+	}
+	.aftermode{
+		background-color: #faf1f1;
+		color: #c72a20;
+	}
+</style>
diff --git a/qianzhu-KFC/home/home.vue b/qianzhu-KFC/home/home.vue
index fc82781..4ae60b5 100644
--- a/qianzhu-KFC/home/home.vue
+++ b/qianzhu-KFC/home/home.vue
@@ -6,7 +6,7 @@
 				<view class="fcor666 font20"><text class="fcor333 fontwig6 ">KFC</text>在线点餐</view>
 				<view class="c62a1e font28 mart10 fontwig6">5折起</view>
 				<image class="width80p mart20" mode="widthFix" src="../static/imgs/kfc1.png"></image>
-				<view class="mart15 width90 height30 border-15 fcorfff backcorf062 font13">
+				<view class="mart15 width90 height30 border-15 fcorfff backcorf062 font13"  @click="jumpbuffert()">
 					立即点餐(堂食/外带)
 				</view>
 			</view>
@@ -33,7 +33,14 @@
 
 			}
 		},
-		methods: {
+		methods: {
+			//跳转自助点餐
+			jumpbuffert(){
+				uni.navigateTo({
+					url:'../buffet-order/buffet-order'
+				})
+			},
+			//跳转外卖
 			jumpaddress() {
 				uni.navigateTo({
 					url: '../address/address'
diff --git a/qianzhu-KFC/menu-list/menu-list.vue b/qianzhu-KFC/menu-list/menu-list.vue
new file mode 100644
index 0000000..b4022a1
--- /dev/null
+++ b/qianzhu-KFC/menu-list/menu-list.vue
@@ -0,0 +1,824 @@
+<template>
+	<view class="content">
+		<!-- <view class="width100 height85 backcorfff heads">
+			<view class="paddtop10 width90 alijusstart">
+				<view class="width80p font16 fcor333 fontwig6">
+					<image mode="widthFix" class="icon15 marRight10" src="../static/imgs/shop.png"></image>时代天街
+				</view>
+				<view class="width20 fotrt">
+					<image mode="widthFix" class="icon20" src="../static/imgs/nocollection.png"></image>
+					<image mode="widthFix" class="icon20" src="../static/imgs/collection.png"></image>
+				</view>
+			</view>
+			<view class="width90 mart5 font12 fcor999">前门西大街正阳市场1号楼中部</view>
+		</view> -->
+
+		<scroll-view scroll-y class="left-aside">
+			<view v-for="item in flist" :key="item.id" class="f-item" :class="{active: item.id === currentId}"
+				@click="tabtap(item)">
+				<view class="width100 fotct">
+					<image src="../static/imgs/menu1.png" mode="widthFix" class="icon45"></image>
+				</view>
+				<view class="width100" style="margin-top: -30px;">
+					{{item.name}}
+				</view>
+			</view>
+		</scroll-view>
+
+		<scroll-view scroll-with-animation scroll-y class="right-aside" @scroll="asideScroll"
+			:scroll-top="tabScrollTop">
+			<view v-for="item in slist" :key="item.id" :id="'main-'+item.id">
+				<view class="s-item width90">
+					<text class="promotion_mixg1 backcor99" style="margin-right: -3px;"></text>
+					<text class="promotion_mixg1 backcor66" style="margin-right: -3px;"></text>
+					<text class="promotion_mixg1 backcor33 marglerig"></text>
+					{{item.name}}
+				</view>
+				<view @click="navToList(item.id, titem.id)" v-if="titem.pid === item.id" class="t-list mart10"
+					v-for="titem in tlist" :id="'main-'+item.id" :key="titem.id">
+					<view class="paddtop10 width94 font16 fcor333 fotrt fontwig6 text2">
+						香辣鸡腿堡
+					</view>
+					<view class="width94 alijun mart5">
+						<view class="width60">
+							<image src="../static/imgs/prod1.png" mode="widthFix" class="width100"></image>
+						</view>
+						<view class="width40 fotrt">
+							<view class="width100 font12 colorc3">¥<text class="font18 fontwig6 margle">16.8</text>
+							</view>
+							<view class="width100 font14 mart5 colorc3">已减¥1.7元</view>
+							<view class="width100 font14 mart5 fcor999" style="text-decoration: line-through;">原价¥18.5
+							</view>
+							<view class="mart10 icon-click fotrt">
+								<image class="btn-reduce" mode="widthFix" src="../static/imgs/reduce.png"></image>
+								<view class="num">1</view>
+								<image class="btn-plus" mode="widthFix" src="../static/imgs/plus.png"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+		<shopcart :goods="goods" @add="addCart" @dec="decreaseCart" @input="inputCart" @delAll="delAll"></shopcart>
+	</view>
+</template>
+
+<script>
+	import shopcart from '../../components/shopcart.vue';
+	export default {
+		components: {
+			shopcart
+		},
+		data() {
+			return {
+				sizeCalcState: false,
+				tabScrollTop: 0,
+				currentId: 1,
+				flist: [],
+				slist: [],
+				tlist: [],
+				goods: [{
+						"name": "热销",
+						"foods": [{
+
+								"name": "南瓜粥",
+								"price": 9.22,
+								"oldPrice": "",
+								"description": "食材：大米，南瓜",
+								"sellCount": 229,
+								"img": '../../static/nanguaz.jpg'
+
+							}, {
+								"name": "小米粥",
+								"price": 9.8,
+								"oldPrice": "",
+								"description": "食材：小米",
+								"sellCount": 239,
+								"count": 1,
+								"img": '../../static/xiaomi.jpg'
+
+							},
+							{
+								"name": "油条",
+								"price": 1.88,
+								"oldPrice": "",
+								"description": "食材：油条",
+								"sellCount": 229,
+								"count": 1,
+								"img": '../../static/youtiao.jpg'
+
+							}
+						]
+					},
+					{
+						"name": "折扣",
+						"foods": [{
+							"name": "油条1只",
+							"price": 1.88,
+							"oldPrice": "",
+							"description": "食材：油条",
+							"sellCount": 229,
+							"img": '../../static/youtiao.jpg'
+
+						}, {
+							"name": "艇仔粥",
+							"price": 9.9,
+							"oldPrice": "",
+							"description": "食材：瘦肉，干贝，花生等",
+							"sellCount": 239,
+							"img": '../../static/tingzaiz.jpg'
+
+						}],
+
+					},
+					{
+						"name": "套餐",
+						"foods": [{
+							"name": "油条2只",
+							"price": 1.88,
+							"oldPrice": "",
+							"description": "食材：油条",
+							"sellCount": 229,
+							"img": '../../static/youtiao.jpg'
+
+						}, {
+							"name": "艇仔粥2",
+							"price": 9.9,
+							"oldPrice": "",
+							"description": "食材：瘦肉，干贝，花生等",
+							"sellCount": 239,
+							"img": '../../static/tingzaiz.jpg'
+
+						}],
+
+					},
+					{
+						"name": "套餐2",
+						"foods": [{
+							"name": "油条3只",
+							"price": 1.88,
+							"oldPrice": "",
+							"description": "食材：油条",
+							"sellCount": 229,
+							"img": '../../static/youtiao.jpg'
+
+						}, {
+							"name": "艇仔粥3",
+							"price": 9.9,
+							"oldPrice": "",
+							"description": "食材：瘦肉，干贝，花生等",
+							"sellCount": 239,
+							"img": '../../static/tingzaiz.jpg'
+
+						}],
+
+					},
+					{
+						"name": "热销2",
+						"foods": [{
+							"name": "南瓜粥1",
+							"price": 9.22,
+							"oldPrice": "",
+							"description": "食材：大米，南瓜",
+							"sellCount": 229,
+							"img": '../../static/nanguaz.jpg'
+
+						}, {
+							"name": "小米粥1",
+							"price": 9.8,
+							"oldPrice": "",
+							"description": "食材：小米",
+							"sellCount": 239,
+							"img": '../../static/xiaomi.jpg'
+
+						}]
+					},
+					{
+						"name": "折扣2",
+						"foods": [{
+							"name": "油条4只",
+							"price": 1.88,
+							"oldPrice": "",
+							"description": "食材：油条",
+							"sellCount": 229,
+							"img": '../../static/youtiao.jpg'
+
+						}, {
+							"name": "艇仔粥4",
+							"price": 9.9,
+							"oldPrice": "",
+							"description": "食材：瘦肉，干贝，花生等",
+							"sellCount": 239,
+							"img": '../../static/tingzaiz.jpg'
+
+						}],
+
+					},
+					{
+						"name": "套餐3",
+						"foods": [{
+							"name": "油条5只",
+							"price": 1.88,
+							"oldPrice": "",
+							"description": "食材：油条",
+							"sellCount": 229,
+							"img": '../../static/youtiao.jpg'
+
+						}, {
+							"name": "艇仔粥5",
+							"price": 9.9,
+							"oldPrice": "",
+							"description": "食材：瘦肉，干贝，花生等",
+							"sellCount": 239,
+							"img": '../../static/tingzaiz.jpg'
+
+						}],
+
+					},
+					{
+						"name": "套餐4",
+						"foods": [{
+							"name": "油条6只",
+							"price": 1.81,
+							"oldPrice": "",
+							"description": "食材：油条",
+							"sellCount": 229,
+							"img": '../../static/youtiao.jpg'
+
+						}, {
+							"name": "艇仔粥6",
+							"price": 9.91,
+							"oldPrice": "",
+							"description": "食材：瘦肉，干贝，花生等",
+							"sellCount": 239,
+							"img": '../../static/tingzaiz.jpg'
+
+						}],
+
+					},
+					{
+						"name": "热销3",
+						"foods": [{
+							"name": "南瓜粥3",
+							"price": 9.21,
+							"oldPrice": "",
+							"description": "食材：大米，南瓜",
+							"sellCount": 229,
+							"img": '../../static/nanguaz.jpg'
+
+						}, {
+							"name": "小米粥3",
+							"price": 9.78,
+							"oldPrice": "",
+							"description": "食材：小米",
+							"sellCount": 239,
+							"img": '../../static/xiaomi.jpg'
+
+						}]
+					},
+					{
+						"name": "折扣3",
+						"foods": [{
+							"name": "油条7只",
+							"price": 1.88,
+							"oldPrice": "",
+							"description": "食材：油条",
+							"sellCount": 229,
+							"img": '../../static/youtiao.jpg'
+
+						}, {
+							"name": "艇仔粥7",
+							"price": 9.9,
+							"oldPrice": "",
+							"description": "食材：瘦肉，干贝，花生等",
+							"sellCount": 239,
+							"img": '../../static/tingzaiz.jpg'
+
+						}],
+
+					},
+					{
+						"name": "套餐6",
+						"foods": [{
+							"name": "油条8只",
+							"price": 1.88,
+							"oldPrice": "",
+							"description": "食材：油条",
+							"sellCount": 229,
+							"img": '../../static/youtiao.jpg'
+
+						}, {
+							"name": "艇仔粥8",
+							"price": 9.9,
+							"oldPrice": "",
+							"description": "食材：瘦肉，干贝，花生等",
+							"sellCount": 239,
+							"img": '../../static/tingzaiz.jpg'
+
+						}],
+
+					},
+					{
+						"name": "套餐7",
+						"foods": [{
+							"name": "油条9只",
+							"price": 1.88,
+							"oldPrice": "",
+							"description": "食材：油条",
+							"sellCount": 229,
+							"img": '../../static/youtiao.jpg'
+
+						}, {
+							"name": "艇仔粥9",
+							"price": 9.9,
+							"oldPrice": "",
+							"description": "食材：瘦肉，干贝，花生等",
+							"sellCount": 239,
+							"img": '../../static/tingzaiz.jpg'
+
+						}],
+
+					},
+					{
+						"name": "热销4",
+						"foods": [{
+							"name": "南瓜粥4",
+							"price": 9.22,
+							"oldPrice": "",
+							"description": "食材：大米，南瓜",
+							"sellCount": 229,
+							"img": '../../static/nanguaz.jpg'
+
+						}, {
+							"name": "小米粥4",
+							"price": 9.8,
+							"oldPrice": "",
+							"description": "食材：小米",
+							"sellCount": 239,
+							"img": '../../static/xiaomi.jpg'
+
+						}]
+					},
+					{
+						"name": "折扣4",
+						"foods": [{
+							"name": "油条10只",
+							"price": 1.88,
+							"oldPrice": "",
+							"description": "食材：油条",
+							"sellCount": 229,
+							"img": '../../static/youtiao.jpg'
+
+						}, {
+							"name": "艇仔粥10",
+							"price": 9.9,
+							"oldPrice": "",
+							"description": "食材：瘦肉，干贝，花生等",
+							"sellCount": 239,
+							"img": '../../static/tingzaiz.jpg'
+
+						}],
+
+					},
+
+				],
+				cateList: [{
+						id: 1,
+						name: '手机数码'
+					},
+					{
+						id: 2,
+						name: '礼品鲜花'
+					},
+					{
+						id: 3,
+						name: '男装女装'
+					},
+					{
+						id: 4,
+						name: '母婴用品'
+					},
+					{
+						id: 5,
+						pid: 1,
+						name: '手机通讯'
+					},
+					{
+						id: 6,
+						pid: 1,
+						name: '运营商'
+					},
+					{
+						id: 8,
+						pid: 5,
+						name: '全面屏手机',
+						picture: '/static/temp/cate2.jpg'
+					},
+					{
+						id: 9,
+						pid: 5,
+						name: '游戏手机',
+						picture: '/static/temp/cate3.jpg'
+					},
+					{
+						id: 10,
+						pid: 5,
+						name: '老人机',
+						picture: '/static/temp/cate1.jpg'
+					},
+					{
+						id: 11,
+						pid: 5,
+						name: '拍照手机',
+						picture: '/static/temp/cate4.jpg'
+					},
+					{
+						id: 12,
+						pid: 5,
+						name: '女性手机',
+						picture: '/static/temp/cate5.jpg'
+					},
+					{
+						id: 14,
+						pid: 6,
+						name: '合约机',
+						picture: '/static/temp/cate1.jpg'
+					},
+					{
+						id: 15,
+						pid: 6,
+						name: '选好卡',
+						picture: '/static/temp/cate4.jpg'
+					},
+					{
+						id: 16,
+						pid: 6,
+						name: '办套餐',
+						picture: '/static/temp/cate5.jpg'
+					},
+					{
+						id: 17,
+						pid: 2,
+						name: '礼品',
+					},
+					{
+						id: 18,
+						pid: 2,
+						name: '鲜花',
+					},
+					{
+						id: 19,
+						pid: 17,
+						name: '公益摆件',
+						picture: '/static/temp/cate7.jpg'
+					},
+					{
+						id: 20,
+						pid: 17,
+						name: '创意礼品',
+						picture: '/static/temp/cate8.jpg'
+					},
+					{
+						id: 21,
+						pid: 18,
+						name: '鲜花',
+						picture: '/static/temp/cate9.jpg'
+					},
+					{
+						id: 22,
+						pid: 18,
+						name: '每周一花',
+						picture: '/static/temp/cate10.jpg'
+					},
+					{
+						id: 23,
+						pid: 18,
+						name: '卡通花束',
+						picture: '/static/temp/cate11.jpg'
+					},
+					{
+						id: 24,
+						pid: 18,
+						name: '永生花',
+						picture: '/static/temp/cate12.jpg'
+					},
+					{
+						id: 25,
+						pid: 3,
+						name: '男装'
+					},
+					{
+						id: 26,
+						pid: 3,
+						name: '女装'
+					},
+					{
+						id: 27,
+						pid: 25,
+						name: '男士T恤',
+						picture: '/static/temp/cate13.jpg'
+					},
+					{
+						id: 28,
+						pid: 25,
+						name: '男士外套',
+						picture: '/static/temp/cate14.jpg'
+					},
+					{
+						id: 29,
+						pid: 26,
+						name: '裙装',
+						picture: '/static/temp/cate15.jpg'
+					},
+					{
+						id: 30,
+						pid: 26,
+						name: 'T恤',
+						picture: '/static/temp/cate16.jpg'
+					},
+					{
+						id: 31,
+						pid: 26,
+						name: '上装',
+						picture: '/static/temp/cate15.jpg'
+					},
+					{
+						id: 32,
+						pid: 26,
+						name: '下装',
+						picture: '/static/temp/cate16.jpg'
+					},
+					{
+						id: 33,
+						pid: 4,
+						name: '奶粉',
+					},
+					{
+						id: 34,
+						pid: 4,
+						name: '营养辅食',
+					},
+					{
+						id: 35,
+						pid: 4,
+						name: '童装',
+					},
+					{
+						id: 39,
+						pid: 4,
+						name: '喂养用品',
+					},
+					{
+						id: 36,
+						pid: 33,
+						name: '有机奶粉',
+						picture: '/static/temp/cate17.jpg'
+					},
+					{
+						id: 37,
+						pid: 34,
+						name: '果泥/果汁',
+						picture: '/static/temp/cate18.jpg'
+					},
+					{
+						id: 39,
+						pid: 34,
+						name: '面条/粥',
+						picture: '/static/temp/cate20.jpg'
+					},
+					{
+						id: 42,
+						pid: 35,
+						name: '婴童衣橱',
+						picture: '/static/temp/cate19.jpg'
+					},
+					{
+						id: 43,
+						pid: 39,
+						name: '吸奶器',
+						picture: '/static/temp/cate21.jpg'
+					},
+					{
+						id: 44,
+						pid: 39,
+						name: '儿童餐具',
+						picture: '/static/temp/cate22.jpg'
+					},
+					{
+						id: 45,
+						pid: 39,
+						name: '牙胶安抚',
+						picture: '/static/temp/cate23.jpg'
+					},
+					{
+						id: 46,
+						pid: 39,
+						name: '围兜',
+						picture: '/static/temp/cate24.jpg'
+					},
+				]
+
+			}
+		},
+		onLoad() {
+			this.loadData();
+		},
+		methods: {
+			async loadData() {
+				let list = await this.cateList;
+				list.forEach(item => {
+					if (!item.pid) {
+						this.flist.push(item); //pid为父级id, 没有pid或者pid=0是一级分类
+					} else if (!item.picture) {
+						this.slist.push(item); //没有图的是2级分类
+					} else {
+						this.tlist.push(item); //3级分类
+					}
+				})
+			},
+			//一级分类点击
+			tabtap(item) {
+				if (!this.sizeCalcState) {
+					this.calcSize();
+				}
+
+				this.currentId = item.id;
+				let index = this.slist.findIndex(sitem => sitem.pid == item.id);
+				this.tabScrollTop = this.slist[index].top;
+			},
+			//右侧栏滚动
+			asideScroll(e) {
+				if (!this.sizeCalcState) {
+					this.calcSize();
+				}
+				let scrollTop = e.detail.scrollTop;
+				let tabs = this.slist.filter(item => item.top <= scrollTop).reverse();
+				if (tabs.length > 0) {
+					this.currentId = tabs[0].pid;
+				}
+			},
+			//计算右侧栏每个tab的高度等信息
+			calcSize() {
+				let h = 0;
+				this.slist.forEach(item => {
+					let view = uni.createSelectorQuery().select("#main-" + item.id);
+					view.fields({
+						size: true
+					}, data => {
+						item.top = h;
+						h += data.height;
+						item.bottom = h;
+					}).exec();
+				})
+				this.sizeCalcState = true;
+			},
+			addCart(item) {
+
+			},
+			decreaseCart(item) {
+
+			},
+			inputCart(item) {},
+			// 清空购物车
+			delAll() {
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		height: 100%;
+		background-color: #f8f8f8;
+	}
+
+	.content {
+		display: flex;
+		bottom: 55px;
+	}
+
+	.heads {
+		position: absolute;
+	}
+
+	.icon20 {
+		width: 20px;
+	}
+
+	.icon15 {
+		width: 15px;
+	}
+
+	.icon45 {
+		width: 45px;
+	}
+
+
+	.left-aside {
+		flex-shrink: 0;
+		width: 80px;
+		height: 100%;
+		// margin-top: 85px;
+		background-color: #fff;
+	}
+
+
+	.f-item {
+		display: grid;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: 180upx;
+		padding: 10px 0px;
+		font-size: 24upx;
+		color: #666666;
+		position: relative;
+
+		&.active {
+			background: #f8f8f8;
+		}
+	}
+
+	.right-aside {
+		flex: 1;
+		overflow: hidden;
+		// margin-top: 85px;
+		padding-left: 20upx;
+	}
+
+	.s-item {
+		justify-content: flex-end;
+		align-items: center;
+		display: flex;
+		height: 70upx;
+		padding-top: 8upx;
+		font-size: 28upx;
+		color: #333333;
+
+		.promotion_mixg1 {
+			width: 12px;
+			height: 2px;
+			border-radius: 18px;
+			transform: rotate(125deg);
+		}
+
+
+	}
+
+	.t-list {
+		width: 96%;
+		border-radius: 15px;
+		background: #fff;
+
+		&:after {
+			content: '';
+			flex: 99;
+			height: 0;
+		}
+
+	}
+
+	.icon-click {
+		position: absolute;
+		height: 28px;
+		right: 6%;
+	}
+
+	.btn-reduce {
+		position: absolute;
+		left: 0px;
+		top: 0;
+		width: 28px;
+		height: 28px;
+		z-index: 1;
+
+	}
+
+	.btn-plus {
+		position: absolute;
+		right: 0px;
+		top: 0;
+		width: 28px;
+		height: 28px;
+		z-index: 1;
+	}
+
+	.num {
+		padding: 0px 35px;
+		height: 28px;
+		line-height: 28px;
+		font-weight: 600;
+		color: #fff;
+		background: #d90209;
+		border-radius: 18px;
+	}
+
+	.footbtn {
+		height: 50px;
+		background-color: #000000;
+		display: flex;
+		bottom: 0px;
+	}
+</style>
diff --git a/qianzhu-KFC/order-details/order-details.vue b/qianzhu-KFC/order-details/order-details.vue
new file mode 100644
index 0000000..c3dc09f
--- /dev/null
+++ b/qianzhu-KFC/order-details/order-details.vue
@@ -0,0 +1,156 @@
+<template>
+	<view>
+		<view class="width100 height220 headsbg backcorfff fotct">
+			<view class="height20"></view>
+			<view class="headstu"></view>
+			<view class="width100  font18 colorc72 mart5">待支付</view>
+			<view class="width100  font14 fcor666 mart5">若超时未支付,订单将自动取消</view>
+			<view class="stubtn mart15">立即支付</view>
+		</view>
+		<!-- <view class="width96 mart20 colorc3 font12 fotct">
+			注:约5分钟后取餐,请尽快到餐厅取餐哦
+		</view> -->
+
+		<view class="concont width94 mart10 backcorfff">
+			<view class="width94 paddtop10 font14">
+				餐品明细
+			</view>
+			<view class="width100 bor-botm1 mart10 marb10"></view>
+			<view class="width100">
+				<view class="width100 alijusstart mart10 bor-botm1" v-for="(item,index) in orderList" :key="index">
+					<view class="width30">
+						<image src="../static/imgs/kfc2.png" mode="widthFix" class="width100"></image>
+					</view>
+					<view class="width40 font13 fcor666">香辣鸡腿堡</view>
+					<view class="width10 font12 fcor999">x1</view>
+					<view class="width20">
+						<view class="width100 fcor333 font12">¥<text class="fontwig6 font16">16.8</text></view>
+						<view class="width100 fcor999 font12" style="text-decoration: line-through;">¥17.8</view>
+					</view>
+				</view>
+				<view class="width90 fotrt height50 font13 fcor999">
+					共 <text class="fcor333 fontwig6" style="margin: 0px 5px;"> 1 </text> 件 小计: <text
+						class="font16 colorc3 fontwig6 margle"> ¥16.8</text>
+				</view>
+			</view>
+		</view>
+
+		<view class="concont width94 mart10 backcorfff marb30">
+			<view class="width94 alijusstart paddtop10 font14 fcor666">
+				订单信息
+			</view>
+			<view class="width94 alijusstart mart20 font14 fcor666">
+				<view class="width30">取餐门店</view>
+				<view class="width70 fotrt">时代天街时代天街时代天街时代天街</view>
+			</view>
+			<view class="width94 alijusstart mart20 font14 fcor666">
+				<view class="width30">订单号</view>
+				<view class="width70 fotrt">2901012002828228288482828</view>
+			</view>
+			<view class="width94 alijusstart mart20 font14 fcor666">
+				<view class="width30">就餐方式</view>
+				<view class="width70 fotrt">店内就餐</view>
+			</view>
+			<view class="width94 alijusstart mart20 font14 fcor666">
+				<view class="width30">支付方式</view>
+				<view class="width70 fotrt">未支付</view>
+			</view>
+			<view class="width94 alijusstart mart20 font14 fcor666">
+				<view class="width30">联系方式</view>
+				<view class="width70 fotrt">15583253627</view>
+			</view>
+
+			<view class="width94 alijusend mart20 font14 fcor666 paddbotm20">
+				<view class="canbtn height30 marRight20">取消订单</view>
+				<view class="canbtn height30">联系客服</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				orderList: [1],
+				sttypeid: 1
+			}
+		},
+		methods: {
+			//选择方式
+			changedissr(item) {
+				this.sttypeid = item;
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f0f0f0;
+	}
+
+	.headstu {
+		width: 80px;
+		height: 80px;
+		border-radius: 50%;
+		background-color: #faf1f1;
+		color: #c72a20;
+		margin-left: 40%;
+		border: 1px solid #c72a20;
+	}
+
+	.stubtn {
+		background-color: #c72a20;
+		width: 30%;
+		height: 35px;
+		line-height: 35px;
+		border-radius: 25px;
+		color: #ffffff;
+		margin-left: 35%;
+	}
+
+	.colorc72 {
+		color: #c72a20;
+	}
+
+	.headsbg {
+		border-radius: 0 0 30px 30px;
+	}
+
+	.concont {
+		border-radius: 12px;
+	}
+
+	.footbtn {
+		bottom: 0px;
+		position: fixed;
+	}
+
+	.btnpay {
+		width: 90px;
+		background-color: #c72a20;
+		border-radius: 22px;
+		height: 36px;
+		line-height: 36px;
+	}
+
+	.takemode {
+		width: 48%;
+		border-radius: 5px;
+		border: 1px solid #999999;
+	}
+
+	.aftermode {
+		background-color: #faf1f1;
+		color: #c72a20;
+	}
+
+	.canbtn {
+		border: 1px solid #313131;
+		color: #333333;
+		width: 80px;
+		border-radius: 25px;
+		text-align: center;
+	}
+</style>
diff --git a/qianzhu-KFC/static/imgs/buffstu.png b/qianzhu-KFC/static/imgs/buffstu.png
new file mode 100644
index 0000000..1395bad
Binary files /dev/null and b/qianzhu-KFC/static/imgs/buffstu.png differ
diff --git a/qianzhu-KFC/static/imgs/collection.png b/qianzhu-KFC/static/imgs/collection.png
new file mode 100644
index 0000000..73409d6
Binary files /dev/null and b/qianzhu-KFC/static/imgs/collection.png differ
diff --git a/qianzhu-KFC/static/imgs/kfcicon.png b/qianzhu-KFC/static/imgs/kfcicon.png
new file mode 100644
index 0000000..8b73313
Binary files /dev/null and b/qianzhu-KFC/static/imgs/kfcicon.png differ
diff --git a/qianzhu-KFC/static/imgs/location.png b/qianzhu-KFC/static/imgs/location.png
new file mode 100644
index 0000000..d424e06
Binary files /dev/null and b/qianzhu-KFC/static/imgs/location.png differ
diff --git a/qianzhu-KFC/static/imgs/menu1.png b/qianzhu-KFC/static/imgs/menu1.png
new file mode 100644
index 0000000..2a8e7a9
Binary files /dev/null and b/qianzhu-KFC/static/imgs/menu1.png differ
diff --git a/qianzhu-KFC/static/imgs/menu2.png b/qianzhu-KFC/static/imgs/menu2.png
new file mode 100644
index 0000000..69b6e37
Binary files /dev/null and b/qianzhu-KFC/static/imgs/menu2.png differ
diff --git a/qianzhu-KFC/static/imgs/menu3.png b/qianzhu-KFC/static/imgs/menu3.png
new file mode 100644
index 0000000..4f6d0b1
Binary files /dev/null and b/qianzhu-KFC/static/imgs/menu3.png differ
diff --git a/qianzhu-KFC/static/imgs/nocollection.png b/qianzhu-KFC/static/imgs/nocollection.png
new file mode 100644
index 0000000..5b392e8
Binary files /dev/null and b/qianzhu-KFC/static/imgs/nocollection.png differ
diff --git a/qianzhu-KFC/static/imgs/plus.png b/qianzhu-KFC/static/imgs/plus.png
new file mode 100644
index 0000000..1276939
Binary files /dev/null and b/qianzhu-KFC/static/imgs/plus.png differ
diff --git a/qianzhu-KFC/static/imgs/prod1.png b/qianzhu-KFC/static/imgs/prod1.png
new file mode 100644
index 0000000..ba57bea
Binary files /dev/null and b/qianzhu-KFC/static/imgs/prod1.png differ
diff --git a/qianzhu-KFC/static/imgs/reduce.png b/qianzhu-KFC/static/imgs/reduce.png
new file mode 100644
index 0000000..792e593
Binary files /dev/null and b/qianzhu-KFC/static/imgs/reduce.png differ
diff --git a/qianzhu-KFC/static/imgs/shop.png b/qianzhu-KFC/static/imgs/shop.png
new file mode 100644
index 0000000..edf1b50
Binary files /dev/null and b/qianzhu-KFC/static/imgs/shop.png differ
diff --git a/subPages/addAgent/addAgent.vue b/subPages/addAgent/addAgent.vue
new file mode 100644
index 0000000..0ec8dee
--- /dev/null
+++ b/subPages/addAgent/addAgent.vue
@@ -0,0 +1,169 @@
+<template>
+	<view>
+		<view class="username">
+			<view class="namecont">代理商名称</view>
+			<input placeholder="请输入代理商名称" v-model="agentname" type="text"
+				placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
+		</view>
+		<view class="username">
+			<view class="namecont">手机号</view>
+			<input placeholder="请输入手机号" v-model="agentphone" type="number"
+				placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
+		</view>
+		<view class="username">
+			<view class="namecont">所在地址</view>
+			<input placeholder="请输入所在地址" v-model="agentaddress" type="text"
+				placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
+		</view>
+		<view class="btn mart50" @click="addgent()">提 交</view>
+	</view>
+</template>
+
+<script>
+	import {
+		insertChildAgent
+	} from '../../Utils/Api.js';
+	export default {
+		data() {
+			return {
+				agentname: '', //名称
+				agentphone: '', //电话
+				agentaddress: '' //地址
+			}
+		},
+		methods: {
+			//添加代理商
+			addgent() {
+				let that = this;
+				if (that.agentname == '') {
+					uni.showToast({
+						title: '请填写代理商名称',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				if (that.agentphone == '') {
+					uni.showToast({
+						title: '请填写手机号',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				if (that.agentaddress == '') {
+					uni.showToast({
+						title: '请填写所在地址',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				uni.showModal({
+					title: '添加代理商',
+					content: '确认信息是否正确。',
+					success: function(res) {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '添加中'
+							})
+							let datas = {
+								"agentName": that.agentname,
+								"agentPhone": that.agentphone,
+								"agentAddress": that.agentaddress
+							}
+							insertChildAgent(datas).then(res => {
+								uni.hideLoading();
+								if (res.return_code == '000000') {
+									uni.showToast({
+										title: '添加成功',
+										icon: 'none',
+										duration: 2000,
+										success() {
+											setTimeout(() => {
+												uni.navigateBack({})
+											}, 1500);
+										}
+									})
+									return;
+								}
+								uni.showToast({
+									title: res.return_msg,
+									duration: 2000,
+									icon: 'none'
+								})
+							})
+						}
+					}
+				})
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.username {
+		width: calc(100% - 90upx);
+		height: 100upx;
+		display: flex;
+		align-items: center;
+		background-color: rgba($color: #ffffff, $alpha: 0.1);
+		border-bottom: 1px solid #f6f6f6;
+		padding: 8upx 45upx;
+
+		input {
+			width: 70%;
+			height: 50upx;
+			font-size: 16px;
+			color: #333333;
+			font-weight: blod;
+		}
+
+		.get-code {
+			position: absolute;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			right: 7px;
+			z-index: 3;
+			border: 1px solid #bfbfbf;
+			width: 25%;
+			padding: 3px 5px;
+			border-radius: 22px;
+
+			&:after {
+				content: " ";
+				width: 1upx;
+				height: 50upx;
+				position: absolute;
+				z-index: 3;
+				margin-right: 100%;
+				left: 0;
+				top: 20upx;
+			}
+		}
+
+		.namecont {
+			color: #666666;
+			width: 28%;
+		}
+	}
+
+	.btn {
+		bottom: 0px;
+		position: absolute;
+		color: #FFFFFF;
+		background-color: #0083f5;
+		width: 90%;
+		margin-left: 5%;
+		margin-top: 80rpx;
+		margin-bottom: 50rpx;
+		height: 90rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 45rpx;
+		font-size: 40rpx;
+	}
+</style>
diff --git a/subPages/agentCardList/agentCardList.vue b/subPages/agentCardList/agentCardList.vue
new file mode 100644
index 0000000..3ab9f02
--- /dev/null
+++ b/subPages/agentCardList/agentCardList.vue
@@ -0,0 +1,71 @@
+<template>
+	<view>
+		<view class="alijusstart fotct font14 height40p backcor9 fcor333">
+			<view class="width40">卡券名称</view>
+			<view class="width20">销售价格</view>
+			<view class="width20">库存数量</view>
+			<view class="width20">销售数量</view>
+		</view>
+		
+		<view v-if="agtcardlist == '' " class="mart60 fotct font14 fcor666">
+			<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
+		</view>
+		<view class="width96 alijusstart fotct font14 height45 fcor666 mart5  bor-botm1 marb5" :key="index"
+			v-for="(item,index) in agtcardlist" @click="jumpcarddes(item.id)">
+			<view class="width40">{{item.couponName}}</view>
+			<view class="width20">{{item.salesPrice}}元</view>
+			<view class="width20">{{item.stockCount}}</view>
+			<view class="width20">{{item.salesCount}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getCouponByAgent
+	} from '../../Utils/Api.js';
+	let app = getApp();
+	export default {
+		data() {
+			return {
+				imgadres: 'noorder.png',
+				imagewxUrl: app.globalData.imageWxImg,
+				agtcardlist: [],
+				agentid: ''
+			}
+		},
+		onLoad(options) {
+			this.agentid = options.agid;
+			this.getCouponByAgent();
+		},
+		methods: {
+			//查询卡列表
+			getCouponByAgent() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				let datas = {
+					agentId: this.agentid,
+					pageNum: 1,
+					pageSize: 999
+				}
+				getCouponByAgent(datas).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.agtcardlist = res.return_data.list;
+					}
+				})
+			},
+			//跳转分发记录
+			jumpcarddes(item) {
+				uni.navigateTo({
+					url: '../agentcardsDetails/agentcardsDetails?couponAgentId='+item
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/subPages/agentDistribution/agentDistribution.vue b/subPages/agentDistribution/agentDistribution.vue
new file mode 100644
index 0000000..c0c8cf8
--- /dev/null
+++ b/subPages/agentDistribution/agentDistribution.vue
@@ -0,0 +1,189 @@
+<template>
+	<view>
+		<view class="username paddtop10">
+			<view class="namecont">卡券选择</view>
+			<picker mode="selector" style="width: 74%;" :range="cardList" range-key="couponName" @change="changeUserCard">
+				<view class="date text1" style="padding: 0 25rpx;">{{typeName}}</view>
+			</picker>
+			<image class="flright" style="width: 15px;height: 15px;" src="../../static/img/downj.png"></image>
+		</view>
+		<view class="username">
+			<view class="namecont">库存数量</view>
+			<input v-model="stockCount" type="number" disabled="true"
+				placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
+		</view>
+		<view class="username">
+			<view class="namecont">分配数量</view>
+			<input placeholder="请输入分配数量" v-model="cardnums" type="number"
+				placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
+		</view>
+		<view class="btn mart50" @click="assignCouponChildAgent()">分 发</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getCouponByAgent,
+		assignCouponChildAgent
+	} from '../../Utils/Api.js';
+	let app = getApp();
+	export default {
+		data() {
+			return {
+				cardnums: '', //数量
+				cardList: [], // 卡列表
+				typeName: '', // 卡名称
+				stockCount:'', // 库存数量
+				type: '' ,//区分类型
+				agentid: ''//分发代理商id
+			}
+		},
+		onLoad(options) {
+			this.agentid = options.agentid;
+			this.getCouponByAgent();
+		},
+		methods: {
+			//查询卡列表
+			getCouponByAgent() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				let datas = {
+					agentId: app.globalData.bresthighAgent.id,
+					pageNum: 1,
+					pageSize: 999
+				}
+				getCouponByAgent(datas).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.cardList = res.return_data.list;
+						this.type = res.return_data.list[0].id;
+						this.stockCount = res.return_data.list[0].stockCount;
+						this.typeName = res.return_data.list[0].couponName;
+					}
+				})
+			},
+			//选择卡类型
+			changeUserCard(e) {
+				this.type = this.cardList[e.target.value].id;
+				this.stockCount = this.cardList[e.target.value].stockCount;
+				this.typeName = this.cardList[e.target.value].couponName;
+			},
+			//分配卡券
+			assignCouponChildAgent() {
+				let that = this;
+				if (that.cardnums == '') {
+					uni.showToast({
+						title: '请填写分发数量',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				uni.showModal({
+					title: '分发卡券',
+					content: '确认分发数量、卡券是否正确!',
+					success: function(res) {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '添加中'
+							})
+							let datas = {
+								"couponAgentRelId": that.type,
+								"agentId": that.agentid,
+								"stockCount": that.cardnums
+							}
+							assignCouponChildAgent(datas).then(res => {
+								uni.hideLoading();
+								if (res.return_code == '000000') {
+									uni.showToast({
+										title: '分发成功',
+										icon: 'none',
+										duration: 2000,
+										success() {
+											setTimeout(() => {
+												uni.navigateBack({})
+											}, 1500);
+										}
+									})
+									return;
+								}
+								uni.showToast({
+									title: res.return_msg,
+									duration: 2000,
+									icon: 'none'
+								})
+							})
+						}
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.username {
+		width: calc(100% - 90upx);
+		height: 100upx;
+		display: flex;
+		align-items: center;
+		background-color: rgba($color: #ffffff, $alpha: 0.1);
+		border-bottom: 1px solid #f6f6f6;
+		padding: 8upx 45upx;
+
+		input {
+			width: 50%;
+			height: 50upx;
+			font-size: 16px;
+			color: #333333;
+			font-weight: blod;
+		}
+
+		.get-code {
+			position: absolute;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			right: 7px;
+			z-index: 3;
+			border: 1px solid #bfbfbf;
+			width: 25%;
+			padding: 3px 5px;
+			border-radius: 22px;
+
+			&:after {
+				content: " ";
+				width: 1upx;
+				height: 50upx;
+				position: absolute;
+				z-index: 3;
+				margin-right: 100%;
+				left: 0;
+				top: 20upx;
+			}
+		}
+
+		.namecont {
+			color: #666666;
+			width: 35%;
+		}
+	}
+
+	.btn {
+		bottom: 0px;
+		position: absolute;
+		color: #FFFFFF;
+		background-color: #0083f5;
+		width: 90%;
+		margin-left: 5%;
+		margin-top: 80rpx;
+		margin-bottom: 50rpx;
+		height: 90rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 45rpx;
+		font-size: 40rpx;
+	}
+</style>
diff --git a/subPages/agentcardsDetails/agentcardsDetails.vue b/subPages/agentcardsDetails/agentcardsDetails.vue
new file mode 100644
index 0000000..3a3f1bf
--- /dev/null
+++ b/subPages/agentcardsDetails/agentcardsDetails.vue
@@ -0,0 +1,82 @@
+<template>
+	<view>
+		<view class="alijusstart fotct font14 height40p backcor9 fcor333">
+			<view class="width40">卡券名称</view>
+			<view class="width20">分发数量</view>
+			<view class="width40">分发时间</view>
+		</view>
+		<view v-if="couponcardlistdes == '' " class="mart60 fotct font14 fcor666">
+			<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
+		</view>
+		<view class="width96 alijusstart fotct font14 height45 fcor666 mart5  bor-botm1 marb5" :key="index"
+			v-for="(item,index) in couponcardlistdes">
+			<view class="width40">{{item.couponName}}</view>
+			<view class="width20">{{item.stockCount}}</view>
+			<view class="width40">{{item.createTime | timeFormat('yyyy-mm-dd')}}
+				{{item.createTime | timeFormat('hh:mm')}} </view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getRecordByCouponAgentId
+	} from '../../Utils/Api.js';
+	let app = getApp();
+	export default {
+		data() {
+			return {
+				couponcardlistdes: [],
+				couponAgentId: '',
+				imgadres: 'noorder.png',
+				imagewxUrl: app.globalData.imageWxImg,
+				pageNum: 1,
+				pageSize: 10,
+				isNoMoreData: false
+			}
+		},
+		onLoad(options) {
+			this.couponAgentId = options.couponAgentId;
+			this.getRecordByCouponAgentId();
+		},
+		onReachBottom() {
+			this.getRecordByCouponAgentId();
+		},
+		methods: {
+			//查询卡列表
+			getRecordByCouponAgentId() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					return false;
+				}
+				let pagenum = this.pageNum;
+				let datas = {
+					couponAgentId: this.couponAgentId,
+					pageNum: pagenum,
+					pageSize: this.pageSize
+				}
+				getRecordByCouponAgentId(datas).then(res => {
+					if (res.return_code == '000000' && res.return_data.list != '') {
+						uni.hideLoading();
+						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
+						this.couponcardlistdes = this.couponcardlistdes.concat(res.return_data.list);
+						if (res.return_data.total == (this.pageNum * this.pageSize)) {
+							this.isNoMoreData = true;
+						}
+						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+					} else {
+						this.couponcardlistdes = [];
+						uni.hideLoading()
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/subPages/agenthome/agenthome.vue b/subPages/agenthome/agenthome.vue
new file mode 100644
index 0000000..10ebf73
--- /dev/null
+++ b/subPages/agenthome/agenthome.vue
@@ -0,0 +1,42 @@
+<template>
+	<view>
+		<image class="width35 imgs mart30" mode="widthFix" v-for="(item,index) in agents" :src="item.imgs" :key="index"
+			@click="jumppage(item.url)"></image>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				agents: [{
+					title: '代理商管理',
+					imgs: '../static/agent1.png',
+					url: '../agentmanage/agentmanage'
+				}, {
+					title: '分发卡券',
+					imgs: '../static/agent2.png',
+					url: '/pages/user/minePromotion/minePromotion'
+				}, {
+					title: '修改密码',
+					imgs: '../static/agent3.png',
+					url: '/pages/login/resetpasswd'
+				}]
+			}
+		},
+		methods: {
+			//跳转页面
+			jumppage(item) {
+				uni.navigateTo({
+					url: item
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="less">
+	.imgs {
+		margin-left: 10%;
+	}
+</style>
diff --git a/subPages/agentmanage/agentmanage.vue b/subPages/agentmanage/agentmanage.vue
new file mode 100644
index 0000000..455d382
--- /dev/null
+++ b/subPages/agentmanage/agentmanage.vue
@@ -0,0 +1,181 @@
+<template>
+	<view>
+		<view v-if="agentList == '' " class="mart60 fotct font14 fcor666">
+			<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
+		</view>
+		<view class="list width90 mart15" v-for="(item, index) in agentList" :key="index" @click="jumpcardlist(item.id)">
+			<view class="address-box width90 paddtop15 font16 fcor333">
+				{{item.agentName}}
+			</view>
+			<view class="width90 mart10 font14 fcor999">
+				{{item.agentPhone}}
+			</view>
+			<view class="width90 mart10 bor-botm1"></view>
+			<view class="alijusend width90 mart10 paddbotm10">
+				<view class="btnsstu backcorf06" @click.stop="jumpcardff(item.id)">分发</view>
+				<view class="btnsstu backcolor41"  @click.stop="jumpcardlist(item.id)">查看
+				</view>
+				<view class="btnsstu backcolorred" v-if="item.status == 1" @click.stop="changeAgentStatus(item.id,0)">禁用
+				</view>
+				<view class="btnsstu backcor99" v-if="item.status == 0" @click.stop="changeAgentStatus(item.id,1)">解除
+				</view>
+			</view>
+		</view>
+		<image src='../static/add.png' mode="widthFix" class="h5xfimg" @click="jumpaddagent()"></image>
+	</view>
+</template>
+
+<script>
+	import {
+		getChildAgentList,
+		changeAgentStatus
+	} from '../../Utils/Api.js';
+	let app = getApp();
+	export default {
+		data() {
+			return {
+				agentList: [],
+				imgadres: 'noorder.png',
+				imagewxUrl: app.globalData.imageWxImg,
+				pageNum: 1,
+				pageSize: 10,
+				isNoMoreData: false
+			}
+		},
+		onShow() {
+			this.isNoMoreData = false;
+			this.agentList = [];
+			this.getChildAgentList();
+		},
+		methods: {
+			//跳转详情
+			jumpcardlist(item) {
+				uni.navigateTo({
+					url: '../agentCardList/agentCardList?agid='+item
+				})
+			},
+			//添加代理商
+			jumpaddagent() {
+				uni.navigateTo({
+					url: '../addAgent/addAgent'
+				})
+			},
+			//分发
+			jumpcardff(item) {
+				uni.navigateTo({
+					url: '../agentDistribution/agentDistribution?agentid='+item
+				})
+			},
+			onReachBottom() {
+				this.getChildAgentList();
+			},
+			//查询列表
+			getChildAgentList() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					return false;
+				}
+				let pagenum = this.pageNum;
+				let datas = {
+					agentId: app.globalData.bresthighAgent.id,
+					pageNum: pagenum,
+					pageSize: this.pageSize
+				}
+				getChildAgentList(datas).then(res => {
+					if (res.return_code == '000000' && res.return_data.list != '') {
+						uni.hideLoading();
+						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
+						this.agentList = this.agentList.concat(res.return_data.list);
+						if (res.return_data.total == (this.pageNum * this.pageSize)) {
+							this.isNoMoreData = true;
+						}
+						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+					} else {
+						this.agentList = [];
+						uni.hideLoading()
+					}
+				})
+			},
+			//禁用
+			changeAgentStatus(item,item1) {
+				let that = this;
+				uni.showModal({
+					title: '修改状态',
+					content: '确认解除或者禁用代理商?',
+					success: function(res) {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '操作中...'
+							})
+							let datas = {
+								"agentId": item,
+								"status": item1
+							}
+							changeAgentStatus(datas).then(res => {
+								uni.hideLoading();
+								if (res.return_code == '000000') {
+									uni.showToast({
+										title: '操作成功',
+										icon: 'none',
+										duration: 2000
+									})
+									that.pageNum = 1;
+									that.isNoMoreData = false;
+									that.agentList = [];
+									that.getChildAgentList();
+									return;
+								}
+								uni.showToast({
+									title: res.return_msg,
+									duration: 2000,
+									icon: 'none'
+								})
+							})
+						}
+					}
+				})
+			}
+
+		}
+	}
+</script>
+
+<style lang="less">
+	page {
+		background-color: #f0f0f0;
+	}
+
+	.list {
+		border-radius: 10px;
+		align-items: center;
+		background: #fff;
+	}
+
+
+
+	.address-box {
+		display: flex;
+		align-items: center;
+	}
+
+	.h5xfimg {
+		width: 100rpx;
+		bottom: 120rpx;
+		position: fixed;
+		right: 40rpx;
+	}
+
+	.btnsstu {
+		width: 70px;
+		height: 30px;
+		line-height: 30px;
+		color: #ffffff;
+		font-size: 14px;
+		text-align: center;
+		border-radius: 10px;
+		margin-right: 10px;
+	}
+</style>
diff --git a/subPages/recharge-centre/recharge-centre.vue b/subPages/recharge-centre/recharge-centre.vue
index 244b67e..b1ac4d8 100644
--- a/subPages/recharge-centre/recharge-centre.vue
+++ b/subPages/recharge-centre/recharge-centre.vue
@@ -29,10 +29,10 @@
 			充值说明：
 		</view>
 		<view class="width90 mart20" v-if="current == 0">
-			<image mode="widthFix" :src="imagewxUrl+image2"></image>
+			<image class="width100" mode="widthFix" :src="imagewxUrl+image2"></image>
 		</view>
 		<view class="width90 mart20" v-if="current == 1">
-			<image mode="widthFix" :src="imagewxUrl+image1"></image>
+			<image class="width100" mode="widthFix" :src="imagewxUrl+image1"></image>
 		</view>
 		<view class="height100p"></view>
 		<view class="bombtn width94 font16">
diff --git a/qianzhu-KFC/static/imgs/add.png b/subPages/static/add.png
similarity index 100%
rename from qianzhu-KFC/static/imgs/add.png
rename to subPages/static/add.png
diff --git a/subPages/static/agent1.png b/subPages/static/agent1.png
new file mode 100644
index 0000000..c0f44cd
Binary files /dev/null and b/subPages/static/agent1.png differ
diff --git a/subPages/static/agent2.png b/subPages/static/agent2.png
new file mode 100644
index 0000000..e037d8e
Binary files /dev/null and b/subPages/static/agent2.png differ
diff --git a/subPages/static/agent3.png b/subPages/static/agent3.png
new file mode 100644
index 0000000..11d05f6
Binary files /dev/null and b/subPages/static/agent3.png differ
diff --git a/uni.scss b/uni.scss
index 9e500d1..1915805 100644
--- a/uni.scss
+++ b/uni.scss
@@ -223,6 +223,10 @@ $uni-font-size-paragraph:30upx;
 
 .fcoreb5 {
   color: #eb5823;
+}
+
+.colorc3 {
+	color: #c32b21;
 }
 
 .fcorred{
@@ -243,11 +247,30 @@ $uni-font-size-paragraph:30upx;
 /* 背景颜色 */
 .backcor9 {
   background-color: #f6f6f6;
+}
+
+.backcor99 {
+  background-color: #999999;
+}
+
+.backcor66 {
+  background-color: #666666;
+}
+
+.backcor33 {
+  background-color: #333333;
 }
 
 .backcolorb9 {
 	background-color: #b85958;
-}
+}
+.backcolor41{
+	background-color: #41cda2;
+}
+
+.backcolorred {
+	background-color: red;
+}
 
 .backcolor32 {
 	background-color: #32649d;
@@ -257,10 +280,6 @@ $uni-font-size-paragraph:30upx;
 	background: linear-gradient(to right, #fe1a1a, #ff722e);
 }
 
-.backcor9 {
-  background-color: #f6f6f6;
-}
-
 .backcorf06{
 	background-color: #0083f5;
 }
@@ -311,8 +330,11 @@ $uni-font-size-paragraph:30upx;
 
 .width80p {
   width: 80%;
-}
+}
 
+.width90w {
+  width: 90%;
+}
 
 .width70 {
   width: 70%;
@@ -437,7 +459,9 @@ $uni-font-size-paragraph:30upx;
   height: 80px;
 }
 
-
+.height85 {
+  height: 85px;
+}
 
 .height90 {
   height: 90px;
@@ -573,8 +597,14 @@ $uni-font-size-paragraph:30upx;
 
 .marb65 {
   margin-bottom: 65px;
+}
+
+.marb80 {
+  margin-bottom: 80px;
+}
+.marb100 {
+  margin-bottom: 100px;
 }
-
 .marb50 {
   margin-bottom: 50px;
 }
@@ -769,3 +799,10 @@ $uni-font-size-paragraph:30upx;
 	align-items: center;
 	display: flex;
 }
+.icon20 {
+	width: 20px;
+}
+
+.icon15 {
+	width: 15px;
+}
\ No newline at end of file