Merge branch 'master' of gitlab2.dui88.com:wanghongyuan/hello_taobao

dist/components/comgou_mai_ji_lu32/comgou_mai_ji_lu32.acss

@@ -84,7 +84,7 @@
   height: 183rpx;
   opacity: 1;
   /* top: 10rpx; */
-  top: -3%;
+  top: 15rpx;
   position: absolute;
 }
 

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.acss

@@ -28,11 +28,12 @@
 }
 
 .huo_dong_ye .music {
-  width: 160rpx;
-  height: 58rpx;
+  z-index: 90;
+  width: 56rpx;
+  height: 56rpx;
   opacity: 1;
-  left: 295rpx;
-  top: 230rpx;
+  left: 224rpx;
+  top: 242rpx;
   position: absolute;
 }
 

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.axml

 <view class="huo_dong_ye">
   <view class="{{maskVisible ? 'mask' : ''}}"></view>
+  <image class="music" a:if="{{musicSwitch}}" onTap="onmusicSwitch" src={{resList['0c115480-d22e-4902-a745-e55eadf7bf91'].url}} />
+  <image class="music" a:if="{{!musicSwitch}}"  onTap="onmusicSwitch" src={{resList['ddd2f68b-0059-4eb1-8667-4b7471b11ddd'].url}} />
   <image class="di_kao_bei2"  src={{resList['66f2b76f-7265-4cb2-9b4d-7e8207ab1d74'].url}} />
   <view class="container">
       <image class="logo" src={{resList['dd7d3a3b-6fcb-427d-8353-da169708bbab'].url}} />
   <image onTap="onPrizeBtnClick"  class="jiang_pinicon" src={{resList['b7517eae-3bc2-4456-935a-e6e3e1fe995e'].url}} />
   <image class="gui_zeicon" onTap="showRuleModal"  src={{resList['d826a2f1-a3ec-4764-aad2-f6cacc43cfce'].url}} />
 
-  <!-- <image class="music" a:if="{{!musicswitch}}" onTap="musicOpen" src={{resList['0c115480-d22e-4902-a745-e55eadf7bf91'].url}} />
-  <image class="music" a:if="{{musicswitch}}" onTap="musicOpen" src={{resList['ddd2f68b-0059-4eb1-8667-4b7471b11ddd'].url}} /> -->
 
   <image class="tu2" src={{resList['d2cd8191-8fbd-423a-8c36-5bd52659317e'].url}} />
   <!-- 立即购买 -->

dist/pages/pagehuo_dong_ye/pagehuo_dong_ye.js

@@ -54,6 +54,7 @@ Page({
     ruleData: '',
     screentop:'',
     maskVisible:false,
+    musicSwitch:true
   },
 
 
@@ -68,7 +69,18 @@ Page({
     this.getOrderList();
     // this.screenAdapt();
 
-    this.addMusic();
+    this.onmusicSwitch();
+    
+  },
+
+  onmusicSwitch(){
+    let {musicSwitch} = this.data;
+    this.addMusic(musicSwitch);
+    this.setData({
+      musicSwitch:!musicSwitch
+    })
+    console.log('music点击后',musicSwitch);
+
   },
 
   // screenAdapt(){
@@ -484,13 +496,15 @@ Page({
     // console.log(SHARE_CONFIG)
     return SHARE_CONFIG;
   },
-  async addMusic(){
+  async addMusic(musicSwitch){
     const resultSrc = await app.cloud.file.getTempFileURL({
 			fileId: 'cloud://C7A066C702682E94326284DF8A2975CC//FILA_building_loop.mp3'
 		});
     let musicUrl = null;
     if (resultSrc[0]) musicUrl = resultSrc[0].url;
-    playBgMusic(true,musicUrl)
+    // let {musicSwitch} = this.data;
+    // playBgMusic(true,musicUrl)
+    playBgMusic(musicSwitch,musicUrl);
     console.log('fuck music')
   }
 });
\ No newline at end of file

dist/pages/pagejie_shu_ye/pagejie_shu_ye.acss

@@ -498,7 +498,7 @@
 }
 
 .jie_shu_ye .gou_mai_ji_lu46 .zu13447 .item{
-  top:-10%;
+  top:15rpx;
   width: 540rpx;
   height: 222rpx;
   opacity: 1;