From 68368b667f6d4a7bd8b4af3930877ad8539dcf3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=A5=E6=96=AF?= <9068149@qq.com>
Date: Wed, 10 Nov 2021 18:17:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A7=86=E9=A2=91=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/componentscom/index.js         |  1 -
 .../componentscom/listswitching/index.vue     | 27 ---------
 .../componentscom/pictureads/index.vue        |  4 --
 .../componentscom/storenotecard/index.vue     | 12 +---
 .../componentscom/suspension/index.vue        | 41 ++++++-------
 .../componentscom/videoss/index.vue           | 30 +++-------
 src/components/phoneBottom/index.vue          | 60 -------------------
 src/views/home.vue                            |  6 --
 8 files changed, 30 insertions(+), 151 deletions(-)
 delete mode 100644 src/components/phoneBottom/index.vue

diff --git a/src/components/componentscom/index.js b/src/components/componentscom/index.js
index 70bd328..50bf02f 100644
--- a/src/components/componentscom/index.js
+++ b/src/components/componentscom/index.js
@@ -10,7 +10,6 @@ export { default as storeinformation } from './storeinformation'
 export { default as entertheshop } from './entertheshop'
 export { default as notice } from './notice'
 export { default as videoss } from './videoss'
-export { default as voicer } from './voicer'
 export { default as custommodule } from './custommodule'
 export { default as communitypowder } from './communitypowder'
 export { default as storenotecard } from './storenotecard'
diff --git a/src/components/componentscom/listswitching/index.vue b/src/components/componentscom/listswitching/index.vue
index a9ee6cf..c9a6bc5 100644
--- a/src/components/componentscom/listswitching/index.vue
+++ b/src/components/componentscom/listswitching/index.vue
@@ -205,12 +205,6 @@
       >
         <!-- 视频图片 -->
         <div class="bg-pic">
-          <!-- <img
-            draggable="false"
-            :src="item | getCommodityItemData('coverUrl')"
-            alt=""
-            :style="{ 'border-radius': datas.borderRadius + 'px' }"
-          /> -->
           <img
             draggable="false"
             :src="item.coverUrl"
@@ -267,7 +261,6 @@
             }"
           >
             {{ item.name }}
-            <!-- {{ item | getCommodityItemData('name') }} -->
           </h5>
           <!-- 视频描述 -->
           <p
@@ -276,7 +269,6 @@
             }"
           >
             {{ item.introduce }}
-            <!-- {{ item | getCommodityItemData('introduce') }} -->
           </p>
           <div
             class="mony"
@@ -285,7 +277,6 @@
             <span v-show="datas.priceofcommodity"
               ><i>￥</i>
               {{ item.price }}
-              <!-- {{ item | getCommodityItemData('price') }} -->
             </span>
             <div v-show="datas.purchasebutton">
               <van-icon
@@ -554,12 +545,6 @@
             >
               <!-- 视频图片 -->
               <div class="bg-pic">
-                <!-- <img
-                  draggable="false"
-                  :src="item | getCommodityItemData('coverUrl')"
-                  alt=""
-                  :style="{ 'border-radius': datas.borderRadius + 'px' }"
-                /> -->
                 <img
                   draggable="false"
                   :src="item.coverUrl"
@@ -624,7 +609,6 @@
                   }"
                 >
                   {{ item.name }}
-                  <!-- {{ item | getCommodityItemData('name') }} -->
                 </h5>
                 <!-- 视频描述 -->
                 <p
@@ -633,7 +617,6 @@
                   }"
                 >
                   {{ item.introduce }}
-                  <!-- {{ item | getCommodityItemData('introduce') }} -->
                 </p>
                 <div
                   class="mony"
@@ -642,7 +625,6 @@
                   <span v-show="datas.priceofcommodity"
                     ><i>￥</i>
                     {{ item.price }}
-                    <!-- {{ item | getCommodityItemData('price') }} -->
                   </span>
                   <div v-show="datas.purchasebutton">
                     <van-icon
@@ -882,12 +864,6 @@
               >
                 <!-- 视频图片 -->
                 <div class="bg-pic">
