Merge branch 'feat/camcard' into dev/1.0

common/js/card-api.js

@@ -36,12 +36,16 @@ export const CARD_API_URL = {
 	CARD_RETRY: '/card/api/card/retry',
 	CARD_RECOGNIZE_BATCH: '/card/api/card/recognizeBatch',
 	CARD_DELETE: '/card/api/card/delete', // 删除自己的名片(软删, 2.11.91)
+	CARD_UPLOAD_QR: '/card/api/card/uploadQrImage', // 自定义二维码图片上传(2.20, 走 Http.upload 通道)
 
 	// === 跟进完成态 2.11.3 /card/api/card/* ===
 	CARD_FOLLOW_DONE: '/card/api/card/followDone',
 	// === 访客轨迹 2.11.4 /card/api/card/* ===
 	CARD_VIEWS: '/card/api/card/views',
 
+	// === 名片主键寻址 /card/api/diy/card (小程序码 scene 仅 32 字符装不下业务 card_id, 需按主键 id 换) ===
+	CARD_BY_REL_ID: '/card/api/diy/card', // POST {id} → 返回该主键对应的业务 card(card_id)
+
 	// === 员工建卡申请 2.11.15 /card/api/apply/* ===
 	APPLY_SUBMIT: '/card/api/apply/submit',
 	APPLY_STATUS: '/card/api/apply/status',
@@ -147,7 +151,9 @@ export const CARD_FIELDS = [
 	'name', 'company', 'job_title', 'avatar',
 	'mobile', 'phone', 'email', 'website', 'wechat',
 	'country', 'province', 'city', 'address', 'postal_code',
-	'bio'
+	'bio',
+	// 2.20 名片级自定义二维码图片(空=用系统生成码)
+	'qr_image'
 ];
 
 /** 人脉可更新白名单：与后端 Contact::EDITABLE_FIELDS 一致 */
@@ -280,6 +286,16 @@ const CardApi = {
 		Http.sendRequest(Object.assign({ url: CARD_API_URL.CARD_VIEWS }, p || {}));
 	},
 
+	/**
+	 * 按名片主键 id 换业务 card_id（小程序码 scene 仅 32 字符装不下业务 card_id，故先查）
+	 * 入参: { data: { id }, success, fail }
+	 * 返回 data: { card: { card_id, ... } }
+	 * @param {Object} p { data: { id }, success, fail }
+	 */
+	cardByRelId(p) {
+		Http.sendRequest(Object.assign({ url: CARD_API_URL.CARD_BY_REL_ID }, p || {}));
+	},
+
 	/* ================= 人脉库 ================= */
 
 	/**