diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..359bb5307e8535ab7d59faf27a7377033291821e --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml new file mode 100644 index 0000000000000000000000000000000000000000..70f212e8304941212f95a50fe5de7734dbb081ad --- /dev/null +++ b/.idea/dbnavigator.xml @@ -0,0 +1,414 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000000000000000000000000000000000000..94a25f7f4cb416c083d265558da75d457237d671 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/alpha/admin/js_sdk/validator/mustgo-running-record.js b/alpha/admin/js_sdk/validator/mustgo-running-record.js index 6c567aaca4cdbdce26c768c1e619012b45667a7a..c6b030c8a520e944cb254dda349dbea6fbedbc88 100644 --- a/alpha/admin/js_sdk/validator/mustgo-running-record.js +++ b/alpha/admin/js_sdk/validator/mustgo-running-record.js @@ -35,8 +35,8 @@ const validator = { "format": "string" } ], - "title": "用户id", - "label": "用户id" + "title": "用户名", + "label": "用户名" }, "distance": { "rules": [ diff --git a/alpha/admin/js_sdk/validator/mustgo-school-activity.js b/alpha/admin/js_sdk/validator/mustgo-school-activity.js index 5d2c781be6979d2b3f7bfd6141858a355c1ea95a..851048764139cb1871f24b1f0e91a35a59ef3c3a 100644 --- a/alpha/admin/js_sdk/validator/mustgo-school-activity.js +++ b/alpha/admin/js_sdk/validator/mustgo-school-activity.js @@ -77,7 +77,8 @@ const validator = { "contact": { "rules": [ { - "format": " /^1[3|4|5|7|8][0-9]\d{8}$/" + "format": "^1[0-9]{10}$", + // "pattern": "^1[0-9]{10}$", } ], "title": "联系方式", diff --git a/alpha/admin/js_sdk/validator/mustgo-team-activity.js b/alpha/admin/js_sdk/validator/mustgo-team-activity.js index 5c1f9f5532705a282ec75ebcf073840203143aeb..78b9dec0ee970e4d8fcc6522ba36dc047076e9bd 100644 --- a/alpha/admin/js_sdk/validator/mustgo-team-activity.js +++ b/alpha/admin/js_sdk/validator/mustgo-team-activity.js @@ -86,7 +86,8 @@ const validator = { "contact": { "rules": [ { - "format": "string" + "format": "string", + "pattern": "/^1[0-9]{10}$/", } ], "title": "联系方式", diff --git a/alpha/admin/pages/content/mustgo-comment/edit.vue b/alpha/admin/pages/content/mustgo-comment/edit.vue index 8d9ab6e53f500e7e3efc557d99e8be794001faba..b7979f0c1ebe5603984266b6e8735812fbf3d335 100644 --- a/alpha/admin/pages/content/mustgo-comment/edit.vue +++ b/alpha/admin/pages/content/mustgo-comment/edit.vue @@ -2,16 +2,21 @@ - + - + + - + + - + @@ -76,7 +76,8 @@ "pace": null, "path_line": [], "start_point": null, - "end_point": null + "end_point": null, + "name": "" } return { formData, diff --git a/alpha/admin/pages/content/mustgo-team/edit.vue b/alpha/admin/pages/content/mustgo-team/edit.vue index bef32a8242aa0c9fdf4d01d483ad3cf5c0557ea1..45b8c738da69b9acc664d967d8582cd3fc8f1ba1 100644 --- a/alpha/admin/pages/content/mustgo-team/edit.vue +++ b/alpha/admin/pages/content/mustgo-team/edit.vue @@ -9,7 +9,7 @@ - + diff --git a/alpha/admin/pages/content/mustgo-user/edit.vue b/alpha/admin/pages/content/mustgo-user/edit.vue index e10674e64792370145b3c3262bf5eb42dae1abbe..7f87173a1e9b3bb8acab0c2df6e501135bb259d4 100644 --- a/alpha/admin/pages/content/mustgo-user/edit.vue +++ b/alpha/admin/pages/content/mustgo-user/edit.vue @@ -31,11 +31,11 @@ - + - +