高敬炎 hace 2 años
padre
commit
c037239d9c

+ 3 - 0
xiaochengxu/App.vue

@@ -31,4 +31,7 @@
 	.align-item-center{
 		align-items: center;
 	}
+	.relative{
+		position:relative;
+	}
 </style>

+ 40 - 27
xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -1,38 +1,41 @@
 <template>
 	<view class="content">
-		<u-navbar title="电子名片" placeholder bgColor="#112253" titleStyle="color:#fff">
-			<view class="u-nav-slot relative" slot="left">
-				<u-icon name="bell" size="26" @click="toNotice" color="#fff"></u-icon>
-				<u-badge :isDot="unread>0?true:false" type="error" class="point"></u-badge>
-			</view>
-		</u-navbar>
-		<view class="content1 flex-row-center">
-			<view class="search flex flex-between" @click="search">
-				<view class="left flex">
-					<uni-icons type="search" size="24" color="#9199af"></uni-icons>
-					<text class="search-val"> {{searchVal?searchVal:'搜索名片'}}</text>
-					<uni-icons type="closeempty" size="24" @click.native.stop="delSearchVal" v-if="searchVal">
-					</uni-icons>
+		<view class='wrap'>
+			<u-navbar title="电子名片" placeholder bgColor="#112253" titleStyle="color:#fff">
+				<view class="u-nav-slot relative" slot="left">
+					<u-icon name="bell" size="26" @click="toNotice" color="#fff"></u-icon>
+					<u-badge :isDot="unread>0?true:false" type="error" class="point"></u-badge>
 				</view>
+			</u-navbar>
+			<view class="content1 flex-row-center">
+				<view class="search flex flex-between" @click="search">
+					<view class="left flex">
+						<uni-icons type="search" size="24" color="#9199af"></uni-icons>
+						<text class="search-val"> {{searchVal?searchVal:'搜索名片'}}</text>
+						<uni-icons type="closeempty" size="24" @click.native.stop="delSearchVal" v-if="searchVal">
+						</uni-icons>
+					</view>
 
-				<view class="right">
-					<image style='width:32rpx;height:32rpx;' v-if="searchVal" @click.native.stop="delSearchVal"
-						src="../../static/imgs/card/searchdel.png" mode="widthFix"></image>
-					<uni-icons type="mic" size="24" @click.native.stop="micOpen" color="#9199af"></uni-icons>
+					<view class="right">
+						<image style='width:32rpx;height:32rpx;' v-if="searchVal" @click.native.stop="delSearchVal"
+							src="../../static/imgs/card/searchdel.png" mode="widthFix"></image>
+						<uni-icons type="mic" size="24" @click.native.stop="micOpen" color="#9199af"></uni-icons>
+					</view>
+				</view>
+				<view class="col flex">
+					<uni-icons type="scan" size="30" @click="scan" color="#fff"></uni-icons>
 				</view>
 			</view>
-			<view class="col flex">
-				<uni-icons type="scan" size="30" @click="scan" color="#fff"></uni-icons>
-			</view>
-		</view>
 
-		<view :style='cardHolderList.length>0?"padding:20rpx 20rpx 200rpx 20rpx;":"padding:20rpx 20rpx 20rpx 20rpx;"' class="content2">
-			<view class="all-type flex" @click="selectType">
-				<text>{{typeName?typeName:'全部分类'}}</text>
-				<uni-icons type="bottom" size="18" color="#fff"></uni-icons>
+			<view :style='cardHolderList.length>0?"padding:20rpx 20rpx 200rpx 20rpx;":"padding:20rpx 20rpx 20rpx 20rpx;"' class="content2">
+				<view class="all-type flex" @click="selectType">
+					<text>{{typeName?typeName:'全部分类'}}</text>
+					<uni-icons type="bottom" size="18" color="#fff"></uni-icons>
+				</view>
 			</view>
 		</view>
-		<view :style='cardHolderList.length>0?"top:-170rpx;":"top:-10rpx;"' class="content3">
+		
+		<view :style='cardHolderList.length>0?"top:376rpx;":"top:276rpx;"' class="content3">
 
 			<mescroll-body v-if='cardHolderList' :up="upOption" :down="downOption" ref="mescrollRef"
 				@init="mescrollInit" @up="upCallback" @down="downCallback">
@@ -1177,7 +1180,7 @@
 	.content3 {
 		// padding:0 20rpx;
 		position: relative;
-		top: -170rpx;
+		top: 376rpx;
 
 		.style1 {
 			display: flex;
@@ -1479,4 +1482,14 @@
 	/deep/.u-checkbox__icon-wrap.u-checkbox__icon-wrap--square {
 		border-color: #D7DEEB !important;
 	}
+	.wrap{
+		position:fixed;
+		top:0;
+		width:100%;
+	}
+	/deep/.mescroll-body{
+		min-height:558px !important;
+		height:558px !important;
+		overflow:scroll !important;
+	}
 </style>

+ 8 - 6
xiaochengxu/pages/circle/detail.vue

@@ -39,9 +39,9 @@
 				</view>
 			</view>
 		</view>
-
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" @up="upCallback" @down="downCallback"
-			style="position: relative;top: -80rpx;">
+		<view  class="relative" style='top:136px;'>
+			<mescroll-body ref="mescrollRef" @init="mescrollInit" @up="upCallback" @down="downCallback" 
+			>
 			<view class="content3" v-for="(item,index) in changeCardList"
 				:style="item.currentBackground?'background:url('+item.currentBackground+');background-size:100% 100%':''"
 				:key="index">
@@ -80,6 +80,8 @@
 				</view>
 			</view>
 		</mescroll-body>
+		</view>
+		
 		<u-picker @cancel="isShowCard=false" :show="isShowCard" :columns="cardList" keyName="cardBusiness"
 			@confirm="cardConfirm"></u-picker>
 		<u-toast ref="uToast"></u-toast>
@@ -514,9 +516,9 @@
 	.line {
 		text-align: center;
 	}
-	/deep/.mescroll-body{
-		height:558px !important;
-		overflow: scroll !important;
+	.mescroll-body{
 		min-height:558px !important;
+		height:558px !important;
+		overflow:scroll !important;
 	}
 </style>

+ 6 - 3
xiaochengxu/pages/mySet/mySet.vue

@@ -116,9 +116,12 @@
 				}).then(res => {
 					this.list=res.data.items
 					this.cardList = [res.data.items]
-					this.cardChange({
-						value: this.cardList[[0]]
-					})
+					if(res.data.items.length>0){
+						this.cardChange({
+							value: this.cardList[[0]]
+						})
+					}
+					
 				})
 			} else {
 				uni.switchTab({