From c6f57b6c8ae7e6d2bc04e6c680ef8b3f25aa665a Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Thu, 4 Aug 2022 18:03:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |  98 ++++++++--------
 pages/goods/recording/recording.vue           |  94 ++++++++-------
 pages/goods/refuel-confirm/refuel-confirm.vue |   2 +-
 pages/goods/refuel-details/refuel-details.vue |   9 +-
 pages/goods/refuel/refuel.vue                 |   3 +-
 pages/order/confirmation.vue                  |   6 +-
 pages/tabBar/category/category.vue            | 109 +++++++++---------
 pages/tabBar/home/home.vue                    |   4 +-
 pages/tabBar/user/user.vue                    |  18 +--
 pages/welcome/welcome.vue                     |   8 +-
 qianzhu-KFC/buffet-order/buffet-order.vue     |   4 +-
 qianzhu-Starbucks/changeRegin/changeRegin.vue |   6 +-
 subPages/recharge-centre/recharge-centre.vue  |   6 +-
 13 files changed, 191 insertions(+), 176 deletions(-)

diff --git a/App.vue b/App.vue
index f6e8c3c..ca2a1fb 100644
--- a/App.vue
+++ b/App.vue
@@ -1,62 +1,62 @@
 <script>
 	export default {
 		globalData: {
-			// url: 'http://192.168.3.4:9301/crest',
+			// url: 'http://192.168.3.4:9301/crest',
 			// 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://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 : '',
-			bresthighAgent:'',
+			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/',
+			userInfo: "",
+			brestUserInfo: '',
+			bresthighAgent: '',
 			openId: '',
 			code: '',
-			token: '',
-			brestToken:'',
+			token: '',
+			brestToken: '',
 			cityId: '',
-			cityName:'',
-			longitude : '',
-			latitude : '',
-			balancePrice : '',
-			balanceCardNo:'',
-			identificationCode:'',
-			// h5获取信息
-			h5code:'',
-			//门店ID
-			storeid:'',
-			//门店名字
-			storename:'',
-			//公众号进入值
-			accountId:'',
-			//个人码key
-			gasKey:'',
-			//个人码code
-			staffCode:'',
-			//公众号菜单区分
-			accountType:'',
-			//区分肯德基 星巴克
-			distinguishid:'',
-			//千猪下单数据
-			qianzhulist:'',
-			//星巴克价格
-			salesTallPrice:'',
-			//第三方嵌入id
-			mchId:''
+			cityName: '',
+			longitude: '',
+			latitude: '',
+			balancePrice: '',
+			balanceCardNo: '',
+			identificationCode: '',
+			// h5获取信息
+			h5code: '',
+			//门店ID
+			storeid: '',
+			//门店名字
+			storename: '',
+			//公众号进入值
+			accountId: '',
+			//个人码key
+			gasKey: '',
+			//个人码code
+			staffCode: '',
+			//公众号菜单区分
+			accountType: '',
+			//区分肯德基 星巴克
+			distinguishid: '',
+			//千猪下单数据
+			qianzhulist: '',
+			//星巴克价格
+			salesTallPrice: '',
+			//第三方嵌入id
+			mchId: '',
+			//千猪名称
+			qianzhuCityName: ''
+		
 		},
-		onLaunch: function() {
-		},
-		onShow: function() {
-		},
-		onHide: function() {
-		}
+		onLaunch: function() {},
+		onShow: function() {},
+		onHide: function() {}
 	}
 </script>
 
diff --git a/pages/goods/recording/recording.vue b/pages/goods/recording/recording.vue
index e620591..cb669cd 100644
--- a/pages/goods/recording/recording.vue
+++ b/pages/goods/recording/recording.vue
@@ -5,24 +5,43 @@
 			<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 class="width94 backcorfff mart20" style="border-radius: 8px;">
