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

@@ -189,7 +189,7 @@
 											height="16px"></u--image>
 										<view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
 									</view>
-									<view class="row2 flex">
+									<view @click="freeTell(item)" class="row2 flex">
 										<u--image :showLoading="true" src="/static/imgs/card/phone2.png" width="12px"
 											height="13px"></u--image>
 										<view class='icon-text'>{{ item.phone }}</view>
@@ -251,7 +251,7 @@
 		<u-modal :show="delShow" title="提示" confirmText='确定' showCancelButton='true' @cancel="delShow=false"
 			@confirm="delConfirm" :content='"已选中"+this.checkedList.length+"张名片，确定删除？"'></u-modal>
 		<u-modal :show="modalShow" @confirm='remarkConfirm' :confirmColor="remark?'#2979ff':'#ccc'"
-			showCancelButton='true' title="备注">
+			showCancelButton='true' title="备注"  @cancel="modalShow=false">
 			<view class="slot-content">
 				<u--textarea v-model="remark" placeholder="输入备注，不超过150个字"></u--textarea>
 			</view>
@@ -419,6 +419,17 @@
 			}
 		},
 		methods: {
+			freeTell(item) {
+				uni.makePhoneCall({
+					phoneNumber: item.phone, //仅为示例，并非真实的电话号码
+					success: function() {
+						console.log("拨打电话成功！")
+					},
+					fail: function() {
+						console.log("拨打电话失败！")
+					}
+				})
+			},
 			getPhoneNumber(e) {
 				console.log(e)
 				if (e.mp.detail.errMsg === "getPhoneNumber:ok") {
@@ -921,6 +932,7 @@
 							type: 'success',
 							message: '修改备注成功',
 						})
+						this.remark=''
 						this.modalShow = false
 						this.mescroll.resetUpScroll()
 					})
@@ -928,6 +940,7 @@
 			},
 			remarkEdit(item) {
 				this.currectData = item
+				this.remark = this.currectData.remark
 				this.modalShow = true
 			},
 			switchType(item) {
@@ -1142,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/circle/detail.vue

@@ -10,11 +10,11 @@
 						<span class="text">
 							{{dataObj.circleName}}（{{dataObj.cardNum}}）
 						</span>
-						<span class="join" @click="addCircle" v-if="!dataObj.circleCardInfo">
+						<span class="join" @click="$u.debounce(addCircle, 500)" v-if="!dataObj.circleCardInfo">
 							<uni-icons type="plusempty" size="12" color="#fff"
 								style="margin:0 10rpx;font-weight: bold;"></uni-icons>加入
 						</span>
-						<span class="join" @click="exitCircle" v-else>
+						<span class="join" @click="$u.debounce(exitCircle, 500)" v-else>
 							退出
 						</span>
 					</view>
@@ -40,8 +40,7 @@
 			</view>
 		</view>
 		<view  class="relative" style='top:136px;'>
-			<mescroll-uni height='1200' 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%':''"
 				:key="index">
@@ -63,43 +62,6 @@
 					</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>
-			<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>
@@ -356,7 +318,6 @@
 				}).then(res => {
 					this.cardList = [res.data.items]
 				})
-
 				await this.$request.baseRequest('admin.unimall.circleManagementInfo', 'get', {
 					commonId: this.userInfo.id,
 					id: this.id
@@ -376,7 +337,6 @@
 				this.getCardList(page)
 			},
 			changeCard(val) {
-
 				this.selectRowCard = val
 				this.swapNameCards = true
 				this.isShowCard = true

xiaochengxu/pages/mySet/cardType.vue

@@ -242,4 +242,7 @@
 		margin: 0 20rpx;
 		border-radius: 20rpx;
 	}
+	.slot-content{
+		width:100%;
+	}
 </style>

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

xiaochengxu/pages/mySet/myInfo.vue

@@ -867,7 +867,7 @@
 
 		.car-bottom {
 			position: absolute;
-			bottom: 20rpx;
+			bottom: 22rpx;
 			left: 20rpx;
 			width: calc(100% - 40rpx);
 
@@ -886,7 +886,7 @@
 				font-size: 26rpx;
 				padding: 20rpx 0;
 				position: relative;
-				right: -280rpx;
+				right: -278rpx;
 				width: calc(100vw - 320rpx);
 				box-sizing: border-box;
 				display: flex;
@@ -965,7 +965,7 @@
 		color:#33CC00;
 	}
 	.del-style{
-		padding:40rpx 40rpx 80rpx 40rpx;
+		padding:40rpx 40rpx 160rpx 40rpx;
 		font-size:32rpx;
 		position:relative;
 		.title{
@@ -988,7 +988,7 @@
 		}
 		.footer{
 			position: absolute;
-			bottom: -33px;
+			bottom: 0px;
 			width: 100%;
 			left: 0;
 		}

xiaochengxu/pages/mySet/mySet.vue

@@ -117,9 +117,12 @@
 					this.list=res.data.items
 					this.cardList = [res.data.items]
 					if(res.data.items.length>0){
-						this.cardChange({
-							value: this.cardList[[0]]
-						})
+						if(!this.poster){
+							this.cardChange({
+								value: this.cardList[[0]]
+							})
+						}
+						
 					}
 					
 				})
@@ -185,7 +188,6 @@
 				this.isShowCode = true
 			},
 			cardChange(e) {
-
 				this.currectData = e.value[0]
 				uni.showLoading({
 					title: '加载中',