bding 2 years ago
parent
commit
24570fb031

+ 3 - 3
activityPages/endActivity/endActivity.vue

@@ -30,8 +30,8 @@
       </view>
     </view>
     <view class="content-ul" v-if="haveData">
-      <view @click="goThemeActivity(item)" class="item-text" v-for="item in dataList" :key="item.ActivityId">
-        <text class="text_oneLine"> {{ item.KeyWord }}</text>
+      <view @click="goThemeActivity(item)" class="item-text text_oneLine" v-for="item in dataList" :key="item.ActivityId">
+        {{ item.KeyWord }}
       </view>
     </view>
     <view class="nodata" v-else>
@@ -102,7 +102,7 @@ export default {
       height: 53rpx;
       background: #f5f5f5;
       border-radius: 65rpx;
-      box-shadow: 0rpx 2rpx 9rpx rgba(0, 0, 0, 0.16), inset 0rpx 4rpx 4prx rgba(255, 255, 255, 0.49);
+      box-shadow: 0px 2rpx 9rpx 0rpx rgba(0, 0, 0, 0.16), inset 0rpx 4rpx 4rpx 0rpx rgba(255, 255, 255, 0.49);
       margin-bottom: 30rpx;
     }
   }

+ 6 - 1
activityPages/generationAsk/generationAsk.vue

@@ -32,7 +32,12 @@ export default {
   },
   methods: {
     async submitHandle() {
-      console.log( this.roadshow ,this.type);
+      if (!this.advice_content)
+        return uni.showToast({
+          title: "内容不能为空",
+          icon: "none",
+          duration: 2000,
+        });
       const res =
         this.roadshow && this.type == "文章"
           ? await Home.microRoadshowAdd({

+ 49 - 15
activityPages/themeActivity/themeActivity.vue

@@ -50,19 +50,21 @@
             <text :class="item.ActivityType == 1 ? '' : 'xianxia'">{{ item.ActivityType == 1 ? "线上" : "线下" }}</text>
             {{ item.SourceType == 2 ? "" : item.ActivityTimeText }}
             <view class="audio-back" v-if="item.AudioLink" @click.stop="PlayBackAll(item)">
-              <block v-if="item.FileType == 2">
-                <image class="audio-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/video_play.png"></image>
-              </block>
-              <image
-                v-else
-                class="audio-img"
-                :src="
-                  curVoiceId === item.ActivityId && !curAudioPaused
-                    ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/stop_play.png'
-                    : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/audio_play.png'
-                "
-              ></image>
-              {{ curVoiceId === item.ActivityId && !curAudioPaused ? "暂停" : "回放" }}
+              <view class="audio-box">
+                <block v-if="item.FileType == 2">
+                  <image class="audio-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/video_play.png"></image>
+                </block>
+                <image
+                  v-else
+                  class="audio-img"
+                  :src="
+                    curVoiceId === item.ActivityId && !curAudioPaused
+                      ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/stop_play.png'
+                      : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/audio_play.png'
+                  "
+                ></image>
+                {{ curVoiceId === item.ActivityId && !curAudioPaused ? "暂停" : "回放" }}
+              </view>
             </view>
           </view>
           <view class="item-li">
@@ -241,6 +243,7 @@ export default {
         if (this.page_no === 1) {
           this.collectList = res.Data.List || [];
           this.haveData = this.collectList.length ? true : false;
+          console.log(this.haveData, "-----------------------");
           if (this.refresh) {
             uni.stopPullDownRefresh();
             this.refresh = false;
@@ -385,10 +388,41 @@ export default {
   .end-select-item {
     justify-content: flex-start !important;
     .select-item-multiple {
-      margin-left: 38rpx;
+      margin-right: 38rpx;
     }
   }
   @import "../components/selectCss.scss";
+  @import "@/components/activity/indexActivity.scss";
+ 
+  .title-date {
+    position: relative;
+    .audio-back {
+      position: absolute;
+      right: 0;
+      top: 50%;
+      transform: translateY(-50%);
+      width: 125rpx;
+      height: 90rpx;
+      font-size: 24rpx;
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+      color: #fff;
+      .audio-box {
+        width: 99rpx;
+        height: 39rpx;
+        display: flex;
+        align-items: center;
+        border-radius: 20rpx;
+        padding-left: 4rpx;
+        background-color: #3385ff;
+      }
+    }
+    .audio-img {
+      width: 30rpx;
+      height: 30rpx;
+      margin: 0 5rpx;
+    }
+  }
 }
-@import "@/components/activity/indexActivity.scss";
 </style>

+ 1 - 1
components/audioVideo.scss

@@ -120,7 +120,7 @@
         }
       }
       .share-collected {
-        padding: 0 30rpx 0 15rpx;
+        padding-left: 5rpx;
         justify-content: space-around;
       }
     }