Parcourir la source

苹果兼容样式修改

tanxue il y a 3 semaines
Parent
commit
c553f65631
2 fichiers modifiés avec 45 ajouts et 45 suppressions
  1. 1 2
      common/styles/global/pages.scss
  2. 44 43
      components/catalogue/catalogue.vue

+ 1 - 2
common/styles/global/pages.scss

@@ -746,11 +746,10 @@
 	.catalogue-nianji-title{height: 50rpx;line-height: 50rpx;display: inline-block;font-size: 36rpx;color: #fff;
 	background-color: #068aea;padding: 0 20px;border-radius: 0 25rpx 25rpx 0;margin-right: auto;}
 	.catalogue-mt{margin-top: 20rpx;}
-	.uni-scroll-view{position: unset;}
 	.catalogue-close-btn{
 		width: 54rpx;height: 54rpx;
 		background-image: url("@/static/images/catalog/catalog-close-btn.png");@include ezy-no-repeat-cover;
-		position: absolute;top: 40rpx;right: 36rpx;
+		position: absolute;top: 40rpx;right: 32rpx;
 	}
 	.ezy-catalogue-collapse{
 		background-color: transparent!important;flex: 1;overflow-y: auto;

+ 44 - 43
components/catalogue/catalogue.vue

@@ -1,51 +1,52 @@
 <template>
 	<uni-popup ref="popupRef" :animation="false" :is-mask-click="false"
 		mask-background-color="rgba(255, 255, 255, 0.6);" :is-shadow="false">
-		<scroll-view :scroll-y="true" :scroll-top="scrollTop" class="ezy-catalogue-dialog"
-			:style="{backgroundImage: 'url(' + catalogueBjFun() + ')'}">
+		<view class="ezy-catalogue-dialog" :style="{backgroundImage: 'url(' + catalogueBjFun() + ')'}">
 			<uni-icons @click="handleClose" class="catalogue-close-btn"></uni-icons>
-			<!-- 当前上下册只针对数学 -->
-      <view v-if="subjectId == 1" class="catalogue-nianji-title">{{ jieTexts ? jieTexts[0]: ''}}</view>
-      <!-- 当前只针对新版英语     -->
-      <view v-if="subjectId == 2 && typeId == 1" class="catalogue-nianji-title">{{ jieTexts ? jieTexts[0]: ''}}</view>
-			<!-- 目录区域 -->
-			<uni-collapse v-model="activeCollapse" class="ezy-catalogue-collapse"
-				:class="{ 'ezy-catalogue-collapse-vip': AuthCode === 'VIP'}" accordion>
-				<template v-for="(item,index) in list">
-					<!-- 当前上下册只针对数学 -->
-					<view v-if="subjectId == 1 && index == shuxueShangxia" class="catalogue-nianji-title catalogue-mt">
-						{{jieTexts ? jieTexts[1]: ''}}
-					</view>
-          <view v-if="subjectId == 2 && typeId == 1 && index == shuxueShangxia" class="catalogue-nianji-title catalogue-mt">
-            {{jieTexts ? jieTexts[1]: ''}}
-          </view>
-					<uni-collapse-item title-border="none" :border="false" :name="index+''" class="collapse-item-box"
-						:class="{ 'collapse-active': activeCollapse === index+''}">
-						<template v-slot:title>
-							<view @click.stop="handleSelectZhang(item,index)" class="collapse-title">
-								<view class="collapse-num-box">{{index+1}}</view>
-								<!-- 章名 -->
-								<text class="collapse-name">{{item.zhangName}}</text>
-								<!-- 锁 -->
-								<!-- <template v-if="AuthCode !== 'VIP'">
-									<view class="collapse-lock" v-if="index!=0"></view>
-								</template> -->
-							</view>
-						</template>
-						<view class="collapse-content-box">
-							<view v-for="(jie,cindex) in item.jieList" class="collapse-content-item"
-								@click="handleJieClick(item,jie,index,cindex)">
-								<text class="jie-index">{{`${index+1}.${cindex+1}`}}</text>
-								<text class="text">{{jie.jieName}}</text>
-							</view>
+			<scroll-view :scroll-y="true" :scroll-top="scrollTop" >
+				<!-- 当前上下册只针对数学 -->
+		  <view v-if="subjectId == 1" class="catalogue-nianji-title">{{ jieTexts ? jieTexts[0]: ''}}</view>
+		  <!-- 当前只针对新版英语     -->
+		  <view v-if="subjectId == 2 && typeId == 1" class="catalogue-nianji-title">{{ jieTexts ? jieTexts[0]: ''}}</view>
+				<!-- 目录区域 -->
+				<uni-collapse v-model="activeCollapse" class="ezy-catalogue-collapse"
+					:class="{ 'ezy-catalogue-collapse-vip': AuthCode === 'VIP'}" accordion>
+					<template v-for="(item,index) in list">
+						<!-- 当前上下册只针对数学 -->
+						<view v-if="subjectId == 1 && index == shuxueShangxia" class="catalogue-nianji-title catalogue-mt">
+							{{jieTexts ? jieTexts[1]: ''}}
 						</view>
-					</uni-collapse-item>
-				</template>
-			</uni-collapse>
-			<tip-small-dialog ref="confirmDialogRef" @confirm-btn="handleConfirmPay"
-				:content="Message"></tip-small-dialog>
-			<tip-big-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" :imgShow="true"></tip-big-dialog>
-		</scroll-view>
+			  <view v-if="subjectId == 2 && typeId == 1 && index == shuxueShangxia" class="catalogue-nianji-title catalogue-mt">
+				{{jieTexts ? jieTexts[1]: ''}}
+			  </view>
+						<uni-collapse-item title-border="none" :border="false" :name="index+''" class="collapse-item-box"
+							:class="{ 'collapse-active': activeCollapse === index+''}">
+							<template v-slot:title>
+								<view @click.stop="handleSelectZhang(item,index)" class="collapse-title">
+									<view class="collapse-num-box">{{index+1}}</view>
+									<!-- 章名 -->
+									<text class="collapse-name">{{item.zhangName}}</text>
+									<!-- 锁 -->
+									<!-- <template v-if="AuthCode !== 'VIP'">
+										<view class="collapse-lock" v-if="index!=0"></view>
+									</template> -->
+								</view>
+							</template>
+							<view class="collapse-content-box">
+								<view v-for="(jie,cindex) in item.jieList" class="collapse-content-item"
+									@click="handleJieClick(item,jie,index,cindex)">
+									<text class="jie-index">{{`${index+1}.${cindex+1}`}}</text>
+									<text class="text">{{jie.jieName}}</text>
+								</view>
+							</view>
+						</uni-collapse-item>
+					</template>
+				</uni-collapse>
+				<tip-small-dialog ref="confirmDialogRef" @confirm-btn="handleConfirmPay"
+					:content="Message"></tip-small-dialog>
+				<tip-big-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" :imgShow="true"></tip-big-dialog>
+			</scroll-view>
+		</view>
 	</uni-popup>
 </template>