学习详情-相关页面调整v2

pages.json

@@ -63,6 +63,11 @@
 			"style": {
 				"navigationBarTitleText": "学习项目"
 			}
+		}, {
+			"path": "pages/YNEduApp/learnProj/learnProjDetail",
+			"style": {
+				"navigationBarTitleText": "学习项目"
+			}
 		}
 	],
 	"globalStyle": {

pages/YNEduApp/learnProj/learnProj.vue

@@ -329,11 +329,12 @@
             box-sizing: border-box;
             padding: 5px;
             display: flex;
+            align-items: center;
 
             .avatar{
 
-              width: 20%;
+              width: 5vh;
-              height: 100%;
+              height: 5vh;
               border-radius: 50%;
               overflow: hidden;
               margin-right: 10rpx;

pages/YNEduApp/learnProj/learnProjDetail.vue

@@ -68,7 +68,7 @@
                 :key="item.id"
                 title="练习"
                 :note="item.title"
-                rightText="未练习"
+                :rightText="item.ifPrac ? '已练习' : '未练习'"
                 clickable
                 :show-extra-icon="true"
                 :extra-icon="pracIconObj"
@@ -131,7 +131,7 @@
 		data() {
 			return {
         projId: '',
-        starRate: 5,
+        starRate: 4,
         learnIconObj: { color: '#1A63AC',size: '18', type: 'calendar' },
         pracIconObj: { color: '#38B022',size: '18', type: 'compose' },
         theoryLearnList: [
@@ -141,15 +141,16 @@
           { title: '电功率', id: 124, percent: 13 },
         ],
         theoryPracList: [
-          { title: '母猪的产后护理', id: 141 },
+          { title: '母猪的产后护理', id: 141, ifPrac: false },
-          { title: '公猪的情绪安抚', id: 142 },
+          { title: '公猪的情绪安抚', id: 142, ifPrac: true },
-          { title: '母狗的二三情事', id: 143 },
+          { title: '母狗的二三情事', id: 143, ifPrac: true },
-          { title: '公狗的大顶绿帽', id: 144 },
+          { title: '公狗的大顶绿帽', id: 144, ifPrac: false },
         ],
         commentList: [
           { username: '王二', avatar: '/static/eduImg/avatar.jpg', cont: '写的什么东西' },
           { username: '张三', avatar: '/static/eduImg/avatar.jpg', cont: '我感觉写得挺好' },
           { username: '李四', avatar: '/static/eduImg/avatar.jpg', cont: '+3' },
+          { username: '孙笑川', avatar: '/static/eduImg/avatar.jpg', cont: '我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了我着火了' },
         ]
 			}
 		},

unpackage/dist/dev/app-plus/app-config-service.js

@@ -1,8 +1,8 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/YNEduApp/index/index","pages/login","pages/webview","pages/message/index","pages/message/detail","pages/gzt/index","pages/txl/index","pages/mine/index","pages/YNEduApp/user/user","pages/YNEduApp/user/settings","pages/YNEduApp/learnProj/learnProj","pages/YNEduApp/learnProj/learnProjDetail"],"window":{"fontFamily":"Helvetica, Arial, sans-serif","pageOrientation":"portrait","navigationBarTitleText":"作业管控智慧平台","navigationBarTextStyle":"black","navigationBarBackgroundColor":"#ffffff","backgroundColor":"#F8F8F8","backgroundColorTop":"#F4F5F6","backgroundColorBottom":"#F4F5F6"},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"作业管控智慧平台","compilerVersion":"4.23","entryPagePath":"pages/YNEduApp/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniConfig = {"pages":["pages/login","pages/webview","pages/message/index","pages/message/detail","pages/gzt/index","pages/txl/index","pages/mine/index","pages/YNEduApp/index/index","pages/YNEduApp/user/user","pages/YNEduApp/user/settings","pages/YNEduApp/learnProj/learnProj","pages/YNEduApp/learnProj/learnProjDetail"],"window":{"fontFamily":"Helvetica, Arial, sans-serif","pageOrientation":"portrait","navigationBarTitleText":"作业管控智慧平台","navigationBarTextStyle":"black","navigationBarBackgroundColor":"#ffffff","backgroundColor":"#F8F8F8","backgroundColorTop":"#F4F5F6","backgroundColorBottom":"#F4F5F6"},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"作业管控智慧平台","compilerVersion":"4.23","entryPagePath":"pages/login","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
-var __uniRoutes = [{"path":"/pages/YNEduApp/index/index","meta":{"isQuit":true},"window":{"navigationBarTitleText":"首页"}},{"path":"/pages/login","meta":{},"window":{"navigationBarTitleText":"登录","navigationStyle":"custom"}},{"path":"/pages/webview","meta":{},"window":{"navigationBarTitleText":"作业管控智慧平台","navigationStyle":"custom"}},{"path":"/pages/message/index","meta":{},"window":{"navigationBarTitleText":"消息"}},{"path":"/pages/message/detail","meta":{},"window":{"navigationBarTitleText":"消息"}},{"path":"/pages/gzt/index","meta":{},"window":{"navigationBarTitleText":"作业管控智慧平台","navigationStyle":"custom"}},{"path":"/pages/txl/index","meta":{},"window":{"navigationBarTitleText":"通讯录"}},{"path":"/pages/mine/index","meta":{},"window":{"navigationBarTitleText":"我的","navigationStyle":"custom"}},{"path":"/pages/YNEduApp/user/user","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/YNEduApp/user/settings","meta":{},"window":{"navigationBarTitleText":"设置"}},{"path":"/pages/YNEduApp/learnProj/learnProj","meta":{},"window":{"navigationBarTitleText":"学习项目"}},{"path":"/pages/YNEduApp/learnProj/learnProjDetail","meta":{},"window":{"navigationBarTitleText":"学习项目"}}];
+var __uniRoutes = [{"path":"/pages/login","meta":{"isQuit":true},"window":{"navigationBarTitleText":"登录","navigationStyle":"custom"}},{"path":"/pages/webview","meta":{},"window":{"navigationBarTitleText":"作业管控智慧平台","navigationStyle":"custom"}},{"path":"/pages/message/index","meta":{},"window":{"navigationBarTitleText":"消息"}},{"path":"/pages/message/detail","meta":{},"window":{"navigationBarTitleText":"消息"}},{"path":"/pages/gzt/index","meta":{},"window":{"navigationBarTitleText":"作业管控智慧平台","navigationStyle":"custom"}},{"path":"/pages/txl/index","meta":{},"window":{"navigationBarTitleText":"通讯录"}},{"path":"/pages/mine/index","meta":{},"window":{"navigationBarTitleText":"我的","navigationStyle":"custom"}},{"path":"/pages/YNEduApp/index/index","meta":{},"window":{"navigationBarTitleText":"首页"}},{"path":"/pages/YNEduApp/user/user","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/YNEduApp/user/settings","meta":{},"window":{"navigationBarTitleText":"设置"}},{"path":"/pages/YNEduApp/learnProj/learnProj","meta":{},"window":{"navigationBarTitleText":"学习项目"}},{"path":"/pages/YNEduApp/learnProj/learnProjDetail","meta":{},"window":{"navigationBarTitleText":"学习项目"}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});

unpackage/dist/dev/app-plus/app-view.js

@@ -165,9 +165,6 @@ window.__uniConfig = {
 if (uni.restoreGlobal) {
   uni.restoreGlobal(weex, plus, setTimeout, clearTimeout, setInterval, clearInterval);
 }
-__definePage('pages/YNEduApp/index/index', function () {
-  return Vue.extend(__webpack_require__(/*! pages/YNEduApp/index/index.vue?mpType=page */ 2).default);
-});
 __definePage('pages/login', function () {
   return Vue.extend(__webpack_require__(/*! pages/login.vue?mpType=page */ 48).default);
 });
@@ -189,6 +186,9 @@ __definePage('pages/txl/index', function () {
 __definePage('pages/mine/index', function () {
   return Vue.extend(__webpack_require__(/*! pages/mine/index.vue?mpType=page */ 316).default);
 });
+__definePage('pages/YNEduApp/index/index', function () {
+  return Vue.extend(__webpack_require__(/*! pages/YNEduApp/index/index.vue?mpType=page */ 2).default);
+});
 __definePage('pages/YNEduApp/user/user', function () {
   return Vue.extend(__webpack_require__(/*! pages/YNEduApp/user/user.vue?mpType=page */ 324).default);
 });
@@ -16353,7 +16353,7 @@ if(false) {}
 var ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ./node_modules/css-loader/dist/runtime/api.js */ 13);
 exports = ___CSS_LOADER_API_IMPORT___(false);
 // Module
-exports.push([module.i, "@charset \"UTF-8\";\n/**\n * 这里是uni-app内置的常用样式变量\n *\n * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量\n * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App\n *\n */\n/**\n * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能\n *\n * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件\n */\n/* 颜色变量 */\n/* 行为相关颜色 */\n/* 文字基本颜色 */\n/* 背景颜色 */\n/* 边框颜色 */\n/* 尺寸变量 */\n/* 文字尺寸 */\n/* 图片尺寸 */\n/* Border Radius */\n/* 水平间距 */\n/* 垂直间距 */\n/* 透明度 */\n/* 文章场景相关 */\n.page {\n  width: 100vw;\n  height: 100vh;\n  background-color: #F8F8F8;\n  box-sizing: border-box;\n  padding: 0 10px;\n}\n.page .status-secs {\n  width: 100%;\n  display: flex;\n  align-items: center;\n  margin-bottom: 1vh;\n}\n.page .status-secs uni-view {\n  box-sizing: border-box;\n  padding: 0 15rpx;\n  font-size: 18px;\n  color: #9EA2AC;\n  font-weight: bold;\n}\n.page .status-secs .active {\n  font-size: 28px;\n  color: #000;\n}\n.page .drops {\n  width: 100%;\n  margin-top: 1vh;\n  display: flex;\n}\n.page .project-cont {\n  width: 100%;\n  height: 10rpx;\n  display: flex;\n  justify-content: space-between;\n  flex-wrap: wrap;\n}\n.page .project-cont .single-proj {\n  width: 49%;\n  height: 30vh;\n  margin-bottom: 1vh;\n  border-radius: 10px;\n  overflow: hidden;\n  display: flex;\n  flex-direction: column;\n  background-color: #fff;\n}\n.page .project-cont .single-proj .img {\n  width: 100%;\n  height: 45%;\n}\n.page .project-cont .single-proj .img uni-image {\n  width: 100%;\n  height: 100%;\n}\n.page .project-cont .single-proj .proj-detail {\n  flex: 1;\n  display: flex;\n  flex-direction: column;\n}\n.page .project-cont .single-proj .proj-detail .detail-upper {\n  width: 100%;\n  height: 65%;\n  border-bottom: 1px solid #DFDFDF;\n  box-sizing: border-box;\n  padding: 5px;\n  display: flex;\n  flex-direction: column;\n  justify-content: space-around;\n}\n.page .project-cont .single-proj .proj-detail .detail-upper .icons {\n  font-size: 12px;\n  color: #C0C0C0;\n  display: flex;\n  align-items: center;\n}\n.page .project-cont .single-proj .proj-detail .detail-upper .icons span {\n  padding-left: 5rpx;\n}\n.page .project-cont .single-proj .proj-detail .detail-lower {\n  flex: 1;\n  box-sizing: border-box;\n  padding: 5px;\n  display: flex;\n}\n.page .project-cont .single-proj .proj-detail .detail-lower .avatar {\n  width: 20%;\n  height: 100%;\n  border-radius: 50%;\n  overflow: hidden;\n  margin-right: 10rpx;\n}\n.page .project-cont .single-proj .proj-detail .detail-lower .avatar uni-image {\n  width: 100%;\n  height: 100%;\n}\n.page .project-cont .single-proj .proj-detail .detail-lower .progress {\n  flex: 1;\n  box-sizing: border-box;\n  font-size: 12px;\n  display: flex;\n  flex-direction: column;\n  justify-content: space-around;\n}\n.page .project-cont .single-proj .proj-detail .detail-lower .progress .bar {\n  flex: 1;\n}\n", ""]);
+exports.push([module.i, "@charset \"UTF-8\";\n/**\n * 这里是uni-app内置的常用样式变量\n *\n * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量\n * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App\n *\n */\n/**\n * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能\n *\n * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件\n */\n/* 颜色变量 */\n/* 行为相关颜色 */\n/* 文字基本颜色 */\n/* 背景颜色 */\n/* 边框颜色 */\n/* 尺寸变量 */\n/* 文字尺寸 */\n/* 图片尺寸 */\n/* Border Radius */\n/* 水平间距 */\n/* 垂直间距 */\n/* 透明度 */\n/* 文章场景相关 */\n.page {\n  width: 100vw;\n  height: 100vh;\n  background-color: #F8F8F8;\n  box-sizing: border-box;\n  padding: 0 10px;\n}\n.page .status-secs {\n  width: 100%;\n  display: flex;\n  align-items: center;\n  margin-bottom: 1vh;\n}\n.page .status-secs uni-view {\n  box-sizing: border-box;\n  padding: 0 15rpx;\n  font-size: 18px;\n  color: #9EA2AC;\n  font-weight: bold;\n}\n.page .status-secs .active {\n  font-size: 28px;\n  color: #000;\n}\n.page .drops {\n  width: 100%;\n  margin-top: 1vh;\n  display: flex;\n}\n.page .project-cont {\n  width: 100%;\n  height: 10rpx;\n  display: flex;\n  justify-content: space-between;\n  flex-wrap: wrap;\n}\n.page .project-cont .single-proj {\n  width: 49%;\n  height: 30vh;\n  margin-bottom: 1vh;\n  border-radius: 10px;\n  overflow: hidden;\n  display: flex;\n  flex-direction: column;\n  background-color: #fff;\n}\n.page .project-cont .single-proj .img {\n  width: 100%;\n  height: 45%;\n}\n.page .project-cont .single-proj .img uni-image {\n  width: 100%;\n  height: 100%;\n}\n.page .project-cont .single-proj .proj-detail {\n  flex: 1;\n  display: flex;\n  flex-direction: column;\n}\n.page .project-cont .single-proj .proj-detail .detail-upper {\n  width: 100%;\n  height: 65%;\n  border-bottom: 1px solid #DFDFDF;\n  box-sizing: border-box;\n  padding: 5px;\n  display: flex;\n  flex-direction: column;\n  justify-content: space-around;\n}\n.page .project-cont .single-proj .proj-detail .detail-upper .icons {\n  font-size: 12px;\n  color: #C0C0C0;\n  display: flex;\n  align-items: center;\n}\n.page .project-cont .single-proj .proj-detail .detail-upper .icons span {\n  padding-left: 5rpx;\n}\n.page .project-cont .single-proj .proj-detail .detail-lower {\n  flex: 1;\n  box-sizing: border-box;\n  padding: 5px;\n  display: flex;\n  align-items: center;\n}\n.page .project-cont .single-proj .proj-detail .detail-lower .avatar {\n  width: 5vh;\n  height: 5vh;\n  border-radius: 50%;\n  overflow: hidden;\n  margin-right: 10rpx;\n}\n.page .project-cont .single-proj .proj-detail .detail-lower .avatar uni-image {\n  width: 100%;\n  height: 100%;\n}\n.page .project-cont .single-proj .proj-detail .detail-lower .progress {\n  flex: 1;\n  box-sizing: border-box;\n  font-size: 12px;\n  display: flex;\n  flex-direction: column;\n  justify-content: space-around;\n}\n.page .project-cont .single-proj .proj-detail .detail-lower .progress .bar {\n  flex: 1;\n}\n", ""]);
 // Exports
 module.exports = exports;