From 1a36fc39260bfa1fa7f1e1dac1ad7d2d969b3e65 Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期一, 31 三月 2025 16:24:58 +0800
Subject: [PATCH] 添加分享功能
---
images/logo2.jpg | 0
pages/home/home.js | 295 ++++++++++++++++--------------------------------
pages/login/login.js | 33 -----
3 files changed, 102 insertions(+), 226 deletions(-)
diff --git a/images/logo2.jpg b/images/logo2.jpg
new file mode 100644
index 0000000..6ac16db
--- /dev/null
+++ b/images/logo2.jpg
Binary files differ
diff --git a/pages/home/home.js b/pages/home/home.js
index e990d66..773340d 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -36,7 +36,7 @@
selectedProject: '',
avatarTapCount: 0,
isFromLogin: false,
- showTipDialog:''
+ showTipDialog: ''
},
openValve: function (e) {
@@ -61,15 +61,22 @@
}).exec();
},
startPullDownRefresh() {
- if (!this.data.isWXRefreshing) {
- var self = this;
- console.log(this.data.isRefreshing);
- this.setData({
- isRefreshing: true
- });
- this.getOpenList();
-
+ if (getApp().globalData.isLoggedIn) {
+ if (!this.data.isWXRefreshing) {
+ var self = this;
+ console.log(this.data.isRefreshing);
+ this.setData({
+ isRefreshing: true
+ });
+ this.getOpenList();
+ }
+ } else {
+ wx.showToast({
+ title: '璇峰厛鐧诲綍',
+ icon: 'error'
+ })
}
+
},
//鑾峰彇鐢ㄦ埛鏁版嵁
@@ -92,12 +99,12 @@
*/
onLoad(options) {
console.log('home椤甸潰onLoad寮�濮嬶紝鍙傛暟:', options);
- //褰撳紑闃�鎴愬姛鍚庤皟鐢ㄥ埛鏂�
+ //褰撳紑闃�鎴愬姛鍚庤皟鐢ㄥ埛鏂�
if (options.param === "1" || options.param === "2") {
- this.setData({
- options: options
- })
- }
+ this.setData({
+ options: options
+ })
+ }
// 妫�鏌ユ槸鍚︿粠鐧诲綍椤甸潰杩斿洖
let fromLogin = false;
@@ -105,29 +112,6 @@
if (options && options.fromLogin === 'true') {
console.log('妫�娴嬪埌URL鍙傛暟fromLogin=true');
fromLogin = true;
- }
-
- // 妫�鏌ユ槸鍚︽湁涓存椂鏍囪
- try {
- const tempFromLogin = wx.getStorageSync('_temp_from_login');
- console.log('璇诲彇鍒扮殑涓存椂鏍囪鍊�:', tempFromLogin);
-
- if (tempFromLogin === 'true') {
- console.log('妫�娴嬪埌涓存椂fromLogin鏍囪');
- fromLogin = true;
-
- // 寤惰繜娓呴櫎涓存椂鏍囪锛岀‘淇濆叾浠栧湴鏂规湁瓒冲鏃堕棿璇诲彇
- setTimeout(() => {
- try {
- wx.removeStorageSync('_temp_from_login');
- console.log('鑷姩娓呴櫎涓存椂fromLogin鏍囪');
- } catch (e) {
- console.error('娓呴櫎涓存椂鏍囪澶辫触:', e);
- }
- }, 10000); // 寤堕暱鍒�10绉�
- }
- } catch (e) {
- console.error('璇诲彇涓存椂鏍囪澶辫触:', e);
}
console.log('home椤甸潰鍔犺浇锛宖romLogin:', fromLogin, '鍙傛暟:', options);
@@ -289,22 +273,6 @@
});
}
- // 妫�鏌ユ槸鍚︽湁涓存椂鏍囪
- try {
- const tempFromLogin = wx.getStorageSync('_temp_from_login');
- console.log('onShow: 璇诲彇鍒扮殑涓存椂鏍囪鍊�:', tempFromLogin);
-
- if (tempFromLogin === 'true') {
- console.log('onShow: 妫�娴嬪埌涓存椂fromLogin鏍囪');
- fromLogin = true;
- this.setData({
- isFromLogin: true
- });
- }
- } catch (e) {
- console.error('onShow: 璇诲彇涓存椂鏍囪澶辫触:', e);
- }
-
// 鍒濆鍖栧鐞�
if (fromLogin || this.data.isFromLogin) {
console.log('onShow: 浠庣櫥褰曢〉杩斿洖锛屼笉杩涜鐧诲綍妫�鏌�');
@@ -405,21 +373,36 @@
},
//瑙ｇ粦鐢ㄦ埛
unbind() {
- wx.showModal({
- title: '瑙ｇ粦纭',
- content: '纭畾瑕佽В缁戝綋鍓嶈处鍙峰悧锛�',
- success: (res) => {
- if (res.confirm) {
- this.unBindPost()
+ if (getApp().globalData.isLoggedIn) {
+ wx.showModal({
+ title: '瑙ｇ粦纭',
+ content: '纭畾瑕佽В缁戝綋鍓嶈处鍙峰悧锛�',
+ success: (res) => {
+ if (res.confirm) {
+ this.unBindPost()
+ }
}
- }
- });
+ });
+ } else {
+ wx.showToast({
+ title: '杩樻湭缁戝畾',
+ icon: 'error'
+ })
+ }
+
},
//杞亴
irrigation() {
- wx.navigateTo({
- url: '/pages/irrigation/irrigation',
- })
+ if (getApp().globalData.isLoggedIn) {
+ wx.navigateTo({
+ url: '/pages/irrigation/irrigation',
+ })
+ } else {
+ wx.showToast({
+ title: '璇峰厛鐧诲綍',
+ icon: 'error'
+ })
+ }
},
handleChange(e) {
const item = e.currentTarget.dataset.item;
@@ -497,7 +480,17 @@
*/
getOpenList() {
const app = getApp();
-
+ if (!getApp().globalData.isLoggedIn) {
+ wx.showToast({
+ title: '璇峰厛鐧诲綍',
+ icon: 'error'
+ })
+ this.setData({
+ isRefreshing: false, // 灏唗riggered灞炴�ц缃负false锛岃〃绀轰笅鎷夊埛鏂板凡瀹屾垚
+ isWXRefreshing: false, // 灏唗riggered灞炴�ц缃负false锛岃〃绀轰笅鎷夊埛鏂板凡瀹屾垚
+ });
+ return;
+ }
// 妫�鏌ユ槸鍚︿粠鐧诲綍椤佃繑鍥�
const fromLogin = this.getFromLogin();
@@ -912,9 +905,9 @@
// 鑾峰彇褰撳墠宸查�夐」鐩拰鏂伴�夋嫨鐨勯」鐩�
const currentProject = getApp().globalData.selectedProject;
const newProject = this.data.selectedProject;
- const projectName = newProject === 'JYG' ? '鍢夊唱鍏抽」鐩�' :
- newProject === 'MQ' ? '姘戝嫟椤圭洰' :
- newProject === 'TEST' ? '娴嬭瘯椤圭洰' : '鏈煡椤圭洰';
+ const projectName = newProject === 'JYG' ? '鍢夊唱鍏抽」鐩�' :
+ newProject === 'MQ' ? '姘戝嫟椤圭洰' :
+ newProject === 'TEST' ? '娴嬭瘯椤圭洰' : '鏈煡椤圭洰';
// 妫�鏌ユ槸鍚﹀垏鎹簡椤圭洰锛堝鏋滃綋鍓嶉」鐩笉鍚屼簬鏂伴�夋嫨鐨勯」鐩級
const isProjectChanged = currentProject && currentProject !== newProject;
@@ -969,19 +962,19 @@
});
} else if (newProject === 'MQ') {
getApp().globalData.tag = 'mq'; // 姘戝嫟椤圭洰瀵瑰簲tag涓簃q
- getApp().globalData.operator = '2025030517095000006';
- getApp().globalData.clientId = '2025030517095000006';
+ getApp().globalData.operator = '2025033115305200006';
+ getApp().globalData.clientId = '2025033115305200006';
getApp().globalData.isLoggedIn = true;
- getApp().globalData.sessionId = '2025030517095000006';
+ getApp().globalData.sessionId = '2025033115305200006';
this.setData({
userName: "姘戝嫟椤圭洰"
});
// 鎸佷箙鍖栧瓨鍌ㄦ皯鍕ら」鐩弬鏁�
storage.setItem('MQ_params', {
- operator: '2025030517095000006',
- clientId: '2025030517095000006',
+ operator: '2025033115305200006',
+ clientId: '2025033115305200006',
isLoggedIn: true,
- sessionId: '2025030517095000006'
+ sessionId: '2025033115305200006'
});
} else if (newProject === 'TEST') {
getApp().globalData.tag = 'ym'; // 娴嬭瘯椤圭洰瀵瑰簲tag涓簍est
@@ -1015,12 +1008,11 @@
icon: 'success',
duration: 2000
});
-
- // 鐩存帴鍒濆鍖栨暟鎹�
setTimeout(() => {
console.log('椤圭洰宸插垏鎹紝姝ｅ湪鍒濆鍖栨暟鎹�');
this.initData();
}, 1000);
+
}).catch(err => {
console.error('淇濆瓨椤圭洰閫夋嫨澶辫触锛�', err);
wx.showToast({
@@ -1034,20 +1026,6 @@
// 妫�鏌ョ櫥褰曠姸鎬�
checkLoginStatus() {
const app = getApp();
-
- // 棣栧厛锛屽己鍒跺啀娆℃鏌ユ槸鍚︿粠鐧诲綍椤佃繑鍥�
- try {
- const tempFromLogin = wx.getStorageSync('_temp_from_login');
- if (tempFromLogin === 'true') {
- console.log('checkLoginStatus: 妫�娴嬪埌涓存椂瀛樺偍_temp_from_login=true锛屼笉鎵ц璺宠浆');
- this.setData({
- isFromLogin: true
- });
- return;
- }
- } catch (e) {
- console.error('checkLoginStatus: 璇诲彇涓存椂鏍囪澶辫触:', e);
- }
// 妫�鏌ユ槸鍚﹀凡鐧诲綍
if (app.globalData.isLoggedIn && app.globalData.sessionId) {
@@ -1092,18 +1070,6 @@
storage.getItemSafe('isLoggedIn')
])
.then(([sessionId, clientId, isLoggedIn]) => {
- // 鏈�鍚庝竴娆℃鏌ヤ复鏃舵爣璁�
- try {
- const tempFromLogin = wx.getStorageSync('_temp_from_login');
- if (tempFromLogin === 'true') {
- console.log('Promise鍐呴儴: 妫�娴嬪埌涓存椂瀛樺偍_temp_from_login=true锛屼笉鎵ц璺宠浆');
- this.setData({
- isFromLogin: true
- });
- return;
- }
- } catch (e) {}
-
if (sessionId) {
// 浠庡瓨鍌ㄤ腑鎭㈠鐧诲綍鐘舵��
app.globalData.sessionId = sessionId;
@@ -1141,11 +1107,11 @@
wx.setStorageSync('_attempted_login_redirect', 'true');
} catch (e) {}
- wx.redirectTo({
- url: `/pages/login/login?project=${this.data.selectedProject}`,
- success: () => console.log('鎴愬姛璺宠浆鍒扮櫥褰曢〉'),
- fail: (err) => console.error('璺宠浆鍒扮櫥褰曢〉澶辫触:', err)
- });
+ // wx.navigateTo({
+ // url: `/pages/login/login?project=${this.data.selectedProject}`,
+ // success: () => console.log('鎴愬姛璺宠浆鍒扮櫥褰曢〉'),
+ // fail: (err) => console.error('璺宠浆鍒扮櫥褰曢〉澶辫触:', err)
+ // });
}
})
.catch(err => {
@@ -1163,39 +1129,16 @@
}
// 鍑洪敊鏃朵篃璺宠浆鍒扮櫥褰曢〉
- wx.redirectTo({
- url: `/pages/login/login?project=${this.data.selectedProject}`,
- success: () => console.log('閿欒鍚庢垚鍔熻烦杞埌鐧诲綍椤�'),
- fail: (err) => console.error('閿欒鍚庤烦杞埌鐧诲綍椤靛け璐�:', err)
- });
+ // wx.navigateTo({
+ // url: `/pages/login/login?project=${this.data.selectedProject}`,
+ // success: () => console.log('閿欒鍚庢垚鍔熻烦杞埌鐧诲綍椤�'),
+ // fail: (err) => console.error('閿欒鍚庤烦杞埌鐧诲綍椤靛け璐�:', err)
+ // });
});
},
// 杈呭姪鍑芥暟锛氭鏌ユ槸鍚︿粠鐧诲綍椤佃繑鍥�
getFromLogin() {
- // 鍏堟鏌ュ叏灞�鍙橀噺锛堜綔涓哄鐢ㄦ柟妗堬級
- if (getApp().globalData && getApp().globalData._tempFromLogin === true) {
- console.log('getFromLogin: 妫�娴嬪埌鍏ㄥ眬鍙橀噺_tempFromLogin=true');
- // 璁剧疆鏍囧織锛岀‘淇濅笅娆℃鏌ユ椂鑳借瘑鍒�
- this.setData({
- isFromLogin: true
- });
-
- // 娓呴櫎鍏ㄥ眬鏍囪锛岄槻姝㈤噸澶嶈瘑鍒�
- setTimeout(() => {
- getApp().globalData._tempFromLogin = false;
- console.log('宸叉竻闄ゅ叏灞�鍙橀噺_tempFromLogin鏍囪');
- }, 100);
-
- return true;
- }
-
- // 妫�鏌ユ槸鍚︽湁璁剧疆fromLogin鏍囧織
- if (this.data.isFromLogin) {
- console.log('getFromLogin: 妫�娴嬪埌this.data.isFromLogin=true');
- return true;
- }
-
// 妫�鏌ュ綋鍓嶉〉闈㈢殑options
const pages = getCurrentPages();
const currentPage = pages[pages.length - 1];
@@ -1207,24 +1150,6 @@
});
return true;
}
-
- // 妫�鏌ヤ复鏃舵爣璁�
- try {
- const tempFromLogin = wx.getStorageSync('_temp_from_login');
- console.log('getFromLogin: 璇诲彇鍒扮殑涓存椂鏍囪鍊�:', tempFromLogin);
-
- if (tempFromLogin === 'true') {
- console.log('getFromLogin: 妫�娴嬪埌涓存椂瀛樺偍_temp_from_login=true');
- // 璁剧疆鏍囧織锛岀‘淇濅笅娆℃鏌ユ椂鑳借瘑鍒�
- this.setData({
- isFromLogin: true
- });
- return true;
- }
- } catch (e) {
- console.error('getFromLogin: 璇诲彇涓存椂鏍囪澶辫触:', e);
- }
-
console.log('getFromLogin: 鏈娴嬪埌浠庣櫥褰曢〉杩斿洖鐨勬爣璁�');
return false;
},
@@ -1243,20 +1168,6 @@
this.setData({
isFromLogin: true
});
- }
-
- // 浠庝复鏃舵爣璁颁腑妫�鏌�
- try {
- const tempFromLogin = wx.getStorageSync('_temp_from_login');
- if (tempFromLogin === 'true') {
- console.log('continueInitPage: 妫�娴嬪埌涓存椂鏍囪_temp_from_login=true');
- fromLogin = true;
- this.setData({
- isFromLogin: true
- });
- }
- } catch (e) {
- console.error('continueInitPage: 璇诲彇涓存椂鏍囪澶辫触:', e);
}
// 浠庨〉闈㈡暟鎹腑妫�鏌�
@@ -1289,12 +1200,6 @@
if (!fromLogin) {
console.log('涓嶆槸浠庣櫥褰曢〉杩斿洖锛屽欢杩熸鏌ョ櫥褰曠姸鎬�');
setTimeout(() => {
- // 鍐嶆妫�鏌ユ槸鍚﹀凡浠庣櫥褰曢〉杩斿洖锛堝彲鑳藉湪鍒濆鍖栬繃绋嬩腑鐘舵�佸凡鍙橈級
- if (this.getFromLogin()) {
- console.log('寤惰繜妫�鏌ワ細妫�娴嬪埌浠庣櫥褰曢〉杩斿洖鐨勬爣璁帮紝涓嶅啀妫�鏌ョ櫥褰曠姸鎬�');
- return;
- }
-
// 浠呭湪鏈櫥褰曚笖涓嶆槸浠庣櫥褰曢〉杩斿洖鏃舵鏌ョ櫥褰曠姸鎬�
if (!getApp().globalData.isLoggedIn) {
console.log('寤惰繜妫�鏌ワ細鏈櫥褰曚笖涓嶆槸浠庣櫥褰曢〉杩斿洖锛屾墽琛岀櫥褰曠姸鎬佹鏌�');
@@ -1328,9 +1233,9 @@
if (response.code === "0001") {
if (response.content.client.clientId === "") {
// 鏈粦瀹氳处鍙凤紝璺宠浆鍒扮櫥褰曢〉闈�
- wx.redirectTo({
- url: `/pages/login/login?project=${this.data.selectedProject}`
- });
+ // wx.navigateTo({
+ // url: `/pages/login/login?project=${this.data.selectedProject}`
+ // });
} else {
this.setData({
userName: response.content.client.clientName,
@@ -1379,9 +1284,9 @@
icon: 'error',
duration: 2000
});
- wx.redirectTo({
- url: `/pages/login/login?project=${this.data.selectedProject}`
- });
+ // wx.navigateTo({
+ // url: `/pages/login/login?project=${this.data.selectedProject}`
+ // });
}
}).catch(error => {
wx.hideLoading();
@@ -1390,9 +1295,9 @@
title: '鐧诲綍澶辫触锛岃閲嶈瘯',
icon: 'none'
});
- wx.redirectTo({
- url: `/pages/login/login?project=${this.data.selectedProject}`
- });
+ // wx.redirectTo({
+ // url: `/pages/login/login?project=${this.data.selectedProject}`
+ // });
});
} else {
wx.hideLoading();
@@ -1419,19 +1324,7 @@
cleanupTempMarkers() {
// 鍙湁鍦╥sFromLogin涓簍rue鏃舵墠杩涜娓呯悊
if (this.data.isFromLogin) {
- console.log('娓呯悊涓存椂鏍囪');
- // 娓呯悊瀛樺偍鏍囪
- try {
- wx.removeStorageSync('_temp_from_login');
- } catch (e) {
- console.error('娓呯悊瀛樺偍鏍囪澶辫触:', e);
- }
-
- // 娓呯悊鍏ㄥ眬鍙橀噺鏍囪
- if (getApp().globalData) {
- getApp().globalData._tempFromLogin = false;
- }
// 閲嶈isFromLogin涓篺alse锛屼絾娣诲姞寤惰繜锛岄伩鍏嶅奖鍝嶅綋鍓嶉〉闈㈢殑杩斿洖閫昏緫
setTimeout(() => {
@@ -1510,4 +1403,18 @@
})
});
},
+ onShareAppMessage: function (options) {
+ // 璁剧疆鍒嗕韩鍐呭
+ return {
+ title: '澶х鐏屾簤鍔╂墜', // 鍒嗕韩鏍囬
+ path: '/pages/home/home', // 鍒嗕韩璺緞锛岃璺緞闇�瑕佹槸褰撳墠灏忕▼搴忓瓨鍦ㄧ殑椤甸潰璺緞
+ imageUrl: '/images/logo2.jpg', // 鍒嗕韩鍥炬爣锛屽彲浠ユ槸缃戠粶鍥剧墖璺緞鎴栨湰鍦板浘鐗囪矾寰�
+ success: function (res) {
+ // 鍒嗕韩鎴愬姛鐨勫洖璋冨嚱鏁�
+ },
+ fail: function (res) {
+ // 鍒嗕韩澶辫触鐨勫洖璋冨嚱鏁�
+ }
+ };
+ }
})
\ No newline at end of file
diff --git a/pages/login/login.js b/pages/login/login.js
index 968bf60..6d237be 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -304,31 +304,6 @@
if (!this.data.manualNavigate) {
console.log('椤甸潰鍗歌浇鏃舵湭璁剧疆manualNavigate锛屽亣瀹氭槸杩斿洖鎸夐挳鎿嶄綔');
- // 绔嬪嵆鍐欏叆涓存椂鏍囪锛屼互渚块椤垫娴嬪埌
- try {
- // 澶氱鏂瑰紡纭繚鍐欏叆鎴愬姛
- wx.setStorageSync('_temp_from_login', 'true');
- console.log('绔嬪嵆鍐欏叆_temp_from_login鏍囪涓簍rue');
-
- // 鍒涘缓涓�涓叏灞�瀵硅薄锛屼綔涓哄鐢ㄦ柟妗�
- if (!getApp().globalData) {
- getApp().globalData = {};
- }
- getApp().globalData._tempFromLogin = true;
- console.log('鍚屾椂璁剧疆鍏ㄥ眬鍙橀噺_tempFromLogin=true');
-
- // 妫�鏌ュ啓鍏ユ槸鍚︽垚鍔�
- const check = wx.getStorageSync('_temp_from_login');
- console.log('妫�鏌ヤ复鏃舵爣璁版槸鍚﹀啓鍏ユ垚鍔�:', check);
- } catch (e) {
- console.error('鍐欏叆鏍囪澶辫触:', e);
- // 澶囩敤鏂瑰紡鍐欏叆
- wx.setStorage({
- key: '_temp_from_login',
- data: 'true'
- });
- }
-
// 灏濊瘯浣跨敤wx.navigateBack杩斿洖涓婁竴椤碉紙濡傛灉鍙锛�
const pages = getCurrentPages();
if (pages.length > 1) {
@@ -565,12 +540,6 @@
// 璁剧疆鍏ㄥ眬鐧诲綍鐘舵��
getApp().globalData.isLoggedIn = true;
- // 纭繚娓呴櫎涓存椂鏍囪
- try {
- wx.removeStorageSync('_temp_from_login');
- } catch(e) {
- console.warn('娓呴櫎涓存椂鏍囪澶辫触', e);
- }
wx.showToast({
title: '缁戝畾鎴愬姛',
@@ -582,7 +551,7 @@
setTimeout(() => {
console.log('鐧诲綍鎴愬姛锛屽噯澶囪烦杞埌棣栭〉');
// 璺宠浆鍒伴椤碉紝浣跨敤reLaunch鑰屼笉鏄痳edirectTo
- wx.reLaunch({
+ wx.redirectTo({
url: '/pages/home/home'
});
}, 1500);
--
Gitblit v1.8.0