-                  <!-- <img
-                    draggable="false"
-                    :src="item | getCommodityItemData('coverUrl')"
-                    alt=""
-                    :style="{ 'border-radius': datas.borderRadius + 'px' }"
-                  /> -->
                   <img
                     draggable="false"
                     :src="item.coverUrl"
@@ -953,7 +929,6 @@
                     }"
                   >
                     {{ item.name }}
-                    <!-- {{ item | getCommodityItemData('name') }} -->
                   </h5>
                   <!-- 视频描述 -->
                   <p
@@ -963,7 +938,6 @@
                     }"
                   >
                     {{ item.introduce }}
-                    <!-- {{ item | getCommodityItemData('introduce') }} -->
                   </p>
                   <div
                     class="mony"
@@ -972,7 +946,6 @@
                     <span v-show="datas.priceofcommodity"
                       ><i>￥</i>
                       {{ item.price }}
-                      <!-- {{ item | getCommodityItemData('price') }} -->
                     </span>
                     <div v-show="datas.purchasebutton">
                       <van-icon
diff --git a/src/components/componentscom/pictureads/index.vue b/src/components/componentscom/pictureads/index.vue
index b1770be..ad01b2c 100644
--- a/src/components/componentscom/pictureads/index.vue
+++ b/src/components/componentscom/pictureads/index.vue
@@ -19,7 +19,6 @@
         :key="index"
         class="imgLis"
         :style="{ 'margin-bottom': datas.imageMargin + 'px' }"
-        @click="clickBanner"
       >
         <!-- 图片 -->
         <img
@@ -175,9 +174,6 @@ export default {
         }
       })
     },
-    clickBanner(){
-      this.$emit('clickBanner')
-    }
   },
 }
 </script>
diff --git a/src/components/componentscom/storenotecard/index.vue b/src/components/componentscom/storenotecard/index.vue
index 81d2e81..376226c 100644
--- a/src/components/componentscom/storenotecard/index.vue
+++ b/src/components/componentscom/storenotecard/index.vue
@@ -154,17 +154,9 @@ export default {
     }
   },
 
-  created() {
-    this.initImageList()
-  },
+  created() {},
 
-  methods: {
-    // 初始化更新imageList数据
-    initImageList() {
-      this.datas.imageList = this.$utils.replaceImageList(this.datas.imageList)
-      console.log(this.datas.imageList, '------------created imageList')
-    },
-  },
+  methods: {},
 }
 </script>
 
diff --git a/src/components/componentscom/suspension/index.vue b/src/components/componentscom/suspension/index.vue
index 6cd6d8b..ec580d5 100644
--- a/src/components/componentscom/suspension/index.vue
+++ b/src/components/componentscom/suspension/index.vue
@@ -1,43 +1,40 @@
 <template>
-  <div id="suspension" @click="goHttp(datas)">
-    <drag></drag>
+  <div id="suspension">
+    <div class="suspension-wrap">
+      <img
+        class="suspension-logo"
+        src="https://imgs.starfirelink.com/vue-fire-start-h5/shop-peison/icon_back_36.png"
+      />
+    </div>
+    <!-- 删除组件 -->
+    <slot name="deles" />
   </div>
 </template>
 <script>
-import drag from './drag'
 export default {
   name: 'suspension',
   props: {
     datas: Object,
   },
-  components: {
-    drag,
-  },
-  data() {
-    return {}
-  },
-
-  created() {
-    console.log(this.datas, '--------------suspension data')
-  },
-  mounted() {
-    this.moveDiv = this.$refs.moveDiv
-    console.log(this.moveDiv, '--------------moveDiv data')
-  },
-  methods: {
-    goHttp(res) {
-      console.log(this.moveDiv, '--------------moveDiv data')
-    },
-  },
 }
 </script>
 <style lang="less" scoped>
 #suspension {
