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

xiaochengxu/config/index.js

@@ -1,8 +1,8 @@
 const dev = {
 	// baseUrlNew: 'http://192.168.110.72:8182',
-	baseUrlNew: 'http://192.168.110.138:8182',
+	// baseUrlNew: 'http://192.168.110.138:8182',
 	// baseUrlNew: 'http://192.168.110.82:8182',
-	// baseUrlNew: 'https://cardapi.eliangeyun.com',
+	baseUrlNew: 'https://cardapi.eliangeyun.com',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

xiaochengxu/pages.json

@@ -115,7 +115,7 @@
 		}, {
 			"path": "pages/mySet/cardType",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "名片分类",
 				"enablePullDownRefresh": false
 			}
 

xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -27,7 +27,7 @@
 
 			<view
 				:style='cardHolderList.length>0?"padding:20rpx 20rpx 200rpx 20rpx;":"padding:20rpx 20rpx 20rpx 20rpx;"'
-				class="content2">
+				class="content2" v-if="cardHolderList.length>0">
 				<view class="all-type flex" @click="selectType">
 					<text style="margin-right: 10rpx;">{{typeName?typeName:'全部分类'}}</text>
 					<uni-icons type="bottom" size="18" color="#fff"></uni-icons>
@@ -42,7 +42,7 @@
 				<view v-for='(item,index) in cardHolderList' @longpress="longpress" class="item flex">
 					<!-- <view class="card-list-item" style="background:red"> -->
 					<view class="card-list-item"
-						:style="'background: url('+item.currentBackground+');background-size:100% 100%'">
+						:style="'background: url('+item.currentBackground+');background-size:106% 111%;background-position: -20rpx -23rpx'">
 						<view class="card-content style1" v-if="item.cuttentTemplate==1">
 							<view class="left">
 								<u--image :showLoading="true" :src="item.headSculpture" width="66px" height="66px"
@@ -217,8 +217,8 @@
 								<image v-if='item.shareCard==1' src="../../static/imgs/card/share.png" mode="widthFix"
 									style="width: 35rpx;height: auto;" @click="share(item)"></image>
 
-								<image v-if='item.shareCard==0' src="../../static/imgs/card/share_grey.png"
-									mode="widthFix" style="width: 40rpx;height: auto;"></image>
+								<!-- <image v-if='item.shareCard==0' src="../../static/imgs/card/share_grey.png"
+									mode="widthFix" style="width: 40rpx;height: auto;"></image> -->
 							</view>
 							<view class="right">
 
@@ -373,9 +373,6 @@
 					},
 					auto: false,
 					noMoreSize: 1,
-					empty: {
-						tip: '暂无相关数据'
-					},
 					textNoMore:'没有更多了~',
 					textColor:'#bbb'
 				},
@@ -428,26 +425,9 @@
 
 		},
 		onShow:function(){
-			this.$request.baseRequest('admin.unimall.cardNewsInfo', 'list', {
-				receiveId: uni.getStorageSync("userInfo").id,
-			}, failres => {
-				console.log('res+++++', failres.errmsg)
-				this.$refs.uToast.show({
-					type: 'error',
-					message: failres.errmsg,
-				})
-			}).then(res => {
-				this.noticeList = res.data.items
-				if (this.noticeList.length > 0) {
-					var data = this.noticeList.filter((item) => {
-						return item.newsFlag == 0
-					})
-					this.unread = data ? data.length : 0
-				}
-				console.log(this.unread)
-			})
+			let _isLoad = uni.getStorageSync("scanAddCardToIndex")
 			this.searchVal = uni.getStorageSync("search_val") ? uni.getStorageSync("search_val") : ''
-			if(this.searchVal) this.mescroll.resetUpScroll();
+			if(this.searchVal||_isLoad) this.mescroll.resetUpScroll();
 		},
 		onLoad: function(options) {
 			that = this
@@ -455,7 +435,25 @@
 			if (uni.getStorageSync("userInfo").phone) {
 				this.userInfo = uni.getStorageSync("userInfo")
 				this.$nextTick(function() {
-					this.mescroll.resetUpScroll()
+					that.mescroll.resetUpScroll()
+					that.$request.baseRequest('admin.unimall.cardNewsInfo', 'list', {
+						receiveId: uni.getStorageSync("userInfo").id,
+					}, failres => {
+						console.log('res+++++', failres.errmsg)
+						that.$refs.uToast.show({
+							type: 'error',
+							message: failres.errmsg,
+						})
+					}).then(res => {
+						that.noticeList = res.data.items
+						if (that.noticeList.length > 0) {
+							var data = that.noticeList.filter((item) => {
+								return item.newsFlag == 0
+							})
+							that.unread = data ? data.length : 0
+						}
+						console.log(that.unread)
+					})
 					wx.showShareMenu({
 						withShareTicket: true,
 						menus: ["shareAppMessage", "shareTimeline"]
@@ -1144,26 +1142,8 @@
 							
 							console.log(this.typeColumns)
 						})
-						
-						// await this.$request.baseRequest('admin.unimall.cardNewsInfo', 'list', {
-						// 	receiveId: uni.getStorageSync("userInfo").id,
-						// }, failres => {
-						// 	console.log('res+++++', failres.errmsg)
-						// 	uni.showToast({
-						// 	  icon:"none",
-						// 	  title: failres.errmsg,
-						// 	  duration: 3000
-						// 	});
-						// }).then(res => {
-						// 	this.noticeList = res.data.items
-						// 	if (this.noticeList.length > 0) {
-						// 		var data = this.noticeList.filter((item) => {
-						// 			return item.newsFlag == 0
-						// 		})
-						// 		this.unread = data ? data.length : 0
-						// 	}
-						// 	console.log(this.unread)
-						// })
+						//清楚扫码添加跳页刷新数据状态开关
+						 uni.setStorageSync("scanAddCardToIndex",0)
 					}
 					
 				}
@@ -1361,11 +1341,12 @@
 		background: #f5f5f5;
 		// height: 1000px;
 		border-radius: 30rpx;
-
+		.item{
+			border-radius: 30rpx;
+		}
 		.style1 {
 			display: flex;
-			padding: 20rpx 30rpx;
-			width: 85%;
+			width: 100%;
 			margin-bottom: 90rpx;
 
 			.left {
@@ -1500,9 +1481,9 @@
 			.car-bottom {
 				position: absolute;
 				bottom: 63rpx;
-				left: 20rpx;
-				bottom: 24rpx;
-				width: 94.9%;
+				left: 0rpx;
+				bottom: 0rpx;
+				width: 100%;
 				background: url("../../static/imgs/card/bg5.png") no-repeat center;
 				background-size: 100% 100%;
 				height: 80rpx;

xiaochengxu/pages/cardHolder/scanCodeAddCard.vue

@@ -27,10 +27,10 @@
 								width="12px" height="13px"></u--image>
 							<view class='icon-text'>{{ cardInfo.phone }}</view>
 						</view>
-						<view @click='remarkEdit(cardInfo)' class="row2 flex" style="color: #808080">
+						<view class="row2 flex" style="color: #808080">
 							<u--image :showLoading="true" :src="'/static/imgs/card/remark'+cardInfo.icon+'.png'"
 								width="10px" height="12px"></u--image>
-							<view class='icon-text' style="color: #808080;">{{cardInfo.remark?cardInfo.remark:'单击添加备注'}}
+							<view class='icon-text' style="color: #808080;">{{cardInfo.remark?cardInfo.remark:''}}
 							</view>
 						</view>
 					</view>
@@ -59,10 +59,10 @@
 								width="12px" height="13px"></u--image>
 							<view class='icon-text'>{{ cardInfo.phone }}</view>
 						</view>
-						<view @click='remarkEdit(cardInfo)' class="row2 flex" style="color: #808080">
+						<view  class="row2 flex" style="color: #808080">
 							<u--image :showLoading="true" :src="'/static/imgs/card/remark'+cardInfo.icon+'.png'"
 								width="10px" height="12px"></u--image>
-							<view class='icon-text' style="color: #808080;">{{cardInfo.remark?cardInfo.remark:'单击添加备注'}}
+							<view class='icon-text' style="color: #808080;">{{cardInfo.remark?cardInfo.remark:''}}
 							</view>
 						</view>
 					</view>
@@ -107,11 +107,11 @@
 									width="12px" height="13px"></u--image>
 								<view class='icon-text'>{{ cardInfo.phone }}</view>
 							</view>
-							<view @click='remarkEdit(cardInfo)' class="row2 flex" style="color: #808080">
+							<view class="row2 flex" style="color: #808080">
 								<u--image :showLoading="true" :src="'/static/imgs/card/remark'+cardInfo.icon+'.png'"
 									width="10px" height="12px"></u--image>
 								<view class='icon-text' style="color: #808080;">
-									{{cardInfo.remark?cardInfo.remark:'单击添加备注'}}
+									{{cardInfo.remark?cardInfo.remark:''}}
 								</view>
 							</view>
 						</view>
@@ -152,11 +152,11 @@
 									width="12px" height="13px"></u--image>
 								<view class='icon-text'>{{ cardInfo.phone }}</view>
 							</view>
-							<view @click='remarkEdit(cardInfo)' class="row2 flex" style="color: #808080">
+							<view class="row2 flex" style="color: #808080">
 								<u--image :showLoading="true" :src="'/static/imgs/card/remark'+cardInfo.icon+'.png'"
 									width="10px" height="12px"></u--image>
 								<view :style='cardInfo.remark?"color:#000;":"color:#808080;"' class='icon-text'>
-									{{cardInfo.remark?cardInfo.remark:'单击添加备注'}}
+									{{cardInfo.remark?cardInfo.remark:''}}
 								</view>
 							</view>
 						</view>
@@ -257,6 +257,7 @@
 			}
 		},
 		onLoad(options) {
+			console.log(123)
 			this.id = options.id.indexOf(",") ? options.id.split(",")[0] : options.id
 			this.commonId = options.id.indexOf(",") ? options.id.split(",")[1] : ''
 			this.getList()
@@ -292,6 +293,7 @@
 						title: '保存成功！',
 						duration: 2000
 					});
+					 uni.setStorageSync("scanAddCardToIndex",1)
 					uni.switchTab({
 						url: "/pages/cardHolder/cardHolder"
 
@@ -330,7 +332,7 @@
 				}).then(res => {
 					console.log(res, "this.cardInfo")
 					this.cardInfo = res.data
-					this.cardInfo.cardBusiness = ''
+					// this.cardInfo.cardBusiness = ''
 					// this.cardInfo.cardCommonId = res.data.commonId
 					console.log(res)
 				})
@@ -345,7 +347,10 @@
 					});
 					uni.hideLoading()
 				}).then(res => {
-					this.cardList = [res.data.cardInfos]
+					this.cardList = [res.data.items]
+					this.cardInfo.cardBusiness = res.data.items[0].cardBusiness
+					this.cardInfo.myCardId = res.data.items[0].id
+					
 				})
 				this.$request.baseRequest('admin.unimall.cardClassifyInfo', 'list', {
 					page: 1,

xiaochengxu/pages/circle/lookHome.vue

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

xiaochengxu/pages/mySet/cardType.vue

@@ -151,6 +151,7 @@
 						title: '置顶成功！',
 						duration: 2000
 					})
