From 032f821c77485c1178de18f78092ddedd25d2fb2 Mon Sep 17 00:00:00 2001
From: zuoxiao <zuoxiao>
Date: 星期三, 09 四月 2025 15:26:58 +0800
Subject: [PATCH] 添加删除功能到灌溉计划页面，用户可通过点击删除按钮确认删除相应的轮灌计划；更新样式以增强用户体验。
---
pages/login/login.js | 45 ++++++++++-----------------------------------
1 files changed, 10 insertions(+), 35 deletions(-)
diff --git a/pages/login/login.js b/pages/login/login.js
index f7edc39..6d237be 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -188,7 +188,9 @@
// 鑾峰彇閫夋嫨鐨勯」鐩� - 浼樺厛浣跨敤URL鍙傛暟
if (options && options.project) {
const project = options.project;
- const projectName = project === 'JYG' ? '鍢夊唱鍏抽」鐩�' : '姘戝嫟椤圭洰';
+ const projectName = project === 'JYG' ? '鍢夊唱鍏抽」鐩�' :
+ project === 'MQ' ? '姘戝嫟椤圭洰' :
+ project === 'TEST' ? '娴嬭瘯椤圭洰' : '鏈煡椤圭洰';
console.log(`浠嶶RL鍙傛暟鑾峰彇椤圭洰淇℃伅: ${project} (${projectName})`);
@@ -225,7 +227,9 @@
// 浠庢湰鍦板瓨鍌ㄨ幏鍙栧凡閫夋嫨鐨勯」鐩�
storage.getItemSafe('selectedProject').then(project => {
if (project) {
- const projectName = project === 'JYG' ? '鍢夊唱鍏抽」鐩�' : '姘戝嫟椤圭洰';
+ const projectName = project === 'JYG' ? '鍢夊唱鍏抽」鐩�' :
+ project === 'MQ' ? '姘戝嫟椤圭洰' :
+ project === 'TEST' ? '娴嬭瘯椤圭洰' : '鏈煡椤圭洰';
console.log(`浠庡瓨鍌ㄨ幏鍙栭」鐩俊鎭�: ${project} (${projectName})`);
this.setData({
@@ -299,31 +303,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();
@@ -491,7 +470,9 @@
storage.setItem("clientId", String(data.content.clientId));
// 璁剧疆褰撳墠椤圭洰鐨則ag
- const tag = this.data.selectedProject === 'JYG' ? 'ym' : 'mq';
+ const tag = this.data.selectedProject === 'JYG' ? 'ym' :
+ this.data.selectedProject === 'MQ' ? 'mq' :
+ this.data.selectedProject === 'TEST' ? 'test' : 'unknown';
getApp().globalData.tag = tag;
// 淇濆瓨鐢ㄦ埛淇℃伅
@@ -559,12 +540,6 @@
// 璁剧疆鍏ㄥ眬鐧诲綍鐘舵��
getApp().globalData.isLoggedIn = true;
- // 纭繚娓呴櫎涓存椂鏍囪
- try {
- wx.removeStorageSync('_temp_from_login');
- } catch(e) {
- console.warn('娓呴櫎涓存椂鏍囪澶辫触', e);
- }
wx.showToast({
title: '缁戝畾鎴愬姛',
@@ -576,7 +551,7 @@
setTimeout(() => {
console.log('鐧诲綍鎴愬姛锛屽噯澶囪烦杞埌棣栭〉');
// 璺宠浆鍒伴椤碉紝浣跨敤reLaunch鑰屼笉鏄痳edirectTo
- wx.reLaunch({
+ wx.redirectTo({
url: '/pages/home/home'
});
}, 1500);
--
Gitblit v1.8.0