ios也可以获得参数

App.vue

@@ -19,9 +19,9 @@
 	import Vue from 'vue'
 
 	export default {
-		data(){
+		data() {
-			return{
+			return {
-				platform:null,  // 系统
+				platform: null, // 系统
 			}
 		},
 		onLaunch: function(e) {
@@ -192,16 +192,28 @@
 				});
 			}
 			// #endif
+			// #ifdef APP-PLUS
+			 setTimeout(function(){
+				var args = plus.runtime.arguments;
+				if (args) {
+					// 处理args参数，如直达到某新页面等
+					console.log(args)					
+				}	
+			 },300)
+					
+			// #endif
+		},
+		onHide: function(){
+			 plus.runtime.arguments = ''
+			 console.log('清空')
 		},
-		onHide: function() {},
 		destroyed() {
 			store.commit('setUserInfo', {
 				'playFlag': true
 			})
 			console.log('页面销毁')
 		},
-		methods: {			
+		methods: {}
-		}
 	};
 </script>
 

config/baseUrl.js

@@ -7,9 +7,9 @@ if (process.env.NODE_ENV === 'development') {
 	// baseUrl = "https://twin-ui.com/demo/";
 	// baseUrl = "http://59.110.212.44:9200/pb/";
 	// baseUrl = "https://testapi.nuttyreading.com/";      // 线上测试环境
-	 baseUrl = "https://api.nuttyreading.com/";   // 线上正式
+	 // baseUrl = "https://api.nuttyreading.com/";   // 线上正式
 	// baseUrl = "http://192.168.110.100:9100/pb/";    //  开发用电脑
-	// baseUrl = "http://192.168.110.110:9200/pb/";
+	baseUrl = "http://192.168.110.110:9200/pb/";
 	  // baseUrl = "http://192.168.110.38:9200/pb/";        // 吴春磊笔记本1
 	// socketUrl = "ws://8.129.186.35:6001/";
 } else if (process.env.NODE_ENV === 'production') {
@@ -45,9 +45,10 @@ const courtConfig = {
 	}
 };
 //手机号验证正则表达式
-// const phoneRegular = /^1\d{10}$/;
+// (中国大陆)
+const phoneRegular = /^1\d{10}$/;
 // 手机号码验证 支持港澳台 大陆
-const phoneRegular = /^[1][3-8]\d{9}$|^([6|9])\d{7}$|^[0][9]\d{8}$|^[6]([8|6])\d{5}$|^(00){0,1}(65){1}[13689]\d{6,7}$/;
+// const phoneRegular = /^[1][3-8]\d{9}$|^([6|9])\d{7}$|^[0][9]\d{8}$|^[6]([8|6])\d{5}$|^(00){0,1}(65){1}[13689]\d{6,7}$/;
 //邮箱验证正则表达式
 const mailRegular = /^\w+@\w+(\.[a-zA-Z]{2,3}){1,2}$/;
 //密码验证正则表达式

config/requestConfig.js

@@ -167,6 +167,7 @@ $http.dataFactory = async function(res) {
 					title: '登录失效，请重新登录',
 					icon: 'none'
 				});
+				console.log('到这里了')
 				setTimeout(() => {
 					uni.navigateTo({
 						url: "/pages/user/login"

main.js

@@ -11,8 +11,8 @@ Vue.prototype.$bgm = bgm
  // Vue.prototype.$baseUrl = "http://59.110.212.44:9100/pb/"
  Vue.prototype.$baseUrl = "https://api.nuttyreading.com/" 
  // 安卓安卓包下载地址
-// Vue.prototype.$apkUrl = "https://www.nuttyreading.com/nuttyreading.apk"
+// Vue.prototype.$apkUrl = "https://www.nuttyreading.com/nuttyreading.apk"    // 本地地址
-Vue.prototype.$apkUrl = "https://www.nuttyreading.com/nuttyreading.apk"
+Vue.prototype.$apkUrl = "https://a.app.qq.com/o/simple.jsp?pkgname=com.cn.nuttyreading"    // 应用宝
 
 
 // uView组件库

manifest.json

@@ -12,8 +12,8 @@
             "src" : "图片路径"
         }
     ],
-    "versionName" : "1.2.12",
+    "versionName" : "1.2.16",
-    "versionCode" : 1212,
+    "versionCode" : 1216,
     "app-plus" : {
         "compatible" : {
             "ignoreVersion" : true
@@ -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://www.nuttyreading.com/agreement.html'>《用户协议》</a>和<a href='https://www.nuttyreading.com/privacy.html'>《隐私协议》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
                 "buttonAccept" : "同意",
                 "buttonRefuse" : "暂不同意"
             }
@@ -78,7 +78,8 @@
                 ],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
                 "minSdkVersion" : 21,
-                "targetSdkVersion" : 30
+                "targetSdkVersion" : 30,
+                "schemes" : "nuttyreading"
             },
             "sdkConfigs" : {
                 "ad" : {},
@@ -114,7 +115,9 @@
                         "com.apple.developer.associated-domains" : [ "applinks:verification.nuttyreading.com" ]
                     }
                 },
-                "idfa" : false
+                "idfa" : false,
+                "urltypes" : "nuttyreading",
+                "urlschemewhitelist" : "everhealth"
             },
             "icons" : {
                 "android" : {
@@ -154,7 +157,10 @@
         "splashscreen" : {
             "alwaysShowBeforeRender" : false
         },
-        "nativePlugins" : {}
+        "nativePlugins" : {},
+        "uniStatistics" : {
+            "enable" : true
+        }
     },
     // 5+App特有相关
     "quickapp" : {},
@@ -172,6 +178,9 @@
             "scope.userLocation" : {
                 "desc" : "你的位置信息将用于小程序位置接口的效果展示"
             }
+        },
+        "uniStatistics" : {
+            "enable" : true
         }
     },
     "h5" : {
@@ -184,9 +193,61 @@
             "treeShaking" : {
                 "enable" : true
             }
+        },
+        "uniStatistics" : {
+            "enable" : true
         }
     },
-    "_spaceID" : "mp-3614b80b-2d75-4462-a481-4998f8187274"
+    "_spaceID" : "mp-3614b80b-2d75-4462-a481-4998f8187274",
+    "uniStatistics" : {
+        "version" : "2",
+        "enable" : true
+    },
+    "mp-alipay" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-baidu" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-jd" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-kuaishou" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-lark" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-qq" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-toutiao" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "quickapp-webview-huawei" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "quickapp-webview-union" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    }
 }
 // 小程序特有相关
 

pages.json

@@ -561,13 +561,13 @@
 				"text": "我"
 			}
 		]
-	},
-	"condition": { //模式配置，仅开发期间生效
-		"current": 0, //当前激活的模式(list 的索引项)
-		"list": [{
-			"name": "", //模式名称
-			"path": "", //启动页面，必选
-			"query": "" //启动参数，在页面的onLoad函数里面得到
-		}]
 	}
+	// "condition": { //模式配置，仅开发期间生效
+	// 	"current": 0, //当前激活的模式(list 的索引项)
+	// 	"list": [{
+	// 		"name": "", //模式名称
+	// 		"path": "", //启动页面，必选
+	// 		"query": "" //启动参数，在页面的onLoad函数里面得到
+	// 	}]
+	// }
 }

pages/acupoint/acupoint.vue

