diff --git a/miniprogram/app.json b/miniprogram/app.json
index 25a169f..be70165 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -1,9 +1,19 @@
{
"pages": [
"pages/mainPage/mainPage",
+ "pages/loginPage/loginPage",
+ "pages/departmentIntro/departmentIntro",
+ "pages/departmentIntro/board/board",
+ "pages/departmentIntro/secretary/secretary",
+ "pages/departmentIntro/externalRelationship/externalRelation",
+ "pages/departmentIntro/literaryGroup/literaryGroup",
+ "pages/departmentIntro/organizationDepartment/organization",
+ "pages/departmentIntro/propagandaDepartment/propaganda",
+ "pages/departmentIntro/technology/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"
}
diff --git a/miniprogram/app.wxss b/miniprogram/app.wxss
index 82678d6..0b4d8f5 100644
--- a/miniprogram/app.wxss
+++ b/miniprogram/app.wxss
@@ -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';}
diff --git a/miniprogram/images/.DS_Store b/miniprogram/images/.DS_Store
new file mode 100644
index 0000000..cb657de
Binary files /dev/null and b/miniprogram/images/.DS_Store differ
diff --git a/miniprogram/images/Background image.jpg b/miniprogram/images/Background image.jpg
new file mode 100644
index 0000000..908da44
Binary files /dev/null and b/miniprogram/images/Background image.jpg differ
diff --git a/miniprogram/images/code-cloud-callback-config.png b/miniprogram/images/code-cloud-callback-config.png
deleted file mode 100644
index 25b0bfc..0000000
Binary files a/miniprogram/images/code-cloud-callback-config.png and /dev/null differ
diff --git a/miniprogram/images/code-db-inc-dec.png b/miniprogram/images/code-db-inc-dec.png
deleted file mode 100644
index d8770b1..0000000
Binary files a/miniprogram/images/code-db-inc-dec.png and /dev/null differ
diff --git a/miniprogram/images/code-db-onAdd.png b/miniprogram/images/code-db-onAdd.png
deleted file mode 100644
index 22c7afb..0000000
Binary files a/miniprogram/images/code-db-onAdd.png and /dev/null differ
diff --git a/miniprogram/images/code-db-onQuery.png b/miniprogram/images/code-db-onQuery.png
deleted file mode 100644
index 218550d..0000000
Binary files a/miniprogram/images/code-db-onQuery.png and /dev/null differ
diff --git a/miniprogram/images/code-db-onRemove.png b/miniprogram/images/code-db-onRemove.png
deleted file mode 100644
index b4eff71..0000000
Binary files a/miniprogram/images/code-db-onRemove.png and /dev/null differ
diff --git a/miniprogram/images/code-func-sum.png b/miniprogram/images/code-func-sum.png
deleted file mode 100644
index 0414529..0000000
Binary files a/miniprogram/images/code-func-sum.png and /dev/null differ
diff --git a/miniprogram/images/console-entrance.png b/miniprogram/images/console-entrance.png
deleted file mode 100644
index bbbb973..0000000
Binary files a/miniprogram/images/console-entrance.png and /dev/null differ
diff --git a/miniprogram/images/create-collection.png b/miniprogram/images/create-collection.png
deleted file mode 100644
index e0fdb34..0000000
Binary files a/miniprogram/images/create-collection.png and /dev/null differ
diff --git a/miniprogram/images/terp_shell.png b/miniprogram/images/terp_shell.png
new file mode 100644
index 0000000..b966b6d
Binary files /dev/null and b/miniprogram/images/terp_shell.png differ
diff --git a/miniprogram/images/terp_shell_1.png b/miniprogram/images/terp_shell_1.png
new file mode 100644
index 0000000..ed96627
Binary files /dev/null and b/miniprogram/images/terp_shell_1.png differ
diff --git a/miniprogram/images/terp_shell_2.png b/miniprogram/images/terp_shell_2.png
new file mode 100644
index 0000000..aaaf431
Binary files /dev/null and b/miniprogram/images/terp_shell_2.png differ
diff --git a/miniprogram/images/terp_shell_btn1.png b/miniprogram/images/terp_shell_btn1.png
new file mode 100644
index 0000000..9e1d5f2
Binary files /dev/null and b/miniprogram/images/terp_shell_btn1.png differ
diff --git a/miniprogram/pages/activitylist/activitylist.js b/miniprogram/pages/activitylist/activitylist.js
new file mode 100644
index 0000000..e23bf6f
--- /dev/null
+++ b/miniprogram/pages/activitylist/activitylist.js
@@ -0,0 +1,4 @@
+// pages/activitylist/activitylist.js
+Page({
+
+})
\ No newline at end of file
diff --git a/miniprogram/pages/activitylist/activitylist.json b/miniprogram/pages/activitylist/activitylist.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/miniprogram/pages/activitylist/activitylist.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/activitylist/activitylist.wxml b/miniprogram/pages/activitylist/activitylist.wxml
new file mode 100644
index 0000000..a515655
--- /dev/null
+++ b/miniprogram/pages/activitylist/activitylist.wxml
@@ -0,0 +1,58 @@
+
+
+
+
+
+ Activity List
+
+
+
+
+
+
+
+
+
+ someDept
+
+
+
+
+
+ someDept
+
+
+
+
+
+
+
+ someDept
+
+
+
+
+
+ someDept
+
+
+
+
+
+ someDept
+
+
+
+
+
+ someDept
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/activitylist/activitylist.wxss b/miniprogram/pages/activitylist/activitylist.wxss
new file mode 100644
index 0000000..33285cf
--- /dev/null
+++ b/miniprogram/pages/activitylist/activitylist.wxss
@@ -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;
+}
+
+
diff --git a/miniprogram/pages/departmentIntro/departmentIntro.json b/miniprogram/pages/departmentIntro/departmentIntro.json
index 8835af0..1ef3c8e 100644
--- a/miniprogram/pages/departmentIntro/departmentIntro.json
+++ b/miniprogram/pages/departmentIntro/departmentIntro.json
@@ -1,3 +1,4 @@
{
"usingComponents": {}
-}
\ No newline at end of file
+}
+
diff --git a/miniprogram/pages/departmentIntro/departmentIntro.wxml b/miniprogram/pages/departmentIntro/departmentIntro.wxml
index e79b585..c6f15ab 100644
--- a/miniprogram/pages/departmentIntro/departmentIntro.wxml
+++ b/miniprogram/pages/departmentIntro/departmentIntro.wxml
@@ -1,60 +1,68 @@
-
-
-
-
-
- 部门介绍
- \n Department Introduction
-
-
-
-
-
-
-
-
-
-
- someDept
-
-
-
-
-
-
- someDept
-
-
-
-
-
-
- someDept
-
-
-
-
-
- someDept
-
-
-
-
-
- someDept
-
-
-
-
-
- someDept
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ 部门介绍
+ \n Department Introduction
+
+
+
+
+
+
+
+
+
+
+ E-Board
+
+
+
+
+
+
+ 秘书团
+
+
+
+
+
+
+ 外联部
+
+
+
+
+
+ 文体团
+
+
+
+
+
+ 组织部
+
+
+
+
+
+ 宣传部
+
+
+
+
+
+ 技术部
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/departmentIntro/departmentIntro.wxss b/miniprogram/pages/departmentIntro/departmentIntro.wxss
index 6d39b8e..b34802c 100644
--- a/miniprogram/pages/departmentIntro/departmentIntro.wxss
+++ b/miniprogram/pages/departmentIntro/departmentIntro.wxss
@@ -12,8 +12,8 @@
}
#title{
- font-size: 35rpx;
- margin-bottom: 5rpx;
+ font-size: 40rpx;
+ margin-bottom: 10rpx;
}
.dptList{
@@ -22,6 +22,7 @@
.dptList navigator {
width: 45%;
float: left;
+ position: center;
vertical-align: top;
border: 1px solid #f2f2f2;
background-color: white;
@@ -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;
+
+}
\ No newline at end of file
diff --git a/miniprogram/pages/departmentIntro/dpt_organization/dpt_organization.js b/miniprogram/pages/departmentIntro/dpt_organization/dpt_organization.js
new file mode 100644
index 0000000..a3942c0
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/dpt_organization/dpt_organization.js
@@ -0,0 +1,66 @@
+// miniprogram/pages/departmentIntro/organizationDepartment/organization.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/departmentIntro/dpt_organization/dpt_organization.json b/miniprogram/pages/departmentIntro/dpt_organization/dpt_organization.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/dpt_organization/dpt_organization.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/departmentIntro/dpt_organization/dpt_organization.wxml b/miniprogram/pages/departmentIntro/dpt_organization/dpt_organization.wxml
new file mode 100644
index 0000000..4a73715
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/dpt_organization/dpt_organization.wxml
@@ -0,0 +1,48 @@
+
+
+
+
+
+ 组织部
+
+ CSSA
+
+
+
+ 部长
+ 江屹璇（荔枝)
+
+ wu
+
+
+
+
+ 副部长
+ 冷一圣
+
+ 专业：Computer Science
+爱好：篮球，旅游，健身，交朋友
+坚吾志而勇于为，炼己身而勤于学。
+ 茫茫人海贵相知，赤子之心永留存。
+希望尽心尽力给大家带来优质的服务，努力地将组织部发展的越来越好。
+CSSA加油！组织部加油！
+
+
+
+
+
+
+ 副部长
+ 张惜光
+
+ wu
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/departmentIntro/dpt_organization/dpt_organization.wxss b/miniprogram/pages/departmentIntro/dpt_organization/dpt_organization.wxss
new file mode 100644
index 0000000..1dd421b
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/dpt_organization/dpt_organization.wxss
@@ -0,0 +1,61 @@
+/* miniprogram/pages/departmentIntro/organizationDepartment/organization.wxss */
+/* miniprogram/pages/departmentIntro/board/board.wxss */
+
+
+/* Top part*/
+.title{
+ font-size: 50rpx;
+ margin-bottom: 5rpx;
+}
+.deptintro{
+ margin-top: 10rpx;
+ font-size: 25rpx;
+}
+
+.line {
+ position: relative;
+ width: 90%;
+ height: 1px;
+ background-color: #e0e0e0;
+ left: 0;
+
+}
+/* individual*/
+.individual{
+ width: 80%;
+
+ text-align: center;
+ border: 1px solid #f2f2f2;
+ background-color: white;
+ margin-bottom: 20rpx;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 30rpx;
+
+ border-radius: 10px;
+ padding: 20rpx;
+ padding-top: 10rpx;
+}
+.photo image{
+ width: 250rpx;
+ height: 250rpx;
+ margin:10rpx;
+
+}
+.job{
+ font-size: 35rpx;
+}
+.name{
+ font-size: 25rpx;
+}
+.saying{
+ font-size: 25rpx;
+}
+.logo image{
+ width: 100rpx;
+ height: 100rpx;
+ margin:10rpx;
+}
+.logo{
+ margin: auto;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/departmentIntro/dpt_outreach/dpt_outreach.js b/miniprogram/pages/departmentIntro/dpt_outreach/dpt_outreach.js
new file mode 100644
index 0000000..acdaf63
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/dpt_outreach/dpt_outreach.js
@@ -0,0 +1,66 @@
+// miniprogram/pages/departmentIntro/externalRelationship/externalRelation.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/departmentIntro/dpt_outreach/dpt_outreach.json b/miniprogram/pages/departmentIntro/dpt_outreach/dpt_outreach.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/dpt_outreach/dpt_outreach.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/departmentIntro/dpt_outreach/dpt_outreach.wxml b/miniprogram/pages/departmentIntro/dpt_outreach/dpt_outreach.wxml
new file mode 100644
index 0000000..48d4063
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/dpt_outreach/dpt_outreach.wxml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+ 外联部
+
+ 外联部负责与外校外联成员沟通联系，与各校CSSA共同举办活动或邀请各校CSSA参加活动；负责cssa与社会赞助商的联系，争取为组织各种大型活动拉取赞助；负责联系马大周边商家，为中国留学生消费争取商家折扣，建立稳固合作关系；负责与校内各个组织和协会建立关系，共同举办活动或引进活动，并为大家搜集每月校内活动。从Spring2019开始策划“小龟吃华府”吃播探店活动，为马大学生推荐dmv周边更优质的美食。
+
+
+
+ 部长
+ 杨舒涵（Mia)
+
+ 专业：Economics, Statistics
+爱好：旅游，猫，跳舞，蹦迪，麻将
+前路浩浩荡荡，万事总可期待
+Study Hard, Play Harder
+小杨冲！外联冲！！
+
+
+
+
+
+ 副部长
+ 林肯
+
+ wu
+
+
+
+
+
+ 副部长
+ 张曦文
+
+ 专业：Economics
+“想把每个普通的一天过得精致且特别”
+喜欢聊天，撸猫，吃好吃的~
+希望可以认识更多的朋友，也希望可以为组织发光发热啦！
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/departmentIntro/dpt_outreach/dpt_outreach.wxss b/miniprogram/pages/departmentIntro/dpt_outreach/dpt_outreach.wxss
new file mode 100644
index 0000000..e9dbec4
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/dpt_outreach/dpt_outreach.wxss
@@ -0,0 +1,65 @@
+/* miniprogram/pages/departmentIntro/externalRelationship/externalRelation.wxss */
+/* miniprogram/pages/departmentIntro/organizationDepartment/organization.wxss */
+/* miniprogram/pages/departmentIntro/board/board.wxss */
+
+
+/* Top part*/
+.title{
+ font-size: 50rpx;
+ margin-bottom: 5rpx;
+}
+.deptintro{
+ margin: 10rpx;
+ margin-left: 30rpx;
+ margin-right: 30rpx;
+ font-size: 25rpx;
+ text-indent: 50rpx;
+}
+
+.line {
+ position: relative;
+ width: 90%;
+ height: 1px;
+ background-color: #e0e0e0;
+ left: 0;
+
+}
+/* individual*/
+.individual{
+ width: 80%;
+
+ text-align: center;
+ border: 1px solid #f2f2f2;
+ background-color: white;
+ margin-bottom: 20rpx;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 30rpx;
+
+ border-radius: 10px;
+ padding: 20rpx;
+ padding-top: 10rpx;
+}
+.photo image{
+ width: 250rpx;
+ height: 250rpx;
+ margin:10rpx;
+
+}
+.job{
+ font-size: 35rpx;
+}
+.name{
+ font-size: 25rpx;
+}
+.saying{
+ font-size: 25rpx;
+}
+.logo image{
+ width: 100rpx;
+ height: 100rpx;
+ margin:10rpx;
+}
+.logo{
+ margin: auto;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/departmentIntro/dpt_publicity/dpt_publicity.js b/miniprogram/pages/departmentIntro/dpt_publicity/dpt_publicity.js
new file mode 100644
index 0000000..d7fc990
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/dpt_publicity/dpt_publicity.js
@@ -0,0 +1,66 @@
+// miniprogram/pages/departmentIntro/propagandaDepartment/propaganda.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/departmentIntro/dpt_publicity/dpt_publicity.json b/miniprogram/pages/departmentIntro/dpt_publicity/dpt_publicity.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/dpt_publicity/dpt_publicity.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/departmentIntro/dpt_publicity/dpt_publicity.wxml b/miniprogram/pages/departmentIntro/dpt_publicity/dpt_publicity.wxml
new file mode 100644
index 0000000..96ed96e
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/dpt_publicity/dpt_publicity.wxml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+ 宣传部
+
+ CSSA
+
+
+
+ 副部长
+ 吴宇飞
+
+ wu
+
+
+
+
+
+ 副部长
+ 李昊然
+
+ wu
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/departmentIntro/dpt_publicity/dpt_publicity.wxss b/miniprogram/pages/departmentIntro/dpt_publicity/dpt_publicity.wxss
new file mode 100644
index 0000000..2e6095c
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/dpt_publicity/dpt_publicity.wxss
@@ -0,0 +1,61 @@
+/* miniprogram/pages/departmentIntro/propagandaDepartment/propaganda.wxss *//* miniprogram/pages/departmentIntro/organizationDepartment/organization.wxss */
+/* miniprogram/pages/departmentIntro/board/board.wxss */
+
+
+/* Top part*/
+.title{
+ font-size: 50rpx;
+ margin-bottom: 5rpx;
+}
+.deptintro{
+ margin-top: 10rpx;
+ font-size: 25rpx;
+}
+
+.line {
+ position: relative;
+ width: 90%;
+ height: 1px;
+ background-color: #e0e0e0;
+ left: 0;
+
+}
+/* individual*/
+.individual{
+ width: 80%;
+
+ text-align: center;
+ border: 1px solid #f2f2f2;
+ background-color: white;
+ margin-bottom: 20rpx;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 30rpx;
+
+ border-radius: 10px;
+ padding: 20rpx;
+ padding-top: 10rpx;
+}
+.photo image{
+ width: 250rpx;
+ height: 250rpx;
+ margin:10rpx;
+
+}
+.job{
+ font-size: 35rpx;
+}
+.name{
+ font-size: 25rpx;
+}
+.saying{
+ font-size: 25rpx;
+}
+.logo image{
+ width: 100rpx;
+ height: 100rpx;
+ margin:10rpx;
+}
+.logo{
+ margin: auto;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/departmentIntro/dpt_secretary/dpt_secretary.js b/miniprogram/pages/departmentIntro/dpt_secretary/dpt_secretary.js
new file mode 100644
index 0000000..10178f7
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/dpt_secretary/dpt_secretary.js
@@ -0,0 +1,66 @@
+// miniprogram/pages/departmentIntro/ secretary/secretary.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/departmentIntro/dpt_secretary/dpt_secretary.json b/miniprogram/pages/departmentIntro/dpt_secretary/dpt_secretary.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/dpt_secretary/dpt_secretary.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/departmentIntro/dpt_secretary/dpt_secretary.wxml b/miniprogram/pages/departmentIntro/dpt_secretary/dpt_secretary.wxml
new file mode 100644
index 0000000..7e2dbdf
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/dpt_secretary/dpt_secretary.wxml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+ 秘书团
+
+ CSSA
+
+
+
+ 秘书长
+ 赵心怡
+
+ wu
+
+
+
+
+ 副秘书长
+ 朱雨豪
+
+ wu
+
+
+
+
+
+ 副秘书长
+ 俞涵秋Cici
+
+ wu
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/departmentIntro/dpt_secretary/dpt_secretary.wxss b/miniprogram/pages/departmentIntro/dpt_secretary/dpt_secretary.wxss
new file mode 100644
index 0000000..7c5cc8f
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/dpt_secretary/dpt_secretary.wxss
@@ -0,0 +1,61 @@
+/* miniprogram/pages/departmentIntro/ secretary/secretary.wxss *//* miniprogram/pages/departmentIntro/organizationDepartment/organization.wxss */
+/* miniprogram/pages/departmentIntro/board/board.wxss */
+
+
+/* Top part*/
+.title{
+ font-size: 50rpx;
+ margin-bottom: 5rpx;
+}
+.deptintro{
+ margin-top: 10rpx;
+ font-size: 25rpx;
+}
+
+.line {
+ position: relative;
+ width: 90%;
+ height: 1px;
+ background-color: #e0e0e0;
+ left: 0;
+
+}
+/* individual*/
+.individual{
+ width: 80%;
+
+ text-align: center;
+ border: 1px solid #f2f2f2;
+ background-color: white;
+ margin-bottom: 20rpx;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 30rpx;
+
+ border-radius: 10px;
+ padding: 20rpx;
+ padding-top: 10rpx;
+}
+.photo image{
+ width: 250rpx;
+ height: 250rpx;
+ margin:10rpx;
+
+}
+.job{
+ font-size: 35rpx;
+}
+.name{
+ font-size: 25rpx;
+}
+.saying{
+ font-size: 25rpx;
+}
+.logo image{
+ width: 100rpx;
+ height: 100rpx;
+ margin:10rpx;
+}
+.logo{
+ margin: auto;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/departmentIntro/dpt_technology/dpt_technology.js b/miniprogram/pages/departmentIntro/dpt_technology/dpt_technology.js
new file mode 100644
index 0000000..d2eff1f
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/dpt_technology/dpt_technology.js
@@ -0,0 +1,66 @@
+// miniprogram/pages/departmentIntro/technology/technology.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/departmentIntro/dpt_technology/dpt_technology.json b/miniprogram/pages/departmentIntro/dpt_technology/dpt_technology.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/dpt_technology/dpt_technology.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/departmentIntro/dpt_technology/dpt_technology.wxml b/miniprogram/pages/departmentIntro/dpt_technology/dpt_technology.wxml
new file mode 100644
index 0000000..b902376
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/dpt_technology/dpt_technology.wxml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+ 技术部
+
+ CSSA
+
+
+
+ 部长
+ Nick
+
+ wu
+
+
+
+
+ 副部长
+ 彭思远Kevin
+
+ wu
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/departmentIntro/dpt_technology/dpt_technology.wxss b/miniprogram/pages/departmentIntro/dpt_technology/dpt_technology.wxss
new file mode 100644
index 0000000..c340d7f
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/dpt_technology/dpt_technology.wxss
@@ -0,0 +1,61 @@
+/* miniprogram/pages/departmentIntro/technology/technology.wxss *//* miniprogram/pages/departmentIntro/organizationDepartment/organization.wxss */
+/* miniprogram/pages/departmentIntro/board/board.wxss */
+
+
+/* Top part*/
+.title{
+ font-size: 50rpx;
+ margin-bottom: 5rpx;
+}
+.deptintro{
+ margin-top: 10rpx;
+ font-size: 25rpx;
+}
+
+.line {
+ position: relative;
+ width: 90%;
+ height: 1px;
+ background-color: #e0e0e0;
+ left: 0;
+
+}
+/* individual*/
+.individual{
+ width: 80%;
+
+ text-align: center;
+ border: 1px solid #f2f2f2;
+ background-color: white;
+ margin-bottom: 20rpx;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 30rpx;
+
+ border-radius: 10px;
+ padding: 20rpx;
+ padding-top: 10rpx;
+}
+.photo image{
+ width: 250rpx;
+ height: 250rpx;
+ margin:10rpx;
+
+}
+.job{
+ font-size: 35rpx;
+}
+.name{
+ font-size: 25rpx;
+}
+.saying{
+ font-size: 25rpx;
+}
+.logo image{
+ width: 100rpx;
+ height: 100rpx;
+ margin:10rpx;
+}
+.logo{
+ margin: auto;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/departmentIntro/eboard/eboard.js b/miniprogram/pages/departmentIntro/eboard/eboard.js
new file mode 100644
index 0000000..e38c3f4
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/eboard/eboard.js
@@ -0,0 +1,66 @@
+// miniprogram/pages/departmentIntro/board/board.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/departmentIntro/eboard/eboard.json b/miniprogram/pages/departmentIntro/eboard/eboard.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/eboard/eboard.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/departmentIntro/eboard/eboard.wxml b/miniprogram/pages/departmentIntro/eboard/eboard.wxml
new file mode 100644
index 0000000..50f0a6c
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/eboard/eboard.wxml
@@ -0,0 +1,66 @@
+
+
+
+
+ 主席团
+
+ CSSA
+
+
+
+
+
+
+
+ 主席
+ 矫怡然（Rachel)
+
+ 有光芒但不刺眼，有棱角却不伤人。
+ 江南无所有，聊赠一枝春。
+ 做个平凡又闪亮的人。
+
+
+
+
+
+
+ 副主席
+ 薄海昭 （Jenny）
+
+ wu
+
+
+
+
+
+ 副主席
+ 孙闻 （Steven）
+
+ wu
+
+
+
+
+
+ 副主席
+ 虞智轩
+
+ wu
+
+
+
+
+
+ 秘书长（兼财务主管）
+ 赵心怡
+
+ wu
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/departmentIntro/eboard/eboard.wxss b/miniprogram/pages/departmentIntro/eboard/eboard.wxss
new file mode 100644
index 0000000..813c8c0
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/eboard/eboard.wxss
@@ -0,0 +1,60 @@
+/* miniprogram/pages/departmentIntro/board/board.wxss */
+
+
+/* Top part*/
+.title{
+ font-size: 50rpx;
+ margin-bottom: 5rpx;
+}
+.deptintro{
+ margin-top: 10rpx;
+ font-size: 25rpx;
+}
+
+.line {
+ position: relative;
+ width: 90%;
+ height: 1px;
+ background-color: #e0e0e0;
+ left: 0;
+
+}
+/* individual*/
+.individual{
+ width: 80%;
+
+ text-align: center;
+ border: 1px solid #f2f2f2;
+ background-color: white;
+ margin-bottom: 20rpx;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 30rpx;
+
+ border-radius: 10px;
+ padding: 20rpx;
+ padding-top: 10rpx;
+}
+.photo image{
+ width: 250rpx;
+ height: 250rpx;
+ margin:10rpx;
+
+}
+.job{
+ font-size: 35rpx;
+}
+.name{
+ font-size: 25rpx;
+}
+.saying{
+ font-size: 25rpx;
+}
+.logo image{
+ width: 100rpx;
+ height: 100rpx;
+ margin:10rpx;
+}
+.logo{
+ margin: auto;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/departmentIntro/literaryGroup/literaryGroup.js b/miniprogram/pages/departmentIntro/literaryGroup/literaryGroup.js
new file mode 100644
index 0000000..ac24a79
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/literaryGroup/literaryGroup.js
@@ -0,0 +1,66 @@
+// miniprogram/pages/departmentIntro/literaryGroup/literaryGroup.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pages/departmentIntro/literaryGroup/literaryGroup.json b/miniprogram/pages/departmentIntro/literaryGroup/literaryGroup.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/literaryGroup/literaryGroup.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/pages/departmentIntro/literaryGroup/literaryGroup.wxml b/miniprogram/pages/departmentIntro/literaryGroup/literaryGroup.wxml
new file mode 100644
index 0000000..144dee3
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/literaryGroup/literaryGroup.wxml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+ 文体团
+
+ 文体团是一个专门负责CSSA文娱表演和体育赛事的部门。自成立以来，文体团在短短一年的时间里迅速成长，在校内校外举办的各种晚会和比赛上给大家留下了良好的印象。文体团采用了学员制度并确立下表演、街舞、羽毛球、音乐和民舞五个分团。文体团不仅是一个优秀的集文娱表演、赛事演出举办于一身的团队，更是一个让每个有才华的同学展示自己的平台
+
+
+
+
+ 副部长
+ 张雨晨（Rachael）
+
+ wu
+
+
+
+
+
+ 副部长
+ 何梓轩（何包仔）
+
+ wu
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pages/departmentIntro/literaryGroup/literaryGroup.wxss b/miniprogram/pages/departmentIntro/literaryGroup/literaryGroup.wxss
new file mode 100644
index 0000000..0b637e0
--- /dev/null
+++ b/miniprogram/pages/departmentIntro/literaryGroup/literaryGroup.wxss
@@ -0,0 +1,65 @@
+/* miniprogram/pages/departmentIntro/literaryGroup/literaryGroup.wxss *//* miniprogram/pages/departmentIntro/externalRelationship/externalRelation.wxss */
+/* miniprogram/pages/departmentIntro/organizationDepartment/organization.wxss */
+/* miniprogram/pages/departmentIntro/board/board.wxss */
+
+
+/* Top part*/
+.title{
+ font-size: 50rpx;
+ margin-bottom: 5rpx;
+}
+.deptintro{
+ margin: 10rpx;
+ margin-left: 30rpx;
+ margin-right: 30rpx;
+ font-size: 25rpx;
+ text-indent: 50rpx;
+}
+
+.line {
+ position: relative;
+ width: 90%;
+ height: 1px;
+ background-color: #e0e0e0;
+ left: 0;
+
+}
+/* individual*/
+.individual{
+ width: 80%;
+
+ text-align: center;
+ border: 1px solid #f2f2f2;
+ background-color: white;
+ margin-bottom: 20rpx;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 30rpx;
+
+ border-radius: 10px;
+ padding: 20rpx;
+ padding-top: 10rpx;
+}
+.photo image{
+ width: 250rpx;
+ height: 250rpx;
+ margin:10rpx;
+
+}
+.job{
+ font-size: 35rpx;
+}
+.name{
+ font-size: 25rpx;
+}
+.saying{
+ font-size: 25rpx;
+}
+.logo image{
+ width: 100rpx;
+ height: 100rpx;
+ margin:10rpx;
+}
+.logo{
+ margin: auto;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml
new file mode 100644
index 0000000..3fc694b
--- /dev/null
+++ b/miniprogram/pages/index/index.wxml
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上传图片
+
+
+
+
+
+
+
+
+
+
+ 前端操作数据库
+
+
+
+
+
+
+ 即时通信 Demo
+
+
+
+
+
+
+ 快速新建云函数
+
+
+
+
+
+
+ 云调用
+
+
+
+
+
+
diff --git a/miniprogram/pages/loginPage/loginPage.js b/miniprogram/pages/loginPage/loginPage.js
index 0823d16..a65b853 100644
--- a/miniprogram/pages/loginPage/loginPage.js
+++ b/miniprogram/pages/loginPage/loginPage.js
@@ -7,7 +7,19 @@ Page({
data: {
nickName: "Nick Name Here!"
},
+ /**
+ * Lifecycle, called on render finished.
+ */
+ onReady() {
+ this.loadCanvasCssaLogo()
+ },
+ /**
+ * Called when an error callback was executed.
+ */
+ onError(msg) {
+ getApp().onError(msg)
+ },
/**
* Callback listener of the login button.
*
@@ -76,4 +88,44 @@ Page({
// Log error
getApp().onError('onGotUserInfo() failed!')
},
+ loadCanvasCssaLogo() {
+ // When canvas is not supported.
+ if (!wx.createCanvasContext) {
+ getApp().onError('Feature [canvas] not supported! Please update WeChat!')
+ return
+ }
+
+ wx.getSystemInfo({
+ success(res) {
+ console.log(res)
+
+ const screenWidth = res.screenWidth ?
+ res.screenWidth : res.windowWidth
+ const scaleFactor = screenWidth / 20
+ const cc = wx.createCanvasContext("cssa-logo")
+
+ cc.setStrokeStyle("#C00")
+ cc.setLineWidth(10)
+ cc.setLineCap("round")
+ cc.setLineJoin("round")
+
+ cc.rect(.5 * scaleFactor, .5 * scaleFactor, 19 * scaleFactor, 19 * scaleFactor)
+ cc.moveTo(18 * scaleFactor, 2 * scaleFactor)
+ cc.lineTo(2 * scaleFactor, 2 * scaleFactor)
+ cc.lineTo(2 * scaleFactor, 14 * scaleFactor)
+ cc.lineTo(18 * scaleFactor, 14 * scaleFactor)
+ cc.moveTo(10 * scaleFactor, 2 * scaleFactor)
+ cc.lineTo(10 * scaleFactor, 6 * scaleFactor)
+ cc.lineTo(18 * scaleFactor, 6 * scaleFactor)
+ cc.lineTo(18 * scaleFactor, 18 * scaleFactor)
+ cc.moveTo(2 * scaleFactor, 18 * scaleFactor)
+ cc.lineTo(10 * scaleFactor, 18 * scaleFactor)
+ cc.lineTo(10 * scaleFactor, 10 * scaleFactor)
+ cc.moveTo(2 * scaleFactor, 10 * scaleFactor)
+ cc.lineTo(18 * scaleFactor, 10 * scaleFactor)
+ cc.stroke()
+ cc.draw()
+ }
+ })
+ },
})
\ No newline at end of file
diff --git a/miniprogram/pages/loginPage/loginPage.wxml b/miniprogram/pages/loginPage/loginPage.wxml
index 3ef8c48..3774606 100644
--- a/miniprogram/pages/loginPage/loginPage.wxml
+++ b/miniprogram/pages/loginPage/loginPage.wxml
@@ -1,13 +1,21 @@
-
-
+
+
+
-
+
+
+
-
+ {{nickName}}
+
- {{nickName}}
\ No newline at end of file
+
+
+
+
+
diff --git a/miniprogram/pages/loginPage/loginPage.wxss b/miniprogram/pages/loginPage/loginPage.wxss
index e3df3a5..3541c03 100644
--- a/miniprogram/pages/loginPage/loginPage.wxss
+++ b/miniprogram/pages/loginPage/loginPage.wxss
@@ -1,2 +1,2 @@
-/* pages/loginPage/loginPage.wxss */
-@import "../../style/style_sheet.wxss";
\ No newline at end of file
+/* import navi bar here*/
+@import "../../tpls/nav_bar_template/template.wxss";
\ No newline at end of file
diff --git a/miniprogram/pages/mainPage/mainPage.js b/miniprogram/pages/mainPage/mainPage.js
index b8273fe..4db71f5 100644
--- a/miniprogram/pages/mainPage/mainPage.js
+++ b/miniprogram/pages/mainPage/mainPage.js
@@ -1,75 +1,106 @@
-// miniprogram/pages/mainPage/mainPage.js
+//mainPage.js
Page({
/**
- * Page data.
+ * Data in page
*/
data: {
- // [swiper] image slider
- imgSliderUrls: [
- 'https://images.unsplash.com/photo-1558637845-c8b7ead71a3e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1189&q=80',
- 'http://img04.tooopen.com/images/20130712/tooopen_17270713.jpg',
- 'http://img04.tooopen.com/images/20130617/tooopen_21241404.jpg',
- 'http://img04.tooopen.com/images/20130701/tooopen_20083555.jpg',
- 'http://img02.tooopen.com/images/20141231/sy_78327074576.jpg'
- ]
},
- /**
- * [canvas] Load cssa logo.
- */
- // loadCanvasCssaLogo() {
- // When canvas is not supported.
- // if (!wx.createCanvasContext) {
- // getApp().onError('Feature [canvas] not supported! Please update WeChat!')
- // return
- // }
-
- // wx.getSystemInfo({
- // success(res) {
- // console.log(res)
+ onLoad() {
+ const res = wx.getSystemInfoSync()
+ if (!res) {
+ getApp().onError("wx.getSystemInfoSync() return nothing")
+ }
- // const screenWidth = res.screenWidth ?
- // res.screenWidth : res.windowWidth
- // const scaleFactor = screenWidth / 20
- // const cc = wx.createCanvasContext("cssa-logo")
+ console.warn(res.windowWidth)
+ console.warn(res.windowHeight)
- // cc.setStrokeStyle("#C00")
- // cc.setLineWidth(10)
- // cc.setLineCap("round")
- // cc.setLineJoin("round")
+ const imgHeight = 1350
+ const btnHeight = 255
+ const scaleFactor = res.windowHeight * 9 / 10 / 1350
+ const aspectRatio = 5 / 9 // 1350:750
+ const btnAspectRatio = 40 / 51 // 200:255
- // cc.rect(.5 * scaleFactor, .5 * scaleFactor, 19 * scaleFactor, 19 * scaleFactor)
- // cc.moveTo(18 * scaleFactor, 2 * scaleFactor)
- // cc.lineTo(2 * scaleFactor, 2 * scaleFactor)
- // cc.lineTo(2 * scaleFactor, 14 * scaleFactor)
- // cc.lineTo(18 * scaleFactor, 14 * scaleFactor)
- // cc.moveTo(10 * scaleFactor, 2 * scaleFactor)
- // cc.lineTo(10 * scaleFactor, 6 * scaleFactor)
- // cc.lineTo(18 * scaleFactor, 6 * scaleFactor)
- // cc.lineTo(18 * scaleFactor, 18 * scaleFactor)
- // cc.moveTo(2 * scaleFactor, 18 * scaleFactor)
- // cc.lineTo(10 * scaleFactor, 18 * scaleFactor)
- // cc.lineTo(10 * scaleFactor, 10 * scaleFactor)
- // cc.moveTo(2 * scaleFactor, 10 * scaleFactor)
- // cc.lineTo(18 * scaleFactor, 10 * scaleFactor)
- // cc.stroke()
- // cc.draw()
- // }
- // })
- // },
+ const _imgHeight = scaleFactor * imgHeight
+ const _imgWidth = _imgHeight * aspectRatio
+ const _btnHeight = scaleFactor * btnHeight
+ const _btnWidth = _btnHeight * btnAspectRatio
- /**
- * Lifecycle, called on render finished.
- */
- onReady() {
- // this.loadCanvasCssaLogo()
+ this.setData({
+ winWidth: res.windowWidth,
+ winHeight: res.windowHeight,
+ imgHeight: _imgHeight,
+ imgWidth: _imgWidth,
+ btnHeight: _btnHeight,
+ btnWidth: _btnWidth,
+ btnMarginRight: _imgWidth * 3 / 25, // 90 / 750,
+ btnMarginTop1: _imgHeight / 5, // * 270 / 1350,
+ btnMarginTop2: _imgHeight / 5 + _btnHeight * 11 / 10,
+ btnMarginTop3: _imgHeight / 5 + _btnHeight * 11 / 5,
+ btnMarginTop4: _imgHeight / 5 + _btnHeight * 11 / 10 * 3,
+ })
},
+ onClicked(event) {
+ if (!event.detail)
+ getApp().onError("evemt.detail not found!")
- /**
- * Called when an error callback was executed.
- */
- onError(msg) {
- getApp().onError(msg)
+ // console.info(event.detail)
+ const x = event.detail.x
+ const y = event.detail.y
+
+ if (this.data.winWidth - x < this.data.btnMarginRight + this.data.btnWidth
+ && this.data.winWidth - x > this.data.btnMarginRight) {
+
+ if (y < this.data.btnMarginTop2 && y > this.data.btnMarginTop1) {
+ wx.navigateTo({
+ url: '../departmentIntro/departmentIntro',
+ })
+ }
+
+ else if (y < this.data.btnMarginTop3 && y > this.data.btnMarginTop2) {
+ console.warn("Button 2!")
+ }
+
+ else if (y < this.data.btnMarginTop4 && y > this.data.btnMarginTop3) {
+ console.warn("Button 3!")
+ }
+ }
+ },
+ /* Color Ball*/
+ loadColorBall(){
+ const ctx = wx.createCanvasContext("colorBall")
+ const res = wx.getSystemInfoSync()
+ const winHeight = res.windowHeight
+ const winWidth = res.windowWidth
+ /* ball constructor */
+ var Ball = function (x, y, vx, vy, radius, color) {
+ this._x = x
+ this._y = y
+ this.x = x
+ this.y = y
+ this.vx = vx
+ this.vy = vy
+ this.radius = radius
+ this.color = color
+ }
+ // ball position
+ Ball.prototype.draw = function () {
+ ctx.beginPath()
+ ctx.arc(this.x, this.y, this.radius, 0, Math.PI * 2)
+ ctx.fillStyle = this.color
+ ctx.fill()
+ }
+ // ball move
+ Ball.prototype.run = function (t) {
+ if (this.x > canvas.width || this.y < 0) {
+ this.x = this._x
+ this.y = this._y
+ }
+ this.x += t * this.vx
+ this.y += t * this.vy
+ this.draw()
+ }
+
}
-})
\ No newline at end of file
+})
diff --git a/miniprogram/pages/mainPage/mainPage.json b/miniprogram/pages/mainPage/mainPage.json
index 8835af0..a0aefe7 100644
--- a/miniprogram/pages/mainPage/mainPage.json
+++ b/miniprogram/pages/mainPage/mainPage.json
@@ -1,3 +1,4 @@
{
- "usingComponents": {}
+ "usingComponents": {},
+ "disableScroll":true
}
\ No newline at end of file
diff --git a/miniprogram/pages/mainPage/mainPage.wxml b/miniprogram/pages/mainPage/mainPage.wxml
index f91abfa..ad0cf60 100644
--- a/miniprogram/pages/mainPage/mainPage.wxml
+++ b/miniprogram/pages/mainPage/mainPage.wxml
@@ -1,13 +1,49 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \n 主页
+
+
+
+
+
+
+
+
+
+ \n 活动
+
+
+
+
+
+
+
+
+ \n 设置
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/miniprogram/pages/mainPage/mainPage.wxss b/miniprogram/pages/mainPage/mainPage.wxss
index 4b881ca..f95fddd 100644
--- a/miniprogram/pages/mainPage/mainPage.wxss
+++ b/miniprogram/pages/mainPage/mainPage.wxss
@@ -1,2 +1,199 @@
/* miniprogram/pages/mainPage/mainPage.wxss */
-@import "../../style/style_sheet.wxss";
\ No newline at end of file
+@import "../../style/style_sheet.wxss";
+
+/**index.wxss**/
+
+page {
+ background: #f6f6f6;
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+}
+
+.userinfo, .uploader, .tunnel {
+ margin-top: 40rpx;
+ height: 140rpx;
+ width: 100%;
+ background: #fff;
+ border: 1px solid rgba(0, 0, 0, 0.1);
+ border-left: none;
+ border-right: none;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ transition: all 300ms ease;
+}
+
+.userinfo-avatar {
+ width: 100rpx;
+ height: 100rpx;
+ margin: 20rpx;
+ border-radius: 50%;
+ background-size: cover;
+ background-color: white;
+}
+
+.userinfo-avatar:after {
+ border: none;
+}
+
+.userinfo-nickname {
+ font-size: 32rpx;
+ color: #007aff;
+ background-color: white;
+ background-size: cover;
+}
+
+.userinfo-nickname::after {
+ border: none;
+}
+
+/* .uploader, .tunnel {
+ height: auto;
+ padding: 0 0 0 40rpx;
+ flex-direction: column;
+ align-items: flex-start;
+ box-sizing: border-box;
+}
+
+.uploader-text, .tunnel-text {
+ width: 100%;
+ line-height: 52px;
+ font-size: 34rpx;
+ color: #007aff;
+} */
+
+/* .uploader-container {
+ width: 100%;
+ height: 400rpx;
+ padding: 20rpx 20rpx 20rpx 0;
+ display: flex;
+ align-content: center;
+ justify-content: center;
+ box-sizing: border-box;
+ border-top: 1px solid rgba(0, 0, 0, 0.1);
+}
+
+.uploader-image {
+ width: 100%;
+ height: 360rpx;
+} */
+
+/* .tunnel {
+ padding: 0 0 0 40rpx;
+}
+
+.tunnel-text {
+ position: relative;
+ color: #222;
+ display: flex;
+ flex-direction: row;
+ align-content: center;
+ justify-content: space-between;
+ box-sizing: border-box;
+ border-top: 1px solid rgba(0, 0, 0, 0.1);
+} */
+
+/* .tunnel-text:first-child {
+ border-top: none;
+}
+
+.tunnel-switch {
+ position: absolute;
+ right: 20rpx;
+ top: -2rpx;
+}
+
+.disable {
+ color: #888;
+} */
+
+/* .service {
+ position: fixed;
+ right: 40rpx;
+ bottom: 40rpx;
+ width: 140rpx;
+ height: 140rpx;
+ border-radius: 50%;
+ background: linear-gradient(#007aff, #0063ce);
+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
+ display: flex;
+ align-content: center;
+ justify-content: center;
+ transition: all 300ms ease;
+} */
+
+.service-button {
+ position: absolute;
+ top: 40rpx;
+}
+
+.service:active {
+ box-shadow: none;
+}
+
+.request-text {
+ padding: 20rpx 0;
+ font-size: 24rpx;
+ line-height: 36rpx;
+ word-break: break-all;
+}
+
+.navbars_container{
+ position: auto;
+width: 100%;
+
+}
+
+.navbars{
+ display: flex;
+ flex-direction:space-bewtween;
+}
+
+
+.navbar{
+ width: 300rpx;
+ height: 150rpx;
+}
+
+.nav_img
+{
+ display: flex;
+ justify-content: center;
+}
+
+.nav_text
+{
+ display: flex;
+ justify-content: center;
+}
+
+.bgimg
+{
+ position:relative;
+ z-index: -900;
+ float:right;
+ top:0px;
+ left: 0px;
+}
+.btngroup
+{
+ position:absolute;
+ margin-top:260rpx;
+ align-items: center;
+}
+.upperlayer{
+ width:100% ;
+ height:90%;
+ z-index:900;
+ position:fixed;
+}
+
+.colorBall{
+ width:100%;
+ height:100%;
+ z-index:-901;
+ position:absolute;
+ top:0px;
+ left: 0px;
+}
\ No newline at end of file
diff --git a/miniprogram/tpls/nav_bar_template/template.wxml b/miniprogram/tpls/nav_bar_template/template.wxml
new file mode 100644
index 0000000..bb7154b
--- /dev/null
+++ b/miniprogram/tpls/nav_bar_template/template.wxml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+ \n 主页
+
+
+
+
+
+
+
+
+
+ \n 活动
+
+
+
+
+
+
+
+
+ \n 设置
+
+
+
+
+
\ No newline at end of file
diff --git a/miniprogram/tpls/nav_bar_template/template.wxss b/miniprogram/tpls/nav_bar_template/template.wxss
new file mode 100644
index 0000000..20b52c5
--- /dev/null
+++ b/miniprogram/tpls/nav_bar_template/template.wxss
@@ -0,0 +1,35 @@
+.navbars_container{
+ position: fixed;
+ bottom: 0;
+width: 100%;
+background-color:rgb(255,255,255);
+}
+
+.navbars{
+display: flex;
+ flex-direction:space-bewtween;
+ width: 100%;
+ height:100%;
+
+}
+
+
+.navbar{
+ /**image width: 300rpx; **/
+ margin-top: 2.5%;
+ margin-bottom: 2.5%;
+ width: 33%;
+ height: 30%;
+}
+
+.nav_img
+{
+ display: flex;
+ justify-content: center;
+}
+
+.nav_text
+{
+ display: flex;
+ justify-content: center;
+}
\ No newline at end of file