From d3272e82652361e5e9bd045925222ef042b6731f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 18 十一月 2020 18:15:15 +0800
Subject: [PATCH] 2020-11-18

---
 src/api/index.js |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index be62de4..8d1b215 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -7,7 +7,6 @@
 import options from '@/store/options.js'
 
 let mkDataBase = null
-let storUsable = false
 
 if (window.openDatabase) {
   let service = window.GLOB.service ? '-' + window.GLOB.service.replace('/', '') : ''
@@ -15,7 +14,7 @@
     mkDataBase = openDatabase(`mkdb${service}`, '1', 'mk-pc-database', 50 * 1024 * 1024)
     mkDataBase.transaction(tx => {
       tx.executeSql('CREATE TABLE IF NOT EXISTS VERSIONS (version varchar(50), createDate varchar(50), CDefine1 varchar(50), CDefine2 varchar(50), CDefine3 varchar(50))', [], () => {
-
+      
       }, () => {
         // eslint-disable-next-line
         throw 'CREATE TABLE ERROR'
@@ -335,12 +334,14 @@
         })
       }) 
     }, () => {
-      _reject()
       mkDataBase = null
+      _reject()
       return Promise.reject()
     }).then(() => {
-      storUsable = true
       _resolve(appVersion)
+    }, () => {
+      mkDataBase = null
+      _reject()
     })
   }
 
@@ -535,7 +536,7 @@
     _param = JSON.stringify(_param)
     _param  = md5(_param)
     
-    if (mkDataBase && storUsable) {
+    if (mkDataBase) {
       param = this.encryptParam(param)
 
       return new Promise(resolve => {
@@ -565,6 +566,9 @@
               })
             }
           }, (tx, results) => {
+            mkDataBase = null
+            console.warn(results)
+
             axios({
               url: `/webapi/dostars${param.func ? '/' + param.func : ''}`,
               data: param
@@ -574,9 +578,6 @@
               }
               resolve(res)
             })
-            mkDataBase = null
-            storUsable = false
-            console.warn(results)
           })
         })
       })

--
Gitblit v1.8.0