Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
0ce59f5
nav_bar
Oct 19, 2019
0eea4f3
sdffdsf
lts-2000 Oct 19, 2019
e37c6a4
ts
lts-2000 Oct 26, 2019
6a04fe7
Activity List
Oct 30, 2019
fe7bae1
Activity List
lts-2000 Oct 30, 2019
1281e34
delete
lts-2000 Nov 1, 2019
762b463
导航栏1.0
Nov 1, 2019
bb3b732
Merge refs/heads/feature/img-slider into refs/heads/feature/navi_bar
Nov 1, 2019
61089fa
regular update
syKevinPeng Nov 8, 2019
c430031
Merge remote-tracking branch 'remotes/GitHub/dev' into feature/homepage
syKevinPeng Nov 8, 2019
70e33fd
Merge remote-tracking branch 'remotes/GitHub/dev' into feature/homepage
syKevinPeng Nov 8, 2019
9c225d0
delete .DS_Store;
syKevinPeng Nov 8, 2019
ec6fa24
fix index.json;
syKevinPeng Nov 8, 2019
0459b87
Major Changes to Home Page
syKevinPeng Nov 8, 2019
1187304
update mainpage button
syKevinPeng Nov 8, 2019
b9888c9
lts
lts-2000 Nov 8, 2019
078186b
update to homepage
syKevinPeng Nov 9, 2019
a479d20
hello from jerry
syKevinPeng Nov 9, 2019
4591d12
3 buttons in home page working;
syKevinPeng Nov 9, 2019
ca91cef
update with bg img
syKevinPeng Nov 14, 2019
94e657b
Merge remote-tracking branch 'remotes/GitHub/feature/lts' into featur…
syKevinPeng Nov 15, 2019
d46384d
Merge Activity List and Depart Intro
syKevinPeng Nov 15, 2019
3dd977d
11.15
Nov 15, 2019
24e3d1b
Fix url not found bug
syKevinPeng Nov 15, 2019
681fcc9
Delete .DS_Store
syKevinPeng Nov 15, 2019
45b49b7
add color ball in js
syKevinPeng Nov 15, 2019
fcfbc89
Merge refs/remotes/origin/feature/homepage into refs/heads/feature/ho…
syKevinPeng Nov 15, 2019
52e8f61
Created DepartmentIntro subpages
willAries Nov 16, 2019
886a2cb
file clean up
syKevinPeng Nov 18, 2019
eba33d5
regular update
syKevinPeng Nov 18, 2019
7ba47a7
fix merge conflicts
syKevinPeng Nov 18, 2019
27ee298
merged from local changes
willAries Nov 18, 2019
b01b103
add navigation bar template
syKevinPeng Nov 19, 2019
0ec64e4
Merge branch 'feature/homepage' into feature/dept-info
syKevinPeng Nov 19, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 12 additions & 41 deletions miniprogram/app.json
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",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change to eboard

"pages/departmentIntro/secretary/secretary",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change to "dpt_secretary"

"pages/departmentIntro/externalRelationship/externalRelation",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dpt_outreach

"pages/departmentIntro/literaryGroup/literaryGroup",
"pages/departmentIntro/organizationDepartment/organization",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dpt_organization

"pages/departmentIntro/propagandaDepartment/propaganda",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dpt_publicity

"pages/departmentIntro/technology/technology"
Copy link
Collaborator

Choose a reason for hiding this comment

The 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",
Expand All @@ -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"
}
22 changes: 22 additions & 0 deletions miniprogram/app.wxss
Original file line number Diff line number Diff line change
Expand Up @@ -154,3 +154,25 @@ page {
line-height: 36rpx;
word-break: break-all;
}



@font-face {
font-family: 'iconfont'; /* project id 518032 */
src: url('//at.alicdn.com/t/font_518032_t2q88z3jok8iwwmi.eot');
src: url('//at.alicdn.com/t/font_518032_t2q88z3jok8iwwmi.eot?#iefix') format('embedded-opentype'),
url('//at.alicdn.com/t/font_518032_t2q88z3jok8iwwmi.woff') format('woff'),
url('//at.alicdn.com/t/font_518032_t2q88z3jok8iwwmi.ttf') format('truetype'),
url('//at.alicdn.com/t/font_518032_t2q88z3jok8iwwmi.svg#iconfont') format('svg');
}
.iconfont {
font-family:"iconfont" !important;
font-size:60rpx;
font-style:normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}

.icon-shouye::before{ content: '\e62d';}
.icon-shezhi:before{content: '\e62a';}
.icon-fenleiorguangchangorqita:before{content: '\e64f';}
Binary file added miniprogram/images/.DS_Store
Binary file not shown.
Binary file added miniprogram/images/Background image.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed miniprogram/images/code-cloud-callback-config.png
Binary file not shown.
Binary file removed miniprogram/images/code-db-inc-dec.png
Binary file not shown.
Binary file removed miniprogram/images/code-db-onAdd.png
Binary file not shown.
Binary file removed miniprogram/images/code-db-onQuery.png
Binary file not shown.
Binary file removed miniprogram/images/code-db-onRemove.png
Binary file not shown.
Binary file removed miniprogram/images/code-func-sum.png
Binary file not shown.
Binary file removed miniprogram/images/console-entrance.png
Binary file not shown.
Binary file removed miniprogram/images/create-collection.png
Binary file not shown.
Binary file added miniprogram/images/terp_shell.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added miniprogram/images/terp_shell_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added miniprogram/images/terp_shell_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added miniprogram/images/terp_shell_btn1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions miniprogram/pages/activitylist/activitylist.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// pages/activitylist/activitylist.js
Page({

})
3 changes: 3 additions & 0 deletions miniprogram/pages/activitylist/activitylist.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"usingComponents": {}
}
58 changes: 58 additions & 0 deletions miniprogram/pages/activitylist/activitylist.wxml
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>
51 changes: 51 additions & 0 deletions miniprogram/pages/activitylist/activitylist.wxss
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;
}


3 changes: 2 additions & 1 deletion miniprogram/pages/departmentIntro/departmentIntro.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"usingComponents": {}
}
}

128 changes: 68 additions & 60 deletions miniprogram/pages/departmentIntro/departmentIntro.wxml
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>
21 changes: 18 additions & 3 deletions miniprogram/pages/departmentIntro/departmentIntro.wxss
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

}
#title{
font-size: 35rpx;
margin-bottom: 5rpx;
font-size: 40rpx;
margin-bottom: 10rpx;
}

.dptList{
Expand All @@ -22,6 +22,7 @@
.dptList navigator {
width: 45%;
float: left;
position: center;
vertical-align: top;
border: 1px solid #f2f2f2;
background-color: white;
Expand All @@ -47,8 +48,22 @@
text-align: center;
margin-bottom: 10rpx;
}
navigator:hover{
navigator:active{
background-color:rgb(90, 67, 67);
color: white;
}
navigator:visited{
background-color:white;
color:black;
}

.line {
position: relative;
width: 90%;
height: 1px;
background-color: #e0e0e0;
left: 0;
margin:10rpx;
margin-top: 20rpx;

}
Loading