diff --git a/pages/course/createCourseOrder/createCourseOrder.js b/pages/course/createCourseOrder/createCourseOrder.js
index a3a9085..ba2e881 100644
--- a/pages/course/createCourseOrder/createCourseOrder.js
+++ b/pages/course/createCourseOrder/createCourseOrder.js
@@ -1,5 +1,6 @@
import { baseUrl, globalImgUrl } from "../../../request";
const { notLogin } = require('../../../utils/util')
+import { decodeBase64 } from "../../../utils/decodebase64";
// pages/course/createCourseOrder/createCourseOrder.js
Page({
@@ -13,21 +14,7 @@ Page({
globalImgUrl, // 全局图片
isMaskVisible: false,
isNoticeVisible: true,
- noticeHtml: `
- 一、购买与使用
- 1）购买后请在 「我的订单」 中查看并进入课程学习；
- 2）课程为虚拟内容服务，一经购买概不支持无理由退款；
-
- 二、账号与权益
- 1）课程仅限购买账号本人使用，不可转借、分享或用于商业用途；
- 2）如发现恶意盗链、传播等行为，我们有权封禁账号并追究法律责任。
-
- 三、发票与售后
- 如需发票或遇到问题，请在课程详情页联系客服。
-
- 四、其他
- 购买即视为同意本须知及平台服务协议。
- `,
+ noticeHtml: '',
},
// 打开/关闭弹窗
@@ -164,6 +151,27 @@ noop() {},
} else {
notLogin(res.data.message)
}
+ },
+ fail: () => {
+ wx.showToast({ title: '网络错误', icon: 'none' });
+ }
+ })
+ },
+
+ getCourseDesc() {
+ wx.request({
+ url: baseUrl + '/userInfo/query/courseDesc',
+ method: 'POST',
+ success: res => {
+ console.log('====>购买须知', res.data)
+ if (res.data.code === 1) {
+ this.setData({noticeHtml: decodeBase64(res.data.data)})
+ } else {
+ notLogin(res.data.message)
+ }
+ },
+ fail: () => {
+ wx.showToast({ title: '网络错误', icon: 'none' });
}
})
},
@@ -177,6 +185,7 @@ noop() {},
courseId: options.id,
})
this.getCourseDetail()
+ this.getCourseDesc()
},
/**
diff --git a/pages/course/createCourseOrder/createCourseOrder.wxss b/pages/course/createCourseOrder/createCourseOrder.wxss
index 415d990..afb216b 100644
--- a/pages/course/createCourseOrder/createCourseOrder.wxss
+++ b/pages/course/createCourseOrder/createCourseOrder.wxss
@@ -250,6 +250,9 @@
max-height: 48vh;
padding: 8rpx 32rpx 24rpx;
}
+rich-text {
+ padding-bottom: 32rpx;
+}
/* 富文本默认样式优化 */
.modal-body rich-text {
@@ -308,3 +311,10 @@
.notice-icon:active {
opacity: 0.85;
}
+
+::-webkit-scrollbar {
+ width: 0;
+ height: 0;
+ background: transparent;
+}
+
diff --git a/pages/course/homepage/homepage.js b/pages/course/homepage/homepage.js
index c22dcbf..e2b6e25 100644
--- a/pages/course/homepage/homepage.js
+++ b/pages/course/homepage/homepage.js
@@ -6,14 +6,8 @@ const { notLogin } = require('../../../utils/util')
Page({
data: {
- // 初始时置空，待接口返回后再渲染
- banners: [
- './image/banner.png',
- './image/banner.png',
- './image/banner.png',
- './image/banner.png'
- ],
courseList: [],
+ bannerList: [],
globalImgUrl
},
@@ -70,10 +64,37 @@ Page({
});
},
+ getBannerList() {
+ const token = wx.getStorageSync('token')
+ wx.request({
+ url: baseUrl + '/banner/mini/list',
+ method: 'GET',
+ header: {
+ 'Authorization': token
+ },
+ success: res => {
+ if (res.data.code === 1) {
+ this.setData({
+ bannerList: res.data.data
+ });
+ } else {
+ notLogin(res.data.message)
+ }
+ },
+ fail: () => {
+ wx.showToast({
+ title: '网络异常，请稍后重试',
+ icon: 'none'
+ });
+ }
+ })
+ },
+
/**
* 生命周期函数--监听页面加载
*/
- onLoad(options) {
+ onLoad() {
+ this.getBannerList()
this.getCourseList()
},
diff --git a/pages/course/homepage/homepage.wxml b/pages/course/homepage/homepage.wxml
index 000791d..4fd6aaa 100644
--- a/pages/course/homepage/homepage.wxml
+++ b/pages/course/homepage/homepage.wxml
@@ -8,9 +8,9 @@
-
+
-
+
diff --git a/pages/loginModule/employeeAccountNotice/employeeAccountNotice.js b/pages/loginModule/employeeAccountNotice/employeeAccountNotice.js
index 9e51e18..33e2bba 100644
--- a/pages/loginModule/employeeAccountNotice/employeeAccountNotice.js
+++ b/pages/loginModule/employeeAccountNotice/employeeAccountNotice.js
@@ -1,18 +1,36 @@
-// pages/loginModule/employeeAccountNotice/employeeAccountNotice.js
+import { baseUrl } from "../../../request";
+import { decodeBase64 } from "../../../utils/decodebase64";
+
Page({
/**
* 页面的初始数据
*/
data: {
-
+ applyDesc: '',
},
/**
* 生命周期函数--监听页面加载
*/
- onLoad(options) {
-
+ getApplyDesc() {
+ wx.request({
+ url: baseUrl + '/userInfo/query/applyNotice',
+ method: 'POST',
+ success: res => {
+ if (res.data.code === 1) {
+ this.setData({ applyDesc: decodeBase64(res.data.data) })
+ } else {
+ wx.showToast({ title: res.data.message, icon: 'none' });
+ }
+ },
+ fail: () => {
+ wx.showToast({ title: '网络错误', icon: 'none' });
+ }
+ })
+ },
+ onLoad() {
+ this.getApplyDesc()
},
/**
diff --git a/pages/loginModule/employeeAccountNotice/employeeAccountNotice.wxml b/pages/loginModule/employeeAccountNotice/employeeAccountNotice.wxml
index 78e0c3c..7069aa7 100644
--- a/pages/loginModule/employeeAccountNotice/employeeAccountNotice.wxml
+++ b/pages/loginModule/employeeAccountNotice/employeeAccountNotice.wxml
@@ -1,5 +1,5 @@
员工账号申请须知
-
+
\ No newline at end of file
diff --git a/pages/loginModule/employeeAccountNotice/employeeAccountNotice.wxss b/pages/loginModule/employeeAccountNotice/employeeAccountNotice.wxss
index 27e5187..9168d29 100644
--- a/pages/loginModule/employeeAccountNotice/employeeAccountNotice.wxss
+++ b/pages/loginModule/employeeAccountNotice/employeeAccountNotice.wxss
@@ -1,15 +1,15 @@
/* pages/loginModule/employeeAccountNotice/employeeAccountNotice.wxss */
.page {
- padding: 65.08rpx 42.19rpx 145.31rpx 44.06rpx;
+ padding: 65.08rpx 42.19rpx 150rpx 44.06rpx;
background-color: #ffffff;
width: 100%;
- overflow-y: auto;
- overflow-x: hidden;
+ overflow: auto;
height: 100%;
}
.text {
color: #000000;
font-size: 33.75rpx;
+ font-weight: bold;
font-family: SourceHanSansCN;
line-height: 31.26rpx;
}
@@ -18,6 +18,10 @@
}
.view {
background-color: #ffffff;
- height: 1301.25rpx;
- border: solid 1.88rpx #000000;
+}
+
+::-webkit-scrollbar {
+ width: 0;
+ height: 0;
+ background: transparent;
}
\ No newline at end of file
diff --git a/pages/personCenter/mine/images/dash.png b/pages/personCenter/mine/images/dash.png
new file mode 100644
index 0000000..a7c8d86
Binary files /dev/null and b/pages/personCenter/mine/images/dash.png differ
diff --git a/pages/personCenter/mine/images/order.png b/pages/personCenter/mine/images/order.png
new file mode 100644
index 0000000..e486e65
Binary files /dev/null and b/pages/personCenter/mine/images/order.png differ
diff --git a/pages/personCenter/mine/images/setting.png b/pages/personCenter/mine/images/setting.png
new file mode 100644
index 0000000..9d910db
Binary files /dev/null and b/pages/personCenter/mine/images/setting.png differ
diff --git a/pages/personCenter/mine/mine.js b/pages/personCenter/mine/mine.js
index 811cc60..59cd8b8 100644
--- a/pages/personCenter/mine/mine.js
+++ b/pages/personCenter/mine/mine.js
@@ -10,7 +10,6 @@ Page({
* 页面的初始数据
*/
data: {
- items: [null,null,null],
nickName: "",
userAvatar: "",
phoneNumber: "",
diff --git a/pages/personCenter/mine/mine.wxml b/pages/personCenter/mine/mine.wxml
index cd1c045..b2bc0b4 100644
--- a/pages/personCenter/mine/mine.wxml
+++ b/pages/personCenter/mine/mine.wxml
@@ -281,9 +281,9 @@
- 我的订单
+ 我的订单
- 仪表盘
+ 仪表盘
- 账号设置
+ 账号设置