Merge branch 'dev-0625' into 'release'

Dev 0625,code review:bo.dang

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

src/views/goods/forms.js

@@ -60,10 +60,13 @@ const form = {
   optPrice:'',
   goodsStock:0,
   stock: 0,
-  externalGoodsCode: ''
+  externalGoodsCode: '',
+  leastCount:1,
+  mostCount: -1,
+  incrType:1
 };
 
 
 export const originForm1 = form1;
 export const originForm2 = form2;
-export const originForm = form;
\ No newline at end of file
+export const originForm = form;

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) {