+			<view class="width94 alijus fotct font15 fcor333 paddtop20"  v-if="recordInfo  != ''" >
+				<view class="width50" @click="changestu(1)">积分收支明细</view>
+				<view class="width50" @click="changestu(2)">7天即将过期积分</view>
+			</view>
+			<view class="width94  paddtop15"  v-if="recordInfo != ''" >
+				<view class="width50 flleft fotct" v-if="typeId == 1">
+					<view class="width40w" style="height: 2px;background-color: red;"></view>
 				</view>
-				<view class="flright width50 fotrt fcorred" v-else>
-					-{{recod.gold}}
+				<view class="width50 flright fotct" v-if="typeId == 2">
+					<view class="width40w" style="height: 2px;background-color: red;"></view>
 				</view>
 			</view>
-			<view class="width100 fcor999 font14 mart5">
-				{{recod.createTime | formatDate('-')}}
+			<view class="width100 line1 marb20" v-if="recordInfo != ''"></view>
+			<view class="width100" v-for="recod in recordInfo" :key="recod.id">
+				<view class="width94 font15 mart10 alijusstart">
+					<view class="width70">
+						<view class="fcor666">
+							积分充值
+						</view>
+						<view class="fcor999 font14 mart10">
+							{{recod.createTime | formatDate('-')}}
+						</view>
+					</view>
+					<view class="width30">
+						<view class="font20 fotrt fcorred" v-if="typeId == 1">
+							+{{recod.gold}}
+						</view>
+						<view class=" font20 fotrt fcor41c" v-else>
+							-{{recod.gold}}
+						</view>
+					</view>
+				</view>
+				<view class="line1f2 mart10"></view>
 			</view>
-			<view class="line1f2 mart15"></view>
 		</view>
-		<view class="loading-text">{{ loadingText }}</view>
+		<view class="height60"></view>
 	</view>
 </template>
 
@@ -34,27 +53,26 @@
 	export default {
 		data() {
 			return {
-				typeId: '',
+				typeId: 1,
 				recordInfo: [],
 				imagewxUrl: app.globalData.imageWxImg,
-				imgadres:'noorder.png',
+				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.typeId = option.id;
+			// if (this.typeId == 1) {
+			uni.setNavigationBarTitle({
+				title: '积分记录'
+			})
+			// } else {
+			// 	uni.setNavigationBarTitle({
+			// 		title: '消费记录'
+			// 	})
+			// }
 			this.getUserGoldRecLists();
 		},
 		filters: {
@@ -79,13 +97,16 @@
 			this.getUserGoldRecLists();
 		},
 		methods: {
+			//切换状态
+			changestu(item) {
+				this.typeId = item;
+			},
 			getUserGoldRecLists() {
 				uni.showLoading({
 					title: '加载中...'
 				})
 				if (this.isNoMoreData) {
 					uni.hideLoading()
-					this.loadingText = '到底了';
 					return false;
 				}
 				let pagenum = this.pageNum;
@@ -98,7 +119,7 @@
 					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)){
+						if (res.return_data.total == (this.pageNum * this.pageSize)) {
 							this.isNoMoreData = true;
 						}
 						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
@@ -115,28 +136,13 @@
 
 <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;
+		background-color: #f6f6f6;
 	}
 
 	.bordr {
 		border-top: 1px solid #fcfcfc;
 	}
 
-	.height60 {
-		height: 60px;
-		line-height: 60px;
-	}
-
 	.pictime {
 		margin-left: 20px;
 	}
diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue
index 2c094bc..7ca092e 100644
--- a/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -271,7 +271,7 @@
 				tongCardPrice: 0,
 				oilPirce: 0, //油卡余额
 				user: '',
-				paytype: '',
+				paytype: 'weixin',
 				PaymentPassword: '',
 				timedeductionPrice: '0', //本次优惠金额
 
diff --git a/pages/goods/refuel-details/refuel-details.vue b/pages/goods/refuel-details/refuel-details.vue
index 3484532..9a73922 100644
--- a/pages/goods/refuel-details/refuel-details.vue
+++ b/pages/goods/refuel-details/refuel-details.vue
@@ -216,7 +216,8 @@
 		},
 		onLoad(options) {
 			this.store_key = options.id;
-			this.counId = options.desId;
+			this.counId = options.desId;
+			this.oilNo = options.oilNo;
 			if (app.globalData.accountId) {
 				this.isTyAgent = true;
 			}
@@ -320,8 +321,8 @@
 					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;
 							this.priceVip = res.return_data.oilPriceList[0].priceVip;
 							this.priceGun = res.return_data.oilPriceList[0].priceGun;
 							this.priceOfficial = res.return_data.oilPriceList[0].priceOfficial;
@@ -336,7 +337,7 @@
 									this.gasOilNo = res.return_data.gasGunList[i].oilNo;
 								}
 							}
