改bug

xiaochengxu/pages/circle/changeCard.vue

@@ -132,7 +132,7 @@
 						<span class='status' v-if="item.status==1">已接受</span>
 						<span class='status' v-if="item.status==3">已拒绝</span>
 						<span class='status' v-if="item.status==5">已过期</span>
-						<span class='status' v-if="item.status==7">已拉黑</span>
+						<span class='status' v-if="item.status==7" @click='cardExchangeInfoEdit(4,item)'>移除</span>
 					</view>
 				</view>
 				<view style='margin:0 20rpx;' class="flex flex-between">

xiaochengxu/pages/circle/detail.vue

@@ -42,7 +42,9 @@
 
 		<mescroll-body ref="mescrollRef" @init="mescrollInit" @up="upCallback" @down="downCallback"
 			style="position: relative;top: -80rpx;">
-			<view class="content3" v-for="(item,index) in changeCardList" :style="item.currentBackground?'background:url('+item.currentBackground+');background-size:100% 100%':''" :key="index">
+			<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">
@@ -64,9 +66,12 @@
 				<view class="line">
 					<image src="../../static/imgs/cirlce/line.png" mode="widthFix" style="width: 95%;"></image>
 				</view>
-				<view class="bottom">
+				<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 src="../../static/imgs/cirlce/home.png" mode="widthFix" style="width: 32rpx;"
 						v-if="item.lookPage==1"></image>
@@ -75,7 +80,8 @@
 				</view>
 			</view>
 		</mescroll-body>
-		<u-picker  @cancel="isShowCard=false" :show="isShowCard" :columns="cardList" keyName="cardBusiness" @confirm="cardConfirm"></u-picker>
+		<u-picker @cancel="isShowCard=false" :show="isShowCard" :columns="cardList" keyName="cardBusiness"
+			@confirm="cardConfirm"></u-picker>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="show" :content='content' @confirm="$u.debounce(joinCircle, 500)" showCancelButton
 			@cancel="show=false" @close="show=false" closeOnClickOverlay></u-modal>
@@ -327,7 +333,7 @@
 				this.getCardList(page)
 			},
 			changeCard(val) {
-				
+
 				this.selectRowCard = val
 				this.swapNameCards = true
 				this.isShowCard = true
@@ -387,6 +393,10 @@
 		}
 	}
 
+	.no-text {
+		color: #969393;
+	}
+
 	.img {
 		width: 122rpx;
 		margin-right: 30rpx;
@@ -493,7 +503,8 @@
 
 		}
 	}
-	.line{
-		text-align:center;
+
+	.line {
+		text-align: center;
 	}
 </style>

xiaochengxu/pages/mySet/mySet.vue

@@ -133,7 +133,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/mySet/lookCard?id=${that.currectData}`
 				return {
 					title: `${that.currectData.name}分享的名片~`,
 					path: path,

xiaochengxu/pages/mySet/newCard.vue

@@ -4,7 +4,7 @@
 			<view class="relative">
 				<image :src="imgList[selectIndex].dictLabel" mode="widthFix" style="width: 100%;"></image>
 			</view>
-			<view class="absolute card-content style1" v-if="selectIndex==0">
+			<view class="absolute card-content style1" v-if="imgList[selectIndex].dictSort==1">
 				<view class="left">
 					<u--image :showLoading="true" :src="cardInfo.headSculpture" width="66px" height="66px" shape="circle" v-if="cardInfo.headSculpture"></u--image>
 					<u--image :showLoading="true" src="/./../static/imgs/card/defaulthead.png" width="66px" height="66px" shape="circle" v-else></u--image>
@@ -28,7 +28,7 @@
 					</view> -->
 				</view>
 			</view>
-			<view class="absolute card-content style1 flex-between" v-if="selectIndex==1">
+			<view class="absolute card-content style1 flex-between" v-if="imgList[selectIndex].dictSort==2">
 				<view class="right">
 					<view class="row1">
 						<text class="name">{{cardInfo.name}}</text>
@@ -52,7 +52,7 @@
 					<u--image :showLoading="true" src="/./../static/imgs/card/defaulthead.png" width="66px" height="66px" shape="circle" v-else></u--image>
 				</view>
 			</view>
-			<view class="absolute card-content style2" v-if="selectIndex==2">
+			<view class="absolute card-content style2" v-if="imgList[selectIndex].dictSort==3">
 					<view class="top">
 						<u--image :showLoading="true" :src="cardInfo.headSculpture" width="66px" height="66px" shape="circle" v-if="cardInfo.headSculpture"></u--image>
 						<u--image :showLoading="true" src="/./../static/imgs/card/defaulthead.png" width="66px" height="66px" shape="circle" v-else></u--image>
@@ -77,7 +77,7 @@
 						</view>
 					</view>
 			</view>
-			<view class="absolute card-content style2" v-if="selectIndex==3">
+			<view class="absolute card-content style2" v-if="imgList[selectIndex].dictSort==4">
 					<view class="top">
 						<view class="row1">
 							<text class="name">{{cardInfo.name}}</text>