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

xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -1262,7 +1262,7 @@
 					success: function(res) {
 						console.log('条码类型：' + res.scanType);
 						console.log('条码内容：' + res.result);
-						console.log(res.result.split("=")[1],res.result.split("=")[1].indexOf(','),res.result.split("=")[1].split(",")[0])
+						// console.log(res.result.split("=")[1],res.result.split("=")[1].indexOf(','),res.result.split("=")[1].split(",")[0])
 						var cardId=res.result.split("=")[1].split(",")[0]
 						that.$request.baseRequest('admin.unimall.cardHolderInfo', 'getAdded', {
 							commonId: uni.getStorageSync("userInfo").id,

xiaochengxu/pages/cardHolder/search.vue

@@ -40,6 +40,7 @@
 		},
 		data() {
 			return {
+
 				duration: 2000, //录音最大值ms 60000/1分钟
 				tempFilePath: '', //音频路径
 				playStatus: 0, //录音播放状态 0:未播放 1:正在播放

xiaochengxu/pages/circle/circle.vue

@@ -27,22 +27,59 @@
 					<uni-icons type="personadd-filled" size="30" @click="toCreateCircle"></uni-icons>
 				</view> -->
 			</view>
-			<view class="" v-for="(item,index) in circleList" :key="index">
-				<view class="flex title" v-if="item.name">
+			<view class="wd-list">
+				<view v-for="(item,index) in circleList1" :key="index">
+					<view class="flex title" v-if="item.name">
+						<view class="line"></view>
+						<view class="text-title">
+							{{item.name}}
+						</view>
+					</view>
+					<view class="row-tiem flex" v-if="!item.name" @click="toDetail(item.id)">
+						<view class="left">
+							<image :src="item.circleHead?item.circleHead:'../../static/imgs/mySet/ewm.png'" mode="aspectFill" class="img"></image>
+						</view>
+						<view class="right">
+							<view class="top">{{item.circleName}}（{{item.cardNum}}人）</view>
+							<view style='flex-wrap: wrap;' class="bottom flex">
+								<view v-for="item1 in item.circleLabelArray" class="text">
+									{{item1}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="content2 flex flex-between">
+			
+				<view class="left flex title">
 					<view class="line"></view>
 					<view class="text-title">
-						{{item.name}}
+						推荐圈子
 					</view>
 				</view>
-				<view class="row-tiem flex" v-if="!item.name" @click="toDetail(item.id)">
-					<view class="left">
-						<image :src="item.circleHead?item.circleHead:'../../static/imgs/mySet/ewm.png'" mode="aspectFill" class="img"></image>
+				<!-- <view class="right">
+					<uni-icons type="personadd-filled" size="30" @click="toCreateCircle"></uni-icons>
+				</view> -->
+			</view>
+			<view class="tj-list">
+				<view v-for="(item,index) in circleList" :key="index">
+					<view class="flex title" v-if="item.name">
+						<view class="line"></view>
+						<view class="text-title">
+							{{item.name}}
+						</view>
 					</view>
-					<view class="right">
-						<view class="top">{{item.circleName}}（{{item.cardNum}}人）</view>
-						<view style='flex-wrap: wrap;' class="bottom flex">
-							<view v-for="item1 in item.circleLabelArray" class="text">
-								{{item1}}
+					<view class="row-tiem flex" v-if="!item.name" @click="toDetail(item.id)">
+						<view class="left">
+							<image :src="item.circleHead?item.circleHead:'../../static/imgs/mySet/ewm.png'" mode="aspectFill" class="img"></image>
+						</view>
+						<view class="right">
+							<view class="top">{{item.circleName}}（{{item.cardNum}}人）</view>
+							<view style='flex-wrap: wrap;' class="bottom flex">
+								<view v-for="item1 in item.circleLabelArray" class="text">
+									{{item1}}
+								</view>
 							</view>
 						</view>
 					</view>
@@ -72,6 +109,7 @@
 				userInfo: {},
 				canReset: false,
 				cardList:[],
+				circleList1:[]
 			};
 		},
 		onLoad() {
@@ -163,8 +201,7 @@
 					this.mescroll.endByPage(curPageLen, totalPage);
 					console.log(res.data)
 					// this.makeData(res.data)
-					if (page.num == 1) this.circleList = []; //如果是第一页需手动置空列表
-					this.circleList = this.circleList.concat(curPageData); //追加新数据
+					//追加新数据
 					for (let i = 0; i < this.circleList.length; i++) {
 						if(this.circleList[i].circleLabel){
 							if(this.circleList[i].circleLabel.split(',').length>=3){
@@ -176,22 +213,12 @@
 							}
 						}
 					}
-					for (let i = 0; i < this.circleList.length; i++) {
-						if (this.circleList[i].addedFlag == 0) {
-							if (i == 0) {
-								this.circleList.unshift({
-									name: '推荐圈子'
-								});
-							} else {
-								this.circleList.splice(i, 0, {
-									name: '推荐圈子'
-								})
-							}
-
-							console.log(this.circleList)
-							return
-						}
-					}
+					
+					if (page.num == 1) this.circleList1 = []; this.circleList = []; //如果是第一页需手动置空列表
+					var tjarr=curPageData.filter((item)=>{return item.addedFlag==0})
+					var wdarr=curPageData.filter((item)=>{return item.addedFlag==1})
+					this.circleList1 = this.circleList1.concat(wdarr); 
+					this.circleList = this.circleList.concat(tjarr); 
 					
 				})
 			},
@@ -290,9 +317,9 @@
 	}
 
 	.row-tiem {
-		background: #fff;
+		// background: #fff;
 		padding: 24rpx;
-		margin: 0 34rpx;
+		// margin: 0 34rpx;
 		align-items: unset;
 
 		.img {
@@ -338,4 +365,10 @@
 		right: 26rpx;
 		height: auto;
 	}
+	.wd-list,.tj-list{
+		border-radius: 20rpx;
+		background:#fff;
+		margin: 0 34rpx;
+	}
+
 </style>