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

src/project/beta/AppBroadcast1/AppBroadcast1.vue

@@ -3,9 +3,9 @@
     <div class="header">
       <img src="./img/bigHorn-bg.png" alt="">
       <div class="content">
-        <div class="item" @click="linkTo('./onlineList')">
+        <div class="item" @click="linkTo('../AppEquipment/AppEquipment')">
           <img src="./img/bigHorn-icon1@2x.png" alt="">
-          <div>在线设备</div>
+          <div>广播设备</div>
           <!-- <h2>1</h2> -->
         </div>
         <div class="item" @click="linkTo('./playList')">

src/project/beta/AppBroadcast1/selectEquipment.vue

@@ -9,7 +9,7 @@
             <u-icon name="arrow-down" color="#666" size="24" style="margin-left: 4px" />
           </AiAreaPicker>
         </div>
-        <u-search v-model="keyword" :clearabled="true" placeholder="请输入素材名称/创建人员" :show-action="false" bg-color="#F5F5F5" search-icon-color="#ccc" color="#666" height="58" @search="getList" @clear="handerClear"></u-search>
+        <u-search v-model="keyword" :clearabled="true" placeholder="请输入设备名称" :show-action="false" bg-color="#F5F5F5" search-icon-color="#ccc" color="#666" height="58" @search="getList" @clear="handerClear"></u-search>
       </div>
     </AiTopFixed>
     <div class="record">

src/project/beta/AppBroadcast1/selectMedia.vue

@@ -7,10 +7,10 @@
         </div>
         <u-search v-model="keyword" :clearabled="true" placeholder="请输入素材名称/创建人员" :show-action="false" bg-color="#F5F5F5" search-icon-color="#ccc" color="#666" height="58" @search="getList" @clear="handerClear"></u-search>
       </div>
+      <div class="tab">
+        <u-tabs :list="tab" :is-scroll="false" :current="currIndex" @change="change" height="96" :bar-style="barStyle"></u-tabs>
+      </div>
     </AiTopFixed>
-    <div class="tab">
-      <u-tabs :list="tab" :is-scroll="false" :current="currIndex" @change="change" height="96" :bar-style="barStyle"></u-tabs>
-    </div>
     <div class="record" v-if="currIndex == 0">
       <div class="item" v-for="(item, index) in list" :key="index" @click="choose(item)">
         <img src="./img/select-blue.png" alt="" @click.stop="check(index)" v-if="item.isCheck">

src/project/beta/AppEquipment/AppEquipment.vue

