From b883ae5d7d46fc7a3503236f16a250c2264ea7c7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 29 九月 2022 17:45:25 +0800
Subject: [PATCH] 2022-09-29

---
 src/utils/utils-custom.js |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 630ecc0..88da467 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -590,7 +590,7 @@
       }
   
       if (item.btnlog) {
-        item.btnlog = []
+        item.btnlog = null
       }
   
       let oriUids = {}
@@ -870,7 +870,7 @@
     }
 
     if (item.btnlog) {
-      item.btnlog = []
+      item.btnlog = null
     }
 
     let oriUids = {}
@@ -954,9 +954,11 @@
  */
 export function resetStyle (style) {
   if (!style) return {}
-  if (sessionStorage.getItem('appType') === 'mob') {
-    let _style = JSON.stringify(style)
 
+  let _style = JSON.stringify(style)
+  _style = _style.replace(/@mywebsite@\//ig, window.GLOB.baseurl)
+
+  if (sessionStorage.getItem('appType') === 'mob') {
     // scaleview
     _style = _style.replace(/\d+vw/ig, (word) => {
       return parseFloat(word) * (window.GLOB.winWidth || 420) / 100 + 'px'
@@ -965,8 +967,7 @@
       return parseFloat(word) * (window.GLOB.winHeight || 738) / 100 + 'px'
       // return parseFloat(word) * 615 / 100 + 'px'
     })
-
-    return JSON.parse(_style)
   }
-  return JSON.parse(JSON.stringify(style))
+  
+  return JSON.parse(_style)
 }
\ No newline at end of file

--
Gitblit v1.8.0