前端

xiaochengxu/components/zhangyuhao-poster/Poster.vue

@@ -283,7 +283,11 @@ list参数说明：
 					console.log(this.list[i])
 					current.index = i
 					/* 如果是文本直接放入队列 */
-					if (current.type === 'text' || current.type === 'textarea' || current.type === 'image' && current.use !== 'bg' && current.use !== 'head') {
+					if (current.type === 'text' || current.type === 'textarea' || current.type === 'image' && current.use !== 'bg' ) {
+						this.drawPathQueue.push(current)
+						continue
+					}
+					if( current.use === 'head'&&current.imageType === 'wl'){
 						this.drawPathQueue.push(current)
 						continue
 					}

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/cardHolder/cardHolder.vue

@@ -634,6 +634,7 @@
 						path: this.currectData.headSculpture?this.currectData.headSculpture:'../../static/imgs/card/defaulthead.png',
 						shape: 'circle',
 						use: 'head',
+						imageType:this.currectData.headSculpture?'wl':'bd',
 						x: 30,
 						y: 30,
 						width: 100,

xiaochengxu/pages/mySet/lookCard.vue

@@ -23,8 +23,10 @@
 				text:'识别号码'
 			}
 		},
-		onLoad(options) {
-			this.cardList=options.cardList
+		onShow() {
+			console.log(11111)
+			this.cardList=uni.getStorageSync('checkedList');
+			console.log(this.cardList,11111111)
 		},
 		methods: {
 			imageOCR(item){

xiaochengxu/pages/mySet/myCard.vue

@@ -71,7 +71,7 @@
 					</view>
 					<view v-else style='padding-left:20rpx;' >
 						<u-upload  @afterRead="afterRead" :fileList="fileList2" @delete="deletePic" name="2" multiple
-						:maxCount="1" height='190' width='360'>
+						:maxCount="1" height='190' width='350'>
 							<view class="">
 								123
 							</view>
@@ -841,4 +841,19 @@
 		font-size:50px;
 		color:#33CC00;
 	}
+	/deep/.u-upload
+	 {
+		 
+		.u-upload__deletable {
+			height:40rpx;
+			width:40rpx;
+			line-height:40rpx;
+		}
+		.u-upload__deletable__icon{
+			top:8rpx;
+		}
+		.uicon-close{
+			font-size:20px !important;
+		}
+	}
 </style>

xiaochengxu/pages/mySet/myInfo.vue

@@ -11,7 +11,7 @@
 						: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" width="66px" height="66px"
+								<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">
@@ -67,7 +67,7 @@
 							<view class="left">
 								<u--image :showLoading="true" :src="item.headSculpture" width="66px" height="66px"
 									shape="circle" v-if="item.headSculpture"></u--image>
-								<u--image :showLoading="true" src="/./../static/imgs/card/defaulthead.png" width="66px"
+								<u--image :showLoading="true" src="/static/imgs/card/defaulthead.png" width="66px"
 									height="66px" shape="circle" v-else></u--image>
 							</view>
 						</view>
@@ -75,7 +75,7 @@
 							<view class="top">
 								<u--image :showLoading="true" :src="item.headSculpture" width="66px" height="66px"
 									shape="circle" v-if="item.headSculpture"></u--image>
-								<u--image :showLoading="true" src="/./../static/imgs/card/defaulthead.png" width="66px"
+								<u--image :showLoading="true" src="/static/imgs/card/defaulthead.png" width="66px"
 									height="66px" shape="circle" v-else></u--image>
 							</view>
 							<view class="bottom flex">
@@ -119,7 +119,7 @@
 								<view class="left">
 									<u--image :showLoading="true" :src="item.headSculpture" width="66px" height="66px"
 										shape="circle" v-if="item.headSculpture"></u--image>
-									<u--image :showLoading="true" src="/./../static/imgs/card/defaulthead.png" width="66px"
+									<u--image :showLoading="true" src="/static/imgs/card/defaulthead.png" width="66px"
 										height="66px" shape="circle" v-else></u--image>
 								</view>
 								<view class="right">
@@ -324,6 +324,7 @@
 						path: this.currectData.headSculpture?this.currectData.headSculpture:'../../static/imgs/card/defaulthead.png',
 						shape: 'circle',
 						use: 'head',
+						imageType:this.currectData.headSculpture?'wl':'bd',
 						x: 30,
 						y: 30,
 						width: 100,

xiaochengxu/pages/mySet/mySet.vue

@@ -8,11 +8,11 @@
 				</view>
 			</view>
 			<view class="position">
-				<image v-if='list.length>1||list.length==0' @click='selectCard' src="../../static/imgs/mySet/share.png" mode="widthFix" class="right-img">
-				<button v-if='list.length==1' class="shareBtn" type="default" data-name="shareBtn" open-type="share">
+				<image @click='selectCard' src="../../static/imgs/mySet/share.png" mode="widthFix" class="right-img">
+<!-- 				<button v-if='list.length==1' class="shareBtn" type="default" data-name="shareBtn" open-type="share">
 					<image src="../../static/imgs/mySet/share.png" mode="widthFix" class="right-img">
 					</image>
-				</button>
+				</button> -->
 				<image @click='selectCard1' src="../../static/imgs/mySet/ewm.png" mode="widthFix" class="right-img">
 				</image>
 			</view>
@@ -58,6 +58,7 @@
 				canvasData: {},
 				currectData: {},
 				list:[],
+				index:0,
 				selectCode: '',
 				show: false,
 				clicknum: 0,
@@ -116,15 +117,6 @@
 				}).then(res => {
 					this.list=res.data.items
 					this.cardList = [res.data.items]
-					if(res.data.items.length>0){
-						if(!this.poster){
-							this.cardChange({
-								value: this.cardList[[0]]
-							})
-						}
-						
-					}
-					
 				})
 			} else {
 				uni.switchTab({
@@ -162,8 +154,11 @@
 			},
 			selectCard() {
 				if(this.cardList[0].length>0){
-					this.show = true
-				}else if(this.cardList[0].length==0){
+					this.index=0
+					this.cardChange({
+						value: this.cardList[[0]]
+					})
+				}else if(this.list.length==0){
 					this.$refs.uToast.show({
 						type: 'error',
 						message: '您还未创建名片',
@@ -172,13 +167,13 @@
 				
 			},
 			selectCard1() {
-				console.log(this.cardList[0])
-				if(this.cardList[0].length>1){
+				if(this.list.length>1){
 					this.show1 = true
-				}else if(this.cardList[0].length>0){
+				}else if(this.list.length>0){
 					this.cardConfirm({value:this.cardList[[0]]})
 				}
 				
+				
 			},
 			cardConfirm(e) {
 				console.log(e)
@@ -188,6 +183,7 @@
 				this.isShowCode = true
 			},
 			cardChange(e) {
+				console.log(e)
 				this.currectData = e.value[0]
 				uni.showLoading({
 					title: '加载中',
@@ -207,6 +203,7 @@
 						path: this.currectData.headSculpture?this.currectData.headSculpture:'../../static/imgs/card/defaulthead.png',
 						shape: 'circle',
 						use: 'head',
+						imageType:this.currectData.headSculpture?'wl':'bd',
 						x: 30,
 						y: 30,
 						width: 100,
@@ -459,6 +456,9 @@
 				// 生成成功，会把临时路径在这里返回
 				this.poster = url;
 				console.log(url)
+				if(this.index==0){
+					this.show=true
+				}
 				// this.show=false
 				uni.hideLoading()
 			},