Merge branch 'dev' into 'master'

Dev

See merge request !96

myPackageA/businessCard/businessCard.vue

@@ -36,11 +36,13 @@
 					</view>
 					<view class="introductContent">
 						<view v-for="item in infoList" :key="item.id" class="infoCon" @click="handleInfo(item)">
-
-							<view class="iconfont infoIcon" :class="`${item.icon}`"></view>
-							<view class="infoTxt">
-								{{item.value}}
-							</view>
+							<template v-if="item.value">
+								<view class="iconfont infoIcon" :class="`${item.icon}`"></view>
+								<view class="infoTxt" >
+									{{item.value}}
+								</view>
+							</template>
+							
 						</view>
 					</view>
 				</view>
@@ -244,7 +246,7 @@
 	import BootPage from "@/components/bootpage/bootpage.vue";
 	import dataHandling from "@/util/dataHandling";
 	import customSegmentedControl from '@/components/customSegmentedControl/customSegmentedControl.vue';
-	
+	import wx from 'weixin-js-sdk'
 	export default {
 		name: 'businessCard',
 		components: {
@@ -418,17 +420,19 @@
 					title: ` ${this.cardInfo.userName}| ${this.cardInfo.companyInfoList[0].position} - ${this.cardInfo.companyInfoList[0].companyName}`,
 					desc: '​AI普惠型新家办领创家庭财事治理蓝海生态',
 					link: `${shareURL}/myPackageA/businessCard/businessCard?userId=${this.userId}&cardId=${this.cardId}&isShareCard=1`, //分享链接
-					imgUrl: `${shareURL}/myPackageA/static/images/suplogo.png`, //图片
+					imgUrl: `${shareURL}/static/suplogo.png`, //图片
 				}
 				var url = window.location.href.split('#')[0]
 				hshare(data, url)
 			},
 			// 分享状态下获取名片信息
 			getShareCard() {
+				console.log('获取分享名片');
 				api.getShareBusinessCard(
 					this.cardId
 				).then(res => {
 					if (res['success']) {
+						
 						this.cardInfo = res.data.data
 						this.cardId = res.data.data.id
 						// this.infoList[0].value = this.cardInfo.phone || '暂无'
@@ -438,11 +442,12 @@
 							this.infoList[0].value = '暂无'
 						}
 						this.btnList[1].phoneNumber = this.cardInfo.phone || null
-						this.infoList[1].value = this.cardInfo.email || '暂无'
+						this.infoList[1].value = this.cardInfo.email || null
 						this.infoList[2].value = this.cardInfo.address || '暂无'
 						if (dataHandling.h5RuntimeEnv() !== 'miniprogram') {
 							this.getshareData()
 						}
+						console.log('cardInfo',this.cardInfo);
 					} else {
 						uni.showToast({
 							title: res['message'],
@@ -469,7 +474,7 @@
 							this.infoList[0].value = '暂无'
 						}
 						this.btnList[1].phoneNumber = this.cardInfo.phone || null
-						this.infoList[1].value = this.cardInfo.email || '暂无'
+						this.infoList[1].value = this.cardInfo.email || null
 						this.infoList[2].value = this.cardInfo.address || '暂无'
 						// this.cardInfo.companyInfoList = [
 						// 	{companyName:'上海律宝科技有限公司',position:'副总经理'},
@@ -553,7 +558,19 @@
 					if (dataHandling.h5RuntimeEnv() !== 'miniprogram') {
 						this.getshareData()
 					}
-
+					// if(dataHandling.h5RuntimeEnv() == 'miniprogram'){
+					// 	let data = {
+					// 		title: ` ${this.cardInfo.userName}| ${this.cardInfo.companyInfoList[0].position} - ${this.cardInfo.companyInfoList[0].companyName}`,
+					// 		desc: '​AI普惠型新家办领创家庭财事治理蓝海生态',
+					// 		link: `${shareURL}/myPackageA/businessCard/businessCard?userId=${this.userId}&cardId=${this.cardId}&isShareCard=1`, //分享链接
+					// 		imgUrl: `${shareURL}/myPackageA/static/images/suplogo.png`, //图片
+					// 	}
+					// 	// 这里应该给小程序的webview发消息，不知道该怎样发送？此时
+					// 		wx.miniProgram.navigateTo({
+					// 		  url: `/myPackageA/h5Pay/appYdhomeofficePay?param=${encodeURIComponent(JSON.stringify(param))}`
+							 
+					// 		})
+					// }
 				}
 			},
 			//关闭登录