diff --git a/high-unionPay/App.vue b/high-unionPay/App.vue
index 315846b..9bff45a 100644
--- a/high-unionPay/App.vue
+++ b/high-unionPay/App.vue
@@ -5,15 +5,15 @@
 			// brestUrl: 'http://192.168.3.4:9302/brest',
 			// imgUrl: 'https://192.168.3.4:9301/filesystem/',
 			//正式
-			// url: 'https://hsg.dctpay.com/crest',
-			// imgUrl: 'https://hsg.dctpay.com/filesystem/',
-			// brestUrl : 'https://hsg.dctpay.com/brest',
-			// imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
+			url: 'https://hsg.dctpay.com/crest',
+			imgUrl: 'https://hsg.dctpay.com/filesystem/',
+			brestUrl : 'https://hsg.dctpay.com/brest',
+			imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
 			//测试
-			url: 'https://hsgcs.dctpay.com/crest',
-			brestUrl : 'https://hsgcs.dctpay.com/brest',
-			imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
-			imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+			// url: 'https://hsgcs.dctpay.com/crest',
+			// brestUrl : 'https://hsgcs.dctpay.com/brest',
+			// imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+			// imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
 			userInfo: "",
 			brestUserInfo : '',
 			openId: '',
diff --git a/high-unionPay/Utils/Api.js b/high-unionPay/Utils/Api.js
index e58a7fd..00db002 100644
--- a/high-unionPay/Utils/Api.js
+++ b/high-unionPay/Utils/Api.js
@@ -103,6 +103,10 @@ export const orderToGoldPay = params => {
 export const getUserGoldRecList = params => {
 	return POST('GET', `${base}/highGoldRec/getUserGoldRecList`, params).then(res => res.data);
 }
+//查询积分7天过期
+export const selectByExpiringSoon = params => {
+	return POST('GET', `${base}/highGoldRec/selectByExpiringSoon`, params).then(res => res.data);
+}
 //获取用户卡券
 export const getUserCouponList = params => {
 	return POST('GET', `${base}/coupon/getUserCouponList`, params).then(res => res.data);
@@ -408,6 +412,27 @@ export const cancelOrderByOrderNo = params => {
 	return POST('GET', `${base}/highOrder/cancelOrderByOrderNo`, params).then(res => res.data);
 }
 
+//分销统计数据
+export const userDistributionStatistics = params => {
+	return POST('GET', `${base}/highUser/userDistributionStatistics`, params).then(res => res.data);
+}
+//邀请列表
+export const distributionInviteList = params => {
+	return POST('GET', `${base}/highUser/distributionInviteList`, params).then(res => res.data);
+}
+//分销用户积分列表
+export const distributionOrderList = params => {
+	return POST('GET', `${base}/highUser/distributionOrderList`, params).then(res => res.data);
+}
+//分销用户积分列表
+export const promoteOrderList = params => {
+	return POST('GET', `${base}/highUser/promoteOrderList`, params).then(res => res.data);
+}
+// 生成海报
+export const promotionalPosters = params => {
+	return POST('GET', `${base}/highUser/promotionalPosters`, params).then(res => res.data);
+}
+
 /**
  * H5 获取用户信息
  */
diff --git a/high-unionPay/pages.json b/high-unionPay/pages.json
index e6aae0c..8fc70c3 100644
--- a/high-unionPay/pages.json
+++ b/high-unionPay/pages.json
@@ -678,6 +678,27 @@
 				}
 			}
 
