From fc9bd6378d3bfbde6d5c71535757a3d44de8d8ff Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 20 七月 2023 15:18:06 +0800
Subject: [PATCH] Merge branch 'feature/1.1.4开发' into develop
---
uniapp/utils/getClipboard.js | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/uniapp/utils/getClipboard.js b/uniapp/utils/getClipboard.js
index 875016a..8af8f3f 100644
--- a/uniapp/utils/getClipboard.js
+++ b/uniapp/utils/getClipboard.js
@@ -2,10 +2,9 @@
import request from './http.js'
import utils from './utils.js'
import clipboard from "../js_sdk/dc-clipboard/clipboard.js"
-
-
+
function getclick(callback) {
-
+ //鑾峰彇鍓创鏉垮唴瀹�
uni.getClipboardData({
success: res => {
console.log(res, '======================================================');
@@ -18,10 +17,10 @@
var res = e.data;
callback(res)
}).catch(function (err) {
+ console.log(err)
})
}else{
getApp().globalData.hasMode = false
- console.log('鍐呴儴澶嶅埗');
}
}
})
@@ -31,7 +30,7 @@
function updatePopup(dataInfo) {
var data = dataInfo.goods;
// 寮圭獥閬僵灞�
- let maskLayers = new plus.nativeObj.View("maskLayers", { //鍏堝垱寤洪伄缃╁眰
+ var maskLayers = new plus.nativeObj.View("maskLayers", { //鍏堝垱寤洪伄缃╁眰
top: '0px',
left: '0px',
height: '100%',
@@ -50,13 +49,13 @@
const viewContentWidth = parseInt(popupViewWidth - viewContentPadding * 2);
// 鏄剧ず寮圭獥
maskLayers.show();
-
+ try{
if (data.goodsId) {
let sLeft = 0;
let popupViewHeight = popupViewWidth + uni.upx2px(390);
sLeft = (data.originalPrice.toString().length + 1) * uni.upx2px(30);
// 寮圭獥鍐呭
- var clipViews = new plus.nativeObj.View("clipViews", { //鍒涘缓搴曢儴鍥炬爣鑿滃崟
+ let clipViews = new plus.nativeObj.View("clipViews", { //鍒涘缓搴曢儴鍥炬爣鑿滃崟
tag: "rect",
top: (screenHeight - popupViewHeight) / 2 + "px",
left: (screenWidth - popupViewWidth) / 2 + "px",
@@ -297,7 +296,7 @@
})
}else{
uni.navigateTo({
- url: '/pages/goods/goodsDetail?info=' + encodeURIComponent(JSON.stringify(data))
+ url: '/pages/goods/goodsDetail?proform=clipboard&info=' + encodeURIComponent(JSON.stringify(data))
})
}
getApp().globalData.hasMode = false
@@ -480,7 +479,7 @@
},
{
- src: './static/images/app/jd.png',
+ src: 'https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/index_icon/%E4%BA%AC%E4%B8%9C.png',
tag: 'img',
id: 'jd',
position: {
@@ -502,7 +501,7 @@
}
},
{
- src: './static/images/app/pdd.png',
+ src: 'https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/index_icon/%E6%8B%BC.png',
tag: 'img',
id: 'pdd',
position: {
@@ -513,7 +512,7 @@
}
},
{
- src: './static/images/app/vph.png',
+ src: 'https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/index_icon/%E5%94%AF.png',
tag: 'img',
id: 'vph',
position: {
@@ -744,6 +743,12 @@
getApp().globalData.hasMode = false
}
});
+ }
+ catch(e)
+ {
+ console.log(e);
+ maskLayers.hide();
+ }
}
export default () => {
--
Gitblit v1.9.3