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

# Conflicts:
#	xiaochengxu/pages.json
#	xiaochengxu/pages/cardHolder/cardHolder.vue

xiaochengxu/components/zhangyuhao-poster/Poster.vue

@@ -69,6 +69,14 @@ list参数说明：
 			};
 		},
 		watch: {
+			list(newVal, oldVal){
+				debugger
+				this.list = newVal
+				if(this.list.length!=0){
+					this.generateImg()
+					console.log('mounted')
+				}
+			},
 			drawPathQueue(newVal, oldVal) {
 				// 绘制单行文字
 				const fillText = (textOptions) => {
@@ -238,8 +246,7 @@ list参数说明：
 		},
 		mounted() {
 			this.ctx = uni.createCanvasContext('myCanvas', this)
-			this.generateImg()
-			console.log('mounted')
+			
 		},
 
 		methods: {

xiaochengxu/pages.json

@@ -4,30 +4,6 @@
 	},
 	"pages": [
 		{
-			"path": "pages/circle/circle",
-			"style": {
-				"navigationBarTitleText": "圈子",
-				"enablePullDownRefresh": false
-			}
-		
-		},
-		{
-			"path": "pages/mySet/myInfo",
-			"style": {
-				"navigationBarTitleText": "我的名片",
-				"enablePullDownRefresh": false
-			}
-
-		},
-		
-		{
-			"path": "pages/mySet/mySet",
-			"style": {
-				"navigationBarTitleText": "我的",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
 			"path": "pages/cardHolder/cardHolder",
 			"style": {
 				"navigationBarTitleText": "电子名片",
@@ -45,10 +21,33 @@
 				// 			}]
 				// 		}
 				// 	}
+		
+			}
+		
+		},{
+			"path": "pages/mySet/myInfo",
+			"style": {
+				"navigationBarTitleText": "我的名片",
+				"enablePullDownRefresh": false
+			}
 
+		},
+		{
+			"path": "pages/circle/circle",
+			"style": {
+				"navigationBarTitleText": "圈子",
+				"enablePullDownRefresh": false
 			}
 
-		}, {
+		},
+		{
+			"path": "pages/mySet/mySet",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"enablePullDownRefresh": false
+			}
+
+		},  {
 			"path": "pages/cardHolder/map",
 			"style": {
 				"navigationBarTitleText": "地图",
@@ -68,6 +67,7 @@
 				"navigationBarTitleText": "名片",
 				"enablePullDownRefresh": false
 			}
+
 		}, {
 			"path": "pages/circle/detail",
 			"style": {
@@ -107,7 +107,7 @@
 		}, {
 			"path": "pages/mySet/myHome",
 			"style": {
-				"navigationBarTitleText": "主页信息",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
 

xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -132,7 +132,7 @@
 		</u-popup>
 		<!-- <image :src="poster" style="width: 750rpx;height: 1334rpx;"></image> -->
 		<!-- 生成图片 -->
-		<poster v-if="list&&list.length>0" :list="list" background-color="#FFF"
+		<poster :list="canvasData" background-color="#FFF"
 			@on-success="posterSuccess" ref="poster" @on-error="posterError"></poster>
 	</view>
 </template>
@@ -167,7 +167,6 @@
 				qrcodeShow: false,
 				unread: 0,
 				noticeList: [],
-				list:[]
 			};
 		},
 		onShow() {
@@ -223,6 +222,7 @@
 			                console.log(err)
 			            },
 			            posterSuccess(url) {
+							console.log("hahahah",url)
 			                // 生成成功，会把临时路径在这里返回
 			                this.poster = url;
 			                console.log(url)
@@ -234,7 +234,6 @@
 			},
 			delSearchVal() {
 				this.searchVal = ""
-				uni.removeStorageSync("search_val")
 				this.mescroll.resetUpScroll()
 			},
 			toUrl() {
@@ -242,7 +241,7 @@
 				this.popupshow = false
 				this.qrcodeShow = true
 			},
-			share(item) {
+			share(item) {debugger
 				this.currectData = item
 				this.canvasData = [{
 						type: 'image',
@@ -251,16 +250,17 @@
 						y: 0,
 						width: 750,
 						height: 424
-					},{
-						type: 'text',
-						text:item.name,
-						x: 0,
-						y: 0,
-						size:13
 					},
+					// {
+					// 	type: 'text',
+					// 	text:item.name,
+					// 	x: 0,
+					// 	y: 0,
+					// 	size:13
+					// },
 					
 				]
-				this.popupshow = true
+				// this.popupshow = true
 			},
 			async delConfirm() {
 				uni.showLoading({