From a9dd0ea8acc183a466b02738b2a2dfd505a83c6c Mon Sep 17 00:00:00 2001
From: heyuntao <heyuntao@LAPTOP-MP4HD5NS>
Date: 星期四, 01 六月 2023 11:24:56 +0800
Subject: [PATCH] Merge branch 'develop' of http://60.204.153.149:8081/r/dfgApp into develop
---
uniapp/manifest.json | 3 ++-
uniapp/utils/utils.js | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/uniapp/manifest.json b/uniapp/manifest.json
index 7cb85c4..6225c9f 100644
--- a/uniapp/manifest.json
+++ b/uniapp/manifest.json
@@ -24,7 +24,8 @@
"Maps" : {},
"Share" : {},
"Geolocation" : {},
- "Push" : {}
+ "Push" : {},
+ "Camera" : {}
},
/* 搴旂敤鍙戝竷淇℃伅 */
"distribute" : {
diff --git a/uniapp/utils/utils.js b/uniapp/utils/utils.js
index 2557f02..aa0a970 100644
--- a/uniapp/utils/utils.js
+++ b/uniapp/utils/utils.js
@@ -246,14 +246,14 @@
// #ifdef APP-PLUS
var userinfo = common.getCacheSync('userInfo');
var appInfo = common.getCacheSync('appInfo');
- var txtdata
- if (plus.os.name == 'Android') {
+ var txtdata=appInfo.invite_url + "?code="+userinfo.invitation_code
+ /* if (plus.os.name == 'Android') {
txtdata = appInfo.appName + '鐨勪笅杞介摼鎺ヤ负锛�' + appInfo.appAndroidDownUrl +
'\n閭�璇风爜锛�' + userinfo.invitation_code
} else {
txtdata = appInfo.appName + '鐨勪笅杞介摼鎺ヤ负锛�' + appInfo.appIosDownUrl + '\n閭�璇风爜锛�' +
userinfo.invitation_code
- }
+ } */
uni.setClipboardData({
data: txtdata,
success: res => {
--
Gitblit v1.9.3