小彬 2 vuotta sitten
vanhempi
commit
34948230ed

+ 4 - 1
activityPages/themeActivity/themeActivity.vue

@@ -47,7 +47,7 @@
                       <text @click="askingGo(item)">帮我带问</text>
                     </view>
                     <text v-if="item.IsShowOutboundCall && item.ActivityTypeId != 1" class="button" @click="signupIsAddOfCancel(item, 1)">{{ item.IsSignup == 1 ? "取消外呼" : "预约外呼" }}</text>
-                    <text v-if="item.IsShowDetails" @click="goDetail(item)" class="button" >查看详情</text>
+                    <text v-if="item.IsShowDetails" @click="goDetail(item)" class="button">查看详情</text>
                     <block v-if="item.IsShowSignup">
                       <block v-if="item.IsCClassMeeting">
                         <text class="button" @click="signupIsAddOfCancel(item, 3, 'CClass')">{{ item.IsSignup == 1 ? "取消报名" : "我要报名" }}</text>
@@ -118,6 +118,7 @@ export default {
       type: "",
       permissionIds: "",
       whichDay: "",
+      activityId: "",
     };
   },
   components: {
@@ -135,6 +136,7 @@ export default {
         ActivityTypeId: this.type ? this.label : "",
         ChartPermissionIds: this.permissionIds,
         WhichDay: this.whichDay,
+        ActivityId: this.activityId,
       });
       if (res.Ret === 200) {
         if (this.type) {
@@ -181,6 +183,7 @@ export default {
     this.type = option.type;
     this.permissionIds = option.permissionIds || "";
     this.whichDay = option.whichDay || "";
+    this.activityId = option.id;
     this.getActivityList();
     this.countryCcode();
   },

+ 0 - 323
components/audioModule/1.vue

@@ -1,323 +0,0 @@
-<template>
-  <view class="container global-audio-box" v-if="showAudioPop">
-    <view class="bg-overlay" @click="isShowMaskHandler"></view>
-    <view class="audio-box">
-      <view class="activity-title">
-        {{ activityTitle }}
-        <view class="icon-cross" @click.stop="isShowMaskHandler">
-          <van-icon name="cross" font-size="32" />
-        </view>
-      </view>
-      <view class="audio-card">
-        <view class="card-title text_oneLine">
-          {{ title }}
-        </view>
-        <view class="slider-paly">
-          <view style="flex: 1; padding-top: 20rpx">
-            <slider activeColor="#3385FF" :max="audioTime" :value="curTime" @changing="handleAudioSliderChangeing($event)" block-size="16" class="slider" />
-            <view class="card-time">
-              <text class="time">{{ curTime | formatVoiceTime }}</text>
-              <text class="time">{{ audioTime | formatVoiceTime }}</text>
-            </view>
-          </view>
-          <view class="is-paly-card">
-            <image
-              @click.stop="handleChangePlayStatus"
-              :src="play ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/play_icon.gif' : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/pause_icon.png'"
-            ></image>
-          </view>
-        </view>
-        <view class="fast-reverse">
-          <image @click="speedReverseHandler('reverse')" class="speed-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/fastReverse_icon.png"></image>
-          <block v-for="(item, index) in timesTheSpeed" :key="item.value">
-            <view class="speed-button" v-if="isTimes == item.value" @click="isTimesHandler(index)">
-              {{ item.name }}
-            </view>
-          </block>
-          <image @click="speedReverseHandler('speed')" class="speed-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/speed_icon.png"></image>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-import { activity } from "@/config/api";
-export default {
-  name: "",
-  filters: {
-    formatVoiceTime(e) {
-      let m = parseInt(e / 60);
-      let s = parseInt(e % 60);
-      return `${m > 9 ? m : "0" + m}:${s > 9 ? s : "0" + s}`;
-    },
-  },
-  components: {},
-  props: {
-    showAudioPop: {
-      type: Boolean,
-      default: false,
-      required: true,
-    },
-  },
-  data() {
-    return {
-      curTime: 0,
-      audioTime: 0, //当前音频总时长
-      title: "", //当前音频标题
-      activityTitle: "", //当前活动标题
-      play: false,
-      isEnded: false,
-      timesTheSpeed: [
-        { name: "倍速", value: 1 },
-        { name: "1.25倍", value: 1.25 },
-        { name: "1.5倍", value: 1.5 },
-        { name: "2倍", value: 2 },
-      ],
-    };
-  },
-  computed: {
-    //重新
-    audioInit() {
-      return {
-        activityId: this.$store.state.audioBg.activityId,
-        reportId: this.$store.state.audioBg.reportId,
-      };
-    },
-    // 几倍的播放速度
-    isTimes() {
-      return this.$store.state.audioBg.multiple;
-    },
-  },
-  watch: {
-    audioInit: {
-      handler(nval) {
-        this.init();
-      },
-      immediate: true,
-    },
-  },
-
-  created() {},
-  mounted() {},
-  methods: {
-    //点击隐藏事件
-    isShowMaskHandler() {
-      this.$emit("update:showAudioPop", false);
-    },
-    //数据初次加载
-    init() {
-      const curAudio = this.$store.state.audioBg.list;
-      if (this.globalBgAudioManager.src != curAudio.Url && curAudio.Url) {
-        this.$store.commit("audioBg/setMultiple", 1);
-        this.$store.commit("audioBg/updateAudioTime", 0);
-        this.globalBgAudioManager.src = curAudio.Url;
-        this.globalBgAudioManager.title = curAudio.Name;
-        this.globalBgAudioManager.startTime = 0;
-        this.globalBgAudioManager.playbackRate = this.isTimes;
-        this.curTime = 0;
-      } else {
-        this.curTime = parseInt(this.globalBgAudioManager.currentTime);
-      }
-      this.audioTime = curAudio.PlaySeconds;
-      this.title = curAudio.Name;
-      this.activityTitle = this.$store.state.audioBg.activityTitle;
-      this.play = !this.globalBgAudioManager.paused;
-      this.listenAudio();
-    },
-    //音频播放事件
-    listenAudio() {
-      this.globalBgAudioManager.onPlay(async () => {
-        console.log("音频播放");
-        this.play = true;
-        this.$store.commit("audioBg/updateAudioPause", false);
-        if (this.$store.state.audioBg.activityId) {
-          activity.backAudioPlay({ ActivityId: this.$store.state.audioBg.activityId });
-        }
-      });
-
-      this.globalBgAudioManager.onPause(() => {
-        console.log("音频暂停");
-        this.play = false;
-        this.$store.commit("audioBg/updateAudioPause", true);
-      });
-
-      this.globalBgAudioManager.onStop(() => {
-        console.log("音频停止");
-        this.$emit("update:showAudioPop", false);
-        uni.getSystemInfo({
-          success: (res) => {
-            if (res.osName == "ios") {
-              this.play = false;
-              this.$store.commit("audioBg/removeAudio");
-            } else {
-              this.play = false;
-              this.$store.commit("audioBg/updateAudioPause", true);
-            }
-          },
-        });
-      });
-
-      this.globalBgAudioManager.onEnded(() => {
-        console.log("音频onEnded");
-        this.$emit("update:showAudioPop", false);
-        this.$store.commit("audioBg/removeAudio");
-        this.$store.commit("audioBg/parseIntAudio", false);
-      });
-
-      this.globalBgAudioManager.onError((e) => {
-        console.log("音频onError", e);
-        this.$store.commit("audioBg/removeAudio");
-        this.$store.commit("audioBg/setMultiple", 1);
-        uni.showToast({
-          title: "音频播放错误",
-          icon: "none",
-        });
-      });
-
-      //音频的播放时间更新
-      this.globalBgAudioManager.onTimeUpdate(() => {
-        if (this.globalBgAudioManager.src && parseInt(this.globalBgAudioManager.currentTime) !== 0) {
-          this.curTime = parseInt(this.globalBgAudioManager.currentTime);
-          this.$store.commit("audioBg/updateAudioTime", this.curTime);
-        }
-      });
-    },
-    //拖动进度条
-    handleAudioSliderChangeing(e) {
-      this.curTime = e.detail.value;
-      this.globalBgAudioManager.seek(this.curTime);
-    },
-    //音频点击暂停播放
-    handleChangePlayStatus() {
-      if (!this.globalBgAudioManager.paused) {
-        this.globalBgAudioManager.pause();
-      } else {
-        this.globalBgAudioManager.play();
-      }
-    },
-    //倍速播放
-    isTimesHandler(i) {
-      console.log(this.curTime);
-      let index = i == 3 ? 0 : i + 1;
-      this.$store.commit("audioBg/setMultiple", this.timesTheSpeed[index].value);
-      this.globalBgAudioManager.playbackRate = this.isTimes;
-      this.globalBgAudioManager.startTime = this.curTime;
-      if (this.globalBgAudioManager.paused) {
-        this.globalBgAudioManager.play();
-      }
-    },
-    //快进 快退
-    speedReverseHandler(type) {
-      let isTime = type == "reverse" ? this.curTime - 15 : this.curTime + 15;
-      isTime = isTime <= 0 ? 0 : isTime >= this.audioTime ? this.audioTime - 1 : isTime;
-      this.globalBgAudioManager.seek(isTime);
-    },
-  },
-};
-</script>
-<style scoped lang="scss">
-.global-audio-box {
-  display: flex;
-  height: 100%;
-  position: fixed;
-  width: 100%;
-  top: 0;
-  left: 0;
-  z-index: 11;
-  .bg-overlay {
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    top: 0;
-    left: 0;
-    background-color: rgba(0, 0, 0, 0.7);
-  }
-  .activity-title {
-    position: relative;
-    width: 100%;
-    font-size: 30rpx;
-    font-weight: 500;
-    margin-bottom: 35rpx;
-    padding-right: 30rpx;
-    .icon-cross {
-      position: absolute;
-      right: 0;
-      top: 50%;
-      transform: translateY(-50%);
-      padding: 10rpx;
-    }
-  }
-  .audio-box {
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    padding: 30rpx;
-    padding-bottom: constant(safe-area-inset-bottom);
-    padding-bottom: env(safe-area-inset-bottom);
-    width: 100%;
-    background: #ffffff;
-    box-sizing: border-box;
-    border-radius: 30rpx 30rpx 0 0;
-  }
-  .audio-card {
-    width: 100%;
-    height: 282rpx;
-    background: #f9f9f9;
-    border-radius: 16rpx;
-    margin: 0 auto;
-    padding: 30rpx;
-    .slider {
-      width: 100%;
-      margin: 0;
-    }
-    .slider-paly {
-      display: flex;
-      height: 80rpx;
-      align-items: center;
-    }
-    .card-title {
-      color: #3385ff;
-      font-size: 28rpx;
-      padding: 0 40rpx;
-      text-align: center;
-      margin-bottom: 35rpx;
-    }
-    .card-time {
-      display: flex;
-      justify-content: space-between;
-      color: #999999;
-      font-size: 20rpx;
-    }
-    .is-paly-card {
-      width: 70rpx;
-      height: 70rpx;
-      flex-shrink: 0;
-      margin-left: 30rpx;
-      image {
-        width: 70rpx;
-        height: 70rpx;
-      }
-    }
-    .fast-reverse {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-top: 30rpx;
-      .speed-button {
-        width: 96rpx;
-        height: 47rpx;
-        background: #eaeaea;
-        border-radius: 8rpx;
-        text-align: center;
-        line-height: 47rpx;
-        margin: 0 70rpx;
-      }
-      .speed-img {
-        width: 50rpx;
-        height: 50rpx;
-      }
-    }
-  }
-}
-</style>

+ 0 - 421
components/audioModule/slider.vue

@@ -1,421 +0,0 @@
-<template>
-  <view class="container global-audio-box" v-if="showAudioPop">
-    <view class="bg-overlay" @click="isShowMaskHandler"></view>
-    <view class="audio-box">
-      <view class="activity-title">
-        {{ activityTitle }}
-        <view class="icon-cross" @click.stop="isShowMaskHandler">
-          <van-icon name="cross" font-size="32" />
-        </view>
-      </view>
-      <view class="audio-card">
-        <view class="card-title text_oneLine">
-          {{ title }}
-        </view>
-        <view class="slider-paly">
-          <view style="flex: 1; padding-top: 20rpx">
-            <view>
-              <movable-area class="slider" id="movable-area">
-                <movable-view
-                  class="time-button"
-                  animation="false"
-                  @change="handleSlideChange"
-                  @touchend="onTouchEnd"
-                  @htouchmove="onHtouchmove"
-                  direction="horizontal"
-                  id="movable-view"
-                  :x="movableViewX"
-                >
-                </movable-view>
-                <progress activeColor="#666" backgroundColor="#999" borderRadius="2" class="progress" :percent="progress" strokeWidth="2"></progress>
-              </movable-area>
-            </view>
-            <view class="card-time">
-              <text class="time">{{ curTime | formatVoiceTime }}</text>
-              <text class="time">{{ audioTime | formatVoiceTime }}</text>
-            </view>
-          </view>
-          <view class="is-paly-card">
-            <image
-              @click.stop="handleChangePlayStatus"
-              :src="play ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/play_icon.gif' : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/pause_icon.png'"
-            ></image>
-          </view>
-        </view>
-        <view class="fast-reverse">
-          <image @click="speedReverseHandler('reverse')" class="speed-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/fastReverse_icon.png"></image>
-          <block v-for="(item, index) in timesTheSpeed" :key="item.value">
-            <view class="speed-button" v-if="isTimes == item.value" @click="isTimesHandler(index)">
-              {{ item.name }}
-            </view>
-          </block>
-          <image @click="speedReverseHandler('speed')" class="speed-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/speed_icon.png"></image>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script>
-import { activity } from "@/config/api";
-export default {
-  name: "",
-  filters: {
-    formatVoiceTime(e) {
-      let m = parseInt(e / 60);
-      let s = parseInt(e % 60);
-      return `${m > 9 ? m : "0" + m}:${s > 9 ? s : "0" + s}`;
-    },
-  },
-  components: {},
-  props: {
-    showAudioPop: {
-      type: Boolean,
-      default: false,
-      required: true,
-    },
-  },
-  data() {
-    return {
-      movableViewX: 0,
-      currentTime: 0,
-      progress: 0,
-      moveAreaW: 0,
-      moveboxW: 0,
-      curTime: 0,
-      audioTime: 0, //当前音频总时长
-      title: "", //当前音频标题
-      activityTitle: "", //当前活动标题
-      play: false,
-      isEnded: false,
-      isMoving: false,
-      timesTheSpeed: [
-        { name: "倍速", value: 1 },
-        { name: "1.25倍", value: 1.25 },
-        { name: "1.5倍", value: 1.5 },
-        { name: "2倍", value: 2 },
-      ],
-    };
-  },
-  computed: {
-    //重新
-    audioInit() {
-      return {
-        activityId: this.$store.state.audioBg.activityId,
-        reportId: this.$store.state.audioBg.reportId,
-      };
-    },
-    // 几倍的播放速度
-    isTimes() {
-      return this.$store.state.audioBg.multiple;
-    },
-  },
-  watch: {
-    audioInit: {
-      handler(nval) {
-        this.init();
-        const query = uni.createSelectorQuery().in(this);
-        query
-          .select("#movable-area")
-          .boundingClientRect((data) => {
-            this.moveAreaW = data && data.width;
-          })
-          .exec();
-        query
-          .select("#movable-view")
-          .boundingClientRect((data) => {
-            this.moveboxW = data && data.width;
-          })
-          .exec();
-      },
-      immediate: true,
-    },
-  },
-
-  created() {},
-  mounted() {
-    console.log(123);
-  },
-  methods: {
-    handleSlideChange(e) {
-      console.log(e);
-      this.movableViewX = e.detail.x;
-      this.progress = Math.round((this.movableViewX / (this.moveAreaW - this.moveboxW)) * 100);
-      if (this.isMoving) {
-        this.curTime = Math.round(this.globalBgAudioManager.duration * (this.progress / 100));
-      }
-    },
-    // 用户拖动进度条结束时,重新给背景音乐的各项赋值
-    onTouchEnd() {
-      const isTime = parseInt(this.globalBgAudioManager.duration * (this.progress / 100));
-      this.globalBgAudioManager.seek(isTime);
-      setTimeout(() => {
-        this.isMoving = false;
-      }, 0);
-    },
-    onHtouchmove() {
-      this.isMoving = true;
-    },
-    //点击隐藏事件
-    isShowMaskHandler() {
-      this.$emit("update:showAudioPop", false);
-    },
-    //数据初次加载
-    init() {
-      const curAudio = this.$store.state.audioBg.list;
-      if (this.globalBgAudioManager.src != curAudio.Url && curAudio.Url) {
-        this.$store.commit("audioBg/setMultiple", 1);
-        this.$store.commit("audioBg/updateAudioTime", 0);
-        this.globalBgAudioManager.src = curAudio.Url;
-        this.globalBgAudioManager.title = curAudio.Name;
-        this.globalBgAudioManager.startTime = 0;
-        this.globalBgAudioManager.playbackRate = this.isTimes;
-        this.curTime = 0;
-        this.progress = 0;
-        this.movableViewX = 0;
-        console.log(this.movableViewX, " this.movableViewX = 0;");
-      } else {
-        this.curTime = parseInt(this.globalBgAudioManager.currentTime);
-      }
-      console.log(this.movableViewX, " this.movableViewX = 0;");
-      this.audioTime = curAudio.PlaySeconds;
-      this.title = curAudio.Name;
-      this.activityTitle = this.$store.state.audioBg.activityTitle;
-      this.play = !this.globalBgAudioManager.paused;
-      this.listenAudio();
-    },
-    //音频播放事件
-    listenAudio() {
-      this.globalBgAudioManager.onPlay(async () => {
-        console.log("音频播放");
-        this.play = true;
-        this.$store.commit("audioBg/updateAudioPause", false);
-        if (this.$store.state.audioBg.activityId) {
-          activity.backAudioPlay({ ActivityId: this.$store.state.audioBg.activityId });
-        }
-      });
-
-      this.globalBgAudioManager.onPause(() => {
-        console.log("音频暂停");
-        this.play = false;
-        this.$store.commit("audioBg/updateAudioPause", true);
-      });
-
-      this.globalBgAudioManager.onStop(() => {
-        console.log("音频停止");
-        this.$emit("update:showAudioPop", false);
-        uni.getSystemInfo({
-          success: (res) => {
-            if (res.osName == "ios") {
-              this.play = false;
-              this.$store.commit("audioBg/removeAudio");
-            } else {
-              this.play = false;
-              this.$store.commit("audioBg/updateAudioPause", true);
-            }
-          },
-        });
-      });
-
-      this.globalBgAudioManager.onEnded(() => {
-        console.log("音频onEnded");
-        this.$emit("update:showAudioPop", false);
-        this.$store.commit("audioBg/removeAudio");
-        this.$store.commit("audioBg/parseIntAudio", false);
-      });
-
-      this.globalBgAudioManager.onError((e) => {
-        console.log("音频onError", e);
-        this.$store.commit("audioBg/removeAudio");
-        this.$store.commit("audioBg/setMultiple", 1);
-        uni.showToast({
-          title: "音频播放错误",
-          icon: "none",
-        });
-      });
-
-      //音频的播放时间更新
-      this.globalBgAudioManager.onTimeUpdate(() => {
-        if (!this.isMoving) {
-          if (this.globalBgAudioManager.src && parseInt(this.globalBgAudioManager.currentTime) !== 0) {
-            this.movableViewX = Math.round(((this.moveAreaW - this.moveboxW) * parseInt(this.globalBgAudioManager.currentTime)) / this.globalBgAudioManager.duration);
-            this.progress = Math.round((100 * parseInt(this.globalBgAudioManager.currentTime)) / this.globalBgAudioManager.duration);
-            this.curTime = parseInt(this.globalBgAudioManager.currentTime);
-            this.$store.commit("audioBg/updateAudioTime", this.curTime);
-          }
-        }
-      });
-    },
-    //拖动进度条
-    // handleAudioSliderChangeing(e) {
-    //   this.curTime = e.detail.value;
-    //   this.globalBgAudioManager.seek(this.curTime);
-    // },
-    //音频点击暂停播放
-    handleChangePlayStatus() {
-      if (!this.globalBgAudioManager.paused) {
-        this.globalBgAudioManager.pause();
-      } else {
-        this.globalBgAudioManager.play();
-      }
-    },
-    //倍速播放
-    isTimesHandler(i) {
-      console.log(this.curTime);
-      let index = i == 3 ? 0 : i + 1;
-      this.$store.commit("audioBg/setMultiple", this.timesTheSpeed[index].value);
-      this.globalBgAudioManager.playbackRate = this.isTimes;
-      this.globalBgAudioManager.startTime = this.curTime;
-      if (this.globalBgAudioManager.paused) {
-        this.globalBgAudioManager.play();
-      }
-    },
-    //快进 快退
-    speedReverseHandler(type) {
-      let isTime = type == "reverse" ? this.curTime - 15 : this.curTime + 15;
-      isTime = isTime <= 0 ? 0 : isTime >= this.audioTime ? this.audioTime - 1 : isTime;
-      this.globalBgAudioManager.seek(isTime);
-    },
-  },
-};
-</script>
-<style>
-.slider {
-  height: 40rpx;
-  margin: 0 32rpx;
-  position: relative;
-  width: 528rpx;
-}
-
-.slider .time-button {
-  background: #333;
-  border-radius: 30rpx;
-  color: #fff;
-  height: 30rpx;
-  text-align: center;
-  width: 30rpx;
-  z-index: 1;
-}
-
-.slider .progress {
-  height: 4rpx;
-  left: 0;
-  position: absolute;
-  top: 18rpx;
-  width: 528rpx;
-}
-
-.play-button {
-  -webkit-box-pack: center;
-  -webkit-box-align: center;
-  align-items: center;
-  display: flex;
-  justify-content: center;
-  margin-top: 52rpx;
-}
-</style>
-<style scoped lang="scss">
-.global-audio-box {
-  display: flex;
-  height: 100%;
-  position: fixed;
-  width: 100%;
-  top: 0;
-  left: 0;
-  z-index: 11;
-  .bg-overlay {
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    top: 0;
-    left: 0;
-    background-color: rgba(0, 0, 0, 0.7);
-  }
-  .activity-title {
-    position: relative;
-    width: 100%;
-    font-size: 30rpx;
-    font-weight: 500;
-    margin-bottom: 35rpx;
-    padding-right: 30rpx;
-    .icon-cross {
-      position: absolute;
-      right: 0;
-      top: 50%;
-      transform: translateY(-50%);
-      padding: 10rpx;
-    }
-  }
-  .audio-box {
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    padding: 30rpx;
-    padding-bottom: constant(safe-area-inset-bottom);
-    padding-bottom: env(safe-area-inset-bottom);
-    width: 100%;
-    background: #ffffff;
-    box-sizing: border-box;
-    border-radius: 30rpx 30rpx 0 0;
-  }
-  .audio-card {
-    width: 100%;
-    height: 282rpx;
-    background: #f9f9f9;
-    border-radius: 16rpx;
-    margin: 0 auto;
-    padding: 30rpx;
-    .slider {
-      width: 100%;
-      margin: 0;
-    }
-    .slider-paly {
-      display: flex;
-      height: 80rpx;
-      align-items: center;
-    }
-    .card-title {
-      color: #3385ff;
-      font-size: 28rpx;
-      padding: 0 40rpx;
-      text-align: center;
-      margin-bottom: 35rpx;
-    }
-    .card-time {
-      display: flex;
-      justify-content: space-between;
-      color: #999999;
-      font-size: 20rpx;
-    }
-    .is-paly-card {
-      width: 70rpx;
-      height: 70rpx;
-      flex-shrink: 0;
-      margin-left: 30rpx;
-      image {
-        width: 70rpx;
-        height: 70rpx;
-      }
-    }
-    .fast-reverse {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-top: 30rpx;
-      .speed-button {
-        width: 96rpx;
-        height: 47rpx;
-        background: #eaeaea;
-        border-radius: 8rpx;
-        text-align: center;
-        line-height: 47rpx;
-        margin: 0 70rpx;
-      }
-      .speed-img {
-        width: 50rpx;
-        height: 50rpx;
-      }
-    }
-  }
-}
-</style>

+ 13 - 10
pages/activity/activity.vue

@@ -50,7 +50,7 @@
               <view class="item-img" @click="goDetails(item)"> </view>
               <view :style="{ 'background-image': 'url(' + item.ImgUrlBg + ')' }" class="activity-ui">
                 <view class="activity-li" :style="{ 'background-image': 'url(' + val.ImgUrlBg + ')' }" v-for="val in item.List" :key="val.KeyWord" @click="goDetails(val, item.Resource)">
-                  <image v-if="val.IsNew" class="item-image" lazy-load src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/hot_activity.png"></image>
+                  <image v-if="val.IsNew" class="item-image" lazy-load src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/new_report.png"></image>
                   <text class="text_oneLine"> {{ val.KeyWord }}</text>
                 </view>
               </view>
@@ -64,7 +64,7 @@
               <view class="item-img" @click="goDetails(item)"> </view>
               <view :style="{ 'background-image': 'url(' + item.ImgUrlBg + ')' }" class="activity-ui">
                 <view class="activity-li" :style="{ 'background-image': 'url(' + val.ImgUrlBg + ')' }" v-for="val in item.List" :key="val.KeyWord" @click="goDetails(val, item.Resource)">
-                  <image v-if="val.IsNew" class="item-image" lazy-load src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/hot_activity.png"></image>
+                  <image v-if="val.IsNew" class="item-image" lazy-load src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/new_report.png"></image>
                   <text class="text_oneLine"> {{ val.KeyWord }}</text>
                 </view>
               </view>
@@ -279,7 +279,11 @@ export default {
       if (item.Resource === 1 || key === 1) {
         let type = item.ActivityTypeName || "";
         let key = item.ActivityTypeId || item.KeyWord;
-        this.$store.dispatch("checkHandle", "/activityPages/themeActivity/themeActivity?title=" + key + "&type=" + type + "&permissionIds=" + this.chartPermissionIds + "&whichDay=" + this.whichDay);
+        let id = typeof key == "string" ? item.ActivityId : "";
+        this.$store.dispatch(
+          "checkHandle",
+          "/activityPages/themeActivity/themeActivity?title=" + key + "&type=" + type + "&permissionIds=" + this.chartPermissionIds + "&whichDay=" + this.whichDay + "&id=" + id
+        );
       } else {
         if (key) {
           this.$store.dispatch("checkHandle", "/activityPages/specialDetail/specialDetail?id=" + item.ActivityId);
@@ -499,7 +503,7 @@ export default {
       height: 86rpx;
       display: flex;
       align-items: center;
-      justify-content:center;
+      justify-content: center;
       background-repeat: no-repeat;
       background-size: 100% 100%;
       padding: 0 20rpx;
@@ -508,12 +512,11 @@ export default {
       color: #fff;
       .item-image {
         position: absolute;
-        left: 0;
-        top: 50%;
-        transform: translateY(-50%);
-        width: 100%;
-        height: 50rpx;
-
+        right: 0;
+        top: 0;
+        width: 60rpx;
+        height: 30rpx;
+        border-radius: 4rpx;
       }
       .new_img {
         width: 26rpx;

+ 1 - 1
pages/purchaser/purchaser.vue

@@ -143,7 +143,7 @@ export default {
       hotList: [],
       kolList: [],
       tabBars: [
-        { titel: "用户收藏榜", name: "用户" },
+        { titel: "月度收藏榜", name: "用户" },
         { titel: "主题热度榜", name: "主题" },
         { titel: "KOL榜", name: "专家" },
       ],