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 | 104 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 74 insertions(+), 30 deletions(-)
diff --git a/uniapp/utils/getClipboard.js b/uniapp/utils/getClipboard.js
index ec4c169..8af8f3f 100644
--- a/uniapp/utils/getClipboard.js
+++ b/uniapp/utils/getClipboard.js
@@ -2,10 +2,10 @@
import request from './http.js'
import utils from './utils.js'
import clipboard from "../js_sdk/dc-clipboard/clipboard.js"
-
-
+
function getclick(callback) {
- uni.getClipboardData({
+ //鑾峰彇鍓创鏉垮唴瀹�
+ uni.getClipboardData({
success: res => {
console.log(res, '======================================================');
var nowClipData = res.data
@@ -17,15 +17,10 @@
var res = e.data;
callback(res)
}).catch(function (err) {
+ console.log(err)
})
- // request.post("tb/parseContent", {
- // content: nowClipData
- // }, 'application/json').then(res => {
- // callback(res)
- // });
}else{
getApp().globalData.hasMode = false
- console.log('鍐呴儴澶嶅埗');
}
}
})
@@ -35,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%',
@@ -54,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",
@@ -301,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
@@ -417,11 +412,31 @@
},
position: {
top: uni.upx2px(580) + "px",
- left: uni.upx2px(115) + "px",
+ left: uni.upx2px(85) + "px",
width: uni.upx2px(74) + "px",
height: uni.upx2px(24) + "px",
}
},
+ {
+ tag: 'font',
+ id: 'dytxt',
+ text: '鎶栭煶',
+ textStyles: {
+ size: uni.upx2px(24) + "px",
+ color: "#333333",
+ align: "center",
+ weight: "normal",
+ whiteSpace: "nowrap",
+ overflow: 'ellipsis',
+ verticalAlign: 'middle'
+ },
+ position: {
+ top: uni.upx2px(580) + "px",
+ left: uni.upx2px(185) + "px",
+ width: uni.upx2px(74) + "px",
+ height: uni.upx2px(24) + "px",
+ }
+ },
{
tag: 'font',
id: 'pddtxt',
@@ -437,7 +452,7 @@
},
position: {
top: uni.upx2px(580) + "px",
- left: uni.upx2px(225) + "px",
+ left: uni.upx2px(285) + "px",
width: uni.upx2px(74) + "px",
height: uni.upx2px(24) + "px",
}
@@ -457,44 +472,57 @@
},
position: {
top: uni.upx2px(580) + "px",
- left: uni.upx2px(335) + "px",
+ left: uni.upx2px(385) + "px",
width: uni.upx2px(74) + "px",
height: uni.upx2px(24) + "px",
}
},
+
{
- 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: {
top: uni.upx2px(490) + "px",
- left: uni.upx2px(115) + "px",
+ left: uni.upx2px(85) + "px",
width: uni.upx2px(74) + "px",
height: uni.upx2px(74) + "px",
}
},
+ {
+ src: 'https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/index_icon/%E6%8A%96.png',
+ tag: 'img',
+ id: 'dy',
+ position: {
+ top: uni.upx2px(490) + "px",
+ left: uni.upx2px(185) + "px",
+ width: uni.upx2px(74) + "px",
+ height: uni.upx2px(74) + "px",
+ }
+ },
{
- 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: {
top: uni.upx2px(490) + "px",
- left: uni.upx2px(225) + "px",
+ left: uni.upx2px(285) + "px",
width: uni.upx2px(74) + "px",
height: uni.upx2px(74) + "px",
}
},
{
- 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: {
top: uni.upx2px(490) + "px",
- left: uni.upx2px(335) + "px",
+ left: uni.upx2px(385) + "px",
width: uni.upx2px(74) + "px",
height: uni.upx2px(74) + "px",
}
},
+
];
nogoodsIdwrap.drawRect({
@@ -570,13 +598,14 @@
let icontop = uni.upx2px(490)
let iconbtm = uni.upx2px(600)
- let jdleft = uni.upx2px(115)
- let jdrgt = uni.upx2px(190)
- let pddleft = uni.upx2px(225)
- let pddrgt = uni.upx2px(300)
- let vphleft = uni.upx2px(335)
- let vphrgt = uni.upx2px(410)
-
+ let jdleft = uni.upx2px(85)
+ let jdrgt = uni.upx2px(160)
+ let pddleft = uni.upx2px(285)
+ let pddrgt = uni.upx2px(360)
+ let vphleft = uni.upx2px(385)
+ let vphrgt = uni.upx2px(460)
+ let dyleft= uni.upx2px(185)
+ let dyrgt= uni.upx2px(260)
if (e.clientY > icontop && e.clientY < iconbtm) {
if (e.clientX < jdrgt && e.clientX > jdleft) {
console.log('鍘籮d');
@@ -588,7 +617,16 @@
uni.setStorageSync('clipboard',dataInfo.goods_url)
getApp().globalData.hasMode = false
}
-
+ if(e.clientX < dyrgt && e.clientX > dyleft) {
+ console.log('鍘籨y');
+ maskLayers.hide();
+ nogoodsIdwrap.hide();
+ uni.navigateTo({
+ url: '/pages/search/searchResult?storetype=4&searchText=' + dataInfo.goods_url
+ })
+ uni.setStorageSync('clipboard',dataInfo.goods_url)
+ getApp().globalData.hasMode = false
+ }
if (e.clientX < pddrgt && e.clientX > pddleft) {
console.log('鍘籶dd');
const value = uni.getStorageSync('userInfo');
@@ -705,6 +743,12 @@
getApp().globalData.hasMode = false
}
});
+ }
+ catch(e)
+ {
+ console.log(e);
+ maskLayers.hide();
+ }
}
export default () => {
--
Gitblit v1.9.3