@@ -62,7 +62,7 @@
 			return {
 				playData: {},
 				searchValue: '',
-				oneCateList: [], // 一级分类标题
+				oneCateList: [], // 一级分类标题1
 				twoCateList: [], // 二级分类标题
 				titleList:[], // 穴位标题
 				curOneCateIndex:0, // 当前选中的一级分类

pages/acupoint/acupointDetail.vue

@@ -8,7 +8,7 @@
 				:duration="duration">
 				<swiper-item v-for="(item, index) in acupointDetail.imageList" :key="index">
 					<view class="swiper-item">
-						<image :src="item" mode="aspectFit"></image>
+						<image :src="item" mode="aspectFit" @click="previewImage(item)"></image>
 					</view>
 				</swiper-item>
 			</swiper>
@@ -21,7 +21,7 @@
 					</view>
 				</uni-section>
 				<uni-section class="mb-10" titleFontSize="18px" title="别名" type="line">
-					<view class="item" v-if="acupointDetail.alias && acupointDetail.alias != ''">
+					<view class="item" v-if="acupointDetail.alias && acupointDetail.alias != ''" >
 						{{acupointDetail.alias}}
 					</view>
 					<view class="item" v-else>
@@ -30,20 +30,20 @@
 				</uni-section>
 				
 				<uni-section class="mb-10" titleFontSize="18px" title="所属经络" type="line">
-					<view class="item">
+					<view class="item" v-html="acupointDetail.meridian">
-						{{acupointDetail.meridian}}
+						
 					</view>
 				</uni-section>
 				
-				<uni-section class="mb-10" titleFontSize="18px" title="定位" type="line">
+				<uni-section class="mb-10" titleFontSize="18px" title="定位" type="line" >
-					<view class="item">
+					<view class="item" v-html="acupointDetail.position">
-						{{acupointDetail.position}}
+						
 					</view>
 				</uni-section>
 				
 				<uni-section class="mb-10" titleFontSize="18px" title="解剖" type="line">
-					<view class="item" v-if="acupointDetail.anatomy && acupointDetail.anatomy != ''">
+					<view class="item" v-if="acupointDetail.anatomy && acupointDetail.anatomy != ''" v-html="acupointDetail.anatomy">
-						{{acupointDetail.anatomy}}
+						
 					</view>
 					<view class="item" v-else>
 						暂无
@@ -51,14 +51,13 @@
 				</uni-section>
 				
 				<uni-section class="mb-10" titleFontSize="18px" title="主治" type="line">
-					<view class="item">
+					<view class="item" v-html="acupointDetail.indication">
-						{{acupointDetail.indication}}
+						
 					</view>
 				</uni-section>
 				
 				<uni-section class="mb-10" titleFontSize="18px" title="配伍" type="line">
-					<view class="item" v-if="acupointDetail.compatibility && acupointDetail.compatibility != ''">
+					<view class="item" v-if="acupointDetail.compatibility && acupointDetail.compatibility != ''" v-html="acupointDetail.compatibility">
-						{{acupointDetail.compatibility}}
 					</view>
 					<view class="item" v-else>
 						暂无
@@ -66,8 +65,8 @@
 				</uni-section>
 				
 				<uni-section class="mb-10" titleFontSize="18px" title="文献" type="line">
-					<view class="item" v-if="acupointDetail.literature && acupointDetail.literature != ''">
+					<view class="item" v-if="acupointDetail.literature && acupointDetail.literature != ''" v-html="acupointDetail.literature">
-						{{acupointDetail.literature}}
+						
 					</view>
 					<view class="item" v-else>
 						暂无
@@ -105,6 +104,19 @@
 			this.getDetail()
 		},
 		methods: {
+			// 放大图片
+			previewImage(url) {
+				console.log(url)
+				uni.previewImage({
+					urls: [url],
+					longPressActions: {
+						itemList: ['很抱歉，暂不支持保存图片到本地'],
+						success: function(res) {
+							// console.log(res,'+++++')
+						}
+					}
+				});
+			},
 			// 穴位详情
 			getDetail() {
 				$http.request({
@@ -139,7 +151,7 @@
 	.mb-10{ margin-bottom: 10px;}
 	.content{font-size: 28rpx;}
 	.swiper-item{
-		image{margin: 0 auto; height:200rpx;}
+		image{margin: 0 auto; height:250rpx;}
 		
 	}
 	.uni-margin-wrap{ margin-bottom: 20rpx; padding-top: 20rpx;

pages/bookShop/orderList copy.vue

@@ -0,0 +1,801 @@
+<template>
+	<view>
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<!-- <z-nav-bar title="我的订单"></z-nav-bar> -->
+		<z-nav-bar backState="2000" title="我的订单"></z-nav-bar>
+
+		<view class="orderTabs flexbox">
+			<view v-for="(item,index) in orderTabs" @click="orderTabCLi(item.value)"
+				:class="orderListTab==item.value?'ordStyle':''">{{item.name}}</view>
+		</view>
+
+		<view class="orderList" v-if="orderList.length > 0">
+			<view class="orderItem" v-for="(ifex,inten) in orderList" @click="goOrdiCont(ifex)" :key="inten">
+				<text class="orderState orderState0" v-if="ifex.orderStatus==0">待支付</text>
+				<text class="orderState orderState1" v-if="ifex.orderStatus==1">待发货</text>
+				<text class="orderState orderState2" v-if="ifex.orderStatus==2">待收货</text>
+				<text class="orderState orderState3" v-if="ifex.orderStatus==3">已完成</text>
+				<text class="orderState orderState5" v-if="ifex.orderStatus==5">已超时</text>
+				<view class="guoqi flexbox" v-if="ifex.orderStatus==0 && ifex.overTime > 0">
+					<text>剩余支付时间：</text>
+					<uni-countdown background-color="#ff5500" color="#ffffff" :font-size="14" :show-day="false"
+						:hour="0" :minute="0" :second="ifex.overTime" @timeup="countDown"></uni-countdown>
+				</view>
+				<view class="flexbox orderSn">
+					<text class="">订单编号: {{ifex.orderSn}}</text>
+				</view>
+				<view class="orderContent" :key="index" v-if="ifex.orderType=='order'"
+					v-for="(item,index) in ifex.productList">
+					<image :src="item.product.productImages" mode=""></image>
+					<view class="itemJian">
+						<view class="orderTitle">
+							<text>{{item.product.productName}}</text>
+						</view>
+						<view class="orderPrice">
+							<text style="color: #f56c6c;">￥</text><text
+								style="font-weight: bold; color: #f56c6c;">{{item.product.price}}</text><br>
+							<text style="color: #bbbbbb;font-size: 20rpx;margin-right: 10rpx;">X</text>
+							<text style="color: #bbbbbb;">{{item.quantity}}</text>
+						</view>
+						<br clear="both">
+					</view>
+					<br clear="both">
+				</view>
+				<view class="orderContent" v-if="ifex.orderType=='point'" @click.stop="goOrdiCont(ifex)">
+					<image src="../../static/icon/oder_chong.png" mode="" style="height: 150rpx;"></image>
+					<view class="itemJian">
+						<view class="orderTitle">
+							<text>天医币充值</text>
+						</view>
+						<view class="orderPrice">
+							<text style="color: #f56c6c;">￥</text><text
+								style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text>
+						</view>
+						<br clear="both">
+					</view>
+					<br clear="both">
+				</view>
+				<view class="orderContent" v-if="ifex.orderType=='vip'" @click.stop="goOrdiCont(ifex)">
+					<image src="../../static/icon/oder_vip.png" mode="" style="height: 150rpx;"></image>
+					<view class="itemJian">
+						<view class="orderTitle">
+							<text>会员充值</text>
+						</view>
+						<view class="orderPrice">
+							<text style="color: #f56c6c;">￥</text><text
+								style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text>
+						</view>
+						<br clear="both">
+					</view>
+					<br clear="both">
+				</view>
+				<view class="orderReal">
+					<span style="color: #999; float: left; font-size: 12px;">下单时间：{{ifex.createTime}}</span>
+					<span style="color: #999;margin-right: 10rpx;">实付款 : </span>
+					<span style=" color: #f56c6c;">￥</span><text
+						style="font-weight: bold; color: #f56c6c;">{{ifex.realMoney}}</text>
+				</view>
+				<view class="orderOper" v-if="ifex.orderStatus==0">
+					<view class="opFix" @click.stop = "canceOrder(ifex)">取消订单</view>
+					<view class="opCan" @click.stop = "getNewIap" v-if="ifex.orderType == 'point' && ifex.paymentMethod == '3'">重新下单</view>
+					<view class="opCan" v-else @click.stop = "goPay(ifex)">去支付</view>
+					
+				</view>
+			</view>
+			<view v-if="status==0" style="text-align: center;">
+				<u-loading-icon style="display: inline-block;"></u-loading-icon>
+				<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中</font>
+			</view>
+			<view v-if="status==1" style="padding-bottom: 20rpx;">
+				<u-divider text="全部加载完成"></u-divider>
+			</view>
+		</view>
+		<view class="" v-else style=" margin-top: 250rpx;">
+			<u-divider text="暂无订单数据"></u-divider>
+		</view>
+		<z-navigation></z-navigation>
+		<music-play :playData="playData"></music-play>
+	</view>
+</template>
+
+<script>
+	import musicPlay from '@/components/music.vue'
+	import $http from '@/config/requestConfig.js';
+	import {
+		setPay,
+		setPayAssign,
+		setWXPay
+	} from '@/config/utils';
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				playData: {},
+				orderTabs: [{
+					name: '全部',
+					value: null
+				}, {
+					name: '待支付',
+					value: 0
+				}, {
+					name: '待发货',
+					value: 1
+				}, {
+					name: '待收货',
+					value: 2
+				}, {
+					name: '已完成',
+					value: 3
+				}, {
+					name: '已超时',
+					value: 5
+				}, ],
+				orderListTab: null,
+				orderList: [],
+				iapChannel: {},
+				checking: false, // 正在检测
+				ComplateRequestArr: null,
+				isAndorid: true,
+				status: 3, // 加载状态
+				totalPage: 0,
+				page: 1
+			}
+		},
+		onHide() {
+			this.orderList = [],
+				this.page = 1
+			this.totalPage = 0
+			this.orderListTab = null
+		},
+		onShow() {
+			this.getOrderList()
+			// this.checkIapOrders() //检查未完成的苹果支付订单
+			this.getOS()
+			// this.countDown()
+
+		},
+		computed: {
+			...mapState(['userInfo']),
+		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			this.orderList = [],
+				this.page = 1
+			this.totalPage = 0
+			this.getOrderList()
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			console.log('到底了')
+			if (this.page < this.totalPage) {
+				this.page++
+				//	console.log('加载',this.page)
+				this.status = 0
+				this.getOrderList()
+			} else {
+				this.status = 1
+				console.log('加载完成了', this.page)
+				return
+			}
+		},
+		components: {
+			musicPlay
+		},
+		methods: {
+			...mapMutations(['setUserInfo']),
+			// 苹果用户重新下单
+			getNewIap(){
+				uni.navigateTo({
+					url:'/pages/peanut/reCharge'
+				})
+			},
+			// 倒计时回调
+			countDown() {
+				console.log('重新刷新订单')
+				this.totalPage = 0
+				this.page = 1
+				this.orderList = []
+				this.getOrderList()
+			},
+			// 获得操作系统
+			getOS() {
+				let oprateOs = ''
+				oprateOs = uni.getSystemInfoSync().platform
+				console.log(oprateOs)
+				if (oprateOs == 'android') {
+					this.isAndorid = true
+				} else {
+					this.isAndorid = false
+				}
+			},
+			checkIapOrders() {
+				const that = this
+				// 如果ios已经绑定支付信息，就直接支付，如果没有绑定，就需要先绑定
+				console.log('检测支付环境...')
+				plus.payment.getChannels((channels) => {
+					console.log(channels, 'channels')
+					for (var i in channels) {
+						// 判断是否苹果支付1
+						if (channels[i].id === 'appleiap') {
+							that.iapChannel = channels[i]
+							that.restoreComplateRequest() //  检查未关闭订单
+							// that.requestOrder(productId)							
+						}
+					}
+				})
+
+			},
+			// 切换订单状态
+			orderTabCLi(e) {
+				this.orderListTab = e
+				this.totalPage = 0
+				this.page = 1
+				this.orderList = []
+				this.getOrderList()
+			},
+
+			// 获取订单列表
+			getOrderList() {
+				let data = {
+					"userId": "",
+					"orderStatus": this.orderListTab,
+					"page": this.page,
+					"limit": 10,
+					'userId': this.userInfo.id
+				}
+
+				$http.request({
+					// url: "book/buyOrder/orderList",
+					url: "book/buyOrder/getUserOrderList",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+					data,
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					if (res.code == 0) {
+						res.page.records.forEach((item, index) => {
+							var seconds = item.timestamp + 30 * 60 + 2 // 过期时间 30分钟+2
+							// var seconds = item.timestamp + 30 + 2    // 过期时间 30秒
+							var nowSeconds = Math.floor(new Date().getTime() / 1000); // 单位秒
+							item.overTime = seconds - nowSeconds
+							// console.log(item.overTime,'item.overTime')
+						})
+						this.orderList = this.orderList.concat(res.page.records)
+						this.totalPage = res.page.pages
+						if (res.page.pages == this.page) {
+							this.status = 1
+						} else {
+							this.status = 3
+						}
+						console.log(this.orderList, '订单列表')
+					}
+				})
+
+			},
+
+			// 订单详情
+			goOrdiCont(e) {
+				console.log(e, 'e')
+				//let orderId = e.orderId ? e.orderId : e.id
+				if(e.orderType == 'point'){      // 充值订单	
+					console.log('跳转到充值页面')
+					uni.navigateTo({
+						url: '/pages/peanut/chargeDetaill?orderId=' + e.orderId + '&orderSn=' + e.orderSn
+					});
+				}else if(e.orderType == 'order'){	 // 实体订单			
+					uni.navigateTo({
+						url: './orderLCont?orderId=' + e.orderId + '&orderType=' + e.orderStatus  + '&orderSn=' + e.orderSn
+					});
+				}
+			},
+
+			// 跳转到支付页面
+			goPay1(e) {
+				console.log(e, 'goPay1')
+				uni.navigateTo({
+					url: '../peanut/reCharge?orderSn=' + e.orderSn
+				});
+			},
+
+			// 取消订单
+			canceOrder(e) {
+				uni.showModal({
+					title: '提示',
+					content: '确定要取消订单吗？',
+					confirmText: "取消订单",
+					cancelText: "考虑一下",
+					confirmColor: '#c96713',
+					cancelColor: '#555',
+					success: res => {
+						if (res.confirm) {
+							this.$http
+								.post(`book/buyOrder/appDelete?orderId=${e.orderId}`)
+								.then(res => {
+									uni.showToast({
+										icon: 'none',
+										title: '取消订单成功'
+									})
+									this.page = 1
+									this.totalPage = 0
+									this.orderList = []
+									this.getOrderList()
+								})
+						}
+					}
+				});
+			},
+
+			// 支付
+			goPay(payItem) {
+				console.log(payItem, 'payItem')
+				if (payItem.paymentMethod == 2) {
+					console.log('阿里支付')
+					setPay({
+						typePay: 'alipay',
+						subject: 'order',
+						totalAmount: payItem.realMoney,
+						type: 2,
+						relevanceoid: payItem.orderSn,
+						customerId: this.userInfo.id,
+					}, res => {
+						if (res.success) {
+							uni.showToast({
+								title: "支付成功"
+							});
+						} else {
+							uni.showToast({
+								title: "支付失败",
+								icon: "none",
+								image: '../../static/icon/ic_close.png'
+							});
+						}
+						this.orderList = [],
+							this.page = 1
+						this.totalPage = 0
+						this.getOrderList()
+					})
+				} else if (payItem.paymentMethod == 1) {
+					console.log('微信支付')
+					// console.log(this.isAndorid)				
+					if (this.isAndorid == false) {
+						uni.showModal({
+							title: '提示',
+							content: '很抱歉，苹果系统暂不支持微信支付',
+							showCancel: false
+						})
+						return false
+					} else {
+						let data1 = {
+							orderSn: payItem.orderSn,
+							buyOrderId: null,
+							totalAmount: payItem.realMoney
+						}
+						console.log(data1, 'data1')
+						setWXPay(data1, res => {
+							if (res.success) {
+								uni.showToast({
+									title: "支付成功"
+								});
+							} else {
+								console.log(res)
+								if (res.data.errMsg.indexOf('User canceled') != -1) {
+									uni.showToast({
+										title: "用户取消支付",
+										icon: "none",
+										image: '../../static/icon/ic_close.png'
+									});
+								} else {
+									uni.showToast({
+										title: "支付失败",
+										icon: "none",
+										image: '../../static/icon/ic_close.png'
+									});
+								}
+							}
+						})
+					}
+				} else if (payItem.paymentMethod == 3) {
+					// 苹果充值
+					console.log('苹果二次支付')
+					if (this.isAndorid) {
+						uni.showModal({
+							title: '提示',
+							showCancel: false,
+							content: '很抱歉，当前订单属于苹果系统内购订单，安卓系统无法完成支付操作，您可切换到苹果系统进行支付，也可以取消该订单，并重新下单'
+						})
+					} else {
+						this.iphonepay(payItem)
+					}
+				}
+			},
+			iphonepay(payItem) {
+				console.log(this.userInfo.restoreFlag, 'this.userInfo.restoreFlag')
+				if (this.ComplateRequestArr == null || this.ComplateRequestArr == []) {
+					this.requestOrder(payItem)
+				} else {
+					uni.showModal({
+						title: '提示',
+						showCancel: false,
+						content: '您的账户存在未完成的支付订单，请稍后重启app留意账户变动。',
+					})
+				}
+			},
+			requestOrder(payItem) {
+				uni.showLoading({
+					title: '获取商品信息',
+					mask: true
+				})
+				const that = this
+				// console.log(productId, 88888888)
+				// ['xxxxx'] 是平台申请拿到的内购商品的id 
+				let IAPOrders = []
+				IAPOrders.push(payItem.productId + '')
+				console.log(IAPOrders, 'IAPOrders')
+				// 新建订单
+				that.iapChannel.requestOrder(IAPOrders, function(event) {
+					// uni.hideLoading()
+					console.log(event, 'event')
+					for (var index in event) {
+						var OrderItem = event[index]
+						// console.log(OrderItem, 'OrderItem')
+						console.log(OrderItem.productid, 'OrderItem.productid')
+						that.topay(payItem)
+					}
+				}, function(erroemsg) {
+					uni.showToast({
+						title: "商品获取失败",
+						icon: 'none'
+					})
+				})
+			},
+			topay(payItem) {
+				const that = this
+				uni.hideLoading()
+				// var restoreFlag = true; // 调用支付接口时标记 restoreFlag = true , 实际应用请将标记存储在 storage 中  
+				this.setUserInfo({
+					restoreFlag: true
+				});
+				console.log(this.userInfo, '更新后的用户信息')
+				plus.payment.request(that.iapChannel, {
+					productid: payItem.productId,
+					username: payItem.orderSn, // 用户标识/订单标识 					
+					manualFinishTransaction: true // 3.5.1+ 支持，设置此参数后需要开发者主动关闭订单，参见下面的关闭订单方法 finishTransaction()
+
+				}, function(result) {
+					// restoreFlag = false; // 支付成功清除标记 restoreFlag = false 					
+					that.transaction = result
+					// 支付成功，result 为 IAP商品交易信息对象 IAPTransaction 需将返回的支付凭证传给后端进行二次认证  
+					that.iapCheck(result)
+				}, function(e) {
+					if (e.errCode == 2) {
+						// 用户未绑定支付方式，app内支付流程结束，系统弹出框引导用户绑定支付方式，此过程将跳转到系统应用 AppStore 进行绑定支付方式，绑定成功同步支付成功，用户成功付款
+						// plus.runtime.openURL("https://apps.apple.com/account/billing");
+					} else {
+						// restoreFlag = false; // 支付失败清楚标记					
+						that.finishTransaction(result);
+						//console.log('订单关闭后的用户信息', that.userInfo);
+						// console.log(e)	
+						//console.log(e.message)
+					}
+				});
+			},
+			// 查询未关闭订单
+			restoreComplateRequest() {
+				let that = this
+				console.log('检测未完成订单')
+				// console.log(that.iapChannel,'this.iapChannel')				
+				that.iapChannel.restoreComplateRequest({
+					manualFinishTransaction: true
+				}, function(results) {
+					console.log('进入restoreComplateRequest')
+					// if(!that.checking){
+					// that.checking = true
+					// console.log(that.checking)
+					// results 格式为数组存放恢复的IAP商品交易信息对象 IAPTransaction，通用需将返回的支付凭证传给后端进行二次认证  
+					that.ComplateRequestArr = results
+					console.log(that.ComplateRequestArr, '未完成订单数组')
+					if (results && results.length > 0) {
+						results.map((item, index) => {
+							// "0"为正在支付；"1"为支付成功；"2"为支付失败；"3"为支付已恢复。
+							if (item.transactionState == '1') {
+								// 已经支付，但是没有走逻辑的内购订单								
+								that.iapCheck(item, index)
+							} else {
+								// 其他状态的内购订单
+								that.finishTransaction(item)
+
+							}
+						})
+					} else {
+						this.setUserInfo({
+							restoreFlag: false
+						});
+						console.log('无未处理订单，可以拉起新的支付')
+					}
+					// }
+				});
+
+
+			},
+			// 关闭交易订单
+			finishTransaction(trans, index) {
+				this.iapChannel.finishTransaction(trans, (success) => {
+					console.log('关闭订单成功', index);
+
+					if (index == this.ComplateRequestArr.length - 1) { // 最后一个支付订单
+						this.setUserInfo({
+							restoreFlag: false
+						});
+						console.log(this.userInfo.restoreFlag, 'this.userInfo.restoreFlag')
+					}
+
+				}, (fail) => {
+					console.log('关闭订单失败');
+				});
+			},
+			iapCheck(result, index) {
+				const that = this
+				console.log('进入后台验证')
+				let data = {
+					transactionId: result.transactionIdentifier, // 支付交易id
+					customerOid: that.userInfo.id,
+					productId: result.payment.productid, // 产品id
+					orderId: result.payment.username, // 系统订单号
+					receiptData: result.transactionReceipt, // 苹果返回收据
+					loadAnimate: 'none', // 请求加载动画
+				}
+				console.log(data, 'data')
+				$http.request({
+					url: "/Ipa/veri",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data,
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					console.log(JSON.stringify(res))
+					console.log(res.code)
+					if (res.code == 0) {
+						// uni.hideLoading()
+						console.log('充值订单已处理，请留意账户金额变动....')
+						// 服务器验证票据有效后在客户端关闭订单
+						that.finishTransaction(result, index)
+					} else if (res.code == 200) { // 重复验证订单
+						console.log('重复验证....')
+						that.finishTransaction(result, index)
+					}
+				}).catch(e => {
+					console.log('支付验证失败，进入轮询程序...')
+					that.getIapPayResult(result, index)
+				})
+				console.log('--------------')
+			},
+
+			// 轮询验证支付结果			
+			getIapPayResult(result, index) {
+				// let interval = null
+				this.ComplateRequestInterval = setTimeout(() => {
+					if (this.maxTimes <= 3) {
+						this.iapCheck(result, index)
+						console.log('执行1', this.maxTimes, this.ComplateRequestInterval)
+						this.maxTimes += 1
+					} else {
+						this.maxTimes = 0
+						console.log('停止轮询', this.maxTimes, this.ComplateRequestInterval, this.maxTimes)
+						this.checking = false
+						this.saveErrorIapOrder(result, index)
+						clearTimeout(this.ComplateRequestInterval)
+
+					}
+				}, 10000)
+
+			},
+			// 轮询失败接口
+			saveErrorIapOrder(result, index) {
+				console.log('提交到充值问题单里面...')
+				let data = {
+					transactionId: result.transactionIdentifier,
+					failureflag: 1,
+					orderId: result.payment.username,
+					receiptData: result.transactionReceipt,
+					productId: result.payment.productid,
+					customerOid: this.userInfo.id
+				}
+				$http.request({
+					url: "Ipa/failure",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data,
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					console.log(JSON.stringify(res))
+					if (res.code == 200) {
+						console.log('提交成功，关闭订单')
+						this.finishTransaction(result, index)
+					}
+				}).catch(e => {
+					console.log(e)
+					if (e.statusCode == 0) { // 重复提交，直接关闭订单
+						this.finishTransaction(result, index)
+					}
+				})
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import '@/style/mixin.scss';
+
+	.guoqi {
+		font-size: 28rpx;
+		align-items: center;
+		color: red;
+		float: right;
+		line-height: 40rpx;
+	}
+
+	.flexbox {
+		display: flex;
+	}
+
+	.orderTabs {
+		margin: 60rpx 0 0 0;
+		width: 100%;
+		padding: 30rpx 3% 3% 3%;
+		// padding-top: 100rpx;
+		position: fixed;
+		top: 80rpx;
+		background-color: #fff;
+		z-index: 100;
+
+		view {
+			border-radius: 20rpx;
+			border: 1px solid #d0d0d0;
+			display: inline-block;
+			padding: 20rpx 0;
+			margin: 0 6rpx;
+			// margin: 40rpx 0 15rpx 0;
+			width: 20%;
+			text-align: center;
+			font-size: 30rpx;
+		}
+
+		.ordStyle {
+			background: #f0f9eb;
+			border: 2rpx solid #54a966;
+			color: #54a966;
+			font-weight: bold;
+		}
+	}
+
+	.orderList {
+		padding: 20rpx;
+		margin-top: 130rpx;
+
+		.orderItem {
+			position: relative;
+			padding: 30rpx 10rpx 30rpx 30rpx;
+			background-color: #fff;
+			border-radius: 30rpx;
+			margin-bottom: 30rpx;
+
+			.orderSn {
+				font-size: 26rpx;
+				color: #999;
+				padding-bottom: 20rpx;
+				border-bottom: 1px solid #eee;
+				margin-top: 60rpx;
+				margin-bottom: 30rpx;
+			}
+
+			.orderState {
+				color: #fff;
+
+				position: absolute;
+				left: 0;
+				top: 20rpx;
+				padding: 10rpx;
+				border-radius: 0 24rpx 24rpx 0;
+				font-size: 26rpx;
+				// font-weight: bold;				
+				color: #fff;
+			}
+
+			.orderState0 {
+				background-color: #e6a23c;
+			}
+
+			.orderState1 {
+				background-color: #409eff;
+			}
+
+			.orderState2 {
+				background-color: #f56c6c;
+			}
+
+			.orderState3 {
+				background-color: #67c23a;
+			}
+
+			.orderState5 {
+				background-color: #787878;
+			}
+
+			.orderContent {
+				margin-bottom: 20rpx;
+
+				image {
+					width: 130rpx;
+					height: 140rpx;
+					margin-right: 20rpx;
+					float: left;
+				}
+
+				.itemJian {
+					float: left;
+					width: 470rpx;
+
+					.orderTitle {
+						// font-weight: bold;
+						font-size: 28rpx;
+						margin: 0 0 20rpx 0;
+						float: left;
+						width: 410rpx;
+					}
+
+					.orderPrice {
+						font-size: 28rpx;
+						float: right;
+						width: 60rpx;
+						text-align: right;
+						line-height: 40rpx;
+					}
+				}
+
+
+			}
+
+			.orderReal {
+				border-top: 1px solid #eee;
+				text-align: right;
+				font-size: 30rpx;
+				margin: 30rpx 20rpx 0 0;
+				padding: 30rpx 0 0 0;
+			}
+
+			.orderOper {
+				text-align: right;
+				margin: 30rpx 20rpx 0 0;
+
+				view {
+					margin-left: 20rpx;
+					padding: 10rpx 0;
+					display: inline-block;
+					width: 150rpx;
+					font-size: 25rpx;
+					text-align: center;
+				}
+
+				.opFix {
+					color: #555;
+					border: 1px solid #ddd;
+					border-radius: 30rpx;
+				}
+
+				.opCan {
+					color: #c96713;
+					border: 1px solid #eba00b;
+					border-radius: 30rpx;
+				}
+			}
+		}
+	}
+</style>

pages/bookShop/orderList1.vue

@@ -0,0 +1,624 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<view class="header">
+			<!-- 顶部导航栏 -->
+			<z-nav-bar backState="2000" title="我的订单"></z-nav-bar>
+            <view class="ordersTabs">
+			    <view v-for="(item,index) in ordersTabs" @click="ordersTabCLi(item.value)" :key="index"
+				:class="ordersListTab==item.value?'ordersdefine ordStyle':'ordersdefine'">
+					{{item.name}}
+					<view class="ordersnum">22</view>
+				</view>
+		    </view>
+		</view>
+        <!-- 站位 -->
+        <view class="ordersTabs" style="z-index:0;position:unset;">
+            <view class="ordersdefine">1</view>
+        </view>
+        <view v-if="ordersListTab == 1">
+            <view v-if="newList.length > 0">
+                <view class="orderInfo" v-for="(item,index) in newList" :key="index">
+                    <view class="mainContent">
+                        <view class="item" @click.stop="toDetail(item)">
+                            <view class="orderstatus">已完成</view>
+							<view>
+								<image class="feng" v-if="item.bookimage" :src="item.bookimage" mode="aspectFill"></image>
+								<!-- <view class="description" v-html="item.content">
+								</view> -->
+								<view class="btns flexbox">
+									<span class="booknameleft">{{item.bookname}}</span>
+									<span class="right flexbox opbtns">
+										¥76
+									</span>
+								</view>
+								<view class="btns flexbox" style="margin-top:10rpx;padding-bottom: 72rpx;">
+									<span class="left" style="color: #C0C4CC;"></span>
+									<span class="right flexbox opbtns" style="color: #C0C4CC;">
+										×1
+									</span>
+								</view>
+                            </view>
+							<view class="btns flexbox" style="margin-top:10rpx;">
+                                <span class="left" style="color: #C0C4CC;"></span>
+                                <span class="right flexbox opbtns">
+                                    <view style="color: #000;font-size:30rpx;font-weight:700;">实付款</view>
+                                    <view style="color: #000;font-size:30rpx;font-weight:700;">{{'　¥' + item.commentNum}}</view>
+                                </span>
+                            </view>
+							<view class="btns flexbox" style="margin-top:10rpx;">
+                                <span class="left" style="color: #C0C4CC;">订单详情</span>
+                                <span class="right flexbox opbtns">
+                                    <view style="color: #000;border:1px solid #999;border-radius: 10rpx;padding: 0 10rpx;">查看物流</view>
+                                    <view style="color: #000;border:1px solid #999;border-radius: 10rpx;padding: 0 10rpx;margin-left:20rpx;width:140rpx;text-align: center;">评价</view>
+                                </span>
+                            </view>
+                            <view style="border-bottom:2rpx solid #e9e9e9;height:50rpx;" v-if="index<item.length-1"></view>
+                        </view>	
+                    </view>
+                </view>
+            </view>
+            <view class="quesheng" v-else>
+                暂无书评内容~
+            </view>
+        </view>
+        <view v-if="ordersListTab == 2">
+            <view v-if="hotList.length > 0">
+                <view class="orderInfo" v-for="(item,index) in hotList" :key="index">
+                    <view class="mainContent">
+                        <view class="item" @click.stop="toDetail(item)">
+                            
+                            <view class="orderstatus">{{item.title}}</view>
+                            <image class="feng" v-if="item.bookimage" :src="item.bookimage" mode="aspectFill"></image>
+                            <view class="description" v-html="item.content">
+                            </view>
+                            <view class="btns flexbox">
+                                <span class="left">{{item.bookname}}</span>
+                                <span class="right flexbox opbtns" style="color:#3c9cff;">
+                                    全文
+                                </span>
+                            </view>
+                            <view class="btns flexbox" style="margin-top:10rpx;">
+                                <span class="left" style="color: #C0C4CC;">{{item.createTime}}</span>
+                                <span class="right flexbox opbtns">
+                                    <image class="gzicon" v-if="item.ilike" src="../../static/icon/gz2.png" mode="aspectFill" @click.stop="clickLike(item)"></image>
+                                    <image class="gzicon" v-else src="../../static/icon/gz.png" mode="aspectFill"></image>
+                                    <view style="color: #C0C4CC;">{{item.contlike}}</view>
+                                    <image class="gzicon" v-if="1" src="../../static/icon/pinglun.png" mode="aspectFill"></image>
+                                    <view style="color: #C0C4CC;">{{item.commentNum}}</view>
+                                </span>
+                            </view>
+                            <view style="border-bottom:2rpx solid #e9e9e9;height:50rpx;" v-if="index<item.length-1"></view>
+                        </view>	
+                    </view>
+                </view>
+            </view>
+            <view class="quesheng" v-else>
+                暂无书评内容~
+            </view>
+        </view>
+        <!-- <view v-if="ordersListTab == 3">
+			<view class="" style="padding:40rpx 20rpx;">
+				<view class="mytabs flexbox">
+					<view :class="['item','item1', contentShow == 1 ? 'active' :'']" @click="setData(1)">
+						已购图书
+					</view>
+					<view :class="['item','item2', contentShow == 2 ? 'active' :'']" @click="setData(2)">
+						推荐图书
+					</view>
+				</view>
+			</view>
+            <view v-if="bookList.length > 0">
+                <view class="orderInfo3" v-for="(item,index) in bookList" :key="index">
+                    <view class="mainContent3">
+                        <view class="item">
+                            <view class="btns flexbox" @click.stop="toMore(item)">
+                                <view class="title">{{item.name}}</view>
+                                <view class="pianshuping">{{item.forumNum}}篇书评</view>
+                            </view>
+                            <image class="feng" v-if="item.images" :src="item.images" mode="aspectFill" @click.stop="toMore(item)"></image>
+                            <view class="shupingList">
+                                <view class="description" v-for="(item1,index1) in item.forums" :key="index1" @click.stop="toDetail(item1)">{{item1.title}}</view>
+                            </view>
+                            <view class="btns flexbox" @click.stop="toMore(item)">
+                                <span class="left"></span>
+                                <span class="right flexbox opbtns" style="color:#3c9cff;">
+                                    全部
+                                </span>
+                            </view>
+                        </view>	
+                    </view>
+                </view>
+            </view>
+            <view class="quesheng" v-else>
+                暂无书评内容~
+            </view>
+        </view> -->
+		
+		<view v-if="status==0" style="text-align: center;">
+			<u-loading-icon style="display: inline-block;"></u-loading-icon>
+			<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中</font>
+		</view>
+		<view v-if="status==1" style="padding-bottom: 20rpx;">
+			<u-divider text="全部加载完成"></u-divider>
+		</view>
+		
+		<music-play :playData="playData"></music-play>
+	</view>
+</template>
+
+<script>
+	import $http from '@/config/requestConfig.js';
+	import emotion from '@/bkhumor-emojiplus/components/bkhumor-emojiplus/bkhumor-emojiplus.vue';
+   import musicPlay from '@/components/music.vue'
+import { data } from 'jquery';
+   import {
+   	mapState, mapMutations
+   } from 'vuex';
+	export default {
+		data() {
+			return {
+				// loadingNow : false,
+				playData:{},
+				emojiIcon:'cuIcon-emoji',
+				windowWidth:0,
+				bookid:null,
+				booklistpage: 1,
+				productList:[],
+				productInfo:{},
+				pingjiaShow:false, //添加评价 
+				Pform:{ // 评价表单
+					star:0,
+					comment:'',
+					img:[],
+					html:''
+				},
+				emoji:[],
+				Files:[],
+				page:1,
+				pageSize:10,
+				total:0,
+				status:3,
+				shupingList:[],
+				bfaid:null,
+                ordersTabs: [{
+					name: '全部',
+					value: 1
+				}, {
+					name: '待付款',
+					value: 2
+				}, {
+					name: '待发货',
+					value: 3
+				}, {
+					name: '待收货',
+					value: 4
+				}, {
+					name: '已完成',
+					value: 5
+				}],
+				ordersListTab: 1,
+                newestpage: 1,
+                hotestpage: 1,
+                booksetpage: 1,
+                newList:[],
+                hotList:[],
+                bookList:[],
+				contentShow: 1,
+
+			}
+		},
+		onPullDownRefresh() {
+			console.log('下拉刷新了')
+			uni.stopPullDownRefresh(); 
+			  
+            this.newestpage = 1
+            this.hotestpage = 1
+            this.booksetpage = 1
+            this.newList = []
+            this.hotList = []
+            this.bookList = []
+            this.getBookList(this.ordersListTab, false)
+			   
+		},
+		onReachBottom() {
+            this.newestpage++
+            this.hotestpage++
+            this.booksetpage++
+            this.getBookList(this.ordersListTab, false)
+		},
+		onLoad(e) {
+			this.windowWidth = uni.getSystemInfoSync().windowWidth;
+			console.log(e,'onload')
+			// this.bookid = e.bookid
+			this.getBookList(1, false)
+		},
+		computed:{
+			...mapState(['userInfo']),
+		},
+		methods: {
+			...mapMutations(['setLoadingShow']),
+			setData(e) {
+				this.contentShow = e
+				this.getBookList(this.ordersListTab, true)
+			},
+            // 切换tab状态
+			ordersTabCLi(e) {
+				this.ordersListTab = e
+                this.newestpage = 1
+                this.hotestpage = 1
+                this.booksetpage = 1
+                this.newList = []
+                this.hotList = []
+                this.bookList = []
+				this.getBookList(this.ordersListTab, false)
+			},
+			// 查看本书更多书评
+			toMore(val){
+				console.log(val,'val')
+				uni.navigateTo({
+					url: '../comments/comments?bookid='+val.id,
+				});
+			},
+			// 书评详情
+			toDetail(val){
+				console.log(val,'val')
+				// uni.navigateTo({
+				// 	url:'../bookShop/commentsDetail?bookid='+val.bookid+'&bfa_id='+val.id
+				// })
+				uni.navigateTo({
+					url: './orderLCont?orderId=' + e.orderId + '&orderType=' + e.orderStatus  + '&orderSn=' + e.orderSn
+				});
+			},
+			getBookList(flag, tushuflag){
+				// 根据tab不同，获取最新书评、最热书评、书集列表
+				// uni.showLoading({
+				// 	title: '加载中'
+				// });			
+				
+                var httpurl = "" 
+                if(flag == 1){
+                    httpurl = "forum/articles/getForumsNew?page=" + this.newestpage + '&limit=10'
+                }else if(flag == 2){
+                    httpurl = "forum/articles/getForumsHot?page=" + this.hotestpage + '&limit=10'
+                }else{
+					if(tushuflag){ // 点击切换已购和推荐
+                		this.booksetpage = 1
+                		this.bookList = []
+					}
+					if(this.contentShow == 1){
+                    	httpurl = "forum/articles/getHasForumsAndBook?page=" + this.booksetpage + '&limit=10&userId=' + this.userInfo.id
+					} else {
+						httpurl = "forum/articles/getBestForumsAndBook?page=" + this.booksetpage + '&limit=10&userId=' + this.userInfo.id
+					}
+                }
+				this.$http
+					.post(httpurl)
+					.then(res => {
+
+                        if(flag == 1){
+                            this.newList = this.newList.concat(res.page.records)
+                        }else if(flag == 2){
+                            this.hotList = this.hotList.concat(res.page.records)
+                        }else{
+                            this.bookList = this.bookList.concat(res.page.records)
+                        }
+                        console.log(this.newList,'this.newList')
+						// let list = res.page.records
+						// console.log(list,'list')
+						// for(let i=0; i < list.length; i++){
+						// 	let data = {
+						// 		'page': 1,
+						// 		'limit': 3,
+						// 		'bookid' : list[i].bookid
+						// 	}
+						// 	this.$http
+						// 		.post('forum/articles/descupdatelist', data)
+						// 		.then(res => {
+						// 		// this.total = res.page.totalPage
+						// 		// this.shupingList = this.shupingList.concat(res.page.list)
+						// 		list[i].shupingList = res.page.list
+						// 		console.log(res.page.list,'评论获取成功')
+								
+						// 		console.log(list,'list')
+						// 		this.productList.push(list[i])
+						// 		console.log(this.productList,'productList')
+						// 		// this.status = 3
+						// 	}).catch((e)=>{
+						// 			console.log(e,'e')
+						// 		})
+						// }
+						if(res.page.records.length != 10){
+							this.status = 1
+						} else {
+							this.status = 0
+						}						
+						// uni.hideLoading();
+					}).catch((e)=>{
+						console.log(e,'e')
+					})
+			},	
+			},
+		components:{
+			musicPlay,			
+			emotion			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+// @import '@/style/mixin.scss';
+.ordersTabs {
+    // margin: 70rpx 0 0 0;
+    width: 730rpx;
+    // padding: 0 3% 3% 3%;
+    position: fixed;
+    // top: 80rpx;
+    background-color: #f7faf9;
+    z-index: 100;
+
+    .ordersdefine {
+        display: inline-block;
+        padding: 20rpx 0 20rpx 0;
+        // margin: 40rpx 0 15rpx 0;
+        width:140rpx;
+        text-align: center;
+        font-size: 30rpx;
+		position: relative;
+		.ordersnum{
+			position: absolute;
+			top: 8rpx;
+			right: 0rpx;
+			background-color: red;
+            // border:1rpx solid #a3a3a3;
+			border-radius: 40rpx;
+			width: 28rpx;
+			height: 28rpx;
+			font-size: 20rpx;
+			font-weight: 500;
+			color: rgb(255, 255, 255);
+		}
+    }
+
+    .ordStyle {
+        // border-bottom: 4rpx solid #54a966;
+        // color: #54a966;
+        font-weight: bold;
+    }
+}
+
+
+	.flexbox{display: flex;}
+	.container{padding: 0 10px;}
+	.star{display: inline-block; width: 20px; height: 20px;  margin-right: 10rpx;}
+		.starGray{ background : url(../../static/icon/star_greey.png) no-repeat; background-size: contain; }
+		.starLight{ background : url(../../static/icon/star_light.png) no-repeat;  background-size: contain;}
+		.cuIcon-emoji {
+			background : url(../../static/biaoqing.png) no-repeat; background-size: contain;  display: block; margin-right: 20rpx;
+	width: 30px; 	}
+	.cuIcon-keyboard{background : url(../../static/biaoqing.png) no-repeat; background-size: contain;  display: block;
+	width: 30px; }
+	.tanchu {
+		padding: 40rpx 30rpx 40rpx 30rpx;
+		position: relative;
+	
+	
+		.dp_title {
+			font-size: 32rpx;
+			margin-bottom: 50rpx;
+			color: #555;
+			text-align: center;
+			font-weight: bold;
+		}
+	
+		.dp_add {
+			position: absolute;
+			top: 40rpx;
+			right: 30rpx;
+			font-size: 22rpx;
+			background-color: #fd6004;
+			color: #fff;
+			border-radius: 10rpx;
+			padding: 5rpx 10rpx;
+	
+			.u-icon {
+				display: inline-block;
+				margin-right: 5rpx;
+			}
+		}}
+	
+	.quesheng{text-align: center; margin-top: 100rpx; color: #8b8a91; padding-bottom: 20rpx; padding-top: 20rpx;}
+	.gengduoshuping{text-align: right; color: #0044ff; padding-bottom: 20rpx; padding-top: 20rpx;}
+	.orderInfo{
+		justify-content: space-between;
+		// margin-bottom: 15px;
+		background-color: #fff;
+		padding:20rpx;
+		border: 1px splid #999;
+		box-sizing: border-box;
+		// padding-bottom: 20rpx;
+		border-radius: 20rpx;
+		margin-bottom: 20rpx;
+		
+	}
+	.mainContent{
+		background-color: #fff; 
+		.item{
+			// padding: 10px;
+			// margin-bottom: 30rpx;
+			// border: 1px solid #999;
+			box-sizing: border-box;
+			// padding-bottom: 20rpx;
+			border-radius: 20rpx;
+			// margin-bottom: 20rpx;
+		}
+		.feng{
+            margin:0rpx 20rpx 0 0;
+            height: 160rpx;
+            width: 140rpx;
+            float:left;
+            border-radius: 20rpx;
+            border:1rpx solid #e9e9e9;
+        }
+		.orderstatus{font-size: 30rpx; color: red; text-align: right;padding-bottom: 10rpx;}
+		/deep/.description{
+			overflow: hidden;
+			color: #666;
+			text-overflow: -o-ellipsis-lastline;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			display: -webkit-box;
+			-webkit-line-clamp: 5;
+			line-clamp: 5;
+			-webkit-box-orient: vertical;
+			font-size: 26rpx;
+			margin-bottom: 20rpx;
+			margin-top:10rpx;
+			height: 172rpx;
+			img{
+				width: 100% !important;
+			}
+		}
+		.btns{
+			font-size: 28rpx;
+			justify-content: space-between;
+			align-items: center;
+			.booknameleft{
+                width: 372rpx;
+                color: #000000;
+			}
+			.left{
+                width: 300rpx;
+                color: #a1a1a1;
+            }
+            .right{
+                width: 350rpx;
+                display: flex;
+                justify-content: flex-end;
+                align-items: center;
+            }
+            .gzicon{
+                margin:0 0 0 20rpx;
+                height: 40rpx;
+                width: 40rpx;
+                // float:left;
+                // border-radius: 20rpx;
+                // border:1rpx solid #e9e9e9;
+            }
+			.opbtns{
+				.pingjia{margin-left: 10px;}
+			}
+		}
+	}
+	.mb30{margin-bottom: 30rpx; overflow: hidden;}
+
+    // .orderInfo3{
+    //     justify-content: space-between;
+	// 	// margin-bottom: 15px;
+	// 	background-color: #fff;
+	// 	padding:20rpx;
+	// 	border: 1px splid #999;
+	// 	box-sizing: border-box;
+	// 	// padding-bottom: 20rpx;
+	// 	border-radius: 20rpx;
+	// 	margin-bottom: 20rpx;
+    //     .mainContent3{
+    //         background-color: #fff; 
+    //         .item{
+    //             // padding: 10px;
+    //             // margin-bottom: 30rpx;
+    //             // border: 1px solid #999;
+    //             box-sizing: border-box;
+    //             // padding-bottom: 20rpx;
+    //             border-radius: 20rpx;
+    //             // margin-bottom: 20rpx;
+    //         }
+    //         .feng{
+    //             margin:10rpx 20rpx 0 0;
+    //             height: 240rpx;
+    //             width: 164rpx;
+    //             float:left;
+    //             border-radius: 20rpx;
+    //             border:1rpx solid #e9e9e9;
+    //         }
+    //         .title{font-size: 30rpx; font-weight: 700; color: #000; overflow: hidden;}
+    //         .pianshuping{
+    //             font-size: 24rpx;
+    //             color: red;
+    //         }
+    //         .shupingList{
+    //             min-height: 212rpx;
+    //         }
+    //         /deep/.description{
+    //             overflow: hidden;
+    //             color: #666;
+    //             text-overflow: -o-ellipsis-lastline;
+    //             overflow: hidden;
+    //             text-overflow: ellipsis;
+    //             display: -webkit-box;
+    //             -webkit-line-clamp: 1;
+    //             line-clamp: 1;
+    //             -webkit-box-orient: vertical;
+    //             font-size: 26rpx;
+    //             margin-bottom: 20rpx;
+    //             margin-top:10rpx;
+	// 			img{
+	// 				width: 100% !important;
+	// 			}
+    //         }
+    //         .btns{
+    //             font-size: 22rpx;
+    //             justify-content: space-between;
+    //             align-items: center;
+    //             .left{
+    //                 width: 300rpx;
+    //                 color: #a1a1a1;
+    //             }
+    //             .right{
+    //                 width: 300rpx;
+    //                 display: flex;
+    //                 justify-content: flex-end;
+    //                 align-items: center;
+    //             }
+    //             .gzicon{
+    //                 margin:0 0 0 20rpx;
+    //                 height: 40rpx;
+    //                 width: 40rpx;
+    //                 // float:left;
+    //                 // border-radius: 20rpx;
+    //                 // border:1rpx solid #e9e9e9;
+    //             }
+    //             .opbtns{
+    //                 .pingjia{margin-left: 10px;}
+    //             }
+    //         }
+    //     }
+    // }
+		
+	.mytabs {
+		// background: url('@/static/icon/bgtushu.png') no-repeat left top;
+		height: 80rpx;
+		// margin-bottom: 30rpx;
+
+		.item {
+			border-radius: 10rpx;
+			background-color: #c6ead0;
+			width: 48%;
+			// margin: 0 10rpx;
+			text-align: center;
+			color: #3c7f56;
+			font-size: 36rpx;
+			line-height: 80rpx;
+		}
+
+		.item.active {
+			background-color: #3c7f56;
+			color: #fff;
+		}
+
+		.item1 {
+			margin-right: 20rpx;
+		}
+	}
+</style>

pages/clock/clock.vue

@@ -661,7 +661,7 @@
 					.then(res => {
 						if (res.code == 0) {
 							console.log(res, '任务信息')
-							if (res.result != {}) {
+							if (res.result != {} && res.result) {
 								this.taskInfo = res.result
 								this.taskInfo.video != '' ? this.poster = this.taskInfo.video +
 									"?x-oss-process=video/snapshot,t_0,f_jpg" : ''
@@ -735,7 +735,7 @@
 					return
 				}
 
-				if (!this.taskInfo.id) {
+				if (this.taskInfo != null && !this.taskInfo.id) {
 					uni.showToast({
 						title: '当天未发布打卡任务,不可签到哦',
 						icon: 'none'

pages/eBook/bookContent.vue

@@ -22,7 +22,7 @@
 					<uni-tag class="tag" @click="toMore()" :inverted="true" text="书评" type="success"></uni-tag>
 					<uni-tag @click="gotoListen()"  class="tag" v-if="bookMessage.canListen" :inverted="true" text="听书" type="primary"></uni-tag>									
 					<!-- 1:打卡，2不打卡 -->
-					<uni-tag  @click="gotoclock()" v-if="bookMessage.clockIn == 1" class="tag" :inverted="true" text="签到" type="warning"></uni-tag>
+					<uni-tag  @click="gotoclock()" v-if="bookMessage.clockIn == 1" class="tag" :inverted="true" text="打卡" type="warning"></uni-tag>
 					<uni-tag  @click="goJiangShu()" v-if="bookMessage.teachIn == 1" class="tag" :inverted="true" text="讲书" type="error"></uni-tag>
 				</view>
 				<view class="buy" v-if="!bookMessage.isBuy">
@@ -224,7 +224,7 @@
 			// 去讲书
 			goJiangShu(){
 				uni.navigateTo({
-					url: '../talkBook/talkBookDetail?bookId='+ this.bookId					
+					url: '../talkBook/talkBookML?bookid='+ this.bookId					
 				});
 			},
 			// 去听书

pages/peanut/home.vue

@@ -3,33 +3,36 @@
 		<!-- <z-nav-bar backState="2000" title="首页"></z-nav-bar> -->
 		<view class="home_bg">
 			<view class="" style=" ">
-				<view class="icon_hua">
+				
-					<image src="../../static/icon/home_icon_3.png" mode="aspectFit" class="icon_hua_1"></image>
+					<view class="icon_hua">
-				</view>	
+						<image src="../../static/icon/home_icon_1.png" mode="aspectFit" class="icon_hua_1"></image>
-				<view class="hehan">
+					</view>	
-					<image src="../../static/icon/hehan.png" mode="aspectFit" class="icon_hua_1"></image>
+					<view class="hehan">
-				</view>	
+						<image src="../../static/icon/hehan.png" mode="aspectFit" class="icon_hua_1"></image>
-				<view class="fiveIcon flexbox" >
+					</view>	
+							
+				<view class="fiveIcon flexbox" style="justify-content: space-around;">
 					<div class="item item1" @click="onPageJump('../acupoint/acupoint')">
 						<image src="../../static/icon/five1.png" mode="aspectFit" ></image>
 						<text>经穴检索</text>
 					</div>
-					<div class="item item1">
+					<!-- <div class="item item1">
 						<image src="../../static/icon/five2.png" mode="aspectFit"></image>
 						<text>方药检索</text>
-					</div>
+					</div> -->
+					<!-- <div class="item item1">
+						<image src="../../static/icon/five4.png" mode="aspectFit"></image>
+						<text>五运六气</text>
+					</div> -->
 					<div class="item item1" @click="onPageJump('../peanut/searchFor')">
 						<image src="../../static/icon/five3.png" mode="aspectFit"></image>
 						<text>书名检索</text>
 					</div>
-					<div class="item item1">
+					
-						<image src="../../static/icon/five4.png" mode="aspectFit"></image>
+					<!-- <div class="item item1">
-						<text>五运六气</text>
-					</div>
-					<div class="item item1">
 						<image src="../../static/icon/five5.png" mode="aspectFit"></image>
 						<text>吴门医述</text>
-					</div>
+					</div> -->
 				</view>
 				<!-- <view class="search_box flexbox" @click="onPageJump('../peanut/searchFor')">
 					<view class="search">
@@ -49,24 +52,24 @@
 		<!-- <view class="home_nar" v-if="showEbook"> -->
 		<view class="home_nar">	
 				<view class="hn_cl_tit shuguan" @click="onPageJump('../clock/index')">
-					<image src="../../static/icon/home1.png" mode="aspectFit"></image>
+					<image src="../../static/icon/home1-1.png" mode="aspectFit"></image>
-					<text>打 卡</text>
+					<!-- <text>打 卡</text> -->
 				</view>	
 						
 			<view  class="hn_cl_tit dianzishu" @click="onPageJump('../listen/home')">
-				<image src="../../static/icon/home2.png" mode="aspectFit"></image>
+				<image src="../../static/icon/home2-1.png" mode="aspectFit"></image>
-				<text>听 书</text>
+				<!-- <text>听 书</text> -->
 			</view>			
 			
 			<!-- <view class="hn_cl_tit" @click="onPageJump('../bookShop/bookShopIndex')"> -->			
 			<view class="hn_cl_tit shuping" @click="onPageJump('../comments/commentsList')">
-				<image src="../../static/icon/home3.png" mode="aspectFit"></image>
+				<image src="../../static/icon/home3-1.png" mode="aspectFit"></image>
-				<text>书 评</text>
+				<!-- <text>书 评</text> -->
 			</view>
 			
 			<view class="hn_cl_tit chaoshi" @click="onPageJump('../talkBook/talkBook')">
-				<image src="../../static/icon/home4.png" mode="aspectFit"></image>
+				<image src="../../static/icon/home4-1.png" mode="aspectFit"></image>
-				<text>讲 书</text>
+				<!-- <text>讲 书</text> -->
 			</view>		
 		</view>
 
@@ -124,14 +127,14 @@
 			</view>
 		</view> -->
 
-		<view class="head_line" >
+		<view class="head_line" style="background-color: #fff;">
 			<b></b>
 			<text>新书上市</text>
 			<!-- <i @click="onBookMore('New')">查看更多 ></i> -->
 		</view>
 		
 		<view class="newBook">			
-			<scroll-view class="scroll-view_H " scroll-x="true" scroll-left="10">
+			<scroll-view class="scroll-view_H " scroll-x="true" scroll-left="10" style="margin-top: 0 !important;">
 				<view :class="['item']"  v-for="(item,index) in newBookList" :key="index">
 						<view class="videoBox" @click="goDetail(item.productId)">
 							<image  v-if="item.productImages != ''" :src="item.productImages" mode="scaleToFill"></image>
@@ -713,7 +716,7 @@
 		text{
 			font-size: 28rpx;  color: #11a669;
 		}	
-			image{width: 60rpx; height: 60rpx; margin: 0 auto; }
+			image{width: 56rpx; height: 56rpx; margin: 0 auto; }
 	}
 	.hehan{width: 80%; margin: 10rpx auto;}
 	.zhekou{
@@ -723,24 +726,26 @@
 	.priceAndnum{ font-size: 24rpx !important;
 		.price{color: #9b9b9b !important; font-size: inherit; font-weight: normal !important; display: block;}
 	}
-	.ProTabs{margin: 20rpx 0; padding:0 20rpx;
+	.ProTabs{
-		text{padding: 12rpx 14rpx; font-size: 32rpx;  border-radius: 10rpx; overflow: hidden; 
+		// margin: 20rpx 0; 
+	padding:0 20rpx;
+		text{padding: 8rpx 14rpx; font-size: 32rpx; display: inline-block; border-radius: 10rpx; overflow: hidden; 
 		// background-color: #eee;
 		 color: #55aa7f; margin-right: 10rpx;}
 		text.cur{background-color:#55aa7f ; color: #fff;}
 	}
-	.newBook{margin-top: 20rpx;}
+	// .newBook{margin-top: 10rpx;}
 	.scroll-view_H{background-color: #fff;white-space: nowrap;
-		 padding:10rpx ; }
+		 padding:10rpx ; margin-top: 12rpx;}
 	.scroll-view_H{ 
-		.item { padding: 10rpx; overflow: hidden; display: inline-block;
+		.item { padding: 10rpx; overflow: hidden; display: inline-block; padding-bottom: 0;
 			width: 180rpx !important; margin-right: 20rpx;  border-radius: 10rpx;
 			.videoBox{ 
 				image{display: block; width:150rpx; 
 				height: 170rpx; 
 				}
 			}
-			.bookName{display: block; margin-top: 20rpx;   color: #666; font-size: 24rpx; white-space: nowrap;					
+			.bookName{display: block; margin-top: 6rpx;   color: #666; font-size: 24rpx; white-space: nowrap;					
 		overflow-x: hidden; overflow: hidden;
 		text-overflow: ellipsis;}
 		}
@@ -748,7 +753,8 @@
 	}
 	.flexbox{display: flex;}
 	.head_line {
-		margin: 20rpx 0 0 0;
+		padding-top: 8rpx;
+		margin: 12rpx 0 0 0;
 
 
 		b {
@@ -790,8 +796,8 @@
 			image{width: 150rpx; height: 80rpx;}
 		}
 		.icon_hua{width: 100%; text-align: center; display: block;
-		image{width: 150rpx; height: 150rpx;  margin: 0 auto;}
+				image{width: 150rpx; height: 150rpx;  margin: 0 auto;}
-		}
+				}
 		.search_box { margin: 0 auto; margin-top: 20rpx;  align-items: center;
 			width: calc(100% - 30rpx);   margin-top: 0;
     margin-bottom: 20rpx;
@@ -826,28 +832,30 @@
 		}
 }
 	.home_nar {
-		margin: 30rpx 20rpx; justify-content: space-between;
+		background-color: #fff;
+		padding: 20rpx 30rpx;
+		 justify-content: space-between;
 		display: flex;
 		color: #333; 
-		// margin-bottom: 0;
+		 margin-bottom: 0;
 		// .dianzishu{  margin-right:10rpx;	
 		// 	background-color:#f8d6f4 ;  border: 2px solid #edcce9;
 		// }
 		// .chaoshi{background-color:#fff2d8 ;  border: 2px solid #ede6d3;	}
 		// .shuping{ background-color: #d6ffda; border: 2px solid #bae9bf;}
 		// .shuguan{ background-color:#e3f9f9 ;  border: 2px solid #d7eced; }
-		.hn_cl_tit { padding-bottom: 10rpx;
+		.hn_cl_tit { 
 			// width: 23%;
 			width: 31%; 
 			text-align: center;			 
-			 border-radius: 20rpx ;	padding-top: 10rpx;	
+			 border-radius: 20rpx ;		
 			// line-height: 110upx;
 			//display: flex;
 			align-content: center;
 			justify-content: center;
 			image {				
-				width:90%;
+				width:120rpx;
-				height:156rpx;
+				height:120rpx;
 				display: block;
 				margin: 0 auto;
 				// margin: 0 20rpx;
@@ -1116,13 +1124,13 @@
 
 	.goods {
 		width: 100%;
-	margin:18rpx 0 50rpx 0;
+	margin:0 0 50rpx 0; background-color: #fff;
 
 		.goodsItem {
 			display: inline-block;
 			width: 46%;
 			border-radius: 20rpx;
-			padding: 25rpx 25rpx 20rpx 25rpx;
+			padding: 25rpx; padding-bottom: 5rpx;
 			margin: 0 20rpx 20rpx 20rpx;
 			background-color: #fff;
 			border: 1px solid #eee;
@@ -1137,12 +1145,12 @@
 
 				.goodsName {
 					margin-top: 10rpx;
-					font-size: 30rpx;
+					font-size: 28rpx;
 					// font-weight: bold;
 				}
 
 				.goodsPrice {
-					font-size: 30rpx;
+					font-size: 28rpx;
 					margin: 5rpx 0 0 3rpx;					
 					display: flex; justify-content: space-between;
 					.price{

pages/peanut/mine.vue

@@ -58,6 +58,11 @@
 			<view class="nav_list" @click="switchTab('../bookShop/orderList')">
 				<text>我的订单</text>
 			</view>
+			
+			<view class="nav_list" @click="appJump()" v-if="this.osName != ''">
+				<text>打开一路健康</text>
+			</view>
+
 			<!-- <view class="nav_list" @click="onPageJump('../clock/clockList')">
 				<text>我的打卡</text>
 			</view> -->
@@ -89,7 +94,8 @@
 			<!-- <view class="nav_list" @click="onGoing()">
 				<text>帮助与反馈11111</text>
 			</view> -->
-			<view class="nav_list" @click="newOnShare" v-if="isAndorid">
+			<!-- <view class="nav_list" @click="newOnShare" v-if="isAndorid"> -->
+			<view class="nav_list" @click="newOnShare">
 				<text>分享App</text>
 			</view>
 			<view class="nav_list" @click="onPageJump('../peanut/aboutUs')">
@@ -122,18 +128,20 @@
 	import $http from '@/config/requestConfig.js';
 	// import appShare, { closeShare } from '@/uni_modules/zhouWei-APPshare/js_sdk/appShare';
 	import {
-		mapState
+		mapState,
+		mapMutations
 	} from 'vuex';
 	export default {
 		data() {
 			return {
-				showEbook:false,    // 显示电子书相关
+				showEbook: false, // 显示电子书相关
 				userMes: {},
 				signShow: false,
 				signContent: '是否要退出登录？',
-				playData:{},
+				playData: {},
-				isAndorid:true,	
+				isAndorid: true,
-				platform : null, // 设备系统
+				platform: null, // 设备系统
+				osName: '', // 系统名称
 			};
 		},
 		//第一次加载
@@ -143,6 +151,7 @@
 			// #ifdef APP-PLUS
 			this.getOS()
 			this.platform = uni.getSystemInfoSync().platform
+			this.osName = plus.os.name
 			// console.log('操纵系统',this.platform)
 			// #endif
 		},
@@ -154,26 +163,70 @@
 			// 隐藏原生的tabbar
 			uni.hideTabBar();
 			this.getData();
+
 		},
 		components: {
 			musicPlay
 		},
 		//方法
 		methods: {
+			...mapMutations(['setUserInfo']),
+
+			// app 跳转
+			appJump() {
+				// console.log(plus.os.name,'系统名称')
+				if (this.osName == "Android") { //安卓
+					if (plus.runtime.isApplicationExist({ //查看安卓系统手机有没有下载这款app
+							pname: 'cn.com.everhealth', //B款app云打包的包名
+						})) { //安装了app
+						plus.runtime.launchApplication({ //打开app
+							pname: "cn.com.everhealth", //B款app云打包的包名
+							extra: {
+								key1: "我是三方app携带的参数激活99" //B款app配置的schemes+云打包的包名
+							},
+							function(e) {
+								console.log("Open system default browser failed: " + e.message);
+							}
+						})
+					} else { //未安装app
+						plus.runtime.openURL('https://a.app.qq.com/o/simple.jsp?pkgname=cn.com.everhealth', function(res) {
+							//进入后台小哥哥给我的应用宝下载链接，让你们后台给你
+							//这链接会判断你手机是ios还是Android，Android进入应用宝下载app
+							//跟下面的是一个链接
+							console.log(res);
+						});
+					}
+				} else if (this.osName == "iOS") { //苹果
+					//因为ios查不到B款app在ios系统手机里面，其实下载了，也是检测不到，所以就不检测了
+					//直接打开B款app，B款app没有的话，会进入回调报错，我们在回调去打开下载链接
+					plus.runtime.launchApplication({
+						action: "everhealth://"
+					}, function(e) {
+						plus.runtime.openURL('https://a.app.qq.com/o/simple.jsp?pkgname=cn.com.everhealth',
+							function(res) {
+								//进入后台小哥哥给我的appStore下载app链接，，让你们后台给你
+								//这链接会判断你手机是ios还是Android，ios进入应用宝下载app
+								//跟上面的是一个链接
+								console.log(res);
+							});
+					});
+				}
+
+			},
 			// 获得操作系统
-			getOS(){
+			getOS() {
 				let oprateOs = ''
 				oprateOs = uni.getSystemInfoSync().platform
 				// console.log(oprateOs)
-				if(oprateOs == 'android'){
+				if (oprateOs == 'android') {
 					this.isAndorid = true
-				}else{
+				} else {
 					this.isAndorid = false
 				}
 			},
-			haveSelected(data){
+			haveSelected(data) {
-				console.log(data,' 选择的是')
+				console.log(data, ' 选择的是')
-				if(data.index == 0){    
+				if (data.index == 0) {
 					// 分享到好友
 					uni.share({
 						provider: "weixin",
@@ -183,14 +236,14 @@
 						title: "疯子读书",
 						summary: "我正在使用疯子读书提升自己，赶紧跟我一起来体验吧！",
 						imageUrl: "static/fengziIcon.jpg",
-						success: function (res) {
+						success: function(res) {
 							console.log("success:" + JSON.stringify(res));
 						},
-						fail: function (err) {
+						fail: function(err) {
 							console.log("fail:" + JSON.stringify(err));
 						}
 					});
-				}else if(data.index == 1){
+				} else if (data.index == 1) {
 					// 分享到朋友圈
 					uni.share({
 						provider: "weixin",
@@ -200,16 +253,16 @@
 						title: "疯子读书",
 						summary: "我正在使用疯子读书提升自己，赶紧跟我一起来体验吧！",
 						imageUrl: "static/fengziIcon.jpg",
-						success: function (res) {
+						success: function(res) {
 							console.log("success:" + JSON.stringify(res));
 						},
-						fail: function (err) {
+						fail: function(err) {
 							console.log("fail:" + JSON.stringify(err));
 						}
 					});
 				}
 			},
-			switchTab(url){
+			switchTab(url) {
 				uni.switchTab({
 					url: url
 				});
@@ -232,23 +285,23 @@
 			},
 
 			// 新写分享
-			newOnShare(){
+			newOnShare() {
 				this.$refs.share.open()
 			},
 
 			// 注销账户
-			logout(){
+			logout() {
 				let that = this
 				uni.showModal({
 					title: '提示',
 					content: '确定要注销当前账户吗？',
-					success: function (res) {
+					success: function(res) {
 						if (res.confirm) {
 							uni.showModal({
 								title: '提示',
-								showCancel:false,
+								showCancel: false,
 								content: `注销申请已提交成功,请联系客服进行后续操作：022-24142321`,
-								success: function (res1) {
+								success: function(res1) {
 									if (res1.confirm) {
 										that.signOut()
 									}
@@ -268,7 +321,7 @@
 				})
 			},
 			onPageJump(url) {
-				console.log(url,'url')
+				console.log(url, 'url')
 				uni.navigateTo({
 					url: url
 				});
@@ -278,6 +331,9 @@
 			// 退出登录
 			signOut() {
 				this.signShow = false
+				this.setUserInfo({
+					'token': null
+				})
 				uni.reLaunch({
 					url: '../user/login'
 				});

pages/talkBook/talkBook.vue

@@ -19,7 +19,7 @@
 		</view> -->
 		<view class="mainContainer">
 			<view class="item" v-if="bookList.length > 0">
-				<u-row gutter="16" justify="flex-start" >
+				<u-row gutter="16" justify="flex-start">
 					<u-col span="4" v-for="(item,index) in bookList" :key="index">
 						<view>
 							<view class="videoBox demo-layout bg-purple" @click="toDetail(item)">
@@ -52,27 +52,29 @@
 <script>
 	import $http from '@/config/requestConfig.js';
 	// import emotion from '@/bkhumor-emojiplus/components/bkhumor-emojiplus/bkhumor-emojiplus.vue';
-   import musicPlay from '@/components/music.vue'
+	import musicPlay from '@/components/music.vue'
-import { data } from 'jquery';
+	import {
-   import {
+		data
-   	mapState
+	} from 'jquery';
-   } from 'vuex';
+	import {
+		mapState
+	} from 'vuex';
 	export default {
 		data() {
 			return {
-				loadingNow : false,
+				loadingNow: false,
-				playData:{},				
+				playData: {},
-				windowWidth:0,
+				windowWidth: 0,
-				bookid:null,
+				bookid: null,
-				productInfo:{},	
+				productInfo: {},
-				page:1,
+				page: 1,
-				bookList:[],
+				bookList: [],
-				pageSize:9,
+				pageSize: 9,
-				total:0,
+				total: 0,
-				totalPage:0,
+				totalPage: 0,
-				status:3,
+				status: 3,
-				shupingList:[],
+				shupingList: [],
-				bfaid:null,
+				bfaid: null,
 				contentShow: 1,
 			}
 		},
@@ -96,12 +98,12 @@ import { data } from 'jquery';
 		},
 		onLoad(e) {
 			this.windowWidth = uni.getSystemInfoSync().windowWidth;
-			console.log(e,'onload')
+			console.log(e, 'onload')
 			this.bookid = e.bookid
-		//	this.getProDetail(e)
+			//	this.getProDetail(e)
 			this.getBooks()
 		},
-		computed:{
+		computed: {
 			...mapState(['userInfo']),
 		},
 		methods: {
@@ -109,84 +111,92 @@ import { data } from 'jquery';
 				this.contentShow = e
 				this.getBooks()
 			},
-			getBooks(){
+			getBooks() {
-				if(this.contentShow == 1){
+				if (this.contentShow == 1) {
 
 					$http.request({
-						url: "book/teach/getUserTeachBooks",
+							url: "book/teach/getUserTeachBooks",
-						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+							method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-						data: {
+							data: {
-							id: this.userInfo.id,
+								id: this.userInfo.id,
-							'limit': 100,
+								'limit': 100,
-							'page': this.page
+								'page': this.page
-						},
+							},
-						header: { //默认 无 说明：请求头
+							header: { //默认 无 说明：请求头
-							'Content-Type': 'application/json'
+								'Content-Type': 'application/json'
-						},
+							},
-					})
+						})
-					.then(res => {
+						.then(res => {
-						console.log(res,'讲书列表')
+							console.log(res, '讲书列表')
-						if(res.code == 0 && res.page.records.length > 0){
+							if (res.code == 0 && res.page.records.length > 0) {
-							this.bookList = res.page.records
+								this.bookList = res.page.records
-							this.totalPage = res.page.pages
+								this.totalPage = res.page.pages
-							this.status = 3
+								this.status = 3
-							console.log(this.bookList,'this.bookList')
+								console.log(this.bookList, 'this.bookList')
-						}else{
+							} else {
-							this.bookList = []
+								this.bookList = []
-							this.totalPage = 0
+								this.totalPage = 0
-						}					    
+							}
 
-					}).catch(e => {
+						}).catch(e => {
-						console.log(e,'e')
+							console.log(e, 'e')
-					});
+						});
-				}else{
+				} else {
 					$http.request({
-						url: "book/teach/getUserBestTeachBooks",
+							url: "book/teach/getUserBestTeachBooks",
-						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+							method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-						data: {
+							data: {
-							id: this.userInfo.id,
+								id: this.userInfo.id,
-							'limit': 100,
+								'limit': 100,
-							'page': this.page
+								'page': this.page
-						},
+							},
-						header: { //默认 无 说明：请求头
+							header: { //默认 无 说明：请求头
-							'Content-Type': 'application/json'
+								'Content-Type': 'application/json'
-						},
+							},
-					})
+						})
-					// this.$http
+						// this.$http
-					// .post('book/teach/getUserBestTeachBooks',{
+						// .post('book/teach/getUserBestTeachBooks',{
-					// 	id: this.userInfo.id,
+						// 	id: this.userInfo.id,
-					// 	'limit': 100,
+						// 	'limit': 100,
-					// 	'page': this.page
+						// 	'page': this.page
-					// })
+						// })
-					.then(res => {
+						.then(res => {
-						console.log(res,'讲书列表')
+							console.log(res, '讲书列表')
-						if(res.code == 0 && res.page.records.length > 0){
+							if (res.code == 0 && res.page.records.length > 0) {
-							this.bookList = res.page.records
+								this.bookList = res.page.records
-							this.totalPage = res.page.pages
+								this.totalPage = res.page.pages
-							this.status = 3
+								this.status = 3
-							console.log(this.bookList,'this.bookList')
+								console.log(this.bookList, 'this.bookList')
-						}else{
+							} else {
-							this.bookList = []
+								this.bookList = []
-							this.totalPage = 0
+								this.totalPage = 0
-						}					    
+							}
 
-					}).catch(e => {
+						}).catch(e => {
-						console.log(e,'e')
+							console.log(e, 'e')
-					});
+						});
 				}
 
 			},
 			// 书评详情
-			toDetail(val){
+			toDetail(val) {
-				console.log(val,'val')
+				// console.log(val,'val')
-				uni.navigateTo({
+				if (this.contentShow == 1) {
-					url:'./talkBookML?bookid='+val.id
+					uni.navigateTo({
-				})
+						url: './talkBookML?bookid=' + val.id
+					})
+				}
+				if (this.contentShow == 2) {
+					uni.navigateTo({
+						url: '../eBook/bookContent?Id=' + val.id
+					});
+				}
+
 			},
 
 
-			},
+		},
-		components:{
+		components: {
 			musicPlay
 
 		}
@@ -219,13 +229,25 @@ import { data } from 'jquery';
 			margin-right: 20rpx;
 		}
 	}
-.tip{
+
-		padding: 20rpx; background-color: #fff;
+	.tip {
-		text{ font-size: 36rpx;}
+		padding: 20rpx;
+		background-color: #fff;
+
+		text {
+			font-size: 36rpx;
+		}
 	}
-	.flexbox{display: flex;}
+
-	.container{padding: 10px;}
+	.flexbox {
-.bookName {
+		display: flex;
+	}
+
+	.container {
+		padding: 10px;
+	}
+
+	.bookName {
 		white-space: nowrap;
 		overflow-x: hidden;
 		text-overflow: ellipsis;
@@ -233,21 +255,29 @@ import { data } from 'jquery';
 		color: #333;
 		padding: 10rpx 0;
 	}
+
 	uni-image {
 		width: auto !important;
 		height: 350rpx;
 	}
+
 	.listenList {
 		padding: 10rpx;
 		box-sizing: border-box;
 		width: calc(100% - 10rpx);
 	}
+
 	.u-row {
 		flex-wrap: wrap;
 	}
+
 	.u-col {
 		overflow: hidden;
 		margin-bottom: 20rpx;
 	}
-	.mb30{margin-bottom: 30rpx; overflow: hidden;}
+
+	.mb30 {
+		margin-bottom: 30rpx;
+		overflow: hidden;
+	}
 </style>

pages/talkBook/talkBookML.vue

@@ -209,7 +209,7 @@
 				this.$http
 					.post('book/teach/getBookTeachItems', {
 						'bookId': this.bookid,
-						'limit': 10,
+						'limit': 20,
 						'page': this.page
 						// 'userid': this.userInfo.id,
 						// 'bookid': 
@@ -222,7 +222,9 @@
 								this.libLIst = this.libLIst.concat(res.page.records)
 								this.status = 3
 								this.totalPage = res.page.pages								
-														
+								if(this.totalPage = res.page.current){
+									this.status = 1
+								}						
 							} else {
 								this.libLIst = []
 								this.totalPage = 0

pages/user/addAddress.vue

@@ -253,7 +253,7 @@
 
 			},
 			changeHandler(e) { //城市选择时触发
-			console.log(e,'变化了',this.columnData, this.columnDatas)
+			// console.log(e,'变化了',this.columnData, this.columnDatas)
 			this.addressChanged = true
 				const {
 					columnIndex, //当前选择的列，省 / 市 / 区
@@ -278,7 +278,7 @@
 			},
 
 			addconfirm(e) { //点击确定按钮
-			console.log(e,'选中的值')
+			// console.log(e,'选中的值')
 				this.addressChanged = true
 				this.addreShow = false;
 				this.addressForm.areaidpathtext = e.value[0].UName + '-' + e.value[1].UName + '-' + e.value[2].UName

pages/user/login.vue

@@ -15,26 +15,31 @@
 				<!-- <view class="title" :class="{ active: type == 2000 }" @click="type = 2000">验证码登录/注册</view>
 				<view class="title" :class="{ active: type == 1000 }" @click="type = 1000">密码登录</view> -->
 			</view>
-			<view class="input_tit">手机号</view>
+			<view class="flexbox" style=" margin-top: 20rpx;">
-			<!-- 带区号 -->
+				<view class="input_tit" style="margin-top: 0; margin-right: 20rpx;">手机号</view>
-			<!-- <view class="flexbox " style="margin:36rpx 0; justify-content: space-between;">
 				<view class="quhao">
-					<uni-data-select 
+					<uni-data-select class="myselect" placeholder="选择区号" v-model="quCode" :localdata="quCodeList" style="height: 30rpx !important;"
-					      placeholder="区号" model="quCode"
+						@change="quChange"></uni-data-select>
-					      :localdata="quCodeList"
-					      @change="quChange"
-					    ></uni-data-select>
 				</view>
-				<view class="triangle borderBottom phoneNumberInput" :clasfs="[type == 1000 ? 'left_triangle': 'right_triangle']">
+			</view>
-					<input type="number" v-model="phone" @input="onInput"  placeholder="请输入您的手机号" placeholder-class="grey" />
+			<!-- 带区号 -->
+			<view class="flexbox " style="margin:36rpx 0; justify-content: space-between;">
+				<view class="triangle borderBottom phoneNumberInput" style="width: 150rpx;">
+					<input type="number" v-model="quCode" placeholder="区号" placeholder-class="grey" />
+					
 				</view>
-			</view> -->
+				<view class="triangle borderBottom phoneNumberInput"
+					:clasfs="[type == 1000 ? 'left_triangle': 'right_triangle']">
+					<input type="number" v-model="phone" @input="onInput" placeholder="请输入您的手机号"
+						placeholder-class="grey" />
+				</view>
+			</view>
 
 			<!-- 不带区号 -->
-			<view class="triangle borderBottom phoneNumberInput input_box"
+			<!-- <view class="triangle borderBottom phoneNumberInput input_box"
 				:clasfs="[type == 1000 ? 'left_triangle': 'right_triangle']">
 				<input type="number" v-model="phone" @input="onInput" placeholder="请输入您的手机号" placeholder-class="grey" />
-			</view>
+			</view> -->
 
 			<view class="input_tit" v-if="type == 1000">密码</view>
 			<view class="input_box" v-if="type == 1000">
@@ -190,16 +195,8 @@
 					Content: ''
 				},
 				quShow: false,
-				quCodeList: [{
+				quCodeList: [], // 国家区域码
-						value: '1',
+				quCode: 86,
-						text: '江'
-					},
-					{
-						value: '2',
-						text: '湖'
-					}
-				],
-				quCode: null,
 
 			};
 		},
@@ -216,11 +213,43 @@
 			// #endif
 		},
 		//页面显示
-		onShow() {},
+		onShow() {
+			this.getCountyCode()
+		},
 		//方法
 		methods: {
 			...mapMutations(['setUserInfo']),
 			...mapMutations(['setHealthMes']),
+			// 获取国家区域编码
+			getCountyCode() {
+				$http.request({
+						url: "book/baseArea/getAllBaseArea",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						// console.log(res,'区域码')
+						if (res.code == 0 && res.baseAreas.length > 0) {
+							//	this.quCodeList = res.baseAreas
+							this.quCodeList = res.baseAreas.map(item => {
+								let obj = {
+									'text': item.title,
+									'value': item.code,
+								}
+								return obj
+							})
+							// console.log('改变格式后',this.quCodeList)						
+						} else {
+							this.quCodeList = []
+							// this.totalPage = 0
+						}
+					}).catch(e => {
+						console.log(e, 'e')
+					});
+			},
 			quChange(e) {
 				console.log(e, 'e')
 			},
@@ -294,12 +323,15 @@
 					});
 					return;
 				}
-				if (!this.$base.phoneRegular.test(this.phone)) {
+				if (this.quCode == null || this.quCode == 86) { // 如果没选择国家code，默认是中国大陆
-					uni.showToast({
+					if (!this.$base.phoneRegular.test(this.phone)) {
-						title: '手机格式不正确',
+						uni.showToast({
-						icon: 'none'
+							title: '手机格式不正确',
-					});
+							icon: 'none'
-					return;
+						});
+						return;
+					}
+					console.log(this.quCode, '选择的区段')
 				}
 				if (!this.agree) {
 					uni.showToast({
@@ -312,6 +344,7 @@
 				this.$http
 					.get('book/user/sms/sendcode', {
 						phone: this.phone,
+						areaCode: this.quCode,
 						type: 2000
 					})
 					.then(res => {
@@ -339,12 +372,14 @@
 					});
 					return;
 				}
-				if (!this.$base.phoneRegular.test(this.phone)) {
+				if (this.quCode == null || this.quCode == 86) {
-					uni.showToast({
+					if (!this.$base.phoneRegular.test(this.phone)) {
-						title: '手机格式不正确',
+						uni.showToast({
-						icon: 'none'
+							title: '手机格式不正确',
-					});
+							icon: 'none'
-					return;
+						});
+						return;
+					}
 				}
 				let httpData = {};
 				if (this.type == 2000) {
@@ -635,10 +670,10 @@
 </script>
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
-
+	.myselect{height: 50rpx !important;}
 	.phoneNumberInput {
-		width: calc(100% - 130rpx);
+		width: calc(100% - 160rpx);
-		width: 100%;
+		// width: 100%;
 		height: 67rpx;
 
 		input {
@@ -656,7 +691,8 @@
 	}
 
 	.quhao {
-		width: 120rpx;
+		height: 50rpx;
+		width: 180rpx;
 	}
 
 	.highlight {