From c348bdad9152e94f42e4683bbcf49374b1d47d40 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Thu, 25 Jul 2024 10:44:20 +0800
Subject: [PATCH] =?UTF-8?q?ios=E9=9A=90=E8=97=8F=E5=85=85=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/baseUrl.js             |  4 ++--
 manifest.json                 |  4 ++--
 pages/bookShop/settlement.vue | 25 ++++++++++---------------
 pages/peanut/mine.vue         | 10 +++-------
 pages/peanut/reCharge.vue     | 14 +++++++++-----
 5 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/config/baseUrl.js b/config/baseUrl.js
index 548f755..3355af6 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -5,8 +5,8 @@ if (process.env.NODE_ENV === 'development') {
 	// baseUrl = "http://localhost:7001/";
 	// socketUrl = "ws://localhost:6001/";
 	// baseUrl = "https://twin-ui.com/demo/";
-	baseUrl = "https://testapi.nuttyreading.com/";      // 线上测试环境
-		 // baseUrl = "https://api.nuttyreading.com/";   // 线上正式
+	// baseUrl = "https://testapi.nuttyreading.com/";      // 线上测试环境
+		 baseUrl = "https://api.nuttyreading.com/";   // 线上正式
 		// baseUrl = "http://192.168.110.100:9200/pb/";    //  开发用电脑
 	// baseUrl = "http://59.110.212.44:9200/pb/";
 	// baseUrl = "http://192.168.110.100:9100/pb/";    //  开发用电脑
diff --git a/manifest.json b/manifest.json
index d2f049d..4501da4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,8 +12,8 @@
             "src" : "图片路径"
         }
     ],
