diff --git a/.gitignore b/.gitignore
index f3d35bc..52ba6aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@
# Logs
logs
*.log
+# 项目配置文件
+project.config.json
# Runtime data
pids
diff --git a/app.json b/app.json
index f68c839..9941a5f 100644
--- a/app.json
+++ b/app.json
@@ -7,11 +7,12 @@
"pages/billboards/firm/index",
"pages/billboards/park/index",
"pages/billboards/policy/index",
+ "pages/billboards/policy/policy-list/index",
"pages/topics/common/interactive/index",
"pages/topics/common/message/index",
"pages/topics/common/goodIdea/index",
"pages/article/index",
- "pages/billboards/policy/policy-list/index",
+ "pages/register/index",
"pages/user/common/myActivity/index",
"pages/user/common/myFavorite/index",
"pages/user/common/myIdea/index",
diff --git a/components/image-button/images/btn_bg.png b/components/image-button/images/btn_bg.png
new file mode 100644
index 0000000..ca30feb
Binary files /dev/null and b/components/image-button/images/btn_bg.png differ
diff --git a/components/image-button/index.js b/components/image-button/index.js
new file mode 100644
index 0000000..9300fde
--- /dev/null
+++ b/components/image-button/index.js
@@ -0,0 +1,26 @@
+// components/image-botton/index.js
+Component({
+ /**
+ * 组件的属性列表
+ */
+ properties: {
+ title: String,
+ },
+
+ /**
+ * 组件的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 组件的方法列表
+ */
+ methods: {
+ onTap () {
+ console.log('onTap')
+ this.triggerEvent('onTap')
+ }
+ }
+})
diff --git a/components/image-button/index.json b/components/image-button/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/components/image-button/index.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/components/image-button/index.wxml b/components/image-button/index.wxml
new file mode 100644
index 0000000..58bb6fe
--- /dev/null
+++ b/components/image-button/index.wxml
@@ -0,0 +1,5 @@
+
+
+
+ {{title}}
+
diff --git a/components/image-button/index.wxss b/components/image-button/index.wxss
new file mode 100644
index 0000000..4118b66
--- /dev/null
+++ b/components/image-button/index.wxss
@@ -0,0 +1,19 @@
+/* components/image-botton/index.wxss */
+.image-button {
+ width: 100%;
+ height: 50px;
+ position: relative;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ color: white;
+ font-size: 15px;
+}
+.image-btn-bg {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ z-index: -1;
+}
\ No newline at end of file
diff --git a/components/segment/index.js b/components/segment/index.js
index 186d5a9..32dc407 100644
--- a/components/segment/index.js
+++ b/components/segment/index.js
@@ -30,9 +30,9 @@ Component({
*/
methods: {
bindtap: function (e) {
- const { item } = e.currentTarget.dataset
+ const item = e.currentTarget.dataset
this.setData({
- selectedTitle: item
+ selectedTitle: item.item
})
this.triggerEvent('tapSegment', item)
},
diff --git a/components/segment/index.wxml b/components/segment/index.wxml
index 038b1f4..27bc2fa 100644
--- a/components/segment/index.wxml
+++ b/components/segment/index.wxml
@@ -4,10 +4,10 @@
diff --git a/components/segment/index.wxss b/components/segment/index.wxss
index c8cecf4..124bebd 100644
--- a/components/segment/index.wxss
+++ b/components/segment/index.wxss
@@ -18,6 +18,7 @@
display: flex;
flex-direction: column;
align-items: center;
+ transition: 0.5s all ease-in-out;
}
.title-selected {
font-size: 16px;
@@ -25,9 +26,12 @@
}
.select-line{
margin-top: 4px;
- width: 10px;
height: 2px;
border-radius: 5px;
+ transition: 0.5s all ease-in-out;
+}
+.select-line-active {
+ width: 10px;
background-color: #FA4646;
}
diff --git a/images/billboard/2.png b/images/billboard/2.png
index 1eb77cb..1a44559 100644
Binary files a/images/billboard/2.png and b/images/billboard/2.png differ
diff --git a/images/common/btn_bg_disable.png b/images/common/btn_bg_disable.png
new file mode 100644
index 0000000..926f413
Binary files /dev/null and b/images/common/btn_bg_disable.png differ
diff --git a/images/common/close.png b/images/common/close.png
new file mode 100644
index 0000000..8c3c953
Binary files /dev/null and b/images/common/close.png differ
diff --git a/pages/article/index.js b/pages/article/index.js
index 82ebe69..013e142 100644
--- a/pages/article/index.js
+++ b/pages/article/index.js
@@ -5,10 +5,385 @@ Page({
* 页面的初始数据
*/
data: {
- nodes: '
我是内容
',
+ nodes: `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 建 党 节
+
+
+
+ 1921.7 ~ 2019.7
+
+
+ 筚路蓝缕,砥砺前行
+
+
+ 初心不忘,迈向复兴
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 98年,对于一个人,也许很漫长;
+
+
+ 对于一个国家,弹指一挥间;
+
+
+ 对于一个政党,恰是风华正茂!
+
+
+ 今年,党的98岁生日,
+
+
+ 热烈庆祝中国共产党98周年快乐!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 作为社会主义接班人,我们本应了解一些党的基本知识。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 最早提出“中国共产党”这一名称的是蔡和森。1920年8月13日和9月16日,正在留法勤工俭学的他,在给毛泽东写的两封信中,详细地研讨了共产党问题,提出:“先要组织党——共产党,因为它是革命运动的发动者、宣传者、先锋队、作战部。”
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 他在对西欧各国共产党特别是俄国共产党考察的基础上,提出了具体的建党步骤,其中包括“明目张胆正式成立一个中国共产党”。
+
+
+
+
+
+ 在此前后,陈独秀在上海,李大钊、张申府在北京也通过信函讨论了党的名称问题,决定采用“共产党”作为中国无产阶级政党的名称。
+
+
+
+
+
+
+
+
+
+
+
+ 九十七年前的盛夏七月,毛泽东、陈独秀和李大钊等中国第一代马克思主义革命家,在上海和嘉兴召开了中国共产党第一次代表大会——中国共产党正式成立,伟大的革命、发展征程就此开启。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 在战争时期,中共一大的召开日期难以考证。因此,毛泽东在著名文论《论持久战》中首次提出以七月一日作为党的生日。
+
+
+
+
+
+ 建国之后,经过党史工作者的细致考证,确认中共一大的召开时间是 1921 年 7 月 23 日,但 7 月 1 日的建党节传统深入人心,一直延续了下来。
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 第一,坚持党的基本路线。
+
+
+ 第二,坚持解放思想,实事求是,与时俱进。
+
+
+ 第三,坚持全心全意为人民服务。
+
+
+ 第四,坚持民主集中制。
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 九十八年,峥嵘岁月,
+
+
+ 九十八年,辉煌历程。
+
+
+
+
+
+ 今天的我们挥舞着前辈们的伟大旗帜 ,追随着那从未熄灭的明灯,冲锋陷阵,高扬风帆,向着那彼岸,向着那未来更加执着而勇敢地前进, 前进 ,前进!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 排版丨135小编
+
+
+ 文案丨来源网络(侵删)
+
+
+ 图片丨来源网络(侵删)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
`,
unStar: '/images/common/star.png',
star: '/images/common/star_light.png',
isStar: true,
+ showBtn: true,
},
onClickCollect () {
this.setData({
@@ -16,6 +391,9 @@ Page({
})
// 收藏功能
},
+ onlineSubmit () {
+ console.log('在线报名')
+ },
/**
* 生命周期函数--监听页面加载
*/
diff --git a/pages/article/index.json b/pages/article/index.json
index 8835af0..ce7a4b2 100644
--- a/pages/article/index.json
+++ b/pages/article/index.json
@@ -1,3 +1,5 @@
{
- "usingComponents": {}
+ "usingComponents": {
+ "e-ibutton": "/components/image-button/index"
+ }
}
\ No newline at end of file
diff --git a/pages/article/index.wxml b/pages/article/index.wxml
index 857d822..804237d 100644
--- a/pages/article/index.wxml
+++ b/pages/article/index.wxml
@@ -8,7 +8,10 @@
-
-
+
+
+
+
diff --git a/pages/article/index.wxss b/pages/article/index.wxss
index ba94b7a..8b6383e 100644
--- a/pages/article/index.wxss
+++ b/pages/article/index.wxss
@@ -1,6 +1,4 @@
/* pages/article/index.wxss */
-.container {
-}
.page_hd {
padding: 0 15px;
display: flex;
@@ -30,4 +28,19 @@
padding: 0 10px;
width: 20px;
height: 20px;
+}
+.page_footer {
+ background-color: white;
+ border-top: 1px solid #f7f7f7;
+ padding: 10px 20px 20px 20px;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ position: fixed;
+}
+.page_bd {
+ padding: 0 10px;
+}
+.page_bd_short {
+ margin-bottom: 81px;
}
\ No newline at end of file
diff --git a/pages/billboards/firm/index.js b/pages/billboards/firm/index.js
index 74b0fb4..bf30769 100644
--- a/pages/billboards/firm/index.js
+++ b/pages/billboards/firm/index.js
@@ -5,7 +5,14 @@ Page({
* 页面的初始数据
*/
data: {
-
+ navs: [
+ "千人计划",
+ "泰山学者",
+ "泰山学者",
+ "泰山学者",
+ "泰山学者",
+ "泰山学者",
+ ]
},
/**
@@ -13,6 +20,9 @@ Page({
*/
onLoad: function (options) {
+ },
+ tapSegemnt (e) {
+ console.log(e.detail)
},
clickCardItem(e) {
console.log(e.detail)
diff --git a/pages/billboards/firm/index.json b/pages/billboards/firm/index.json
index 0b75386..f75e0d9 100644
--- a/pages/billboards/firm/index.json
+++ b/pages/billboards/firm/index.json
@@ -1,6 +1,7 @@
{
"navigationBarTitleText": "重点企业",
"usingComponents": {
- "e-card": "/components/card/index"
+ "e-card": "/components/card/index",
+ "e-segment": "/components/segment/index"
}
}
\ No newline at end of file
diff --git a/pages/billboards/firm/index.wxml b/pages/billboards/firm/index.wxml
index c4c548a..6d048ce 100644
--- a/pages/billboards/firm/index.wxml
+++ b/pages/billboards/firm/index.wxml
@@ -1,8 +1,13 @@
-
-
-
+
+
+
+
+
+
+
+
diff --git a/pages/billboards/firm/index.wxss b/pages/billboards/firm/index.wxss
index 6e378b5..665f520 100644
--- a/pages/billboards/firm/index.wxss
+++ b/pages/billboards/firm/index.wxss
@@ -1,10 +1,24 @@
/* pages/billboards/firm/index.wxss */
.container {
+
+}
+.page_hd {
+ position: fixed;
+ border-bottom: 1px solid #f7f7f7;
+ top: 0;
+ height: 48px;
+ width: 100%;
+ left: 0;
+ z-index: 10;
+ background-color: white;
+}
+.page_bd {
padding: 0 3vw;
display: flex;
flex-direction: row;
justify-content: space-between;
flex-wrap: wrap;
+ margin-top: 50px;
}
.e_card {
width: 45vw;
diff --git a/pages/billboards/park/index.json b/pages/billboards/park/index.json
index bc5718d..d45d7fe 100644
--- a/pages/billboards/park/index.json
+++ b/pages/billboards/park/index.json
@@ -1,5 +1,5 @@
{
- "navigationBarTitleText": "创业园区",
+ "navigationBarTitleText": "平台载体",
"usingComponents": {
"e-card": "/components/card/index"
}
diff --git a/pages/billboards/policy/components/tags/index.wxml b/pages/billboards/policy/components/tags/index.wxml
index f826156..e514a24 100644
--- a/pages/billboards/policy/components/tags/index.wxml
+++ b/pages/billboards/policy/components/tags/index.wxml
@@ -5,5 +5,5 @@
人才政策
- 全部
+ 全部
diff --git a/pages/billboards/policy/index.wxss b/pages/billboards/policy/index.wxss
index 778b62f..bb149a2 100644
--- a/pages/billboards/policy/index.wxss
+++ b/pages/billboards/policy/index.wxss
@@ -1 +1,10 @@
-/* pages/billboards/policy/index.wxss */
\ No newline at end of file
+/* pages/billboards/policy/index.wxss */
+.page_hd .weui-search-bar {
+ background-color: white;
+}
+.page_hd .weui-search-bar__label {
+ background-color: #EDEDED;
+}
+.page_hd .weui-search-bar__form {
+ background-color: #EDEDED;
+}
\ No newline at end of file
diff --git a/pages/billboards/policy/policy-list/index.js b/pages/billboards/policy/policy-list/index.js
index d9d4f1d..79670b6 100644
--- a/pages/billboards/policy/policy-list/index.js
+++ b/pages/billboards/policy/policy-list/index.js
@@ -5,7 +5,44 @@ Page({
* 页面的初始数据
*/
data: {
-
+ navSelectIndex: 0,
+ nodes: `
+
+
+
+
+
+
+ 当清晨的一缕阳光透过窗帘上的空隙映照在沉睡的脸庞时,微微张开的双眼朦胧地注视着周遭的一切,新的一天悄然而至。
+
+
+
+
+
+
+`,
+ navs: [
+ "千人计划",
+ "泰山学者",
+ "泰山学者",
+ "泰山学者",
+ "泰山学者",
+ "泰山学者",
+ ]
},
/**
@@ -14,6 +51,9 @@ Page({
onLoad: function (options) {
console.log(options)
const {index} = options
+ this.setData({
+ navSelectIndex: index
+ })
},
/**
diff --git a/pages/billboards/policy/policy-list/index.json b/pages/billboards/policy/policy-list/index.json
index 8835af0..4107059 100644
--- a/pages/billboards/policy/policy-list/index.json
+++ b/pages/billboards/policy/policy-list/index.json
@@ -1,3 +1,6 @@
{
- "usingComponents": {}
+ "navigationBarTitleText": "人才政策",
+ "usingComponents": {
+ "e-segment": "/components/segment/index"
+ }
}
\ No newline at end of file
diff --git a/pages/billboards/policy/policy-list/index.wxml b/pages/billboards/policy/policy-list/index.wxml
index b8330ee..19a680d 100644
--- a/pages/billboards/policy/policy-list/index.wxml
+++ b/pages/billboards/policy/policy-list/index.wxml
@@ -1,2 +1,9 @@
-pages/billboards/policy/policy-list/index.wxml
+
+
+
+
+
+
+
+
diff --git a/pages/billboards/policy/policy-list/index.wxss b/pages/billboards/policy/policy-list/index.wxss
index e1a2d7c..1898fc9 100644
--- a/pages/billboards/policy/policy-list/index.wxss
+++ b/pages/billboards/policy/policy-list/index.wxss
@@ -1 +1,15 @@
-/* pages/billboards/policy/policy-list/index.wxss */
\ No newline at end of file
+/* pages/billboards/policy/policy-list/index.wxss */
+.page_hd {
+ position: fixed;
+ border-bottom: 1px solid #f7f7f7;
+ top: 0;
+ height: 48px;
+ width: 100%;
+ left: 0;
+ z-index: 10;
+ background-color: white;
+}
+.page_bd {
+ padding: 10px 10px 0 10px;
+ margin-top: 48px;
+}
\ No newline at end of file
diff --git a/pages/home/index.js b/pages/home/index.js
index 9755598..a6c515d 100644
--- a/pages/home/index.js
+++ b/pages/home/index.js
@@ -38,7 +38,10 @@ Page({
},
clickListItem (e) {
console.log(e.detail)
- this.gotoArticePage(e.detail.id)
+ // this.gotoArticePage(e.detail.id)
+ wx.redirectTo({
+ url: '/pages/register/index',
+ })
},
gotoArticePage (id) {
wx.navigateTo({
diff --git a/pages/register/index.js b/pages/register/index.js
new file mode 100644
index 0000000..c92bd4d
--- /dev/null
+++ b/pages/register/index.js
@@ -0,0 +1,57 @@
+// pages/register/index.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ disabled: false, // 是否允许点击注册
+ rules: [
+ {
+ name: 'name',
+ rules: { required: true, message: '姓名必填' },
+ }, { // 多个规则
+ name: 'mobile',
+ rules: [{ required: true, message: '手机号必填' }, { mobile: true, message: '手机号格式不对' }],
+ }, {
+ name: 'vcode',
+ rules: { required: true, message: '验证码必填' },
+ },
+ ],
+ formData: {
+
+ }
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+
+ },
+ formInputChange (e) {
+ const { field } = e.currentTarget.dataset
+ this.setData({
+ [`formData.${field}`]: e.detail.value
+ })
+ },
+ submitClick () {
+ this.selectComponent('#form').validate((valid, errors) => {
+ console.log('valid', valid, errors)
+ if (!valid) {
+ const firstError = Object.keys(errors)
+ if (firstError.length) {
+ const error = errors[firstError[0]].message
+ wx.showToast({
+ icon: "none",
+ title: error
+ })
+ }
+ } else {
+ wx.showToast({
+ title: '校验通过'
+ })
+ }
+ })
+ }
+})
\ No newline at end of file
diff --git a/pages/register/index.json b/pages/register/index.json
new file mode 100644
index 0000000..ced49c2
--- /dev/null
+++ b/pages/register/index.json
@@ -0,0 +1,9 @@
+{
+ "usingComponents": {
+ "mp-cell": "/components/weui/cell/cell",
+ "mp-cells": "/components/weui/cells/cells",
+ "mp-checkbox": "/components/weui/checkbox/checkbox",
+ "mp-form": "/components/weui/form/form",
+ "e-ibotton": "/components/image-button/index"
+ }
+}
\ No newline at end of file
diff --git a/pages/register/index.wxml b/pages/register/index.wxml
new file mode 100644
index 0000000..a537af9
--- /dev/null
+++ b/pages/register/index.wxml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 获取验证码
+
+
+
+
+
+
+
diff --git a/pages/register/index.wxss b/pages/register/index.wxss
new file mode 100644
index 0000000..c29235d
--- /dev/null
+++ b/pages/register/index.wxss
@@ -0,0 +1,35 @@
+/* pages/register/index.wxss */
+
+.container {
+ position: relative;
+ padding: 0 20px;
+ display: flex;
+ height: 100vh;
+ justify-items: center;
+ align-items: center;
+}
+.register_cancel {
+ position: absolute;
+ padding: 10px;
+ width: 30px;
+ height: 30px;
+ top: 0;
+ right: 20px;
+}
+.page_bd {
+ height: 60vh;
+ width: 100%;
+}
+
+.register_form .weui-cells__title {
+ font-size: 19px;
+ color: black;
+}
+.register_form .weui-cell__icon {
+ padding-right:5px;
+ width: 25px;
+ height: 30px;
+}
+.register_form .weui-cells::before {
+ border-top: 0px solid white;
+}
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index 5f6981a..213eff5 100644
--- a/project.config.json
+++ b/project.config.json
@@ -4,7 +4,7 @@
"ignore": []
},
"setting": {
- "urlCheck": true,
+ "urlCheck": false,
"es6": true,
"enhance": false,
"postcss": true,
@@ -50,7 +50,7 @@
"list": []
},
"miniprogram": {
- "current": 4,
+ "current": 5,
"list": [
{
"id": -1,
@@ -84,6 +84,13 @@
"id": -1,
"name": "policy-list",
"pathName": "pages/billboards/policy/policy-list/index",
+ "query": "",
+ "scene": null
+ },
+ {
+ "id": -1,
+ "name": "Register",
+ "pathName": "pages/register/index",
"scene": null
}
]