高敬炎 2 سال پیش
والد
کامیت
f1a220b90b
2فایلهای تغییر یافته به همراه44 افزوده شده و 19 حذف شده
  1. 40 7
      xiaochengxu/pages/circle/detail.vue
  2. 4 12
      xiaochengxu/pages/mySet/mySet.vue

+ 40 - 7
xiaochengxu/pages/circle/detail.vue

@@ -40,7 +40,7 @@
 			</view>
 		</view>
 		<view  class="relative" style='top:136px;'>
-			<mescroll-body ref="mescrollRef" @init="mescrollInit" @up="upCallback" @down="downCallback" 
+			<mescroll-uni height='1200' 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%':''"
@@ -79,7 +79,44 @@
 						@click="changeCard(item)" v-if="item.notDisplay!=1"></image>
 				</view>
 			</view>
-		</mescroll-body>
+			<view class="content3" v-for="(item,index) in changeCardList"
+				:style="item.currentBackground?'background:url('+item.currentBackground+');background-size:100% 100%':''"
+				:key="index">
+				<view class="flex item">
+					<view class="top flex">
+						<view class="left">
+							<u--image src="https://cdn.uviewui.com/uview/album/1.jpg" shape="circle" width="66px"
+								height="66px"></u--image>
+						</view>
+						<view class="right">
+							<view class="row1">
+								<text class="name">{{item.name}}</text>
+								<text class="post">{{item.post}}</text>
+							</view>
+							<view class="row2">
+								{{item.companyName}}
+							</view>
+						</view>
+					</view>
+				</view>
+			
+				<view class="line">
+					<image src="../../static/imgs/cirlce/line.png" mode="widthFix" style="width: 95%;"></image>
+				</view>
+				<view class="bottom" v-if="item.scopeOfBusiness">
+					{{item.scopeOfBusiness}}
+				</view>
+				<view class="bottom no-text" v-else>
+					暂无业务描述
+				</view>
+				<view class="flex btn" v-if="item.lookPage==1||item.notDisplay!=1">
+					<image @click='toHome(item)' src="../../static/imgs/cirlce/home.png" mode="widthFix" style="width: 32rpx;"
+						v-if="item.lookPage==1&&item.personalHomeId"></image>
+					<image src="../../static/imgs/cirlce/change.png" mode="widthFix" style="width: 32rpx;"
+						@click="changeCard(item)" v-if="item.notDisplay!=1"></image>
+				</view>
+			</view>
+		</mescroll-uni>
 		</view>
 		
 		<u-picker @cancel="isShowCard=false" :show="isShowCard" :columns="cardList" keyName="cardBusiness"
@@ -516,9 +553,5 @@
 	.line {
 		text-align: center;
 	}
-	.mescroll-body{
-		min-height:558px !important;
-		height:558px !important;
-		overflow:scroll !important;
-	}
+
 </style>

+ 4 - 12
xiaochengxu/pages/mySet/mySet.vue

@@ -138,7 +138,7 @@
 			let imageUrl = this.poster
 			console.log("imageUrl", imageUrl)
 			if (res.from === 'button') {
-				let path = `/pages/mySet/lookCard?id=${that.currectData.id}`
+				let path = `/pages/cardHolder/scanCodeAddCard?id=${that.currectData.id}`
 				return {
 					title: `${that.currectData.name}分享的名片~`,
 					path: path,
@@ -147,20 +147,12 @@
 			}
 			if (res.from === 'menu') {
 				return {
-					title: '商通线上商城',
-					path: '/pages/tabBarPro/index/index',
-					imageUrl: this.popupshow ? imageUrl : ''
+					title: '名片Box',
+					path: '/pages/cardHolder/cardHolder',
+					imageUrl:''
 				};
 			}
 		},
-		// 分享到朋友圈
-		onShareTimeline() {
-			return {
-				title: '商通线上商城',
-				path: '/pages/index/index',
-				imageUrl: 'https://cdn.uviewui.com/uview/swiper/1.jpg'
-			};
-		},
 		methods: {
 			handleHiddenShare() {
 				this.popupshow = false