From f135434894a67b13fd703263ae79e4335f06aa8d Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 29 三月 2024 19:46:47 +0800
Subject: [PATCH] 音频播放页冲突解决
---
packageBookService/pages/bookServices/examination/questionList/index.wxml | 2 +-
packageDomain/pages/resourceDetails/myAudio/index.wxml | 19 +++++++++----------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.wxml b/packageBookService/pages/bookServices/examination/questionList/index.wxml
index 9153292..22ae54e 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionList/index.wxml
@@ -242,7 +242,7 @@
style="background-color:{{isNight ? '#000' : '#fff'}}; "
/>
</view>
- <!-- 鎴戠殑閿欓妯″紡涓嬶紝鏌ョ湅瑙ｆ瀽鎸夐挳 -->
+ <!-- 鎴戠殑閿欓銆佹敹钘忔ā寮忎笅锛屾煡鐪嬭В鏋愭寜閽� -->
<view
wx:if="{{(answerType == 'collectQuestion' || answerType == 'errorQuestion') && (item.questionType == 'multipleChoice' || item.questionType == 'completion' || item.questionType == 'shortAnswer')}}"
>
diff --git a/packageDomain/pages/resourceDetails/myAudio/index.wxml b/packageDomain/pages/resourceDetails/myAudio/index.wxml
index 434cfaf..90482e5 100644
--- a/packageDomain/pages/resourceDetails/myAudio/index.wxml
+++ b/packageDomain/pages/resourceDetails/myAudio/index.wxml
@@ -27,24 +27,23 @@
</view> -->
<!-- 鏆傚仠鎾斁 -->
-<<<<<<< Updated upstream
<view
class="audioIconBox color"
style="margin-left: 30rpx; margin-right: 10rpx"
>
- <view wx:if="{{!isplay}}" bind:tap="play">
- <t-icon name="play-circle-stroke" size="24" />
-=======
- <view class="audioIconBox color" style="margin-left: 30rpx; margin-right: 10rpx;">
- <view wx:if="{{!isplay}}" bind:tap='play' class="pauseCircleBox">
+ <view wx:if="{{!isplay}}" bind:tap="play" class="pauseCircleBox">
<!-- <t-icon name="play-circle-stroke" size="24" /> -->
- <image src="/static/images/resourceDetailsMyAudio/play@2x.png" mode="" />
-
->>>>>>> Stashed changes
+ <image
+ src="/static/images/resourceDetailsMyAudio/play@2x.png"
+ mode=""
+ />
</view>
<view wx:else bind:tap="stop" class="pauseCircleBox">
<!-- <t-icon name="pause-circle-stroke" size="24" /> -->
- <image src="/static/images/resourceDetailsMyAudio/zanting@2x.png" mode="" />
+ <image
+ src="/static/images/resourceDetailsMyAudio/zanting@2x.png"
+ mode=""
+ />
</view>
</view>
<slider
--
Gitblit v1.9.1