From 7532912042a438ec8f516d7e3ffddde96d108ef7 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 30 Aug 2022 11:22:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E9=94=99=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppCooperationPropaganda.vue              | 70 +-----------------
 .../addPropaganda.vue                         | 19 -----
 .../AppCooperationPropaganda.vue              | 71 ++++++++++++++++++-
 .../addPropaganda.vue                         | 61 ++++++++++++++++
 4 files changed, 132 insertions(+), 89 deletions(-)
 delete mode 100644 src/apps/AppCooperationPropaganda/addPropaganda.vue
 create mode 100644 src/project/saas/AppCooperationPropaganda/addPropaganda.vue

diff --git a/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue b/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue
index 10b1b542..f093b28c 100644
--- a/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue
+++ b/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue
@@ -1,9 +1,6 @@
 <template>
   <div class="AppCooperationPropaganda">
     <AiTopFixed>
-      <div class="tab-select">
-        <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index" @click="tabClick(index)">{{ item }}<span></span></div>
-      </div>
       <div class="search">
         <div class="searchBox">
           <u-search placeholder="请输入任务名称" v-model="taskTitle" clearabled @search="searchBtn" @clear="taskTitle='',getList()" :show-action="false"></u-search>
@@ -28,10 +25,6 @@
     </div>
     <AiEmpty description="暂无数据" v-if="!list.length"/>
 
-    <AiFixedBtn>
-      <div class="addBtn iconfont iconfont-iconfangda" @tap="toAdd"></div>
-    </AiFixedBtn>
-
     <u-popup v-model="filterShow" mode="bottom" border-radius="14">
       <div class="popup">
         <div class="tips"></div>
