Browse Source

说明:本地测试通过

程志平 4 years ago
parent
commit
dbebb1615c

+ 1 - 0
pages/jiaofei/jiaofei.css

@@ -149,6 +149,7 @@ page {
 	border-radius: 47.5upx;
 	border-radius: 47.5upx;
 	background-color: #1296DB; 
 	background-color: #1296DB; 
 	padding: 15upx 315upx;
 	padding: 15upx 315upx;
+	white-space: nowrap;
 }
 }
 
 
 .change-show{
 .change-show{

+ 7 - 3
pages/jiaofei/jiaofei.vue

@@ -114,7 +114,7 @@
 							this.code = res.code
 							this.code = res.code
 							// 请求服务器,获得openid
 							// 请求服务器,获得openid
 							if (param == 'comfirm') {
 							if (param == 'comfirm') {
-								// 获取IP
+								// // 获取IP
 								this.getIP()
 								this.getIP()
 							} else
 							} else
 								this.getOpenId()
 								this.getOpenId()
@@ -133,7 +133,7 @@
 			async getIP() {
 			async getIP() {
 				const res = await this.$myRequest({
 				const res = await this.$myRequest({
 					host: 'ip',
 					host: 'ip',
-					url: '/',
+					url: '?ie=utf-8',
 					method: 'POST'
 					method: 'POST'
 				})
 				})
 
 
@@ -200,7 +200,7 @@
 			async getDianLiang() {
 			async getDianLiang() {
 				if (this.roomSelect != '') {
 				if (this.roomSelect != '') {
 					const res = await this.$myRequest({
 					const res = await this.$myRequest({
-						host: 'code',
+						host: this.ceshi,
 						url: '/HotWaters/buildoverElec.action',
 						url: '/HotWaters/buildoverElec.action',
 						method: 'POST',
 						method: 'POST',
 						header: {
 						header: {
@@ -340,6 +340,10 @@
 					}
 					}
 				})
 				})
 
 
+				uni.showToast({
+					title: res.data.pay,
+					duration: 10000
+				});
 				// console.log(res);
 				// console.log(res);
 				if (res.data.pay == 'error') {
 				if (res.data.pay == 'error') {
 					uni.showToast({
 					uni.showToast({

+ 2 - 2
pages/recharge/recharge.vue

@@ -75,7 +75,7 @@
 			async getIP() {
 			async getIP() {
 				const res = await this.$myRequest({
 				const res = await this.$myRequest({
 					host: 'ip',
 					host: 'ip',
-					url: '/',
+					url: '?ie=utf-8',
 					method: 'POST'
 					method: 'POST'
 				})
 				})
 
 
@@ -95,7 +95,7 @@
 			async jsapi() {
 			async jsapi() {
 				if (this.code == '' || this.amount == '' || this.IP == '') {
 				if (this.code == '' || this.amount == '' || this.IP == '') {
 					uni.showToast({
 					uni.showToast({
-						title: 'code、充值金额  IP为空'
+						title: 'code、充值金额或IP为空'
 					});
 					});
 					return
 					return
 				}
 				}

+ 2 - 2
pages/reshui/reshui.vue

@@ -979,7 +979,7 @@
 					return
 					return
 				}
 				}
 				const res = await this.$myRequest({
 				const res = await this.$myRequest({
-					host: 'code',
+					host: this.ceshi,
 					url: '/HotWaters/wpstart.action',
 					url: '/HotWaters/wpstart.action',
 					data: {
 					data: {
 						collect_code: this.byte35,
 						collect_code: this.byte35,
@@ -1012,7 +1012,7 @@
 					return
 					return
 				}
 				}
 				const res = await this.$myRequest({
 				const res = await this.$myRequest({
-					host: 'code',
+					host: this.ceshi,
 					url: '/HotWaters/wpconsume.action',
 					url: '/HotWaters/wpconsume.action',
 					data: {
 					data: {
 						collect_code: this.byte35.substring(2)
 						collect_code: this.byte35.substring(2)

+ 1 - 2
static/api.js

@@ -1,7 +1,6 @@
 const WEXIN_BASE_URL = 'https://api.mch.weixin.qq.com' // wexin
 const WEXIN_BASE_URL = 'https://api.mch.weixin.qq.com' // wexin
 const CODE_BASE_URL = 'https://jtishfw.ncjti.edu.cn/jxch-smartmp' // code
 const CODE_BASE_URL = 'https://jtishfw.ncjti.edu.cn/jxch-smartmp' // code
-// const CODE_BASE_URL = 'https://developdomain.chuanghai-tech.com' // code
-const IP_BASE_URL = 'http://pv.sohu.com/cityjson?ie=utf-8' // ip
+const IP_BASE_URL = 'https://pv.sohu.com/cityjson' // ip
 
 
 const myRequest = (options) => {
 const myRequest = (options) => {
 	// 域名 或 url 为空,则不执行任何操作
 	// 域名 或 url 为空,则不执行任何操作