+					this.getList()
 				})
 			},
 

xiaochengxu/pages/mySet/lookCard.vue

@@ -2,28 +2,39 @@
 	<view>
 		<view v-for='(item,index) in cardList' class="">
 			<view style='margin:10px;' class='flex justify-space-between'>
-				<view>{{item.certificateName}}</view>
 				<view class="flex">
-					<view v-if='item.personNo'>({{item.personNo1}})</view>
+					<view style="margin-right: 20rpx;">
+						{{item.certificateName}}
+					</view>
+					<view class="">
+						<view v-if='item.personNo'>{{item.personNo1}}</view>
+						<view v-if='item.bankNo'>{{item.bankNo1}}</view>
+					</view>
+				</view>
+				<view class="flex">
+
 					<view style='margin:0 10rpx;' class='finished' v-if='item.personNo' @click='clip(0,item)'>
 						复制号码
 					</view>
-					<text v-if='item.bankNo'>({{item.bankNo1}})</text>
-					<view class='finished' v-if='item.bankNo' @click='clip(1,item)' >
+
+					<view class='finished' v-if='item.bankNo' @click='clip(1,item)'>
 						复制号码
 					</view>
-					<view :class='countdownTime==0?"finished":"unfinished"' @click='imageOCR(item,index)'>{{text}}</view>
+					<view :class='countdownTime==0?"finished":"unfinished"' @click='imageOCR(item,index)' style="margin-left: 20rpx;">{{text}}
+					</view>
 				</view>
-				
-				
+
+
 			</view>
 			<view style='text-align:center;' class="">
-				<image @click="click(item)" style='width:96%;height:190px;border-radius:20rpx;'  :src="item.certificateImage" mode="aspectFill"></image>
+				<image @click="click(item)" style='width:96%;height:190px;border-radius:20rpx;'
+					:src="item.certificateImage" mode="aspectFill"></image>
 			</view>
-			
+
 		</view>
 		<u-toast ref="uToast"></u-toast>
-		<u-picker :immediateChange ="true" @cancel='show=false' @confirm='pickerConfirm' title='识别类型' :show="show" :columns="columns"></u-picker>
+		<u-picker :immediateChange="true" @cancel='show=false' @confirm='pickerConfirm' title='识别类型' :show="show"
+			:columns="columns"></u-picker>
 	</view>
 </template>
 
@@ -31,30 +42,30 @@
 	export default {
 		data() {
 			return {
-				cardList:[],
-				show:false,
-				countdownTime:0,
-				currectData:{},
-				index:0,
+				cardList: [],
+				show: false,
+				countdownTime: 0,
+				currectData: {},
+				index: 0,
 				columns: [
 					['识别身份证号', '识别银行卡号']
 				],
-				text:'识别号码'
+				text: '识别号码'
 			}
 		},
 		onLoad(options) {
 			console.log(11111)
-			this.cardList=JSON.parse(options.dataList);
-			console.log(this.cardList,11111111)
+			this.cardList = JSON.parse(options.dataList);
+			console.log(this.cardList, 11111111)
 		},
 		methods: {
-			click(item){
+			click(item) {
 				console.log(111111111)
 				uni.previewImage({
-						current: 0,     // 当前显示图片的索引值
-						urls: [item],    // 需要预览的图片列表，photoList要求必须是数组
-						loop:true,          // 是否可循环预览
-					})
+					current: 0, // 当前显示图片的索引值
+					urls: [item], // 需要预览的图片列表，photoList要求必须是数组
+					loop: true, // 是否可循环预览
+				})
 			},
 			clip(status, item) {
 				uni.setClipboardData({
@@ -67,77 +78,82 @@
 					}
 				})
 			},
