diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
new file mode 100644
index 0000000..c9abd4b
--- /dev/null
+++ b/.hbuilderx/launch.json
@@ -0,0 +1,11 @@
+{ // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+ // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
+ "version": "0.0",
+ "configurations": [{
+ "type": "uniCloud",
+ "default": {
+ "launchtype": "local"
+ }
+ }
+ ]
+}
diff --git a/pages.json b/pages.json
index 8fcaa48..cfa5233 100644
--- a/pages.json
+++ b/pages.json
@@ -96,35 +96,35 @@
"navigationBarBackgroundColor": "#f8f8f8"
}
}
- ,{
- "path" : "pages/Project/PatternMatch",
- "style" : {
+ ,{
+ "path" : "pages/Project/PatternMatch",
+ "style" : {
"navigationBarTitleText": "花样赛项目",
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#f8f8f8"
}
- }
- ,{
- "path" : "pages/Login/Retrieve",
- "style" : {}
- }
- ,{
- "path" : "pages/Project/MatchDetail/TeamMatch",
- "style" : {}
- }
- ,{
- "path" : "pages/Project/MatchDetail/TeamDetail",
- "style" : {}
- }
- ,{
- "path" : "pages/First/Choose",
- "style" : {
- "navigationBarTitleText": "选择比赛类型",
- "navigationBarTextStyle": "#0a97c6",
- "navigationBarBackgroundColor": "#6D99F2"
- }
- }
- ],
+ }
+ ,{
+ "path" : "pages/Login/Retrieve",
+ "style" : {}
+ }
+ ,{
+ "path" : "pages/Project/MatchDetail/TeamMatch",
+ "style" : {}
+ }
+ ,{
+ "path" : "pages/Project/MatchDetail/TeamDetail",
+ "style" : {}
+ }
+ ,{
+ "path" : "pages/First/Choose",
+ "style" : {
+ "navigationBarTitleText": "选择比赛类型",
+ "navigationBarTextStyle": "#0a97c6",
+ "navigationBarBackgroundColor": "#6D99F2"
+ }
+ }
+ ],
"globalStyle": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "2021年山西省学生跳绳比赛报名系统",
diff --git a/pages/Basics/Basics.vue b/pages/Basics/Basics.vue
index cfc81e5..f2d7330 100644
--- a/pages/Basics/Basics.vue
+++ b/pages/Basics/Basics.vue
@@ -12,11 +12,24 @@
{{ item.title }}
+
+
+ 请填写单位全称,如“XXXX学校”
+
+
+ 此名称将出现在秩序册、成绩册、获奖证书等。
+
+
+
+ 请扫码进群!~
+
+
+
@@ -78,7 +91,7 @@ import { savecompany } from 'api/savecompany'
// imgList: []
}
},
- computed:mapState('project',['companyId','data']),
+ computed:mapState('project',['companyId','data','type']),
methods: {
...mapMutations('project',['setCompanyId']),
radioChange() {
@@ -227,4 +240,8 @@ import { savecompany } from 'api/savecompany'
.fbt {
color: $red;
}
+ .tips {
+ color: $gray;
+ font-size: 12px;
+ }
diff --git a/pages/First/First.vue b/pages/First/First.vue
index ebebfe7..8ba26f4 100644
--- a/pages/First/First.vue
+++ b/pages/First/First.vue
@@ -108,6 +108,8 @@ import { overview } from 'api/overview'
if (datalist && datalist.companyId) {
that.setCompanyId(datalist.companyId)
that.datalist = datalist
+ } else {
+ that.setCompanyId(0)
}
}
}catch(e){
diff --git a/static/item00.png b/static/item00.png
index 2e6ad9b..44805a9 100644
Binary files a/static/item00.png and b/static/item00.png differ