diff --git a/pages.json b/pages.json
index 948d316..3818c86 100644
--- a/pages.json
+++ b/pages.json
@@ -6,7 +6,7 @@
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "首页",
- "navigationBarBackgroundColor": "#284CD1"
+ "navigationStyle": "custom"
}
}, {
"path": "pages/personal/mytestkit/mytestkit",
@@ -380,6 +380,22 @@
"navigationBarTitleText": "我的主页",
"navigationBarBackgroundColor": "#284CD1"
}
+ },
+ {
+ "path" : "pages/personal/myCourse/myCourse",
+ "style" :
+ {
+ "navigationBarTitleText" : "",
+ "navigationBarBackgroundColor": "#284CD1"
+ }
+ },
+ {
+ "path" : "pages/personal/courseSign/courseSign",
+ "style" :
+ {
+ "navigationBarTitleText" : "",
+ "navigationBarBackgroundColor": "#284CD1"
+ }
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7d0caf2..8c8e6d7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,5 +1,11 @@
+
+
+ 首页
+
+
+
@@ -264,447 +270,497 @@
\ No newline at end of file
diff --git a/pages/index/testtraining/testtraining.vue b/pages/index/testtraining/testtraining.vue
index 7b420a0..93a31f3 100644
--- a/pages/index/testtraining/testtraining.vue
+++ b/pages/index/testtraining/testtraining.vue
@@ -423,7 +423,7 @@
- {{calltext}}
+
{{timetext}}
@@ -556,1706 +556,1715 @@
\ No newline at end of file
diff --git a/pages/personal/courseSign/courseSign.vue b/pages/personal/courseSign/courseSign.vue
new file mode 100644
index 0000000..23a1fab
--- /dev/null
+++ b/pages/personal/courseSign/courseSign.vue
@@ -0,0 +1,151 @@
+
+
+
+
+ {{ className }}
+
+
+ {{ courseName }}
+
+
+ 签到
+ {{ nowTime }}
+
+
+
+ 已签到
+
+
+
+
+ 无法识别二维码
+
+
+
+
+
+
+
diff --git a/pages/personal/courseSign/error.1png b/pages/personal/courseSign/error.1png
new file mode 100644
index 0000000..f6f9d4b
Binary files /dev/null and b/pages/personal/courseSign/error.1png differ
diff --git a/pages/personal/courseSign/error.png b/pages/personal/courseSign/error.png
new file mode 100644
index 0000000..ef1e67e
Binary files /dev/null and b/pages/personal/courseSign/error.png differ
diff --git a/pages/personal/courseSign/signSuc.1png b/pages/personal/courseSign/signSuc.1png
new file mode 100644
index 0000000..d9044a5
Binary files /dev/null and b/pages/personal/courseSign/signSuc.1png differ
diff --git a/pages/personal/courseSign/signSuc.png b/pages/personal/courseSign/signSuc.png
new file mode 100644
index 0000000..f790ffc
Binary files /dev/null and b/pages/personal/courseSign/signSuc.png differ
diff --git a/pages/personal/myCourse/myCourse.vue b/pages/personal/myCourse/myCourse.vue
new file mode 100644
index 0000000..eab2404
--- /dev/null
+++ b/pages/personal/myCourse/myCourse.vue
@@ -0,0 +1,115 @@
+
+
+
+
+ {{ course.courseName }}
+ {{ course.courseTime }}
+ 课程资料
+ {{
+ course.status ? '已签到' : '未签到'
+ }}
+
+
+ 暂未配置课程
+
+
+
+
+
+
diff --git a/pages/personal/personal.vue b/pages/personal/personal.vue
index 87a97ee..804f448 100644
--- a/pages/personal/personal.vue
+++ b/pages/personal/personal.vue
@@ -78,7 +78,6 @@
-
@@ -188,12 +187,7 @@
-
-
-
-
-
{
+ // console.log(res);
this.signuplistLength = res.data.rows.length
})
@@ -446,7 +441,7 @@
uni.navigateTo({
url: '/pages/personal/setup/myreview'
})
- }
+ }
} else {
this.tokenshow = true
diff --git a/pages/personal/personalresume/personalresume.vue b/pages/personal/personalresume/personalresume.vue
index cb4f1ae..327f7fa 100644
--- a/pages/personal/personalresume/personalresume.vue
+++ b/pages/personal/personalresume/personalresume.vue
@@ -159,10 +159,6 @@
-
-
-
-
diff --git a/utils/encodeChinese.js b/utils/encodeChinese.js
new file mode 100644
index 0000000..f973f59
--- /dev/null
+++ b/utils/encodeChinese.js
@@ -0,0 +1,16 @@
+function encodeChinese(str){
+ if(!str){
+ return ''
+ }
+ return encodeURIComponent(str)
+}
+
+function decodeChinse(str){
+ if(str){
+ return decodeURIComponent(str)
+ }
+}
+
+export {
+ encodeChinese,decodeChinse
+}
\ No newline at end of file
diff --git a/utils/http.js b/utils/http.js
index 918dd29..1faca8e 100644
--- a/utils/http.js
+++ b/utils/http.js
@@ -1,7 +1,7 @@
import comstemutil from "./comstemutil";
//es6
-// const baseUrl = 'http://192.168.0.229:9999';
+// const baseUrl = 'http://192.168.0.230:9999';
const baseUrl = 'https://www.bjkeyware.com/test-api';
// const baseUrl = 'https://www.bjkeyware.com/prod-api';