+  width: 100%;
+  height: 36px;
+  position: relative;
+  position: absolute;
+  right: 0;
+  bottom: 10%;
+  z-index: 999;
   border: none;
   box-sizing: border-box;
   .suspension-wrap {
     width: 36px;
     height: 36px;
+    position: absolute;
+    right: 30px;
+    z-index: 1001;
     .suspension-logo {
       width: 36px;
       height: 36px;
diff --git a/src/components/componentscom/videoss/index.vue b/src/components/componentscom/videoss/index.vue
index 7cccc9e..04d032e 100644
--- a/src/components/componentscom/videoss/index.vue
+++ b/src/components/componentscom/videoss/index.vue
@@ -1,21 +1,19 @@
 <template>
   <div class="videoss">
     <!-- 默认视频 -->
-    <section class="default" v-if="!datas.videoData">
+    <section class="default" v-if="!datas.src">
       <van-icon name="tv-o" size="150px" />
     </section>
 
     <!-- 选择视频后 -->
-    <section v-else style="min-height: 200px; position: relative">
-      <!-- 视频封面 -->
-      <img
-        draggable="false"
-        :src="datas.videoData.coverUrl"
-        alt=""
-        style="width: 100%; display: block"
-      />
-      <!-- 图标 -->
-      <van-icon class="bof" name="play-circle-o" />
+    <section v-else style="position: relative">
+      <video
+        :src="datas.src"
+        controls
+        :autoplay="datas.autoplay"
+        :poster="datas.coverUrl"
+        width="100%"
+      ></video>
     </section>
 
     <!-- 删除组件 -->
@@ -31,19 +29,9 @@ export default {
   },
 
   created() {
-    this.initImageList()
   },
 
   methods: {
-    // 初始化更新imageList数据
-    initImageList() {
-      if (this.datas.videoData) {
-        let shopCommodity = JSON.parse(localStorage.getItem('shopCommodity'))
-        this.datas.videoData =
-          shopCommodity[this.datas.videoData.type][this.datas.videoData.id]
-        console.log(this.datas.videoData, '------------created imageList')
-      }
-    },
   },
 }
 </script>
diff --git a/src/components/phoneBottom/index.vue b/src/components/phoneBottom/index.vue
deleted file mode 100644
index 08a3b3a..0000000
--- a/src/components/phoneBottom/index.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
-  <div class="phoneBottom">
-    <p class="ft-links" v-show="datas.isShowBootom">
-      <span>店铺主页</span>
-      <span>个人中心</span>
-      <!-- <span>关注我们</span> -->
-      <!-- <span>店铺信息</span> -->
-    </p>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'phoneBottom',
-  props:['datas'],
-  watch: {
-    datas() {
-      // console.log(this.datas,'------------this.datas')
-    },
-  },
-}
-</script>
-
-<style scoped lang="less">
-.phoneBottom {
-  width: 100%;
-  background-color: #fff;
-  min-height: 145px;
-  cursor: pointer;
-  padding-top: 30px;
-  box-sizing: border-box;
-  .ft-links {
-    text-align: center;
-    padding: 0px 15px 10px;
-    span {
-      padding: 0 6px;
-      color: #666;
-      font-size: 12px;
-      border-right: 1px solid #e5e5e5;
-      &:last-of-type {
-        border-right: 0;
-      }
-    }
-  }
-
-  .yinjia {
-    color: #bfbfc3;
-    text-align: center;
-    font-size: 11px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    .logo {
-      width: 15px;
-      height: 15px;
-      margin-right: 5px;
-    }
-  }
-}
-</style>
diff --git a/src/views/home.vue b/src/views/home.vue
index 83b0ee4..9a762fc 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -28,8 +28,6 @@
               />
             </keep-alive>
           </template>
-          <!-- 底部 -->
-          <phoneBottom :datas="pageSetup.bottomLogo" />
         </section>
       </van-pull-refresh>
     </section>
@@ -37,7 +35,6 @@
 </template>
 
 <script>
-import phoneBottom from 'components/phoneBottom' // 手机底部
 import headerTop from 'components/headerTop'
 import collect from 'components/collect'
 
@@ -54,7 +51,6 @@ import {
   entertheshop,
   notice,
   videoss,
-  voicer,
   custommodule,
   communitypowder,
   storenotecard,
@@ -164,7 +160,6 @@ export default {
   components: {
     collect,
     headerTop,
-    phoneBottom,
     captiontext,
     placementarea,
     pictureads,
@@ -177,7 +172,6 @@ export default {
     entertheshop,
     notice,
     videoss,
-    voicer,
     custommodule,
     communitypowder,
     storenotecard,