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

unimall-data/src/main/java/com/iotechn/unimall/data/domain/CardHolderInfo.java

@@ -119,7 +119,9 @@ public class CardHolderInfo extends SuperDO {
     /** 头像 */
     @TableField(exist = false)
     private String headSculpture;
-
+    /** 图标 */
+    @TableField(exist = false)
+    private String icon;
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/CardHolderInfoMapper.xml

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cmi.qr_code as qrCode,
         cmi.current_background as currentBackground,
         cmi.cuttent_template as cuttentTemplate,
+        cmi.icon as icon,
         phi.id as personalHomeId,
         cui.share_card as shareCard,
         chi.gmt_update AS gmtUpdate,

xiaochengxu/pages/cardHolder/cardHolder.vue

@@ -1263,6 +1263,7 @@
 				this.type = 1
 			},
 			scan() {
+				var that = this
 				// console.log(1)
 				// uni.navigateTo({
 				// 	url: "/pages/cardHolder/scancode"
@@ -1271,9 +1272,24 @@
 					success: function(res) {
 						console.log('条码类型：' + res.scanType);
 						console.log('条码内容：' + res.result);
-						uni.navigateTo({
-							url: "/pages/cardHolder/scanCodeAddCard?id=" + res.result.split("=")[1]
+						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,
+							cardId:cardId
+						}, failres => {
+							console.log('res+++++', failres.errmsg)
+							uni.showToast({
+							  icon:"none",
+							  title: failres.errmsg,
+							  duration: 3000
+							});
+						}).then(res1 => {
+							uni.navigateTo({
+								url: "/pages/cardHolder/scanCodeAddCard?id=" + res.result.split("=")[1]
+							})
 						})
+						
 					}
 				});
 			},