From 815337acc775ce847228fb25884676c8d7f79382 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Tue, 30 Aug 2022 09:29:24 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=9C=A8=E7=BA=BF=E5=8A=A0?=
 =?UTF-8?q?=E6=B2=B9=E4=BB=B7=E6=A0=BC=E9=80=89=E6=8B=A9=202.=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=88=86=E9=94=80=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=203.=E4=B8=8A=E7=BA=BF=E9=93=B6=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 high-unionPay/App.vue                         |  16 +-
 high-unionPay/Utils/Api.js                    |  25 ++
 high-unionPay/pages.json                      |  21 ++
 .../pages/goods/recording/recording.vue       | 345 ++++++++++--------
 .../goods/refuel-confirm/refuel-confirm.vue   |   2 +-
 .../goods/refuel-details/refuel-details.vue   | 201 ++++++----
 high-unionPay/pages/tabBar/user/user.vue      |  36 +-
 .../user/generatePoster/generatePoster.vue    |  43 +++
 .../pages/user/myPromotion/myPromotion.vue    | 291 +++++++++++++++
 .../pages/user/order_list/order_list.vue      |  22 +-
 high-unionPay/static/img/user/1.png           | Bin 0 -> 2694 bytes
 high-unionPay/static/img/user/2.png           | Bin 0 -> 2606 bytes
 high-unionPay/uni.scss                        |  10 +
 13 files changed, 743 insertions(+), 269 deletions(-)
 create mode 100644 high-unionPay/pages/user/generatePoster/generatePoster.vue
 create mode 100644 high-unionPay/pages/user/myPromotion/myPromotion.vue
 create mode 100644 high-unionPay/static/img/user/1.png
 create mode 100644 high-unionPay/static/img/user/2.png

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 0000000000000000000000000000000000000000..aa2f197a04aa73d4f6b5eb2cfb3908a378a3a01a
GIT binary patch
literal 2694
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

literal 0
HcmV?d00001

diff --git a/high-unionPay/static/img/user/2.png b/high-unionPay/static/img/user/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..a168cf35813f0660e180cd01a410d8fa75980f0d
GIT binary patch
literal 2606
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
Qi~s-t07*qoM6N<$f>v$}rT_o{

literal 0
HcmV?d00001

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