From 0fe16bf5ab4fbdafd4ce65ae97ef26329991f92d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=B1=AA?= <781521347@qq.com> Date: Wed, 14 Jul 2021 18:43:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 18 + api/knowledge.js | 73 ++++ api/serverTeacher.js | 78 ++++ api/user.js | 14 + assets/css/base.less | 11 +- assets/css/reset.less | 22 +- components/AddressWindow.vue | 2 +- components/OrderGoods.vue | 54 ++- components/ProductWindow.vue | 5 + components/wuc-tab/wuc-tab.vue | 2 +- config/index.js | 3 +- manifest.json | 12 +- pages.json | 76 +++- pages/Loading/index.vue | 31 +- pages/authorization/index.vue | 3 +- pages/course/detail.vue | 264 ++++++++---- pages/course/index.vue | 207 +++++++-- pages/home/index.vue | 211 ++++++--- pages/knowledge/components/secondMenu.vue | 3 +- pages/knowledge/detail.vue | 161 +++++-- pages/knowledge/index.vue | 203 ++++++--- pages/knowledge/unlock.vue | 163 +++++++ pages/order/Logistics/index.vue | 2 +- pages/order/OrderSubmission/index.vue | 266 +++++++----- pages/serviceTeacher/addMember.vue | 355 +++++++++++++++ pages/serviceTeacher/courseDetail.vue | 406 ++++++++++++++++++ pages/serviceTeacher/courseManagement.vue | 195 +++++++++ pages/serviceTeacher/index.vue | 121 ++++++ pages/serviceTeacher/memberDabang.vue | 203 +++++++++ pages/serviceTeacher/memberDetail.vue | 248 +++++++++++ pages/serviceTeacher/memberManagement.vue | 185 ++++++++ pages/serviceTeacher/setSelfData.vue | 324 ++++++++++++++ pages/shop/GoodsClass/index.vue | 71 ++- pages/shop/GoodsCon/index.vue | 27 +- pages/shop/ShoppingCart/index.vue | 42 +- pages/study/bangdanRecord.vue | 95 +++- pages/study/dabang.vue | 202 ++++++--- pages/study/detail.vue | 237 +++++++--- pages/study/editDabang.vue | 60 ++- pages/user/PersonalData/index.vue | 25 +- pages/user/User/index.vue | 174 ++++++-- pages/user/feedBack/index.vue | 35 +- pages/user/myBangdan/index.vue | 58 ++- pages/user/myCourses/index.vue | 99 +++-- .../user/address/AddressManagement/index.vue | 7 +- pagesB/pages/user/signIn/Integral/index.vue | 155 ++++++- static/addMenber.png | Bin 0 -> 1981 bytes static/article1.png | Bin 352705 -> 0 bytes static/backhome-icon.png | Bin 0 -> 2922 bytes static/dabang-icon.png | Bin 0 -> 911 bytes static/default-headerimg.png | Bin 0 -> 2157 bytes static/dizhi.png | Bin 0 -> 1055 bytes static/home-banner.png | Bin 343772 -> 0 bytes static/img2.png | Bin 67607 -> 0 bytes static/jifen1.png | Bin 0 -> 1632 bytes static/jifen2.png | Bin 0 -> 1590 bytes static/jifen3.png | Bin 0 -> 1594 bytes static/jifen4.png | Bin 0 -> 1442 bytes static/kecheng-icon.png | Bin 0 -> 1307 bytes static/kecheng-icon2.png | Bin 0 -> 973 bytes static/like.png | Bin 0 -> 888 bytes static/lock.png | Bin 0 -> 932 bytes static/message.png | Bin 0 -> 1624 bytes static/num1.png | Bin 0 -> 1695 bytes static/num2.png | Bin 0 -> 1545 bytes static/num3.png | Bin 0 -> 1601 bytes static/sort-icon.png | Bin 0 -> 694 bytes static/success.png | Bin 0 -> 2650 bytes static/tab1-d.png | Bin 0 -> 1655 bytes static/tab2-d.png | Bin 0 -> 1544 bytes static/tab3-d.png | Bin 0 -> 885 bytes static/tab4-d.png | Bin 0 -> 823 bytes static/tab5-d.png | Bin 0 -> 1628 bytes static/time.png | Bin 0 -> 691 bytes static/user-menu6.png | Bin 0 -> 1398 bytes static/vipmanage-icon.png | Bin 0 -> 1451 bytes utils/index.js | 54 +++ utils/request.js | 7 +- 78 files changed, 4570 insertions(+), 699 deletions(-) create mode 100644 api/serverTeacher.js create mode 100644 pages/knowledge/unlock.vue create mode 100644 pages/serviceTeacher/addMember.vue create mode 100644 pages/serviceTeacher/courseDetail.vue create mode 100644 pages/serviceTeacher/courseManagement.vue create mode 100644 pages/serviceTeacher/index.vue create mode 100644 pages/serviceTeacher/memberDabang.vue create mode 100644 pages/serviceTeacher/memberDetail.vue create mode 100644 pages/serviceTeacher/memberManagement.vue create mode 100644 pages/serviceTeacher/setSelfData.vue create mode 100644 static/addMenber.png delete mode 100644 static/article1.png create mode 100644 static/backhome-icon.png create mode 100644 static/dabang-icon.png create mode 100644 static/default-headerimg.png create mode 100644 static/dizhi.png delete mode 100644 static/home-banner.png delete mode 100644 static/img2.png create mode 100644 static/jifen1.png create mode 100644 static/jifen2.png create mode 100644 static/jifen3.png create mode 100644 static/jifen4.png create mode 100644 static/kecheng-icon.png create mode 100644 static/kecheng-icon2.png create mode 100644 static/like.png create mode 100644 static/lock.png create mode 100644 static/message.png create mode 100644 static/num1.png create mode 100644 static/num2.png create mode 100644 static/num3.png create mode 100644 static/sort-icon.png create mode 100644 static/success.png create mode 100644 static/tab1-d.png create mode 100644 static/tab2-d.png create mode 100644 static/tab3-d.png create mode 100644 static/tab4-d.png create mode 100644 static/tab5-d.png create mode 100644 static/time.png create mode 100644 static/user-menu6.png create mode 100644 static/vipmanage-icon.png diff --git a/App.vue b/App.vue index 2d20bb3..b9bfc6e 100644 --- a/App.vue +++ b/App.vue @@ -88,4 +88,22 @@ export default { @import './assets/css/base.less'; @import './assets/css/reset.less'; @import './assets/css/style.less'; +/* #ifdef APP-PLUS ||MP-WEIXIN */ + checkbox .wx-checkbox-input { + border-radius: 50% !important; + /* color: #ffffff !important; */ + } + + checkbox .wx-checkbox-input.wx-checkbox-input-checked { + color: #fff; + background: #FDBF68; + border-color: #FDBF68 !important; + } + + /* .wx-checkbox-input.wx-checkbox-input-checked { + border: none !important; + } */ + + /* #endif */ + diff --git a/api/knowledge.js b/api/knowledge.js index 909296c..2ee1356 100644 --- a/api/knowledge.js +++ b/api/knowledge.js @@ -7,6 +7,13 @@ export function getCategory(data) { return request.get("/CourseCategory", data); } +/** + * 文章分类 + */ +export function getArticleCategorys(data) { + return request.get("/CourseCategory/getArticleCategorys", data); +} + /** * 通过分类查找文章列表 */ @@ -21,12 +28,64 @@ export function getArticleDetails(data) { return request.get("/article/details/"+data); } +/** + * 获取解锁所有文章费用 + */ +export function getUnlockAllArticlePrice(data) { + return request.get("/article/getUnlockAllArticlePrice"); +} +/** + * 获取解锁文章 + */ +export function unlockArticle(data) { + return request.post("/article/unlockArticle",data); +} /** * 获取学习榜单列表 */ export function getStudyList(data) { return request.post("/StudyList/listStudyList",data); } +/** + * 获取学习榜单详情 + */ +export function getStudyDetail(data) { + return request.get("/StudyList/studyListDetail?id="+data); +} +/** + * 报名榜单 + */ +export function enterStudyList(data) { + return request.post("/StudyList/enterStudyList",data); +} +/** + * 获取榜单打榜进度 + */ +export function myProgress(data) { + return request.get("/StudyList/myProgress?studyListId="+data); +} + +/** + * 发布打榜分享 + */ +export function studyListPublish(data) { + return request.post("/StudyList/studyListPublish",data); +} + +/** + * 发布打榜点赞 + */ +export function studyListVote(data) { + return request.post("/StudyList/studyListVote",data); +} + +/** + * 获取打榜日记 + */ +export function myStudylist(data) { + return request.get("/StudyList/myStudylist?listId="+data); +} + /** * 获取课程列表 */ @@ -46,4 +105,18 @@ export function getCourseDetail(data) { */ export function enterCourse(data) { return request.post("/user/enterCourse",data); +} + +/** + * 课程扫码签到 + */ +export function signCourse(data) { + return request.get("/user/signCourse?courseId="+data); +} + +/** + * 意见反馈 + */ +export function feedBack(data) { + return request.post("/user/feedback",data); } \ No newline at end of file diff --git a/api/serverTeacher.js b/api/serverTeacher.js new file mode 100644 index 0000000..03fcce5 --- /dev/null +++ b/api/serverTeacher.js @@ -0,0 +1,78 @@ +import request from "@/utils/request"; + +/** + * 完善资料 + */ +export function editSelfData(data) { + return request.post("/user/sellerActive", data); +} + +/** + * 获取会员管理列表 + */ +export function getSellerMembers(data) { + return request.post("/user/sellerMembers", data); +} + +/** + * 获取会员管理列表 + */ +export function getMembersList(data) { + return request.post("/user/getSellerMembersByLevel"); +} + +/** + * 课程添加会员 + */ +export function addMembers(data) { + return request.post("/user/addMembers",data); +} +/** + * 获取会员等级列表 + */ +export function getMyMemberLevels(data) { + return request.get("/user/getMyMemberLevels"); +} +/** + * 获取会员详情 + */ +export function getMemberDetail(data) { + return request.post("/user/sellerMembersDetail", data); +} + + + +/** + * 获取课程管理列表 + */ +export function sellerCourses(data) { + return request.post("/user/sellerCourses", data); +} + +/** + * 获取课程详情 + */ +export function getCourseDetail(data) { + return request.get("/user/sellerCoursesDetail?id="+data); +} + +/** + * 设置座位 + */ +export function setMemberSeat(data) { + return request.post("/user/addMembersCourseSeat",data); +} + +/** + * 发送验证码 + */ +export function getVerificationCode(data) { + return request.post("/user/getVerificationCode",data); +} + +/** + * 获取会员榜单日记 + */ +export function myMemberStudylist(data) { + return request.post("/user/myMemberStudylist", data); +} \ No newline at end of file diff --git a/api/user.js b/api/user.js index b3d6343..b3119ab 100644 --- a/api/user.js +++ b/api/user.js @@ -434,3 +434,17 @@ export function setDetection() { export function getRechargeApi() { return request.get('recharge/index') } + +/* + * 获取我的课程列表 + * */ +export function getMyCourseList(q) { + return request.get('/Course/listCoursesByMemberId?type='+q) +} + +/* + * 获取我的打榜列表 + * */ +export function getStudyList(q) { + return request.get('/StudyList/getStudyListByMemberId?type='+q) +} \ No newline at end of file diff --git a/assets/css/base.less b/assets/css/base.less index ddc63cd..a24722f 100644 --- a/assets/css/base.less +++ b/assets/css/base.less @@ -2,18 +2,19 @@ /** *相关初始化 */ + .font-color-red { - color: #eb3729 !important; + color: #E5270F !important; } .bg-color-red { - background-color: #eb3729 !important; + background-color: #E5270F !important; } .icon-color { - color: #eb3729; + color: #E5270F; } .cart-color { - color: #eb3729 !important; - border: 1px solid #eb3729 !important; + color: #E5270F !important; + border: 1px solid #E5270F !important; } /* padding20 */ .padding20 { diff --git a/assets/css/reset.less b/assets/css/reset.less index 6aa0929..85e9ea0 100644 --- a/assets/css/reset.less +++ b/assets/css/reset.less @@ -34,8 +34,26 @@ input{line-height: normal; box-sizing:border-box;} transform: scaleY(0.33); } } -.line1{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width: 100%;} -.line2{word-break:break-all;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;overflow:hidden;} +.line1{ + overflow:hidden; + text-overflow:ellipsis; + white-space:nowrap; + width: 100%; +} +.line2{ + word-break:break-all; + display:-webkit-box; + -webkit-line-clamp:2; + -webkit-box-orient:vertical; + overflow:hidden; +} +.line5{ + word-break:break-all; + display:-webkit-box; + -webkit-line-clamp:5; + -webkit-box-orient:vertical; + overflow:hidden; +} .mask{position:fixed;top:0;left:0;right:0;bottom:0;z-index:55;background-color:rgba(0,0,0,0.5);} diff --git a/components/AddressWindow.vue b/components/AddressWindow.vue index 18300f5..2c2b1c4 100644 --- a/components/AddressWindow.vue +++ b/components/AddressWindow.vue @@ -65,7 +65,7 @@ export default { this.$emit("input", false); }, goAddressPages: function() { - this.$yrouter.push({ path: "/pages/user/address/AddAddress/index" }); + this.$yrouter.push('/pagesB/pages/user/address/AddressManagement/index') this.$emit("redirect"); }, tapAddress: function(index) { diff --git a/components/OrderGoods.vue b/components/OrderGoods.vue index 61554d8..b2f141a 100644 --- a/components/OrderGoods.vue +++ b/components/OrderGoods.vue @@ -2,7 +2,7 @@ 共{{ cartInfo.length }}件商品 - + @@ -12,8 +12,9 @@ x {{ cart.cartNum }} {{ cart.productInfo.attrInfo.sku }} - {{ cart.costPrice }}积分 - ￥{{ cart.truePrice }} + ￥{{ cart.productInfo.price }}+{{ cart.productInfo.giveIntegral }}积分 + 评价 @@ -38,10 +39,55 @@ export default { methods: { routerGo(cart) { this.$yrouter.push({ - path: '/pages/shop/GoodsEvaluate/index', + path: '/pagesB/pages/shop/GoodsEvaluate/index', query: { id: cart.unique }, }) }, }, } + diff --git a/components/ProductWindow.vue b/components/ProductWindow.vue index 4bf6fae..f8d87bd 100644 --- a/components/ProductWindow.vue +++ b/components/ProductWindow.vue @@ -138,3 +138,8 @@ export default { }, }; + diff --git a/components/wuc-tab/wuc-tab.vue b/components/wuc-tab/wuc-tab.vue index 1d381fa..faa95e2 100644 --- a/components/wuc-tab/wuc-tab.vue +++ b/components/wuc-tab/wuc-tab.vue @@ -124,7 +124,7 @@ swiper { background-color: #0081ff; } .text-orange{ - color: #f37b1d + color: #EB5744; } .text-xl { diff --git a/config/index.js b/config/index.js index 73d6e27..8cbb594 100644 --- a/config/index.js +++ b/config/index.js @@ -1,7 +1,8 @@ // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api' // export const VUE_APP_API_URL = 'http://139.186.134.205:9006/api' -export const VUE_APP_API_URL = 'http://192.168.0.110:8088/api' +export const VUE_APP_API_URL = 'http://192.168.0.114:8088/api' +// export const VUE_APP_API_URL = 'https://www.cyjyyjy.com/api' // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api' // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; diff --git a/manifest.json b/manifest.json index fced5a7..ca0cb31 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,8 @@ "OAuth" : {}, "Payment" : {}, "Share" : {}, - "Geolocation" : {} + "Geolocation" : {}, + "Push" : {} }, /* 应用发布信息 */ "distribute" : { @@ -58,25 +59,26 @@ "sdkConfigs" : { "oauth" : { "weixin" : { - "appid" : "wx7c84ede33062d1e4", + "appid" : "wx030578b829a4a49a", "appsecret" : "c47ef66d3311194da44e60387d5c1abd", "UniversalLinks" : "https://yixiang.co/app/" } }, "payment" : { "weixin" : { - "appid" : "wx7c84ede33062d1e4", + "appid" : "wx030578b829a4a49a", "UniversalLinks" : "https://yixiang.co/app/" } }, "share" : { "weixin" : { - "appid" : "wx7c84ede33062d1e4", + "appid" : "wx030578b829a4a49a", "UniversalLinks" : "https://yixiang.co/app/" } }, "ad" : {}, - "geolocation" : {} + "geolocation" : {}, + "push" : {} }, "splashscreen" : { "ios" : { diff --git a/pages.json b/pages.json index d25b70d..a00494d 100644 --- a/pages.json +++ b/pages.json @@ -64,13 +64,14 @@ { "path": "pages/study/dabang", "style": { - "navigationBarTitleText": "打榜" + "navigationBarTitleText": "打榜", + "enablePullDownRefresh": true } }, { "path": "pages/study/bangdanRecord", "style": { - "navigationBarTitleText": "我的打榜记录" + "navigationBarTitleText": "我的打榜日记" } }, { @@ -85,6 +86,12 @@ "navigationBarTitleText": "文章详情" } }, + { + "path": "pages/knowledge/unlock", + "style": { + "navigationBarTitleText": "解锁文章" + } + }, { "path": "pages/shop/GoodSearch/index", "style": { @@ -94,7 +101,7 @@ { "path": "pages/shop/GoodsClass/index", "style": { - "navigationBarTitleText": "商品分类" + "navigationBarTitleText": "商城" } }, { @@ -197,7 +204,55 @@ "style": { "navigationBarTitleText": "退货列表" } - } + }, + { + "path": "pages/serviceTeacher/index", + "style": { + "navigationBarTitleText": "禪易" + } + }, + { + "path": "pages/serviceTeacher/setSelfData", + "style": { + "navigationBarTitleText": "个人资料" + } + }, + { + "path": "pages/serviceTeacher/memberManagement", + "style": { + "navigationBarTitleText": "会员管理" + } + }, + { + "path": "pages/serviceTeacher/memberDetail", + "style": { + "navigationBarTitleText": "会员详情" + } + }, + { + "path": "pages/serviceTeacher/memberDabang", + "style": { + "navigationBarTitleText": "会员打榜日记" + } + }, + { + "path": "pages/serviceTeacher/courseManagement", + "style": { + "navigationBarTitleText": "课程管理" + } + }, + { + "path": "pages/serviceTeacher/courseDetail", + "style": { + "navigationBarTitleText": "课程详情" + } + }, + { + "path": "pages/serviceTeacher/addMember", + "style": { + "navigationBarTitleText": "添加学员" + } + } // { // "path": "pages/activity/GoodsGroup/index", // "style": { @@ -533,38 +588,39 @@ "color": "#666666", "selectedColor": "#F99C10", "backgroundColor": "#ffffff", + "borderStyle":"white", "height": "50px", - "fontSize": "10px", + "fontSize": "12px", "iconWidth": "24px", "spacing": "3px", "list": [ { "pagePath": "pages/home/index", - "iconPath": "static/tab1.png", + "iconPath": "static/tab1-d.png", "selectedIconPath": "static/tab1.png", "text": "禪易" }, { "pagePath": "pages/course/index", - "iconPath": "static/tab2.png", + "iconPath": "static/tab2-d.png", "selectedIconPath": "static/tab2.png", "text": "学习" }, { "pagePath": "pages/knowledge/index", - "iconPath": "static/tab3.png", + "iconPath": "static/tab3-d.png", "selectedIconPath": "static/tab3.png", "text": "文章" }, { "pagePath": "pages/shop/GoodsClass/index", - "iconPath": "static/tab4.png", + "iconPath": "static/tab4-d.png", "selectedIconPath": "static/tab4.png", "text": "商城" }, { "pagePath": "pages/user/User/index", - "iconPath": "static/tab5.png", + "iconPath": "static/tab5-d.png", "selectedIconPath": "static/tab5.png", "text": "我的" } diff --git a/pages/Loading/index.vue b/pages/Loading/index.vue index 348fc8b..3ab16d8 100644 --- a/pages/Loading/index.vue +++ b/pages/Loading/index.vue @@ -7,7 +7,7 @@ diff --git a/pages/home/index.vue b/pages/home/index.vue index ef8fe03..3acf3a5 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -1,6 +1,6 @@ + \ No newline at end of file diff --git a/pages/serviceTeacher/addMember.vue b/pages/serviceTeacher/addMember.vue new file mode 100644 index 0000000..ec8dbc3 --- /dev/null +++ b/pages/serviceTeacher/addMember.vue @@ -0,0 +1,355 @@ + + + + + diff --git a/pages/serviceTeacher/courseDetail.vue b/pages/serviceTeacher/courseDetail.vue new file mode 100644 index 0000000..a401faf --- /dev/null +++ b/pages/serviceTeacher/courseDetail.vue @@ -0,0 +1,406 @@ + + + + + diff --git a/pages/serviceTeacher/courseManagement.vue b/pages/serviceTeacher/courseManagement.vue new file mode 100644 index 0000000..5cf224b --- /dev/null +++ b/pages/serviceTeacher/courseManagement.vue @@ -0,0 +1,195 @@ + + + + + diff --git a/pages/serviceTeacher/index.vue b/pages/serviceTeacher/index.vue new file mode 100644 index 0000000..1db7d0f --- /dev/null +++ b/pages/serviceTeacher/index.vue @@ -0,0 +1,121 @@ + + + + + diff --git a/pages/serviceTeacher/memberDabang.vue b/pages/serviceTeacher/memberDabang.vue new file mode 100644 index 0000000..90981d7 --- /dev/null +++ b/pages/serviceTeacher/memberDabang.vue @@ -0,0 +1,203 @@ + + + + + diff --git a/pages/serviceTeacher/memberDetail.vue b/pages/serviceTeacher/memberDetail.vue new file mode 100644 index 0000000..d9395ff --- /dev/null +++ b/pages/serviceTeacher/memberDetail.vue @@ -0,0 +1,248 @@ + + + + + diff --git a/pages/serviceTeacher/memberManagement.vue b/pages/serviceTeacher/memberManagement.vue new file mode 100644 index 0000000..4f78875 --- /dev/null +++ b/pages/serviceTeacher/memberManagement.vue @@ -0,0 +1,185 @@ + + + + + diff --git a/pages/serviceTeacher/setSelfData.vue b/pages/serviceTeacher/setSelfData.vue new file mode 100644 index 0000000..801db23 --- /dev/null +++ b/pages/serviceTeacher/setSelfData.vue @@ -0,0 +1,324 @@ + + + + + diff --git a/pages/shop/GoodsClass/index.vue b/pages/shop/GoodsClass/index.vue index c811e55..b3b7072 100644 --- a/pages/shop/GoodsClass/index.vue +++ b/pages/shop/GoodsClass/index.vue @@ -1,5 +1,8 @@ diff --git a/pages/study/bangdanRecord.vue b/pages/study/bangdanRecord.vue index d322ebd..86fa3ba 100644 --- a/pages/study/bangdanRecord.vue +++ b/pages/study/bangdanRecord.vue @@ -1,32 +1,85 @@ diff --git a/pages/study/editDabang.vue b/pages/study/editDabang.vue index f7c5e85..d2f7ca9 100644 --- a/pages/study/editDabang.vue +++ b/pages/study/editDabang.vue @@ -1,12 +1,12 @@