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 | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/uniapp/utils/getClipboard.js b/uniapp/utils/getClipboard.js
index 6746089..8af8f3f 100644
--- a/uniapp/utils/getClipboard.js
+++ b/uniapp/utils/getClipboard.js
@@ -11,13 +11,13 @@
var nowClipData = res.data
if (nowClipData.length > 6 && nowClipData!=uni.getStorageSync('clipboard')) {
getApp().globalData.hasMode = true
- console.log(nowClipData);
Vue.prototype.$u.api.identifyGoods({goods_url: nowClipData}).then(e => {
console.log(e)
if(e.code != 0) return Vue.prototype.$alert(e.msg)
var res = e.data;
callback(res)
}).catch(function (err) {
+ console.log(err)
})
}else{
getApp().globalData.hasMode = false
@@ -49,7 +49,7 @@
const viewContentWidth = parseInt(popupViewWidth - viewContentPadding * 2);
// 鏄剧ず寮圭獥
maskLayers.show();
-
+ try{
if (data.goodsId) {
let sLeft = 0;
let popupViewHeight = popupViewWidth + uni.upx2px(390);
@@ -743,6 +743,12 @@
getApp().globalData.hasMode = false
}
});
+ }
+ catch(e)
+ {
+ console.log(e);
+ maskLayers.hide();
+ }
}
export default () => {
--
Gitblit v1.9.3