chore(h5): vue-router

packages/vue-cli-plugin-uni/packages/h5-vue-router/dist/vue-router.common.js

@@ -2228,9 +2228,15 @@ var HTML5History = (function (History$$1) {
   HTML5History.prototype.push = function push (location, onComplete , onAbort ) {
     var this$1 = this;
 
-    if (typeof location === 'object') { // fixed by xxxxxx
+    if (typeof location === 'object') { // fixed by xxxxxx
+      location.params = location.params || {};
+      var hasId = location.params.__id__;
       switch (location.type) {
-        case 'navigateTo':
+        case 'navigateTo':
+          if (!hasId) {
+            this.router.id++;
+          }
+          break
         case 'redirectTo':
         case 'reLaunch':
           this.router.id++;
@@ -2238,8 +2244,9 @@ var HTML5History = (function (History$$1) {
         case 'switchTab':
           break
       }
-      location.params = location.params || {};
-      location.params.__id__ = this.router.id;
+      if (!hasId) {
+        location.params.__id__ = this.router.id;
+      }
     }
 
     var ref = this;
@@ -2369,9 +2376,15 @@ var HashHistory = (function (History$$1) {
   HashHistory.prototype.push = function push (location, onComplete , onAbort ) {
     var this$1 = this;
 
-    if (typeof location === 'object') { // fixed by xxxxxx
+    if (typeof location === 'object') { // fixed by xxxxxx
+      location.params = location.params || {};
+      var hasId = location.params.__id__;
       switch (location.type) {
-        case 'navigateTo':
+        case 'navigateTo':
+          if (!hasId) {
+            this.router.id++;
+          }
+          break
         case 'redirectTo':
         case 'reLaunch':
           this.router.id++;
@@ -2379,8 +2392,10 @@ var HashHistory = (function (History$$1) {
         case 'switchTab':
           break
       }
-      location.params = location.params || {};
-      location.params.__id__ = this.router.id;
+
+      if (!hasId) {
+        location.params.__id__ = this.router.id;
+      }
     }
 
     var ref = this;

packages/vue-cli-plugin-uni/packages/h5-vue-router/dist/vue-router.esm.js

@@ -2226,9 +2226,15 @@ var HTML5History = (function (History$$1) {
   HTML5History.prototype.push = function push (location, onComplete , onAbort ) {
     var this$1 = this;
 
-    if (typeof location === 'object') { // fixed by xxxxxx
+    if (typeof location === 'object') { // fixed by xxxxxx
+      location.params = location.params || {};
+      var hasId = location.params.__id__;
       switch (location.type) {
-        case 'navigateTo':
+        case 'navigateTo':
+          if (!hasId) {
+            this.router.id++;
+          }
+          break
         case 'redirectTo':
         case 'reLaunch':
           this.router.id++;
@@ -2236,8 +2242,9 @@ var HTML5History = (function (History$$1) {
         case 'switchTab':
           break
       }
-      location.params = location.params || {};
-      location.params.__id__ = this.router.id;
+      if (!hasId) {
+        location.params.__id__ = this.router.id;
+      }
     }
 
     var ref = this;
@@ -2367,9 +2374,15 @@ var HashHistory = (function (History$$1) {
   HashHistory.prototype.push = function push (location, onComplete , onAbort ) {
     var this$1 = this;
 
-    if (typeof location === 'object') { // fixed by xxxxxx
+    if (typeof location === 'object') { // fixed by xxxxxx
+      location.params = location.params || {};
+      var hasId = location.params.__id__;
       switch (location.type) {
-        case 'navigateTo':
+        case 'navigateTo':
+          if (!hasId) {
+            this.router.id++;
+          }
+          break
         case 'redirectTo':
         case 'reLaunch':
           this.router.id++;
@@ -2377,8 +2390,10 @@ var HashHistory = (function (History$$1) {
         case 'switchTab':
           break
       }
-      location.params = location.params || {};
-      location.params.__id__ = this.router.id;
+
+      if (!hasId) {
+        location.params.__id__ = this.router.id;
+      }
     }
 
     var ref = this;

packages/vue-cli-plugin-uni/packages/h5-vue-router/dist/vue-router.js

@@ -2232,9 +2232,15 @@ var HTML5History = (function (History$$1) {
   HTML5History.prototype.push = function push (location, onComplete , onAbort ) {
     var this$1 = this;
 
-    if (typeof location === 'object') { // fixed by xxxxxx
+    if (typeof location === 'object') { // fixed by xxxxxx
+      location.params = location.params || {};
+      var hasId = location.params.__id__;
       switch (location.type) {
-        case 'navigateTo':
+        case 'navigateTo':
+          if (!hasId) {
+            this.router.id++;
+          }
+          break
         case 'redirectTo':
         case 'reLaunch':
           this.router.id++;
@@ -2242,8 +2248,9 @@ var HTML5History = (function (History$$1) {
         case 'switchTab':
           break
       }
-      location.params = location.params || {};
-      location.params.__id__ = this.router.id;
+      if (!hasId) {
+        location.params.__id__ = this.router.id;
+      }
     }
 
     var ref = this;
@@ -2373,9 +2380,15 @@ var HashHistory = (function (History$$1) {
   HashHistory.prototype.push = function push (location, onComplete , onAbort ) {
     var this$1 = this;
 
-    if (typeof location === 'object') { // fixed by xxxxxx
+    if (typeof location === 'object') { // fixed by xxxxxx
+      location.params = location.params || {};
+      var hasId = location.params.__id__;
       switch (location.type) {
-        case 'navigateTo':
+        case 'navigateTo':
+          if (!hasId) {
+            this.router.id++;
+          }
+          break
         case 'redirectTo':
         case 'reLaunch':
           this.router.id++;
@@ -2383,8 +2396,10 @@ var HashHistory = (function (History$$1) {
         case 'switchTab':
           break
       }
-      location.params = location.params || {};
-      location.params.__id__ = this.router.id;
+
+      if (!hasId) {
+        location.params.__id__ = this.router.id;
+      }
     }
 
     var ref = this;