+		}, {
+			"path": "pages/user/myPromotion/myPromotion",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "我的推广",
+				"backgroundTextStyle": "light",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
+			}
+
+		}, {
+			"path": "pages/user/generatePoster/generatePoster",
+			"style": {
+				"navigationBarTitleText": "查看海报",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
+			}
+
 		}
 	],
 	"subpackages": [{
diff --git a/high-unionPay/pages/goods/recording/recording.vue b/high-unionPay/pages/goods/recording/recording.vue
index d8074d9..c0be178 100644
--- a/high-unionPay/pages/goods/recording/recording.vue
+++ b/high-unionPay/pages/goods/recording/recording.vue
@@ -1,160 +1,187 @@
-<template>
-	<view>
-
-		<view v-if="recordInfo == '' " class="mart60 fotct font14 fcor666">
-			<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
-		</view>
-
-		<view class="width90" v-for="recod in recordInfo" :key="recod.id">
-			<view class="width100 font15 height20 mart10">
-				<view class="flleft width50 fcor666">
-					积分充值
-				</view>
-				<view class="flright width50 fotrt fcorred" v-if="typeId == 1">
-					+{{recod.gold}}
-				</view>
-				<view class="flright width50 fotrt fcorred" v-else>
-					-{{recod.gold}}
-				</view>
-			</view>
-			<view class="width100 fcor999 font14 mart5">
-				{{recod.createTime | formatDate('-')}}
-			</view>
-			<view class="line1f2 mart15"></view>
-		</view>
-		<view class="loading-text">{{ loadingText }}</view>
-	</view>
-</template>
-
-<script>
-	import {
-		getUserGoldRecList
-	} from '../../../Utils/Api.js';
-	let app = getApp();
-	export default {
-		data() {
-			return {
-				typeId: '',
-				recordInfo: [],
-				imagewxUrl: app.globalData.imageWxImg,
-				imgadres:'noorder.png',
-				pageNum: 1,
-				pageSize: 10,
-				isNoMoreData: false,
-				loadingText: ''
-			}
-		},
-		onLoad(option) {
-			this.typeId = option.id;
-			if (this.typeId == 1) {
-				uni.setNavigationBarTitle({
-					title: '充值记录'
-				})
-			} else {
-				uni.setNavigationBarTitle({
-					title: '消费记录'
-				})
-			}
-			this.getUserGoldRecLists();
-		},
-		filters: {
-			//过滤器 用于格式化时间
-			formatDate: function(value, spe = '/') {
-				let data = new Date(value);
-				let year = data.getFullYear();
-				let month = data.getMonth() + 1;
-				let day = data.getDate();
-				let h = data.getHours();
-				let mm = data.getMinutes();
-				let s = data.getSeconds();
-				month = month >= 10 ? month : "0" + month;
-				day = day >= 10 ? day : "0" + day;
-				h = h >= 10 ? h : "0" + h;
-				mm = mm >= 10 ? mm : "0" + mm;
-				s = s >= 10 ? s : "0" + s;
-				return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
-			}
-		},
-		onReachBottom() {
-			this.getUserGoldRecLists();
-		},
-		methods: {
-			getUserGoldRecLists() {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				if (this.isNoMoreData) {
-					uni.hideLoading()
-					this.loadingText = '到底了';
-					return false;
-				}
-				let pagenum = this.pageNum;
-				let params = {
-					pageNum: pagenum,
-					goldType: this.typeId,
-					pageSize: this.pageSize
-				}
-				getUserGoldRecList(params).then(res => {
-					if (res.return_code == '000000') {
-						uni.hideLoading();
-						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
-						if(res.return_data.total == (this.pageNum * this.pageSize)){
-							this.isNoMoreData = true;
-						}
-						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
-						this.recordInfo = this.recordInfo.concat(res.return_data.list);
-					} else {
-						this.recordInfo = [];
-						uni.hideLoading()
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background-color: #f8f8f9;
-	}
-
-	.loading-text {
-		width: 100%;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 60upx;
-		color: #979797;
-		font-size: 24upx;
-	}
-
-	.bordr {
-		border-top: 1px solid #fcfcfc;
-	}
-
-	.height60 {
-		height: 60px;
-		line-height: 60px;
-	}
-
-	.pictime {
-		margin-left: 20px;
-	}
-
-	.arrow {
-		width: 8px;
-		height: 8px;
-		border-top: 2px solid #999;
-		border-right: 2px solid #999;
-		position: absolute;
-		left: 30%;
-		top: 22px;
-		transform: rotate(135deg);
-	}
-
-	.line1f2 {
-		width: 100%;
-		height: 1px;
-		background-color: #f2f2f2;
-	}
+<template>
+	<view>
+
+		<!-- 	<view v-if="recordInfo == '' " class="mart60 fotct font14 fcor666">
+			<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
+		</view>
+ -->
+		<view class="width94 backcorfff mart20" style="border-radius: 8px;">
+			<view class="width94 alijus fotct font16 fcor333 paddtop20">
+				<view class="width50" @click="changestu(1)">积分收支明细</view>
+				<view class="width50" @click="changestu(2)">7天即将过期积分</view>
+			</view>
+			<view class="width94  paddtop15">
+				<view class="width50 flleft fotct" v-if="typeId == 1">
+					<view class="width40w" style="height: 2px;background-color: red;"></view>
+				</view>
+				<view class="width50 flright fotct" v-if="typeId == 2">
+					<view class="width40w" style="height: 2px;background-color: red;"></view>
+				</view>
+			</view>
+			<view class="width100 line1 marb20"></view>
+			<view v-if="recordInfo ==  null " class="mart60 fotct font14 fcor666">
+				<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
+			</view>
+			<view class="width100" v-for="recod in recordInfo" :key="recod.id">
+				<view class="width94 font16 mart10 alijusstart">
+					<view class="width70">
+						<view class="fcor666" v-if="recod.remark">
+							{{recod.remark}}
+						</view>
+						<view class="fcor666" v-else>
+							暂无
+						</view>
+						<view class="fcor999 font13 mart10">
+							{{recod.createTime | formatDate('-')}}
+						</view>
+					</view>
+					<view class="width30">
+						<view class="font20 fotrt fcorred" v-if="recod.goldType == 1">
+							+{{recod.gold}}
+						</view>
+						<view class=" font20 fotrt fcor41c" v-else>
+							-{{recod.gold}}
+						</view>
+					</view>
+				</view>
+				<view class="line1f2 mart10"></view>
+			</view>
+		</view>
+		<view class="height60"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		getUserGoldRecList,
+		selectByExpiringSoon
+	} from '../../../Utils/Api.js';
+	let app = getApp();
+	export default {
+		data() {
+			return {
+				typeId: 1,
+				recordInfo: [],
+				imagewxUrl: app.globalData.imageWxImg,
+				imgadres: 'noorder.png',
+				pageNum: 1,
+				pageSize: 10,
+				isNoMoreData: false,
+			}
+		},
+		onLoad(option) {
+
+			this.getUserGoldRecLists();
+		},
+		filters: {
+			//过滤器 用于格式化时间
+			formatDate: function(value, spe = '/') {
+				let data = new Date(value);
+				let year = data.getFullYear();
+				let month = data.getMonth() + 1;
+				let day = data.getDate();
+				let h = data.getHours();
+				let mm = data.getMinutes();
+				let s = data.getSeconds();
+				month = month >= 10 ? month : "0" + month;
+				day = day >= 10 ? day : "0" + day;
+				h = h >= 10 ? h : "0" + h;
+				mm = mm >= 10 ? mm : "0" + mm;
+				s = s >= 10 ? s : "0" + s;
+				return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
+			}
+		},
+		onReachBottom() {
+			this.getUserGoldRecLists();
+		},
+		methods: {
+			//切换状态
+			changestu(item) {
+				this.typeId = item;
+				if (item == 1) {
+					this.isNoMoreData = false;
+					this.pageNum = 1;
+					this.recordInfo = [];
+					this.getUserGoldRecLists();
+				} else {
+					this.recordInfo = [];
+					this.selectByExpiringSoon();
+				}
+			},
+			//查询积分情况
+			getUserGoldRecLists() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					return false;
+				}
+				let pagenum = this.pageNum;
+				let params = {
+					pageNum: pagenum,
+					pageSize: this.pageSize
+				}
+				getUserGoldRecList(params).then(res => {
+					if (res.return_code == '000000') {
+						uni.hideLoading();
+						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
+						if (res.return_data.total == (this.pageNum * this.pageSize)) {
+							this.isNoMoreData = true;
+						}
+						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+						this.recordInfo = this.recordInfo.concat(res.return_data.list);
+					} else {
+						this.recordInfo = [];
+						uni.hideLoading()
+					}
+				})
+			},
+			//查询积分情况
+			selectByExpiringSoon() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				selectByExpiringSoon().then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.recordInfo = res.return_data.list;
+					} else {
+						this.recordInfo = [];
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f6f6f6;
+	}
+
+	.bordr {
+		border-top: 1px solid #fcfcfc;
+	}
+
+	.pictime {
+		margin-left: 20px;
+	}
+
+	.arrow {
+		width: 8px;
+		height: 8px;
+		border-top: 2px solid #999;
+		border-right: 2px solid #999;
+		position: absolute;
+		left: 30%;
+		top: 22px;
+		transform: rotate(135deg);
+	}
+
+	.line1f2 {
+		width: 100%;
+		height: 1px;
+		background-color: #f2f2f2;
+	}
 </style>
diff --git a/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue b/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
index 16b8a21..27f7ca0 100644
--- a/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -266,7 +266,7 @@
 		},
 		onShow() {
 			let that = this;
-			that.paytype = '';
+			// that.paytype = '';
 			that.findUser();
 		},
 		methods: {
diff --git a/high-unionPay/pages/goods/refuel-details/refuel-details.vue b/high-unionPay/pages/goods/refuel-details/refuel-details.vue
index 5c699f9..d90e125 100644
--- a/high-unionPay/pages/goods/refuel-details/refuel-details.vue
+++ b/high-unionPay/pages/goods/refuel-details/refuel-details.vue
@@ -71,7 +71,16 @@
 				style="border-left: 1px solid #f2f2f2;line-height: 40px;">
 				约{{oilLiters}}L
 			</view>
-		</view>
+		</view>
+		
+		<view class="list width90">
+			<view class="box" v-for="(amount,index) in amountList" :key="index" @click="select(amount)"
+				:class="{'on':amount.codeValue == inputMoney}">
+				<view class="heTitle fcor333 paddtop10" :class="{'colorfe80':amount.codeValue == inputMoney}">{{amount.codeValue}}元</view>
+				<view class="width100 font12 fcor333 mart5" :class="{'colorfe80':amount.codeValue == inputMoney}">最高优惠¥{{amount.codeName}}</view>
+			</view>
+		</view>
+		
 		<view class="line10 mart15"></view>
 		<view class="width90 height40">
 			<view class="flleft width50 font15 fcor666">平台补贴:
@@ -140,7 +149,8 @@
 <script>
 	import {
 		getGasDetailByStoreKey,
-		addOrder,
+		addOrder,
+		getDictionaryByCodeType,
 		getDictionaryByCodeTypeOl,
 		oilPriceDiscountCompute
 	} from '../../../Utils/Api.js';
@@ -160,22 +170,23 @@
 				detailList: [],
 				gunnumber: [],
 				user: '',
-				amountList: [{
-						id: '1',
-						price: '200'
-					},
-					{
-						id: '2',
-						price: '300'
-					},
-					{
-						id: '3',
-						price: '400'
-					},
-					{
-						id: '4',
-						price: '500'
-					}
+				amountList: [
+					// {
+					// 	id: '1',
+					// 	price: '200'
+					// },
+					// {
+					// 	id: '2',
+					// 	price: '300'
+					// },
+					// {
+					// 	id: '3',
+					// 	price: '400'
+					// },
+					// {
+					// 	id: '4',
+					// 	price: '500'
+					// }
 				],
 				inputAmount: '',
 				store_key: '',
@@ -210,12 +221,24 @@
 			this.oilNo = options.oilNo;
 			this.getGasDetailByStoreKey();
 			this.getDictionaryByCodeTypeOl();
-			this.getDictionaryByCodeTypeMoney();
+			this.getDictionaryByCodeTypeMoney();
+			this.getDictionaryByCodeType();
 		},
 		onShow() {
 			this.user = app.globalData.userInfo;
 		},
-		methods: {
+		methods: {
+			//查询油品
+			getDictionaryByCodeType() {
+				let datas = {
+					codeType: 'REFUEL_PRICE'
+				}
+				getDictionaryByCodeType(datas).then(res => {
+					if (res.return_code == '000000') {
+						this.amountList = res.return_data;
+					}
+				})
+			},
 			//前往导航
 			seeloaction() {
 				uni.openLocation({
@@ -231,7 +254,8 @@
 				this.$refs.popup.show();
 			},
 			//查询详情
-			getGasDetailByStoreKey() {
+			getGasDetailByStoreKey() {
+				this.gunnumber = [];
 				uni.showLoading({
 					title: '加载中...'
 				})
@@ -244,19 +268,29 @@
 					uni.hideLoading();
 					if (res.return_code == '000000') {
 						this.storeList = res.return_data;
-						if (!this.oilNo) {
-							this.oilNo = res.return_data.oilPriceList[0].oilNoName;
+						// if (!this.oilNo) {
+						// 	this.oilNo = res.return_data.oilPriceList[0].oilNoName;
+						// }else{
+						let oillist = res.return_data.oilPriceList;
+						for (var i = 0; i < oillist.length; i++) {
+							if (this.oilNo == oillist[i].oilNoName) {
+								this.priceVip = oillist[i].priceVip;
+								this.priceGun = oillist[i].priceGun;
+								this.priceOfficial = oillist[i].priceOfficial;
+								this.oilType = oillist[i].oilType;
+							}
 						}
-						this.priceVip = res.return_data.oilPriceList[0].priceVip;
-						this.priceGun = res.return_data.oilPriceList[0].priceGun;
-						this.priceOfficial = res.return_data.oilPriceList[0].priceOfficial;
+						// }
+						// this.priceVip = res.return_data.oilPriceList[0].priceVip;
+						// this.priceGun = res.return_data.oilPriceList[0].priceGun;
+						// this.priceOfficial = res.return_data.oilPriceList[0].priceOfficial;
 						this.detailList = res.return_data.oilPriceList;
-						this.oilType = res.return_data.oilPriceList[0].oilType;
+						// this.oilType = res.return_data.oilPriceList[0].oilType;
 						this.gasGunList = res.return_data.gasGunList;
 						for (var i = 0; i < res.return_data.gasGunList.length; i++) {
 							if (this.oilNo == res.return_data.gasGunList[i].oilNoName) {
 								this.gunnumber.push(res.return_data.gasGunList[i])
-								this.gunNo = res.return_data.gasGunList[i].gunNo;
+								// this.gunNo = res.return_data.gasGunList[i].gunNo;
 								this.gasOilNo = res.return_data.gasGunList[i].oilNo;
 							}
 						}
@@ -303,7 +337,7 @@
 				for (var i = 0; i < this.gasGunList.length; i++) {
 					if (this.oilNo == this.gasGunList[i].oilNoName) {
 						this.gunnumber.push(this.gasGunList[i])
-						this.gunNo = this.gasGunList[i].gunNo;
+						// this.gunNo = this.gasGunList[i].gunNo;
 						this.gasOilNo = this.gasGunList[i].oilNo;
 					}
 				}
@@ -337,15 +371,17 @@
 				// this.totalPreferences = '0';
 				this.$refs.popup.hide();
 			},
-			// select(amount) {
-			// 	this.inputMoney = amount.price;
-			// 	this.litre = parseFloat(amount.price / this.priceGun).toFixed(2);
-			// 	this.totalPrice = parseFloat(amount.price / this.priceGun * this.priceVip).toFixed(2);
-			// 	if (this.priceVip != this.priceGun) {
-			// 		let gbprice = parseFloat(this.litre * this.priceOfficial).toFixed(2);
-			// 		this.discountPrice = parseFloat(gbprice - this.inputMoney).toFixed(2);
-			// 	}
-			// },
+			select(amount) {
+				// this.inputMoney = amount.price;
+				// this.litre = parseFloat(amount.price / this.priceGun).toFixed(2);
+				// this.totalPrice = parseFloat(amount.price / this.priceGun * this.priceVip).toFixed(2);
+				// if (this.priceVip != this.priceGun) {
+				// 	let gbprice = parseFloat(this.litre * this.priceOfficial).toFixed(2);
+				// 	this.discountPrice = parseFloat(gbprice - this.inputMoney).toFixed(2);
+				// }
+				this.inputMoney = amount.codeValue;
+				this.oilPriceDiscountCompute();
+			},
 			// H5获取手机号
 			jumpH5Bding() {
 				uni.navigateTo({
@@ -442,14 +478,24 @@
 			 * 定位
 			 */
 			postionIng() {
-				let that = this;
-				if (that.inputMoney == '' || that.inputMoney < 10) {
+				let that = this;
+				var c = /^([1-9][0-9]*)+(\.[0-9]{1,2})?$/;
+				if (that.inputMoney == '' || that.inputMoney < 10 || !(c.test(this.inputMoney))) {
 					uni.showToast({
 						title: '请输入正确金额',
 						icon: "none",
 						duration: 2000
 					});
 					return;
+				}
+				
+				if (this.gunNo == '') {
+					uni.showToast({
+						title: '请选择枪号',
+						icon: "none",
+						duration: 2000
+					});
+					return;
 				}
 				uni.getLocation({
 					type: 'wgs84',
@@ -606,44 +652,43 @@
 		border-right: 1px solid #f4f4f4;
 	}
 
-	.list {
-		display: flow-root;
-		justify-content: space-between;
-		padding: 20upx 0;
-
-		.box {
-			width: 30%;
-			margin-right: 2%;
-			margin-top: 20upx;
-			float: left;
-			height: 120upx;
-			line-height: 120upx;
-			// display: flex;
-			justify-content: center;
-			align-items: center;
-			text-align: center;
-			border-radius: 10upx;
-			box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.05);
-			font-size: 36upx;
-			color: #666666;
-			border: 1px solid #f2f2f2;
-
-			&.on {
-				// background-color: #089bf5;
-				border: 1px solid #089bf5;
-			}
-		}
-
-		.heTitle {
-			width: 100%;
-			font-size: 16px;
-		}
-
-		.mitext {
-			margin-top: 10upx;
-			width: 100%;
-			font-size: 12px;
-		}
+	.list {
+		display: flow-root;
+		justify-content: space-between;
+		padding: 20upx 0;
+	
+		.box {
+			width: 30%;
+			margin-right: 2%;
+			margin-top: 20upx;
+			float: left;
+			height: 130upx;
+			// display: flex;
+			justify-content: center;
+			align-items: center;
+			text-align: center;
+			border-radius: 10upx;
+			box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.05);
+			font-size: 36upx;
+			color: #666666;
+			border: 1px solid #f2f2f2;
+	
+			&.on {
+				// background-color: #089bf5;
+				border: 1px solid #089bf5;
+			}
+		}
+	
+		.heTitle {
+			width: 100%;
+			font-size: 16px;
+		}
+	
+		.mitext {
+			margin-top: 10upx;
+			width: 100%;
+			font-size: 12px;
+		}
 	}
 
 	.footer {
diff --git a/high-unionPay/pages/tabBar/user/user.vue b/high-unionPay/pages/tabBar/user/user.vue
index 6f8808e..42bd382 100644
--- a/high-unionPay/pages/tabBar/user/user.vue
+++ b/high-unionPay/pages/tabBar/user/user.vue
@@ -77,9 +77,9 @@
 						<uni-badge  text="1" type="error" />
 					</view> -->
 
-					<uni-badge style="width: 20px;position: absolute; right: 30%;" v-if="row.text == '我的卡券' && textnum "
+					<uni-badge style="width: 20px;position: absolute; right: 55%;" v-if="row.text == '我的卡券' && textnum "
 						:text="textnum" type="error" size="normal"></uni-badge>
-					<uni-badge style="width: 20px;position: absolute; right: 7%;"
+					<uni-badge style="width: 20px;position: absolute; right: 30%;"
 						v-if="row.text == '我的优惠券' && textSend " :text="textSend" type="error" size="normal"></uni-badge>
 					<view class="img">
 						<image :src="imagewxUrl+row.img"></image>
@@ -193,15 +193,16 @@
 				],
 				// 工具栏列表
 				mytoolbarList: [{
-						url: '/pages/goods/recording/recording?id=1',
-						text: '充值记录',
+						url: '/pages/goods/recording/recording',
+						text: '积分记录',
 						img: 'user/mingxi.png'
-					},
-					{
-						url: '/pages/goods/recording/recording?id=2',
-						text: '消费记录',
-						img: 'user/quan.png'
-					},
+					},
+					// ,
+					// {
+					// 	url: '/pages/goods/recording/recording?id=2',
+					// 	text: '消费记录',
+					// 	img: 'user/quan.png'
+					// },
 					{
 						url: '/pages/user/mineCoupons/mineCoupons',
 						text: '我的卡券',
@@ -211,7 +212,18 @@
 						url: '../../user/coupon/coupon',
 						text: '我的优惠券',
 						img: 'user/momey.png'
-					}
+					},
+					{
+						url: '/pages/user/myPromotion/myPromotion',
+						text: '我的推广',
+						img: 'user/extension.png'
+					}
+					// ,
+					// {
+					// 	url: '/pages/user/generatePoster/generatePoster',
+					// 	text: '生成海报',
+					// 	img: 'user/poster.png'
+					// }
 				],
 				//操作列表
 				czList: '',
@@ -791,7 +803,7 @@
 
 			.box {
 				width: 25%;
-				margin-bottom: 30upx;
+				margin-bottom: 40upx;
 
 				.img {
 					width: 23vw;
diff --git a/high-unionPay/pages/user/generatePoster/generatePoster.vue b/high-unionPay/pages/user/generatePoster/generatePoster.vue
new file mode 100644
index 0000000..14f21b5
--- /dev/null
+++ b/high-unionPay/pages/user/generatePoster/generatePoster.vue
@@ -0,0 +1,43 @@
+<template>
+	<view>
+		<image :src="imgs" mode="widthFix" class="width90 mart15"></image>
+	</view>
+</template>
+
+<script>
+	import {
+		promotionalPosters
+	} from '../../../Utils/Api.js';
+	export default {
+		data() {
+			return {
+				imgs: ''
+			}
+		},
+		onLoad() {
+			this.promotionalPosters();
+		},
+		methods: {
+			promotionalPosters() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				promotionalPosters().then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.imgs = res.return_data;
+						// uni.showToast({
+						// 	title: "请截图保存至手机相册",
+						// 	icon: "none",
+						// 	duration: 3000
+						// });
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/high-unionPay/pages/user/myPromotion/myPromotion.vue b/high-unionPay/pages/user/myPromotion/myPromotion.vue
new file mode 100644
index 0000000..a9b30b6
--- /dev/null
+++ b/high-unionPay/pages/user/myPromotion/myPromotion.vue
@@ -0,0 +1,291 @@
+<template>
+	<view>
+		<image src="../../../static/img/user/1.png" class="width100 images"></image>
+		<view class="width100 font16 fcorfff title fotct paddtop15">今日积分收入</view>
+		<view class="width100 font48 fcorfff title fotct paddtop15">
+			{{ !distribution.toDayIntegralNum ? 0 : distribution.toDayIntegralNum}}
+		</view>
+		<view class="title paddtop15 alijus fcorfff  fotct">
+			<view class="width30w ">
+				<view class="width100 font14">邀请人数</view>
+				<view class="width100 font18 paddtop5">
+					{{ !distribution.inviteeNum ? 0 : distribution.inviteeNum}}
+				</view>
+			</view>
+			<view class="backcorfff" style="width: 1px;height: 50px;"></view>
+			<view class="width30w">
+				<view class="width100 font14">积分收入</view>
+				<view class="width100 font18 paddtop5">
+					{{ !distribution.integralIncome ? 0 : distribution.integralIncome}}
+				</view>
+			</view>
+			<view class="backcorfff" style="width: 1px;height: 50px;"></view>
+			<view class="width30w">
+				<view class="width100 font14">积分笔数</view>
+				<view class="width100 font18 paddtop5">{{ !distribution.orderCount ? 0 : distribution.orderCount}}
+				</view>
+			</view>
+		</view>
+		<view class="font14 width20w fcorfff title fotct mart10"
+			style="padding: 3px 5px;border-radius: 15px;border: 1px solid;" @click="jumpmypro()">我的邀请码</view>
+
+		<view class="width90 mart40 alijus ">
+			<view class="font14 fcor666 paddtop5 paddbotm5  margle20  marRight20" v-for="(item,index) in cateTypeList"
+				@click="switchid(item)" :class="[goodtyid == item.id ? 'fon62ac borbtom fontwig6 font16' : '']"
+				:key="index">
+				{{item.title}}
+			</view>
+		</view>
+
+		<view class="alijus width90 fotct mart20 font14 fcor666" v-if="goodtyid == 1">
+			<view class="width30w fotlt">
+				名称
+			</view>
+			<view class="width30w">
+				电话
+			</view>
+			<view class="width30w">
+				邀请时间
+			</view>
+		</view>
+		<view class="width100" v-if="goodtyid == 1">
+			<view v-if="dataslist == '' " class="mart60 fotct font14 fcor666">
+				<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
+			</view>
+			<view class="alijus width90 fotct mart15 font14 fcor999" v-for="(item,index) in dataslist" :key="index">
+				<view class="width30w fotlt">
+					{{item.userName}}
+				</view>
+				<view class="width30w fotlt">
+					{{item.phone}}
+				</view>
+				<view class="width30w">
+					{{item.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
+				</view>
+			</view>
+		</view>
+
+		<view class="width100" v-if="goodtyid == 2">
+			<view v-if="integralList == '' " class="mart60 fotct font14 fcor666">
+				<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
+			</view>
+			<view class="alijus width94 mart15 font14 fcor999" v-for="(item,index) in integralList" :key="index">
+				<image :src="imageUrl+item.ext1" class="icon40" mode="widthFix"></image>
+				<view class="width85 bor-botm1">
+					<view class="width100 alijusstart">
+						<view class="width70 fcor333 paddleft10">{{item.title}}</view>
+						<view class="width30 fcor333 fontwig6 font20 fotrt">+{{item.integralNum}}</view>
+					</view>
+					<view class="width100 fcor999 font13 paddleft10 paddbotm5">
+						{{item.ext3}} | {{item.userName}}
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="width100" v-if="goodtyid == 3">
+			<view v-if="distrOrderList == '' " class="mart60 fotct font14 fcor666">
+				<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
+			</view>
+			<view class="alijus width100 mart15 font14 fcor999" v-for="(item,index) in distrOrderList" :key="index">
+				<view class="width100 bor-botm1 paddleft5 paddtright10">
+					<view class="width100 alijusstart">
+						<view class="width70 fcor333 paddleft10">{{item.goodsTypeName}}</view>
+						<view class="width30 fcor333 fontwig6 font20 fotrt">¥{{item.totalPrice}}</view>
+					</view>
+					<view class="width100 fcor999 font13 paddleft10 paddbotm5">
+						{{item.time}} ｜ {{item.memName}}
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="height45"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		userDistributionStatistics,
+		distributionInviteList,
+		distributionOrderList,
+		promoteOrderList
+	} from '../../../Utils/Api.js'
+	let app = getApp();
+	export default {
+		data() {
+			return {
+				imagewxUrl: app.globalData.imageWxImg,
+				imageUrl:app.globalData.imgUrl,
+				imgadres: 'noorder.png',
+				cateTypeList: [{
+						id: 1,
+						title: '邀请列表'
+					},
+					{
+						id: 2,
+						title: '积分记录'
+					}, {
+						id: 3,
+						title: '推广记录'
+					},
+				],
+				goodtyid: 1, //区分类型
+				dataslist: [], //邀请列表
+				distrOrderList: [], //订单列表
+				distribution: '', //统计
+				integralList: [], //积分数据
+				pageNum: 1,
+				pageSize: 10,
+				isNoMoreData: false,
+			}
+		},
+		onLoad() {
+			this.userDistributionStatistics();
+			this.distributionInviteList();
+		},
+		methods: {
+			//跳转到生成海报
+			jumpmypro() {
+				uni.navigateTo({
+					url: '/pages/user/generatePoster/generatePoster'
+				})
+			},
+			//切换id
+			switchid(item) {
+				this.goodtyid = item.id;
+				if (item.id == 1) {
+					this.pageNum = 1;
+					this.dataslist = [];
+					this.isNoMoreData = false;
+					this.distributionInviteList();
+				} else if (item.id == 2) {
+					this.pageNum = 1;
+					this.integralList = [];
+					this.isNoMoreData = false;
+					this.distributionOrderList();
+				} else if (item.id == 3) {
+					this.pageNum = 1;
+					this.distrOrderList = [];
+					this.isNoMoreData = false;
+					this.promoteOrderList();
+				}
+			},
+			//分销统计
+			userDistributionStatistics() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				userDistributionStatistics().then(res => {
+					if (res.return_code == '000000') {
+						this.distribution = res.return_data;
+						uni.hideLoading();
+					}
+				})
+			},
+			//邀请列表
+			distributionInviteList() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading();
+					return false;
+				}
+				let pagenum = this.pageNum;
+				let params = {
+					pageNum: pagenum,
+					pageSize: this.pageSize,
+				}
+				distributionInviteList(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
+						this.dataslist = this.dataslist.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.dataslist = [];
+					}
+				})
+			},
+			// 分销用户积分
+			distributionOrderList() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					return false;
+				}
+				let pagenum = this.pageNum;
+				let params = {
+					pageNum: pagenum,
+					pageSize: this.pageSize,
+				}
+				distributionOrderList(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
+						this.integralList = this.integralList.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.integralList = [];
+					}
+				})
+			},
+			//分销用户订单列表
+			promoteOrderList() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					return false;
+				}
+				let pagenum = this.pageNum;
+				let params = {
+					pageNum: pagenum,
+					pageSize: this.pageSize,
+				}
+				promoteOrderList(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
+						this.distrOrderList = this.distrOrderList.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.distrOrderList = [];
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.images {
+		position: absolute;
+		height: 235px;
+	}
+
+	.title {
+		position: relative;
+	}
+
+	.borbtom {
+		border-bottom: 3px solid #62ac4e;
+	}
+
+	.fon62ac {
+		color: #62ac4e;
+	}
+</style>
diff --git a/high-unionPay/pages/user/order_list/order_list.vue b/high-unionPay/pages/user/order_list/order_list.vue
index 93c5e6d..3198c43 100644
--- a/high-unionPay/pages/user/order_list/order_list.vue
+++ b/high-unionPay/pages/user/order_list/order_list.vue
@@ -14,61 +14,61 @@
 				</view>
 				<view class="row" v-for="(row,index) in orderList" :key="index">
 					<view class="width96 height40" @click="jumpDetails(row.highChildOrderList[0].goodsType,row.id)">
-						<view class="width50 flleft aliitem fotlt font16"
+						<view class="width40 flleft aliitem fotlt font16"
 							v-if="row.highChildOrderList[0].goodsType == 1">
 							<image src="../../../static/img/order2.png" class="marglerig"
 								style="width: 50rpx;height: 50rpx;"></image>
 							卡券订单
 						</view>
-						<view class="width50 flleft aliitem fotlt font16"
+						<view class="width40 flleft aliitem fotlt font16"
 							v-if="row.highChildOrderList[0].goodsType == 2">
 							<image src="../../../static/img/order2.png" class="marglerig"
 								style="width: 50rpx;height: 50rpx;"></image>
 							积分充值
 						</view>
-						<view class="width50 flleft aliitem fotlt font16"
+						<view class="width40 flleft aliitem fotlt font16"
 							v-if="row.highChildOrderList[0].goodsType == 7">
 							<image src="../../../static/img/order9.png" class="marglerig"
 								style="width: 50rpx;height: 50rpx;"></image>
 							优惠券包
 						</view>
-						<view class="width50 flleft aliitem fotlt font16"
+						<view class="width40 flleft aliitem fotlt font16"
 							v-if="row.highChildOrderList[0].goodsType == 3">
 							<image src="../../../static/img/order4.png" class="marglerig"
 								style="width: 50rpx;height: 50rpx;"></image>
-							团油订单
+							加油订单
 						</view>
-						<view class="width50 flleft aliitem fotlt font16"
+						<view class="width40 flleft aliitem fotlt font16"
 							v-if="row.highChildOrderList[0].goodsType == 5">
 							<image src="../../../static/img/order5.png" class="marglerig"
 								style="width: 50rpx;height: 50rpx;"></image>
 							电影票
 						</view>
-						<view class="width50 flleft aliitem fotlt font16"
+						<view class="width40 flleft aliitem fotlt font16"
 							v-if="row.highChildOrderList[0].goodsType == 4">
 							<image src="../../../static/img/order3.png" class="marglerig"
 								style="width: 50rpx;height: 50rpx;"></image>
 							KFC<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
 						</view>
-						<view class="width50 flleft aliitem fotlt font16"
+						<view class="width40 flleft aliitem fotlt font16"
 							v-if="row.highChildOrderList[0].goodsType == 9">
 							<image src="../../../static/img/xbk.png" class="marglerig"
 								style="width: 50rpx;height: 50rpx;"></image>
 							星巴克<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
 						</view>
-						<view class="width50 flleft aliitem fotlt font16"
+						<view class="width40 flleft aliitem fotlt font16"
 							v-if="row.highChildOrderList[0].goodsType == 10">
 							<image src="../../../static/img/Vip.png" class="marglerig"
 								style="width: 50rpx;height: 50rpx;"></image>
 							会员充值<view class="unread" v-if="row.orderStatus == 3 && !row.whetherCheck"></view>
 						</view>
-						<view class="width50 flleft aliitem fotlt font16"
+						<view class="width40 flleft aliitem fotlt font16"
 							v-if="row.highChildOrderList[0].goodsType == 8">
 							<image src="../../../static/img/ghkpay.png" class="marglerig"
 								style="width: 50rpx;height: 50rpx;"></image>
 							工会卡充值
 						</view>
-						<view class="width50 flright fotrt fcor666 font15">
+						<view class="width60 flright fotrt fcor666 font15">
 							{{row.createTime | formatDate('-')}}
 						</view>
 					</view>
diff --git a/high-unionPay/static/img/user/1.png b/high-unionPay/static/img/user/1.png
new file mode 100644
index 0000000..aa2f197
Binary files /dev/null and b/high-unionPay/static/img/user/1.png differ
diff --git a/high-unionPay/static/img/user/2.png b/high-unionPay/static/img/user/2.png
new file mode 100644
index 0000000..a168cf3
Binary files /dev/null and b/high-unionPay/static/img/user/2.png differ
diff --git a/high-unionPay/uni.scss b/high-unionPay/uni.scss
index 2a5f556..429005b 100644
--- a/high-unionPay/uni.scss
+++ b/high-unionPay/uni.scss
@@ -119,6 +119,9 @@ $uni-font-size-paragraph:30upx;
   font-size: 28px;
 }
 
+.font48 {
+  font-size: 48px;
+}
 // 字体加粗
 .fontwig6{
 	font-weight: bold;
@@ -360,6 +363,10 @@ $uni-font-size-paragraph:30upx;
   margin-left: 30%;
 }
 
+.width30w {
+  width: 30%;
+  margin-left: 3%;
+}
 .width35 {
   width: 35%;
 }
@@ -759,4 +766,7 @@ $uni-font-size-paragraph:30upx;
 
 .icon12 {
 	width: 12px;
+}
+.icon40 {
+	width: 40px;
 }
\ No newline at end of file