@@ -92,8 +85,6 @@ export default {
   appName: '协同宣发',
   data() {
     return {
-      tabs: ['群发居民群','群发居民','群发朋友圈'],
-      tabIndex: 0,
       current: 1,
       name: '',
       list: [],
@@ -111,9 +102,6 @@ export default {
     }
   },
   methods: {
-    tabClick(index) {
-      this.tabIndex = index;
-    },
     toDetail(item) {
       uni.navigateTo({url: `./cooperationDetail?id=${item.id}&time=${item.createTime}`})
     },
@@ -174,9 +162,6 @@ export default {
     },
     confirmEnd(val) {
       this.endTime = val.year + '-' + val.month + '-' + val.day
-    },
-    toAdd() {
-      
     }
   },
   onShow() {
@@ -196,50 +181,11 @@ export default {
 
 <style lang="scss" scoped>
 .AppCooperationPropaganda {
-  ::v-deep .AiTopFixed .content {
-    padding: 0;
-  }
-
-  .tab-select {
-    width: 100%;
-    height: 96px;
-    line-height: 96px;
-    background: #3975c6;
-    display: flex;
-
-    .item {
-      flex: 1;
-      text-align: center;
-      font-size: 28px;
-      font-family: PingFangSC-Regular, PingFang SC;
-      color: #cddcf0;
-    }
-
-    .active {
-      font-family: PingFangSC-Medium, PingFang SC;
-      font-weight: 500;
-      position: relative;
-      color: #fff;
-
-      span {
-        width: 48px;
-        height: 4px;
-        background: #fff;
-        position: absolute;
-        bottom: 14px;
-        left: 50%;
-        margin-left: -24px;
-      }
-    }
-  }
-
   .search {
     display: flex;
-    height: 100px;
+    height: 80px;
     align-items: center;
     justify-content: space-between;
-    padding: 20px 32px;
-    box-sizing: border-box;
 
     .searchBox {
       width: 562px;
@@ -309,20 +255,6 @@ export default {
     }
   }
 
-  .addBtn {
-    width: 96px;
-    height: 96px;
-    flex-shrink: 0;
-    background: $uni-color-primary;
-    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
-    font-size: 48px;
-    color: #fff;
-    border-radius: 50%;
-    justify-content: center;
-    align-items: center;
-    display: flex;
-  }
-
   .popup {
     box-sizing: border-box;
     // height: 800px;
diff --git a/src/apps/AppCooperationPropaganda/addPropaganda.vue b/src/apps/AppCooperationPropaganda/addPropaganda.vue
deleted file mode 100644
index 42aaedcd..00000000
--- a/src/apps/AppCooperationPropaganda/addPropaganda.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<template>
-  <div class="addPropaganda"></div>
-</template>
-
-<script>
-export default {
-  name: "addPropaganda",
-  data() {
-    return {}
-  },
-  methods: {},
-  onShow() {},
-  
-}
-</script>
-
-<style>
-
-</style>
\ No newline at end of file
diff --git a/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue
index e1def441..b78b6ede 100644
--- a/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue
+++ b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="AppCooperationPropaganda">
     <AiTopFixed>
+      <div class="tab-select">
+        <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index" @click="tabClick(index)">{{ item }}<span></span></div>
+      </div>
       <div class="search">
         <div class="searchBox">
           <u-search placeholder="请输入任务名称" v-model="taskTitle" clearabled @search="searchBtn" @clear="taskTitle='',getList()" :show-action="false"></u-search>
@@ -25,6 +28,11 @@
       </div>
     </div>
     <AiEmpty description="暂无数据" v-if="!list.length"/>
+
+    <AiFixedBtn>
+      <div class="addBtn iconfont iconfont-iconfangda" @tap="toAdd"></div>
+    </AiFixedBtn>
+
     <u-popup v-model="filterShow" mode="bottom" border-radius="14">
       <div class="popup">
         <div class="tips"></div>
@@ -84,6 +92,8 @@ export default {
   appName: '协同宣发',
   data() {
     return {
+      tabs: ['群发居民群','群发居民','群发朋友圈'],
+      tabIndex: 0,
       current: 1,
       name: '',
       list: [],
@@ -101,6 +111,9 @@ export default {
     }
   },
   methods: {
+    tabClick(index) {
+      this.tabIndex = index;
+    },
     toDetail(item) {
       uni.navigateTo({url: `./cooperationDetail?id=${item.id}&time=${item.createTime}`})
     },
@@ -162,6 +175,9 @@ export default {
     confirmEnd(val) {
       this.endTime = val.year + '-' + val.month + '-' + val.day
     },
+    toAdd() {
+      uni.navigateTo({url: `./addPropaganda?index=${this.tabIndex}`})
+    }
   },
   onShow() {
     document.title = '协同宣发'
@@ -180,11 +196,50 @@ export default {
 
 <style lang="scss" scoped>
 .AppCooperationPropaganda {
+  ::v-deep .AiTopFixed .content {
+    padding: 0;
+  }
+
+  .tab-select {
+    width: 100%;
+    height: 96px;
+    line-height: 96px;
+    background: #3975c6;
+    display: flex;
+
+    .item {
+      flex: 1;
+      text-align: center;
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #cddcf0;
+    }
+
+    .active {
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      position: relative;
+      color: #fff;
+
+      span {
+        width: 48px;
+        height: 4px;
+        background: #fff;
+        position: absolute;
+        bottom: 14px;
+        left: 50%;
+        margin-left: -24px;
+      }
+    }
+  }
+
   .search {
     display: flex;
-    height: 80px;
+    height: 100px;
     align-items: center;
     justify-content: space-between;
+    padding: 20px 32px;
+    box-sizing: border-box;
 
     .searchBox {
       width: 562px;
@@ -253,6 +308,20 @@ export default {
       }
     }
   }
+
+  .addBtn {
+    width: 96px;
+    height: 96px;
+    flex-shrink: 0;
+    background: $uni-color-primary;
+    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
+    font-size: 48px;
+    color: #fff;
+    border-radius: 50%;
+    justify-content: center;
+    align-items: center;
+    display: flex;
+  }
   .popup {
     box-sizing: border-box;
     // height: 800px;
diff --git a/src/project/saas/AppCooperationPropaganda/addPropaganda.vue b/src/project/saas/AppCooperationPropaganda/addPropaganda.vue
new file mode 100644
index 00000000..6af9eee9
--- /dev/null
+++ b/src/project/saas/AppCooperationPropaganda/addPropaganda.vue
@@ -0,0 +1,61 @@
+<template>
+  <div class="addPropaganda">
+    <!-- <div>{{ this.type==0? "群发居民群": this.type==1? "群发居民": "群发朋友圈" }}</div> -->
+
+    <div class="task_name">
+      <div><span class="color_red">*</span><span class="title">任务名称</span></div>
+      <u-input v-model="value" type="text" placeholder="请输入" maxlength="15" class="inpt"/>
+    </div>
+
+    <div class="send_scope">
+      <div><span class="color_red">*</span><span class="title">发送范围</span></div>
+      <div>
+
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "addPropaganda",
+  data() {
+    return {
+      type: '',
+    }
+  },
+  methods: {},
+  onShow() {
+  },
+  onLoad(o) {
+    this.type = o.index;
+    document.title = this.type==0? "群发居民群": this.type==1? "群发居民": "群发朋友圈"
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.addPropaganda {
+  font-size: 32px !important;
+  .task_name,
+  .send_scope {
+    background: #FFF;
+    padding: 32px;
+    box-sizing: border-box;
+    margin-bottom: 16px;
+    box-shadow: inset 0px -1px 0px 0px #DDDDDD;
+    .title {
+      font-weight: 400;
+      font-size: 32px;
+    }
+  }
+
+
+  .color_red {
+    color: #FF4466;
+  }
+  .inpt {
+    margin-left: 14px;
+  }
+}
+</style>
\ No newline at end of file