@@ -0,0 +1,142 @@
+<template>
+  <div class="AppEquipment">
+    <AiTopFixed>
+      <div class="currentLeft-top">
+        <div class="left">
+          <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" selectRoot>
+            <span class="label" v-if="areaName">{{ areaName }}</span>
+            <span v-else>请选择</span>
+            <u-icon name="arrow-down" color="#666" size="24" style="margin-left: 4px" />
+          </AiAreaPicker>
+        </div>
+        <u-search v-model="keyword" :clearabled="true" placeholder="请输入设备名称" :show-action="false" bg-color="#F5F5F5" search-icon-color="#ccc" color="#666" height="58" @search="getList" @clear="handerClear"></u-search>
+      </div>
+    </AiTopFixed>
+    <div class="record">
+      <div class="item" @click="toDetail">
+        <img src="./img/lb@2x.png" alt="" class="voice-img">
+        <div class="info">
+          <div class="text">
+            <p>村头大喇叭</p>
+            <span>刘家河居委会</span>
+          </div>
+          <div class="status">在线</div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="./img/lb@2x.png" alt="" class="voice-img">
+        <div class="info">
+          <div class="text">
+            <p>村头大喇叭</p>
+            <span>刘家河居委会</span>
+          </div>
+          <div class="status">在线</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { mapState } from 'vuex'
+export default {
+  name: "AppEquipment",
+  data() {
+    return {
+      areaId: '',
+      areaName: '',
+      keyword: ''
+    }
+  },
+  computed: { ...mapState(['user']) },
+  onLoad(option) {
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
+  },
+  methods: {
+    areaSelect(e) {
+      this.areaId = e
+      // this.getList()
+    },
+    toDetail(item) {
+      uni.navigateTo({url: `./detail`})
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.AppEquipment {
+
+  .currentLeft-top {
+    display: flex;
+    align-items: center;
+
+    .left {
+      width: 200px;
+      display: flex;
+      align-items: center;
+
+      img {
+        width: 48px;
+        height: 48px;
+      }
+    }
+  }
+  .record {
+    margin-top: 8px;
+    padding-left: 32px;
+    background-color: #fff;
+
+    .item {
+      width: 100%;
+      display: flex;
+      border-bottom: 1px solid #ddd;
+
+      .check-img {
+        width: 44px;
+        height: 44px;
+        margin: 32px 32px 0 0;
+      }
+
+      .voice-img {
+        width: 48px;
+        height: 48px;
+        margin: 28px 16px 0 0;
+      }
+
+      .info {
+        width: calc(100% - 160px);
+        padding: 18px 0;
+        line-height: 44px;
+        font-size: 34px;
+        display: flex;
+        justify-content: space-between;
+
+        .text {
+          p {
+            font-family: PingFang-SC-Medium, PingFang-SC;
+            font-weight: 500;
+            color: #333;
+            margin-bottom: 8px;
+          }
+
+          span {
+            font-size: 26px;
+            font-family: PingFang-SC-Medium, PingFang-SC;
+            font-weight: 500;
+            color: #999;
+            line-height: 36px;
+          }
+        }
+
+        .status {
+          font-size: 34px;
+          font-family: PingFang-SC-Medium, PingFang-SC;
+          font-weight: 500;
+          color: #4E8EEE;
+          line-height: 48px;
+        }
+      }
+    }
+  }
+}
+</style>

src/project/beta/AppEquipment/detail.vue

@@ -0,0 +1,212 @@
+<template>
+  <div class="detail">
+    <AiTopFixed>
+      <div class="tab">
+        <u-tabs :list="tab" :is-scroll="false" :current="currIndex" @change="change" height="96" :bar-style="barStyle"></u-tabs>
+      </div>
+    </AiTopFixed>
+    <div class="content">
+      <div class="info-content" v-if="currIndex != 1">
+        <p>村头大喇叭</p>
+        <div class="info">
+          <span>设备编号</span>
+          <span class="color-333">121312312312</span>
+        </div>
+        <div class="info">
+          <span>设备状态</span>
+          <span style="color: #4E8EEE">在线</span>
+        </div>
+        <div class="info">
+          <span>信号强度</span>
+          <span class="color-333">一般</span>
+        </div>
+        <div class="info">
+          <span>音量</span>
+          <span class="color-333"></span>
+        </div>
+        <div class="info">
+          <span>所属区划</span>
+          <span class="color-333"></span>
+        </div>
+      </div>
+      <div class="list-content" v-else>
+        <div class="list">
+          <div class="item" @click="toTaskDetail">
+            <div class="left">
+              <p>韩红-我的祖国.mp3</p>
+              <div>李毅 2022-06-09 09:43:05</div>
+              <div>日常 立即播发</div>
+            </div>
+            <div class="right">
+              <div class="status">已下发</div>
+              <div class="cancel-btn">撤销</div>
+            </div>
+          </div>
+        </div>
+        <!-- <AiEmpty v-if="!list.length"></AiEmpty> -->
+      </div>
+    </div>
+    
+    <div class="btn">设置音量</div>
+    <u-popup v-model="isShow" mode="bottom">
+      
+    </u-popup>
+  </div>
+</template>
+<script>
+
+export default {
+  name: "detail",
+  data() {
+    return {
+      barStyle: {width: '98px', bottom: '-3px', left: '-38px'},
+      tab: [{name: '基本信息'}, {name: '播发任务'}],
+      list: [],
+      currIndex: 1,
+      current: 1,
+      isShow: false,
+    }
+  },
+  onLoad(query) {
+    
+  },
+
+  onShow() {
+    document.title = '设备详情'
+  },
+
+  methods: {
+    change(index) {
+      this.currIndex = index
+      this.getListInit()
+    },
+    toTaskDetail(item) {
+      uni.navigateTo({url: `./taskDetail`})
+    }
+  },
+
+  onReachBottom() {
+    if(this.currIndex == 1) {
+      this.current ++
+      this.getList()
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.detail {
+  padding-bottom: 128px;
+  ::v-deep .AiTopFixed{
+    .content{
+      padding: 0;
+    }
+  }
+  .tab {
+    border-bottom: 1px solid #ddd;
+    margin-bottom: 4px;
+  }
+  .content{
+    margin-top: 8px;
+    .info-content{
+      padding-left: 32px;
+      background-color: #fff;
+      p{
+        padding: 32px 32px 32px 0;
+        font-size: 38px;
+        font-family: PingFangSC-Semibold, PingFang SC;
+        font-weight: 600;
+        color: #333;
+        line-height: 56px;
+        word-break: break-all;
+      }
+      .info{
+        display: flex;
+        justify-content: space-between;
+        font-size: 32px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #999;
+        line-height: 44px;
+        padding: 34px 32px 32px 0;
+        border-bottom: 1px solid #ddd;
+        .color-333{
+          color: #333;
+        }
+      }
+    }
+    .list-content{
+      .list{
+        padding-left: 32px;
+        background-color: #fff;
+        .item{
+          display: flex;
+          padding: 16px 40px 16px 0;
+          box-sizing: border-box;
+          border-bottom: 1px solid #ddd;
+          .left{
+            width: calc(100% - 176px);
+            p{
+              font-size: 34px;
+              font-family: PingFang-SC-Medium, PingFang-SC;
+              font-weight: 500;
+              color: #333;
+              line-height: 48px;
+              word-break: break-all;
+              margin-bottom: 8px;
+            }
+            div{
+              font-size: 26px;
+              font-family: PingFang-SC-Medium, PingFang-SC;
+              font-weight: 500;
+              color: #999;
+              line-height: 36px;
+              margin-bottom: 8px;
+            }
+          }
+          .right{
+            width: 160px;
+            text-align: center;
+            .status{
+              font-size: 34px;
+              font-family: PingFang-SC-Medium, PingFang-SC;
+              font-weight: 500;
+              color: #4E8EEE;
+              line-height: 48px;
+              margin-bottom: 28px;
+            }
+            .cancel-btn{
+              width: 154px;
+              height: 60px;
+              line-height: 60px;
+              text-align: center;
+              background: #3975C6;
+              border-radius: 8px;
+              font-size: 30px;
+              font-family: PingFang-SC-Medium, PingFang-SC;
+              font-weight: 500;
+              color: #FFF;
+            }
+            .bg-AFD0FC{
+              background: #AFD0FC;
+            }
+          }
+        }
+      }
+    }
+
+  }
+  .btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    text-align: center;
+    background: #3975C6;
+    font-size: 32px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #FFFFFF;
+  }
+}
+</style>

src/project/beta/AppEquipment/taskDetail.vue

@@ -0,0 +1,206 @@
+<template>
+  <div class="taskDetail">
+    <div class="info-content">
+      <div class="info border-none">
+        <h2>播发任务</h2>
+        <h3>已下发</h3>
+      </div>
+      <div class="info">
+        <span>播发级别</span>
+        <span class="color-333">121312312312</span>
+      </div>
+      <div class="info">
+        <span>播放方式</span>
+        <span style="color: #4E8EEE">在线</span>
+      </div>
+      <div>
+        <div class="info">
+          <span>播放天数</span>
+          <span class="color-333">每周一、每周二、每周三</span>
+        </div>
+        <div class="info">
+        <span>开始日期</span>
+        <span class="color-333">2022-06-10</span>
+        </div>
+        <div class="info">
+          <span>开始时间</span>
+          <span class="color-333">18:00:00</span>
+        </div>
+        <div class="info">
+          <span>结束时间</span>
+          <span class="color-333">19:00:00</span>
+        </div>
+      </div>
+      <div class="info">
+        <span>创建人</span>
+        <span class="color-333">一般</span>
+      </div>
+      <div class="info">
+        <span>创建时间</span>
+        <span class="color-333"></span>
+      </div>
+    </div>
+    <div class="media-content">
+      <h2>播发素材</h2>
+      <div class="media-item">
+        <img :src="`${$cdn}video/play-icon.png`" alt="" @click="choose()">
+        <div class="info">
+          <p>五一活动唱红歌.mp3</p>
+          <div>李毅 2022-06-09 09:43:05</div>
+        </div>
+      </div>
+    </div>
+    <div class="btn">撤销任务</div>
+    <u-popup v-model="isShow" mode="bottom">
+      <div class="audio">
+        <AiVideo :src="url" autoplay></AiVideo>
+        <!-- <audio :src="url" ref="audio" :controls="true" :name="autioName" style="display: block;"></audio> -->
+      </div>
+    </u-popup>
+  </div>
+</template>
+<script>
+
+export default {
+  name: "taskDetail",
+  data() {
+    return {
+      isShow: false
+    }
+  },
+  onLoad(query) {
+    
+  },
+
+  onShow() {
+    document.title = '任务详情'
+  },
+
+  methods: {
+    choose(item) {
+      console.log(item.url)
+      this.url = item.url
+      this.isShow = tru
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.taskDetail {
+  .info-content{
+    padding-left: 32px;
+    background-color: #fff;
+    p{
+      padding: 32px 32px 32px 0;
+      font-size: 38px;
+      font-family: PingFangSC-Semibold, PingFang SC;
+      font-weight: 600;
+      color: #333;
+      line-height: 56px;
+      word-break: break-all;
+    }
+    .info{
+      display: flex;
+      justify-content: space-between;
+      font-size: 32px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #999;
+      line-height: 44px;
+      padding: 34px 32px 32px 0;
+      border-bottom: 1px solid #ddd;
+      .color-333{
+        color: #333;
+      }
+      h2{
+        font-size: 38px;
+        font-family: PingFangSC-Semibold, PingFang SC;
+        font-weight: 600;
+        color: #333;
+        line-height: 52px;
+      }
+      h3{
+        font-size: 34px;
+        font-family: PingFang-SC-Medium, PingFang-SC;
+        font-weight: 500;
+        color: #4E8EEE;
+        line-height: 52px;
+      }
+    }
+    .border-none{
+      border-bottom: 0;
+    }
+  }
+  .audio {
+    width: 100%;
+    height: 400px;
+    box-sizing: border-box;
+    padding: 104px 0 46px;
+  }
+  .media-content{
+    margin-top: 16px;
+    background-color: #fff;
+    h2{
+      padding: 32px;
+      font-size: 38px;
+      font-family: PingFangSC-Semibold, PingFang SC;
+      font-weight: 600;
+      color: #333;
+      line-height: 52px;
+    }
+    .media-item {
+      width: 100%;
+      display: flex;
+      border-bottom: 1px solid #ddd;
+      padding: 32px 30px;
+      box-sizing: border-box;
+
+      img {
+        width: 56px;
+        height: 56px;
+        margin-right: 14px;
+      }
+
+      .info {
+        width: calc(100% - 70px);
+        line-height: 44px;
+        font-size: 34px;
+        font-family: PingFang-SC-Medium, PingFang-SC;
+        font-weight: 500;
+        color: #333;
+
+        p {
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          word-break: break-all;
+        }
+        div{
+          font-size: 26px;
+          font-family: PingFang-SC-Medium, PingFang-SC;
+          font-weight: 500;
+          color: #999;
+          line-height: 36px;
+          margin-top: 8px;
+        }
+      }
+    }
+  }
+  
+  
+  .btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    text-align: center;
+    background: #fff;
+    font-size: 32px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #F46;
+    border-top: 1px solid #ddd;
+  }
+}
+</style>

src/project/beta/AppResourcesManage/AppResourcesManage.vue

@@ -7,10 +7,10 @@
         </div>
         <u-search v-model="keyword" :clearabled="true" placeholder="请输入素材名称/创建人员" :show-action="false" bg-color="#F5F5F5" search-icon-color="#ccc" color="#666" height="58" @search="getList" @clear="handerClear"></u-search>
       </div>
+      <div class="tab">
+        <u-tabs :list="tab" :is-scroll="false" :current="currIndex" @change="change" height="96" :bar-style="barStyle"></u-tabs>
+      </div>
     </AiTopFixed>
-    <div class="tab">
-      <u-tabs :list="tab" :is-scroll="false" :current="currIndex" @change="change" height="96" :bar-style="barStyle"></u-tabs>
-    </div>
     <div class="record" v-if="currIndex == 0">
       <div class="item" v-for="(item, index) in list" :key="index" @click="toDetail(item)">
         <img :src="`${$cdn}video/play-icon.png`" alt="" @click="choose(item)">
@@ -39,7 +39,6 @@
 
 export default {
   name: "AppResourcesManage",
-  appName: "媒资管理",
   data() {
     return {
       tab: [{name: '音频素材'}, {name: '文本素材'}],