diff --git a/src/pages.json b/src/pages.json
index a1259033..2a087741 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -10,7 +10,6 @@
}
},
{
-<<<<<<< HEAD
"path": "pages/courseDetail/index",
"style": {
"navigationBarTitleText": "课程详情",
@@ -20,8 +19,15 @@
}
},
{
-=======
->>>>>>> f0015d5ea46c4904ce35c5ec4a03028d9ec6d5b4
+ "path": "pages/courseDetail/submit",
+ "style": {
+ "navigationBarTitleText": "提交评价",
+ "app-plus": {
+ "titleNView": false
+ }
+ }
+ },
+ {
"path": "pages/study/index",
"style": {
"navigationBarTitleText": "学习",
@@ -93,8 +99,6 @@
"titleNView": false
}
}
-<<<<<<< HEAD
-=======
},
{
"path": "pages/course/index",
@@ -104,7 +108,6 @@
"titleNView": false
}
}
->>>>>>> f0015d5ea46c4904ce35c5ec4a03028d9ec6d5b4
}
],
"tabBar": {
diff --git a/src/pages/courseDetail/submit.vue b/src/pages/courseDetail/submit.vue
new file mode 100644
index 00000000..03ca1939
--- /dev/null
+++ b/src/pages/courseDetail/submit.vue
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+ 去学习
+
+
+
+
+
+
+
diff --git a/src/pagesOther.json b/src/pagesOther.json
index b720cdef..04435044 100644
--- a/src/pagesOther.json
+++ b/src/pagesOther.json
@@ -17,6 +17,15 @@
"titleNView": false
}
}
+ },
+ {
+ "path": "pages/courseDetail/submit",
+ "style": {
+ "navigationBarTitleText": "提交评价",
+ "app-plus": {
+ "titleNView": false
+ }
+ }
}
],
"tabBar": {