Merge branch 'dev-20210628' into 'dev-0625'

商品管理和订单管理弹窗,code review:bo.dang

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!271

src/views/shop/shop-list.vue

@@ -382,21 +382,37 @@
       },
       //店铺管理
       shopManage(row) {
-        this.$router.push({
+        let routeData = this.$router.resolve({
           path: '/goods-manage',
           query: {
             storeId: row.tradeStore.id,
             commissionFlag:row.tradeStore.commissionFlag
           }
-        })
+        });
+        window.open(routeData.href, '_blank');
+
+        // this.$router.push({
+        //   path: '/goods-manage',
+        //   query: {
+        //     storeId: row.tradeStore.id,
+        //     commissionFlag:row.tradeStore.commissionFlag
+        //   }
+        // })
       },
       orderManage(row) {
-        this.$router.push({
+        let routeData = this.$router.resolve({
           path: '/order-manage',
           query: {
-            storeId: row.tradeStore.id,
+            storeId: row.tradeStore.id
           }
-        })
+        });
+        window.open(routeData.href, '_blank');
+        // this.$router.push({
+        //   path: '/order-manage',
+        //   query: {
+        //     storeId: row.tradeStore.id,
+        //   }
+        // })
       },
       //编辑
       editShop(row) {