Merge branch 'master' of http://git.zthymaoyi.com/wangchao/businessCard

xiaochengxu/components/Card/Card.vue

@@ -4,7 +4,7 @@
 			<view v-for='(item,index) in list' class="item flex">
 				<view class="card-list-item"
 					:style="'background:url('+item.currentBackground+');background-size:100% 100%;width:100%'">
-					<view class="card-content style1" v-if="item.cuttentTemplate==0">
+					<view class="card-content style1" v-if="item.cuttentTemplate==1">
 						<view class="left">
 							<u--image :showLoading="true" :src="item.headSculpture" width="66px" height="66px"
 								shape="circle"></u--image>
@@ -30,7 +30,7 @@
 							</view> -->
 						</view>
 					</view>
-					<view class="card-content style1 flex-between" v-if="item.cuttentTemplate==1">
+					<view class="card-content style1 flex-between" v-if="item.cuttentTemplate==2">
 						<view class="right">
 							<view class="row1">
 								<text class="name">{{item.name}}</text>
@@ -58,7 +58,7 @@
 								shape="circle" v-else></u--image>
 						</view>
 					</view>
-					<view class="card-content style2" v-if="item.cuttentTemplate==2">
+					<view class="card-content style2" v-if="item.cuttentTemplate==3">
 						<view class="top">
 							<u--image :showLoading="true" :src="item.headSculpture" width="66px" height="66px"
 								shape="circle" v-if="item.headSculpture"></u--image>
@@ -87,7 +87,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="card-content style2" v-if="item.cuttentTemplate==3">
+					<view class="card-content style2" v-if="item.cuttentTemplate==4">
 						<view class="top">
 							<view class="row1">
 								<text class="name">{{item.name}}</text>
@@ -130,8 +130,8 @@
 		</view>
 
 		<view class="card-obj" v-if="obj">
-			<view class="card-list-item" :style="'background:url('+obj.currentBackground+');background-size:100% 100%'">
-				<view class="card-content style1" v-if="obj.cuttentTemplate==0">
+			<view class="card-list-item" :style="obj.currentBackground?'background:url('+obj.currentBackground+');background-size:100% 100%':''">
+				<view class="card-content style1" v-if="obj.cuttentTemplate==1">
 					<view class="left">
 						<u--image :showLoading="true" :src="obj.headSculpture" width="66px" height="66px"
 							shape="circle"></u--image>
@@ -154,7 +154,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="card-content style1 flex-between" v-if="obj.cuttentTemplate==1">
+				<view class="card-content style1 flex-between" v-if="obj.cuttentTemplate==2">
 					<view class="right">
 						<view class="row1">
 							<text class="name">{{obj.name}}</text>
@@ -179,7 +179,7 @@
 							v-else></u--image>
 					</view>
 				</view>
-				<view class="card-content style2" v-if="obj.cuttentTemplate==2">
+				<view class="card-content style2" v-if="obj.cuttentTemplate==3">
 					<view class="top">
 						<u--image :showLoading="true" :src="obj.headSculpture" width="66px" height="66px" shape="circle"
 							v-if="obj.headSculpture"></u--image>
@@ -208,7 +208,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="card-content style2" v-if="obj.cuttentTemplate==3">
+				<view class="card-content style2" v-if="obj.cuttentTemplate==4">
 					<view class="top">
 						<view class="row1">
 							<text class="name">{{obj.name}}</text>

xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -1155,7 +1155,7 @@
 						console.log('条码类型：' + res.scanType);
 						console.log('条码内容：' + res.result);
 						uni.navigateTo({
-							url: "/pages/cardHolder/scanCodeAddCard?id=" + res.result
+							url: "/pages/cardHolder/scanCodeAddCard?id=" + res.result.split("=")[1]
 						})
 					}
 				});

xiaochengxu/pages/cardHolder/scanCodeAddCard.vue

@@ -6,29 +6,6 @@
 				<text>默</text>
 			</view>
 		</view>
-
-		<!-- 		<view class="content1">
-			
-			<view class="left">
-			</view>
-			<view class="right">
-				<view class="row1">
-					{{cardInfo.name}}|{{cardInfo.post}}
-				</view>
-				<view class="">
-					{{cardInfo.companyName}}
-				</view>
-				<view class="">
-					地址{{cardInfo.province}}{{cardInfo.city}}{{cardInfo.area}}{{cardInfo.detailedAddress}}
-				</view>
-				<view class="">
-					联系电话{{cardInfo.phone}}
-				</view>
-				<view class="">
-					备注{{cardInfo.remark?cardInfo.remark:''}}
-				</view>
-			</view>
-		</view> -->
 		<view class="title">
 			名片信息
 		</view>
@@ -178,6 +155,7 @@
 					})
 					uni.hideLoading()
 				}).then(res => {
+					console.log(res,"this.cardInfo")
 					this.cardInfo = res.data
 					this.cardInfo.cardBusiness=''
 					this.cardInfo.cardCommonId = res.data.commonId

xiaochengxu/pages/mySet/myHome.vue

@@ -7,6 +7,7 @@
 			autoplay
 			imgMode='aspectFill'
 			height='260'
+			:circular="true"
 		    @change="e => current = e.current" @click="click">
 				<view slot="indicator" class="indicator">
 					<view