diff --git a/pages.json b/pages.json
index 8a0a00a..64d47dc 100644
--- a/pages.json
+++ b/pages.json
@@ -233,6 +233,13 @@
"navigationBarTitleText" : "news",
"enablePullDownRefresh": false
}
+ },
+ {
+ "path" : "pages/course/index",
+ "style" :
+ {
+ "navigationBarTitleText" : "课程列表"
+ }
}
],
"globalStyle": {
diff --git a/pages/course/index.vue b/pages/course/index.vue
new file mode 100644
index 0000000..cec33f5
--- /dev/null
+++ b/pages/course/index.vue
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+ {{news.title}}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/news/news.vue b/pages/news/news.vue
index 98dbc73..cec33f5 100644
--- a/pages/news/news.vue
+++ b/pages/news/news.vue
@@ -20,15 +20,7 @@
var clear;
import {
mapState
- } from 'vuex';
- // 密码验证的正则
- //1、密码为八位及以上并且字母数字特殊字符三项都包括
- var strongRegex = new RegExp("^(?=.{8,})(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*\\W).*$", "g");
- //2、密码为八位及以上并且字母、数字、特殊字符三项中有两项,强度是中等
- var mediumRegex = new RegExp(
- "^(?=.{8,})(((?=.*[A-Z])(?=.*[a-z]))|((?=.*[A-Z])(?=.*[0-9]))|((?=.*[a-z])(?=.*[0-9]))|((?=.*[a-z])(?=.*\\W))|((?=.*[0-9])(?=.*\\W))|((?=.*[A-Z])(?=.*\\W))).*$",
- "g");
- var enoughRegex = new RegExp("(?=.{8,}).*", "g");
+ } from 'vuex';
export default {
data() {
return {
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index 3ec31b4..fea2085 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -101,7 +101,7 @@
-
+
@@ -139,7 +139,7 @@
-
+
@@ -332,11 +332,11 @@
id ? ftag = id : ftag = 0
$http.request({
- url: "medical/home/getMedicalLabels",
+ url: "curseTagList",
method: "POST", // POST、GET、PUT、DELETE,具体说明查看官方文档
- data: {
- 'id': ftag
- },
+ // data: {
+ // 'id': ftag
+ // },
header: { //默认 无 说明:请求头
'Content-Type': 'application/json'
},
@@ -519,9 +519,9 @@
},
// 跳转
- onPageJump(url) {
+ onPageJump(url,thatId) {
uni.navigateTo({
- url: url
+ url: `${url}?id=${thatId}`
});
},