diff --git a/src/apps/AppActive/Add.vue b/src/apps/AppActive/Add.vue index e69de29b..cd1cef30 100644 --- a/src/apps/AppActive/Add.vue +++ b/src/apps/AppActive/Add.vue @@ -0,0 +1,25 @@ + + + + + diff --git a/src/apps/AppActive/AppActive.vue b/src/apps/AppActive/AppActive.vue index 9e7997cc..618bdee0 100644 --- a/src/apps/AppActive/AppActive.vue +++ b/src/apps/AppActive/AppActive.vue @@ -1,14 +1,45 @@ @@ -23,10 +54,10 @@ export default { datas: [], tabList: [ { - name: '全部', + name: '全部活动', }, { - name: '我的走访', + name: '我发布的', }, ], currentTabs: 0, @@ -46,6 +77,15 @@ export default { this.currentTabs = index this.getList() }, + + toAdd() { + uni.navigateTo({ url: `./Add` }) + }, + + toDetail(item) { + uni.navigateTo({ url: `./Detail` }) + // uni.navigateTo({ url: `./Detail?id=${item.id}` }) + }, }, onReachBottom() { this.current = this.current + 1 @@ -60,6 +100,95 @@ uni-page-body { } .AppActive { height: 100%; - background: #fff; + background: #f3f6f9; + + .dataTop { + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 48px; + margin-bottom: 8px; + padding: 0 32px; + .dataLeft { + font-size: 38px; + font-weight: 600; + } + .dataRight { + font-size: 28px; + color: #666666; + .specialColor { + color: #4181ff; + } + } + } + + ::v-deep .AiCard { + background: #f3f6f9; + .start { + background: #fff; + padding: 32px; + border-radius: 16px; + .fill { + display: flex; + justify-content: space-between; + // align-items: center; + .left { + width: calc(100% - 205px); + // background: pink; + .titles { + margin-bottom: 8px; + color: #333333; + font-weight: 500; + font-size: 30px; + line-height: 1.3; + word-break: break-all; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + overflow: hidden; + } + .nums { + .specialColor { + color: #4181ff; + } + } + .times { + .timesCont { + margin-right: 10px; + } + } + .areaNmae { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + } + img { + width: 182px; + height: 182px; + } + } + } + } + + .AiFixedBtn { + .movableArea { + .addBtn { + display: flex; + justify-content: center; + align-items: center; + width: 96px; + height: 96px; + flex-shrink: 0; + background: $uni-color-primary; + box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.2); + font-size: 48px; + background: #fff; + color: #1365dd; + border-radius: 50%; + } + } + } } diff --git a/src/apps/AppActive/Deatil.vue b/src/apps/AppActive/Deatil.vue deleted file mode 100644 index e69de29b..00000000 diff --git a/src/apps/AppActive/Detail.vue b/src/apps/AppActive/Detail.vue new file mode 100644 index 00000000..9b973710 --- /dev/null +++ b/src/apps/AppActive/Detail.vue @@ -0,0 +1,25 @@ + + + + + diff --git a/src/apps/AppActive/yan.jpg b/src/apps/AppActive/yan.jpg new file mode 100644 index 00000000..bf6a5a2c Binary files /dev/null and b/src/apps/AppActive/yan.jpg differ diff --git a/src/apps/AppWalkask/AppWalkask.vue b/src/apps/AppWalkask/AppWalkask.vue index 8ab16351..28aea542 100644 --- a/src/apps/AppWalkask/AppWalkask.vue +++ b/src/apps/AppWalkask/AppWalkask.vue @@ -6,11 +6,9 @@
-
+
- -
@@ -55,58 +53,6 @@
- -
-
-
- - - -
- - -
- - - -
- - -
- 点击 - 新增按钮 - 试试试吧~ -
-
-
@@ -201,11 +147,7 @@ export default { }, areaSelect(e) { - if (e.type == 5) { - this.areaId = e.id - } else { - return this.$u.toast('请选择到村') - } + this.areaId = e.id this.getList() }, diff --git a/src/apps/AppWalkask/components/images/icon2.png b/src/apps/AppWalkask/components/images/icon2.png deleted file mode 100644 index c6f04638..00000000 Binary files a/src/apps/AppWalkask/components/images/icon2.png and /dev/null differ