From 619f5dc757212065df91436d80023262192496aa Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Mon, 28 Nov 2022 14:35:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=8B=A8=E6=89=93=E7=94=B5?=
 =?UTF-8?q?=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  4 +-
 .../pages/tabBar/category/category.vue        |  6 +-
 high-unionPay/pages/tabBar/home/home.vue      | 58 ++++++++++---------
 high-unionPay/pages/tabBar/user/user.vue      |  4 +-
 4 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/.gitignore b/.gitignore
index 99057ba..8732631 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-unpackage/
\ No newline at end of file
+unpackage/
+.hbuilderx/launch.json
+node_modules
\ No newline at end of file
diff --git a/high-unionPay/pages/tabBar/category/category.vue b/high-unionPay/pages/tabBar/category/category.vue
index bc64bbb..918ffdb 100644
--- a/high-unionPay/pages/tabBar/category/category.vue
+++ b/high-unionPay/pages/tabBar/category/category.vue
@@ -271,10 +271,12 @@
 				// uni.showToast({title: "建议跳转到新页面做搜索功能"});
 			},
 			//拨打客服电话
-			playPhone() {
+			playPhone() {
+				let cont = "本服务由惠兑礼品提供\n400-678-738";
+				let content = cont.replace(/<br>/g,"\n");
 				uni.showModal({
 					title: '客服',
-					content: '4006780738',
+					content: content,
 					success: function(res) {
 						if (res.confirm) {
 							uni.makePhoneCall({
diff --git a/high-unionPay/pages/tabBar/home/home.vue b/high-unionPay/pages/tabBar/home/home.vue
index 72795e7..2bf2eb7 100644
--- a/high-unionPay/pages/tabBar/home/home.vue
+++ b/high-unionPay/pages/tabBar/home/home.vue
@@ -66,7 +66,7 @@
 		getTPigCinemaToken,
 		getCacheParam,
 		delCacheParam,
-		getCmsContent,
+		getCmsContent,
 		findByLatAndLng
 	} from "../../../Utils/Api.js"; //您的api路径
 	import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
@@ -233,15 +233,15 @@
 						success: function(res) {
 							switch (uni.getSystemInfoSync().platform) {
 								case 'android':
-									let zuob = JSON.parse(res);
+									let zuob = JSON.parse(res);
 									app.globalData.latitude = zuob.latitude;
-									app.globalData.longitude = zuob.longitude;
-									that.findByLatAndLng(zuob.longitude,zuob.latitude);
+									app.globalData.longitude = zuob.longitude;
+									that.findByLatAndLng(zuob.longitude, zuob.latitude);
 									break;
 								case 'ios':
 									app.globalData.latitude = res.latitude;
-									app.globalData.longitude = res.longitude;
-									that.findByLatAndLng(res.longitude,res.latitude);
+									app.globalData.longitude = res.longitude;
+									that.findByLatAndLng(res.longitude, res.latitude);
 									break;
 							}
 
@@ -249,23 +249,23 @@
 						fail: function() {}
 					});
 				});
-			},
-			//经纬度转换
-			findByLatAndLng(item, item1) {
-				let datas = {
-					lng: item,
-					lat: item1
-				}
-				findByLatAndLng(datas).then(res => {
-					if (res.return_code == '000000') {
-						// res.return_data.provinceName
-						app.globalData.cityName = res.return_data.provinceName;
-						app.globalData.qianzhuCityName = res.return_data.cityName;
-						app.globalData.cityId = res.return_data.regionId;
-						// app.globalData.cityId = '520000';
-						app.globalData.companyId = res.return_data.companyId;
-					}
-				});
+			},
+			//经纬度转换
+			findByLatAndLng(item, item1) {
+				let datas = {
+					lng: item,
+					lat: item1
+				}
+				findByLatAndLng(datas).then(res => {
+					if (res.return_code == '000000') {
+						// res.return_data.provinceName
+						app.globalData.cityName = res.return_data.provinceName;
+						app.globalData.qianzhuCityName = res.return_data.cityName;
+						app.globalData.cityId = res.return_data.regionId;
+						// app.globalData.cityId = '520000';
+						app.globalData.companyId = res.return_data.companyId;
+					}
+				});
 			},
 			//获取首页功能
 			getCmsContentcmsContent() {
@@ -411,10 +411,12 @@
 				})
 			},
 			//拨打客服电话
-			playPhone() {
+			playPhone() {
+				let cont = "本服务由惠兑礼品提供\n400-678-738";
+				let content = cont.replace(/<br>/g,"\n");
 				uni.showModal({
 					title: '客服',
-					content: '4006780738',
+					content: content,
 					success: function(res) {
 						if (res.confirm) {
 							uni.makePhoneCall({
@@ -447,9 +449,9 @@
 				}
 			},
 			//单独跳转话费充值
-			jumphuafei(item) {
-				uni.navigateTo({
-					url: item.ext1
+			jumphuafei(item) {
+				uni.navigateTo({
+					url: item.ext1
 				})
 				// if (!app.globalData.userInfo) {
 				// 	uni.navigateTo({
diff --git a/high-unionPay/pages/tabBar/user/user.vue b/high-unionPay/pages/tabBar/user/user.vue
index 7c7d82b..56a43fb 100644
--- a/high-unionPay/pages/tabBar/user/user.vue
+++ b/high-unionPay/pages/tabBar/user/user.vue
@@ -429,9 +429,11 @@
 			},
 			//拨打客服电话
 			playPhone() {
+				let cont = "本服务由惠兑礼品提供\n400-678-738";
+				let content = cont.replace(/<br>/g,"\n");
 				uni.showModal({
 					title: '客服',
-					content: '4006780738',
+					content: content,
 					success: function(res) {
 						if (res.confirm) {
 							uni.makePhoneCall({