diff --git a/wms/wipwhole-change-contractdate.php b/wms/wipwhole-change-contractdate.php
index 5126fd22..96a42fe0 100644
--- a/wms/wipwhole-change-contractdate.php
+++ b/wms/wipwhole-change-contractdate.php
@@ -1,59 +1,34 @@
 <?php
 // ini_set('display_errors', 'on');
 
-$token = empty($token) ? $_REQUEST["token"] : $token;
-$token_link = "token=" . $_REQUEST["token"];
-list($user_id, $enc_user_name, $login_dt) = explode(".", $token);
-$user_name = urldecode(base64_decode($enc_user_name));
-
+function getAccounttype($link,$user_id){
+    $sql = "SELECT * FROM account where accountid = '$user_id'"; 
+    $data = mysqli_query($link, $sql); 
+    $row = mysqli_fetch_array($data, MYSQLI_ASSOC);
+    return $row['accounttype'];
+}
 
 include 'IncludeCommon.php';
-include "header.php";
 require_once "database.php";
 
 $includecommon = new IncludeCommon();
-$data = array(); 
-$sql = "SELECT * FROM account where accountid = '$user_id'"; 
-$data = mysqli_query($link, $sql); 
-$row = mysqli_fetch_array($data, MYSQLI_ASSOC);
-$accounttype = $row['accounttype'];
+$token = empty($token) ? $_REQUEST["token"] : $token;
+$token_link = "token=" . $token;
+list($user_id, $enc_user_name, $login_dt) = explode(".", $token);
+$user_name = urldecode(base64_decode($enc_user_name));
+$accounttype = getAccounttype($link,$user_id);
 
+$data = array(); 
 $login_json = null;
-
 if (strlen($accounttype) != 0) {
-    if ($accounttype == "B" || $accounttype == "M" || $accounttype == "E" || $accounttype == "W"){
-        $response_result =['list'=>''] ; 
-        $response_menu = $includecommon->menu_v3($user_id, $accounttype); 
-        if (is_array($response_result["list"])) {
-            for ($i = 0; $i < count($response_result["list"]); $i++) {
-                $response_result["list"][$i]["path"] = $response_result["list"][$i]["path"] . "?token=" . $token;
-            }
-        }
-        $response_result["note"] = "success";
-        $response_result["token"] = $token;
-        $farr = [];
-        $jsonres['menu']=$response_menu;
-        $login_json =  json_encode($jsonres);
-    }
+    $jsonres['menu']=$includecommon->menu_v3($user_id, $accounttype); 
+    $login_json =  json_encode($jsonres, JSON_UNESCAPED_UNICODE);
 }
 
 ?>
 <script>
-    // window.localStorage.setItem("menu_<?php echo $user_id; ?>", "123");
-
-    res=eval("("+<?php echo $login_json; ?>+")");
-    if(res.code=='200'){
-        var token=res.token;
-        var name=res.name;
-        var login=res.login;
-        var menu=res.menu;
-        window.localStorage.setItem("menu_"+res.uid,menu);
-        window.location.href='index.php?token='+token;
-    }else{
-        window.location.href='login.php?errno=1';
-    }
-
-
+    res=eval("("+JSON.stringify(<?php echo $login_json; ?>)+")");
+    window.localStorage.setItem("menu_<?php echo $user_id; ?>",res.menu);
 </script>
 <?php
 /*
@@ -66,8 +41,7 @@ if (strlen($accounttype) != 0) {
 
 // ini_set('display_errors', 'on');
 
-// include "header.php";
-// require_once "database.php";
+include "header.php";
 include "css/view/wipwhole-change-contractdate.php";
 include "wipwhole-change-contractdate-function.php";
 
diff --git a/wms/wipwhole-change-planning-customer-name.php b/wms/wipwhole-change-planning-customer-name.php
index 0cd3d59b..0742c977 100644
--- a/wms/wipwhole-change-planning-customer-name.php
+++ b/wms/wipwhole-change-planning-customer-name.php
@@ -1,59 +1,34 @@
 <?php
 // ini_set('display_errors', 'on');
 
-$token = empty($token) ? $_REQUEST["token"] : $token;
-$token_link = "token=" . $_REQUEST["token"];
-list($user_id, $enc_user_name, $login_dt) = explode(".", $token);
-$user_name = urldecode(base64_decode($enc_user_name));
-
+function getAccounttype($link,$user_id){
+    $sql = "SELECT * FROM account where accountid = '$user_id'"; 
+    $data = mysqli_query($link, $sql); 
+    $row = mysqli_fetch_array($data, MYSQLI_ASSOC);
+    return $row['accounttype'];
+}
 
 include 'IncludeCommon.php';
-include "header.php";
 require_once "database.php";
 
 $includecommon = new IncludeCommon();
-$data = array(); 
-$sql = "SELECT * FROM account where accountid = '$user_id'"; 
-$data = mysqli_query($link, $sql); 
-$row = mysqli_fetch_array($data, MYSQLI_ASSOC);
-$accounttype = $row['accounttype'];
+$token = empty($token) ? $_REQUEST["token"] : $token;
+$token_link = "token=" . $token;
+list($user_id, $enc_user_name, $login_dt) = explode(".", $token);
+$user_name = urldecode(base64_decode($enc_user_name));
+$accounttype = getAccounttype($link,$user_id);
 
+$data = array(); 
 $login_json = null;
-
 if (strlen($accounttype) != 0) {
-    if ($accounttype == "B" || $accounttype == "M" || $accounttype == "E" || $accounttype == "W"){
-        $response_result =['list'=>''] ; 
-        $response_menu = $includecommon->menu_v3($user_id, $accounttype); 
-        if (is_array($response_result["list"])) {
-            for ($i = 0; $i < count($response_result["list"]); $i++) {
-                $response_result["list"][$i]["path"] = $response_result["list"][$i]["path"] . "?token=" . $token;
-            }
-        }
-        $response_result["note"] = "success";
-        $response_result["token"] = $token;
-        $farr = [];
-        $jsonres['menu']=$response_menu;
-        $login_json =  json_encode($jsonres);
-    }
+    $jsonres['menu']=$includecommon->menu_v3($user_id, $accounttype); 
+    $login_json =  json_encode($jsonres, JSON_UNESCAPED_UNICODE);
 }
 
 ?>
 <script>
-    // window.localStorage.setItem("menu_<?php echo $user_id; ?>", "123");
-
-    res=eval("("+<?php echo $login_json; ?>+")");
-    if(res.code=='200'){
-        var token=res.token;
-        var name=res.name;
-        var login=res.login;
-        var menu=res.menu;
-        window.localStorage.setItem("menu_"+res.uid,menu);
-        window.location.href='index.php?token='+token;
-    }else{
-        window.location.href='login.php?errno=1';
-    }
-
-
+    res=eval("("+JSON.stringify(<?php echo $login_json; ?>)+")");
+    window.localStorage.setItem("menu_<?php echo $user_id; ?>",res.menu);
 </script>
 <?php
 /*
@@ -64,7 +39,7 @@ if (strlen($accounttype) != 0) {
     5. 大日程的 id 新申請過的直接取得
 */
 
-
+include "header.php";
 include "css/view/wipwhole-change-contractdate.php";
 include "wipwhole-change-planning-customer-name-function.php";