-
Notifications
You must be signed in to change notification settings - Fork 2
Created DepartmentIntro subpages #18
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: dev
Are you sure you want to change the base?
Changes from all commits
0ce59f5
0eea4f3
e37c6a4
6a04fe7
fe7bae1
1281e34
762b463
bb3b732
61089fa
c430031
70e33fd
9c225d0
ec6fa24
0459b87
1187304
b9888c9
078186b
a479d20
4591d12
ca91cef
94e657b
d46384d
3dd977d
24e3d1b
681fcc9
45b49b7
fcfbc89
52e8f61
886a2cb
eba33d5
7ba47a7
27ee298
b01b103
0ec64e4
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,19 @@ | ||
| { | ||
| "pages": [ | ||
| "pages/mainPage/mainPage", | ||
| "pages/loginPage/loginPage", | ||
| "pages/departmentIntro/departmentIntro", | ||
| "pages/departmentIntro/board/board", | ||
| "pages/departmentIntro/secretary/secretary", | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. change to "dpt_secretary" |
||
| "pages/departmentIntro/externalRelationship/externalRelation", | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. dpt_outreach |
||
| "pages/departmentIntro/literaryGroup/literaryGroup", | ||
| "pages/departmentIntro/organizationDepartment/organization", | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. dpt_organization |
||
| "pages/departmentIntro/propagandaDepartment/propaganda", | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. dpt_publicity |
||
| "pages/departmentIntro/technology/technology" | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. dpt_technology |
||
| "pages/loginPage/loginPage", | ||
| "pages/departmentIntro/departmentIntro" | ||
| ], | ||
| "pages/departmentIntro/departmentIntro", | ||
| "pages/activityList/activitylist" | ||
| ], | ||
| "window": { | ||
| "backgroundColor": "#F6F6F6", | ||
| "backgroundTextStyle": "light", | ||
|
|
@@ -13,44 +23,5 @@ | |
| "navigationBarTextStyle": "black", | ||
| "navigationBarTitleText": "UMD CSSA WeApp" | ||
| }, | ||
| "tabBar": { | ||
| "backgroundColor": "#F6F6F6", | ||
| "borderStyle": "black", | ||
| "color": "#696969", | ||
| "position": "bottom", | ||
| "selectedColor": "#C00", | ||
| "list": [ | ||
| { | ||
| "pagePath": "pages/mainPage/mainPage", | ||
| "iconPath": "images/cssa_logo.png", | ||
| "selectedIconPath": "images/cssa_logo.png", | ||
| "text": "Page 1" | ||
| }, | ||
| { | ||
| "pagePath": "pages/mainPage/mainPage", | ||
| "iconPath": "images/cssa_logo.png", | ||
| "selectedIconPath": "images/cssa_logo.png", | ||
| "text": "Page 2" | ||
| }, | ||
| { | ||
| "pagePath": "pages/mainPage/mainPage", | ||
| "iconPath": "images/cssa_logo.png", | ||
| "selectedIconPath": "images/cssa_logo.png", | ||
| "text": "Page 3" | ||
| }, | ||
| { | ||
| "pagePath": "pages/mainPage/mainPage", | ||
| "iconPath": "images/cssa_logo.png", | ||
| "selectedIconPath": "images/cssa_logo.png", | ||
| "text": "Page 4" | ||
| }, | ||
| { | ||
| "pagePath": "pages/loginPage/loginPage", | ||
| "iconPath": "images/cssa_logo.png", | ||
| "selectedIconPath": "images/cssa_logo.png", | ||
| "text": "Page 5" | ||
| } | ||
| ] | ||
| }, | ||
| "sitemapLocation": "sitemap.json" | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| // pages/activitylist/activitylist.js | ||
| Page({ | ||
|
|
||
| }) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "usingComponents": {} | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| <!--pages/activitylist/activitylist.wxml--> | ||
| <view class="container"> | ||
|
|
||
| <view class="page_section"> | ||
| <view class="top"> | ||
| <text id="title">Activity List</text> | ||
| </view> | ||
| </view> | ||
|
|
||
|
|
||
| <view class="dptList"> | ||
|
|
||
| <navigator url=""> | ||
|
|
||
| <view class="dptpro_img"><image mode="aspectFill" src="/images/Background image.jpg" alt=""></image></view> | ||
| <view class="deptName">someDept</view> | ||
|
|
||
| </navigator> | ||
|
|
||
| <navigator url=""> | ||
| <view class="dptpro_img"><image mode="aspectFill" src="/images/Background image.jpg" alt=""></image></view> | ||
| <view class="deptName">someDept</view> | ||
|
|
||
| </navigator> | ||
|
|
||
|
|
||
|
|
||
| <navigator url=""> | ||
| <view class="dptpro_img"><image mode="aspectFill" src="/images/Background image.jpg" alt=""></image></view> | ||
| <view class="deptName">someDept</view> | ||
|
|
||
| </navigator> | ||
|
|
||
| <navigator url=""> | ||
| <view class="dptpro_img"><image mode="aspectFill" src="/images/Background image.jpg" alt=""></image></view> | ||
| <view class="deptName">someDept</view> | ||
|
|
||
| </navigator> | ||
|
|
||
| <navigator url=""> | ||
| <view class="dptpro_img"><image mode="aspectFill" src="/images/Background image.jpg" alt=""></image></view> | ||
| <view class="deptName">someDept</view> | ||
|
|
||
| </navigator> | ||
|
|
||
| <navigator url=""> | ||
| <view class="dptpro_img"><image mode="aspectFill" src="/images/Background image.jpg" alt=""></image></view> | ||
| <view class="deptName">someDept</view> | ||
|
|
||
| </navigator> | ||
| </view> | ||
| </view> | ||
|
|
||
| <import src="../../tpls/nav_bar_template/template.wxml" /> | ||
| <view> | ||
| <!-- 导航栏1.0 --> | ||
| <template is = "navi_bar"/> | ||
| </view> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* pages/activitylist/activitylist.wxss */ | ||
|
|
||
| /* import navi bar here*/ | ||
| @import "../../tpls/nav_bar_template/template.wxss"; | ||
|
|
||
| .top{ | ||
| width: 520rpx; | ||
| height: 30rpx; | ||
| line-height: 30rpx; | ||
| position: relative; | ||
| color: black; | ||
| font-size: 30rpx; | ||
| margin: 27rpx auto; | ||
| text-align:center; | ||
|
|
||
| } | ||
| #title{ | ||
| font-size: 35rpx; | ||
| margin-bottom: 5rpx; | ||
| } | ||
|
|
||
| .dptList{ | ||
| margin-top:25rpx; | ||
| } | ||
| .dptList navigator { | ||
| width: 93%; | ||
| float: left; | ||
| vertical-align: top; | ||
|
|
||
| background-color: lightcyan; | ||
| margin-bottom: 50rpx; | ||
| margin-left: 25rpx; | ||
| border: 1px solid; | ||
| -moz-box-sizing: border-box; | ||
| -o-box-sizing: border-box; | ||
| box-sizing: border-box; | ||
| border-radius: 10rpx; | ||
| } | ||
|
|
||
| .dptpro_img, .dptpro_img image { | ||
| width: 100%; | ||
| height: 250rpx; | ||
|
|
||
| } | ||
|
|
||
| .deptName{ | ||
| text-align: center; | ||
| opacity: 0.7; | ||
| } | ||
|
|
||
|
|
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| { | ||
| "usingComponents": {} | ||
| } | ||
| } | ||
|
|
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,60 +1,68 @@ | ||
| <!--pages/departmentIntro/departmentIntro.wxml--> | ||
| <view class="container"> | ||
|
|
||
| <view class="page_section"> | ||
| <view class="top"> | ||
| <text id="title">部门介绍</text> | ||
| <text>\n Department Introduction</text> | ||
| </view> | ||
| </view> | ||
|
|
||
|
|
||
| <view class="dptList"> | ||
|
|
||
|
|
||
|
|
||
| <navigator class="dpt_button" url=""> | ||
| <view class="dptpro_img"><image src="/images/cssa_logo.png" alt=""></image></view> | ||
| <view class="deptName">someDept</view> | ||
|
|
||
| </navigator> | ||
|
|
||
|
|
||
| <navigator url=""> | ||
| <view class="dptpro_img"><image src="/images/cssa_logo.png" alt=""></image></view> | ||
| <view class="deptName">someDept</view> | ||
|
|
||
| </navigator> | ||
|
|
||
|
|
||
| <navigator class="dpt_button" url=""> | ||
| <view class="dptpro_img"><image src="/images/cssa_logo.png" alt=""></image></view> | ||
| <view class="deptName">someDept</view> | ||
|
|
||
| </navigator> | ||
|
|
||
| <navigator url=""> | ||
| <view class="dptpro_img"><image src="/images/cssa_logo.png" alt=""></image></view> | ||
| <view class="deptName">someDept</view> | ||
|
|
||
| </navigator> | ||
|
|
||
| <navigator class="dpt_button" url=""> | ||
| <view class="dptpro_img"><image src="/images/cssa_logo.png" alt=""></image></view> | ||
| <view class="deptName">someDept</view> | ||
|
|
||
| </navigator> | ||
|
|
||
| <navigator url=""> | ||
| <view class="dptpro_img"><image src="/images/cssa_logo.png" alt=""></image></view> | ||
| <view class="deptName">someDept</view> | ||
|
|
||
| </navigator> | ||
|
|
||
|
|
||
| </view> | ||
|
|
||
|
|
||
|
|
||
|
|
||
| </view> | ||
| <!--pages/departmentIntro/departmentIntro.wxml--> | ||
| <view class="container"> | ||
|
|
||
| <view class="page_section"> | ||
| <view class="top"> | ||
| <text id="title">部门介绍</text> | ||
| <text>\n Department Introduction</text> | ||
| </view> | ||
| </view> | ||
| <view class="line"></view> | ||
|
|
||
| <view class="dptList"> | ||
|
|
||
|
|
||
|
|
||
| <navigator class="dpt_button" url="../departmentIntro/eboard/eboard"> | ||
| <view class="dptpro_img"><image src="/images/cssa_logo.png" alt=""></image></view> | ||
| <view class="deptName">E-Board</view> | ||
|
|
||
| </navigator> | ||
|
|
||
|
|
||
| <navigator url="../departmentIntro/dpt_secretary/dpt_secretary"> | ||
| <view class="dptpro_img"><image src="/images/cssa_logo.png" alt=""></image></view> | ||
| <view class="deptName">秘书团</view> | ||
|
|
||
| </navigator> | ||
|
|
||
|
|
||
| <navigator class="dpt_button" url="../departmentIntro/dpt_outreach/dpt_outreach"> | ||
| <view class="dptpro_img"><image src="/images/cssa_logo.png" alt=""></image></view> | ||
| <view class="deptName">外联部</view> | ||
|
|
||
| </navigator> | ||
|
|
||
| <navigator url="../departmentIntro/literaryGroup/literaryGroup"> | ||
| <view class="dptpro_img"><image src="/images/cssa_logo.png" alt=""></image></view> | ||
| <view class="deptName">文体团</view> | ||
|
|
||
| </navigator> | ||
|
|
||
| <navigator class="dpt_button" url="../departmentIntro/dpt_organization/dpt_organization"> | ||
| <view class="dptpro_img"><image src="/images/cssa_logo.png" alt=""></image></view> | ||
| <view class="deptName">组织部</view> | ||
|
|
||
| </navigator> | ||
|
|
||
| <navigator url="../departmentIntro/dpt_publicity/dpt_publicity"> | ||
| <view class="dptpro_img"><image src="/images/cssa_logo.png" alt=""></image></view> | ||
| <view class="deptName">宣传部</view> | ||
|
|
||
| </navigator> | ||
|
|
||
| <navigator class="dpt_button" url="../departmentIntro/dpt_technology/dpt_technology"> | ||
| <view class="dptpro_img"><image src="/images/cssa_logo.png" alt=""></image></view> | ||
| <view class="deptName">技术部</view> | ||
|
|
||
| </navigator> | ||
|
|
||
|
|
||
|
|
||
|
|
||
| </view> | ||
|
|
||
|
|
||
|
|
||
|
|
||
| </view> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change to eboard