diff --git a/manifest.json b/manifest.json index 2233c69..981d587 100644 --- a/manifest.json +++ b/manifest.json @@ -12,8 +12,8 @@ "src" : "图片路径" } ], - "versionName" : "1.2.26", - "versionCode" : 1226, + "versionName" : "1.2.29", + "versionCode" : 1229, "app-plus" : { "compatible" : { "ignoreVersion" : true diff --git a/pages.json b/pages.json index d81e93b..895168f 100644 --- a/pages.json +++ b/pages.json @@ -505,7 +505,7 @@ { "path": "pages/prescript/prescript", "style": { - "navigationBarTitleText": "方剂检索", + "navigationBarTitleText": "方药检索", "enablePullDownRefresh": false } }, diff --git a/pages/acupoint/acupoint.vue b/pages/acupoint/acupoint.vue index c5c77e6..0719738 100644 --- a/pages/acupoint/acupoint.vue +++ b/pages/acupoint/acupoint.vue @@ -7,9 +7,8 @@ @cancel="cancel" @clear="clear"> --> - + @@ -72,7 +71,7 @@ oneCateList: [], // 一级分类标题1 twoCateList: [], // 二级分类标题 titleList: [], // 穴位标题 - curOneCateIndex: 0, // 当前选中的一级分类 + curOneCateIndex: 1, // 当前选中的一级分类 curTwoCateIndex: 0, // 当前选中的二级分类 searchList: [], // 搜索结果数组 showSearchList: false, @@ -94,29 +93,7 @@ ...mapState(['userInfo']), }, methods: { - // 检查是有权限使用搜索功能 - checkDisable() { - console.log('点击了') - if (this.userMes.pointPower == 0 && this.oneCateList[this.curOneCateIndex].id == 3 || this.userMes - .pointPower == 0 && this.oneCateList[this.curOneCateIndex].id == 6) { // 等于0 就是没有权限 - this.showNoRights() - } - }, - // 显示无权限弹窗 - showNoRights() { - let that = this - uni.showModal({ - content: "购买 手模 或 脚模 后方可使用此功能", - confirmText: '好的', - showCancel: false, - success: function(res) { - if (res.confirm) { - // console.log('用户点击确定'); - that.clear() - } - } - }) - }, + // 获取用户详情 getUserInfo() { // 用户详情 @@ -133,15 +110,9 @@ // 穴位详情 gotoDetail(item) { - if (this.userMes.pointPower == 0 && this.oneCateList[this.curOneCateIndex].id == 3 || this.userMes - .pointPower == 0 && this.oneCateList[this.curOneCateIndex].id == 6) { // 等于0 就是没有权限 - this.showNoRights() - } else { - // 等于1 就是有权限 - uni.navigateTo({ - url: "./acupointDetail?id=" + item.id - }) - } + uni.navigateTo({ + url: "./acupointDetail?id=" + item.id + }) }, // 获取穴位名称 @@ -174,10 +145,11 @@ this.getTitles(id) }, setOneCateIndex(item, index) { - if(this.userMes.tgdzPower == 0){ + console.log(item) + if (item.id == 3 && this.userMes.pointPower == 0) { let that = this uni.showModal({ - content: "购买 针灸六经法要上册和下册 后方可使用此功能", + content: '购买 手模 或 脚模 后方可使用此功能', confirmText: '好的', showCancel: false, success: function(res) { @@ -188,12 +160,26 @@ }) return } - if(item.title == "时辰取穴"){ + if (item.id == 6 && this.userMes.tgdzPower == 0) { + let that = this + uni.showModal({ + content: '购买 针灸六经法要上册和下册 后方可使用此功能', + confirmText: '好的', + showCancel: false, + success: function(res) { + if (res.confirm) { + // console.log('用户点击确定'); + } + } + }) + return + } + if (item.title == "时辰取穴") { uni.navigateTo({ url: "../timeAcupoint/timeAcupoint" }) - return - } + return + } let id = item.id this.curOneCateIndex = index this.curTwoCateIndex = 0 @@ -244,7 +230,7 @@ console.log(res, '脉穴分类获取成功') if (res.code == 0 && res.category.length > 0) { this.oneCateList = res.category - this.getTowCateList(this.oneCateList[0].id) + this.getTowCateList(this.oneCateList[1].id) } else { this.oneCateList = [] } diff --git a/pages/classic/classic.vue b/pages/classic/classic.vue index 6b72793..51cf1d7 100644 --- a/pages/classic/classic.vue +++ b/pages/classic/classic.vue @@ -33,7 +33,7 @@ - + @@ -41,7 +41,7 @@ - {{item.name}} + {{item.name}} - + 立即购买 diff --git a/pages/luck/luck.vue b/pages/luck/luck.vue index cd9fc23..02ad50b 100644 --- a/pages/luck/luck.vue +++ b/pages/luck/luck.vue @@ -191,7 +191,6 @@ scroll: function(e) {}, // 获取五运六气 getYun(date) { - console.log(this.data + '1111111111111111111') let that = this $http.request({ url: "book/point/WYLQForYear", diff --git a/pages/medicaldes/medicaldes.vue b/pages/medicaldes/medicaldes.vue index 2e0bd03..67ae961 100644 --- a/pages/medicaldes/medicaldes.vue +++ b/pages/medicaldes/medicaldes.vue @@ -173,7 +173,8 @@ console.log('this.curTwoCateIndex',this.curTwoCateIndex) if(this.curOneCateIndex==0){ uni.navigateTo({ - url: '../bookShop/commodityDetail?id=' + item.id + // url: '../bookShop/commodityDetail?id=' + item.id + url: '../eBook/bookContent?Id=' + item.id }) return } diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue index 3992dd5..d08ab29 100644 --- a/pages/peanut/home.vue +++ b/pages/peanut/home.vue @@ -3,86 +3,78 @@ - - - - - - - - + + + + + + + +
- + 经穴检索
- 方剂检索 + 方药检索
经典查阅
-
-
- - 五运六气 -
+
+
+ + 五运六气 +
- -
+ + +
吴门医述
- - - + + - - - - - - - + + + + + + + - - - + + + - + - - + + - + - - - - + + - - - - - - {{item.productName}} + + + + + {{item.productName}} + - + + --> - - + + + + + + + + 请输入书名 + + + + 书名检索 + + + + + - {{item.labelName}} + {{item.labelName}} - {{item.labelName}} + {{item.labelName}} - {{item.labelName}} + {{item.labelName}} - - - - - - - - {{item.productName}} - - - ￥{{item.activityPrice}} - ￥{{item.price}} - 已售：{{item.sumSales}} 件 + + + + + + + + {{item.productName}} + + + ￥{{item.activityPrice}} + ￥{{item.price}} + 已售：{{item.sumSales}} 件 + + - - - - - - 努力加载中 + + + + 努力加载中 + + + + + - - - - - - - + + + @@ -285,7 +297,7 @@ - + @@ -295,23 +307,24 @@ import repciptData from '@/static/json/repcipt.json' import $http from '@/config/requestConfig.js'; import { - mapState,mapMutations + mapState, + mapMutations } from 'vuex'; export default { data() { return { - myList:[], - showEbook:false, // 显示电子书相关 + myList: [], + showEbook: false, // 显示电子书相关 transaction: { // 成功回调 - - }, - tabsNumber : null, - scrollLeft:0, - maxTimes:1, // 轮询最大次数 - ComplateRequestInterval:null, // 轮询定时器 - checking:false, // 正在检测 - ComplateRequestArr:[], - iapChannel:null, + + }, + tabsNumber: null, + scrollLeft: 0, + maxTimes: 1, // 轮询最大次数 + ComplateRequestInterval: null, // 轮询定时器 + checking: false, // 正在检测 + ComplateRequestArr: [], + iapChannel: null, scrollTop: 0, list3: [ // '../../static/icon/home_ban_1.jpg', @@ -323,37 +336,59 @@ limiTist: [], jingList: [], seckillList: [], - offSaleList:[], // 折扣列表 + offSaleList: [], // 折扣列表 goodsList: [], bgiStyle: { background: '#fff' }, - newBookList:[], + newBookList: [], iconStyle: { fontSize: '40rpx', fontWeight: 'bold', color: '#54a966', }, - tagList:[] ,// 推荐标签列表 - wztaglist:[ - {splId:"-1",labelName:"全部"}, - {splId:"5",labelName:"文学"}, - {splId:"6",labelName:"哲学"}, + tagList: [], // 推荐标签列表 + wztaglist: [{ + splId: "-1", + labelName: "全部" + }, + { + splId: "5", + labelName: "文学" + }, + { + splId: "6", + labelName: "哲学" + }, ], - yxtaglist:[ - {splId:"0",labelName:"全部"}, - {splId:"2",labelName:"中医经典"}, - {splId:"1",labelName:"中医基础"}, - {splId:"3",labelName:"各家学说"}, - {splId:"4",labelName:"中医临床"}, + yxtaglist: [{ + splId: "0", + labelName: "全部" + }, + { + splId: "2", + labelName: "中医经典" + }, + { + splId: "1", + labelName: "中医基础" + }, + { + splId: "3", + labelName: "各家学说" + }, + { + splId: "4", + labelName: "中医临床" + }, ], wztabsid: '', - pageSize:10, - page:1, - totalPage:0, - tjProList:[], - status : 3, - userMsg:{}, // 用户信息 + pageSize: 10, + page: 1, + totalPage: 0, + tjProList: [], + status: 3, + userMsg: {}, // 用户信息 }; }, onPageScroll(e) { @@ -363,8 +398,8 @@ onLoad(e) { // 隐藏原生的tabbar uni.hideTabBar(); - // this.requestIapOrder() - + // this.requestIapOrder() + }, onHide() { this.page = 1 @@ -378,7 +413,7 @@ // 隐藏原生的tabbar this.tjProList = [] uni.hideTabBar(); - this.getData(); + this.getData(); this.getTags() this.getUserInfo() }, @@ -395,19 +430,19 @@ this.getUserInfo() // this.requestIapOrder() uni.stopPullDownRefresh() - + }, onReachBottom() { this.loadingNow = true console.log('到底了') - if(this.page+1 <= this.totalPage){ + if (this.page + 1 <= this.totalPage) { this.status = 0 this.page++ this.getJtData() - }else{ + } else { this.status = 1 } - + }, filters: { @@ -426,7 +461,7 @@ computed: { ...mapState(['userInfo']), }, - components:{ + components: { musicPlay }, //方法 @@ -437,180 +472,182 @@ getUserInfo() { // 用户详情 // if (this.userInfo.id != undefined) { - this.$http - .post('book/user/info/' + this.userInfo.id) - .then(res => { - this.userMsg = res.user - }); + this.$http + .post('book/user/info/' + this.userInfo.id) + .then(res => { + this.userMsg = res.user + }); // } }, // 获取商品标签 - getTags() { - this.loadingNow = false - this.$http + getTags() { + this.loadingNow = false + this.$http .post('book/label/getLabels') .then(res => { - console.log(res,'标签列表') - if(res.code == 0 && res.result.labels.length > 0){ + console.log(res, '标签列表') + if (res.code == 0 && res.result.labels.length > 0) { this.tagList = res.result.labels this.tabsid = this.tagList[0].splId this.getJtData() - } + } }).catch(e => { - console.log(e,'e') + console.log(e, 'e') }); - }, - tabsChange(item){ + }, + tabsChange(item) { this.tjProList = [] this.tabsid = item.splId - if(this.tabsid == 15){ + if (this.tabsid == 15) { this.wztabsid = '0' - }else if(this.tabsid == 16){ + } else if (this.tabsid == 16) { this.wztabsid = '-1' - }else{ + } else { this.wztabsid = '' } this.page = 1 // 获取推荐数据 this.getJtData() }, - wztabsChange(item){ + wztabsChange(item) { this.tjProList = [] this.wztabsid = item.splId this.page = 1 // 获取推荐数据 this.getJtData() }, - getJtData(){ + getJtData() { this.$http - // .post('book/label/list',{ - .post('book/label/getProductsByLabel',{ - 'splId': this.tabsid, - 'limit': this.pageSize, - 'page': this.page, - 'type': this.wztabsid - }) - .then(res => { - - if(res.code == 0 && res.page.records.length > 0){ - this.tjProList = this.tjProList.concat(res.page.records) - this.totalPage = res.page.pages - this.status = 3 - console.log(this.tjProList,'按标签检索结果') - }else{ - this.tjProList = [] - this.totalPage = 0 - } - }).catch(e => { - console.log(e,'标签检索报错') - }); + // .post('book/label/list',{ + .post('book/label/getProductsByLabel', { + 'splId': this.tabsid, + 'limit': this.pageSize, + 'page': this.page, + 'type': this.wztabsid + }) + .then(res => { + + if (res.code == 0 && res.page.records.length > 0) { + this.tjProList = this.tjProList.concat(res.page.records) + this.totalPage = res.page.pages + this.status = 3 + console.log(this.tjProList, '按标签检索结果') + } else { + this.tjProList = [] + this.totalPage = 0 + } + }).catch(e => { + console.log(e, '标签检索报错') + }); }, // 获取折扣图书 - getOffSale(){ + getOffSale() { this.$http .post('book/shopproduct/listactivityprice?limit=10&page=1') .then(res => { - console.log(res,'折扣') - if(res.code == 0 && res.page.list.length > 0){ + console.log(res, '折扣') + if (res.code == 0 && res.page.list.length > 0) { this.offSaleList = res.page.list this.tabsNumber = 0 - } - + } + }).catch(e => { - console.log(e,'e') + console.log(e, 'e') }); }, // 新书上市 - getNewBook(){ + getNewBook() { this.$http - .post('book/shopproduct/getNewBook',{ + .post('book/shopproduct/getNewBook', { 'limit': 4, - 'page':1 + 'page': 1 }) .then(res => { - console.log(res,'xinshu') - this.newBookList = res.page.list + console.log(res, 'xinshu') + this.newBookList = res.page.list }).catch(e => { - console.log(e,'新书上市报错') + console.log(e, '新书上市报错') }); }, // 检测未完成订单 - requestIapOrder(){ + requestIapOrder() { console.log('检测支付环境...') plus.payment.getChannels((channels) => { console.log(channels, 'channels') //this.setUserInfo({channelList:channels}); // 将支付通道保存到本地 - for (var i in channels) { + for (var i in channels) { // 判断是否苹果支付1 if (channels[i].id === 'appleiap') { - this.iapChannel = channels[i] + this.iapChannel = channels[i] // console.log(this.userInfo.restoreFlag,'this.userInfo.restoreFlag') - if(this.userInfo.restoreFlag){ // 如果存在异常回调订单 + if (this.userInfo.restoreFlag) { // 如果存在异常回调订单 this.restoreComplateRequest() } } - } + } }) }, - // 查询未关闭订单 - restoreComplateRequest(){ + // 查询未关闭订单 + restoreComplateRequest() { let that = this console.log('检测未完成订单') - console.log(this.iapChannel,'this.iapChannel') + console.log(this.iapChannel, 'this.iapChannel') this.iapChannel.restoreComplateRequest({ manualFinishTransaction: true - }, function(results) { - if(!that.checking){ - that.checking = true - // console.log(that.checking) - // results 格式为数组存放恢复的IAP商品交易信息对象 IAPTransaction，通用需将返回的支付凭证传给后端进行二次认证 + }, function(results) { + 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) - - } - }) + 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) + + } + }) } - } - }); - - + } + }); + + }, // 关闭交易订单 - finishTransaction(trans,index){ + finishTransaction(trans, index) { this.iapChannel.finishTransaction(trans, (success) => { - console.log('关闭订单成功',index); - - if(index == this.ComplateRequestArr.length-1){ // 最后一个支付订单 - this.setUserInfo({restoreFlag:false}); + console.log('关闭订单成功', index); + + if (index == this.ComplateRequestArr.length - 1) { // 最后一个支付订单 + this.setUserInfo({ + restoreFlag: false + }); // console.log(this.userInfo.restoreFlag,'this.ComplateRequestArr.length+++') } - - }, (fail) => { - console.log('关闭订单失败'); - }); + + }, (fail) => { + console.log('关闭订单失败'); + }); }, - iapCheck(result,index) { - const that = this + iapCheck(result, index) { + const that = this console.log('进入后台验证') let data = { transactionId: result.transactionIdentifier, // 支付交易id - customerOid: that.userInfo.id, + customerOid: that.userInfo.id, productId: result.payment.productid, // 产品id orderId: result.payment.username, // 系统订单号 - receiptData: result.transactionReceipt ,// 苹果返回收据 - loadAnimate:'none', // 请求加载动画 - } - console.log(data,'data') + receiptData: result.transactionReceipt, // 苹果返回收据 + loadAnimate: 'none', // 请求加载动画 + } + console.log(data, 'data') $http.request({ url: "/Ipa/veri", method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 @@ -619,54 +656,54 @@ 'Content-Type': 'application/json' }, }).then(res => { - console.log(JSON.stringify(res)) + console.log(JSON.stringify(res)) console.log(res.code) - if(res.code == 0){ + if (res.code == 0) { // uni.hideLoading() - console.log('充值订单已处理，请留意账户金额变动....') - // 服务器验证票据有效后在客户端关闭订单 - that.finishTransaction(result,index) - }else if(res.code == 200){ // 重复验证订单 + console.log('充值订单已处理，请留意账户金额变动....') + // 服务器验证票据有效后在客户端关闭订单 + that.finishTransaction(result, index) + } else if (res.code == 200) { // 重复验证订单 console.log('重复验证....') - that.finishTransaction(result,index) + that.finishTransaction(result, index) } - }).catch(e => { + }).catch(e => { console.log('支付验证失败，进入轮询程序...') - that.getIapPayResult(result,index) - }) + that.getIapPayResult(result, index) + }) console.log('--------------') }, - + // 轮询验证支付结果 - getIapPayResult(result,index){ + 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.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) + console.log('停止轮询', this.maxTimes, this.ComplateRequestInterval, this.maxTimes) this.checking = false - this.saveErrorIapOrder(result,index) + this.saveErrorIapOrder(result, index) clearTimeout(this.ComplateRequestInterval) - + } - },10000) - + }, 10000) + }, // 轮询失败接口 - saveErrorIapOrder(result,index){ + saveErrorIapOrder(result, index) { console.log('提交到充值问题单里面...') let data = { - transactionId : result.transactionIdentifier, + transactionId: result.transactionIdentifier, failureflag: 1, - orderId:result.payment.username, - receiptData:result.transactionReceipt, - productId:result.payment.productid, - customerOid:this.userInfo.id - } + 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，具体说明查看官方文档 @@ -675,17 +712,17 @@ 'Content-Type': 'application/json' }, }).then(res => { - console.log(JSON.stringify(res)) - if(res.code == 200){ + console.log(JSON.stringify(res)) + if (res.code == 200) { console.log('提交成功，关闭订单') - this.finishTransaction(result,index) + this.finishTransaction(result, index) } - }).catch(e => { - console.log(e) - if(e.statusCode == 0){ // 重复提交，直接关闭订单 - this.finishTransaction(result,index) + }).catch(e => { + console.log(e) + if (e.statusCode == 0) { // 重复提交，直接关闭订单 + this.finishTransaction(result, index) } - }) + }) }, // 获取列表数据 getData() { @@ -718,19 +755,18 @@ // 跳转 onPageJump(url) { - console.log(this.userMsg,'this.userMsg') - if(url == '../luck/luck' && this.userMsg.wylqPower == 0){ + console.log(this.userMsg, 'this.userMsg') + if (url == '../luck/luck' && this.userMsg.wylqPower == 0) { uni.showModal({ content: "购买 中医时间医学·火病原理 后方可使用此功能", confirmText: '好的', showCancel: false, success: function(res) { - if (res.confirm) { - } + if (res.confirm) {} } }) return - } + } uni.navigateTo({ url: url }); @@ -767,7 +803,7 @@ url: '../bookShop/commodityDetail?id=' + id }); }, - + // 列表跳页 onShopMore(e) { uni.navigateTo({ @@ -790,55 +826,137 @@ + \ No newline at end of file diff --git a/pages/prescript/prescript.vue b/pages/prescript/prescript.vue index 3668902..c724c1b 100644 --- a/pages/prescript/prescript.vue +++ b/pages/prescript/prescript.vue @@ -2,7 +2,7 @@ - + @@ -181,8 +181,6 @@ uni.navigateTo({ url: "./prescriptDetail?id=" + item.prescriptId }) - - }, // 获取方剂名称 getTitles(id) { @@ -242,11 +240,15 @@ this.searchValue = '' this.searchList = [] this.showSearchList = false - if (index != 2) { - this.getTowCateList(id) - } else { + if (index == 2) { this.getJFList(id) + } else if (index == 3) { + this.twoCateList = [] + this.getTitles(id) + } else{ + this.getTowCateList(id) } + }, getTowCateList(id) { $http.request({ @@ -315,6 +317,7 @@ console.log(e) }) }, + getCateList(id) { id ? '' : id = 0 this.twoCateList = [] diff --git a/pages/user/persData.vue b/pages/user/persData.vue index d074cfb..2086677 100644 --- a/pages/user/persData.vue +++ b/pages/user/persData.vue @@ -13,7 +13,7 @@ 邮箱 {{userMsage.email}} - 点击绑定