diff --git a/project.config.json b/project.config.json new file mode 100644 index 0000000..98b0c3d --- /dev/null +++ b/project.config.json @@ -0,0 +1,28 @@ +{ + "appid": "wxaf87b420b87e2d79", + "compileType": "miniprogram", + "libVersion": "3.4.6", + "packOptions": { + "ignore": [], + "include": [] + }, + "setting": { + "coverView": true, + "es6": true, + "postcss": true, + "minified": true, + "enhance": true, + "showShadowRootInWxmlPanel": true, + "packNpmRelationList": [], + "babelSetting": { + "ignore": [], + "disablePlugins": [], + "outputPath": "" + } + }, + "condition": {}, + "editorSetting": { + "tabIndent": "insertSpaces", + "tabSize": 2 + } +} \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json new file mode 100644 index 0000000..b74fac7 --- /dev/null +++ b/project.private.config.json @@ -0,0 +1,7 @@ +{ + "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", + "projectname": "epmet-wx-pa", + "setting": { + "compileHotReLoad": true + } +} \ No newline at end of file diff --git a/src/assets/css/index.less b/src/assets/css/index.less index 9abab2f..48fda0b 100644 --- a/src/assets/css/index.less +++ b/src/assets/css/index.less @@ -56,6 +56,9 @@ body #app { &-y{ flex-direction: column; } + &-x{ + flex-direction: row; +} &-center1{ justify-content: center; } @@ -65,23 +68,33 @@ body #app { &-center3{ align-items: flex-start; } + // &-mean{ justify-content: space-around; } + //两端对齐 &-end{ justify-content: space-between; } + //水平轴右对齐 &-fend{ justify-content: flex-end; } + // 允许子元素换行 &-wrap{ flex-wrap: wrap; } } +.z{ + z-index: 5; +} .m{ &-left12{ margin-left: 12px; } + &-left012{ + margin-left: -5px; + } &-left18{ margin-left: 18px; } @@ -100,9 +113,13 @@ body #app { &-bottom5{ margin-bottom: 5px; } + &-bottom10{ + margin-bottom: 10px; + } &-right10{ margin-right: 10px; } + &-top15{ margin-top: 15px; } @@ -131,7 +148,7 @@ body #app { padding: 12px; } } - +//固定在底部左侧。背景颜色为白色,全部窗口 .bto_btn{ position: fixed; bottom: 5px; @@ -142,7 +159,7 @@ body #app { box-sizing: border-box; text-align: right; } - +// 相对定位 .required{ position: relative; } @@ -217,4 +234,7 @@ body #app { .content{ width: calc(100% - 20px); margin: 0 auto; +} +.back_color{ + background: #F7F7F7; } \ No newline at end of file diff --git a/src/assets/images/discusion/1.png b/src/assets/images/discusion/1.png new file mode 100644 index 0000000..aa0be84 Binary files /dev/null and b/src/assets/images/discusion/1.png differ diff --git a/src/assets/images/discusion/2.png b/src/assets/images/discusion/2.png new file mode 100644 index 0000000..9d7ce04 Binary files /dev/null and b/src/assets/images/discusion/2.png differ diff --git a/src/assets/images/discusion/3.png b/src/assets/images/discusion/3.png new file mode 100644 index 0000000..aa0be84 Binary files /dev/null and b/src/assets/images/discusion/3.png differ diff --git a/src/assets/images/discusion/VS.png b/src/assets/images/discusion/VS.png new file mode 100644 index 0000000..e190356 Binary files /dev/null and b/src/assets/images/discusion/VS.png differ diff --git a/src/assets/images/discusion/c-l.png b/src/assets/images/discusion/c-l.png new file mode 100644 index 0000000..b7ebd39 Binary files /dev/null and b/src/assets/images/discusion/c-l.png differ diff --git a/src/assets/images/discusion/f-l.png b/src/assets/images/discusion/f-l.png new file mode 100644 index 0000000..655199e Binary files /dev/null and b/src/assets/images/discusion/f-l.png differ diff --git a/src/assets/images/discusion/f-y.png b/src/assets/images/discusion/f-y.png new file mode 100644 index 0000000..f116c51 Binary files /dev/null and b/src/assets/images/discusion/f-y.png differ diff --git a/src/assets/images/discusion/h-l.png b/src/assets/images/discusion/h-l.png new file mode 100644 index 0000000..631d183 Binary files /dev/null and b/src/assets/images/discusion/h-l.png differ diff --git a/src/assets/images/discusion/h-y.png b/src/assets/images/discusion/h-y.png new file mode 100644 index 0000000..109a180 Binary files /dev/null and b/src/assets/images/discusion/h-y.png differ diff --git a/src/assets/images/discusion/z-y.png b/src/assets/images/discusion/z-y.png new file mode 100644 index 0000000..aedc44e Binary files /dev/null and b/src/assets/images/discusion/z-y.png differ diff --git a/src/router/router.config.js b/src/router/router.config.js index cd1f57b..62db098 100644 --- a/src/router/router.config.js +++ b/src/router/router.config.js @@ -88,10 +88,23 @@ export const constantRouterMap = [ name: 'activity', component: () => import('@/views/activity'), meta: { title: '社区活动', keepAlive: false } - },{ + }, + { + path: '/discussion', + name: 'discussion', + component: () => import('@/views/discussion'), + meta: { title: '社区议事', keepAlive: false } + }, + { path: '/activityDetail', name: 'activityDetail', component: () => import('@/views/activity/detail'), meta: { title: '活动详情', keepAlive: false } + }, + { + path: '/discusionDetail', + name: 'discusionDetail', + component: () => import('@/views/discussion/discusionDetail'), + meta: { title: '详情', keepAlive: false } } ] diff --git a/src/views/discussion/discusionDetail.vue b/src/views/discussion/discusionDetail.vue new file mode 100644 index 0000000..241b1b5 --- /dev/null +++ b/src/views/discussion/discusionDetail.vue @@ -0,0 +1,221 @@ + + + + + diff --git a/src/views/discussion/index.vue b/src/views/discussion/index.vue new file mode 100644 index 0000000..f78e8cc --- /dev/null +++ b/src/views/discussion/index.vue @@ -0,0 +1,179 @@ + + + + + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 6072fd1..c0e915c 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -78,7 +78,7 @@
居民议事 - 更多 + 更多
@@ -185,6 +185,7 @@ export default { } } else { this.$router.push({ path: `/${path}` }) + console.log("1111"+path); } } },