From e7d9d12556a1853c479a2061fb6ca6117e4c743f Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Mon, 26 Jun 2023 17:46:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E7=89=88=E4=B8=8A=E7=BA=BF=E5=90=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/baseUrl.js       |  4 +--
 main.js                 |  4 +--
 manifest.json           |  6 ++--
 pages.json              | 11 +++++++-
 pages/peanut/home.vue   |  2 +-
 pages/peanut/mine.vue   | 33 +++++++++++++++++++++-
 pages/peanut/opeVip.vue | 31 ++++++++++++++++-----
 pages/user/login.vue    | 62 ++++++++++++++++++++++++++++++++++++-----
 pages/user/protocol.vue |  2 ++
 pages/yRead/angbook.vue |  7 +++--
 10 files changed, 136 insertions(+), 26 deletions(-)

diff --git a/config/baseUrl.js b/config/baseUrl.js
index 183a5c5..333a73d 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 = "http://59.110.212.44:9100/pb/";
-	baseUrl = "http://192.168.110.100:9100/pb/";
+	 baseUrl = "http://59.110.212.44:9100/pb/";
+	// baseUrl = "http://192.168.110.100:9100/pb/";
 	// socketUrl = "ws://8.129.186.35:6001/";
 } else if (process.env.NODE_ENV === 'production') {
 	// 生产环境
diff --git a/main.js b/main.js
index 8934661..8373461 100644
--- a/main.js
+++ b/main.js
@@ -3,8 +3,8 @@ import App from './App'
 import qs from 'qs'
 
 // 地址
-Vue.prototype.$baseUrl = "http://192.168.110.100:9100/pb/"
-// Vue.prototype.$baseUrl = "http://59.110.212.44:9100/pb/"
+// Vue.prototype.$baseUrl = "http://192.168.110.100:9100/pb/"
+ Vue.prototype.$baseUrl = "http://59.110.212.44:9100/pb/"
 
 
 
diff --git a/manifest.json b/manifest.json
index 4be880d..b1e57d5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -22,7 +22,7 @@
             "prompt" : "template",
             "template" : {
                 "title" : "用户协议和隐私政策",
-                "message" : "请你务必审慎阅读、充分理解“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href='https://main.nuttyreading.com/agreement.html'>《用户协议》</a>和<a href='https://main.nuttyreading.com/privacy.html'>《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+                "message" : "请你务必审慎阅读、充分理解“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href='https://main.nuttyreading.com/agreement.html'>《用户协议》</a>和<a href='https://main.nuttyreading.com/privacy.html'>《隐私协议》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
                 "buttonAccept" : "同意",
                 "buttonRefuse" : "暂不同意"
             }
@@ -30,7 +30,7 @@
         "modules" : {
             "Payment" : {},
             "OAuth" : {},
-            "Messaging" : {},
+            // "Messaging" : {}, 短信权限
             "VideoPlayer" : {},
             "Share" : {}
         },
@@ -99,7 +99,7 @@
             },
             "ios" : {
                 "dSYMs" : false,
-				"UIBackgroundModes":["audio"] // 背景播放音乐
+                "UIBackgroundModes" : [ "audio" ] // 背景播放音乐
             },
             "icons" : {
                 "android" : {
diff --git a/pages.json b/pages.json
index fee2b0a..39b19ec 100644
--- a/pages.json
+++ b/pages.json
@@ -249,7 +249,16 @@
 			}
 		}
 	
-],
+    ,{
+            "path" : "pages/peanut/aboutUs",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "关于我们",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index 99cc054..99338c0 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -217,7 +217,7 @@
 				seckillList: [],
 				goodsList: [],
 				bgiStyle: {
-					background: '#2ab588'
+					background: '#fff'
 				},
 				iconStyle: {
 					fontSize: '40rpx',
diff --git a/pages/peanut/mine.vue b/pages/peanut/mine.vue
index e7b2447..78471f4 100644
--- a/pages/peanut/mine.vue
+++ b/pages/peanut/mine.vue
@@ -73,9 +73,16 @@
 			<!-- <view class="nav_list" @click="onGoing()">
 				<text>帮助与反馈</text>
 			</view> -->
+			<view class="nav_list" @click="onPageJump('../peanut/aboutUs')">
+				<text>关于我们</text>
+			</view>
 			<view class="nav_list" @click="signShow=true">
 				<text>退出登录</text>
 			</view>
+			<view class="nav_list" @click="logout">
+				<text>注销帐号</text>
+			</view>
+			
 		</view>
 
 		<u-modal :show="signShow" :content="signContent" :showCancelButton="true" @cancel="signShow=false"
@@ -131,7 +138,31 @@
 				}
 
 			},
