diff --git a/config/baseUrl.js b/config/baseUrl.js index 1ccd200..001c8ae 100644 --- a/config/baseUrl.js +++ b/config/baseUrl.js @@ -3,13 +3,13 @@ let socketUrl = ""; if (process.env.NODE_ENV === 'development') { // 开发环境 // baseUrl = "https://testapi.nuttyreading.com/"; //线上测试环境 - baseUrl = "https://api.nuttyreading.com/"; //线上正式 - //baseUrl = "http://192.168.110.100:9200/pb/"; //张川川 + //baseUrl = "https://api.nuttyreading.com/"; //线上正式 + baseUrl = "http://192.168.110.100:9200/pb/"; //张川川 } else if (process.env.NODE_ENV === 'production') { // 生产环境11 // baseUrl = "https://testapi.nuttyreading.com/"; - baseUrl = "https://api.nuttyreading.com/"; - //baseUrl = "http://192.168.110.100:9200/pb/"; //张川川 + //baseUrl = "https://api.nuttyreading.com/"; + baseUrl = "http://192.168.110.100:9200/pb/"; //张川川 } const courtConfig = { //微信公众号APPID1 diff --git a/node_modules.zip b/node_modules.zip deleted file mode 100644 index 2ac3f28..0000000 Binary files a/node_modules.zip and /dev/null differ diff --git a/pages.json b/pages.json index e220a07..b95ce29 100644 --- a/pages.json +++ b/pages.json @@ -19,7 +19,7 @@ { "path": "pages/mine/vip/index", "style": { - "navigationBarTitleText": "vip", + "navigationBarTitleText": "VIP定制", "enablePullDownRefresh": true, "onReachBottomDistance": 100, "app-plus": { diff --git a/pages/course/courseDetail.vue b/pages/course/courseDetail.vue index d0c8078..b9e76ad 100644 --- a/pages/course/courseDetail.vue +++ b/pages/course/courseDetail.vue @@ -2,32 +2,17 @@ - - - - - - + + @@ -37,9 +22,6 @@ {{ course.title }} - - @@ -66,7 +48,6 @@ - @@ -86,10 +67,6 @@ 第{{index + 1}}次自考成绩 {{item.score}}分 - 查看试卷 @@ -109,10 +86,6 @@ - - - - - @@ -211,14 +179,13 @@ - - - - + - @@ -658,7 +578,6 @@ export default { this.payType = this.payList[this.selectPayIndex].type; } } - // this.payType = this.payList[this.selectPayIndex].type; this.$forceUpdate(); }, }, @@ -670,8 +589,6 @@ export default { await this.getActiveCouponList(); }); } - - // this.payType = this.payList[this.selectPayIndex].type; this.$forceUpdate(); }, }, @@ -809,7 +726,6 @@ export default { urlList: { list: "app/phone.do?getCourseDetail_new", initPrepareOrder: "common/buyOrder/initPrepareOrder", - // buyOrder: "book/buyOrder/placeOrder", buyOrder: "book/buyOrder/placeOrder", curriculumInfo: "app/phone.do?getCourseInfo", detailInfo: "app/phoneDoctor.do?getTaiHuClassInfo_new", @@ -843,15 +759,8 @@ export default { }; }, async onLoad(options) { - console.log("调用了onLoad方法"); var that = this; - console.log("options at line 387: 获取到的内容", options); this.options = JSON.parse(options.data); - // if (this.options.goods.findIndex((e) => e.goodsType == "05") >= 0) { - // this.isShowAddress = false; - // } else { - // this.isShowAddress = true; - // } this.goodsDataList = this.options.goods; var list = [...this.options.goods]; list = list.map((e) => e.goodsType); @@ -869,15 +778,6 @@ export default { }; } that.initPrepareOrder(); - console.log("this.options at line 375:", this.options, this.goToInfo); - - // this.getUserInfo() - // this.getCateList() - }, - - onHide() { - // this.showSearchList = false - // this.searchList = [] }, async onShow() { this.curCouponId = undefined; @@ -899,9 +799,6 @@ export default { console.log("没有接受到数据"); } }); - - // this.selectPayIndex = 0; - console.log("this.addressData at line 416:", this.addressData); // #ifdef APP-PLUS this.getOS(); // #endif @@ -914,11 +811,9 @@ export default { this.showCouponPup = false; }, confirmCoupon(data) { - console.log("选中的优惠券是", data); if (data) { this.curCoupon = data; this.curCouponId = data.couponEntity.id; - // this.getTotalPrice() } else { this.curCoupon = {}; this.curCouponId = undefined; @@ -928,7 +823,6 @@ export default { }, // 查询商品可用优惠券 async getActiveCouponList() { - console.log("this.goodsDataList", this.goodsDataList); if (this.goodsDataList.length <= 0) { uni.showToast({ title: "商品参数错误，无法获取优惠券", @@ -946,18 +840,14 @@ export default { }); var idsString = list.join(","); - console.log("idsString", idsString); - // var idsString = '' this.$http .request({ - // url: "book/buyOrder/buySave", url: "common/coupon/getCouponListPayment", - method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 + method: "POST", data: { shopProductInfos: idsString, }, header: { - //默认 无 说明：请求头 "Content-Type": "application/json", }, }) @@ -977,13 +867,6 @@ export default { return; } if (res.code == 0) { - console.log("可用优惠券列表", res); - // res.couponHistoryList.forEach((item) => { - // if (item.couponEntity.useLevel > this.totalPrice) { - // item.canUse = 0; - // item.canUseReason = "未到使用门槛"; - // } - // }); this.couponHistoryList = res.couponHistoryList; this.selectcouponList = this.couponHistoryList.filter( @@ -1018,10 +901,8 @@ export default { } else { await this.getTotalPrice(); } - // await that.getDetailInfo(); }) .catch((e) => { - console.log("可用优惠券列表报错", e); uni.showToast({ title: e.errMsg, icon: "none", @@ -1032,13 +913,11 @@ export default { getOS() { let oprateOs = ""; oprateOs = uni.getSystemInfoSync().platform; - // console.log(oprateOs) if (oprateOs == "android") { this.isAndorid = true; } else { this.isAndorid = false; if (this.haveCourse && !this.isAndorid) { - console.log("苹果系统，并且有商品类型为05"); this.selectPayIndex = 0; this.payType = this.payListIOS[0].type; this.beizhuShow = true; @@ -1046,7 +925,6 @@ export default { } }, handleChangejf(val) { - console.log("val at line 653:", val); var value = val; this.$nextTick(() => { if (val == 0) { @@ -1059,7 +937,6 @@ export default { this.$forceUpdate(); } else { } - // value = value.replace(/[^\d]/g, ""); this.jfNumber = Number(value); this.jfNumberShow = this.jfNumber.toFixed(2); } @@ -1067,7 +944,6 @@ export default { if (this.curCouponId && this.curCoupon.couponEntity.id) { couponAmount = this.curCoupon.couponEntity.couponAmount; } - // that.actualPayment = that.actualPayment - that.couponAmount; // 减去优惠券的金额 this.actualPayment = this.totalPrice - couponAmount - this.jfNumber + this.freightNum; @@ -1076,10 +952,6 @@ export default { } else { this.isDefaultCurrency = false; } - console.log( - "this.isDefaultCurrency at line 692:", - this.isDefaultCurrency - ); this.$forceUpdate(); }); }, @@ -1133,9 +1005,6 @@ export default { }, ]; } - // this.goodsDataList - console.log("this.goodsDataList at line 595:", this.goodsDataList); - var data = { uid: this.userInfo.id, productList: this.goodsDataList.map((e) => { @@ -1150,18 +1019,15 @@ export default { this.$http .request({ - // url: "book/buyOrder/buySave", url: `${this.urlList.initPrepareOrder}`, - method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 + method: "POST", data, header: { - //默认 无 说明：请求头 "Content-Type": "application/json", }, }) .then(async (res) => { - console.log("res at line 374:", res); if (res.code == 0) { this.initData = res.data; console.log( @@ -1181,25 +1047,20 @@ export default { } this.$forceUpdate(); - - // await that.getDetailInfo(); }); }, // 获取地址列表 async getUserAddress() { - console.log("this.userInfo.id at line 368:", this.userInfo.id); var data = {}; var that = this; this.$http .request({ - // url: "book/buyOrder/buySave", url: `${this.urlList.addressList}?userId=${this.userInfo.id}`, method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 data, header: { - //默认 无 说明：请求头 "Content-Type": "application/json", }, }) @@ -1240,16 +1101,11 @@ export default { if (!this.addressData.id) { this.addressData = this.defaultAddressList; } - console.log("this.addressData at line 742:", this.addressData); - if (this.defaultAddressList.id) { console.log("有默认地址"); await this.getFreightNum(); } - // await this.getFreightNum(); this.$forceUpdate(); - - // await that.getDetailInfo(); }); }, @@ -1270,12 +1126,10 @@ export default { this.$http .request({ - // url: "book/buyOrder/buySave", url: `${this.urlList.freightNum}`, - method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 + method: "POST", data, header: { - //默认 无 说明：请求头 "Content-Type": "application/json", }, }) @@ -1287,8 +1141,6 @@ export default { } await this.getTotalPrice(); this.$forceUpdate(); - - // await that.getDetailInfo(); }); }, handleFresh() { @@ -1306,15 +1158,7 @@ export default { : this.goodsDataList[i].price; } that.totalPrice = s * this.orderNumber; - // ！ - var couponAmount = 0; - - console.log( - "that.curCoupon.couponEntity.id at line 1288:", - that.curCoupon, - this.selectcouponList - ); var couponData = this.selectcouponList.filter( (e) => e.couponId == that.curCouponId ); @@ -1322,8 +1166,6 @@ export default { couponAmount = that.curCoupon.couponEntity.couponAmount; } else { couponAmount = 0; - // that.curCoupon={} - // that.curCouponId=undefined } if (!this.isShowAddress) { if (this.initData.user.jf >= that.totalPrice) { @@ -1350,10 +1192,6 @@ export default { } else { that.actualPayment = that.totalPrice + that.freightNum - couponAmount; } - - // console.log('couponAmount优惠券金额',couponAmount); - // that.actualPayment = that.actualPayment - couponAmount; // 减去优惠券的金额 - if (this.actualPayment == 0 && !this.isShowAddress) { this.isDefaultCurrency = true; } else { @@ -1368,10 +1206,6 @@ export default { uni.navigateTo({ url: "/pages/component/commonComponents/address/index?type=order", }); - // this.show = true; - // this.$nextTick(() => { - // this.$refs.commonAddress.open(); - // }); }, fnCopy(value, title) { this.$commonJS.handleMakingPhoneCalls(value, title); @@ -1392,7 +1226,6 @@ export default { } }, async goBuyJie() { - console.log("this.buyingFlag", this.buyingFlag); if (this.buyingFlag) { uni.showToast({ title: "操作太频繁了，休息下吧", @@ -1402,35 +1235,11 @@ export default { } this.buyingFlag = true; var that = this; - // if (this.addressList.length == 0) { - // this.dizhiShow = true // 如果没有地址信息 - // } - // if (!this.nowClick) { - // return - // } this.nowClick = false; setTimeout(() => { this.nowClick = true; }, 5000); - - // let youPre = { - // id: "", - // coupons: { - // amount: 0, - // name: "", - // }, - // }; - // if (this.youhuiContent.id != undefined) { - // youPre = this.youhuiContent; - // } let xiaBiao = []; - // for (let i = 0; i < this.cartList.length; i++) { - // xiaBiao.push({ - // productId: this.cartList[i].productId, - // quantity: this.cartList[i].productAmount, - // }); - // } - console.log("99999999999", this.options); let data = {}; if (this.options.isFudu) { console.log( @@ -1494,9 +1303,6 @@ export default { }); thisproduct = thisproduct.join(","); } - - console.log("data at line 477 提交后台的下单数据:", data); - // console.log('成功信息',product,thisproduct,data.addressId, data.realMoney); if ( this.historyOrderInfo && thisproduct == this.historyOrderInfo.product && @@ -1535,14 +1341,12 @@ export default { await $http .request({ - // url: "book/buyOrder/buySave", url: that.options.isFudu ? that.urlList.renewPayment : that.urlList.buyOrder, - method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 + method: "POST", data, header: { - //默认 无 说明：请求头 "Content-Type": "application/json", }, }) @@ -1601,9 +1405,6 @@ export default { url: `${that.goToInfo.url}?type=order`, }); } else { - // uni.navigateBack({ - // delta: 2, - // }); uni.redirectTo({ url: `${that.goToInfo.url}?backType=order`, }); @@ -1611,10 +1412,6 @@ export default { } }, 1000); } else { - uni.hideLoading(); - console.log("失败失败失败"); - // this.buyingFlag = false - // that.$commonJS.showToast('支付是失败') setTimeout(() => { console.log("延迟调用 失败提示"); uni.showToast({ @@ -1622,13 +1419,6 @@ export default { image: "../../../static/icon/ic_close.png", }); }, 0); - - // setTimeout(() => { - - // uni.navigateTo({ - // url: './orderList' - // }); - // }, 1000) } } ); @@ -1660,7 +1450,6 @@ export default { } }, 1000); } else { - // this.buyingFlag = false uni.hideLoading(); console.log(res, "微信支付111111111111111"); if (res.data.errMsg.indexOf("User canceled") != -1) { @@ -1717,13 +1506,6 @@ export default { ? (this.beizhuShow = true) : (this.beizhuShow = false); this.payType = this.payList[this.selectPayIndex].type; - console.log("this.selectPayIndex at line 315:", this.selectPayIndex); - // if(this.isAndorid){ - // console.log('是安卓'); - // }else{ - // this.payType = this.payListIOS[0].type - // console.log('不是安卓',this.payType); - // } this.$forceUpdate(); }, handleValChange(e) { @@ -1743,12 +1525,6 @@ export default { ...this.taiHuClassInfo, }, }; - // $mars.progressBegin('申请中...'); - // $mars.post(customerType, 'applyRelearn', data, function (ret) { - // api.hideProgress(); - - // fnLoadDataGrid(); - // }); }, fnRelearn(oid, days, courseFee) { //99和199课程复读一个月60三个月120; 299和399课程复读一个月80三个月180 @@ -1785,41 +1561,6 @@ export default { fee: fee, }; this.show = true; - // $aui.alert({ - // title: , - // content: '用户您好，该课程已到期，通过支付' + fee + '元，本门课程可获得' + days + '天延期学习时间，点击确认即完成自动扣费，感谢配合！', - // buttons: ['取消', '确认'], - // radius: 6, - // titleColor: '#ff3300', - // contColor: '#333', - // btnColor: '' - }, - //课程详情 - async gotoDetail(v) { - console.log(v); - - var result = await this.$commonJS.getCheckCourseStatus({ - oid: v.courseOid, - }); - console.log("result at line 364:", result); - - if (result.buyFlg == 0 && v.conditions != "01") { - this.$commonJS.showToast("请先购买课程"); - return; - } - - uni.navigateTo({ - // url: '../bookShop/commodityDetail?id=' + item.id - url: `/pages/curriculum/order/curriculum/detail?navTitle=${v.title}&title=${v.title}&oid=${v.courseOid}&conditions=${v.conditions}&detailOid=${v.detailOid}`, - }); - }, - //相关课程 - goCourseDescription(v) { - console.log(v); - uni.navigateTo({ - // url: '../bookShop/commodityDetail?id=' + item.id - url: `/pages/curriculum/order/curriculum/index?navTitle=${v.title}&title=${v.title}&oid=${v.oid}`, - }); }, async getCourseDescriptionData() { var data = {}; @@ -1842,16 +1583,10 @@ export default { this.swiperList.push(that.curriculumData.explainsImg); } else { that.swiperList = that.curriculumData.productImageList.split(","); - // for (var i = 0; i < imgList.length; i++) { - // this.swiperList.push(imgList[i]) - // } } that.dataList = res.obj.correlatedList; await that.getDetailInfo(); - // that.relatedCoursesList = res.obj.correlatedList - // await that.handleselectCate({ ...this.cateList[0], index: 0 }) - // socket.init(); }); }, getPriceData() { @@ -1866,21 +1601,6 @@ export default { checkDisable() { console.log("点击了"); }, - // 显示无权限弹窗 - // showNoRights() { - // let that = this - // uni.showModal({ - // content: "", - // confirmText: '好的', - // showCancel: false, - // success: function(res) { - // if (res.confirm) { - // // console.log('用户点击确定'); - // that.clear() - // } - // } - // }) - // }, // 获取用户详情 getUserInfo() { // 用户详情 @@ -1898,9 +1618,6 @@ export default { var data = []; console.log(item, index, 99999); var that = this; - - // curriculumInfo - this.$http .post(this.urlList.curriculumInfo, { customerType: "D", @@ -1911,170 +1628,22 @@ export default { .then(async (res) => { that.curriculumInfo = res.obj; that.dataList = res.obj.courseList; - - // socket.init(); }); - - // this.$nextTick(() => { - // switch (item.type) { - // case 1: - // // allDataList - // this.dataList = that.allDataList.result1Lst - // break; - // case 2: - // this.dataList = that.allDataList.result2Lst - // break; - // case 3: - // this.dataList = that.allDataList.result3Lst - // break; - // case 4: - // this.dataList = that.allDataList.result4Lst.filter(e => - // e.oid != '5fcf991c027b11e7ae62008cfae40c18' && e.oid != 'b3d8a938b8e147bc877613bb712a9cb3' && e.oid != '4d4730163135420ea962bfac4805e026' && e.oid != '49fb76ca3d6b43718d78c6aa9a3003c2' && e.oid != 'c7b047ed9246469b9ae2b1013fc3df9c' - - // ) - - // console.log(this.dataList.length, 6666666) - // break; - - // } - - // this.currentCateIndex = item.index - // }) - console.log(this.allDataList, this.dataList, "1688"); - // if(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 - // } - - // this.currentStatusIndex = index - this.searchValue = ""; this.searchList = []; this.showSearchList = false; - // if (index != 2) { - - // uni.createSelectorQuery().select('.statusList').boundingClientRect(function (rect) { - // var height = rect.height - // console.log('元素高度：',); - - // }).exec(); - - // } else { - // this.getJFList(dictType) - // } - return data; }, async getDetailInfo() { var that = this; - - // curriculumInfo - this.detailInfo = { content: "

没有中医基础想学中医难不难？中医学者治疗出现瓶颈怎么办？中西医究竟有什么不同呢？吴雄志教授将以全新的视角，完美整合中药学和西医学知识，让你领略当代中医生理学魅力。



【思考题】

1、简述中医的发展这些年出现了哪些变化？

2、简述中西医学科的异同？

", }; - // this.$http - // .post(this.urlList.detailInfo, { - // customerType - // : - // "D", - // token - // : uni.getStorageSync("token") - // , - // customerOid - // : uni.getStorageSync("customerOid"), - // classOid: 'f81b558ca4ee406e97c4045c87c2539c' - - // }) - // .then(async res => { - // that.detailInfo = res.obj - // // that.dataList = res.obj.courseList - - // // socket.init(); - - // }); - - // this.$nextTick(() => { - // switch (item.type) { - // case 1: - // // allDataList - // this.dataList = that.allDataList.result1Lst - // break; - // case 2: - // this.dataList = that.allDataList.result2Lst - // break; - // case 3: - // this.dataList = that.allDataList.result3Lst - // break; - // case 4: - // this.dataList = that.allDataList.result4Lst.filter(e => - // e.oid != '5fcf991c027b11e7ae62008cfae40c18' && e.oid != 'b3d8a938b8e147bc877613bb712a9cb3' && e.oid != '4d4730163135420ea962bfac4805e026' && e.oid != '49fb76ca3d6b43718d78c6aa9a3003c2' && e.oid != 'c7b047ed9246469b9ae2b1013fc3df9c' - - // ) - - // console.log(this.dataList.length, 6666666) - // break; - - // } - - // this.currentCateIndex = item.index - // }) - console.log(this.allDataList, this.dataList, "1688"); - // if(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 - // } - - // this.currentStatusIndex = index - this.searchValue = ""; this.searchList = []; this.showSearchList = false; - // if (index != 2) { - - // uni.createSelectorQuery().select('.statusList').boundingClientRect(function (rect) { - // var height = rect.height - // console.log('元素高度：',); - - // }).exec(); - - // } else { - // this.getJFList(dictType) - // } return data; }, @@ -2082,31 +1651,7 @@ export default { this.allDataList = []; console.log(index, 99999); var that = this; - - // if(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 - // } - this.currentStatusIndex = index; - // this.currentCateIndex = 0 - this.searchValue = ""; this.searchList = []; this.showSearchList = false; @@ -2115,19 +1660,6 @@ export default { this.$forceUpdate(); }); - - // this.handleselectCate(this.cateList[this.currentCateIndex]) - // if (index != 2) { - - // uni.createSelectorQuery().select('.statusList').boundingClientRect(function (rect) { - // var height = rect.height - // console.log('元素高度：',); - - // }).exec(); - - // } else { - // this.getJFList(dictType) - // } }, transformData(inputData) { @@ -2139,159 +1671,13 @@ export default { } result[letter].push(item); }); - // const finalResult = Object.keys(result).map(key => ({ [key]: result[key] })); return result; }, - // getJFList(id) { - // $http.request({ - // url: "book/prescript/prescriptListForJF", - // method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 - // data: { - // loadAnimate: 'none', // 请求加载动画 - // 'categoryId': id - // }, - // header: { //默认 无 说明：请求头 - // 'Content-Type': 'application/json' - // }, - // }).then(res => { - // if (res.code == 0 && res.list.length > 0) { - // this.twoCateList = [] - // this.dataList = this.transformData(res.list) - // console.log('JF经方', this.dataList) - // } else { - // this.twoCateList = [] - // this.dataList = [] - // } - // }).catch(e => { - // this.twoCateList = [] - // this.dataList = [] - // console.log(e) - // }) - // }, getCateList(id) { id ? "" : (id = 0); this.twoCateList = []; this.curTwoCateIndex = 0; - // 0为获取顶级分类，其他为搜索下级分类，目前的逻辑，顶级是写死的，所以可能只会涉及到搜索第二级 - // $http.request({ - // url: "book/prescript/prescriptCategoryList", - // method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 - // data: { - // loadAnimate: 'none', // 请求加载动画 - // 'categoryId': id - // }, - // header: { //默认 无 说明：请求头 - // 'Content-Type': 'application/json' - // }, - // }).then(res => { - // console.log(res, '脉穴分类获取成功') - // if (res.code == 0 && res.list.length > 0) { - // this.statusList = res.list - // this.getTowCateList(this.statusList[0].type) - // } else { - // this.statusList = [] - // } - // }).catch(e => { - // this.statusList = [] - // console.log(e) - // }) }, - - // 放大图片 - previewImage(url) { - console.log(url); - uni.previewImage({ - urls: [url], - longPressActions: { - itemList: ["很抱歉，暂不支持保存图片到本地"], - success: function (res) { - // console.log(res,'+++++') - }, - }, - }); - }, - // getSearch() { - // $http.request({ - // url: "book/prescript/searchPrescript", - // method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 - // data: { - // loadAnimate: 'none', // 请求加载动画 - // 'keywords': this.searchValue, - // type: this.currentStatusIndex + 1 - // }, - // header: { //默认 无 说明：请求头 - // 'Content-Type': 'application/json' - // }, - // }).then(res => { - // console.log(res, '搜索结果') - // if (res.code == 0 && res.list.length >= 0) { - // this.showSearchList = true - // this.searchList = res.list - // } else { - // this.searchList = [] - // } - // }).catch(e => { - // // this.dataList = [] - // this.searchList = [] - // console.log(e) - // }) - // }, - // search(res) { - // console.log(res, 'res') - // // uni.showToast({ - // // title: '搜索：' + res, - // // icon: 'none' - // // }) - // if (res == '') { - // this.showSearchList = false - // this.searchList = [] - // } else { - // this.getSearch() - // } - - // }, - // input(res) { - // console.log('----input:', res) - // if (res == '') { - // this.searchList = [] - // } else { - // this.getSearch() - // } - // }, - // clear(res) { - // console.log('----clear:', res) - // // uni.showToast({ - // // title: 'clear事件，清除值为：', - // // icon: 'none' - // // }) - // this.searchValue = '' - // this.showSearchList = false - // }, - // blur(res) { - // // console.log('----blur:', res) - // // if (res == '') { - // // this.showSearchList = false - // // this.searchList = [] - // // } else { - // // this.getSearch() - // // } - // }, - // focus(e) { - // console.log('----focus:') - // // uni.showToast({ - // // title: 'focus事件，输出值为：' + e.value, - // // icon: 'none' - // // }) - // // 等于1 就是有权限 - // // this.showSearchList = true - - // }, - // cancel(res) { - // uni.showToast({ - // title: '点击取消，输入值为：' + res.value, - // icon: 'none' - // }) - // } }, onBackPress() { // #ifdef APP-PLUS diff --git a/pages/mine/mine/index.vue b/pages/mine/mine/index.vue index c911faa..c384a29 100644 --- a/pages/mine/mine/index.vue +++ b/pages/mine/mine/index.vue @@ -13,36 +13,32 @@ - - - + + - - - 超级VIP - 众妙之门VIP - 吴门医述VIP + + + 医学 + 国学心理学 + - + - - - - - - @@ -197,14 +181,6 @@ }, ], priceBreakdownList: [], - // orderInfoList: [ - // { - // text: "订单备注", - // placeholder: "点击填写订单备注", - // imgUrl: "", - // type: "remark", - // }, - // ], number: 1, detailInfo: {}, content: "", @@ -253,7 +229,6 @@ urlList: { list: "app/phone.do?getCourseDetail_new", initPrepareOrder: "/common/buyOrder/initPrepareOrder", - // buyOrder: "book/buyOrder/placeOrder", buyOrder: "common/userVip/placeVipOrder", curriculumInfo: "app/phone.do?getCourseInfo", detailInfo: "app/phoneDoctor.do?getTaiHuClassInfo_new", @@ -275,43 +250,17 @@ }; }, async onLoad(options) { - console.log("调用了onLoad方法"); var that = this; - console.log("options at line 387:", options); this.options = JSON.parse(options.data); - // if (this.options.goods.findIndex((e) => e.goodsType == "05") >= 0) { - // this.isShowAddress = false; - // } else { - // this.isShowAddress = true; - // } this.goodsDataList = this.options.goods; - // if (this.options.sourceType == "curriculum") { - // this.goToInfo = { - // url: "/pages/curriculum/order/index/index", - // type: 2, - // }; - // } else { this.goToInfo = { url: "/pages/bookShop/orderList", type: 1, }; - // } - // that.initPrepareOrder(); - console.log("this.options at line 375:", this.options, this.goToInfo); - - // this.getUserInfo() - // this.getCateList() - }, - - onHide() { - // this.showSearchList = false - // this.searchList = [] }, async onShow() { - console.log("调用了onShow方法"); var that = this; await uni.$on("returnData", function(data) { - console.log("data at line 415:", data); if (data) { that.addressData = { ...data, @@ -326,9 +275,6 @@ console.log("没有接受到数据"); } }); - // this.selectPayIndex = 0; - - console.log("this.addressData at line 416:", this.addressData); }, computed: { ...mapState(["userInfo"]), @@ -345,8 +291,6 @@ this.orderModalShow = false; }, onPageJump(url) { - console.log(url, "url"); - uni.navigateTo({ url: url, }); @@ -364,9 +308,6 @@ type: 2, }, ]; - // this.goodsDataList - console.log("this.goodsDataList at line 595:", this.goodsDataList); - var data = { uid: this.userInfo.id, productList: [], @@ -376,12 +317,10 @@ this.$http .request({ - // url: "book/buyOrder/buySave", url: `${this.urlList.initPrepareOrder}`, - method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 + method: "POST", data, header: { - //默认 无 说明：请求头 "Content-Type": "application/json", }, }) @@ -390,12 +329,9 @@ console.log("res at line 374:", res); if (res.code == 0) { this.initData = res.data; - // this.$emit('user') } this.$forceUpdate(); - - // await that.getDetailInfo(); }); }, // 获取订单初始话 @@ -445,10 +381,6 @@ uni.navigateTo({ url: "/pages/component/commonComponents/address/index?type=order", }); - // this.show = true; - // this.$nextTick(() => { - // this.$refs.commonAddress.open(); - // }); }, fnCopy(value, title) { this.$commonJS.handleMakingPhoneCalls(value, title); @@ -459,44 +391,19 @@ }, openOrderModal(v) { this.orderModalShowInfo = v; - console.log( - "this.orderModalShowInfo at line 727:", - this.orderModalShowInfo - ); this.orderModalShow = true; if (this.orderModalShowInfo.type == "remark") { this.content = this.remark; } }, + //支付请求 async goBuyJie() { var that = this; - // if (this.addressList.length == 0) { - // this.dizhiShow = true // 如果没有地址信息 - // } - // if (!this.nowClick) { - // return - // } this.nowClick = false; setTimeout(() => { this.nowClick = true; }, 5000); - // let youPre = { - // id: "", - // coupons: { - // amount: 0, - // name: "", - // }, - // }; - // if (this.youhuiContent.id != undefined) { - // youPre = this.youhuiContent; - // } let xiaBiao = []; - // for (let i = 0; i < this.cartList.length; i++) { - // xiaBiao.push({ - // productId: this.cartList[i].productId, - // quantity: this.cartList[i].productAmount, - // }); - // } if (this.payType == 4 && this.initData.user.peanutCoin < this.dataInfo.lastFee) { uni.showToast({ title: '天医币余额不足', @@ -512,25 +419,17 @@ jfDeduction: 0, //积分抵扣 vipBuyConfigId: this.dataInfo.id, come: 2, //订单来源，0疯子读书1国学众妙之门2医学吴门医述 - - // appName: "wumen", }; - - console.log("data at line 477:", data); - await $http .request({ - // url: "book/buyOrder/buySave", url: that.urlList.buyOrder, - method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 + method: "POST", data, header: { - //默认 无 说明：请求头 "Content-Type": "application/json", }, }) .then(async (res) => { - console.log("res at line 598:", res); if (res.code == 0) { if (res.orderSn == null) { uni.showToast({ @@ -539,7 +438,6 @@ image: "../../../static/icon/ic_close.png", }); } else { - console.log("that.payType at line 607:", that.payType); if (that.payType == 2) { // 常规支付 uni.showToast({ @@ -569,24 +467,13 @@ }); }, 1000); } else { - console.log("失败失败失败"); - - // that.$commonJS.showToast('支付是失败') setTimeout(() => { console.log("延迟调用 失败提示"); uni.showToast({ title: "支付失败", - image: "../../../static/icon/ic_close.png", }); }, 0); - - // setTimeout(() => { - - // uni.navigateTo({ - // url: './orderList' - // }); - // }, 1000) } } ); @@ -608,7 +495,6 @@ }); }, 1000); } else { - console.log(res, "微信支付111111111111111"); if (res.data.errMsg.indexOf("User canceled") != -1) { uni.showToast({ title: "用户取消支付", @@ -644,7 +530,6 @@ radioChange(index) { this.selectPayIndex = index; this.payType = this.payList[this.selectPayIndex].type; - console.log("this.selectPayIndex at line 315:", this.selectPayIndex); this.$forceUpdate(); }, handleValChange(e) { @@ -664,12 +549,6 @@ ...this.taiHuClassInfo, }, }; - // $mars.progressBegin('申请中...'); - // $mars.post(customerType, 'applyRelearn', data, function (ret) { - // api.hideProgress(); - - // fnLoadDataGrid(); - // }); }, fnRelearn(oid, days, courseFee) { //99和199课程复读一个月60三个月120; 299和399课程复读一个月80三个月180 @@ -705,14 +584,6 @@ fee: fee, }; this.show = true; - // $aui.alert({ - // title: , - // content: '用户您好，该课程已到期，通过支付' + fee + '元，本门课程可获得' + days + '天延期学习时间，点击确认即完成自动扣费，感谢配合！', - // buttons: ['取消', '确认'], - // radius: 6, - // titleColor: '#ff3300', - // contColor: '#333', - // btnColor: '' }, //课程详情 async gotoDetail(v) { @@ -729,7 +600,6 @@ } uni.navigateTo({ - // url: '../bookShop/commodityDetail?id=' + item.id url: `/pages/curriculum/order/curriculum/detail?navTitle=${v.title}&title=${v.title}&oid=${v.courseOid}&conditions=${v.conditions}&detailOid=${v.detailOid}`, }); }, @@ -737,14 +607,12 @@ goCourseDescription(v) { console.log(v); uni.navigateTo({ - // url: '../bookShop/commodityDetail?id=' + item.id url: `/pages/curriculum/order/curriculum/index?navTitle=${v.title}&title=${v.title}&oid=${v.oid}`, }); }, async getCourseDescriptionData() { var data = {}; var that = this; - console.log(this.$store.state, "11111111111"); this.$http .post(this.urlList.list, { customerType: "D", @@ -762,16 +630,10 @@ this.swiperList.push(that.curriculumData.explainsImg); } else { that.swiperList = that.curriculumData.productImageList.split(","); - // for (var i = 0; i < imgList.length; i++) { - // this.swiperList.push(imgList[i]) - // } } that.dataList = res.obj.correlatedList; await that.getDetailInfo(); - // that.relatedCoursesList = res.obj.correlatedList - // await that.handleselectCate({ ...this.cateList[0], index: 0 }) - // socket.init(); }); }, getPriceData() { @@ -786,21 +648,6 @@ checkDisable() { console.log("点击了"); }, - // 显示无权限弹窗 - // showNoRights() { - // let that = this - // uni.showModal({ - // content: "", - // confirmText: '好的', - // showCancel: false, - // success: function(res) { - // if (res.confirm) { - // // console.log('用户点击确定'); - // that.clear() - // } - // } - // }) - // }, // 获取用户详情 getUserInfo() { // 用户详情 @@ -818,9 +665,6 @@ var data = []; console.log(item, index, 99999); var that = this; - - // curriculumInfo - this.$http .post(this.urlList.curriculumInfo, { customerType: "D", @@ -831,201 +675,27 @@ .then(async (res) => { that.curriculumInfo = res.obj; that.dataList = res.obj.courseList; - - // socket.init(); }); - - // this.$nextTick(() => { - // switch (item.type) { - // case 1: - // // allDataList - // this.dataList = that.allDataList.result1Lst - // break; - // case 2: - // this.dataList = that.allDataList.result2Lst - // break; - // case 3: - // this.dataList = that.allDataList.result3Lst - // break; - // case 4: - // this.dataList = that.allDataList.result4Lst.filter(e => - // e.oid != '5fcf991c027b11e7ae62008cfae40c18' && e.oid != 'b3d8a938b8e147bc877613bb712a9cb3' && e.oid != '4d4730163135420ea962bfac4805e026' && e.oid != '49fb76ca3d6b43718d78c6aa9a3003c2' && e.oid != 'c7b047ed9246469b9ae2b1013fc3df9c' - - // ) - - // console.log(this.dataList.length, 6666666) - // break; - - // } - - // this.currentCateIndex = item.index - // }) - console.log(this.allDataList, this.dataList, "1688"); - // if(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 - // } - - // this.currentStatusIndex = index - this.searchValue = ""; this.searchList = []; this.showSearchList = false; - // if (index != 2) { - - // uni.createSelectorQuery().select('.statusList').boundingClientRect(function (rect) { - // var height = rect.height - // console.log('元素高度：',); - - // }).exec(); - - // } else { - // this.getJFList(dictType) - // } - return data; }, async getDetailInfo() { var that = this; - - // curriculumInfo - this.detailInfo = { content: "

没有中医基础想学中医难不难？中医学者治疗出现瓶颈怎么办？中西医究竟有什么不同呢？吴雄志教授将以全新的视角，完美整合中药学和西医学知识，让你领略当代中医生理学魅力。



【思考题】

1、简述中医的发展这些年出现了哪些变化？

2、简述中西医学科的异同？

", }; - - // this.$http - // .post(this.urlList.detailInfo, { - // customerType - // : - // "D", - // token - // : uni.getStorageSync("token") - // , - // customerOid - // : uni.getStorageSync("customerOid"), - // classOid: 'f81b558ca4ee406e97c4045c87c2539c' - - // }) - // .then(async res => { - // that.detailInfo = res.obj - // // that.dataList = res.obj.courseList - - // // socket.init(); - - // }); - - // this.$nextTick(() => { - // switch (item.type) { - // case 1: - // // allDataList - // this.dataList = that.allDataList.result1Lst - // break; - // case 2: - // this.dataList = that.allDataList.result2Lst - // break; - // case 3: - // this.dataList = that.allDataList.result3Lst - // break; - // case 4: - // this.dataList = that.allDataList.result4Lst.filter(e => - // e.oid != '5fcf991c027b11e7ae62008cfae40c18' && e.oid != 'b3d8a938b8e147bc877613bb712a9cb3' && e.oid != '4d4730163135420ea962bfac4805e026' && e.oid != '49fb76ca3d6b43718d78c6aa9a3003c2' && e.oid != 'c7b047ed9246469b9ae2b1013fc3df9c' - - // ) - - // console.log(this.dataList.length, 6666666) - // break; - - // } - - // this.currentCateIndex = item.index - // }) - console.log(this.allDataList, this.dataList, "1688"); - // if(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 - // } - - // this.currentStatusIndex = index - this.searchValue = ""; this.searchList = []; this.showSearchList = false; - // if (index != 2) { - - // uni.createSelectorQuery().select('.statusList').boundingClientRect(function (rect) { - // var height = rect.height - // console.log('元素高度：',); - - // }).exec(); - - // } else { - // this.getJFList(dictType) - // } - return data; }, async setOneCateIndex(item, index) { this.allDataList = []; console.log(index, 99999); var that = this; - - // if(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 - // } - this.currentStatusIndex = index; - // this.currentCateIndex = 0 - this.searchValue = ""; this.searchList = []; this.showSearchList = false; @@ -1034,19 +704,6 @@ this.$forceUpdate(); }); - - // this.handleselectCate(this.cateList[this.currentCateIndex]) - // if (index != 2) { - - // uni.createSelectorQuery().select('.statusList').boundingClientRect(function (rect) { - // var height = rect.height - // console.log('元素高度：',); - - // }).exec(); - - // } else { - // this.getJFList(dictType) - // } }, transformData(inputData) { @@ -1060,159 +717,13 @@ } result[letter].push(item); }); - // const finalResult = Object.keys(result).map(key => ({ [key]: result[key] })); return result; }, - // getJFList(id) { - // $http.request({ - // url: "book/prescript/prescriptListForJF", - // method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 - // data: { - // loadAnimate: 'none', // 请求加载动画 - // 'categoryId': id - // }, - // header: { //默认 无 说明：请求头 - // 'Content-Type': 'application/json' - // }, - // }).then(res => { - // if (res.code == 0 && res.list.length > 0) { - // this.twoCateList = [] - // this.dataList = this.transformData(res.list) - // console.log('JF经方', this.dataList) - // } else { - // this.twoCateList = [] - // this.dataList = [] - // } - // }).catch(e => { - // this.twoCateList = [] - // this.dataList = [] - // console.log(e) - // }) - // }, getCateList(id) { id ? "" : (id = 0); this.twoCateList = []; this.curTwoCateIndex = 0; - // 0为获取顶级分类，其他为搜索下级分类，目前的逻辑，顶级是写死的，所以可能只会涉及到搜索第二级 - // $http.request({ - // url: "book/prescript/prescriptCategoryList", - // method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 - // data: { - // loadAnimate: 'none', // 请求加载动画 - // 'categoryId': id - // }, - // header: { //默认 无 说明：请求头 - // 'Content-Type': 'application/json' - // }, - // }).then(res => { - // console.log(res, '脉穴分类获取成功') - // if (res.code == 0 && res.list.length > 0) { - // this.statusList = res.list - // this.getTowCateList(this.statusList[0].type) - // } else { - // this.statusList = [] - // } - // }).catch(e => { - // this.statusList = [] - // console.log(e) - // }) }, - - // 放大图片 - previewImage(url) { - console.log(url); - uni.previewImage({ - urls: [url], - longPressActions: { - itemList: ["很抱歉，暂不支持保存图片到本地"], - success: function(res) { - // console.log(res,'+++++') - }, - }, - }); - }, - // getSearch() { - // $http.request({ - // url: "book/prescript/searchPrescript", - // method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 - // data: { - // loadAnimate: 'none', // 请求加载动画 - // 'keywords': this.searchValue, - // type: this.currentStatusIndex + 1 - // }, - // header: { //默认 无 说明：请求头 - // 'Content-Type': 'application/json' - // }, - // }).then(res => { - // console.log(res, '搜索结果') - // if (res.code == 0 && res.list.length >= 0) { - // this.showSearchList = true - // this.searchList = res.list - // } else { - // this.searchList = [] - // } - // }).catch(e => { - // // this.dataList = [] - // this.searchList = [] - // console.log(e) - // }) - // }, - // search(res) { - // console.log(res, 'res') - // // uni.showToast({ - // // title: '搜索：' + res, - // // icon: 'none' - // // }) - // if (res == '') { - // this.showSearchList = false - // this.searchList = [] - // } else { - // this.getSearch() - // } - - // }, - // input(res) { - // console.log('----input:', res) - // if (res == '') { - // this.searchList = [] - // } else { - // this.getSearch() - // } - // }, - // clear(res) { - // console.log('----clear:', res) - // // uni.showToast({ - // // title: 'clear事件，清除值为：', - // // icon: 'none' - // // }) - // this.searchValue = '' - // this.showSearchList = false - // }, - // blur(res) { - // // console.log('----blur:', res) - // // if (res == '') { - // // this.showSearchList = false - // // this.searchList = [] - // // } else { - // // this.getSearch() - // // } - // }, - // focus(e) { - // console.log('----focus:') - // // uni.showToast({ - // // title: 'focus事件，输出值为：' + e.value, - // // icon: 'none' - // // }) - // // 等于1 就是有权限 - // // this.showSearchList = true - - // }, - // cancel(res) { - // uni.showToast({ - // title: '点击取消，输入值为：' + res.value, - // icon: 'none' - // }) - // } }, onBackPress() { // #ifdef APP-PLUS diff --git a/static/icon/chao_svip.png b/static/icon/chao_svip.png new file mode 100644 index 0000000..2437ade Binary files /dev/null and b/static/icon/chao_svip.png differ diff --git a/static/icon/chao_vip.png b/static/icon/chao_vip.png new file mode 100644 index 0000000..6afdacb Binary files /dev/null and b/static/icon/chao_vip.png differ