1

mer_plat_admin/src/views/pagediy/viewDesign/index.vue

@@ -595,7 +595,7 @@ export default {
       let data = {};
       if (param === 'bottomNavigation') {
         data = { bottomNavigationList: this.changeIndex(this.navigationList), isCustom: this.isCustom };
-        if (navigationList.length < 4) return this.$message.warning('设置数据不能小于4条');
+        if (navigationList.length < 3) return this.$message.warning('设置数据不能小于4条');
       } else {
         if (param === 'indexMenu' && tArr.length < 5) return this.$message.warning('设置数据不能小于5条');
         if (param === 'indexTabNav' && tArr.length < 2) return this.$message.warning('设置数据不能小于2条');

mer_plat_admin/src/views/rider/deliverySetting/index.vue

@@ -88,7 +88,7 @@
       <!-- 配送时间范围-->
       <template v-if="currentTab === '1'">
         <el-button
-          v-hasPermi="['platform:pc:shopping:home:recommended:add']"
+          v-hasPermi="['platform:rider:deliveTime:add']"
           type="primary"
           size="small"
           class="mb20"
@@ -100,7 +100,7 @@
 		  class="mb20"
 		  @click.native="handleBatchSales()"
 		  v-if="
-		    checkPermi(['platform:product:batch:set:virtual:sales'])
+		    checkPermi(['platform:rider:deliveTime:batch:set'])
 		  "
 		  >批量设置</el-button
 		>
@@ -123,7 +123,7 @@
           <el-table-column prop="status" label="是否显示" min-width="100" fixed="right">
             <template slot-scope="scope">
               <el-switch
-			   v-if="checkPermi(['platform:pc:shopping:home:recommended:switch'])"
+			   v-if="checkPermi(['platform:rider:deliveTime:switch'])"
                 v-model="scope.row.status"
                 :active-value="true"
                 :inactive-value="false"
@@ -157,7 +157,7 @@
       </el-form>
       <span slot="footer">
         <el-button @click="dialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="submitBatchSetDeliveForm('formData')" v-hasPermi="['platform:express:update']"
+        <el-button type="primary" @click="submitBatchSetDeliveForm('formData')" v-hasPermi="['platform:rider:deliveTime:add']"
           >确定</el-button
         >
       </span>
@@ -310,7 +310,7 @@ export default {
     //   this.getRecommendedInfo(this.id);
     // }
 	if (checkPermi(['platform:rider:fee:add'])) this.getDetal();
-	this.getList();
+	if (checkPermi(['platform:rider:deliveTime:list'])) this.getList();
   },
   computed: {
     ...mapGetters(['merPlatProductClassify', 'productBrand']),