-    "versionName" : "1.2.52",
-    "versionCode" : 1252,
+    "versionName" : "1.2.51",
+    "versionCode" : 1251,
     "app-plus" : {
         "compatible" : {
             "ignoreVersion" : true
diff --git a/pages/bookShop/settlement.vue b/pages/bookShop/settlement.vue
index 2b842b9..1bc45d9 100644
--- a/pages/bookShop/settlement.vue
+++ b/pages/bookShop/settlement.vue
@@ -72,7 +72,7 @@
 			</view>
 		</view>
 		<!-- 支付列表 -->
-		<view class="zhif_fangsh" v-if="isAndorid">
+		<view class="zhif_fangsh" >
 			<view class="zhif_radio">
 				<u-radio-group v-model="payType">
 					<view style="width: 100%;">
@@ -81,7 +81,7 @@
 								{{item.title}}
 								<span v-if="item.id == 4"
 									style="color: #bbb; margin-left: 10px;">{{userMes.peanutCoin}}天医币可用</span>
-								<span @click.stop="buPoint" style="color: #bf0c0c; margin-left: 10px;" v-if="item.id == 4"
+								<span @click.stop="buPoint" style="color: #bf0c0c; margin-left: 10px;" v-if="item.id == 4 && oprateOs != 'ios'"
 									class="chongBtn">去充值</span>
 								<u-radio :key="index" activeColor="#fe6e09" :name='item.id'
 									style="float: right;margin-top: 5rpx;"></u-radio>
@@ -91,7 +91,7 @@
 			</view>
 		</view>
 		<!-- ios支付列表 -->
-		<view class="zhif_fangsh" v-else>
+		<!-- <view class="zhif_fangsh" v-else>
 			<view class="zhif_radio">
 				<u-radio-group v-model="payType">
 					<view style="width: 100%;">
@@ -108,7 +108,7 @@
 					</view>
 				</u-radio-group>
 			</view>
-		</view>
+		</view> -->
 
 		<view class="footer">
 			<view class="commodityPrice" v-if="payType != 4">
@@ -244,7 +244,7 @@
 				isSend: '0',
 				farePrice: 0,
 				realPrice: 0,
-				payType:null,
+				payType:1,
 				nowClick: true,
 				paylist: [{
 						title: '支付宝',
@@ -284,6 +284,7 @@
 						img: '../../static/icon/oder_chong.png'
 					}					
 				],
+				oprateOs : ''
 			}
 		},
 		onLoad(e) {
@@ -322,16 +323,9 @@
 		methods: {
 			// 获得操作系统
 			getOS() {
-				let oprateOs = ''
-				oprateOs = uni.getSystemInfoSync().platform
-				// console.log(oprateOs)
-				if (oprateOs == 'android') {
-					this.isAndorid = true
-					this.payType = 1
-				} else {
-					this.isAndorid = false
-					this.payType = 4
-				}
+				// let oprateOs = ''
+				this.oprateOs = uni.getSystemInfoSync().platform
+				// console.log(oprateOs)				
 			},
 			// 充值天医币
 			buPoint() {
@@ -585,6 +579,7 @@
 			goBuyJie() {
 				if (this.addressList.length == 0) {
 					this.dizhiShow = true // 如果没有地址信息
+					return
 				}
 				if (!this.nowClick) {
 					return
diff --git a/pages/peanut/mine.vue b/pages/peanut/mine.vue
index 8c1f881..17ce3d5 100644
--- a/pages/peanut/mine.vue
+++ b/pages/peanut/mine.vue
@@ -28,10 +28,6 @@
         <text style="margin-left: 20rpx; font-size: 22rpx; color: #888" v-else
           >({{ userMes.email }})</text
         >
-
-        <!-- <text class="tong">累计读书5本
-					<span style="margin: 0 20upx;">|</span> 今日读50分钟
-				</text> -->
       </view>
       <br clear="both" />
     </view>
@@ -58,7 +54,7 @@
         <text style="float: right; line-height: 85rpx"> > </text>
       </view>
       <view class="chong_list">
-        <view v-if="iosHide">
+        <view >
           <b>{{ userMes.peanutCoin }}</b>
           天医币
         </view>
@@ -67,7 +63,7 @@
           优惠券
         </view> -->
         <!-- <b class="chong_btn" @click="onPageJump('../sdkDemo/pay')">充 值</b> -->
-        <b class="chong_btn" v-if="iosHide" @click="onPageJump('./reCharge')"
+        <b class="chong_btn" v-if="platform == 'android'" @click="onPageJump('./reCharge')"
           >充 值</b
         >
       </view>
@@ -171,7 +167,7 @@ export default {
     // #ifdef APP-PLUS
     this.getOS();
     this.platform = uni.getSystemInfoSync().platform;
-    // console.log('操纵系统',this.platform)
+    console.log('操纵系统',this.platform)
     // #endif
   },
   computed: {
diff --git a/pages/peanut/reCharge.vue b/pages/peanut/reCharge.vue
index b240d9d..c7f62bf 100644
--- a/pages/peanut/reCharge.vue
+++ b/pages/peanut/reCharge.vue
@@ -120,10 +120,10 @@
 				productid: '',
 				isAndroid: true, // 是否为安卓环境
 
-				payType: 2,
-				// #ifdef  APP-IOS
-				payType: 3,
-				// #endif
+				payType: null,
+				// // #ifdef  APP-IOS
+				// payType: 3,
+				// // #endif
 				paylist: [{
 						title: '支付宝',
 						id: 2,
@@ -143,6 +143,7 @@
 				transaction: { // 成功回调
 
 				},
+				oprateOs:'',
 			};
 		},
 		//第一次加载
@@ -150,6 +151,7 @@
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
 			this.chargeOrderSn = e.orderSn
+			this.oprateOs = uni.getSystemInfoSync().platform
 			// console.log(e.orderSn,'orderSn')
 		},
 		//页面显示
@@ -401,9 +403,11 @@
 			getDevName() {
 				// 获取使用环境
 				if (uni.getSystemInfoSync().platform === 'android') {
-					this.isAndroid = true
+					this.isAndroid = true	
+				   this.payType = 1
 					// console.log('运行Android上')
 				} else {
+					this.payType = 4
 					this.isAndroid = false
 					// console.log('运行iOS上')
 				}