-
+			
+			// 注销账户
+			logout(){
+				let that = this
+				uni.showModal({
+					title: '提示',
+					content: '确定要注销当前账户吗？',
+					success: function (res) {
+						if (res.confirm) {
+							uni.showModal({
+								title: '提示',
+								showCancel:false,
+								content: `注销申请已提交成功,请联系客服进行后续操作：022-24142321`,
+								success: function (res1) {
+									if (res1.confirm) {
+										that.signOut()
+									}
+								}
+							});
+						} else if (res.cancel) {
+							// 取消操作
+						}
+					}
+				});
+			},
 			// 跳转
 			onGoing() {
 				uni.showToast({
diff --git a/pages/peanut/opeVip.vue b/pages/peanut/opeVip.vue
index a1ec1ab..ac53f0b 100644
--- a/pages/peanut/opeVip.vue
+++ b/pages/peanut/opeVip.vue
@@ -164,7 +164,7 @@
 			showXieyi(){
 				this.$http
 					.get(`sys/agreement/list?key=member`)
-					.then(res => {						
+					.then(res => {							
 						this.xieyi = res.page.list[0]
 						this.xieyiShow = true
 					})
@@ -185,11 +185,28 @@
 				if(this.radioValue == '1'){				
 				
 				if(this.stepsVc.money > this.userMes.peanutCoin){
-					uni.showToast({
-						title:'疯币不足，请充值',
-						icon: 'error',
-						duration: 2000
-					})
+					// uni.showToast({
+					// 	title:'疯币不足，请充值',
+					// 	icon: 'none',
+					// 	duration: 2000
+					// })
+					uni.showModal({
+						title: '提示',
+						content: '疯币不足',
+						confirmText:'去充值',
+						showCancel:'知道了',
+						success: function (res) {
+							let that = this
+							if (res.confirm) {
+								console.log('用户点击确定');								
+								uni.navigateTo({
+									url: '../peanut/reCharge'
+								});
+							} else if (res.cancel) {
+								//console.log('用户点击取消');
+							}
+						}
+					});
 					return 
 				}else{
 					this.kaiVip()
@@ -203,7 +220,7 @@
 				}
 			},
 			// 充值疯币
-			buPoint() {
+			buPoint() {				
 				uni.navigateTo({
 					url: '../peanut/reCharge'
 				});
diff --git a/pages/user/login.vue b/pages/user/login.vue
index 97431a6..ee9cbcd 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -40,10 +40,13 @@
 			<view class="protocol_box">
 				<view class="select" :class="{active: agree}" @click="agree = !agree"></view>
 				我已同意
-				<text @click="onPageJump('/pages/user/protocol')">《用户协议》</text>
+				<!-- <a href="https://main.nuttyreading.com/agreement.html">《用户协议》</a> -->
+				<!-- <text @click="onPageJump('/pages/user/protocol')">《用户协议》</text> -->
+				<span class="highlight" @click="showXieyi('user')">《用户协议》</span>
 				和
-				<text @click="onPageJump('/pages/user/protocol')">《隐私协议》</text>
-			</view>
+				<span class="highlight" @click="showXieyi('privacy')">《隐私协议》</span>
+				<!-- <text @click="onPageJump('/pages/user/protocol')">《隐私协议》</text>-->
+			</view> 
 			<view class="btn_box">
 				<button @click="onSubmit" class="active" v-if="btnShow">登 录</button>
 				<button v-else>登 录</button>
@@ -95,10 +98,10 @@
 						<view @click="onSubmit_Health">确定</view>
 					</view>
 				</view>
-			</z-popup>
+			</z-popup>		
 
 			<!-- #ifdef APP-PLUS -->  
-			<!-- <view class="third_party_login_box" v-if="isIos && system >= 13">
+			<!-- <view class="third_party_login_box" v-if="isIos && system >= 13">6
 				<view class="third_party_title"><text>第三方登录</text></view>
 				<view class="third_party_content">
 					<image src="../../static/icon/ic_login_weixin.png" v-if="isWeixin" @click="onWxAppLogin"
@@ -108,12 +111,22 @@
 				</view>
 			</view> -->
 			<!-- #endif -->
+			
+			<u-popup :show="xieyiShow" :round="10" @close="xieyiShow=false">
+				<view class="tanchu">
+					<view class="dp_title">{{xieyi.title}}</view>
+					<view style="max-height: 1000rpx;overflow-y: scroll;">
+						<view v-html="xieyi.content"></view>
+					</view>				
+				</view>
+			</u-popup>
 		</view>
-
+		
 	</view>
 </template>
 
 <script>
+	import $http from '@/config/requestConfig.js';
 	import md5 from '@/plugins/md5';
 	var clear;
 	import {
@@ -145,6 +158,11 @@
 				health_phone: '13333333333',
 				health_password: '123456',
 				isSee_H: false,
+				xieyiShow : false,
+				xieyi:{
+					title:'',
+					content:''
+				},
 			};
 		},
 		//第一次加载
@@ -165,6 +183,20 @@
 		methods: {
 			...mapMutations(['setUserInfo']),
 			...mapMutations(['setHealthMes']),
+			// 显示协议
+			showXieyi(str){	
+				this.xieyi = {}
+				this.$http
+					.get(`sys/agreement/list?key=${str}`)
+					.then(res => {	
+						
+						this.xieyi = res.page.list[0]
+						this.xieyiShow = true
+					}).catch((e)=>{
+						console.log(e)
+					})
+				
+			},
 			onPageJump(url) {
 				uni.navigateTo({
 					url: url
@@ -558,7 +590,23 @@
 </script>
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
-
+.highlight{color: $themeColor;}
+.tanchu {
+		padding: 40rpx 30rpx 40rpx 30rpx;
+		position: relative;
+	
+	
+		.dp_title {
+			font-size: 32rpx;
+			margin-bottom: 50rpx;
+			color: #555;
+			text-align: center;
+			font-weight: bold;
+		}
+	
+		
+		
+	}
 	.logo_bg {
 		background-image: url('@/static/icon/login_bg.png');
 		// background-position: center center;
diff --git a/pages/user/protocol.vue b/pages/user/protocol.vue
index 34cf9f5..256bcbe 100644
--- a/pages/user/protocol.vue
+++ b/pages/user/protocol.vue
@@ -18,6 +18,7 @@ export default {
 	},
 	//第一次加载
 	onLoad(e) {
+		console.log(e)
 		if(e.type){
 			this.type = parseInt(e.type);
 			let title;
@@ -40,6 +41,7 @@ export default {
 					type: this.type
 				})
 				.then(res => {
+					console.log(res)
 					this.$refs.article.setContent(res);
 				});
 		}
diff --git a/pages/yRead/angbook.vue b/pages/yRead/angbook.vue
index 2ab061b..1d64bc6 100644
--- a/pages/yRead/angbook.vue
+++ b/pages/yRead/angbook.vue
@@ -1169,10 +1169,13 @@ import { nextTick } from "vue";
 						chapterIndex: this.curChapter.chapterIndex,
 						progress: this.progress
 					})
+					//this.updateReadRateUl()   // 更新进度
+				}				
+					// 没有阅读过
 					// 将进度存到数据库
 					this.saveReadRateUl()
-					//this.updateReadRateUl()   // 更新进度
-				}
+					console.log('执行save')
+				
 				// oldReadSpeed:{      // 本地初始阅读进度
 				//    chapterIndex: null,
 				// 	updateReadId: null