-			imageOCR(item,index){
-				this.currectData=item
-				this.index=index
-				this.show=true
+			imageOCR(item, index) {
+				this.currectData = item
+				this.index = index
+				this.show = true
 			},
 			getCountdownTime() {
 				this.countdownTime = 60
 				let timer = setInterval(() => {
 					this.countdownTime--;
-					this.text='识别号码（'+this.countdownTime+'s）'
+					this.text = '识别号码（' + this.countdownTime + 's）'
 					if (this.countdownTime < 1) {
 						clearInterval(timer)
 						this.countdownTime = 0
-						this.text='识别号码'
-						
+						this.text = '识别号码'
+
 					}
 				}, 1000)
 			},
-			pickerConfirm(e){
-				
-				this.show=false
-				
-				if(this.countdownTime==0){
+			pickerConfirm(e) {
+
+				this.show = false
+
+				if (this.countdownTime == 0) {
 					this.getCountdownTime()
 					uni.showLoading({
-							title: '数据加载中',
-							mask:true
-						})
-					var type='',type1=''
-					if(e.value[0]=='识别身份证号'){
-						type='admin.unimall.certificateManagementInfo'
-						type1='personShibie'
-					}else if(e.value[0]=='识别银行卡号'){
-						type='admin.unimall.certificateManagementInfo'
-						type1='bankShibie'
+						title: '数据加载中',
+						mask: true
+					})
+					var type = '',
+						type1 = ''
+					if (e.value[0] == '识别身份证号') {
+						type = 'admin.unimall.certificateManagementInfo'
+						type1 = 'personShibie'
+					} else if (e.value[0] == '识别银行卡号') {
+						type = 'admin.unimall.certificateManagementInfo'
+						type1 = 'bankShibie'
 					}
-					this.$request.baseRequest(type, type1,{certificateImage:this.currectData.certificateImage}, failres => {
+					this.$request.baseRequest(type, type1, {
+						certificateImage: this.currectData.certificateImage
+					}, failres => {
 						console.log('res+++++', failres.errmsg)
 						uni.hideLoading()
 						uni.showToast({
-						  icon:"none",
-						  title: failres.errmsg,
-						  duration: 3000
+							icon: "none",
+							title: failres.errmsg,
+							duration: 3000
 						});
 					}).then(res => {
 						uni.hideLoading()
 						uni.showToast({
-						  icon:"success",
-						  title: '识别成功！',
-						  duration: 2000
+							icon: "success",
+							title: '识别成功！',
+							duration: 2000
 						});
-						if(e.value[0]=='识别身份证号'){
-							this.cardList[this.index].personNo=res.data.recPersonNo
-							this.cardList[this.index].personNo1 = '*' + (this.cardList[this.index].personNo.substring(this.cardList[this.index].personNo.length - 4))
-							
-						}else if(e.value[0]=='识别银行卡号'){
-							this.cardList[this.index].bankNo=res.data.bankNo
-							this.cardList[this.index].bankNo1 = '*' + (this.cardList[this.index].bankNo.substring(this.cardList[this.index].bankNo.length - 4))
+						if (e.value[0] == '识别身份证号') {
+							this.cardList[this.index].personNo = res.data.recPersonNo
+							this.cardList[this.index].personNo1 = '*' + (this.cardList[this.index].personNo
+								.substring(this.cardList[this.index].personNo.length - 4))
+
+						} else if (e.value[0] == '识别银行卡号') {
+							this.cardList[this.index].bankNo = res.data.bankNo
+							this.cardList[this.index].bankNo1 = '*' + (this.cardList[this.index].bankNo.substring(
+								this.cardList[this.index].bankNo.length - 4))
 						}
-						this.credentialsShow=true
-					})		
+						this.credentialsShow = true
+					})
 				}
 				console.log(e)
-				
+
 			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.finished{
+	.finished {
 		padding: 10rpx 14rpx;
 		text-align: center;
 		background: #112253;
@@ -146,7 +162,8 @@
 		font-weight: bold;
 		color: #FFFFFF;
 	}
-	.unfinished{
+
+	.unfinished {
 		padding: 10rpx 14rpx;
 		text-align: center;
 		background: rgba(17, 34, 83, 0.3);
@@ -155,4 +172,4 @@
 		font-weight: bold;
 		color: #FFFFFF;
 	}
-</style>
+</style>

xiaochengxu/pages/mySet/myCard.vue

@@ -1,6 +1,7 @@
 <template>
 	<view>
-		<u-navbar placeholder title="我的证件" @leftClick="leftClick" bgColor="#112253" titleStyle ="color:#fff" leftIconColor="#fff">
+		<u-navbar placeholder title="我的证件" @leftClick="leftClick" bgColor="#112253" titleStyle="color:#fff"
+			leftIconColor="#fff">
 		</u-navbar>
 		<view class="flex content1 flex-between">
 			<view @click='addclick' class="button">
@@ -17,12 +18,12 @@
 				识别号码
 			</view>
 		</view>
-		<view v-if='addstatus' class="content2" >
+		<view v-if='addstatus' class="content2">
 			<view class="flex flex-between">
-				<u--input border="bottom" v-model="cardData.certificateName" placeholder="输入证件名称"></u--input>
+				<u--input border="bottom" v-model="cardData.certificateName" placeholder="输入证件名称" focus></u--input>
 				<view @click='add' class="submit">提交</view>
 			</view>
-			<view class='add-image' >
+			<view class='add-image'>
 				<u-upload @afterRead="afterRead" :fileList="fileList1" @delete="deletePic" name="1" multiple
 					:maxCount="1" height='190' width='360'>
 					<view class="bgc">
@@ -33,12 +34,12 @@
 							</view>
 						</view> -->
 					</view>
-					</u-upload>
+				</u-upload>
 			</view>
 		</view>
 		<view class="content3" style="background-color: #F7F7F7;">
-			<mescroll-body v-if='!addstatus&&cardList.length==0||cardList.length>0' ref="mescrollRef" @init="mescrollInit"
-				@up="upCallback" @down="downCallback">
+			<mescroll-body v-if='!addstatus&&cardList.length==0||cardList.length>0' ref="mescrollRef"
+				@init="mescrollInit" @up="upCallback" @down="downCallback" :up="upOption" :down="downOption">
 				<view v-for='(item,index) in cardList' class="">
 					<view class="flex flex-between row">
 						<view v-if='!item.editstatus' class="left flex">
@@ -46,47 +47,55 @@
 								{{item.certificateName}}
 							</view>
 							<text v-if='item.personNo'>({{item.personNo1}})</text>
-							<u-icon v-if='item.personNo' @click='clip(0,item)' name="file-text-fill" color="#2979ff"
-								size="28"></u-icon>
-							<text v-if='item.bankNo'>({{item.bankNo1}})</text>
-							<u-icon v-if='item.bankNo' @click='clip(1,item)' name="file-text-fill" color="#2979ff"
-								size="28"></u-icon>
+							<image src="../../static/imgs/mySet/copy.png" mode="widthFix" style="width: 28rpx;" v-if='item.personNo' @click='clip(0,item)'></image>
+							<!-- <u-icon v-if='item.personNo' @click='clip(0,item)' name="file-text-fill" color="#2979ff"
+								size="28"></u-icon> -->
+							<text v-if='item.bankNo' style="margin:0 20rpx ;">{{item.bankNo1}}</text>
+							<image src="../../static/imgs/mySet/copy.png" mode="widthFix" style="width: 28rpx;" v-if='item.bankNo' @click='clip(1,item)'></image>
+							<!-- <u-icon v-if='item.bankNo' @click='clip(1,item)' name="file-text-fill" color="#2979ff"
+								size="28"></u-icon> -->
 						</view>
-						<u--input @input='certificateNameInput($event,item)' border="bottom" v-else v-model="item.certificateName" placeholder="输入证件名称"></u--input>
+						<u--input @input='certificateNameInput($event,item)' border="bottom" v-else
+							v-model="item.certificateName" placeholder="输入证件名称"></u--input>
 						<view class="flex" v-if="item.editstatus">
-							<view @click='qxEdit(item)' :class="!item.editstatus?'edit':'finished'" style="margin:0 20rpx;">取消</view>
+							<view @click='qxEdit(item)' :class="!item.editstatus?'edit':'finished'"
+								style="margin:0 20rpx;">取消</view>
 							<view @click='edit(item)' :class="!item.status?'edit':'finished'">完成</view>
 						</view>
 						<view class="flex" v-if="!item.editstatus">
-							<view  @click="del(item)" :class="!item.editstatus?'edit':'finished'" style="margin:0 20rpx 0 0;">删除</view>
-							<view @click='edit(item)' class="finished" >编辑</view>
+							<view @click="del(item)" :class="!item.editstatus?'edit':'finished'"
+								style="margin:0 20rpx 0 0;">删除</view>
+							<view @click='edit(item)' class="finished">编辑</view>
 						</view>
 					</view>
 					<view class="row2" v-if='!item.editstatus'>
-						<image @click='previewImage(item.certificateImage)'  :src="item.certificateImage" mode="aspectFill" class="img"></image>
+						<image @click='previewImage(item.certificateImage)' :src="item.certificateImage" class="img" mode="aspectFill" style="width: 95%;"></image>
 						<view class="right">
-							<u-checkbox-group v-model="item.checked" placement="column" @change="checkboxChange($event,index,item)">
-								<u-checkbox iconColor='#4977FC' activeColor="#fff" :name='index+1' :customStyle="{marginBottom: '8px'}">
+							<u-checkbox-group v-model="item.checked" placement="column"
+								@change="checkboxChange($event,index,item)">
+								<u-checkbox iconColor='#4977FC' activeColor="#fff" :name='index+1'
+									:customStyle="{marginBottom: '8px'}">
 								</u-checkbox>
 							</u-checkbox-group>
 							<!-- <image src="../../static/imgs/mySet/del1.png" mode="widthFix" @click="del(item)" style="width: 28rpx;"></image> -->
 						</view>
 					</view>
-					<view v-else style='padding-left:20rpx;' >
-						<u-upload  @afterRead="afterRead" :fileList="fileList2" @delete="deletePic" name="2" multiple
-						:maxCount="1" height='190' width='340'>
+					<view v-else style='padding-left:20rpx;'>
+						<u-upload @afterRead="afterRead" :fileList="fileList2" @delete="deletePic" name="2" multiple
+							:maxCount="1" height='190' width='340'>
 							<!-- <view class="">
 								123
 							</view> -->
 							<!-- <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png" 
 								mode="widthFix" style="width: 250px;height: 150px;"></image> -->
-							</u-upload>
-						</view>
+						</u-upload>
+					</view>
 				</view>
 			</mescroll-body>
 		</view>
-	
-		<u-picker :immediateChange ="true" @cancel='show=false' @confirm='pickerConfirm' title='识别类型' :show="show" :columns="columns"></u-picker>
+
+		<u-picker :immediateChange="true" @cancel='show=false' @confirm='pickerConfirm' title='识别类型' :show="show"
+			:columns="columns"></u-picker>
 		<u-popup :show="popupshow" :closeOnClickOverlay='true' :overlayOpacity='0.4' @close='handleHiddenShare'
 			:round="10" mode="bottom">
 			<view>
@@ -94,13 +103,13 @@
 					<view class="block" @click="toUrl()">
 						<button class="moment">
 							<view class="iconfont icon-pengyouquan"></view>
-							<view>分享朋友圈</view>
+							<view style="font-size: 26rpx;">分享朋友圈</view>
 						</button>
 					</view>
 					<view class="block">
 						<button class="shareBtn" type="default" data-name="shareBtn" open-type="share">
 							<view class="iconfont icon-weixin"></view>
-							<view>分享微信好友</view>
+							<view style="font-size: 26rpx;">分享微信好友</view>
 						</button>
 					</view>
 				</view>
@@ -121,7 +130,8 @@
 		<u-modal :show="modalstatusshow" confirmText='继续返回' cancelText='取消' @confirm='confirm' @cancel='cancel'
 			showCancelButton='true' title="提示" content='有证件处于编辑状态未提交。'></u-modal>
 		<u-toast ref="uToast"></u-toast>
-		<canvas style="position: absolute; top: -1000px; left: -1000px; width: 600px; height: 400px; background: #000;" canvas-id="canvas"></canvas>
+		<canvas style="position: absolute; top: -1000px; left: -1000px; width: 600px; height: 400px; background: #000;"
+			canvas-id="canvas"></canvas>
 		<point-share @close='showShare=false' :show='showShare'></point-share>
 	</view>
 </template>
@@ -137,6 +147,18 @@
 		},
 		data() {
 			return {
+				downOption: {
+					textColor: '#bbb'
+				},
+				upOption: {
+					page: {
+						size: 10 // 每页数据的数量,默认10
+					},
+					auto: false,
+					noMoreSize: 1,
+					textNoMore: '没有更多了~',
+					textColor: '#bbb'
+				},
 				show: false,
 				modalshow: false,
 				modalstatusshow: false,
@@ -144,7 +166,7 @@
 				columns: [
 					['识别身份证号', '识别银行卡号']
 				],
-				showShare:false,
+				showShare: false,
 				userInfo: {},
 				cardData: {},
 				cardList: [],
@@ -158,11 +180,11 @@
 				shibie: '',
 				shibieList: [],
 				canReset: false,
-				shareimg:''
+				shareimg: ''
 			};
 		},
 		onLoad() {
-			
+
 			// this.getList()
 		},
 		onShow() {
@@ -175,8 +197,8 @@
 			});
 			this.cutShareImg()
 		},
-		onShareAppMessage(res) {	
-			
+		onShareAppMessage(res) {
+
 			let that = this;
 			//生成名片图片
 			let imageUrl = this.poster
@@ -184,7 +206,7 @@
 			if (res.from === 'button') {
 				return {
 					title: '证件分享',
-					path: '/pages/mySet/lookCard?dataList='+uni.getStorageSync('checkedList'),
+					path: '/pages/mySet/lookCard?dataList=' + uni.getStorageSync('checkedList'),
 					imageUrl: this.shareimg,
 				};
 			}
@@ -197,52 +219,52 @@
 			}
 		},
 		methods: {
-			previewImage(src){
-						console.log(src)
-								//预览图片
-					uni.previewImage({
-						urls: [src], // 需要预览的图片链接列表，可以写你图片链接的数组或者跟我一样，就写一个单独的链接
-						current: src // 为当前显示图片的链接/索引值，不填或填写的值无效则为 urls 的第一张
-					});
+			previewImage(src) {
+				console.log(src)
+				//预览图片
+				uni.previewImage({
+					urls: [src], // 需要预览的图片链接列表，可以写你图片链接的数组或者跟我一样，就写一个单独的链接
+					current: src // 为当前显示图片的链接/索引值，不填或填写的值无效则为 urls 的第一张
+				});
 			},
-			toUrl(){
-				this.popupshow=false
-				this.showShare=true
+			toUrl() {
+				this.popupshow = false
+				this.showShare = true
+			},
+			cutShareImg() {
+				let that = this;
+				uni.getImageInfo({
+					src: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20230506110702.png', // 这里填写网络图片路径 
+					success: (res) => {
+						let ctx = uni.createCanvasContext('canvas');
+						ctx.drawImage(res.path, 0, 0, 480, 300)
+						ctx.draw(false, () => {
+							uni.canvasToTempFilePath({
+								canvasId: 'canvas',
+								fileType: 'png',
+								success: (res) => {
+									//设置分享图片路径
+									that.shareimg = res.tempFilePath
+									console.log(that.shareimg)
+								}
+							})
+						})
+					}
+				});
 			},
-			 cutShareImg (){
-			    let that=this;
-			    uni.getImageInfo({
-			      src: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/pcfiles/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20230506110702.png',  // 这里填写网络图片路径 
-			      success: (res) => {
-			        let ctx = uni.createCanvasContext('canvas');  
-			        ctx.drawImage(res.path, 0, 0, 480, 300)
-			        ctx.draw(false, () => {
-			            uni.canvasToTempFilePath({
-			              canvasId: 'canvas',
-			              fileType: 'png',
-			              success: (res) => {
-			              	//设置分享图片路径
-			                that.shareimg=res.tempFilePath
-							console.log(that.shareimg)
-			              }
-			            })
-			        })
-			      }
-			    });
-			  },
 			handleHiddenShare() {
 				this.popupshow = false
 			},
-			certificateNameInput(e,item){
+			certificateNameInput(e, item) {
 				console.log(item)
-				if(item.certificateName1!=item.certificateName){
-					item.status=true
-				}else{
-					item.status=false
+				if (item.certificateName1 != item.certificateName) {
+					item.status = true
+				} else {
+					item.status = false
 				}
-				
+
 			},
-			qxEdit(){
+			qxEdit() {
 				this.mescroll.resetUpScroll()
 			},
 			clip(status, item) {
@@ -258,32 +280,32 @@
 			},
 			edit(item) {
 				if (item.editstatus) {
-					if(item.status){
+					if (item.status) {
 						this.$request.baseRequest('admin.unimall.certificateManagementInfo', 'update', {
 							certificateManagementInfo: JSON.stringify(item)
 						}, failres => {
 							console.log('res+++++', failres.errmsg)
 							uni.hideLoading()
 							uni.showToast({
-							  icon:"none",
-							  title: failres.errmsg,
-							  duration: 3000
+								icon: "none",
+								title: failres.errmsg,
+								duration: 3000
 							});
 						}).then(res => {
 							uni.hideLoading()
 							uni.showToast({
-							  icon:"success",
-							  title: '编辑成功！',
-							  duration: 2000
+								icon: "success",
+								title: '编辑成功！',
+								duration: 2000
 							});
 							this.modalshow = false
 							this.checkedList = []
 							this.mescroll.resetUpScroll()
-						})	
+						})
 					}
 				} else {
 					item.editstatus = true
-					item.certificateName1=item.certificateName
+					item.certificateName1 = item.certificateName
 					this.fileList2 = [{
 						url: item.certificateImage
 					}]
@@ -296,18 +318,18 @@
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
 					uni.showToast({
-					  icon:"none",
-					  title: failres.errmsg,
-					  duration: 3000
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
 					});
 					uni.hideLoading()
 				}).then(res => {
-					
+
 					uni.hideLoading()
 					uni.showToast({
-					  icon:"success",
-					  title: '删除成功！',
-					  duration: 2000
+						icon: "success",
+						title: '删除成功！',
+						duration: 2000
 					});
 					this.modalshow = false
 					this.checkedList = []
@@ -338,17 +360,17 @@
 					console.log('res+++++', failres.errmsg)
 					uni.hideLoading()
 					uni.showToast({
-					  icon:"none",
-					  title: failres.errmsg,
-					  duration: 3000
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
 					});
 				}).then(res => {
 					console.log(res.data)
 					uni.hideLoading()
 					uni.showToast({
-					  icon:"success",
-					  title: '识别成功！',
-					  duration: 2000
+						icon: "success",
+						title: '识别成功！',
+						duration: 2000
 					});
 					this.credentials = res.data
 					this.credentialsShow = true
@@ -375,21 +397,21 @@
 			share() {
 				if (this.checkedList.length == 0) {
 					uni.showToast({
-					  icon:"none",
-					  title: '请勾选想要分享的证件！！',
-					  duration: 2000
+						icon: "none",
+						title: '请勾选想要分享的证件！！',
+						duration: 2000
 					});
 					return
 				}
-				var arr=[]
-				for(var i=0;i<this.cardList.length;i++){
-					if(this.checkedList.findIndex((item) => {
-						return item == i
-					})!=-1){
+				var arr = []
+				for (var i = 0; i < this.cardList.length; i++) {
+					if (this.checkedList.findIndex((item) => {
+							return item == i
+						}) != -1) {
 						arr.push(this.cardList[i])
 					}
 				}
-				console.log(arr,111)
+				console.log(arr, 111)
 				uni.setStorageSync('checkedList', JSON.stringify(arr));
 				this.popupshow = true
 			},
@@ -397,25 +419,27 @@
 				console.log(this.cardList, this.checkedList)
 				if (this.checkedList.length == 0) {
 					uni.showToast({
-					  icon:"none",
-					  title: '请勾选想要识别的证件！',
-					  duration: 2000
+						icon: "none",
+						title: '请勾选想要识别的证件！',
+						duration: 2000
 					});
 					return
 				}
 				if (this.checkedList.length > 1) {
 					uni.showToast({
-					  icon:"none",
-					  title: '一次只能勾选一张证件',
-					  duration: 3000
+						icon: "none",
+						title: '一次只能勾选一张证件',
+						duration: 3000
 					});
 					return
 				}
 				this.show = true
 			},
-			credentialscancel(){
+			credentialscancel() {
 				this.credentialsShow = false
-				this.pickerConfirm({value:[this.shibie]})
+				this.pickerConfirm({
+					value: [this.shibie]
+				})
 			},
 			credentialsConfirm() {
 				var type = '',
@@ -438,17 +462,17 @@
 				}, failres => {
 					console.log('res+++++', failres.errmsg)
 					uni.showToast({
-					  icon:"none",
-					  title: failres.errmsg,
-					  duration: 3000
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
 					});
 					uni.hideLoading()
 				}).then(res => {
 					uni.hideLoading()
 					uni.showToast({
-					  icon:"success",
-					  title: '编辑成功！',
-					  duration: 2000
+						icon: "success",
+						title: '编辑成功！',
+						duration: 2000
 					});
 					this.credentialsShow = false
 					this.checkedList = []
@@ -479,9 +503,9 @@
 			add() {
 				if (!this.cardData.certificateImage) {
 					uni.showToast({
-					  icon:"none",
-					  title: "请上传证件照片",
-					  duration: 2000
+						icon: "none",
+						title: "请上传证件照片",
+						duration: 2000
 					});
 					return
 				}
@@ -494,17 +518,17 @@
 					console.log('res+++++', failres.errmsg)
 					uni.hideLoading()
 					uni.showToast({
-					  icon:"none",
-					  title: failres.errmsg,
-					  duration: 3000
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
 					});
 				}).then(res => {
 					// if (res.errno == 200) {
 					uni.hideLoading()
 					uni.showToast({
-					  icon:"success",
-					  title: '提交成功！',
-					  duration: 2000
+						icon: "success",
+						title: '提交成功！',
+						duration: 2000
 					});
 					this.fileList1 = []
 					this.addstatus = false
@@ -546,7 +570,7 @@
 						url: result
 					}))
 					fileListLen++
-					this.checkedList=[]
+					this.checkedList = []
 				}
 				console.log(this[`fileList${event.name}`])
 			},
@@ -586,9 +610,9 @@
 					console.log('res+++++', failres.errmsg)
 					uni.hideLoading()
 					uni.showToast({
-					  icon:"none",
-					  title: failres.errmsg,
-					  duration: 3000
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
 					});
 					this.mescroll.endBySize(curPageLen, totalPage)
 				}).then(res => {
@@ -600,9 +624,9 @@
 						for (var i = 0; i < res.data.items.length; i++) {
 							res.data.items[i].editstatus = false
 							res.data.items[i].status = false
-							if (res.data.items[i].personNo) res.data.items[i].personNo1 = '*' + (res.data.items[i]
+							if (res.data.items[i].personNo) res.data.items[i].personNo1 = '****' + (res.data.items[i]
 								.personNo.substring(res.data.items[i].personNo.length - 4))
-							if (res.data.items[i].bankNo) res.data.items[i].bankNo1 = '*' + (res.data.items[i]
+							if (res.data.items[i].bankNo) res.data.items[i].bankNo1 = '****' + (res.data.items[i]
 								.bankNo.substring(res.data.items[i].bankNo.length - 4))
 						}
 					}
@@ -624,7 +648,7 @@
 	}
 </script>
 
-<style lang="scss" scoped> 
+<style lang="scss" scoped>
 	button::after {
 		border: initial;
 	}
@@ -735,7 +759,7 @@
 	}
 
 	.content1 {
-		
+
 		background-color: #112253;
 		padding: 20rpx;
 		box-sizing: border-box;
@@ -748,10 +772,10 @@
 			background: #fff;
 			color: #333333;
 			border-radius: 20rpx;
-			padding:0 24rpx;
-			height: 70rpx;
+			padding: 0 24rpx;
+			height: 88rpx;
 			width: calc(33% - 60rpx);
-			font-size:32rpx;
+			font-size: 32rpx;
 		}
 
 		.btn-img {
@@ -760,24 +784,28 @@
 			height: auto;
 		}
 	}
-	.content2{
-		padding:20rpx ;
-		.bgc{
+
+	.content2 {
+		padding: 20rpx;
+
+		.bgc {
 			background: #fff;
 			width: calc(100vw - 40rpx);
 			height: 380rpx;
-			position:relative;
-			
-			.circle{
-				position:absolute;
-				top:50%;
-				left:50%;
-				transform: translateX(-50%) translateY(-50%);			
+			position: relative;
+			border-radius: 30rpx;
+
+			.circle {
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				transform: translateX(-50%) translateY(-50%);
 				text-align: center;
 			}
 		}
-		.submit{
-			padding: 10rpx 14rpx;
+
+		.submit {
+			padding: 8rpx 20rpx;
 			text-align: center;
 			background: #112253;
 			border-radius: 10rpx;
@@ -787,17 +815,20 @@
 			margin-left: 20rpx;
 		}
 	}
-	.content3{
-		.row{
+
+	.content3 {
+		.row {
 			padding: 20rpx;
 			box-sizing: border-box;
-			.name-text{
+
+			.name-text {
 				font-size: 32rpx;
 				font-weight: bold;
 				color: #1A1A1A;
 			}
 		}
-		.edit{
+
+		.edit {
 			padding: 10rpx 14rpx;
 			text-align: center;
 			background: rgba(17, 34, 83, 0.1);
@@ -806,7 +837,8 @@
 			font-weight: bold;
 			color: #FFFFFF;
 		}
-		.finished{
+
+		.finished {
 			padding: 10rpx 14rpx;
 			text-align: center;
 			background: #112253;
@@ -815,69 +847,79 @@
 			font-weight: bold;
 			color: #FFFFFF;
 		}
-		.row2{
+
+		.row2 {
 			display: flex;
-			    justify-content: center;
-			    position: relative;
-				.img{
-					    border-radius: 20rpx;
-						height: 380rpx;
-				}
-				.right{
-					    position: absolute;
-					    right: 0;
-					    height: 100%;
-					    right: 10px;
-
-					    display: flex;
-					    flex-direction: column;
-					    justify-content: space-between;
-					    align-items: center;
-					    padding: 10px 5px;
-					    box-sizing: border-box;
-				}
-				/deep/.u-checkbox__icon-wrap{
-					margin-right: 0!important;
-				}
+			justify-content: center;
+			position: relative;
+
+			.img {
+				border-radius: 20rpx;
+				height: 380rpx;
+			}
+
+			.right {
+				position: absolute;
+				right: 0;
+				height: 100%;
+				right: 10px;
+
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				align-items: center;
+				padding: 10px 5px;
+				box-sizing: border-box;
+			}
+
+			/deep/.u-checkbox__icon-wrap {
+				margin-right: 0 !important;
+			}
 		}
 	}
-	.add-image{
+
+	.add-image {
 		background-color: #fff;
-		margin-top:10rpx;
-		border-radius:20rpx;
+		margin-top: 20rpx;
+		border-radius: 20rpx;
 	}
+
 	.share-content {
 		display: flex;
 		padding: 20rpx;
 		justify-content: center;
 		font-size: 24rpx;
-	
+
 		button {
 			background: transparent;
 			line-height: 1.5;
 		}
-	
+
 		button:after {
 			border: none;
 		}
 	}
-	.icon-pengyouquan,.icon-weixin{
-		font-size:50px;
-		color:#33CC00;
+
+	.icon-pengyouquan,
+	.icon-weixin {
+		font-size: 50px;
+		color: #33CC00;
 	}
-	/deep/.u-upload
-	 {
-		 
+
+	/deep/.u-upload {
+
 		.u-upload__deletable {
-			height:40rpx;
-			width:40rpx;
-			line-height:40rpx;
+			height: 40rpx;
+			width: 40rpx;
+			line-height: 40rpx;
 		}
-		.u-upload__deletable__icon{
-			top:8rpx;
+
+		.u-upload__deletable__icon {
+			top: 8rpx;
 		}
-		.uicon-close{
-			font-size:20px !important;
+
+		.uicon-close {
+			font-size: 20px !important;
 		}
 	}
 </style>

xiaochengxu/pages/mySet/myHome.vue

@@ -31,11 +31,6 @@
 		</view>
 		<view class="company-title row flex flex-between line" >
 			<view class='title' v-if='!editstatus'>{{companyData.companyName}}</view>
-			<view v-if='!editstatus' style='border-radius:10rpx;' class='button flex align-item-center' @click='$u.debounce(edit, 500)'>
-				<image src="../../static/imgs/mySet/edit.png" style='width:26rpx;height:26rpx;' mode=""></image>
-				<view style='margin-left:10rpx;'>编辑</view>
-			</view>
-			<!-- <view v-else @click='$u.debounce(buttonsubmit, 500)' class='button'>提交</view> -->
 		</view>
 		<view class="content1" :class="editstatus?'content1-edit':''">
 			<view v-if='editstatus' class="row flex flex-between align-item-center line" >
@@ -52,7 +47,7 @@
 			<view class="scope top-m">
 				<view v-if='editstatus' class="row">业务范围</view>
 				<view v-else class="title">业务范围</view>
-				<u--textarea v-if='editstatus' v-model="companyData.scopeOfBusiness" count placeholder="输入业务范围，不超过500个字"></u--textarea>
+				<u--textarea v-if='editstatus' v-model="companyData.scopeOfBusiness" count placeholder="输入业务范围，不超过500个字" maxlength="500"></u--textarea>
 				<view class='content' v-else>{{companyData.scopeOfBusiness}}</view>
 			</view>
 			<view class='compInformation' v-if='!editstatus'>
@@ -120,7 +115,9 @@
 		
 	<view class="footer">
 		<button  v-if='editstatus' @click='$u.debounce(buttonsubmit, 500)' class='button' type="default">提交</button>
+		<button v-if='!editstatus' class='button' type="default" @click='$u.debounce(edit, 500)'>编辑</button>
 	</view>
+	
 		
 		<u-toast ref="uToast"></u-toast>
 	</view>

xiaochengxu/pages/mySet/myInfo.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="content">
-		<u-loading-page loading-mode='spinner' image="/static/imgs/logo.png" iconSize='60' :loading='loading'></u-loading-page>
+		<u-loading-page loading-mode='spinner' image="/static/imgs/logo.png" iconSize='60'
+			:loading='loading'></u-loading-page>
 		<view v-show='!loading'>
 			<view class="card-list content1">
 				<view class="row" v-for="(item,index) in cardList" :key="index">
@@ -11,8 +12,9 @@
 						:style="item.currentBackground?'background:url('+item.currentBackground+');background-size:100% 100%':''">
 						<view class="card-content style1" v-if="item.cuttentTemplate==1">
 							<view class="left">
-								<u--image :showLoading="true" :src="item.headSculpture?item.headSculpture:'/static/imgs/card/defaulthead.png'" width="66px" height="66px"
-									shape="circle"></u--image>
+								<u--image :showLoading="true"
+									:src="item.headSculpture?item.headSculpture:'/static/imgs/card/defaulthead.png'"
+									width="66px" height="66px" shape="circle"></u--image>
 							</view>
 							<view class="right">
 								<view class="row1">
@@ -23,16 +25,19 @@
 									{{item.companyName}}
 								</view>
 								<view class="row3 flex">
-									<u--image :showLoading="true" :src="'/static/imgs/card/address'+item.icon+'.png'" width="13px"
-										height="16px"></u--image> <view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
+									<u--image :showLoading="true" :src="'/static/imgs/card/address'+item.icon+'.png'"
+										width="13px" height="16px"></u--image>
+									<view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
 								</view>
 								<view class="row4 flex">
-									<u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'" width="12px"
-										height="13px"></u--image><view class='icon-text'>{{ item.phone }}</view>
+									<u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'"
+										width="12px" height="13px"></u--image>
+									<view class='icon-text'>{{ item.phone }}</view>
 								</view>
 								<view class="row4 flex">
-									<u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'" width="10px"
-										height="12px"></u--image><view class='icon-text'>{{item.remark?item.remark:'--'}}</view>
+									<u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'"
+										width="10px" height="12px"></u--image>
+									<view class='icon-text'>{{item.remark?item.remark:'--'}}</view>
 								</view>
 								<!-- <view class="">
 									备注
@@ -49,16 +54,19 @@
 									{{item.companyName}}
 								</view>
 								<view class="row3 flex">
-									<u--image :showLoading="true" :src="'/static/imgs/card/address'+item.icon+'.png'" width="13px"
-										height="16px"></u--image><view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
+									<u--image :showLoading="true" :src="'/static/imgs/card/address'+item.icon+'.png'"
+										width="13px" height="16px"></u--image>
+									<view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
 								</view>
 								<view class="row4 flex">
-									<u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'" width="12px"
-										height="13px"></u--image><view class='icon-text'>{{ item.phone }}</view>
+									<u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'"
+										width="12px" height="13px"></u--image>
+									<view class='icon-text'>{{ item.phone }}</view>
 								</view>
 								<view class="row4 flex">
-									<u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'" width="10px"
-										height="12px"></u--image><view class='icon-text'>{{item.remark?item.remark:'--'}}</view>
+									<u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'"
+										width="10px" height="12px"></u--image>
+									<view class='icon-text'>{{item.remark?item.remark:'--'}}</view>
 								</view>
 								<!-- <view class="">
 									备注
@@ -90,16 +98,20 @@
 								</view>
 								<view class="right">
 									<view class="row3 flex">
-										<u--image :showLoading="true" :src="'/static/imgs/card/address'+item.icon+'.png'" width="13px"
-											height="16px"></u--image><view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
+										<u--image :showLoading="true"
+											:src="'/static/imgs/card/address'+item.icon+'.png'" width="13px"
+											height="16px"></u--image>
+										<view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
 									</view>
 									<view class="row4 flex">
-										<u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'" width="12px"
-											height="13px"></u--image><view class='icon-text'>{{ item.phone }}</view>
+										<u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'"
+											width="12px" height="13px"></u--image>
+										<view class='icon-text'>{{ item.phone }}</view>
 									</view>
 									<view class="row4 flex">
-										<u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'" width="10px"
-											height="12px"></u--image><view class='icon-text'>{{item.remark?item.remark:'--'}}</view>
+										<u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'"
+											width="10px" height="12px"></u--image>
+										<view class='icon-text'>{{item.remark?item.remark:'--'}}</view>
 									</view>
 								</view>
 							</view>
@@ -113,7 +125,7 @@
 								<view class="row2">
 									{{item.companyName}}
 								</view>
-			
+
 							</view>
 							<view class="bottom flex">
 								<view class="left">
@@ -124,28 +136,32 @@
 								</view>
 								<view class="right">
 									<view class="row3 flex">
-										<u--image :showLoading="true" :src="'/static/imgs/card/address'+item.icon+'.png'" width="13px"
-											height="16px"></u--image><view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
+										<u--image :showLoading="true"
+											:src="'/static/imgs/card/address'+item.icon+'.png'" width="13px"
+											height="16px"></u--image>
+										<view class='icon-text'>{{ item.province }}{{ item.city }}{{ item.area }}</view>
 									</view>
 									<view class="row4 flex">
-										<u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'" width="12px"
-											height="13px"></u--image><view class='icon-text'>{{ item.phone }}</view>
+										<u--image :showLoading="true" :src="'/static/imgs/card/phone'+item.icon+'.png'"
+											width="12px" height="13px"></u--image>
+										<view class='icon-text'>{{ item.phone }}</view>
 									</view>
 									<view class="row4 flex">
-										<u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'" width="10px"
-											height="12px"></u--image><view class='icon-text'>{{item.remark?item.remark:'--'}}</view>
+										<u--image :showLoading="true" :src="'/static/imgs/card/remark'+item.icon+'.png'"
+											width="10px" height="12px"></u--image>
+										<view class='icon-text'>{{item.remark?item.remark:'--'}}</view>
 									</view>
 								</view>
 							</view>
 						</view>
 						<view class="car-bottom flex">
 							<view class="left">
-								<image src="../../static/imgs/card/home.png" mode="widthFix" style="width: 32rpx;height: auto;"
-									@click="toHome(item)"></image>
-								<image src="../../static/imgs/card/share.png" mode="widthFix" style="width: 35rpx;height: auto;"
-									@click="share(item)"></image>
-								<image src="../../static/imgs/card/ewm.png" mode="widthFix" style="width: 32rpx;height: auto;"
-									@click="showCode(item)"></image>
+								<image src="../../static/imgs/card/home.png" mode="widthFix"
+									style="width: 32rpx;height: auto;" @click="toHome(item)"></image>
+								<image src="../../static/imgs/card/share.png" mode="widthFix"
+									style="width: 35rpx;height: auto;" @click="share(item)"></image>
+								<image src="../../static/imgs/card/ewm.png" mode="widthFix"
+									style="width: 32rpx;height: auto;" @click="showCode(item)"></image>
 							</view>
 							<view class="right">
 								<text class="text" @click="topMarking(item)">置顶</text>
@@ -163,27 +179,32 @@
 			</view>
 			<view class="upload flex flex-all-center" @click="addCard">
 				<view class="solids flex flex-all-center">
-					<image src="../../static/imgs/card/add.png" mode="widthFix" style="width: 148rpx;height: auto;"></image>
+					<image src="../../static/imgs/card/add.png" mode="widthFix" style="width: 148rpx;height: auto;">
+					</image>
 					<text class='text'>添加新名片</text>
 				</view>
 			</view>
 		</view>
-		
-		
+
+
 		<u-toast ref="uToast"></u-toast>
 		<u-popup :round='10' :show="isShowDel" @close="isShowDel=false" mode="center">
 			<view class="del-style">
 				<text class="title">删除名片自动退出关联得圈子，确定删除？</text>
 				<view class="">
 					<view @click='radiovalue=1' class="flex align-item-center radio-wrap">
-						<image style='width:13px;height:13px;margin-right:10rpx;' :src="radiovalue==1?'../../static/imgs/mySet/checked.png':'../../static/imgs/mySet/not-checked.png'" mode=""></image>
+						<image style='width:13px;height:13px;margin-right:10rpx;'
+							:src="radiovalue==1?'../../static/imgs/mySet/checked.png':'../../static/imgs/mySet/not-checked.png'"
+							mode=""></image>
 						<view class="">仅从自己名片列表删除</view>
-					</view>	
+					</view>
 					<view @click='radiovalue=2' class="flex align-item-center radio-wrap">
-						<image style='width:13px;height:13px;margin-right:10rpx;' :src="radiovalue==2?'../../static/imgs/mySet/checked.png':'../../static/imgs/mySet/not-checked.png'" mode=""></image>
+						<image style='width:13px;height:13px;margin-right:10rpx;'
+							:src="radiovalue==2?'../../static/imgs/mySet/checked.png':'../../static/imgs/mySet/not-checked.png'"
+							mode=""></image>
 						<view class="">从所有拥有此名片用户列表删除</view>
-					</view>	
-				</view>	
+					</view>
+				</view>
 				<view class="flex footer">
 					<view class="cancel" @click="isShowDel=false">
 						取消
@@ -219,7 +240,7 @@
 		<!-- 生成图片 -->
 		<poster :data="canvasData" background-color="#FFF" :width='750' :height='420' @on-success="posterSuccess"
 			ref="poster" @on-error="posterError"></poster>
-			<point-share @close='showShare=false' :show='showShare'></point-share>
+		<point-share @close='showShare=false' :show='showShare'></point-share>
 	</view>
 </template>
 
@@ -237,15 +258,15 @@
 				isShowCode: false,
 				selectCode: '',
 				id: '',
-				showShare:false,
-				popupshow:false,
+				showShare: false,
+				popupshow: false,
 				radiovalue: 1,
-				loading:true,
+				loading: true,
 				isShowDel: false,
 				cardList: [],
-				canvasData:{},
-				clicknum:0,
-				poster:''
+				canvasData: {},
+				clicknum: 0,
+				poster: ''
 			};
 		},
 		onLoad() {
@@ -256,7 +277,7 @@
 			this.init()
 		},
 		onShareAppMessage(res) {
-		
+
 			console.log(res, this.popupshow)
 			let that = this;
 			//生成名片图片
@@ -279,9 +300,9 @@
 			}
 		},
 		methods: {
-			toUrl(){
-				this.popupshow=false
-				this.showShare=true
+			toUrl() {
+				this.popupshow = false
+				this.showShare = true
 			},
 			handleHiddenShare() {
 				this.popupshow = false
@@ -297,7 +318,7 @@
 				uni.hideLoading()
 				this.popupshow = true
 				console.log(url)
-				
+
 			},
 			showCode(val) {
 				this.selectCode = val.qrCodeMyself
@@ -320,10 +341,11 @@
 					},
 					{
 						type: 'image',
-						path: this.currectData.headSculpture?this.currectData.headSculpture:'../../static/imgs/card/defaulthead.png',
+						path: this.currectData.headSculpture ? this.currectData.headSculpture :
+							'../../static/imgs/card/defaulthead.png',
 						shape: 'circle',
 						use: 'head',
-						imageType:this.currectData.headSculpture?'wl':'bd',
+						imageType: this.currectData.headSculpture ? 'wl' : 'bd',
 						x: 30,
 						y: 30,
 						width: 100,
@@ -610,7 +632,7 @@
 				this.canvasData = {
 					clicknum: this.clicknum++,
 					list: data,
-					page:'myInfo'
+					page: 'myInfo'
 				}
 				console.log(1111111)
 			},
@@ -629,15 +651,15 @@
 				}, failres => {
 					uni.hideLoading()
 					uni.showToast({
-					  icon:"none",
-					  title: failres.errmsg,
-					  duration: 3000
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
 					});
 				}).then(res => {
 					this.cardList = res.data.items
-					setTimeout(()=>{
-						that.loading=false
-					},1500)
+					setTimeout(() => {
+						that.loading = false
+					}, 1500)
 				})
 			},
 			toEditCard(val) {
@@ -660,16 +682,16 @@
 				that.$request.baseRequest('admin.unimall.cardManagementInfo', 'delete', _data, failres => {
 					uni.hideLoading()
 					uni.showToast({
-					  icon:"none",
-					  title: failres.errmsg,
-					  duration: 3000
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
 					});
 				}).then(res => {
 					this.isShowDel = false
 					uni.showToast({
-					  icon:"success",
-					  title: '删除成功！',
-					  duration: 2000
+						icon: "success",
+						title: '删除成功！',
+						duration: 2000
 					});
 					this.init()
 				})
@@ -681,7 +703,7 @@
 			},
 			addCard() {
 				uni.navigateTo({
-					url: "/pages/mySet/newCard"
+					url: "/pages/mySet/newCard?cardIndex="+(this.cardList.length+1)
 				})
 			},
 			topMarking(val) {
@@ -692,15 +714,15 @@
 				}, failres => {
 					uni.hideLoading()
 					uni.showToast({
-					  icon:"none",
-					  title: failres.errmsg,
-					  duration: 3000
+						icon: "none",
+						title: failres.errmsg,
+						duration: 3000
 					});
 				}).then(res => {
 					uni.showToast({
-					  icon:"success",
-					  title: '置顶成功！',
-					  duration: 2000
+						icon: "success",
+						title: '置顶成功！',
+						duration: 2000
 					})
 					this.init()
 				})
@@ -719,14 +741,15 @@
 	}
 
 	.content1 {
-		.icon-text{
-			margin-left:10rpx;
+		.icon-text {
+			margin-left: 10rpx;
 		}
+
 		.style1 {
 			display: flex;
-			padding: 20rpx 30rpx;
-			width: 85%;
 			margin-bottom: 70rpx;
+			padding: 30rpx;
+			box-sizing: border-box;
 
 			.left {
 				width: 132rpx;
@@ -759,7 +782,8 @@
 					color: #323333;
 				}
 
-				.row3,.row4 {
+				.row3,
+				.row4 {
 					margin-top: 30rpx;
 					font-size: 24rpx;
 					font-weight: 500;
@@ -771,6 +795,7 @@
 
 		.style2 {
 			padding: 30rpx;
+			box-sizing: border-box;
 			margin-bottom: 70rpx;
 
 			.top {
@@ -795,7 +820,7 @@
 					font-weight: bold;
 					color: #323333;
 				}
-				
+
 			}
 
 			.bottom {
@@ -839,12 +864,14 @@
 					.row2 {
 						margin-top: 20rpx;
 					}
-					.row3,.row4 {
+
+					.row3,
+					.row4 {
 						margin-top: 30rpx;
 						font-size: 24rpx;
 						font-weight: 500;
 						color: #323333;
-					
+
 					}
 				}
 			}
@@ -950,58 +977,69 @@
 		}
 
 	}
+
 	.share-content {
 		display: flex;
 		padding: 20rpx;
 		justify-content: center;
 		font-size: 24rpx;
-	
+
 		button {
 			background: transparent;
 			line-height: 1.5;
 		}
-	
+
 		button:after {
 			border: none;
 		}
 	}
-	.icon-pengyouquan,.icon-weixin{
-		font-size:50px;
-		color:#33CC00;
+
+	.icon-pengyouquan,
+	.icon-weixin {
+		font-size: 50px;
+		color: #33CC00;
 	}
-	.del-style{
-		padding:40rpx 40rpx 160rpx 40rpx;
-		font-size:32rpx;
-		position:relative;
-		.title{
-			color:#1A1A1A;
-			font-size:32rpx;
+
+	.del-style {
+		padding: 40rpx 40rpx 160rpx 40rpx;
+		font-size: 32rpx;
+		position: relative;
+
+		.title {
+			color: #1A1A1A;
+			font-size: 32rpx;
 			font-weight: bold;
 		}
-		.radio-wrap{
-			padding:23rpx;
-			border-radius:10rpx;
-			background:#F5F5F5;
-			margin:20rpx 0;
+
+		.radio-wrap {
+			padding: 23rpx;
+			border-radius: 10rpx;
+			background: #F5F5F5;
+			margin: 20rpx 0;
 		}
-		.cancel,.confirm{
+
+		.cancel,
+		.confirm {
 			width: 50%;
 			text-align: center;
 			padding: 35rpx 0;
 			border-top: 1px solid #ccc;
-			font-size:36rpx;
+			font-size: 36rpx;
 		}
-		.footer{
+
+		.footer {
 			position: absolute;
 			bottom: 0px;
 			width: 100%;
 			left: 0;
 		}
-		.cancel{
+
+		.cancel {
 			border-right: 1px solid #ccc;
 		}
-		.confirm{
-			color:#4977FC;
+
+		.confirm {
+			color: #4977FC;
 		}
 	}
-</style>
+</style>

xiaochengxu/pages/mySet/mySet.vue

@@ -18,10 +18,10 @@
 		<view class="content2">
 			<view class="row flex flex-between" v-for="(item,index) in menuList" :key='index'
 				@click="menuClick(item.type)">
-				<view class="flex">
+				<view class="flex" style="width: 100%;">
 					<image :src="item.src" mode="widthFix" class="nav-img"></image>
 					<button class="left-btn" v-if='item.type=="contactCustomer"'
-						open-type='contact'>{{item.name}}</button>
+						open-type='contact' style="width: 90%;">{{item.name}}</button>
 					<span class="left" v-else>{{item.name}}</span>
 				</view>
 

xiaochengxu/pages/mySet/newCard.vue

@@ -20,20 +20,20 @@
 						{{cardInfo.companyName}}
 					</view>
 					<view class="row3 flex">
-						<u--image :showLoading="true"
+						<u--image
 							:src="'/static/imgs/card/address'+colorList[colorSelectIndex].index+'.png'" width="13px"
 							height="16px"></u--image>
 						<view class='icon-text'>
 							{{ cardInfo.province?cardInfo.province:'-' }}{{ cardInfo.city }}{{ cardInfo.area }}</view>
 					</view>
 					<view class="row4 flex">
-						<u--image :showLoading="true"
+						<u--image
 							:src="'/static/imgs/card/phone'+colorList[colorSelectIndex].index+'.png'" width="12px"
 							height="13px"></u--image>
 						<view class='icon-text'>{{ cardInfo.phone?cardInfo.phone:'-' }}</view>
 					</view>
 					<view class="row4 flex">
-						<u--image :showLoading="true"
+						<u--image
 							:src="'/static/imgs/card/remark'+colorList[colorSelectIndex].index+'.png'" width="10px"
 							height="12px"></u--image>
 						<view class='icon-text'>{{cardInfo.remark?cardInfo.remark:'-'}}</view>
@@ -50,20 +50,20 @@
 						{{cardInfo.companyName}}
 					</view>
 					<view class="row3 flex">
-						<u--image :showLoading="true"
+						<u--image
 							:src="'/static/imgs/card/address'+colorList[colorSelectIndex].index+'.png'" width="13px"
 							height="16px"></u--image>
 						<view class='icon-text'>
 							{{ cardInfo.province?cardInfo.province:'-' }}{{ cardInfo.city }}{{ cardInfo.area }}</view>
 					</view>
 					<view class="row4 flex">
-						<u--image :showLoading="true"
+						<u--image
 							:src="'/static/imgs/card/phone'+colorList[colorSelectIndex].index+'.png'" width="12px"
 							height="13px"></u--image>
 						<view class='icon-text'>{{ cardInfo.phone?cardInfo.phone:'-' }}</view>
 					</view>
 					<view class="row4 flex">
-						<u--image :showLoading="true"
+						<u--image
 							:src="'/static/imgs/card/remark'+colorList[colorSelectIndex].index+'.png'" width="10px"
 							height="12px"></u--image>
 						<view class='icon-text'>{{cardInfo.remark?cardInfo.remark:'-'}}</view>
@@ -95,7 +95,7 @@
 					</view>
 					<view class="right">
 						<view class="row1 flex">
-							<u--image :showLoading="true"
+							<u--image
 								:src="'/static/imgs/card/address'+colorList[colorSelectIndex].index+'.png'" width="13px"
 								height="16px"></u--image>
 							<view class='icon-text'>
@@ -103,13 +103,13 @@
 							</view>
 						</view>
 						<view class="row2 flex">
-							<u--image :showLoading="true"
+							<u--image
 								:src="'/static/imgs/card/phone'+colorList[colorSelectIndex].index+'.png'" width="12px"
 								height="13px"></u--image>
 							<view class='icon-text'>{{ cardInfo.phone?cardInfo.phone:'-' }}</view>
 						</view>
 						<view class="row4 flex">
-							<u--image :showLoading="true"
+							<u--image
 								:src="'/static/imgs/card/remark'+colorList[colorSelectIndex].index+'.png'" width="10px"
 								height="12px"></u--image>
 							<view class='icon-text'>{{cardInfo.remark?cardInfo.remark:'-'}}</view>
@@ -137,7 +137,7 @@
 					</view>
 					<view class="right">
 						<view class="row1 flex">
-							<u--image :showLoading="true"
+							<u--image
 								:src="'/static/imgs/card/address'+colorList[colorSelectIndex].index+'.png'" width="13px"
 								height="16px"></u--image>
 							<view class='icon-text'>
@@ -145,13 +145,13 @@
 							</view>
 						</view>
 						<view class="row2 flex">
-							<u--image :showLoading="true"
+							<u--image
 								:src="'/static/imgs/card/phone'+colorList[colorSelectIndex].index+'.png'" width="12px"
 								height="13px"></u--image>
 							<view class='icon-text'>{{ cardInfo.phone?cardInfo.phone:'-' }}</view>
 						</view>
 						<view class="row4 flex">
-							<u--image :showLoading="true"
+							<u--image
 								:src="'/static/imgs/card/remark'+colorList[colorSelectIndex].index+'.png'" width="10px"
 								height="12px"></u--image>
 							<view class='icon-text'>{{cardInfo.remark?cardInfo.remark:'-'}}</view>
@@ -282,10 +282,12 @@
 	var that;
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	export default {
-		onLoad() {
+		onLoad(options) {
 			that = this
 			this.userInfo = uni.getStorageSync("userInfo")
 			this.cardInfo.commonId = this.userInfo.id
+			this.cardInfo.cardBusiness ="名片标识"+ options.cardIndex
+			
 			this.getList()
 		},
 		data() {
@@ -326,30 +328,6 @@
 				selectConfig: 1,
 				selectIndex: 0,
 				imgList: [],
-				// imgList: [{
-				// 		dictLabel: '/./../static/1.jpg',
-				// 		dictValue: '/./../static/1.jpg'
-
-				// 	},
-				// 	{
-				// 		dictLabel: '/./../static/2.jpg',
-				// 		dictValue: '/./../static/2.jpg'
-
-				// 	},
-				// 	{
-				// 		dictLabel: '/./../static/3.jpg',
-				// 		dictValue: '/./../static/3.jpg'
-
-				// 	}, {
-				// 		dictLabel: '/./../static/4.jpg',
-				// 		dictValue: '/./../static/4.jpg'
-
-				// 	}, {
-				// 		dictLabel: '/./../static/5.jpg',
-				// 		dictValue: '/./../static/5.jpg'
-
-				// 	}
-				// ],
 				isSubmit: false,
 				content: '确定提交名片信息？',
 				userInfo: {},
@@ -359,7 +337,7 @@
 					area: '',
 					province: '',
 					commonId: '',
-					cardBusiness: '名片标识',
+					cardBusiness: '',
 					name: '',
 					post: '',
 					companyName: '',