Merge branch 'feature/zl' into 'test'

save

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

src/views/shop/shop-list.vue

@@ -162,16 +162,40 @@
           </template>
         </el-table-column>
         <el-table-column label="操作" min-width="230" align="center" fixed="right">
+<!--          <template slot-scope="scope">-->
+<!--            <div>-->
+<!--              <el-button v-if="scope.row.tradeStore.storeType == 1 && scope.row.tradeStore.certifyStatus == 3" @click="setPrice(scope.row, false)" type="text" size="small">设置分佣</el-button>-->
+
+<!--              <el-button @click="editShop(scope.row, 'true')" type="text" size="small">查看</el-button>-->
+
+<!--              <el-button v-if="scope.row.tradeStore.storeType == 1 && scope.row.tradeStore.certifyStatus > 2" @click="editShop(scope.row, 'false')" type="text" size="small">编辑</el-button>-->
+
+<!--              <el-button v-if="checkIsEdit(scope.row)" @click="shopManage(scope.row)" type="text" size="small">商品管理</el-button>-->
+
+<!--              <el-button v-if="checkIsEdit(scope.row)" @click="orderManage(scope.row)" type="text" size="small">订单管理</el-button>-->
+
+
+<!--              <el-button v-if="scope.row.tradeStore.storeType == 1 && scope.row.tradeStore.certifyStatus == 3"@click="setFreight(scope.row)" type="text" size="small">运费配置</el-button>-->
+
+<!--              <el-button  v-if="scope.row.tradeStore.storeType == 3" @click="closeShopAction(scope.row)" type="text" size="small">关闭店铺</el-button>-->
+<!--            </div>-->
+<!--          </template>-->
           <template slot-scope="scope">
             <div>
-              <el-button v-if="scope.row.tradeStore.commissionFlag == 2" @click="setPrice(scope.row, false)" type="text" size="small">设置分佣</el-button>
-              <el-button v-if="scope.row.tradeStore.storeStatus <= 2" @click="editShop(scope.row, 'true')" type="text" size="small">{{scope.row.tradeStore.storeStatus <= 2 ? '查看' : ''}}</el-button>
+              <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>
+
+              <el-button @click="editShop(scope.row, 'false')" type="text" size="small">编辑</el-button>
+
+              <el-button  @click="shopManage(scope.row)"  type="text" size="small">商品管理</el-button>
 
-              <el-button v-if="checkIsEdit(scope.row)" @click="editShop(scope.row, 'false')" type="text" size="small">编辑</el-button>
-              <el-button @click="shopManage(scope.row)" type="text" size="small">商品管理</el-button>
               <el-button @click="orderManage(scope.row)" type="text" size="small">订单管理</el-button>
-              <el-button v-if="scope.row.tradeStore.commissionFlag == 2" @click="setFreight(scope.row)" type="text" size="small">运费配置</el-button>
-              <el-button v-if="storageIdType == 1 && (scope.row.tradeStore.storeType == 3 && scope.row.tradeStore.storeStatus == 1)" @click="closeShopAction(scope.row)" type="text" size="small">关闭店铺</el-button>
+
+
+              <el-button @click="setFreight(scope.row)" type="text" size="small">运费配置</el-button>
+
+              <el-button   @click="closeShopAction(scope.row)" type="text" size="small">关闭店铺</el-button>
             </div>
           </template>
         </el-table-column>
@@ -669,11 +693,11 @@
       },
       checkIsEdit (row){
         const {storeType, certifyStatus} = row.tradeStore;
-        if(storeType == 3 && certifyStatus == 1){
+        if(storeType == 1 && certifyStatus == 3){
           return true
-        }else if(storeType != 3 && certifyStatus>2){
+        }else if(storeType == 2 && (certifyStatus == 1 || certifyStatus == 3)){
           return true
-        }else {
+        }else if(storeType == 3 && certifyStatus>2) {
           return false;
         }
       }