Merge branch 'nativehome_tst' of http://code.mayi888.com/chengmo/mayi-mp-shop into nativehome_tst

src/components/basicTool/shop-popup/index.vue

 <!-- 文字上下滚动 -->
 <template>
   <div
-    class="marquee"
+    class="marquee-wrap"
     v-if="targetShow"
-    :style="[this.render?{'pointer-events':'none'}:'',{'top':datas.componentData.yPosition+'em'}]"
+    :style="{'top':(datas.componentData.yPosition * 16) +'px'}"
   >
     <div class="marquee_box">
       <div class="evaluate" :class="animate?'animation_in':'animation_out'">
-        <img :src="selectImg | DFSImg(300,300)" alt />
+        <img :src="selectImg" alt />
         <span>{{subName}}刚刚购买了一单</span>
       </div>
     </div>
@@ -15,7 +15,9 @@
 </template>
 
 <script>
+import { DFSImg} from '../../../utils/index.js'
 let api;
+
 const app = getApp()
 export default {
   name: "shop-popup",
@@ -106,6 +108,8 @@ export default {
       this.selectname = this.marqueeList[this.selectIndex].customerNickname;
       this.selectImg = this.marqueeList[this.selectIndex].customerHeadImage;
 
+      this.selectImg = DFSImg(this.selectImg,300,300)
+
         if (this.selectname.length > 1) {
         this.subName =  `${this.selectname.substr(0, 1)}****${this.selectname.charAt(
           this.selectname.length - 1
@@ -141,8 +145,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-/* @import url(); 引入css类 */
-.marquee {
+.marquee-wrap {
   font-size: 16px;
   width: 100%;
   align-items: center;
@@ -151,7 +154,6 @@ export default {
   box-sizing: border-box;
   overflow: hidden;
   position: fixed;
-  // top: 10%;
   left: 0px;
   z-index: 1999;
 }