diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..8835b6c
Binary files /dev/null and b/.DS_Store differ
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/dictionaries b/.idea/dictionaries
new file mode 100644
index 0000000..7793bcc
--- /dev/null
+++ b/.idea/dictionaries
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..be40127
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/sociology_app.iml b/.idea/sociology_app.iml
new file mode 100644
index 0000000..24643cc
--- /dev/null
+++ b/.idea/sociology_app.iml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vagrant.xml b/.idea/vagrant.xml
new file mode 100644
index 0000000..a5aa786
--- /dev/null
+++ b/.idea/vagrant.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..82d92d1
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $USER_HOME$/.subversion
+
+
+
+
+ 1730945085136
+
+
+ 1730945085136
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/bkhumor-emojiplus/.DS_Store b/bkhumor-emojiplus/.DS_Store
new file mode 100644
index 0000000..f185ada
Binary files /dev/null and b/bkhumor-emojiplus/.DS_Store differ
diff --git a/components/.DS_Store b/components/.DS_Store
new file mode 100644
index 0000000..f70896e
Binary files /dev/null and b/components/.DS_Store differ
diff --git a/config/baseUrl.js b/config/baseUrl.js
index 5e03e6a..ad05360 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -2,42 +2,12 @@ let baseUrl = "";
let socketUrl = "";
if (process.env.NODE_ENV === 'development') {
// 开发环境
- // baseUrl = "http://localhost:7001/";
- // socketUrl = "ws://localhost:6001/";
- // baseUrl = "https://twin-ui.com/demo/";
- // baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境
- // baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
-
-
-
-
- baseUrl = "https://api.nuttyreading.com/"; // 线上正式
-
-
- // baseUrl = "http://101.201.146.165:8088/App-EH/"; // 一路健康APP线上正式
-
-
- // baseUrl = "http://192.168.110.100:9200/pb/"; // 开发用电脑
- // baseUrl = "http://59.110.212.44:9200/pb/";
- // baseUrl = "http://192.168.110.100:9100/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/";
+ baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
+ //baseUrl = "https://api.nuttyreading.com/"; // 线上正式
} else if (process.env.NODE_ENV === 'production') {
- // baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
+ baseUrl = "http://192.168.110.100:9200/pb/"; // 张川川
// 生产环境11
-
- // baseUrl = "http://192.168.110.110:9200/pb/"; //磊哥
- // baseUrl = "http://59.110.212.44:9100/pb/";
- // baseUrl = "https://testapi.nuttyreading.com/";
- baseUrl = "https://api.nuttyreading.com/"; //1
- // baseUrl = "ws://twin-ui.com:6001/";
- // socketUrl = "ws://twin-ui.com:6001/";
+ //baseUrl = "https://api.nuttyreading.com/"; //1
}
const courtConfig = {
//微信公众号APPID
diff --git a/config/requestConfig.js b/config/requestConfig.js
index 21d674b..34dfd86 100644
--- a/config/requestConfig.js
+++ b/config/requestConfig.js
@@ -39,7 +39,8 @@ let $http = new request({
// 'Content-Type': 'application/json;charset=UTF-8',
'Content-Type': 'application/x-www-form-urlencoded',
// 'project_token': base.projectToken, //项目token（可删除）
- }
+ },
+ timeout: '15000' // 15秒
});
// 添加获取七牛云token的方法
$http.getQnToken = function (callback) {
diff --git a/js_sdk/.DS_Store b/js_sdk/.DS_Store
new file mode 100644
index 0000000..8438948
Binary files /dev/null and b/js_sdk/.DS_Store differ
diff --git a/node_modules/.DS_Store b/node_modules/.DS_Store
new file mode 100644
index 0000000..0911758
Binary files /dev/null and b/node_modules/.DS_Store differ
diff --git a/pages/.DS_Store b/pages/.DS_Store
new file mode 100644
index 0000000..ea0a388
Binary files /dev/null and b/pages/.DS_Store differ
diff --git a/pages/bookShop/orderList.vue b/pages/bookShop/orderList.vue
index d846550..884665e 100644
--- a/pages/bookShop/orderList.vue
+++ b/pages/bookShop/orderList.vue
@@ -1421,6 +1421,7 @@
.commonDetailPage {
background-color: $themeBgColor;
+ height: calc(100vh);
}
.order_box {
diff --git a/pages/component/input/input.nvue b/pages/component/input/input.vue
similarity index 100%
rename from pages/component/input/input.nvue
rename to pages/component/input/input.vue
diff --git a/pages/curriculum/order/curriculum/detail.vue b/pages/curriculum/order/curriculum/detail.vue
index 82584ae..67a7a7f 100644
--- a/pages/curriculum/order/curriculum/detail.vue
+++ b/pages/curriculum/order/curriculum/detail.vue
@@ -1,10 +1,5 @@
-
+
-
-
diff --git a/pages/curriculum/order/curriculum/index.vue b/pages/curriculum/order/curriculum/index.vue
index f1d129b..a1503d4 100644
--- a/pages/curriculum/order/curriculum/index.vue
+++ b/pages/curriculum/order/curriculum/index.vue
@@ -65,8 +65,6 @@
{{
curriculumData.title
}}
-
-
{{
@@ -159,17 +157,11 @@
slotProps.row.viewFlg == 1 ? 'aui-text-success' : ''
}`">{{ slotProps.row.title }}
-
-
-
-
-
-
试听
@@ -178,26 +170,7 @@
-
-
-
学习进度
@@ -224,15 +197,6 @@
-
-
{
this.getCourseDescriptionData();
});
-
- // 也可以通过主题形式调用，如：
- // this.$refs.uNotify.primary('Primary主题')
- // 关闭 notify
- // this.$refs.uNotify.close()
},
methods: {
handleClickGetVip() {
@@ -432,10 +367,9 @@
url: "/pages/mine/vip/index",
});
},
+ //获取vip信息数据
getUserInfo() {
- console.log("111111111111111111111111111");
this.$http.post("common/user/getUserInfo").then((res) => {
- console.log(res, "111111111111111111111111111");
if (res.result.userVip) {
this.vip = res.result.userVip;
} else {
@@ -502,11 +436,6 @@
this.$forceUpdate();
},
onHandleClickBuy(e) {
- console.log("e at line 387:", e);
- // if (e.index == 0) {
- // this.handleClickClose();
- // }
- // if (e.index == 0) {
var mynavData = JSON.stringify({
goods: [this.selectGoodsData],
typeId: 0,
@@ -517,7 +446,6 @@
uni.navigateTo({
url: `/pages/goods/order/index?data=${mynavData}`,
});
- // }
},
handleClickGoBuy() {},
handleClickClose() {
@@ -528,11 +456,8 @@
//获取相关关联课程商品
//获取相关关联课程商品
handleClickGetGoodsList(v) {
- // console.log("data at line 313:", data);
-
if (v.type == 0) {
//免费
-
this.$http
.request({
url: this.urlList.startStudyForMF,
@@ -541,25 +466,13 @@
catalogueId: v.id,
},
header: {
- //默认 无 说明：请求头
"Content-Type": "application/json",
},
})
.then(async (res) => {
- console.log("res at line 493:", res);
if (res.code == 0) {
this.getCourseDescriptionData();
- // this.$commonJS.showToast("");
}
- // if (res.productList.length > 0) {
- // this.goodsList = res.productList;
- // this.selectGoodsData = this.goodsList[0];
- // this.$refs.commonSelectGoods.open();
- // this.show = true;
- // } else {
- // this.$commonJS.showToast("此课程暂无购买方式");
- // }
-
this.$forceUpdate();
});
} else {
@@ -585,7 +498,6 @@
id: v.id,
},
header: {
- //默认 无 说明：请求头
"Content-Type": "application/json",
},
})
@@ -613,12 +525,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
@@ -654,33 +560,9 @@
fee: fee,
};
this.show = true;
- // $aui.alert({
- // title: ,
- // content: '用户您好，该课程已到期，通过支付' + fee + '元，本门课程可获得' + days + '天延期学习时间，点击确认即完成自动扣费，感谢配合！',
- // buttons: ['取消', '确认'],
- // radius: 6,
- // titleColor: '#ff3300',
- // contColor: '#333',
- // btnColor: ''
},
//课程详情
async gotoDetail(v, index) {
- console.log('v at line 664:', v)
- console.log(
- this.cateList[this.currentCateIndex],
- 8888888888888888888888888
- );
-
- // 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;
- // }
-
if (
this.cateList[this.currentCateIndex].isBuy == 1 ||
v.isAudition == 1 ||
@@ -688,7 +570,6 @@
this.vip.type == "3"
) {
uni.navigateTo({
- // url: '../bookShop/commodityDetail?id=' + item.id
url: `/pages/curriculum/order/curriculum/detail?navTitle=${this.options.navTitle}&title=${v.title}&id=${v.id}&conditions=${v.conditions}&detailOid=${v.detailOid}&curriculumImgUrl=${this.curriculumData.image}`,
});
} else {
@@ -697,9 +578,7 @@
},
//相关课程
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}`,
});
},
@@ -710,25 +589,17 @@
await $http
.request({
url: this.urlList.curriculumInfo,
- method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+ method: "POST",
data: {
id: v.id,
},
header: {
- //默认 无 说明：请求头
"Content-Type": "application/json",
},
})
.then(async (res) => {
if (res.code == 0 && res.chapterList.length > 0) {
- // res.chapterList.map((item) => {
- // item.tryListen = [];
- // });
-
list = JSON.parse(JSON.stringify(res.chapterList));
-
- console.log("at line 1343:", list);
- // console.log('status', res)
} else {
list = [];
}
@@ -741,8 +612,6 @@
getCourseDescriptionData() {
var data = {};
var that = this;
- console.log(this.$store.state, "11111111111");
-
this.$http
.request({
url: this.urlList.list,
@@ -751,17 +620,12 @@
id: this.options.id,
},
header: {
- //默认 无 说明：请求头
"Content-Type": "application/json",
},
})
.then(async (res) => {
that.curriculumData = res.data.course;
that.cateList = [...res.data.catalogues];
-
- console.log("that.allDataList at line 1068:", that.allDataList);
- // this..getPercentage();
-
for (let i = 0; i < that.cateList.length; i++) {
var list = await that.getChapterList(that.cateList[i]);
@@ -769,18 +633,12 @@
...that.cateList[i],
courseList: [...list],
};
- // that.allDataList[i].courseList = [];
}
setTimeout(() => {
that.$refs.commonAnchorLink.getDistanceArr();
}, 200);
- console.log("that.courseList at line 1238:", that.allDataList);
- this.$forceUpdate(); // that.relatedCoursesList = res.data.correlatedList
- // ? res.data.correlatedList
- // : [];
- // await that.handleselectCate(this.cateList[0], 0);
- // socket.init();
+ this.$forceUpdate();
});
},
getPriceData() {
@@ -795,115 +653,12 @@
checkDisable() {
console.log("点击了");
},
- // 显示无权限弹窗
- // showNoRights() {
- // let that = this
- // uni.showModal({
- // content: "",
- // confirmText: '好的',
- // showCancel: false,
- // success: function(res) {
- // if (res.confirm) {
- // // console.log('用户点击确定');
- // that.clear()
- // }
- // }
- // })
- // },
- // // 获取用户详情
- // getUserInfo() {
- // // 用户详情
- // if (this.userInfo.id != undefined) {
- // this.$http.post("book/user/info/" + this.userInfo.id).then((res) => {
- // this.userMes = res.user;
- // this.getCateList();
- // console.log(this.userMes, "呼呼");
- // });
- // }
- // },
-
- async handleselectCate(item, index) {
- console.log("item at line 662:", item);
- console.log("index at line 637:", index);
- // this.description=`您还未购买当前【${item.title}】课程，`
- var title1 = "";
- this.currentCateIndex = index;
- switch (this.vip.type) {
- case 0:
- this.goBuyTitle = "购买VIP,即可免费观看吴门医述所有课程";
- this.goBuyType = 0;
- break;
- case 1 || 2:
- var vipName = "";
- if (this.vip.type == 1) {
- vipName = "超级VIP";
- }
- if (this.vip.type == 2) {
- vipName = "吴门医述VIP";
- }
- //超级VIP
- this.goBuyTitle = `尊贵的${vipName},您的有效期到 ${
- this.vip.endTime && this.vip.endTime.split(" ")[0]
- }`;
- this.goBuyType = 1;
- break;
-
- case 3:
- //众妙之门
- this.goBuyTitle =
- "尊贵的众妙之门VIP,升级至超级VIP,即可免费观看吴门医述所有课程";
-
- this.goBuyType = 2;
- break;
- }
-
- // this.currentCateIndex = index;
- this.dataList = [];
- var data = [];
- console.log(item, index, 99999);
- var that = this;
-
- // curriculumInfo
- this.$http
- .request({
- url: this.urlList.curriculumInfo,
- method: "POST",
- data: {
- id: item.id,
- },
- header: {
- //默认 无 说明：请求头
- "Content-Type": "application/json",
- },
- })
-
- .then(async (res) => {
- // that.curriculumInfo = res.obj;
- // that.currentCateIndex = index;
- that.percentage = item.completion;
- that.dataList = res.chapterList;
- // that.getPercentage();
- that.$forceUpdate();
-
- // socket.init();
- });
-
- console.log(this.allDataList, this.dataList, "1688");
-
- this.searchValue = "";
- this.searchList = [];
- this.showSearchList = false;
-
- return data;
- },
+
async setOneCateIndex(item, index) {
this.allDataList = [];
- console.log(index, 99999);
var that = this;
this.currentStatusIndex = index;
- // this.currentCateIndex = 0
-
this.searchValue = "";
this.searchList = [];
this.showSearchList = false;
@@ -912,19 +667,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) {
@@ -938,23 +680,8 @@
}
result[letter].push(item);
});
- // const finalResult = Object.keys(result).map(key => ({ [key]: result[key] }));
return result;
},
-
- // 放大图片
- previewImage(url) {
- console.log(url);
- uni.previewImage({
- urls: [url],
- longPressActions: {
- itemList: ["很抱歉，暂不支持保存图片到本地"],
- success: function(res) {
- // console.log(res,'+++++')
- },
- },
- });
- },
},
onBackPress() {
// #ifdef APP-PLUS
@@ -966,11 +693,6 @@
\ No newline at end of file
diff --git a/pages/mine/vip/index.vue b/pages/mine/vip/index.vue
index f6b820d..147b6de 100644
--- a/pages/mine/vip/index.vue
+++ b/pages/mine/vip/index.vue
@@ -1,965 +1,286 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.title }}
- ￥{{ item.lastFee }}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {{item.title}}
+ 还有{{item.tip}}天到期
+
+ 已过期
+
+
+
+
+ 课程价格：
+ 一年{{item.originalPrice||0}}元
+
+
+ 去办理
+ 去续费
+
+
+ 超级VIP价格：
+ VIP价格：
+
+ {{item_price.year}}年{{item_price.rebateFee}}元
+
+
+
+ 延期价格：
+
+ {{item_yq.year}}年{{item_yq.rebateFee}}元
+
+
+
+ VIP权限：
+ 无限制观看吴门医述APP中医学、针灸学、肿瘤学三个板块任意课程；
+ 无限制观看众妙之门APP与吴门医述APP心理学板块任意课程；
+ 无限制观看众妙之门APP任意课程；
+ 无限制观看吴门医述APP{{item.title.replace(/VIP/g, '')}}板块任意课程；
+
+
+ {{item.title.replace(/超级VIP/g, '')}}
+ {{item.title.replace(/VIP/g, '')}}
+ 培训班报名享受8折9折优惠
+
+ 疯子读书APP购书享受8折9折优惠
+
+
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/pages/mine/vip/order.vue b/pages/mine/vip/order.vue
index 88333be..9dacf75 100644
--- a/pages/mine/vip/order.vue
+++ b/pages/mine/vip/order.vue
@@ -1,7 +1,4 @@
-
+
@@ -9,10 +6,19 @@
支付方式
-
-
+
+
+
+ {{dataInfo.list[0].title}}价格：
+ {{item.year}}年
+
+
+
@@ -20,7 +26,7 @@
{{ v.text }}
-
+
(余额：{{
initData && initData.user ? initData.user.peanutCoin : 0
}})
@@ -29,11 +35,11 @@
{{ v.text }}
-
-
@@ -51,9 +57,8 @@
确保您的天医币足够支付
- 立即充值
+ 立即充值
@@ -64,23 +69,15 @@
022-24142321
-
-
3.非中国大陆用户可以信用卡支付。简单快捷，推荐使用！
支付时使用的信用卡需要带有Visa或MasterCard的标识。请向邮箱
+ style="text-decoration: underline; color: #018F89">
publisher@tmrjournals.com
（点击复制）发送支付请求，内容需包含：拟购买的课程名称、支付金额、APP注册姓名及手机号码，或者加一路健康客服微信（
+ style="text-decoration: underline; color: #018F89">
yilujiankangkefu ）（点击复制）联系我们，我们将在24小时内向您的邮箱或者微信发送支付链接，根据提示即可完成信用卡支付，无需兑换外币。
@@ -101,36 +98,20 @@
- 合计:
-
+ 合计：
￥{{ dataInfo.lastFee }}
-
-
-
支付即同意众妙之门《会员服务协议》
-
-
-
-