diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java
index 6136328..20b2649 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java
@@ -7,16 +7,23 @@ import com.ruoyi.business.service.IBusStoreInfoService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.domain.SysLogininfor;
+import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysLogininforService;
+import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,6 +42,7 @@ import java.util.stream.Collectors;
  * @author ruoyi
  * @date 2024-07-03
  */
+@Api(tags = "代理人")
 @RestController
 @RequestMapping("/system/info")
 public class BusAgentInfoController extends BaseController {
@@ -46,6 +54,8 @@ public class BusAgentInfoController extends BaseController {
     private ISysUserService iSysUserService;
     @Autowired
     private ISysLogininforService iSysLogininforService;
+    @Autowired
+    private ISysDeptService iSysDeptService;
 
     /**
      * 查询代理管理列表
@@ -144,6 +154,30 @@ public class BusAgentInfoController extends BaseController {
         throw new ServiceException("账分余额不足！请联系管理员充值。");
     }
 
+    @ApiOperation("部门")
+    @GetMapping("/deptList")
+    public AjaxResult deptList() {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        SysDept sysDept = new SysDept();
+        sysDept.setParentId(loginUser.getDeptId());
+        sysDept.setStatus("0");
+        sysDept.setDelFlag("0");
+        List<SysDept> depts = iSysDeptService.selectDeptList(sysDept);
+        return success(depts);
+    }
+
+//    @ApiOperation("部门")
+//    @GetMapping("/deptList")
+//    public AjaxResult getLoginUser() {
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        SysDept sysDept = new SysDept();
+//        sysDept.setParentId(loginUser.getDeptId());
+//        sysDept.setStatus("0");
+//        sysDept.setDelFlag("0");
+//        List<SysDept> depts = iSysDeptService.selectDeptList(sysDept);
+//        return success(depts);
+//    }
+
     /**
      * 删除代理管理
      */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusAgentInfo.java b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusAgentInfo.java
index f91c07b..93164f1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusAgentInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusAgentInfo.java
@@ -118,6 +118,15 @@ public class BusAgentInfo extends BaseEntity
     private String confirmPassword;
     private String phoneNumber;
     private int aiRealTimeNum;
+    private Long deptId;
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
 
     public int getAiRealTimeNum() {
         return aiRealTimeNum;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java
index 78f614e..b08aefd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java
@@ -145,6 +145,8 @@ public class AiServiceImpl implements IAiService {
             fifteenInfoService.insertBusFifteenInfo(fifteenInfo);
 
         } else if ("20005".equals(jo.getString("code")) || "20006".equals(jo.getString("code"))) {
+            System.out.println("建立任务接口返回错误： " + jo.toString());
+            redisTemplate.delete("apiKey");
             sendAiTask(content, busOrderInfo);
         } else {
             // TODO: 2024/7/10 失败原因判断 是否继续循环
@@ -383,6 +385,7 @@ public class AiServiceImpl implements IAiService {
             fifteenInfoService.insertBusFifteenInfo(fifteenInfo);
 
         } else if ("20005".equals(jo.getString("code")) || "20006".equals(jo.getString("code"))) {
+            redisTemplate.delete("apiKey");
             sendAiTask(content, busOrderInfo);
         } else {
             // TODO: 2024/7/10 失败原因判断 是否继续循环
diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java
index 508f22d..e68e85a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java
@@ -124,7 +124,7 @@ public class BusAgentInfoServiceImpl implements IBusAgentInfoService
         String pwd = SecurityUtils.encryptPassword(busAgentInfo.getPassword());
         user.setPassword(pwd);
         user.setPhonenumber(busAgentInfo.getPhoneNumber());
-        SysDept dept = deptService.selectDeptIdById(loginUser.getDeptId());
+        SysDept dept = deptService.selectDeptById(busAgentInfo.getDeptId());
         user.setDeptId(dept.getDeptId());
         user.setDept(dept);
         busAgentInfo.setSuperiorAgentCode(loginUser.getUserId());
diff --git a/ruoyi-ui/src/api/agent/info.js b/ruoyi-ui/src/api/agent/info.js
index 4041c92..240d84f 100644
--- a/ruoyi-ui/src/api/agent/info.js
+++ b/ruoyi-ui/src/api/agent/info.js
@@ -42,3 +42,12 @@ export function delInfo(id) {
     method: 'delete'
   })
 }
+
+
+// 查询代理管理列表
+export function deptList() {
+  return request({
+    url: '/system/info/deptList',
+    method: 'get'
+  })
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/agent/list/index.vue b/ruoyi-ui/src/views/agent/list/index.vue
index 8bcfc32..39f9fef 100644
--- a/ruoyi-ui/src/views/agent/list/index.vue
+++ b/ruoyi-ui/src/views/agent/list/index.vue
@@ -118,14 +118,27 @@
           <el-input v-model="form.agentName" placeholder="请输入代理人姓名" />
         </el-form-item>
         <el-form-item label="密码" prop="superiorAgentCode">
-          <el-input v-model="form.password" placeholder="请输入密码" />
+          <el-input type="password" v-model="form.password" placeholder="请输入密码" />
         </el-form-item>
         <el-form-item label="确认密码" prop="superiorAgentAccount">
-          <el-input v-model="form.confirmPassword" placeholder="请输入确认密码" />
+          <el-input type="password" v-model="form.confirmPassword" placeholder="请输入确认密码" />
+        </el-form-item>
+        <el-form-item label="代理级别" prop="deptId">
+          <el-select
+              v-model="form.deptId"
+              placeholder="请选择代理级别"
+              filterable
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in deptList"
+                :key="dict.id"
+                :label="dict.deptName+' ：'+dict.deptId"
+                :value="dict.id"
+              />
+            </el-select>
         </el-form-item>
-<!--        <el-form-item label="角色" prop="grantStoreNum">-->
-<!--          <el-input v-model="form.role" placeholder="请输入角色" />-->
-<!--        </el-form-item>-->
         <el-form-item label="手机号" prop="operateStoreNum">
           <el-input v-model="form.phoneNumber" placeholder="请输入手机号" />
         </el-form-item>
@@ -155,7 +168,7 @@
 </template>
 
 <script>
-import { listInfo, getInfo, delInfo, addInfo, updateInfo } from "@/api/agent/info";
+import { listInfo, getInfo, delInfo, addInfo, updateInfo,deptList } from "@/api/agent/info";
 
 export default {
   name: "Info",
@@ -175,6 +188,7 @@ export default {
       total: 0,
       // 代理管理表格数据
       infoList: [],
+      deptList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -197,6 +211,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getdeptList();
   },
   methods: {
     /** 查询代理管理列表 */
@@ -250,6 +265,11 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
+    getdeptList() {
+      deptList().then(response => {
+        this.deptList = response.data;
+      });
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
diff --git a/ruoyi-ui/src/views/market/brand/index.vue b/ruoyi-ui/src/views/market/brand/index.vue
index 2a0f81c..b492bb7 100644
--- a/ruoyi-ui/src/views/market/brand/index.vue
+++ b/ruoyi-ui/src/views/market/brand/index.vue
@@ -1,102 +1,143 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item label="平台" prop="platform">
-        <el-select
-          v-model="queryParams.platform"
-          placeholder="选择平台"
-          clearable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="dict in dict.type.sys_platform_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="店铺名称" prop="roleName">
-        <el-input
-          v-model="queryParams.roleName"
-          placeholder="请输入店铺名称"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="店铺编号" prop="roleKey">
-        <el-input
-          v-model="queryParams.roleKey"
-          placeholder="请输入店铺编号"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="店铺归属" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="店铺归属"
-          clearable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="dict in dict.type.sys_normal_disable"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="备注" prop="roleKey">
-        <el-input
-          v-model="queryParams.roleKey"
-          placeholder="备注"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
+      <el-row>
+        <el-col :span="5">
+          <el-form-item label="对接平台" prop="platformType" >
+            <el-select
+              v-model="queryParams.platformType"
+              placeholder="选择平台"
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_platform_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="店铺名称" prop="storeName">
+            <el-input
+              v-model="queryParams.storeName"
+              placeholder="请输入店铺名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="店铺编号" prop="storeCode">
+            <el-input
+              v-model="queryParams.storeCode"
+              placeholder="请输入店铺编号"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="店铺归属" prop="saleBindId">
+            <el-select
+              v-model="queryParams.saleBindId"
+              placeholder="店铺归属"
+              filterable
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in saleList"
+                :key="dict.id"
+                :label="dict.saleName+' ：'+dict.id"
+                :value="dict.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="2"><el-form-item label="门店数量："><span>{{map.storeCount}}</span></el-form-item></el-col>
+        <el-col :span="2"><el-form-item label="掉线数量："><span>{{map.noGrantCount}}</span></el-form-item></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="5">
+          <el-form-item label="登录状态" prop="grantStatus">
+            <el-select
+              v-model="queryParams.grantStatus"
+              placeholder="选择登录状态"
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_grant_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="回访状态" prop="returnVisitStatus">
+            <el-select
+              v-model="queryParams.returnVisitStatus"
+              placeholder="选择回访状态"
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_return_visit_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item></el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="开启数量："><span>{{map.openCount}}</span></el-form-item>
+        </el-col>
+      </el-row>
+
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="primary"-->
-<!--          plain-->
-<!--          icon="el-icon-plus"-->
-<!--          size="mini"-->
-<!--          @click="handleAdd"-->
-<!--          v-hasPermi="['system:role:add']"-->
-<!--        >新增</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="success"-->
-<!--          plain-->
-<!--          icon="el-icon-edit"-->
-<!--          size="mini"-->
-<!--          :disabled="single"-->
-<!--          @click="handleUpdate"-->
-<!--          v-hasPermi="['system:role:edit']"-->
-<!--        >修改</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="danger"-->
-<!--          plain-->
-<!--          icon="el-icon-delete"-->
-<!--          size="mini"-->
-<!--          :disabled="multiple"-->
-<!--          @click="handleDelete"-->
-<!--          v-hasPermi="['system:role:remove']"-->
-<!--        >删除</el-button>-->
-<!--      </el-col>-->
+     <el-col :span="1.5">
+       <el-button
+         type="primary"
+         plain
+         icon="el-icon-plus"
+         size="mini"
+         @click="handleAdd"
+       >授权前置指引</el-button>
+     </el-col>
+     <el-col :span="1.5">
+      <a :href="meituanUrl" style="color: rgb(230, 167, 0);">授权M</a>
+      <el-tooltip content="请使用鼠标右键点击授权M后选择在隐身窗口中打开链接（新增或更新失效，操作一致）" effect="dark" placement="right">
+        <i class="el-tooltip el-icon-question" tabindex="0" ></i>
+      </el-tooltip>
+     </el-col>
+     <el-col :span="1.5">
+       <el-button
+         type="primary"
+         plain
+         icon="el-icon-refresh"
+         size="mini"
+         @click="handleRefresh"
+       >一键同步</el-button>
+     </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -104,68 +145,77 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['system:role:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="storeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" prop="roleId" width="120" />
-      <el-table-column label="名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="标识" prop="roleKey" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="状态" align="center" width="100"/>
-      <el-table-column label="源" align="center" width="100"/>
-      <el-table-column label="昨日单量" align="center" width="100"/>
-      <el-table-column label="昨日好评量" align="center" width="100"/>
-      <el-table-column label="昨日五星量" align="center" width="100"/>
-      <el-table-column label="昨日好评比(%)" align="center" width="100"/>
-      <el-table-column label="昨日营销比(%)" align="center" width="100"/>
-      <el-table-column label="影响量(今)" align="center" width="100"/>
-      <el-table-column label="影响量(昨)" align="center" width="100"/>
-      <el-table-column label="评分" align="center" width="100"/>
-      <el-table-column label="营销用户下单" align="center" width="100"/>
-
-<!--        <template slot-scope="scope">-->
-<!--          <el-switch-->
-<!--            v-model="scope.row.status"-->
-<!--            active-value="0"-->
-<!--            inactive-value="1"-->
-<!--            @change="handleStatusChange(scope.row)"-->
-<!--          ></el-switch>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column label="序号" type="index" ></el-table-column>
+      <el-table-column label="平台" prop="platformType" width="55">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
+          <dict-tag :options="dict.type.sys_platform_type" :value="scope.row.platformType"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
-          <el-button
+      <el-table-column label="编号" prop="storeCode" :show-overflow-tooltip="true"  width="55" align="center" />
+      <el-table-column label="名称" prop="storeName" :show-overflow-tooltip="true"  align="center" />
+      <el-table-column label="在线状态" prop ="grantStatus" align="center"  width="75" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_grant_status" :value="scope.row.grantStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="昨日单量" prop="lastOrderNum" align="center"  width="75"/>
+      <el-table-column label="昨日好评量" prop="lastPositiveReviewsNum" align="center"  width="85"/>
+      <el-table-column label="昨日五星量" prop="lastFiveStarReviewsNum" align="center"  width="85"/>
+      <el-table-column label="昨日回访量" prop="lastReturnVisitNum" align="center"  width="85"/>
+      <el-table-column label="昨日营销比(%)" prop="lastReturnVisitRate" align="center" :render-header="renderPrice"  width="120" />
+      <el-table-column label="今日回访量" prop="todayReturnVisitNum" align="center" width="85" />
+      <el-table-column label="评分" prop="score" align="center"  width="55" />
+      <el-table-column label="归属" prop="saleBindId" align="center"  :formatter="idToName"  width="65" />
+      <el-table-column label="创建时间" align="center" prop="bindTime" width="160">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.bindTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="营销用户下单" prop="returnVisitUserRange" align="center" width="110" />
+      <el-table-column label="是否开启" prop="returnVisitStatus" align="center" width="85" >
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.returnVisitStatus"
+            active-value="1"
+            inactive-value="2"
+            @change="handleStatusChange(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width =120>
+        <template slot-scope="scope">
+          <el-button  v-if="scope.row.returnVisitStatus !== 1"
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:role:edit']"
-          >修改</el-button>
-          <el-button
+          >配置</el-button>
+          <el-button v-if="scope.row.selfDeliveryStatus == 1 && scope.row.returnVisitStatus !== 1"
+            size="mini"
+            type="text"
+            icon="el-icon-bicycle"
+            @click="handleSelfDelivery(scope.row)"
+          >自配送</el-button>
+          <el-button  v-if="scope.row.returnVisitStatus !== 1"
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:role:remove']"
           >删除</el-button>
-          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
-            <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"
-                v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>
-              <el-dropdown-item command="handleAuthUser" icon="el-icon-user"
-                v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-mouse"
+            @click="handleOpen(scope.row)"
+          >后台</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -177,49 +227,139 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="角色名称" prop="roleName">
-          <el-input v-model="form.roleName" placeholder="请输入角色名称" />
-        </el-form-item>
-        <el-form-item prop="roleKey">
-          <span slot="label">
-            <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
-              <i class="el-icon-question"></i>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+        <el-form-item label="早高峰时段-方案" prop="content1">
+          <!-- <el-input v-model="form.storeCode" placeholder="店铺编码" /> -->
+          <el-select
+              v-model="form.content1"
+              placeholder="选择话术"
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in dict.type.bus_script_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+            <el-tooltip content="06:00:00-10:00:00" effect="dark" placement="right">
+              <i class="el-tooltip el-icon-question" tabindex="0" ></i>
             </el-tooltip>
-            权限字符
-          </span>
-          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
         </el-form-item>
-        <el-form-item label="角色顺序" prop="roleSort">
-          <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
+        <el-form-item label="午高峰时段-方案" prop="content2">
+          <el-select
+              v-model="form.content2"
+              placeholder="选择话术"
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in dict.type.bus_script_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+            <el-tooltip content="10:00:00-14:00:00" effect="dark" placement="right">
+              <i class="el-tooltip el-icon-question" tabindex="0" ></i>
+            </el-tooltip>
         </el-form-item>
-        <el-form-item label="状态">
-          <el-radio-group v-model="form.status">
+        <el-form-item label="下午时段-方案" prop="content3">
+          <el-select
+              v-model="form.content3"
+              placeholder="选择话术"
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in dict.type.bus_script_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+            <el-tooltip content="14:00:00-17:00:00" effect="dark" placement="right">
+              <i class="el-tooltip el-icon-question" tabindex="0" ></i>
+            </el-tooltip>
+        </el-form-item>
+        <el-form-item label="晚高峰时段-方案" prop="content4">
+          <el-select
+              v-model="form.content4"
+              placeholder="选择话术"
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in dict.type.bus_script_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+            <el-tooltip content="17:00:00-06:00:00" effect="dark" placement="right">
+              <i class="el-tooltip el-icon-question" tabindex="0" ></i>
+            </el-tooltip>
+        </el-form-item>
+        <el-form-item label="营销用户-下单次数 >=" prop="min_order_num">
+          <el-input-number v-model="form.minOrderNum" placeholder="请输入营销下单次数" :min="1"/>
+        </el-form-item>
+        <el-form-item label="营销用户-下单次数 <=" prop="max_order_num">
+          <el-input-number v-model="form.maxOrderNum" placeholder="请输入营销下单次数" :min="1"/>
+        </el-form-item>
+        <el-form-item label="营销时段" prop="start_time">
+          <!-- <el-date-picker
+            v-model="value2"
+            type="datetimerange"
+            range-separator="至"
+            :picker-options="pickerOptions"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker> -->
+          <el-time-picker
+            is-range
+            v-model="timeRange"
+            value-format = "HH:mm:ss"
+            range-separator="至"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            placeholder="选择时间范围">
+          </el-time-picker>
+        </el-form-item>
+        <!-- <el-form-item label="营销时长" prop="selfDeliveryDuration">
+          <el-input-number v-model="form.selfDeliveryDuration" controls-position="right" :min="0" />
+        </el-form-item> -->
+        <el-form-item label="营销限额" prop="quota">
+          <el-input-number v-model="form.quota" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="是否拼好饭">
+          <el-radio-group v-model="form.isSpliceOrder">
             <el-radio
-              v-for="dict in dict.type.sys_normal_disable"
+              v-for="dict in dict.type.sys_yes_no"
               :key="dict.value"
               :label="dict.value"
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="菜单权限">
-          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
-          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
-          <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
-          <el-tree
-            class="tree-border"
-            :data="menuOptions"
-            show-checkbox
-            ref="menu"
-            node-key="id"
-            :check-strictly="!form.menuCheckStrictly"
-            empty-text="加载中，请稍候"
-            :props="defaultProps"
-          ></el-tree>
+        <el-form-item label="店铺归属" prop="saleBindId">
+          <!-- <el-input v-model="form.roleSort" controls-position="right"/> -->
+          <el-select
+              v-model="form.saleBindId"
+              placeholder="店铺归属"
+              filterable
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in saleList"
+                :key="dict.id"
+                :label="dict.saleName+' ：'+dict.id"
+                :value="dict.id"
+              />
+            </el-select>
         </el-form-item>
+
         <el-form-item label="备注">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
         </el-form-item>
@@ -229,60 +369,20 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
-    <!-- 分配角色数据权限对话框 -->
-    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
-      <el-form :model="form" label-width="80px">
-        <el-form-item label="角色名称">
-          <el-input v-model="form.roleName" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="权限字符">
-          <el-input v-model="form.roleKey" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="权限范围">
-          <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
-            <el-option
-              v-for="item in dataScopeOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="数据权限" v-show="form.dataScope == 2">
-          <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
-          <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
-          <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
-          <el-tree
-            class="tree-border"
-            :data="deptOptions"
-            show-checkbox
-            default-expand-all
-            ref="dept"
-            node-key="id"
-            :check-strictly="!form.deptCheckStrictly"
-            empty-text="加载中，请稍候"
-            :props="defaultProps"
-          ></el-tree>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitDataScope">确 定</el-button>
-        <el-button @click="cancelDataScope">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
-import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+
+import { listStore, changeReturnVisitStatus, getMtUrl, changeSelfDeliveryStatus, getStoreConfig, updateStoreConfig, refresh, getStoreStatistics } from "@/api/business/store";
+import { listSaleA} from "@/api/business/sale";
 
 export default {
   name: "Role",
-  dicts: ['sys_normal_disable','sys_platform_type'],
+  dicts: ['sys_yes_no','sys_grant_status','sys_platform_type','sys_return_visit_status','bus_script_type'],
   data() {
     return {
+      meituanUrl: "https://e.waimai.meituan.com?ABC="+this.$store.state.user.name+":1",
       // 遮罩层
       loading: true,
       // 选中数组
@@ -295,55 +395,35 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 角色表格数据
-      roleList: [],
+      // 店铺表格数据
+      storeList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
       // 是否显示弹出层（数据权限）
       openDataScope: false,
-      menuExpand: false,
-      menuNodeAll: false,
-      deptExpand: true,
-      deptNodeAll: false,
-      // 日期范围
-      dateRange: [],
-      // 数据范围选项
-      dataScopeOptions: [
-        {
-          value: "1",
-          label: "全部数据权限"
-        },
-        {
-          value: "2",
-          label: "自定数据权限"
-        },
-        {
-          value: "3",
-          label: "本部门数据权限"
-        },
-        {
-          value: "4",
-          label: "本部门及以下数据权限"
-        },
-        {
-          value: "5",
-          label: "仅本人数据权限"
-        }
-      ],
-      // 菜单列表
-      menuOptions: [],
-      // 部门列表
-      deptOptions: [],
+      map: {
+        storeCount: 0,
+        openCount: 0,
+        noGrantCount: 0
+
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        roleName: undefined,
-        roleKey: undefined,
-        status: undefined
+        id: undefined,
+        platformType: undefined,
+        storeCode: undefined,
+        storeName: undefined,
+        saleBindId: undefined,
+        grantStatus: undefined,
+        returnVisitStatus: undefined,
+        selfDeliveryStatus: 1
       },
+      saleList: [],
+      timeRange: undefined,
       // 表单参数
       form: {},
       defaultProps: {
@@ -352,79 +432,88 @@ export default {
       },
       // 表单校验
       rules: {
-        roleName: [
-          { required: true, message: "角色名称不能为空", trigger: "blur" }
+        minOrderNum: [
+          { required: true, message: "下单次数min不能为空", trigger: "blur" }
         ],
-        roleKey: [
-          { required: true, message: "权限字符不能为空", trigger: "blur" }
+        maxOrderNum: [
+          { required: true, message: "下单次数max不能为空", trigger: "blur" }
         ],
-        roleSort: [
-          { required: true, message: "角色顺序不能为空", trigger: "blur" }
+        timeRange: [
+          { required: true, message: "运营时间不能为空", trigger: "blur" }
+        ],
+        quota: [
+          { required: true, message: "限额不能为空", trigger: "blur" }
         ]
       }
     };
   },
   created() {
+    this.getListSale();
     this.getList();
+    this.storeStatistics();
   },
   methods: {
+    renderPrice(h, { column, $index }) {
+      return [
+        h(
+          'el-tooltip',
+          {
+            props: {
+              content: '昨日营销量与昨日单量比值', // 鼠标悬停时要展示的文字提示
+              placement: 'top' // 悬停内容展示的位置
+            }
+          },
+          [h('span', { class: { 'el-icon-question': true }})] // 图标
+        ),
+        column.label
+      ]
+    },
     /** 查询角色列表 */
     getList() {
       this.loading = true;
-      listRole(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.roleList = response.rows;
+      listStore(this.queryParams).then(response => {
+          this.storeList = response.rows;
           this.total = response.total;
           this.loading = false;
         }
       );
     },
-    /** 查询菜单树结构 */
-    getMenuTreeselect() {
-      menuTreeselect().then(response => {
-        this.menuOptions = response.data;
+    getListSale() {
+      listSaleA(this.queryParams).then(response => {
+        this.saleList = response.data;
+        }
+      );
+    },
+    storeStatistics() {
+      getStoreStatistics().then(response => {
+          this.map.storeCount = response.data.storeCount;
+          this.map.openCount = response.data.openCount;
+          this.map.noGrantCount = response.data.noGrantCount;
+        }
+      );
+    },
+    idToName(row, column, cellValue) {
+        // 查找对应 ID 的姓名
+      const person = this.saleList.find(p => p.id === parseInt(cellValue));
+      // 如果找到了对应的人员信息，返回姓名，否则返回空字符串或者错误提示
+      return person ? person.saleName : '--';
+    },
+    handleOpen(row) {
+      this.queryParams.id = row.id;
+      getMtUrl(this.queryParams).then(response => {
+        window.open(response.msg,"_blank");
       });
     },
-    // 所有菜单节点数据
-    getMenuAllCheckedKeys() {
-      // 目前被选中的菜单节点
-      let checkedKeys = this.$refs.menu.getCheckedKeys();
-      // 半选中的菜单节点
-      let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
-      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
-      return checkedKeys;
-    },
-    // 所有部门节点数据
-    getDeptAllCheckedKeys() {
-      // 目前被选中的部门节点
-      let checkedKeys = this.$refs.dept.getCheckedKeys();
-      // 半选中的部门节点
-      let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys();
-      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
-      return checkedKeys;
-    },
-    /** 根据角色ID查询菜单树结构 */
-    getRoleMenuTreeselect(roleId) {
-      return roleMenuTreeselect(roleId).then(response => {
-        this.menuOptions = response.menus;
-        return response;
-      });
-    },
-    /** 根据角色ID查询部门树结构 */
-    getDeptTree(roleId) {
-      return deptTreeSelect(roleId).then(response => {
-        this.deptOptions = response.depts;
-        return response;
-      });
-    },
-    // 角色状态修改
+    // 运营状态修改
     handleStatusChange(row) {
-      let text = row.status === "0" ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗？').then(function() {
-        return changeRoleStatus(row.roleId, row.status);
+      let text = row.returnVisitStatus === "1" ? "启用" : "停用";
+      this.$modal.confirm('确认要"' + text + '""' + row.storeName + '"店铺的运营吗？').then(function() {
+        console.log(row.id+"====")
+        return changeReturnVisitStatus(row.id, row.returnVisitStatus);
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");
       }).catch(function() {
-        row.status = row.status === "0" ? "1" : "0";
+        row.returnVisitStatus = row.returnVisitStatus === "2" ? "1" : "2";
       });
     },
     // 取消按钮
@@ -447,15 +536,19 @@ export default {
       this.deptExpand = true,
       this.deptNodeAll = false,
       this.form = {
-        roleId: undefined,
-        roleName: undefined,
-        roleKey: undefined,
-        roleSort: 0,
-        status: "0",
-        menuIds: [],
-        deptIds: [],
-        menuCheckStrictly: true,
-        deptCheckStrictly: true,
+        storeCode: undefined,
+        content1: 'projects|00dd4cb88fc5f777d5c578c0fdb6b3a0',
+        content2: 'projects|00dd4cb88fc5f777d5c578c0fdb6b3a0',
+        content3: 'projects|00dd4cb88fc5f777d5c578c0fdb6b3a0',
+        content4: 'projects|00dd4cb88fc5f777d5c578c0fdb6b3a0',
+        minOrderNum: 1,
+        maxOrderNum: 1,
+        startTime: undefined,
+        endTime: undefined,
+        isSpliceOrder: 'N',
+        selfDeliveryDuration: undefined,
+        saleBindId: undefined,
+        quota: 1,
         remark: undefined
       };
       this.resetForm("form");
@@ -464,10 +557,10 @@ export default {
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.getList();
+      this.storeStatistics();
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -477,149 +570,85 @@ export default {
       this.single = selection.length!=1
       this.multiple = !selection.length
     },
-    // 更多操作触发
-    handleCommand(command, row) {
-      switch (command) {
-        case "handleDataScope":
-          this.handleDataScope(row);
-          break;
-        case "handleAuthUser":
-          this.handleAuthUser(row);
-          break;
-        default:
-          break;
-      }
-    },
-    // 树权限（展开/折叠）
-    handleCheckedTreeExpand(value, type) {
-      if (type == 'menu') {
-        let treeList = this.menuOptions;
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
-        }
-      } else if (type == 'dept') {
-        let treeList = this.deptOptions;
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
-        }
-      }
-    },
-    // 树权限（全选/全不选）
-    handleCheckedTreeNodeAll(value, type) {
-      if (type == 'menu') {
-        this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
-      } else if (type == 'dept') {
-        this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
-      }
-    },
-    // 树权限（父子联动）
-    handleCheckedTreeConnect(value, type) {
-      if (type == 'menu') {
-        this.form.menuCheckStrictly = value ? true: false;
-      } else if (type == 'dept') {
-        this.form.deptCheckStrictly = value ? true: false;
-      }
-    },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.getMenuTreeselect();
-      this.open = true;
-      this.title = "添加角色";
+      // var url = 'https://p.kdocs.cn/s/VEQ34BIAIQ';
+      // var url = 'http://43.140.224.18/h5/test.html'
+      var url = 'https://365.kdocs.cn/l/ccP9yCOfaXE9';
+      window.open(url,'_blank');
+      //
+      // this.reset();
+      // this.getMenuTreeselect();
+      // this.open = true;
+      // this.title = "添加角色";
+    },
+    async handleRefresh(){
+      await refresh().then(response => {
+        this.$modal.msgSuccess("修改成功");
+        this.handleQuery();
+      })
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const roleId = row.roleId || this.ids
-      const roleMenu = this.getRoleMenuTreeselect(roleId);
-      getRole(roleId).then(response => {
-        this.form = response.data;
+      getStoreConfig(row.storeCode).then(response => {
         this.open = true;
-        this.$nextTick(() => {
-          roleMenu.then(res => {
-            let checkedKeys = res.checkedKeys
-            checkedKeys.forEach((v) => {
-                this.$nextTick(()=>{
-                    this.$refs.menu.setChecked(v, true ,false);
-                })
-            })
-          });
-        });
-        this.title = "修改角色";
-      });
-    },
-    /** 选择角色权限范围触发 */
-    dataScopeSelectChange(value) {
-      if(value !== '2') {
-        this.$refs.dept.setCheckedKeys([]);
-      }
-    },
-    /** 分配数据权限操作 */
-    handleDataScope(row) {
-      this.reset();
-      const deptTreeSelect = this.getDeptTree(row.roleId);
-      getRole(row.roleId).then(response => {
-        this.form = response.data;
-        this.openDataScope = true;
-        this.$nextTick(() => {
-          deptTreeSelect.then(res => {
-            this.$refs.dept.setCheckedKeys(res.checkedKeys);
-          });
-        });
-        this.title = "分配数据权限";
-      });
-    },
-    /** 分配用户操作 */
-    handleAuthUser: function(row) {
-      const roleId = row.roleId;
-      this.$router.push("/system/role-auth/user/" + roleId);
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.roleId != undefined) {
-            this.form.menuIds = this.getMenuAllCheckedKeys();
-            updateRole(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            this.form.menuIds = this.getMenuAllCheckedKeys();
-            addRole(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+        if(response.data != null){
+          this.form = response.data;
+          if(response.data.startTime != null&&response.data.endTime != null){
+            this.timeRange = [response.data.startTime,response.data.endTime];
           }
+          this.title = "编辑配置";
+        }else{
+          this.form.storeCode = row.storeCode;
+          this.title = "新增配置";
         }
       });
     },
-    /** 提交按钮（数据权限） */
-    submitDataScope: function() {
-      if (this.form.roleId != undefined) {
-        this.form.deptIds = this.getDeptAllCheckedKeys();
-        dataScope(this.form).then(response => {
-          this.$modal.msgSuccess("修改成功");
-          this.openDataScope = false;
-          this.getList();
-        });
+    /** 提交按钮 */
+    submitForm: function() {
+      const data = this.form
+      if(this.timeRange==undefined || this.timeRange.length == 0){
+        this.$modal.msgSuccess("请填写营销时段！");
+        return
       }
+      data.startTime = this.timeRange[0]
+      data.endTime = this.timeRange[1]
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          updateStoreConfig(data).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+        }
+      });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const roleIds = row.roleId || this.ids;
-      this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
-        return delRole(roleIds);
+      this.$modal.confirm('是否确认删除解绑编号为"' + row.storeCode + '"的店铺？').then(function() {
+        return changeSelfDeliveryStatus(row.id, 3);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(function() {
+
+      });
+    },
+    /** 自配送按钮操作 */
+    handleSelfDelivery(row) {
+      this.$modal.confirm('是否确认将营销源 "' + row.storeCode + '" 转为自配送？确认后该营销源会变为自配送营销。').then(function() {
+        return changeSelfDeliveryStatus(row.id, 2);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(function() {
+
+      });
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/role/export', {
+      this.download('business/store/export', {
         ...this.queryParams
       }, `role_${new Date().getTime()}.xlsx`)
     }