-						}
+						// }
 					} else {
 						uni.showToast({
 							title: res.return_msg,
diff --git a/pages/goods/refuel/refuel.vue b/pages/goods/refuel/refuel.vue
index 5a69d52..29c3919 100644
--- a/pages/goods/refuel/refuel.vue
+++ b/pages/goods/refuel/refuel.vue
@@ -272,7 +272,8 @@
 			//跳转详情
 			goDetails(items, itemId) {
 				uni.navigateTo({
-					url: '../refuel-details/refuel-details?id=' + items + '&desId=' + itemId
+					url: '../refuel-details/refuel-details?id=' + items + '&desId=' + itemId + '&oilNo=' + this
+						.onilName
 				})
 			},
 			result(val) {
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index d7974ae..cfcc5a5 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -280,8 +280,10 @@
 				findUser(params).then(res => {
 					if (res.return_code == '000000') {
 						app.globalData.userInfo = res.return_data;
-						this.user = res.return_data;
-						this.getHuiLianTongCardBalance();
+						this.user = res.return_data;
+						if(this.user.hltCardNo){
+							this.getHuiLianTongCardBalance();
+						}
 						this.getUserNormalDiscountList();
 						uni.setStorage({
 							key: "user",
diff --git a/pages/tabBar/category/category.vue b/pages/tabBar/category/category.vue
index ffbbc1b..5d1a11b 100644
--- a/pages/tabBar/category/category.vue
+++ b/pages/tabBar/category/category.vue
@@ -22,7 +22,7 @@
 					<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
 				</view> -->
 				<picker mode="selector" :range="MerchantList" range-key="merchantName" @change="showCategory">
-					<view>{{showCategoryIndex}}
+					<view class="font14">{{showCategoryIndex}}
 						<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
 					</view>
 				</picker>
@@ -60,12 +60,12 @@
 					{{item.merchantName}}
 				</view>
 			</view>
-		</wybPopup> -->
+		</wybPopup> -->
 		<!-- #ifdef MP-->
 		<image :src="imagewxUrl+imgadres5" mode="widthFix" class="xfimg"></image>
-		<!-- #endif -->
-		<!-- #ifdef H5-->
-		<image :src="imagewxUrl+imgadres5" mode="widthFix" class="h5xfimg" @click="playPhone"></image>
+		<!-- #endif -->
+		<!-- #ifdef H5-->
+		<image :src="imagewxUrl+imgadres5" mode="widthFix" class="h5xfimg" @click="playPhone"></image>
 		<!-- #endif -->
 	</view>
 </template>
@@ -73,7 +73,7 @@
 	import {
 		getCouponList,
 		getStoreListByMerchant,
-		getMerchantList,
+		getMerchantList,
 		findByLatAndLng
 	} from "../../../Utils/Api.js";
 	import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
@@ -159,23 +159,23 @@
 				})
 			},
 			//金纬度转
-			findByLatAndLng(item, item1) {					
-					let datas = {
-						lng: item,
-						lat: item1
-					}
-					findByLatAndLng(datas).then(res => {
-						if (res.return_code == '000000') {
-							this.city = res.return_data.result.addressComponent.province;
-							app.globalData.cityName = res.return_data.result.addressComponent
-								.province;
-							app.globalData.cityId = res.return_data.result.addressComponent.adcode;
-							// app.globalData.cityId = '500100';
-							if (res.return_data.result.addressComponent.adcode) {
-								this.getMerchantList();
-							}
-						}
-					});
+			findByLatAndLng(item, item1) {
+				let datas = {
+					lng: item,
+					lat: item1
+				}
+				findByLatAndLng(datas).then(res => {
+					if (res.return_code == '000000') {
+						this.city = res.return_data.result.addressComponent.province;
+						app.globalData.cityName = res.return_data.result.addressComponent
+							.province;
+						app.globalData.cityId = res.return_data.result.addressComponent.adcode;
+						// app.globalData.cityId = '500100';
+						if (res.return_data.result.addressComponent.adcode) {
+							this.getMerchantList();
+						}
+					}
+				});
 			},
 			// 商户列表
 			getMerchantList() {
@@ -186,10 +186,10 @@
 					if (res.return_code == '000000' && res.return_data != '') {
 						this.MerchantList = res.return_data;
 						this.showCategoryIndex = res.return_data[0].merchantName;
-						this.showCategoryIndexId = res.return_data[0].id;
-						this.pageNum = 1;
-						this.pageSize = 10;
-						this.isNoMoreData = false;
+						this.showCategoryIndexId = res.return_data[0].id;
+						this.pageNum = 1;
+						this.pageSize = 10;
+						this.isNoMoreData = false;
 						this.categoryList = [];
 						this.getStoreListByMerchant();
 
@@ -267,27 +267,27 @@
 					url: '../../goods/HM-search/HM-search'
 				})
 				// uni.showToast({title: "建议跳转到新页面做搜索功能"});
-			},
-			//拨打客服电话
-			playPhone() {
-				uni.showModal({
-					title: '客服',
-					content: '4006780738',
-					success: function(res) {
-						if (res.confirm) {
-							uni.makePhoneCall({
-								phoneNumber: '4006780738', //电话号码
-								success: function(e) {
-									console.log(e);
-								},
-								fail: function(e) {
-									console.log(e);
-			
-								}
-							})
-						}
-					}
-				})
+			},
+			//拨打客服电话
+			playPhone() {
+				uni.showModal({
+					title: '客服',
+					content: '4006780738',
+					success: function(res) {
+						if (res.confirm) {
+							uni.makePhoneCall({
+								phoneNumber: '4006780738', //电话号码
+								success: function(e) {
+									console.log(e);
+								},
+								fail: function(e) {
+									console.log(e);
+
+								}
+							})
+						}
+					}
+				})
 			}
 		}
 	}
@@ -296,13 +296,14 @@
 	page {
 		background-color: #f1f3f5;
 	}
-
-	.h5xfimg {
-		width: 80rpx;
-		bottom: 140rpx;
-		position: fixed;
-		right: 40rpx;
+
+	.h5xfimg {
+		width: 80rpx;
+		bottom: 140rpx;
+		position: fixed;
+		right: 40rpx;
 	}
+
 	.xfimg {
 		width: 80rpx;
 		bottom: 60rpx;
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index f54d793..53cbd5f 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -236,7 +236,6 @@
 		onLoad(options) {
 			let that = this;
 			// #ifdef MP
-			app.globalData.accountId = options.accountId;
 			// 1.wx获取登录用户code
 			uni.login({
 				provider: 'weixin',
@@ -461,11 +460,12 @@
 					lng: item,
 					lat: item1
 				}
-				findByLatAndLng(datas).then(res => {
+				findByLatAndLng(datas).then(res => {
 					if (res.return_code == '000000') {
 						that.city = res.return_data.result.addressComponent.province;
 						app.globalData.cityName = res.return_data.result.addressComponent
 							.province;
+						app.globalData.qianzhuCityName = res.return_data.result.addressComponent.city;
 						app.globalData.cityId = res.return_data.result.addressComponent.adcode;
 						// app.globalData.cityId = '500103';
 						if (res.return_data.result.addressComponent.adcode) {
diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue
index d6e2669..1157486 100644
--- a/pages/tabBar/user/user.vue
+++ b/pages/tabBar/user/user.vue
@@ -89,9 +89,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>
@@ -215,15 +215,15 @@
 				],
 				// 工具栏列表
 				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: '我的卡券',
diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue
index 383fa49..139db5a 100644
--- a/pages/welcome/welcome.vue
+++ b/pages/welcome/welcome.vue
@@ -12,8 +12,14 @@
 
 			}
 		},
-		onLoad() {
+		onLoad(options) {
 			let that = this;
+			// #ifdef MP
+			app.globalData.accountId = options.accountId;
+			uni.switchTab({
+				url: '../tabBar/home/home'
+			})
+			// #endif
 			// #ifdef H5
 			var arr1 = window.location.href;
 			var arr2 = arr1.split('=');
diff --git a/qianzhu-KFC/buffet-order/buffet-order.vue b/qianzhu-KFC/buffet-order/buffet-order.vue
index 861cbe3..3bebbb3 100644
--- a/qianzhu-KFC/buffet-order/buffet-order.vue
+++ b/qianzhu-KFC/buffet-order/buffet-order.vue
@@ -84,7 +84,7 @@
 
 		},
 		onShow() {
-			this.cityName = app.globalData.cityName;
+			this.cityName = app.globalData.qianzhuCityName;
 			if (this.typeid == 2) {
 				this.getStarbucksStore();
 			}
@@ -140,7 +140,7 @@
 					title: '加载中...'
 				})
 				let datas = {
-					cityName: app.globalData.cityName,
+					cityName: app.globalData.qianzhuCityName,
 					storeName: this.storeName,
 					lat: app.globalData.latitude,
 					lon: app.globalData.longitude
diff --git a/qianzhu-Starbucks/changeRegin/changeRegin.vue b/qianzhu-Starbucks/changeRegin/changeRegin.vue
index 9131871..46e00b0 100644
--- a/qianzhu-Starbucks/changeRegin/changeRegin.vue
+++ b/qianzhu-Starbucks/changeRegin/changeRegin.vue
@@ -39,8 +39,7 @@
 			this.getAllCity();
 			this.activeCity = {
 				id: 1,
-				cityName: app.globalData.cityName,
-				cityCode: app.globalData.cityId
+				cityName: app.globalData.qianzhuCityName
 			}
 			//热门城市
 			this.hotCity = [{
@@ -58,8 +57,7 @@
 		methods: {
 			//选择城市
 			cityClick(item) {
-				app.globalData.cityName = item.cityName;
-				app.globalData.cityId = item.provinceCode;
+				app.globalData.qianzhuCityName = item.cityName;
 				uni.navigateBack({
 				})
 			},
diff --git a/subPages/recharge-centre/recharge-centre.vue b/subPages/recharge-centre/recharge-centre.vue
index 4c1ac45..02b48e3 100644
--- a/subPages/recharge-centre/recharge-centre.vue
+++ b/subPages/recharge-centre/recharge-centre.vue
@@ -28,10 +28,10 @@
 		<view class="mart5 width90 font18 fcor333 fontwig6">
 			充值说明：
 		</view>
-		<view class="width90 mart20" v-if="current == 0">
+		<!-- <view class="width90 mart20" v-if="current == 0">
 			<image class="width100" mode="widthFix" :src="imagewxUrl+image2"></image>
-		</view>
-		<view class="width90 mart20" v-if="current == 1">
+		</view> -->
+		<view class="width90 mart20">
 			<image class="width100" mode="widthFix" :src="imagewxUrl+image1"></image>
 		</view>
 		<view class="height100p"></view>