xcx hace 4 años
padre
commit
3c5b4ab9a3

+ 1
- 5
src/app.config.js Ver fichero

1
 export default {
1
 export default {
2
   pages: [
2
   pages: [
3
-    'pages/HuiShengHuo/ActivityList/ActivityDetail/index', // 荟生活-活动列表-活动详情
4
-
5
     'pages/HuiShengHuo/index', // 荟生活
3
     'pages/HuiShengHuo/index', // 荟生活
6
     'pages/HuiShengHuo/ActivityList/index', // 荟生活-活动列表
4
     'pages/HuiShengHuo/ActivityList/index', // 荟生活-活动列表
5
+    'pages/HuiShengHuo/ActivityList/ActivityDetail/index', // 荟生活-活动列表-活动详情
7
     'pages/HuiShengHuo/ActivityList/ActivityDetail/JoinIn/index', // 荟生活-活动列表-活动详情-报名
6
     'pages/HuiShengHuo/ActivityList/ActivityDetail/JoinIn/index', // 荟生活-活动列表-活动详情-报名
8
-    'pages/HuiShengHuo/ActivityList/ActivityDetail/Vote/index', // 荟生活-活动列表-活动详情-投票
9
     'pages/HuiShengHuo/PhotoList/index', // 荟生活-照片列表
7
     'pages/HuiShengHuo/PhotoList/index', // 荟生活-照片列表
10
     'pages/HuiShengHuo/PhotoList/PhotoDetail/index', // 荟生活-照片列表-照片详情
8
     'pages/HuiShengHuo/PhotoList/PhotoDetail/index', // 荟生活-照片列表-照片详情
11
 
9
 
12
     'pages/HuiQuanYi/index', // 荟权益
10
     'pages/HuiQuanYi/index', // 荟权益
13
-    'pages/HuiQuanYi/NoticeBoard/index', // 荟权益-公告栏
14
-    'pages/HuiQuanYi/NoticeBoard/NoticeDetail/index', // 荟权益-公告栏-详情
15
     'pages/HuiQuanYi/OwnersNews/index', // 荟权益-业主资讯
11
     'pages/HuiQuanYi/OwnersNews/index', // 荟权益-业主资讯
16
     'pages/HuiQuanYi/OwnersNews/NewsDetail/index', // 荟权益-业主资讯-详情
12
     'pages/HuiQuanYi/OwnersNews/NewsDetail/index', // 荟权益-业主资讯-详情
17
 
13
 

+ 23
- 7
src/iconfont.scss Ver fichero

1
 @font-face {font-family: "iconfont";
1
 @font-face {font-family: "iconfont";
2
-  src: url('//at.alicdn.com/t/font_1998922_g8nkn1klezi.eot?t=1597115213858'); /* IE9 */
3
-  src: url('//at.alicdn.com/t/font_1998922_g8nkn1klezi.eot?t=1597115213858#iefix') format('embedded-opentype'), /* IE6-IE8 */
4
-  url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAALsAAsAAAAABtwAAAKfAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDBgqBPIEvATYCJAMMCwgABCAFhG0HPxv+BSMR9mLuCZD95QE9RLoneIYmThm2YfE2B8GHbdBGDqNFTVOubfnRPGyk/otisEzH9zmCpzV+83b37qskSSrQzTwRuiZIjRAJRaqIhHwBMHSurbFSIHUgN5H+DlpR0UcCLTa37Gw3IyIUn+Q8+H2+T1rCl14IexzjFhgQlkHkfLD5zMHaawOTITU+z+X0JtCB3FXfspzmGH7UCzAOKMC9MIqsQAIOQDuW1zUpT7xBr+4TaDdmXmwedh/WqmDLAnGbrl3Q2ksril9rFeqZvUU8VmlND9MzHpWfj7+r0UpSZWzt/qtbLlv/Q89Zo9OakCHA4QoZ8yjE2dnycVn4XNZuLuuttSKkq3JNU6oza/3RP14iaqy7E0xDJfGDlBP8+IAEMqj71WWso+zgDwgxEsnD5JP3NR+P33WbCaP4mXWNNBm9miEXDxObPpL0yfUCgJ9maz/AvJ1aEf+E2gKXO74anPGHXt6qupQZqbxcdturhFyUJEw/U0qQj+bZKOlWk76gkxb6nRc6LjzKGVHrtYC3ze+BZJOCi9L6u0hgfRrkQMl0zJNLopbqIpqNIIIJUAYxDVi834fj1iF0P6HV0IFoi9EWWatxsrDzqHRYi1qrdWg3Z9vhDgPuyKK0YdZdgtDrCZJuT5H1ek4W9j0qw/6j1hsZ7Y4Gd2aH3wbZBJ1iBP8HCrwn4VNb9d4xn6uTrq7k3ygH5aCtmmFtxB3lig3HJ3eqCZLwBgN5DNeVoQjPGLSaVEtf12nuRVXgzViToFOMwP8BBd6THq129P475nN1siKaKr5RDpoctCoNghzNO0r0K88cn9xRTSAJb2AgQVx5mUGZnzVj0Mp0oFh6NR2WsObqeetmv2PQbtgZ+ZIiR0E+3e7pNpkpyqdQntQYAA==') format('woff2'),
5
-  url('//at.alicdn.com/t/font_1998922_g8nkn1klezi.woff?t=1597115213858') format('woff'),
6
-  url('//at.alicdn.com/t/font_1998922_g8nkn1klezi.ttf?t=1597115213858') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
7
-  url('//at.alicdn.com/t/font_1998922_g8nkn1klezi.svg?t=1597115213858#iconfont') format('svg'); /* iOS 4.1- */
2
+  src: url('//at.alicdn.com/t/font_1998922_px03xetq40o.eot?t=1597199692796'); /* IE9 */
3
+  src: url('//at.alicdn.com/t/font_1998922_px03xetq40o.eot?t=1597199692796#iefix') format('embedded-opentype'), /* IE6-IE8 */
4
+  url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAARkAAsAAAAACUgAAAQYAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDXgqFDIQ8ATYCJAMcCxAABCAFhG0HahseCBGVnGnIfmryIDGIJhYQ8a1gyAiCg/4fJAgRYMAAAgyl5OFp7X/nzswK4hI9mTTTTCLzG2LSCE2rhS7ebMEb+V2u5ZfZrlCH7uddAVXZHW5yOcrNZvMwvk53fIUE8q1wnf9xNvFgtaUTo4EEIUrt48S/dH59MA+X4P//71XNmPjBsq49i8teg4I54QAFKOne2lOyFqTYExAt6MEgyOMPDttF3OasV36ZQH+TLRRr3Xx8Ka0CzgrEwaSEKEpbMCodWGg1dcONRVxVadO5dKnnivj5+C0IDkmVwYWbD7jGUlZ2+uJ9emWv0n7jiJazw7qNjIUoxOlG51E5SS6U9Q8Os9iOwVpJ3c0gIhJKckiJeF/So9gLq2EwqiNUiun/eTJR05QDVfLuVE2nTxBBJ0JUdKGIQpeDSHQliJrv+00yaJh68AbpB8QE27QIKNNJfDQJMWjQ8IHUgQOHDRNojCyBfgD4IuSPcQAMO37CL6Yg9MMlvmOh0tJN44Dlqsg+gv63+PNG37ieYP2xt26HoEQRjN0dFNvbrHTfXzXQoniXoF/tG8qh9t9u7lXo3bqluDJwp6pf6XGOw8hJGKiaa1bI4/ubZyoVMba3crZFWcb1tcxXKZmanQPKBwPH7H7m8wsY6+T8+3niRjY/82/8+9rgF4btpqYyJsr4h9sJ+kS6/fS6MlG4yV2ZsvzRS3t31FrDIBdedHD/D/2XEuYxdNE+d+/FmxoXR03MOy6uJ8pdLaQ5O+vAqWliB2VqNnpcPv8y1uCZT6XZA+y0tbT8ZLG93V/2VSauolJaena+MO7eE97D6AfeVdvvX40ktSOX64sM0jEW0XeESrN9FPf4Js8h9VB9aBOYZ9UkbtinNrPJC92gej5g2LuupuZGlS3lxr6CrMxC5V58yuFy2W3ZxjG9w6CHnMsmkJ+mBXq3TmUjg0kczmoJST6VhZomevr8F1MILjvrB9HG4H87oAOfgg5dqcEeKpZLtRKDRT+MaOBMCSVgaoo/nLQINBbk8iT0R0v8Jt7h/pZTjxpcTmiNyiBpTIKsNRNfyAuhMsAiqLVWQH8LnN4+wAhkRpQf5ntSIAz1DMlgLyAb6h1fyL9QGe0fakODDv3tjJ0HDjA7kpYPCRPGHNIJqEy3Yi28LCuvUdo6obxEMO6RjIqA73jlzCm2SEtcYoYyYBYgSDdworwO61pDR7rEjJ2Cueu7rmj6IifTTW/ZGgQlGMqB1ARQMlpLsPVsufL915Bk1RLUMTDgvoeIobYHPoc3AH+qbAcNPMp+Y0gKMCb00wSiNcCJakc1Smqgaz6uhDLMUUyId/pcbZEYqnS2VzfXeQP6gw82UUgzLMdL/z5UUtuxTdqFsVLEFGqhyM/kZayfl74jVavaEawtKVlwrwc=') format('woff2'),
5
+  url('//at.alicdn.com/t/font_1998922_px03xetq40o.woff?t=1597199692796') format('woff'),
6
+  url('//at.alicdn.com/t/font_1998922_px03xetq40o.ttf?t=1597199692796') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
7
+  url('//at.alicdn.com/t/font_1998922_px03xetq40o.svg?t=1597199692796#iconfont') format('svg'); /* iOS 4.1- */
8
 }
8
 }
9
 
9
 
10
 .iconfont {
10
 .iconfont {
15
   -moz-osx-font-smoothing: grayscale;
15
   -moz-osx-font-smoothing: grayscale;
16
 }
16
 }
17
 
17
 
18
+.iconweigouxuan:before {
19
+  content: "\e623";
20
+}
21
+
22
+.iconxianshi:before {
23
+  content: "\e673";
24
+}
25
+
26
+.icongouxuan:before {
27
+  content: "\e7c2";
28
+}
29
+
30
+.iconshijian:before {
31
+  content: "\e65c";
32
+}
33
+
18
 .iconguanbi:before {
34
 .iconguanbi:before {
19
   content: "\e639";
35
   content: "\e639";
20
 }
36
 }
21
 
37
 
22
 .iconjiantouright:before {
38
 .iconjiantouright:before {
23
   content: "\e67b";
39
   content: "\e67b";
24
-}
40
+}

+ 39
- 5
src/pages/HuiAiXin/EnergyStory/index.vue Ver fichero

1
 <template>
1
 <template>
2
-  <view class="page">
3
-    正能量事迹
2
+  <view class="page ZhengNengLiangShiJi">
3
+    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh">
4
+      <view class="Container">
5
+
6
+        <!-- 标题 -->
7
+        <view class="Title">
8
+          <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/zhengnengliangshiji.png"></image>
9
+        </view>
10
+
11
+        <!-- 列表 -->
12
+        <view class="List">
13
+          <navigator v-for="(item, index) in 10" :key="index" url="./EnergyStoryDetail/index" hover-class="other-navigator-hover" class="Item flex-h">
14
+            <view class="flex-item">
15
+              <text>事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题事迹标题</text>
16
+              <text>副标题</text>
17
+              <text>来源</text>
18
+            </view>
19
+            <view class="Img">
20
+              <view></view>
21
+            </view>
22
+          </navigator>
23
+        </view>
24
+
25
+      </view>
26
+    </ScrollY>
4
   </view>
27
   </view>
5
 </template>
28
 </template>
6
 
29
 
7
 <script>
30
 <script>
8
-
31
+import ScrollY from '../../../components/ScrollY/index'
9
 export default {
32
 export default {
10
-  name: 'EnergyStory',
33
+  name: 'ZhengNengLiangShiJi',
11
   data () {
34
   data () {
12
     return {
35
     return {
13
-
36
+      IsRefreshing: false,
37
+      DataLock: false
14
     }
38
     }
15
   },
39
   },
16
   components: {
40
   components: {
41
+    ScrollY
17
   },
42
   },
18
   created () {
43
   created () {
19
     this.Init()
44
     this.Init()
20
   },
45
   },
21
   methods: {
46
   methods: {
22
     Init () {
47
     Init () {
48
+    },
49
+    Refresh (e) {
50
+      if (this.DataLock) return
51
+      this.DataLock = true
52
+      this.IsRefreshing = true
53
+      setTimeout(() => {
54
+        this.IsRefreshing = false
55
+        this.DataLock = false
56
+      }, 1000)
23
     }
57
     }
24
   }
58
   }
25
 }
59
 }

+ 62
- 2
src/pages/HuiAiXin/EnergyStory/page.scss Ver fichero

1
-.page {
1
+.page.ZhengNengLiangShiJi {
2
   width: 100%;
2
   width: 100%;
3
-}
3
+  height: 100%;
4
+  background: #fff;
5
+  .Container {
6
+    > .Title {
7
+      margin-top: 40px;
8
+      > image {
9
+        height: 44px;
10
+        margin-left: 20px;
11
+      }
12
+    }
13
+    > .List {
14
+      padding: 0 20px;
15
+      > .Item {
16
+        padding: 40px 0;
17
+        border-bottom: 2px solid #f5f5f5;
18
+        > .flex-item {
19
+          margin-right: 20px;
20
+          > text {
21
+            display: block;
22
+            font-size: 28px;
23
+            line-height: 40px;
24
+            overflow: hidden;
25
+            margin-top: 6px;
26
+            &:nth-child(1) {
27
+              text-overflow: ellipsis;
28
+              display: -webkit-box;
29
+              -webkit-box-orient: vertical;
30
+              -webkit-line-clamp: 2;
31
+              margin-top: 0;
32
+            }
33
+            &:nth-child(2) {
34
+              color: #666;
35
+              font-size: 24px;
36
+              white-space: nowrap;
37
+              text-overflow: ellipsis;
38
+            }
39
+            &:nth-child(3) {
40
+              color: #fe4e45;
41
+              font-size: 24px;
42
+              white-space: nowrap;
43
+              text-overflow: ellipsis;
44
+            }
45
+          }
46
+        }
47
+        > .Img {
48
+          width: 34%;
49
+          margin-right: 20px;
50
+          position: relative;
51
+          overflow: hidden;
52
+          > view {
53
+            width: 100%;
54
+            padding-bottom: 70%;
55
+            background: #ccc;
56
+            position: relative;
57
+            overflow: hidden;
58
+          }
59
+        }
60
+      }
61
+    }
62
+  }
63
+}

+ 33
- 5
src/pages/HuiAiXin/StarOwner/index.vue Ver fichero

1
 <template>
1
 <template>
2
-  <view class="page">
3
-    明星业主
2
+  <view class="page MingXingYeZhu">
3
+    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh">
4
+      <view class="Container">
5
+
6
+        <!-- 标题 -->
7
+        <view class="Title">
8
+          <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/mingxingyezhu.png"></image>
9
+        </view>
10
+
11
+        <!-- 列表 -->
12
+        <view class="List">
13
+          <navigator v-for="(item, index) in 10" :key="index" url="./StarOwnerDetail/index" hover-class="other-navigator-hover" class="Item">
14
+            <view class="Img"></view>
15
+            <text class="Info">业主家庭名称</text>
16
+          </navigator>
17
+        </view>
18
+
19
+      </view>
20
+    </ScrollY>
4
   </view>
21
   </view>
5
 </template>
22
 </template>
6
 
23
 
7
 <script>
24
 <script>
8
-
25
+import ScrollY from '../../../components/ScrollY/index'
9
 export default {
26
 export default {
10
-  name: 'StarOwner',
27
+  name: 'MingXingYeZhu',
11
   data () {
28
   data () {
12
     return {
29
     return {
13
-
30
+      IsRefreshing: false,
31
+      DataLock: false
14
     }
32
     }
15
   },
33
   },
16
   components: {
34
   components: {
35
+    ScrollY
17
   },
36
   },
18
   created () {
37
   created () {
19
     this.Init()
38
     this.Init()
20
   },
39
   },
21
   methods: {
40
   methods: {
22
     Init () {
41
     Init () {
42
+    },
43
+    Refresh (e) {
44
+      if (this.DataLock) return
45
+      this.DataLock = true
46
+      this.IsRefreshing = true
47
+      setTimeout(() => {
48
+        this.IsRefreshing = false
49
+        this.DataLock = false
50
+      }, 1000)
23
     }
51
     }
24
   }
52
   }
25
 }
53
 }

+ 44
- 2
src/pages/HuiAiXin/StarOwner/page.scss Ver fichero

1
-.page {
1
+.page.MingXingYeZhu {
2
   width: 100%;
2
   width: 100%;
3
-}
3
+  height: 100%;
4
+  background: #fff;
5
+  .Container {
6
+    > .Title {
7
+      margin-top: 40px;
8
+      > image {
9
+        height: 44px;
10
+        margin-left: 20px;
11
+      }
12
+    }
13
+    > .List {
14
+      padding: 0 20px;
15
+      margin-top: 40px;
16
+      > .Item {
17
+        width: 100%;
18
+        position: relative;
19
+        overflow: hidden;
20
+        display: inline-block;
21
+        vertical-align: middle;
22
+        border-radius: 20px;
23
+        box-shadow: 0 5px 10px 5px rgba(0, 0, 0, 0.08);
24
+        margin-bottom: 40px;
25
+        > .Img {
26
+          width: 100%;
27
+          padding-bottom: 45%;
28
+          background: #ccc;
29
+          position: relative;
30
+          overflow: hidden;
31
+        }
32
+        > .Info {
33
+          display: block;
34
+          padding: 0 34px;
35
+          font-size: 24px;
36
+          line-height: 70px;
37
+          white-space: nowrap;
38
+          overflow: hidden;
39
+          text-overflow: ellipsis;
40
+          color: #333;
41
+        }
42
+      }
43
+    }
44
+  }
45
+}

+ 1
- 1
src/pages/HuiQuanYi/OwnersNews/NewsDetail/index.config.js Ver fichero

1
 export default {
1
 export default {
2
-  navigationBarTitleText: '咨询详情'
2
+  navigationBarTitleText: '业主资讯'
3
 }
3
 }

+ 12
- 3
src/pages/HuiQuanYi/OwnersNews/NewsDetail/index.vue Ver fichero

1
 <template>
1
 <template>
2
-  <view class="page">
3
-    资讯详情
2
+  <view class="page ZiXunXiangQing">
3
+    
4
+    <!-- 标题 -->
5
+    <view class="MainTitle">
6
+      <text>标题</text>
7
+      <text class="iconfont iconguanbi"></text>
8
+    </view>
9
+
10
+    <!-- 内容 -->
11
+    <view class="Container"></view>
12
+    
4
   </view>
13
   </view>
5
 </template>
14
 </template>
6
 
15
 
7
 <script>
16
 <script>
8
 
17
 
9
 export default {
18
 export default {
10
-  name: 'NewsDetail',
19
+  name: 'ZiXunXiangQing',
11
   data () {
20
   data () {
12
     return {
21
     return {
13
 
22
 

+ 36
- 2
src/pages/HuiQuanYi/OwnersNews/NewsDetail/page.scss Ver fichero

1
-.page {
1
+.page.ZiXunXiangQing {
2
   width: 100%;
2
   width: 100%;
3
-}
3
+  height: 100%;
4
+  overflow-y: scroll;
5
+  background: #fff;
6
+  > .MainTitle {
7
+    position: relative;
8
+    overflow: hidden;
9
+    margin-top: 20px;
10
+    > text {
11
+      &:nth-child(1) {
12
+        display: block;
13
+        text-align: center;
14
+        font-size: 52px;
15
+        font-weight: bold;
16
+        line-height: 80px;
17
+        z-index: 1;
18
+        position: relative;
19
+      }
20
+      &:nth-child(2) {
21
+        font-size: 24px;
22
+        display: inline-block;
23
+        position: absolute;
24
+        z-index: 2;
25
+        right: 40px;
26
+        top: 50%;
27
+        transform: translateY(-50%);
28
+        -webkit-transform: translateY(-50%);
29
+      }
30
+    }
31
+  }
32
+  > .Container {
33
+    margin-top: 40px;
34
+    padding: 0 20px;
35
+    padding-bottom: 40px;
36
+  }
37
+}

+ 36
- 5
src/pages/HuiQuanYi/OwnersNews/index.vue Ver fichero

1
 <template>
1
 <template>
2
-  <view class="page">
3
-    业主资讯
2
+  <view class="page YeZhuZiXun">
3
+    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh">
4
+      <view class="Container">
5
+
6
+        <!-- 标题 -->
7
+        <view class="Title">
8
+          <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/yezhuzixun.png"></image>
9
+        </view>
10
+
11
+        <!-- 列表 -->
12
+        <view class="List">
13
+          <navigator url="./NewsDetail/index" hover-class="other-navigator-hover" v-for="(item, index) in 20" :key="index" class="Item flex-h">
14
+            <view class="flex-item">
15
+              <text>资讯标题</text>
16
+              <text>4567</text>
17
+            </view>
18
+            <text class="iconfont iconjiantouright"></text>
19
+          </navigator>
20
+        </view>
21
+
22
+      </view>
23
+    </ScrollY>
4
   </view>
24
   </view>
5
 </template>
25
 </template>
6
 
26
 
7
 <script>
27
 <script>
8
-
28
+import ScrollY from '../../../components/ScrollY/index'
9
 export default {
29
 export default {
10
-  name: 'OwnersNews',
30
+  name: 'YeZhuZiXun',
11
   data () {
31
   data () {
12
     return {
32
     return {
13
-
33
+      IsRefreshing: false,
34
+      DataLock: false
14
     }
35
     }
15
   },
36
   },
16
   components: {
37
   components: {
38
+    ScrollY
17
   },
39
   },
18
   created () {
40
   created () {
19
     this.Init()
41
     this.Init()
20
   },
42
   },
21
   methods: {
43
   methods: {
22
     Init () {
44
     Init () {
45
+    },
46
+    Refresh (e) {
47
+      if (this.DataLock) return
48
+      this.DataLock = true
49
+      this.IsRefreshing = true
50
+      setTimeout(() => {
51
+        this.IsRefreshing = false
52
+        this.DataLock = false
53
+      }, 1000)
23
     }
54
     }
24
   }
55
   }
25
 }
56
 }

+ 49
- 2
src/pages/HuiQuanYi/OwnersNews/page.scss Ver fichero

1
-.page {
1
+.page.YeZhuZiXun {
2
   width: 100%;
2
   width: 100%;
3
-}
3
+  height: 100%;
4
+  background: #fff;
5
+  .Container {
6
+    > .Title {
7
+      margin-top: 40px;
8
+      > image {
9
+        height: 44px;
10
+        margin-left: 20px;
11
+      }
12
+    }
13
+    > .List {
14
+      padding-left: 20px;
15
+      margin-top: 20px;
16
+      padding-bottom: 40px;
17
+      > .Item {
18
+        border-bottom: 2px solid #f5f5f5;
19
+        padding: 20px 20px 20px 0;
20
+        align-items: center;
21
+        > view {
22
+          font-size: 0;
23
+          white-space: nowrap;
24
+          position: relative;
25
+          overflow: hidden;
26
+          > text {
27
+            display: inline-block;
28
+            vertical-align: middle;
29
+            font-size: 28px;
30
+            color: #999;
31
+            &:nth-child(1) {
32
+              color: #000;
33
+              max-width: 88%;
34
+              overflow: hidden;
35
+              text-overflow: ellipsis;
36
+              margin-right: 2%;
37
+            }
38
+            &:nth-child(2) {
39
+              width: 10%;
40
+            }
41
+          }
42
+        }
43
+        > text {
44
+          font-size: 28px;
45
+          color: #999;
46
+        }
47
+      }
48
+    }
49
+  }
50
+}

+ 27
- 3
src/pages/HuiShengHuo/ActivityList/ActivityDetail/JoinIn/index.vue Ver fichero

1
 <template>
1
 <template>
2
-  <view class="page">
3
-    活动报名
2
+  <view class="page LiJiBaoMing">
3
+
4
+    <!-- 表单 -->
5
+    <view class="Form">
6
+      <view class="flex-h">
7
+        <text>姓名</text>
8
+        <view class="flex-item">
9
+          <input type="text" placeholder="请输入" />
10
+        </view>
11
+      </view>
12
+      <view class="flex-h">
13
+        <text>手机号</text>
14
+        <view class="flex-item">
15
+          <input type="number" placeholder="请输入" />
16
+        </view>
17
+      </view>
18
+      <view class="flex-h">
19
+        <text>人数</text>
20
+        <view class="flex-item">
21
+          <input type="number" placeholder="请输入" />
22
+        </view>
23
+      </view>
24
+    </view>
25
+    
26
+    <text>提交</text>
27
+
4
   </view>
28
   </view>
5
 </template>
29
 </template>
6
 
30
 
7
 <script>
31
 <script>
8
 
32
 
9
 export default {
33
 export default {
10
-  name: 'JoinIn',
34
+  name: 'LiJiBaoMing',
11
   data () {
35
   data () {
12
     return {
36
     return {
13
 
37
 

+ 42
- 2
src/pages/HuiShengHuo/ActivityList/ActivityDetail/JoinIn/page.scss Ver fichero

1
-.page {
1
+.page.LiJiBaoMing {
2
   width: 100%;
2
   width: 100%;
3
-}
3
+  height: 100%;
4
+  overflow-y: scroll;
5
+  background: #fff;
6
+  > .Form {
7
+    padding: 0 20px;
8
+    > view {
9
+      padding: 26px 0;
10
+      border-bottom: 2px solid #f5f5f5;
11
+      &:last-child {
12
+        border-bottom: none;
13
+      }
14
+      > text {
15
+        font-size: 28px;
16
+        width: 100px;
17
+      }
18
+      > view {
19
+        position: relative;
20
+        overflow: hidden;
21
+        > input {
22
+          width: 100%;
23
+          font-size: 28px;
24
+          line-height: 40px;
25
+          height: 40px;
26
+          text-align: right;
27
+        }
28
+      }
29
+    }
30
+  }
31
+  > text {
32
+    width: 620px;
33
+    font-size: 40px;
34
+    display: block;
35
+    font-weight: bold;
36
+    line-height: 100px;
37
+    border-radius: 100px;
38
+    background: #fddd39;
39
+    margin: 60px auto 0;
40
+    text-align: center;
41
+    box-shadow: 0 5px 10px 5px rgba(253, 221, 57, 0.3);
42
+  }
43
+}

+ 0
- 3
src/pages/HuiShengHuo/ActivityList/ActivityDetail/Vote/index.config.js Ver fichero

1
-export default {
2
-  navigationBarTitleText: '活动投票'
3
-}

+ 0
- 31
src/pages/HuiShengHuo/ActivityList/ActivityDetail/Vote/index.vue Ver fichero

1
-<template>
2
-  <view class="page">
3
-    活动投票
4
-  </view>
5
-</template>
6
-
7
-<script>
8
-
9
-export default {
10
-  name: 'Vote',
11
-  data () {
12
-    return {
13
-
14
-    }
15
-  },
16
-  components: {
17
-  },
18
-  created () {
19
-    this.Init()
20
-  },
21
-  methods: {
22
-    Init () {
23
-    }
24
-  }
25
-}
26
-</script>
27
-
28
-<style lang="scss">
29
-@import "page.scss";
30
-</style>
31
- 

+ 0
- 3
src/pages/HuiShengHuo/ActivityList/ActivityDetail/Vote/page.scss Ver fichero

1
-.page {
2
-  width: 100%;
3
-}

+ 1
- 1
src/pages/HuiShengHuo/ActivityList/ActivityDetail/index.config.js Ver fichero

1
 export default {
1
 export default {
2
-  navigationBarTitleText: '活动详情'
2
+  navigationBarTitleText: '荟 · 生活'
3
 }
3
 }

+ 90
- 4
src/pages/HuiShengHuo/ActivityList/ActivityDetail/index.vue Ver fichero

1
 <template>
1
 <template>
2
-  <view class="page">
3
-    活动详情
2
+  <view class="page HuoDongXiangQing flex-v">
3
+
4
+    <view class="flex-item">
5
+      <view>
6
+
7
+        <!-- 活动主要信息 -->
8
+        <view class="MainInfo">
9
+          <text>活动名称</text>
10
+          <view class="SubInfo flex-h">
11
+            <view class="flex-item">
12
+              <text class="iconfont iconxianshi"></text>
13
+              <text>1245</text>
14
+            </view>
15
+            <view class="Time">
16
+              <text class="iconfont iconshijian"></text>
17
+              <text>2020-08-07</text>
18
+            </view>
19
+          </view>
20
+          <view class="Line flex-h">
21
+            <text>活动时间:</text>
22
+            <text class="flex-item">2020-08-07 至 2020-08-08</text>
23
+          </view>
24
+          <view class="Line flex-h">
25
+            <text>活动地址:</text>
26
+            <text class="flex-item">南京市江宁区丽园荟广场</text>
27
+          </view>
28
+          <view class="Line flex-h">
29
+            <text>报名截止:</text>
30
+            <text class="flex-item">2020-08-06 18:30</text>
31
+          </view>
32
+        </view>
33
+
34
+        <!-- 活动详情 -->
35
+        <view class="DetailContainer">
36
+          <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/huodongxiangqing.png"></image>
37
+          <view class="Text"></view>
38
+        </view>
39
+
40
+        <!-- 投票 -->
41
+        <view class="VoteContainer">
42
+          <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/toupiao.png"></image>
43
+          <view class="List">
44
+            <view v-for="(item, index) in VoteList" :key="index">
45
+              <text>{{index + 1}}.{{item.Question}}</text>
46
+              <view class="flex-h" v-for="(subItem, subIndex) in item.Answer" :key="subIndex">
47
+                <text class="iconfont iconweigouxuan" v-if="!subItem.active"></text>
48
+                <text class="iconfont icongouxuan" v-else></text>
49
+                <view class="flex-item">
50
+                  <text>{{subItem.name}}</text>
51
+                </view>
52
+              </view>
53
+            </view>
54
+          </view>
55
+          <text>提交</text>
56
+        </view>
57
+
58
+      </view>
59
+    </view>
60
+
61
+    <!-- 底部栏 -->
62
+    <view class="Bottom flex-h">
63
+      <view class="flex-item">
64
+        <image class="centerLabel" mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/huishenghuo.png"></image>
65
+      </view>
66
+      <view class="flex-item">
67
+        <image class="centerLabel" mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/fenxiang.png"></image>
68
+      </view>
69
+      <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/lijibaomingbtn.png"></image>
70
+    </view>
71
+
4
   </view>
72
   </view>
5
 </template>
73
 </template>
6
 
74
 
7
 <script>
75
 <script>
8
 
76
 
9
 export default {
77
 export default {
10
-  name: 'ActivityDetail',
78
+  name: 'HuoDongXiangQing',
11
   data () {
79
   data () {
12
     return {
80
     return {
13
-
81
+      DataLock: false,
82
+      VoteList: [
83
+        {
84
+          Question: '问题1',
85
+          Answer: [{ name: '答案1', active: false, id: '1' }, { name: '答案2', active: false, id: '2' }, { name: '答案3', active: false, id: '3' }]
86
+        }, {
87
+          Question: '问题2',
88
+          Answer: [{ name: '答案1', active: false, id: '1' }, { name: '答案2', active: false, id: '2' }, { name: '答案3', active: false, id: '3' }]
89
+        }, {
90
+          Question: '问题3',
91
+          Answer: [{ name: '答案1', active: false, id: '1' }, { name: '答案2', active: false, id: '2' }, { name: '答案3', active: false, id: '3' }]
92
+        }, {
93
+          Question: '问题4',
94
+          Answer: [{ name: '答案1', active: false, id: '1' }, { name: '答案2', active: false, id: '2' }, { name: '答案3', active: false, id: '3' }]
95
+        }, {
96
+          Question: '问题5',
97
+          Answer: [{ name: '答案1', active: false, id: '1' }, { name: '答案2', active: false, id: '2' }, { name: '答案3', active: false, id: '3' }]
98
+        }
99
+      ]
14
     }
100
     }
15
   },
101
   },
16
   components: {
102
   components: {

+ 164
- 2
src/pages/HuiShengHuo/ActivityList/ActivityDetail/page.scss Ver fichero

1
-.page {
1
+.page.HuoDongXiangQing {
2
   width: 100%;
2
   width: 100%;
3
-}
3
+  height: 100%;
4
+  > .flex-item {
5
+    position: relative;
6
+    overflow: hidden;
7
+    > view {
8
+      width: 100%;
9
+      height: 100%;
10
+      overflow-y: scroll;
11
+      > .MainInfo {
12
+        background: #fff;
13
+        padding: 24px;
14
+        box-shadow: 0 5px 10px 5px rgba(0, 0, 0, 0.08);
15
+        > text {
16
+          display: block;
17
+          font-size: 44px;
18
+          line-height: 60px;
19
+        }
20
+        > .SubInfo {
21
+          align-items: center;
22
+          margin-top: 10px;
23
+          > .flex-item {
24
+            font-size: 0;
25
+            white-space: nowrap;
26
+            > text {
27
+              display: inline-block;
28
+              vertical-align: middle;
29
+              font-size: 24px;
30
+              line-height: 40px;
31
+              color: #999;
32
+              margin-right: 10px;
33
+              &:nth-child(1) {
34
+                font-size: 30px;
35
+              }
36
+            }
37
+          }
38
+          > .Time {
39
+            font-size: 0;
40
+            white-space: nowrap;
41
+            > text {
42
+              display: inline-block;
43
+              vertical-align: middle;
44
+              font-size: 24px;
45
+              line-height: 40px;
46
+              margin-left: 10px;
47
+              color: #999;
48
+              &:nth-child(1) {
49
+                font-size: 30px;
50
+              }
51
+            }
52
+          }
53
+        }
54
+        > .Line {
55
+          align-items: center;
56
+          margin-top: 10px;
57
+          margin-bottom: 10px;
58
+          > text {
59
+            font-size: 28px;
60
+            color: #000;
61
+            line-height: 40px;
62
+            white-space: nowrap;
63
+            overflow: hidden;
64
+            text-overflow: ellipsis;
65
+            &:nth-child(1) {
66
+              color: #999;
67
+              width: 140px;
68
+            }
69
+          }
70
+        }
71
+      }
72
+      > .DetailContainer {
73
+        background: #fff;
74
+        margin-top: 20px;
75
+        padding-top: 50px;
76
+        box-shadow: 0 5px 10px 5px rgba(0, 0, 0, 0.08);
77
+        > image {
78
+          height: 70px;
79
+          display: block;
80
+          margin: 0 auto;
81
+        }
82
+        > .Text {
83
+          padding: 20px;
84
+        }
85
+      }
86
+      > .VoteContainer {
87
+        background: #fff;
88
+        margin-top: 20px;
89
+        padding-top: 50px;
90
+        padding-bottom: 80px;
91
+        margin-bottom: 40px;
92
+        box-shadow: 0 5px 10px 5px rgba(0, 0, 0, 0.08);
93
+        > image {
94
+          height: 70px;
95
+          display: block;
96
+          margin: 0 auto;
97
+        }
98
+        > .List {
99
+          padding-top: 20px;
100
+          > view {
101
+            padding-left: 20px;
102
+            margin-bottom: 20px;
103
+            > text {
104
+              display: block;
105
+              font-size: 28px;
106
+              color: #666;
107
+              line-height: 40px;
108
+            }
109
+            > view {
110
+              align-items: flex-start;
111
+              padding: 22px 0;
112
+              border-bottom: 2px solid #f5f5f5;
113
+              > text {
114
+                font-size: 38px;
115
+                line-height: 40px;
116
+                margin-right: 20px;
117
+                color: #fe4e45;
118
+              }
119
+              > view {
120
+                position: relative;
121
+                overflow: hidden;
122
+                > text {
123
+                  display: block;
124
+                  font-size: 28px;
125
+                  color: #666;
126
+                  line-height: 40px;
127
+                }
128
+              }
129
+            }
130
+          }
131
+        }
132
+        > text {
133
+          width: 620px;
134
+          font-size: 40px;
135
+          display: block;
136
+          font-weight: bold;
137
+          line-height: 100px;
138
+          border-radius: 100px;
139
+          background: #fddd39;
140
+          margin: 40px auto 0;
141
+          text-align: center;
142
+          box-shadow: 0 5px 10px 5px rgba(253, 221, 57, 0.3);
143
+        }
144
+      }
145
+    }
146
+  }
147
+  > .Bottom {
148
+    background: #fff;
149
+    > view {
150
+      position: relative;
151
+      overflow: hidden;
152
+      > image {
153
+        height: 40px;
154
+      }
155
+      &:nth-child(2) {
156
+        > image {
157
+          height: 36px;
158
+        }
159
+      }
160
+    }
161
+    > image {
162
+      height: 90px;
163
+    }
164
+  }
165
+}

+ 14
- 3
src/pages/SignIn/index.vue Ver fichero

1
 <template>
1
 <template>
2
-  <view class="page">
3
-    登录页
2
+  <view class="page DengLu">
3
+    <image mode="widthFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/signinbg.png"></image>
4
+    <view class="Btn flex-h">
5
+      <view class="flex-item"><text>取消登录</text></view>
6
+      <view class="flex-item"><text>授权登录</text></view>
7
+    </view>
8
+    <view class="Agree flex-h">
9
+      <text class="iconfont icongouxuan"></text>
10
+      <text class="iconfont iconweigouxuan"></text>
11
+      <view class="flex-item">
12
+        <text>我已认真阅读,理解并同意<text>《用户协议及隐私政策》</text></text>
13
+      </view>
14
+    </view>
4
   </view>
15
   </view>
5
 </template>
16
 </template>
6
 
17
 
7
 <script>
18
 <script>
8
 export default {
19
 export default {
9
-  name: 'SignIn',
20
+  name: 'DengLu',
10
   data () {
21
   data () {
11
     return {
22
     return {
12
 
23
 

+ 63
- 2
src/pages/SignIn/page.scss Ver fichero

1
-.page {
1
+.page.DengLu {
2
   width: 100%;
2
   width: 100%;
3
-}
3
+  height: 100%;
4
+  overflow-y: scroll;
5
+  background: #fff;
6
+  > image {
7
+    width: 100%;
8
+  }
9
+  > .Btn {
10
+    padding: 0 76px;
11
+    margin-top: 40px;
12
+    align-items: center;
13
+    overflow: visible;
14
+    > view {
15
+      margin-left: 40px;
16
+      overflow: visible;
17
+      &:nth-child(1) {
18
+        margin-left: 0;
19
+      }
20
+      &:nth-child(2) {
21
+        > text {
22
+          background: #fddd39;
23
+          border-color: #fddd39;
24
+          box-shadow: 0 5px 10px 5px rgba(253, 221, 57, 0.3);
25
+        }
26
+      }
27
+      > text {
28
+        display: block;
29
+        text-align: center;
30
+        font-size: 28px;
31
+        line-height: 80px;
32
+        border-radius: 80px;
33
+        box-sizing: border-box;
34
+        border: 2px solid #333;
35
+        text-align: center;
36
+      }
37
+    }
38
+  }
39
+  > .Agree {
40
+    padding: 0 76px;
41
+    align-items: flex-start;
42
+    margin-top: 20px;
43
+    > text {
44
+      font-size: 36px;
45
+      line-height: 40px;
46
+      margin-right: 10px;
47
+      color: #fe4e45;
48
+    }
49
+    > view {
50
+      > text {
51
+        display: block;
52
+        font-size: 24px;
53
+        color: #333;
54
+        line-height: 40px;
55
+        >text {
56
+          display: inline-block;
57
+          font-size: 24px;
58
+          color: #333;
59
+          line-height: 40px;
60
+        }
61
+      }
62
+    }
63
+  }
64
+}

+ 18
- 3
src/pages/WoDe/Feedback/index.vue Ver fichero

1
 <template>
1
 <template>
2
-  <view class="page">
3
-    意见反馈
2
+  <view class="page YiJianFanKui">
3
+
4
+    <!-- 标题 -->
5
+    <view class="Title">
6
+      <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/yijianfankui.png"></image>
7
+    </view>
8
+
9
+    <!-- 表单 -->
10
+    <view class="Form">
11
+      <view>
12
+        <textarea placeholder="请输入" name="textarea"/>
13
+        <text>0/100</text>
14
+      </view>
15
+    </view>
16
+
17
+    <text>提交</text>
18
+
4
   </view>
19
   </view>
5
 </template>
20
 </template>
6
 
21
 
7
 <script>
22
 <script>
8
 
23
 
9
 export default {
24
 export default {
10
-  name: 'Feedback',
25
+  name: 'YiJianFanKui',
11
   data () {
26
   data () {
12
     return {
27
     return {
13
 
28
 

+ 47
- 2
src/pages/WoDe/Feedback/page.scss Ver fichero

1
-.page {
1
+.page.YiJianFanKui {
2
   width: 100%;
2
   width: 100%;
3
-}
3
+  height: 100%;
4
+  overflow-y: scroll;
5
+  background: #fff;
6
+  > .Title {
7
+    margin-top: 40px;
8
+    > image {
9
+      height: 50px;
10
+      margin-left: 20px;
11
+    }
12
+  }
13
+  > .Form {
14
+    padding: 0 20px;
15
+    margin-top: 20px;
16
+    > view {
17
+      box-sizing: border-box;
18
+      border: 4px solid #e5e3e3;
19
+      border-radius: 16px;
20
+      padding: 10px;
21
+      > textarea {
22
+        font-size: 30px;
23
+        color: #999;
24
+        line-height: 40px;
25
+        width: 100%;
26
+      }
27
+      > text {
28
+        display: block;
29
+        font-size: 24px;
30
+        color: #999;
31
+        text-align: right;
32
+        line-height: 40px;
33
+      }
34
+    }
35
+  }
36
+  > text {
37
+    width: 620px;
38
+    font-size: 40px;
39
+    display: block;
40
+    font-weight: bold;
41
+    line-height: 100px;
42
+    border-radius: 100px;
43
+    background: #fddd39;
44
+    margin: 40px auto 0;
45
+    text-align: center;
46
+    box-shadow: 0 5px 10px 5px rgba(253, 221, 57, 0.3);
47
+  }
48
+}

+ 39
- 5
src/pages/WoDe/MyActivityList/index.vue Ver fichero

1
 <template>
1
 <template>
2
-  <view class="page">
3
-    我的活动列表
2
+  <view class="page WoDeHuoDong">
3
+    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh">
4
+      <view class="Container">
5
+
6
+        <!-- 标题 -->
7
+        <view class="Title">
8
+          <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/wodehuodong.png"></image>
9
+        </view>
10
+
11
+        <!-- 列表 -->
12
+        <view class="List">
13
+          <navigator v-for="(item, index) in 10" :key="index" url="../../HuiShengHuo/ActivityList/ActivityDetail/index" hover-class="other-navigator-hover" class="Item flex-h">
14
+            <view class="flex-item">
15
+              <text>活动标题</text>
16
+              <text>已报名123人</text>
17
+              <text>已结束</text>
18
+            </view>
19
+            <view class="Img">
20
+              <view></view>
21
+            </view>
22
+          </navigator>
23
+        </view>
24
+
25
+      </view>
26
+    </ScrollY>
4
   </view>
27
   </view>
5
 </template>
28
 </template>
6
 
29
 
7
 <script>
30
 <script>
8
-
31
+import ScrollY from '../../../components/ScrollY/index'
9
 export default {
32
 export default {
10
-  name: 'MyActivityList',
33
+  name: 'WoDeHuoDong',
11
   data () {
34
   data () {
12
     return {
35
     return {
13
-
36
+      IsRefreshing: false,
37
+      DataLock: false
14
     }
38
     }
15
   },
39
   },
16
   components: {
40
   components: {
41
+    ScrollY
17
   },
42
   },
18
   created () {
43
   created () {
19
     this.Init()
44
     this.Init()
20
   },
45
   },
21
   methods: {
46
   methods: {
22
     Init () {
47
     Init () {
48
+    },
49
+    Refresh (e) {
50
+      if (this.DataLock) return
51
+      this.DataLock = true
52
+      this.IsRefreshing = true
53
+      setTimeout(() => {
54
+        this.IsRefreshing = false
55
+        this.DataLock = false
56
+      }, 1000)
23
     }
57
     }
24
   }
58
   }
25
 }
59
 }

+ 73
- 1
src/pages/WoDe/MyActivityList/page.scss Ver fichero

1
-.page {
1
+.page.WoDeHuoDong {
2
   width: 100%;
2
   width: 100%;
3
+  height: 100%;
4
+  background: #fff;
5
+  .Container {
6
+    > .Title {
7
+      margin-top: 40px;
8
+      > image {
9
+        height: 50px;
10
+        margin-left: 20px;
11
+      }
12
+    }
13
+    > .List {
14
+      padding-left: 20px;
15
+      > .Item {
16
+        padding: 40px 0;
17
+        border-bottom: 2px solid #f5f5f5;
18
+        overflow: visible;
19
+        > .flex-item {
20
+          margin-right: 20px;
21
+          overflow: visible;
22
+          > text {
23
+            display: block;
24
+            font-size: 28px;
25
+            line-height: 40px;
26
+            overflow: hidden;
27
+            margin-top: 6px;
28
+            &:nth-child(1) {
29
+              text-overflow: ellipsis;
30
+              display: -webkit-box;
31
+              -webkit-box-orient: vertical;
32
+              -webkit-line-clamp: 2;
33
+              margin-top: 0;
34
+            }
35
+            &:nth-child(2) {
36
+              color: #666;
37
+              font-size: 24px;
38
+              white-space: nowrap;
39
+              text-overflow: ellipsis;
40
+            }
41
+            &:nth-child(3) {
42
+              display: inline-block;
43
+              color: #000;
44
+              font-size: 24px;
45
+              line-height: 52px;
46
+              padding: 0 20px;
47
+              border-radius: 52px;
48
+              background: #ccc;
49
+              box-shadow: 0 10px 20px 5px rgba(0, 0, 0, 0.1);
50
+              &.active {
51
+                background: #fe4e45;
52
+                color: #fff;
53
+                box-shadow: 0 10px 20px 5px rgba(254, 78, 69, 0.3);
54
+              }
55
+            }
56
+          }
57
+        }
58
+        > .Img {
59
+          width: 34%;
60
+          margin-right: 20px;
61
+          position: relative;
62
+          overflow: hidden;
63
+          border-radius: 12px;
64
+          > view {
65
+            width: 100%;
66
+            padding-bottom: 70%;
67
+            background: #ccc;
68
+            position: relative;
69
+            overflow: hidden;
70
+          }
71
+        }
72
+      }
73
+    }
74
+  }
3
 }
75
 }