新建分支前最后一次提交

2023-07-04 13:27:04 +08:00
parent e7d9d12556
commit 5bdbe1afc4
10 changed files with 122 additions and 59 deletions
--- a/components/navigation-video/navigation-video.vue
+++ b/components/navigation-video/navigation-video.vue
@@ -42,6 +42,11 @@ export default {
 					pagePath: 'pages/peanut/bookshelf',
 					tab: true
 				},
+				// {
+				// 	text: '我的订单',
+				// 	pagePath: 'pages/bookShop/orderList',
+				// 	tab: true
+				// },
 				{
 					text: '我的',
 					pagePath: 'pages/peanut/mine',
--- a/components/z-navigation/z-navigation.vue
+++ b/components/z-navigation/z-navigation.vue
@@ -38,11 +38,18 @@
 						selectedIconPath: 'static/tab/icon2_y.png',
 						text: '购物车'
 					},
+					// {
+					// 	pagePath: 'pages/peanut/bookshelf',
+					// 	iconPath: 'static/tab/icon3_n.png',
+					// 	selectedIconPath: 'static/tab/icon3_y.png',
+					// 	text: '我的书架'
+					// },
 					{
-						pagePath: 'pages/peanut/bookshelf',
+						pagePath: 'pages/bookShop/orderList',
 						iconPath: 'static/tab/icon3_n.png',
 						selectedIconPath: 'static/tab/icon3_y.png',
-						text: '我的书架'
+						text: '我的订单'
+						
 					},
 					{
 						pagePath: 'pages/peanut/mine',
--- 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') {
 	// 生产环境
--- 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/"



--- a/manifest.json
+++ b/manifest.json
@@ -79,7 +79,12 @@
            "sdkConfigs" : {
                "ad" : {},
                "maps" : {},
-                "share" : {},
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx47134a8f15083734",
+                        "UniversalLinks" : ""
+                    }
+                },
                "payment" : {
                    "alipay" : {
                        "__platform__" : [ "ios", "android" ]
--- a/pages.json
+++ b/pages.json
@@ -167,7 +167,8 @@
 		{
 			"path": "pages/user/login",
 			"style": {
-				"navigationBarTitleText": "登录"
+				"navigationBarTitleText": "登录",
+				"enablePullDownRefresh":false        // 禁止下拉刷新
 			}
 		},
 		{
@@ -285,11 +286,17 @@
 				"selectedIconPath": "static/tab/icon2_y.png",
 				"text": "购物车"
 			},
+			// {
+			// 	"pagePath": "pages/peanut/bookshelf",
+			// 	"iconPath": "static/tab/icon3_n.png",
+			// 	"selectedIconPath": "static/tab/icon3_y.png",
+			// 	"text": "我的书架"
+			// },
 			{
-				"pagePath": "pages/peanut/bookshelf",
+				"pagePath": "pages/bookShop/orderList",
 				"iconPath": "static/tab/icon3_n.png",
 				"selectedIconPath": "static/tab/icon3_y.png",
-				"text": "我的书架"
+				"text": "我的订单"
 			},
 			{
 				"pagePath": "pages/peanut/mine",
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -3,13 +3,13 @@
 		<!-- <z-nav-bar backState="2000" title="首页"></z-nav-bar> -->
 		<view class="home_bg">
 			<image src="../../static/icon/home_icon_1.png" mode="aspectFit" class="icon_hua_1"></image>
-			<view class="search_box" @click="onPageJump('./searchFor')">
+			<view v-if="showEbook" class="search_box" @click="onPageJump('./searchFor')">
 				<text class="icon_search"></text>
 				<text class="prompt">搜索...</text>
 			</view>
 		</view>
-		<view class="home_nar">
-			<view class="hn_cl_tit dianzishu" @click="onPageJump('../eBook/bookList')">
+		<view class="home_nar" v-if="showEbook">
+			<view  class="hn_cl_tit dianzishu" @click="onPageJump('../eBook/bookList')">
 				<image src="../../static/icon/home_bar_1.png" mode="aspectFit"></image>
 				<text>电子书</text>
 			</view>
@@ -32,7 +32,7 @@
 			<u-swiper :list="list3" indicator indicatorMode="line" circular style="height: 180rpx;"></u-swiper>
 		</view>

-		<view class="home_shujia">
+		<view class="home_shujia" v-if="showEbook">
 			<view class="hn_sj" @click="onTabJump('./bookshelf')">
 				<image src="../../static/icon/midBtn_01.png" mode="aspectFit"></image>
 				我的书架
@@ -82,13 +82,13 @@
 			</view>
 		</view>

-		<view class="head_line">
+		<view class="head_line" v-if="showEbook">
 			<b></b>
 			<text>新书上架</text>
 			<i @click="onBookMore('New')">查看更多 ></i>
 		</view>

-		<view class="home_xinshu">
+		<view class="home_xinshu" v-if="showEbook">
 			<view v-for="(item, index) in xinsList" @click="onBookJump(item)" v-if="index<3" class="hx_list">
 				<image :src="item.image"></image>
 				<view class="hx_title">{{item.bookName}}</view>
@@ -107,12 +107,12 @@
 			<br clear='both'>
 		</view>

-		<view class="head_line">
+		<view class="head_line" v-if="showEbook">
 			<b></b>
 			<text>限时特价</text>
 			<i @click="onBookMore('Sale')">查看更多 ></i>
 		</view>
-		<view class="home_limit">
+		<view class="home_limit" v-if="showEbook">
 			<u-scroll-list indicatorActiveColor="#27b386">
 				<view v-for="(item, index) in limiTist" :key="index" @click="onBookJump(item)" class="lt_list">
 					<image :src="item.image"></image>
@@ -128,12 +128,12 @@



-		<view class="head_line">
+		<view class="head_line" v-if="showEbook">
 			<b></b>
 			<text>精选书单</text>
 			<i @click="onBookMore('Best')">查看更多 ></i>
 		</view>
-		<view class="home_jingxu">
+		<view class="home_jingxu" v-if="showEbook">
 			<view class="hj_hot" v-for="(item,index) in jingList" @click="onBookJump(item)">
 				<view>
 					<text class="bok_name">{{item.bookName}}</text>
@@ -157,7 +157,8 @@
 		<view class="head_line">
 			<b></b>
 			<text>精选商品</text>
-			<i @click="onShopMore('Hot')">查看更多 ></i>
+			<!-- <i @click="onShopMore('Hot')">查看更多 ></i> -->
+			<i @click="onPageJump('../bookShop/classify')">查看更多 ></i>
 		</view>

 		<!-- 商品展示 -->
@@ -197,6 +198,7 @@
 	export default {
 		data() {
 			return {
+				showEbook:false,    // 显示电子书相关
 				transaction: { // 成功回调
 				
 				},
@@ -457,7 +459,7 @@

 				// 获取精选商品
 				this.$http
-					.post('book/shopproduct/appGetList?limit=4&page=1&istop=1')
+					.post('book/shopproduct/appGetList?limit=30&page=1&istop=1')
 					.then(res => {
 						this.goodsList = res.page.list
 					})
--- a/pages/peanut/mine.vue
+++ b/pages/peanut/mine.vue
@@ -58,12 +58,12 @@
 			<view class="nav_list" @click="onPageJump('../bookShop/orderList')">
 				<text>我的订单</text>
 			</view>
-			<view class="nav_list" @click="onPageJump('../eBook/bookBuy')">
+			<!-- <view v-if="showEbook" class="nav_list" @click="onPageJump('../eBook/bookBuy')">
 				<text>电子书购买记录</text>
-			</view>
-			<view class="nav_list" @click="onPageJump('../eBook/bookRecord')">
+			</view> -->
+			<!-- <view v-if="showEbook" class="nav_list" @click="onPageJump('../eBook/bookRecord')">
 				<text>阅读记录</text>
-			</view>
+			</view> -->
 			<view class="nav_list" @click="onPageJump('../user/persData')">
 				<text>修改个人资料</text>
 			</view>
@@ -73,6 +73,9 @@
 			<!-- <view class="nav_list" @click="onGoing()">
 				<text>帮助与反馈</text>
 			</view> -->
+			<view class="nav_list" @click="onShare">
+				<text>分享App</text>
+			</view>
 			<view class="nav_list" @click="onPageJump('../peanut/aboutUs')">
 				<text>关于我们</text>
 			</view>
@@ -95,12 +98,14 @@

 <script>
 	import $http from '@/config/requestConfig.js';
+	import appShare, { closeShare } from '@/uni_modules/zhouWei-APPshare/js_sdk/appShare';
 	import {
 		mapState
 	} from 'vuex';
 	export default {
 		data() {
 			return {
+				showEbook:false,    // 显示电子书相关
 				userMes: {},
 				signShow: false,
 				signContent: '是否要退出登录？'
@@ -139,6 +144,32 @@

 			},
 			
+			
+			//分享app
+			onShare(){
+				let shareData = {
+					 shareUrl:"https://sj.qq.com/appdetail/com.cn.nuttyreading?source=gdaq",
+					shareTitle:"疯子读书",
+					type:'0',
+					shareContent:"疯子读书",
+					shareImg:"static/fengziIcon.jpg",
+					appId : "wx47134a8f15083734", // 默认不传type的时候，必须传appId和appPath才会显示小程序图标
+					appPath : "https://sj.qq.com/appdetail/com.cn.nuttyreading?source=gdaq",
+					 appWebUrl : "https://sj.qq.com/appdetail/com.cn.nuttyreading?source=gdaq",
+				};
+				// 调用
+				let shareObj = appShare(shareData,res => {
+					console.log("疯子读书",res);
+					// 分享成功后关闭弹窗
+					// 第一种关闭弹窗的方式					
+					closeShare();
+				});
+				setTimeout(() => {
+					// 第二种关闭弹窗的方式
+					shareObj.close();
+				},5000);
+			},
+			
 			// 注销账户
 			logout(){
 				let that = this
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -40,7 +40,7 @@
 			<view class="protocol_box">
 				<view class="select" :class="{active: agree}" @click="agree = !agree"></view>
 				我已同意
-				<!-- <a href="https://main.nuttyreading.com/agreement.html">《用户协议》</a> -->
+				<!-- <text @click="plus.runtime.openURL('https://main.nuttyreading.com/agreement.html')">《用户协议》</text> -->
 				<!-- <text @click="onPageJump('/pages/user/protocol')">《用户协议》</text> -->
 				<span class="highlight" @click="showXieyi('user')">《用户协议》</span>
 				和
@@ -114,10 +114,10 @@
 			
 			<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 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>
@@ -128,6 +128,9 @@
 <script>
 	import $http from '@/config/requestConfig.js';
 	import md5 from '@/plugins/md5';
+	
+	import localuserxieyi from '@/static/json/userAndyinsiP.json'
+	import localyinsixieyi from '@/static/json/yinsiP.json'
 	var clear;
 	import {
 		mapState,
@@ -155,14 +158,16 @@
 				system: 13,
 				clearTime: null,
 				HealthOpen: false,
-				health_phone: '13333333333',
-				health_password: '123456',
+				// health_phone: '13333333333',
+				// health_password: '123456',
+				health_phone: '',
+				health_password: '',
 				isSee_H: false,
 				xieyiShow : false,
 				xieyi:{
 					title:'',
-					content:''
-				},
+					Content:''
+				}
 			};
 		},
 		//第一次加载
@@ -185,17 +190,14 @@
 			...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)
-					})
-				
+				if(str == 'user'){
+					this.xieyi = localuserxieyi
+				}else{
+					this.xieyi = localyinsixieyi
+				}
+				//console.log(localuserxieyi)				
+				this.xieyiShow = true
+								
 			},
 			onPageJump(url) {
 				uni.navigateTo({
--- a/pages/yRead/angbook.vue
+++ b/pages/yRead/angbook.vue
@@ -1521,14 +1521,13 @@ import { nextTick } from "vue";
 					this.musicManuShow = false
 					this.isAudioMenu = true					
 				} else {
-					let found = false
+					
 					this.verticalData.text.forEach((item, itemIndex) => {
 						// console.log(copyBookText[page][0][0],'copyBookText')
 						//console.log(item.content,'item')				
 						if (item.content.indexOf(nowRead) != -1) {
 							// 找到了
-							console.log(item.number, '找到了')
-							found = true
+							console.log(item.number, '找到了')							
 							this.domIndex = itemIndex
 							this.createAudio()
 							this.musicManuShow = false
@@ -1536,13 +1535,7 @@ import { nextTick } from "vue";
 							return
 						}
 					})
-					if (!found) {
-						uni.showToast({
-							title: '未找到音频',
-							icon: 'none',
-							duration: 2000
-						})
-					}
+					
 				}
 			},

@@ -1551,7 +1544,8 @@ import { nextTick } from "vue";
 				console.log('读到的位置', this.domIndex);
 				this.music = uni.createInnerAudioContext()
 				this.music.src = this.verticalData.text[this.domIndex].voices; // static文件夹下的音频地址
-				console.log(this.verticalData.text, '文本')
+				// console.log(this.music.src,'this.music.src')				
+				// console.log(this.verticalData.text, '文本')
 				// 找到符合条件的dom
 				console.log('domList', this.domList)
 				// 给对应dom高亮				
@@ -1560,13 +1554,23 @@ import { nextTick } from "vue";
 				console.log('highlight', this.highlight);
 				console.log('domIndex', this.domIndex);
 				// 判断是否有src
-				if (this.music.src) {
+				if (this.music.src != null) {
 					setTimeout(() => {
 						this.music.play(); //执行播放
 						this.musicPlaying = true
 						this.musicItem.musicPlaying = true
 						this.changeMusicItem()
 					}, 150)
+				}else{
+					console.log('没找到')
+					// 没有音频
+						uni.showToast({
+							title: '未找到音频',
+							icon: 'none',
+							duration: 2000
+						})
+						this.offAudio()				
+					
 				}
 				// 音频播放结束
 				this.music.onEnded(() => {
@@ -3337,7 +3341,7 @@ import { nextTick } from "vue";
 								this.touchTime = setTimeout(() => {
 									this.touchNum = 0
 								}, 250)
-								console.log('双击')
+								// console.log('双击')
 								ownerInstance.callMethod('showMenuCall', {
 									menuShow:true
 								})