Merge branch 'feature/zl' into 'test'

Feature/zl

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

src/views/shop/create-shop.vue

@@ -1912,9 +1912,9 @@ export default {
             if (res.code == "000000") {
               storejs.remove('store_info');
               this.$message.success("操作成功");
-              // this.$router.push({
-              //   path: "/shop-list",
-              // });
+              this.$router.push({
+                path: "/shop-list",
+              });
             } else {
               this.$message.error(res.message);
             }
@@ -1937,9 +1937,9 @@ export default {
             if (res.code == "000000") {
               storejs.remove('store_info');
               this.$message.success("操作成功");
-              // this.$router.push({
-              //   path: "/shop-list",
-              // });
+              this.$router.push({
+                path: "/shop-list",
+              });
             } else {
               this.$message.error(res.message);
             }
@@ -3161,6 +3161,8 @@ export default {
   .certifyStatusColor3{
     color: #f6ffed;
   }
-
+  .el-range-editor{
+    width: 500px;
+  }
 }
 </style>

src/views/shop/shop-list.vue

@@ -182,7 +182,6 @@
 <!--          </template>-->
           <template slot-scope="scope">
             <div>
-              <el-button  @click="setPrice(scope.row, false)" type="text" size="small">设置分佣</el-button>
 
               <el-button @click="editShop(scope.row, 'true')" type="text" size="small">查看</el-button>
 
@@ -192,6 +191,7 @@
 
               <el-button @click="orderManage(scope.row)" type="text" size="small">订单管理</el-button>
 
+              <el-button  @click="setPrice(scope.row, false)" type="text" size="small">设置分佣</el-button>
 
               <el-button @click="setFreight(scope.row)" type="text" size="small">运费配置</el-button>