Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue

@@ -24,6 +24,7 @@
       </div>
     </div>
     <AiEmpty description="暂无数据" v-if="!list.length"/>
+
     <u-popup v-model="filterShow" mode="bottom" border-radius="14">
       <div class="popup">
         <div class="tips"></div>
@@ -74,6 +75,7 @@
         </div>
       </div>
     </u-popup>
+
   </div>
 </template>
 
@@ -160,7 +162,7 @@ export default {
     },
     confirmEnd(val) {
       this.endTime = val.year + '-' + val.month + '-' + val.day
-    },
+    }
   },
   onShow() {
     document.title = '协同宣发'
@@ -252,6 +254,7 @@ export default {
       }
     }
   }
+
   .popup {
     box-sizing: border-box;
     // height: 800px;

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;

src/project/saas/AppCooperationPropaganda/addPropaganda.vue

@@ -0,0 +1,157 @@
+<template>
+  <div class="addPropaganda">
+    <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>
+        <span>请选择</span><span><u-icon name="arrow-right" color="#CCD0D3"></u-icon></span>
+      </div>
+    </div>
+
+    <div class="send_content">
+      <div class="content_title">
+        <div><span class="color_red">*</span><span class="title">发送内容</span></div>
+        <div style="color: #3399FF;">预览</div>
+      </div>
+      <div class="content_text">
+        <u-input v-model="value" type="textarea" height="372" :auto-height="true" placeholder="请输入政策、活动、节日问候等内容" />
+      </div>
+      <div class="content_fodder">
+        <div style="color: #8E8F91;">添加素材</div>
+        <div class="fodder_alls">
+          <div class="fodder_add"><u-icon name="plus" color="#CCD0D3" size="32"></u-icon></div>
+        </div>
+      </div>
+    </div>
+
+    <div class="isExamine">
+      <div class="examineChange">
+        <div>宣发需要审批</div>
+        <u-switch v-model="checked" size="40" @change="checked = !!checked"></u-switch>
+      </div>
+      <div class="examine_person" v-if="checked == true">
+        <div><span class="color_red">*</span><span class="title">审批人</span></div>
+        <div>
+          <span>请选择人员</span><span><u-icon name="arrow-right" color="#CCD0D3"></u-icon></span>
+        </div>
+      </div>
+    </div>
+
+    <div class="btn">
+      <div class="submit">发送</div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: "addPropaganda",
+  data() {
+    return {
+      type: '',
+      value: '',
+      checked: false,
+    }
+  },
+  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;
+  padding-bottom: 120px;
+  box-sizing: border-box;
+  .task_name,
+  .send_scope,
+  .send_content {
+    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;
+    }
+  }
+
+  .send_scope {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .send_content {
+    .content_title {
+      display: flex;
+      justify-content: space-between;
+    }
+    .content_text {
+      margin-top: 12px;
+      border-bottom: 1px solid #DDD;
+    }
+    .content_fodder {
+      margin-top: 16px;
+      .fodder_alls {
+        display: flex;
+        margin-top: 16px;
+        .fodder_add {
+          border: 2px solid #DBDCDF;
+          padding: 20px 24px;
+          box-sizing: border-box;
+          border-radius: 8px;
+        }
+      }
+      
+    }
+  }
+
+  .isExamine {
+    background: #FFF;
+    padding: 0 32px;
+    box-sizing: border-box;
+    box-shadow: inset 0px -1px 0px 0px #DDDDDD;
+    
+    .examineChange,
+    .examine_person {
+      display: flex;
+      justify-content: space-between;
+      padding: 26px 0;
+      box-sizing: border-box;
+    }
+
+    .examine_person {
+      border-top: 2px solid #DDD;
+    }
+  }
+  .color_red {
+    color: #FF4466;
+  }
+  .inpt {
+    margin-left: 14px;
+  }
+  .btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 128px;
+    padding: 24px 32px;
+    box-sizing: border-box;
+    background: #FFF;
+  }
+}
+</style>