客服聊天页面优化 订单中心跳转到短信界面

config/index.js

@@ -23,8 +23,9 @@ module.exports = {
     // 代理列表, 是否开启代理通过[./dev.env.js]配置
     proxyTable: devEnv.OPEN_PROXY === false ? {} : {
       '/proxyApi': {
+        target: 'https://mxys.chuanghai-tech.com/wm-test/wm-api',
         // target: 'http://192.168.0.131:8171/sqx_fast/',
-        target: 'https://mxys.chuanghai-tech.com/sqx_fast/',
+        // target: 'https://mxys.chuanghai-tech.com/sqx_fast/',
         changeOrigin: true,
         pathRewrite: {
           '^/proxyApi': ''

src/router/index.js

@@ -74,6 +74,12 @@ const mainRoutes = {
       meta: { title: "消息中心", isTab: true }
     },
     {
+      path: "/downList",
+      component: _import("downLoad/downList"),
+      name: "downList",
+      meta: { title: "导出记录", isTab: true }
+    },
+    {
       path: "/taskConfig",
       component: _import("taskConfig/taskConfig"),
       name: "taskConfig",
@@ -557,7 +563,7 @@ router.beforeEach((to, from, next) => {
     router.options.isAddDynamicMenuRoutes ||
     fnCurrentRouteType(to, globalRoutes) === "global"
   ) {
-    console.log(userId, "测试12");
+    // console.log(userId, "测试12");
     next();
   } else {
     console.log(userId, "测试123");
@@ -621,7 +627,7 @@ function fnCurrentRouteType(route, globalRoutes = []) {
  */
 function fnAddDynamicMenuRoutes(menuList = [], routes = []) {
   var temp = [];
-  console.log(menuList, "list列表");
+  // console.log(menuList, "list列表");
   for (var i = 0; i < menuList.length; i++) {
     if (menuList[i].list && menuList[i].list.length >= 1) {
       temp = temp.concat(menuList[i].list);
@@ -652,7 +658,7 @@ function fnAddDynamicMenuRoutes(menuList = [], routes = []) {
       routes.push(route);
     }
   }
-  console.log(temp, "路由");
+  // console.log(temp, "路由");
   if (temp.length >= 1) {
     fnAddDynamicMenuRoutes(temp, routes);
   } else {

src/utils/httpRequest.js

@@ -61,10 +61,11 @@ http.interceptors.response.use(response => {
 http.adornUrl = (actionName) => {
   // 非生产环境 && 开启代理, 接口前缀统一使用[/proxyApi/]前缀做代理拦截!
   // return (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.baseUrl) + actionName
-	return 'https://mxys.chuanghai-tech.com/sqx_fast/' + actionName
+	// return 'https://mxys.chuanghai-tech.com/sqx_fast/' + actionName
   // return 'http://r8p8gz.natappfree.cc/sqx_fast/' + actionName
   // return 'https://www.daweilinli.com/sqx_fast/' + actionName
 	// return 'http://192.168.0.131:8171/sqx_fast/' + actionName
+	return 'https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast/' + actionName
 }
 
 http.adornUrl2 = (actionName) => {
@@ -75,8 +76,9 @@ http.adornUrl2 = (actionName) => {
 http.adornWss = (actionName) => {
   // 非生产环境 && 开启代理, 接口前缀统一使用[/proxyApi/]前缀做代理拦截!
   // return (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.baseUrl) + actionName
-	return 'wss://mxys.chuanghai-tech.com/wss/' + actionName
+	// return 'wss://mxys.chuanghai-tech.com/wss/' + actionName
 	// return 'wss://www.daweilinli.com/wss/' + actionName
+	return 'wss://mxys.chuanghai-tech.com/wss-test/' + actionName
 }
 /**
  * get请求参数处理
@@ -99,7 +101,7 @@ http.adornParams = (params = {}, openDefultParams = false) => {
       var b=[]
       // console.log(arr,'j')
       arr.forEach((element, index) => {
-        console.log(element[1],index,element[1]==undefined)
+        // console.log(element[1],index,element[1]==undefined)
         if(element[1]==undefined){
           element[1]==''
           arr[index][1] = urlSafeBase64Encode(encrypt(''))

src/views/common/home.vue

@@ -5,7 +5,11 @@
         <el-col :span="6" class="cards">
           <div class="box">
             <div class="box_num">
-              <div class="box_color">总用户数</div>
+              <div class="box_color">总用户数
+                <el-tooltip class="item" effect="dark" placement="top" content="所有状态为正常的用户数" :open-delay="500">
+                  <img class="help" src="~@/assets/img/help.png" alt="">
+                </el-tooltip>
+              </div>
               <div class="text_color"><span>{{tableData.allCount ? tableData.allCount : 0}}</span>人</div>
             </div>
           </div>
@@ -13,7 +17,11 @@
         <el-col :span="6" class="cards">
           <div class="box">
             <div class="box_num">
-              <div class="box_color">今日新增</div>
+              <div class="box_color">今日新增
+                <el-tooltip class="item" effect="dark" placement="top" content="创建时间为今日的用户数" :open-delay="500">
+                  <img class="help" src="~@/assets/img/help.png" alt="">
+                </el-tooltip>
+              </div>
               <div class="text_color"><span>{{tableData.dayAddUser ? tableData.dayAddUser : 0}}</span>人</div>
             </div>
           </div>
@@ -21,7 +29,11 @@
         <el-col :span="6" class="cards">
           <div class="box">
             <div class="box_num">
-              <div class="box_color">本月新增</div>
+              <div class="box_color">本月新增
+                <el-tooltip class="item" effect="dark" placement="top" content="创建时间为本月的用户数" :open-delay="500">
+                  <img class="help" src="~@/assets/img/help.png" alt="">
+                </el-tooltip>
+              </div>
               <div class="text_color"><span>{{tableData.monthAddUser ? tableData.monthAddUser : 0}}</span>人</div>
             </div>
           </div>
@@ -29,7 +41,11 @@
         <el-col :span="6" class="cards">
           <div class="box">
             <div class="box_num">
-              <div class="box_color">本年新增</div>
+              <div class="box_color">本年新增
+                <el-tooltip class="item" effect="dark" placement="top" content="创建时间为本年的用户数" :open-delay="500">
+                  <img class="help" src="~@/assets/img/help.png" alt="">
+                </el-tooltip>
+              </div>
               <div class="text_color"><span>{{tableData.yearAddUser ? tableData.yearAddUser : 0}}</span>人</div>
             </div>
           </div>
@@ -37,9 +53,11 @@
         <el-col :span="6" class="cards">
           <div class="box">
             <div class="box_num">
-              <el-tooltip class="item" effect="dark" placement="top" content="(? 待取餐+派送中+已完成 状态的已支付订单)(按支付时间)" :open-delay="500">
-                <div class="box_color">今日外卖收入</div>
-              </el-tooltip>
+              <div class="box_color">今日外卖收入
+                <el-tooltip class="item" effect="dark" placement="top" content="(派送中+待取餐+已完成 的已支付订单)" :open-delay="500">
+                  <img class="help" src="~@/assets/img/help.png" alt="">
+                </el-tooltip>
+              </div>
 
               <div class="text_color"><span>{{tableData.dayIncome ? tableData.dayIncome : 0 }}</span>元</div>
             </div>
@@ -48,7 +66,11 @@
         <el-col :span="6" class="cards">
           <div class="box">
             <div class="box_num">
-              <div class="box_color">本月外卖收入 </div>
+              <div class="box_color">本月外卖收入
+                <el-tooltip class="item" effect="dark" placement="top" content="(派送中+待取餐+已完成 的已支付订单)" :open-delay="500">
+                  <img class="help" src="~@/assets/img/help.png" alt="">
+                </el-tooltip>
+              </div>
               <div class="text_color"><span>{{tableData.monthIncome ? tableData.monthIncome : 0}}</span>元</div>
             </div>
           </div>
@@ -56,7 +78,11 @@
         <el-col :span="6" class="cards">
           <div class="box">
             <div class="box_num">
-              <div class="box_color">本年外卖收入</div>
+              <div class="box_color">本年外卖收入
+                <el-tooltip class="item" effect="dark" placement="top" content="(派送中+待取餐+已完成 的已支付订单)" :open-delay="500">
+                  <img class="help" src="~@/assets/img/help.png" alt="">
+                </el-tooltip>
+              </div>
               <div class="text_color"><span>{{tableData.yearIncome ? tableData.yearIncome : 0}}</span>元</div>
             </div>
           </div>
@@ -64,7 +90,11 @@
         <el-col :span="6" class="cards">
           <div class="box">
             <div class="box_num">
-              <div class="box_color">今日外卖接单数量 </div>
+              <div class="box_color">今日外卖接单数量
+                <el-tooltip class="item" effect="dark" placement="top" content="(派送中+待取餐+已完成 的已支付订单)" :open-delay="500">
+                  <img class="help" src="~@/assets/img/help.png" alt="">
+                </el-tooltip>
+              </div>
               <div class="text_color"><span>{{tableData.indentCount ? tableData.indentCount : 0}}</span>笔</div>
             </div>
           </div>
@@ -85,9 +115,11 @@
             <el-col :span="6" class="cards">
               <div class="box">
                 <div class="box_num">
-                  <el-tooltip class="item" effect="dark" placement="top" content="(? 待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的已支付订单)(按支付时间)" :open-delay="500">
-                    <div class="box_color">订单总金额</div>
-                  </el-tooltip>
+                    <div class="box_color">订单总金额
+                      <el-tooltip class="item" effect="dark" placement="top" content="(待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的已支付订单)(按支付时间)" :open-delay="500">
+                        <img class="help" src="~@/assets/img/help.png" alt="">
+                      </el-tooltip>
+                    </div>
                   <div class="text_color"><span>{{taskStat.sumMoney ? taskStat.sumMoney : 0}}</span>元</div>
                 </div>
               </div>
@@ -95,9 +127,11 @@
             <el-col :span="6" class="cards">
               <div class="box">
                 <div class="box_num">
-                  <el-tooltip class="item" effect="dark" placement="top" content="(? 待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的已支付订单)(按支付时间)" :open-delay="500">
-                    <div class="box_color">订单数量</div>
-                  </el-tooltip>
+                  <div class="box_color">订单数量
+                    <el-tooltip class="item" effect="dark" placement="top" content="(待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的已支付订单)(按支付时间)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
                   <div class="text_color"><span>{{taskStat.countOrder ? taskStat.countOrder : 0}}</span>单</div>
                 </div>
               </div>
@@ -106,9 +140,11 @@
             <el-col :span="6" class="cards">
               <div class="box">
                 <div class="box_num">
-                  <el-tooltip class="item" effect="dark" placement="top" content="(? 待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的到店已支付订单)(按支付时间)" :open-delay="500">
-                    <div class="box_color">到店订单数</div>
-                  </el-tooltip>
+                  <div class="box_color">到店订单数
+                    <el-tooltip class="item" effect="dark" placement="top" content="(待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的到店已支付订单)(按支付时间)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
                   <div class="text_color"><span>{{taskStat.takeCount ? taskStat.takeCount : 0}}</span>单</div>
                 </div>
               </div>
@@ -116,9 +152,12 @@
             <el-col :span="6" class="cards">
               <div class="box">
                 <div class="box_num">
-                  <el-tooltip class="item" effect="dark" placement="top" content="(? 待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的外卖已支付订单)(按支付时间)" :open-delay="500">
-                    <div class="box_color">外卖订单数</div>
-                  </el-tooltip>
+                  <div class="box_color">外卖订单数
+                    <el-tooltip class="item" effect="dark" placement="top" content="(待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的外卖已支付订单)(按支付时间)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
+
                   <div class="text_color"><span>{{taskStat.takeCount2 ? taskStat.takeCount2 : 0}}</span>单</div>
                 </div>
               </div>
@@ -126,9 +165,12 @@
             <el-col :span="6" class="cards">
               <div class="box">
                 <div class="box_num">
-                  <el-tooltip class="item" effect="dark" placement="top" content="(? 待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的到店已支付订单)(按支付时间)" :open-delay="500">
-                    <div class="box_color">到店订单金额</div>
-                  </el-tooltip>
+                  <div class="box_color">到店订单金额
+                    <el-tooltip class="item" effect="dark" placement="top" content="(待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的到店已支付订单)(按支付时间)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
+
                   <div class="text_color"><span>{{taskStat.takeMoney ? taskStat.takeMoney : 0 }}</span>元</div>
                 </div>
               </div>
@@ -136,9 +178,12 @@
             <el-col :span="6" class="cards">
               <div class="box">
                 <div class="box_num">
-                  <el-tooltip class="item" effect="dark" placement="top" content="(? 待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的外卖已支付订单)(按支付时间)" :open-delay="500">
-                    <div class="box_color">外卖订单金额</div>
-                  </el-tooltip>
+                  <div class="box_color">外卖订单金额
+                    <el-tooltip class="item" effect="dark" placement="top" content="(待结算+待取餐+派送中+已完成+商家待接单+制作中 状态的外卖已支付订单)(按支付时间)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
+
                   <div class="text_color"><span>{{taskStat.takeMoney1 ? taskStat.takeMoney1 : 0}}</span>元</div>
                 </div>
               </div>
@@ -146,9 +191,12 @@
             <el-col :span="6" class="cards">
               <div class="box">
                 <div class="box_num">
-                  <el-tooltip class="item" effect="dark" placement="top" content="(? 已取消 状态的订单)(按订单创建时间)" :open-delay="500">
-                    <div class="box_color">退款订单数</div>
-                  </el-tooltip>
+                  <div class="box_color">退款订单数
+                    <el-tooltip class="item" effect="dark" placement="top" content="(已取消 状态的订单)(按订单创建时间)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
+
                   <div class="text_color"><span>{{taskStat.cancelOrderCount ? taskStat.cancelOrderCount : 0}}</span>单</div>
                 </div>
               </div>
@@ -156,9 +204,12 @@
             <el-col :span="6" class="cards">
               <div class="box">
                 <div class="box_num">
-                  <el-tooltip class="item" effect="dark" placement="top" content="(? 已取消 状态的订单)(按订单创建时间)" :open-delay="500">
-                    <div class="box_color">退款金额</div>
-                  </el-tooltip>
+                  <div class="box_color">退款金额
+                    <el-tooltip class="item" effect="dark" placement="top" content="(已取消 状态的订单)(按订单创建时间)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
+
                   <div class="text_color"><span>{{taskStat.cancelOrderMoney ? taskStat.cancelOrderMoney : 0}}</span>元</div>
                 </div>
               </div>
@@ -251,7 +302,11 @@
         		<el-col :span="6" class="cards">
         			<div class="box">
         				<div class="box_num">
-        					<div class="box_color">累计订单</div>
+        					<div class="box_color">累计订单
+                    <el-tooltip class="item" effect="dark" placement="top" content="(跑腿订单总数)(按时间筛选)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
         					<div class="text_color">
         						<span>{{orderStat.i ? orderStat.i : 0}}</span>笔</div>
         				</div>
@@ -260,7 +315,11 @@
         		<el-col :span="6" class="cards">
         			<div class="box">
         				<div class="box_num">
-        					<div class="box_color">付款订单</div>
+        					<div class="box_color">付款订单
+                    <el-tooltip class="item" effect="dark" placement="top" content="(已支付的跑腿订单总数)(按时间筛选)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
         					<div class="text_color">
         						<span>{{orderStat.i1 ? orderStat.i1 : 0}}</span>笔</div>
         				</div>
@@ -269,7 +328,11 @@
         		<el-col :span="6" class="cards">
         			<div class="box">
         				<div class="box_num">
-        					<div class="box_color">接单订单</div>
+        					<div class="box_color">接单订单
+                    <el-tooltip class="item" effect="dark" placement="top" content="(骑手已接单的跑腿订单总数)(按时间筛选)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
         					<div class="text_color">
         						<span>{{orderStat.i2 ? orderStat.i2 : 0}}</span>笔</div>
         				</div>
@@ -278,7 +341,11 @@
         		<el-col :span="6" class="cards">
         			<div class="box">
         				<div class="box_num">
-        					<div class="box_color">进行中订单</div>
+        					<div class="box_color">进行中订单
+                    <el-tooltip class="item" effect="dark" placement="top" content="(骑手已取货/购买的跑腿订单总数)(按时间筛选)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
         					<div class="text_color">
         						<span>{{orderStat.i3 ? orderStat.i3 : 0}}</span>笔</div>
         				</div>
@@ -287,7 +354,11 @@
         		<el-col :span="6" class="cards">
         			<div class="box">
         				<div class="box_num">
-        					<div class="box_color">已完成订单</div>
+        					<div class="box_color">已完成订单
+                    <el-tooltip class="item" effect="dark" placement="top" content="(已完成的跑腿订单总数)(按时间筛选)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
         					<div class="text_color">
         						<span>{{orderStat.i4 ? orderStat.i4 : 0}}</span>笔</div>
         				</div>
@@ -296,7 +367,11 @@
         		<el-col :span="6" class="cards">
         			<div class="box">
         				<div class="box_num">
-        					<div class="box_color">已取消订单</div>
+        					<div class="box_color">已取消订单
+                    <el-tooltip class="item" effect="dark" placement="top" content="(已取消的跑腿订单总数)(按时间筛选)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
         					<div class="text_color">
         						<span>{{orderStat.i5 ? orderStat.i5 : 0}}</span>笔</div>
         				</div>
@@ -309,7 +384,11 @@
         		<el-col :span="6" class="cards">
         			<div class="box">
         				<div class="box_num">
-        					<div class="box_color">发单总金额</div>
+        					<div class="box_color">发单总金额
+                    <el-tooltip class="item" effect="dark" placement="top" content="(已支付+已接单+已取货+已完成 跑腿订单总金额)(按时间筛选)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
         					<div class="text_color">
         						<span>{{taskStatPt.billMoney ? taskStatPt.billMoney : 0}}</span>元</div>
         				</div>
@@ -318,7 +397,11 @@
         		<el-col :span="6" class="cards">
         			<div class="box">
         				<div class="box_num">
-        					<div class="box_color">接单总金额</div>
+        					<div class="box_color">接单总金额
+                    <el-tooltip class="item" effect="dark" placement="top" content="(已接单+已取货+已完成 跑腿订单总金额)(按时间筛选)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
         					<div class="text_color">
         						<span>{{taskStatPt.receivingMoney ? taskStatPt.receivingMoney : 0}}</span>元</div>
         				</div>
@@ -327,7 +410,11 @@
         		<el-col :span="6" class="cards">
         			<div class="box">
         				<div class="box_num">
-        					<div class="box_color">发单数量</div>
+        					<div class="box_color">发单数量
+                    <el-tooltip class="item" effect="dark" placement="top" content="(已支付+已接单+已取货+已完成 跑腿订单总数量)(按时间筛选)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
         					<div class="text_color">
         						<span>{{taskStatPt.billCount ? taskStatPt.billCount : 0}}</span>笔</div>
         				</div>
@@ -336,7 +423,11 @@
         		<el-col :span="6" class="cards">
         			<div class="box">
         				<div class="box_num">
-        					<div class="box_color">接单数量</div>
+        					<div class="box_color">接单数量
+                      <el-tooltip class="item" effect="dark" placement="top" content="(已接单+已取货+已完成 跑腿订单总数量)(按时间筛选)" :open-delay="500">
+                        <img class="help" src="~@/assets/img/help.png" alt="">
+                      </el-tooltip>
+                  </div>
         					<div class="text_color">
         						<span>{{taskStatPt.reveivingCount ? taskStatPt.reveivingCount : 0}}</span>笔</div>
         				</div>
@@ -384,7 +475,11 @@
         		<el-col :span="6" class="cards">
         			<div class="box">
         				<div class="box_num">
-        					<div class="box_color">总收入</div>
+        					<div class="box_color">总收入
+                    <el-tooltip class="item" effect="dark" placement="top" content="(总收入=服务费+保价费+扣除骑手保证金)(按时间筛选)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
         					<div class="text_color">
         						<span>{{platformData.allMoneySum}}</span>元
         					</div>
@@ -394,7 +489,11 @@
         		<el-col :span="6" class="cards">
         			<div class="box">
         				<div class="box_num">
-        					<div class="box_color">服务费收入</div>
+        					<div class="box_color">服务费收入
+                    <el-tooltip class="item" effect="dark" placement="top" content="(服务费=帮我取+帮我买+同城外卖+同城服务)(按时间筛选)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
         					<div class="text_color">
         						<span>{{platformData.serviceMoneySum}}</span>元
         					</div>
@@ -404,7 +503,11 @@
             <el-col :span="6" class="cards">
               <div class="box">
                 <div class="box_num">
-                  <div class="box_color">同城外卖收入</div>
+                  <div class="box_color">同城外卖收入
+                    <el-tooltip class="item" effect="dark" placement="top" content="(跑腿订单状态为已完成的跑腿订单平台收入总金额)(按时间筛选)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
                   <div class="text_color">
                     <span>{{platformData.tcwmMoneySum ? platformData.tcwmMoneySum : 0}}</span>元</div>
                 </div>
@@ -413,7 +516,11 @@
         		<el-col :span="6" class="cards">
         			<div class="box">
         				<div class="box_num">
-        					<div class="box_color">保价费收入</div>
+        					<div class="box_color">保价费收入
+                    <el-tooltip class="item" effect="dark" placement="top" content="(跑腿订单状态为已完成的跑腿订单保价费总金额)(按时间筛选)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
         					<div class="text_color">
         						<span>{{platformData.cargoInsurance}}</span>元
         					</div>
@@ -423,7 +530,11 @@
         		<el-col :span="6" class="cards">
         			<div class="box">
         				<div class="box_num">
-        					<div class="box_color">扣除骑手保证金收入</div>
+        					<div class="box_color">扣除骑手保证金收入
+                    <el-tooltip class="item" effect="dark" placement="top" content="(申诉未通过的骑手投诉订单总金额)(按时间筛选)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
         					<div class="text_color">
         						<span>{{platformData.deductMoneySum}}</span>元
         					</div>
@@ -434,7 +545,11 @@
         		<el-col :span="6" class="cards">
         			<div class="box">
         				<div class="box_num">
-        					<div class="box_color">同城服务收入</div>
+        					<div class="box_color">同城服务收入
+                    <el-tooltip class="item" effect="dark" placement="top" content="(跑腿订单状态为已完成的跑腿订单平台收入总金额)(按时间筛选)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
         					<div class="text_color">
         						<span>{{platformData.fourthMoneySum}}</span>元
         					</div>
@@ -444,7 +559,11 @@
         		<el-col :span="6" class="cards">
         			<div class="box">
         				<div class="box_num">
-        					<div class="box_color">帮我送收入</div>
+        					<div class="box_color">帮我送收入
+                    <el-tooltip class="item" effect="dark" placement="top" content="(跑腿订单状态为已完成的跑腿订单平台收入总金额)(按时间筛选)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
         					<div class="text_color">
         						<span>{{platformData.firstMoneySum}}</span>元
         					</div>
@@ -454,7 +573,11 @@
         		<el-col :span="6" class="cards">
         			<div class="box">
         				<div class="box_num">
-        					<div class="box_color">帮我取收入</div>
+        					<div class="box_color">帮我取收入
+                    <el-tooltip class="item" effect="dark" placement="top" content="(跑腿订单状态为已完成的跑腿订单平台收入总金额)(按时间筛选)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
         					<div class="text_color">
         						<span>{{platformData.secondMoneySum}}</span>元
         					</div>
@@ -464,7 +587,11 @@
         		<el-col :span="6" class="cards">
         			<div class="box">
         				<div class="box_num">
-        					<div class="box_color">同城帮买收入</div>
+        					<div class="box_color">同城帮买收入
+                    <el-tooltip class="item" effect="dark" placement="top" content="(跑腿订单状态为已完成的跑腿订单平台收入总金额)(按时间筛选)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
         					<div class="text_color">
         						<span>{{platformData.thirdMoneySum}}</span>元
         					</div>
@@ -475,7 +602,11 @@
         		<el-col :span="6" class="cards">
         			<div class="box">
         				<div class="box_num">
-        					<div class="box_color">骑手保证金收入</div>
+        					<div class="box_color">骑手保证金收入
+                    <el-tooltip class="item" effect="dark" placement="top" content="(骑手成功缴纳的保证金)(按时间筛选)" :open-delay="500">
+                      <img class="help" src="~@/assets/img/help.png" alt="">
+                    </el-tooltip>
+                  </div>
         					<div class="text_color">
         						<span>{{platformData.cashDepositMoney}}</span>元
         					</div>
@@ -732,6 +863,8 @@
           data
         }) => {
           if (data.code == 0) {
+            console.log(data.data);
+
             let returnData = data.data;
             this.tableData = returnData
           }
@@ -933,6 +1066,15 @@
     color: #333;
     font-size: 14px;
     margin-bottom: 15px;
+    display: flex;
+    align-items: center;
+  }
+
+  .box_num .box_color .help{
+    width: 16px;
+    height: 16px;
+    cursor: pointer;
+    margin: 0 2px;
   }
 
   .box_num div span {

src/views/coupon/couponList.vue

@@ -1,204 +1,215 @@
-<template>
-  <el-tabs v-model="activeName" @tab-click="handleClick">
-    <el-tab-pane label="优惠券列表" name="seventh">
-      <div style="position: relative;display: inline-block;margin: 10px 0px;">
-        <span>状态：</span>
-        <el-select v-model="state" style="width:150px;margin-left: 10px;" @change="animeDat(state)">
-          <el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
-        </el-select>&nbsp;&nbsp;&nbsp;
-      </div>
-      <div style="position: relative;display: inline-block;margin: 10px 0px;">
-        <span>手机号：</span>
-        <el-input style="width: 200px;" @keydown.enter.native="animeDat" placeholder="请输入手机号"
-          v-model="phone">
-        </el-input>&nbsp;&nbsp
-      </div>
-	  <div style="position: relative;display: inline-block;margin: 10px 0px;">
-	    <span>商户名称：</span>
-	    <el-input style="width: 200px;" @keydown.enter.native="animeDat" placeholder="请输入商户名称"
-	      v-model="shopName">
-	    </el-input>&nbsp;&nbsp
-	  </div>
-	  
-      <div style="position: relative;display: inline-block;margin-right:2%;">
-        <el-button style="margin-left:15px;" size="mini" type="primary" icon="document" @click="animeDat">查询
-        </el-button>
-        <el-button style="margin-left:15px;" size="mini" type="primary" icon="document" @click="cleans">重置
-        </el-button>
-      </div>
-      <el-table v-loading="tableDataLoading" :data="tableData.list">
-        <el-table-column fixed prop="id" label="编号" width="80">
-        </el-table-column>
-        <el-table-column fixed prop="nickName" label="昵称" width="150">
-          <template slot-scope="scope">
-            <span style="color: #f56c6c;cursor: pointer;" @click="updataDetails(scope.row)">{{scope.row.nickName ? scope.row.nickName : '未绑定'}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="图像">
-          <template slot-scope="scope">
-            <img v-if="scope.row.avatar==null" src="~@/assets/img/avatar.png" alt="" width="40" height="40">
-            <img v-else :src="scope.row.avatar" alt="" width="40" height="40">
-          </template>
-        </el-table-column>
-        <el-table-column prop="phone" label="手机号">
-        </el-table-column>
-		<el-table-column prop="shopName" label="商户名称">
-			<template slot-scope="scope">
-			  <span v-if="scope.row.shopId==0">平台优惠券</span>
-				<span v-else>{{scope.row.shopName}}</span>
-			</template>
-		</el-table-column>
-        <el-table-column prop="couponName" label="优惠券名称">
-        </el-table-column>
-        <el-table-column prop="couponPicture" label="图片">
-          <template slot-scope="scope">
-            <img :src="scope.row.couponPicture" alt="" width="40" height="40">
-          </template>
-        </el-table-column>
-        <el-table-column prop="money" label="优惠券金额">
-        </el-table-column>
-        <el-table-column prop="minMoney" label="最低消费">
-        </el-table-column>
-        <!-- <el-table-column prop="needIntegral" label="兑换积分">
-        </el-table-column> -->
-        <el-table-column prop="createTime" label="领取时间">
-        </el-table-column>
-        <el-table-column prop="expirationTime" label="过期时间">
-        </el-table-column>
-        <el-table-column prop="expirationTime" label="状态">
-          <template slot-scope="scope">
-            <span v-if="scope.row.status==0">待使用</span>
-            <span v-else-if="scope.row.status==1">已使用</span>
-            <span v-else-if="scope.row.status==2">已失效</span>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div style="text-align: center;margin-top: 10px;">
-        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-          :page-sizes="[10, 20, 30,50,100]" :page-size="limit" :current-page="page" layout="total,sizes, prev, pager, next"
-          :total="tableData.totalCount">
-        </el-pagination>
-      </div>
-    </el-tab-pane>
-  </el-tabs>
-</template>
-
-<script>
-  export default {
-    data() {
-      return {
-        limit: 10,
-        page: 1,
-        state: '',
-        url: '',
-        title: '',
-        type: '',
-        id: '',
-        types: [{
-            value: 'word',
-            label: '文字'
-          },
-          {
-            value: 'url',
-            label: '链接'
-          }
-        ],
-        phone: '',
-        content: '',
-        activeName: 'seventh',
-        tableDataLoading: false,
-        dialogFormVisible1: false,
-        dialogFormVisible2: false,
-        dialogFormVisible: false,
-        tableData: [],
-        typeList:[
-          {
-            value:'',
-            label:'全部'
-          },
-          {
-            value:0,
-            label:'待使用'
-          },
-          {
-            value:1,
-            label:'已使用'
-          },
-          {
-            value:2,
-            label:'已失效'
-          }
-        ],
-        phone:'',
-		shopName:'',
-      }
-    },
-    methods: {
-      // 详情跳转
-      updataDetails(row) {
-        this.$router.push({
-          path: '/userDetail',
-          query: {
-            userId: row.userId
-          }
-        });
-      },
-      handleSizeChange(val) {
-        this.limit = val;
-        this.dataSelect()
-      },
-      handleCurrentChange(val) {
-        this.page = val;
-        this.dataSelect()
-      },
-      handleClick(tab, event) {
-
-        if (tab._props.label == '优惠券列表') {
-          this.page = 1
-          this.limit = 10
-          this.dataSelect()
-        }
-      },
-      // 获取数据列表
-      dataSelect() {
-        this.tableDataLoading = true
-        this.$http({
-          url: this.$http.adornUrl('admin/dataCentre/selectCouponByUserId'),
-          method: 'get',
-          params: this.$http.adornParams({
-            'page':this.page,
-            'limit':this.limit,
-            'userId':'',
-            'status':this.state,
-            'phone':this.phone,
-			'shopName':this.shopName
-          })
-        }).then(({
-          data
-        }) => {
-          this.tableDataLoading = false
-          let returnData = data.data;
-          this.tableData = returnData
-        })
-      },
-      animeDat(){
-        this.page = 1
-        this.dataSelect()
-      },
-      cleans(){
-        this.page = 1
-        this.phone = ''
-        this.state = ''
-		this.shopName = ''
-        this.dataSelect()
-      }
-    },
-    mounted() {
-      this.dataSelect()
-    }
-  };
-</script>
-
-<style>
-
-</style>
+<template>
+  <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tab-pane label="优惠券列表" name="seventh">
+      <div style="position: relative;display: inline-block;margin: 10px 0px;">
+        <span>状态：</span>
+        <el-select v-model="state" style="width:150px;margin-left: 10px;" @change="animeDat(state)">
+          <el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+        </el-select>&nbsp;&nbsp;&nbsp;
+      </div>
+      <div style="position: relative;display: inline-block;margin: 10px 0px;">
+        <span>手机号：</span>
+        <el-input style="width: 200px;" @keydown.enter.native="animeDat" placeholder="请输入手机号"
+          v-model="phone">
+        </el-input>&nbsp;&nbsp;
+      </div>
+	  <div style="position: relative;display: inline-block;margin: 10px 0px;">
+	    <span>商户名称：</span>
+	    <el-input style="width: 200px;" @keydown.enter.native="animeDat" placeholder="请输入商户名称"
+	      v-model="shopName">
+	    </el-input>&nbsp;&nbsp;
+	  </div>
+    <div style="position: relative;display: inline-block;margin: 10px 0px;">
+	    <span>是否平台券：</span>
+	    <el-select v-model="isTicket" style="width:150px;margin-left: 10px;" @change="animeDat(isTicket)">
+          <el-option label="全部" :value="0"></el-option>
+          <el-option label="是" :value="1"></el-option>
+          <el-option label="否" :value="2"></el-option>
+        </el-select>&nbsp;&nbsp;&nbsp;
+	  </div>
+
+      <div style="position: relative;display: inline-block;margin-right:2%;">
+        <el-button style="margin-left:15px;" size="mini" type="primary" icon="document" @click="animeDat">查询
+        </el-button>
+        <el-button style="margin-left:15px;" size="mini" type="primary" icon="document" @click="cleans">重置
+        </el-button>
+      </div>
+      <el-table v-loading="tableDataLoading" :data="tableData.list">
+        <el-table-column fixed prop="id" label="编号" width="80">
+        </el-table-column>
+        <el-table-column fixed prop="nickName" label="昵称" width="150">
+          <template slot-scope="scope">
+            <span style="color: #f56c6c;cursor: pointer;" @click="updataDetails(scope.row)">{{scope.row.nickName ? scope.row.nickName : '未绑定'}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="图像">
+          <template slot-scope="scope">
+            <img v-if="scope.row.avatar==null" src="~@/assets/img/avatar.png" alt="" width="40" height="40">
+            <img v-else :src="scope.row.avatar" alt="" width="40" height="40">
+          </template>
+        </el-table-column>
+        <el-table-column prop="phone" label="手机号">
+        </el-table-column>
+		<el-table-column prop="shopName" label="商户名称">
+			<template slot-scope="scope">
+			  <span v-if="scope.row.shopId==0">平台优惠券</span>
+				<span v-else>{{scope.row.shopName}}</span>
+			</template>
+		</el-table-column>
+        <el-table-column prop="couponName" label="优惠券名称">
+        </el-table-column>
+        <el-table-column prop="couponPicture" label="图片">
+          <template slot-scope="scope">
+            <img :src="scope.row.couponPicture" alt="" width="40" height="40">
+          </template>
+        </el-table-column>
+        <el-table-column prop="money" label="优惠券金额">
+        </el-table-column>
+        <el-table-column prop="minMoney" label="最低消费">
+        </el-table-column>
+        <!-- <el-table-column prop="needIntegral" label="兑换积分">
+        </el-table-column> -->
+        <el-table-column prop="createTime" label="领取时间">
+        </el-table-column>
+        <el-table-column prop="expirationTime" label="过期时间">
+        </el-table-column>
+        <el-table-column prop="expirationTime" label="状态">
+          <template slot-scope="scope">
+            <span v-if="scope.row.status==0">待使用</span>
+            <span v-else-if="scope.row.status==1">已使用</span>
+            <span v-else-if="scope.row.status==2">已失效</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div style="text-align: center;margin-top: 10px;">
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+          :page-sizes="[10, 20, 30,50,100]" :page-size="limit" :current-page="page" layout="total,sizes, prev, pager, next"
+          :total="tableData.totalCount">
+        </el-pagination>
+      </div>
+    </el-tab-pane>
+  </el-tabs>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+        limit: 10,
+        page: 1,
+        state: '',
+        isTicket: 0,
+        url: '',
+        title: '',
+        type: '',
+        id: '',
+        types: [{
+            value: 'word',
+            label: '文字'
+          },
+          {
+            value: 'url',
+            label: '链接'
+          }
+        ],
+        phone: '',
+        content: '',
+        activeName: 'seventh',
+        tableDataLoading: false,
+        dialogFormVisible1: false,
+        dialogFormVisible2: false,
+        dialogFormVisible: false,
+        tableData: [],
+        typeList:[
+          {
+            value:'',
+            label:'全部'
+          },
+          {
+            value:0,
+            label:'待使用'
+          },
+          {
+            value:1,
+            label:'已使用'
+          },
+          {
+            value:2,
+            label:'已失效'
+          }
+        ],
+        phone:'',
+		shopName:'',
+      }
+    },
+    methods: {
+      // 详情跳转
+      updataDetails(row) {
+        this.$router.push({
+          path: '/userDetail',
+          query: {
+            userId: row.userId
+          }
+        });
+      },
+      handleSizeChange(val) {
+        this.limit = val;
+        this.dataSelect()
+      },
+      handleCurrentChange(val) {
+        this.page = val;
+        this.dataSelect()
+      },
+      handleClick(tab, event) {
+
+        if (tab._props.label == '优惠券列表') {
+          this.page = 1
+          this.limit = 10
+          this.dataSelect()
+        }
+      },
+      // 获取数据列表
+      dataSelect() {
+        this.tableDataLoading = true
+        this.$http({
+          url: this.$http.adornUrl('admin/dataCentre/selectCouponByUserId'),
+          method: 'get',
+          params: this.$http.adornParams({
+            'page':this.page,
+            'limit':this.limit,
+            'userId':'',
+            'status':this.state,
+            'phone':this.phone,
+            'shopFlag':this.isTicket,
+			'shopName':this.shopName
+          })
+        }).then(({
+          data
+        }) => {
+          this.tableDataLoading = false
+          let returnData = data.data;
+          this.tableData = returnData
+        })
+      },
+      animeDat(){
+        this.page = 1
+        this.dataSelect()
+      },
+      cleans(){
+        this.page = 1
+        this.phone = ''
+        this.state = ''
+        this.isTicket=0
+		this.shopName = ''
+        this.dataSelect()
+      }
+    },
+    mounted() {
+      this.dataSelect()
+    }
+  };
+</script>
+
+<style>
+
+</style>

src/views/downLoad/downList.vue

@@ -0,0 +1,352 @@
+<template>
+  <div>
+    <div style="display: inline-block;">
+      <span>状态：</span>
+      <el-select
+        v-model="successFlag"
+        style="width:150px;margin-left: 10px;"
+        @change="select()"
+      >
+        <el-option
+          v-for="item in statesnum2"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option> </el-select
+      >&nbsp;&nbsp;
+      <div style="position: relative;display: inline-block;">
+        <span>订单id：</span>
+        <el-input
+          style="width: 200px;"
+          @keydown.enter.native="select"
+          placeholder="请输入订单编号"
+          v-model="orderId"
+        >
+        </el-input
+        >&nbsp;&nbsp;
+      </div>
+      <div style="position: relative;display: inline-block;">
+        <span>发送商户：</span>
+        <el-input
+          style="width: 200px;"
+          @keydown.enter.native="select"
+          placeholder="请输入发送商户手机号"
+          v-model="fromTo"
+        >
+        </el-input
+        >&nbsp;&nbsp;
+      </div>
+      <div style="position: relative;display: inline-block;">
+        <span>接收人：</span>
+        <el-input
+          style="width: 200px;"
+          @keydown.enter.native="select"
+          placeholder="请输入接收人手机号"
+          v-model="sendTo"
+        >
+        </el-input
+        >&nbsp;&nbsp;
+      </div>
+      <div style="margin:5px;display: inline-block;">
+        <span>开始时间：</span>
+        <el-date-picker
+          style="width: 160px;margin-left: 10px;"
+          v-model="startTime"
+          align="right"
+          type="datetime"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          placeholder="选择开始时间"
+        >
+        </el-date-picker
+        >&nbsp;&nbsp;&nbsp;
+      </div>
+      <div style="margin:5px;display: inline-block;">
+        <span>截止时间：</span>
+        <el-date-picker
+          style="width: 160px;margin-left: 10px;"
+          v-model="endTime"
+          align="right"
+          type="datetime"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          placeholder="选择截止时间"
+        >
+        </el-date-picker>
+      </div>
+      <el-button
+        style="margin-left:15px;"
+        size="mini"
+        type="primary"
+        icon="document"
+        @click="select"
+        >查询
+      </el-button>
+      <el-button
+        style="margin-left:15px;"
+        size="mini"
+        type="primary"
+        icon="document"
+        @click="cleans"
+        >重置
+      </el-button>
+      <!-- <el-button style='margin:0 0 20px 20px;' v-if="isAuth('autonym:tongguo')" size="mini" type="primary"
+				icon="document" @click="passClick()" :disabled="checkBoxData.length <= 0">通过</el-button> -->
+    </div>
+    <el-table v-loading="tableDataLoading" :data="duanxinData.list">
+      <el-table-column fixed prop="complaintId" label="编号" width="80">
+        <template slot-scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="orderId" label="订单id" width="200" align="center">
+      </el-table-column>
+      <el-table-column prop="goodsCover" label="图片" width="150">
+        <template slot-scope="scope">
+          <div
+            v-for="(item, index) in scope.row.imgs"
+            :key="index"
+            style="display: inline-block; margin: 3px;"
+          >
+            <el-popover placement="top-start" title="" trigger="hover">
+              <img
+                style="width: 50px; height: 50px"
+                :src="item"
+                alt=""
+                slot="reference"
+              />
+              <img style="width: 300px; height: auto" :src="item" alt="" />
+            </el-popover>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="successFlag" label="发送状态" width="150">
+        <template slot-scope="scope">
+          <div v-if="scope.row.successFlag == 0">发送失败</div>
+          <div v-if="scope.row.successFlag == 1">发送成功</div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="sendContent"
+        label="短信内容"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="sendResult"
+        label="发送结果"
+        width="120"
+        align="center"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="sendTo"
+        label="接受人"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="sendFromShopName"
+        label="发送商户"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="sendTime"
+        label="发送时间"
+        width="100"
+      ></el-table-column>
+    </el-table>
+    <div style="text-align: center;margin-top: 10px;">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 20, 30, 40]"
+        :page-size="limit"
+        :current-page="page"
+        layout="total,sizes, prev, pager, next,jumper"
+        :total="duanxinData.totalCount"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      limit: 10,
+      page: 1,
+      activeName: "first",
+      tableDataLoading: false,
+      dialogFormVisible: false,
+      tableData: [],
+      checkBoxData: [], //多选框选择的值
+      helpTakeId: "",
+      info: {
+        stockDate: this.getNowTime() //日期
+      },
+      info1: {
+        stockDate1: this.getNowTime1() //日期
+      },
+      info2: {
+        stockDate2: this.getNowTime2() //日期
+      },
+      startTime: "",
+      endTime: "",
+      orderId: "",
+      sendTo: "",
+      fromTo: "",
+      statesnum2: [
+        {
+          label: "全部",
+          value: ""
+        },
+        {
+          label: "发送成功",
+          value: 1
+        },
+        {
+          label: "发送失败",
+          value: 0
+        }
+      ],
+      successFlag: "",
+      duanxinData: []
+      // info: {
+      // 	stockDate: this.getNowTime(), //日期
+      // },
+      // info1: {
+      // 	stockDate1: this.getNowTime1(), //日期
+      // },
+      // info2: {
+      // 	stockDate2: this.getNowTime2(), //日期
+      // },
+    };
+  },
+  watch: {
+  // 监听路由参数的变化
+    '$route.query.indentId': {
+      immediate: true, // 如果需要在组件创建时立即触发，设置为true
+      handler(newVal, oldVal) {
+        // 当路由参数变化时，这里会被调用
+        // 你可以在这里根据新的参数执行你的逻辑
+        console.log(newVal,oldVal);
+        this.orderId = newVal
+        // this.dataSelect();
+      }
+    }
+  },
+  methods: {
+    handleSizeChange(val) {
+      this.limit = val;
+      this.dataSelect();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.dataSelect();
+    },
+    //处理默认选中当前日期
+    getNowTime1() {
+      var now = new Date();
+      var year = now.getFullYear(); //得到年份
+      var month = now.getMonth(); //得到月份
+      var date = now.getDate(); //得到日期
+      var hh = now.getHours() < 10 ? "0" + now.getHours() : now.getHours();
+      var mm =
+        now.getMinutes() < 10 ? "0" + now.getMinutes() : now.getMinutes();
+      var ss =
+        now.getSeconds() < 10 ? "0" + now.getSeconds() : now.getSeconds();
+      month = month + 1;
+      month = month.toString().padStart(2, "0");
+      date = date.toString().padStart(2, "0");
+      var defaultDate = `${year}-${month}-${date} ${hh}:${mm}:${ss}`;
+      return defaultDate;
+      this.$set(this.info, "stockDate", defaultDate);
+    },
+    getNowTime2() {
+      var now = new Date();
+      var year = now.getFullYear(); //得到年份
+      var month = now.getMonth(); //得到月份
+      var date = now.getDate(); //得到日期
+      month = month + 1;
+      month = month.toString().padStart(2, "0");
+      date = date.toString().padStart(2, "0");
+      var defaultDate = `${year}-${month}-${date}`;
+      return defaultDate;
+      this.$set(this.info, "stockDate", defaultDate);
+    },
+    //处理默认选中当前日期
+    getNowTime() {
+      var now = new Date();
+      var year = now.getFullYear(); //得到年份
+      var month = now.getMonth() - now.getMonth(); //得到月份
+      var date = now.getDate() - now.getDate() + 1; //得到日期
+      month = month + 1;
+      month = month.toString().padStart(2, "0");
+      date = date.toString().padStart(2, "0");
+      var defaultDate = `${year}-${month}-${date}`;
+      return defaultDate;
+      this.$set(this.info, "stockDate", defaultDate);
+    },
+    // 查询
+    select() {
+      this.page = 1;
+      this.limit = 10;
+      // this.dataSelect();
+    },
+    // 重置
+    cleans() {
+      this.orderId = "";
+      this.successFlag = "";
+      this.sendTo = "";
+      this.fromTo = "";
+      this.startTime = "";
+      this.endTime = "";
+      this.page = 1;
+      // this.dataSelect();
+    },
+    // 获取派单数据列表
+    dataSelect() {
+      // if (this.endTime == '') {
+      // 	  this.endTime = this.info2.stockDate2
+      //   }
+      //   if (this.startTime == '') {
+      // 	  this.startTime = this.info.stockDate
+      //   }
+      this.tableDataLoading = true;
+      this.$http({
+        url: this.$http.adornUrl("admin/tb-indent-sms/log"),
+        method: "get",
+        params: this.$http.adornParams({
+          page: this.page,
+          limit: this.limit,
+          orderId: this.orderId, //订单id
+          successFlag: this.successFlag, //是否发送成功
+          sendTo: this.sendTo, //接受人
+          fromTo: this.fromTo, //发送骑手
+          startTime: this.startTime, //开始时间
+          endTime: this.endTime, //结束时间
+          sourceType: 2 //1骑手、2商家，默认为1
+        })
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.tableDataLoading = false;
+          for (var i in data.data.list) {
+            if (data.data.list[i].imgs) {
+              data.data.list[i].imgs = data.data.list[i].imgs.split(",");
+            }
+          }
+          let returnData = data.data;
+          this.duanxinData = returnData;
+          console.log(data.data,'商家短信列表');
+        }
+      });
+    }
+  },
+  mounted() {
+    // this.dataSelect();
+  },
+};
+</script>
+
+<style></style>

src/views/main-navbar.vue

@@ -24,6 +24,11 @@
               controls hidden></audio>
           </template>
         </el-menu-item> -->
+        <el-menu-item index="10" style="position: relative;" @click="$router.push({ name: 'downList' })">
+          <template slot="title">
+            <icon-svg name="xiazai2" class="el-icon-setting" style="font-size: 20px;"></icon-svg>
+          </template>
+        </el-menu-item>
         <el-menu-item index="1" style="position: relative;" @click="$router.push({ name: 'vueMchat' })">
           <template slot="title">
             <span class="left-number" v-if="chatNum2">{{chatNum2}}</span>
@@ -126,7 +131,7 @@
               shows = 1
             }
           }
-          console.log('shows', shows)
+          // console.log('shows', shows)
           if (shows == 2) {
             this.show = true
           }
@@ -140,7 +145,6 @@
         }
       })
 
-
     },
     methods: {
       // 修改密码
@@ -233,12 +237,13 @@
           }
           console.log('清空请求', data.data)
         })
-
-
       },
       aplayAudio() {
         const audio = document.getElementById('audio')
-        audio.play()
+        console.log(audio);
+        if(audio){
+          audio.play()
+        }
         console.log('语音提示')
       },
       // 获取店铺数据
@@ -269,7 +274,7 @@
       },
       // 获取聊天消息
       chatSelect() {
-        console.log(this.storeId,'p')
+        // console.log(this.storeId,'p')
         this.$http({
           url: this.$http.adornUrl('chats/count'),
           method: 'get',
@@ -279,7 +284,7 @@
         }).then(({
           data
         }) => {
-          console.log(data,'pcc')
+          // console.log(data,'pcc')
           this.code = data.code
 
           if (data.data > 0) {
@@ -304,12 +309,12 @@
           } else {
             this.isshow = true
           }
-          console.log('this.chatNum2', this.chatNum2)
+          // console.log('this.chatNum2', this.chatNum2)
         })
       },
     },
     created() {
-      console.log('this.show', this.show)
+      // console.log('this.show', this.show)
       // if(this.show==true){
       // setInterval(() => {
       //   this.newsSelect()

src/views/main.vue

@@ -1,91 +1,93 @@
-<template>
-  <div
-    class="site-wrapper"
-    :class="{ 'site-sidebar--fold': sidebarFold }"
-    v-loading.fullscreen.lock="loading"
-    element-loading-text="拼命加载中">
-    <template v-if="!loading">
-      <main-navbar />
-	  <main-sidebar />
-      <div class="site-content__wrapper" :style="{ 'min-height': documentClientHeight + 'px' }">
-        <main-content v-if="!$store.state.common.contentIsNeedRefresh" />
-      </div>
-    </template>
-  </div>
-</template>
-
-<script>
-  import MainNavbar from './main-navbar'
-  import MainSidebar from './main-sidebar'
-  import MainContent from './main-content'
-  export default {
-    provide () {
-      return {
-        // 刷新
-        refresh () {
-          this.$store.commit('common/updateContentIsNeedRefresh', true)
-          this.$nextTick(() => {
-            this.$store.commit('common/updateContentIsNeedRefresh', false)
-          })
-        }
-      }
-    },
-    data () {
-      return {
-        loading: true
-      }
-    },
-    components: {
-      MainNavbar,
-      MainSidebar,
-      MainContent
-    },
-    computed: {
-      documentClientHeight: {
-        get () { return this.$store.state.common.documentClientHeight },
-        set (val) { this.$store.commit('common/updateDocumentClientHeight', val) }
-      },
-      sidebarFold: {
-        get () { return this.$store.state.common.sidebarFold }
-      },
-      userId: {
-        get () { return this.$store.state.user.id },
-        set (val) { this.$store.commit('user/updateId', val) }
-      },
-      userName: {
-        get () { return this.$store.state.user.name },
-        set (val) { this.$store.commit('user/updateName', val) }
-      }
-    },
-    created () {
-      this.getUserInfo()
-    },
-    mounted () {
-      this.resetDocumentClientHeight()
-    },
-    methods: {
-      // 重置窗口可视高度
-      resetDocumentClientHeight () {
-        this.documentClientHeight = document.documentElement['clientHeight']
-        window.onresize = () => {
-          this.documentClientHeight = document.documentElement['clientHeight']
-        }
-      },
-      // 获取当前管理员信息
-      getUserInfo () {
-        this.$http({
-          url: this.$http.adornUrl('sys/user/info'),
-          method: 'get',
-          params: this.$http.adornParams()
-        }).then(({data}) => {
-          if (data && data.code === 0) {
-            this.loading = false
-            this.userId = data.user.userId
-            this.userName = data.user.username
-            this.$cookie.set('userId', data.user.userId)
-          }
-        })
-      }
-    }
-  }
-</script>
+<template>
+  <div
+    class="site-wrapper"
+    :class="{ 'site-sidebar--fold': sidebarFold }"
+    v-loading.fullscreen.lock="loading"
+    element-loading-text="拼命加载中">
+    <template v-if="!loading">
+      <main-navbar />
+	  <main-sidebar />
+      <div class="site-content__wrapper" :style="{ 'min-height': documentClientHeight + 'px' }">
+        <main-content v-if="!$store.state.common.contentIsNeedRefresh" />
+      </div>
+    </template>
+  </div>
+</template>
+
+<script>
+  import MainNavbar from './main-navbar'
+  import MainSidebar from './main-sidebar'
+  import MainContent from './main-content'
+  export default {
+    provide () {
+      return {
+        // 刷新
+        refresh () {
+          this.$store.commit('common/updateContentIsNeedRefresh', true)
+          this.$nextTick(() => {
+            this.$store.commit('common/updateContentIsNeedRefresh', false)
+          })
+        }
+      }
+    },
+    data () {
+      return {
+        loading: true
+      }
+    },
+    components: {
+      MainNavbar,
+      MainSidebar,
+      MainContent
+    },
+    computed: {
+      documentClientHeight: {
+        get () { return this.$store.state.common.documentClientHeight },
+        set (val) { this.$store.commit('common/updateDocumentClientHeight', val) }
+      },
+      sidebarFold: {
+        get () { return this.$store.state.common.sidebarFold }
+      },
+      userId: {
+        get () { return this.$store.state.user.id },
+        set (val) { this.$store.commit('user/updateId', val) }
+      },
+      userName: {
+        get () { return this.$store.state.user.name },
+        set (val) { this.$store.commit('user/updateName', val) }
+      }
+    },
+    created () {
+      this.getUserInfo()
+    },
+    mounted () {
+      this.resetDocumentClientHeight()
+    },
+    methods: {
+      // 重置窗口可视高度
+      resetDocumentClientHeight () {
+        this.documentClientHeight = document.documentElement['clientHeight']
+        console.log(this.documentClientHeight);
+
+        window.onresize = () => {
+          this.documentClientHeight = document.documentElement['clientHeight']
+        }
+      },
+      // 获取当前管理员信息
+      getUserInfo () {
+        this.$http({
+          url: this.$http.adornUrl('sys/user/info'),
+          method: 'get',
+          params: this.$http.adornParams()
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.loading = false
+            this.userId = data.user.userId
+            this.userName = data.user.username
+            this.$cookie.set('userId', data.user.userId)
+          }
+        })
+      }
+    }
+  }
+</script>

src/views/materials/materialsList.vue

@@ -114,7 +114,7 @@
           <span style="width: 200px;display: inline-block;text-align: right;">跳转链接：</span>
           <el-input style="width: 50%;" v-model="articleUrl" placeholder="请输入跳转链接"></el-input>
         </div>
-        <div style="margin-bottom: 10px;p">
+        <div style="margin-bottom: 10px;">
           <span style="width: 200px;display: inline-block;text-align: right;position: relative;top: -65px;">文章内容：</span>
           <el-input style="width: 50%;" type="textarea" rows="4" v-model="content" placeholder="请输入内容"></el-input>
         </div>

src/views/runErrands/duanxinlist.vue

@@ -1,250 +1,263 @@
-<template>
-	<div>
-		<div style="display: inline-block;">
-			<span>状态：</span>
-			<el-select v-model="successFlag" style="width:150px;margin-left: 10px;" @change="select()">
-				<el-option v-for="item in statesnum2" :key="item.value" :label="item.label" :value="item.value">
-				</el-option>
-			</el-select>&nbsp;&nbsp;
-			<div style="position: relative;display: inline-block;">
-				<span>订单id：</span>
-				<el-input style="width: 200px;" @keydown.enter.native="select" placeholder="请输入订单编号" v-model="orderId">
-				</el-input>&nbsp;&nbsp;
-			</div>
-			<div style="position: relative;display: inline-block;">
-				<span>发送骑手：</span>
-				<el-input style="width: 200px;" @keydown.enter.native="select" placeholder="请输入发送骑手姓名" v-model="fromTo">
-				</el-input>&nbsp;&nbsp;
-			</div>
-			<div style="position: relative;display: inline-block;">
-				<span>接收人：</span>
-				<el-input style="width: 200px;" @keydown.enter.native="select" placeholder="请输入接收人姓名" v-model="sendTo">
-				</el-input>&nbsp;&nbsp;
-			</div>
-			<div style="margin:5px;display: inline-block;">
-					<span>开始时间：</span>
-					<el-date-picker style="width: 160px;margin-left: 10px;" v-model="startTime" align="right"
-						type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择开始时间">
-					</el-date-picker>&nbsp;&nbsp;&nbsp;
-				</div>
-				<div style="margin:5px;display: inline-block;">
-					<span>截止时间：</span>
-					<el-date-picker style="width: 160px;margin-left: 10px;" v-model="endTime" align="right"
-						type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择截止时间">
-					</el-date-picker>
-				</div>
-			<el-button style='margin-left:15px;' size="mini" type="primary" icon="document" @click="select">查询
-			</el-button>
-			<el-button style='margin-left:15px;' size="mini" type="primary" icon="document" @click="cleans">重置
-			</el-button>
-			<!-- <el-button style='margin:0 0 20px 20px;' v-if="isAuth('autonym:tongguo')" size="mini" type="primary"
-				icon="document" @click="passClick()" :disabled="checkBoxData.length <= 0">通过</el-button> -->
-		</div>
-		<el-table v-loading="tableDataLoading" :data="duanxinData.list">
-		  <el-table-column fixed prop="complaintId" label="编号" width="80">
-			 <template slot-scope="scope">
-					  <span>{{scope.$index+1}}</span>
-				  </template>
-		  </el-table-column>
-		  <el-table-column prop="orderId" label="订单id" width="200" align="center">
-		  </el-table-column>
-		  <el-table-column prop="goodsCover" label="图片" width="150">
-            <template slot-scope="scope">
-              <div v-for="(item,index) in scope.row.imgs" :key="index"
-                style="display: inline-block; margin: 3px;">
-                <el-popover placement="top-start" title="" trigger="hover">
-                  <img style="width: 50px; height: 50px" :src="item" alt="" slot="reference">
-                  <img style="width: 300px; height: auto" :src="item" alt="">
-                </el-popover>
-              </div>
-            </template>
-          </el-table-column>
-		  <el-table-column prop="successFlag" label="发送状态" width="150">
-			<template slot-scope="scope">
-					  <div v-if="scope.row.successFlag==0">发送失败</div>
-					  <div v-if="scope.row.successFlag==1">发送成功</div>
-				  </template>
-		  </el-table-column>
-		  <el-table-column prop="sendContent" label="短信内容" width="180"></el-table-column>
-		  <el-table-column prop="sendResult" label="发送结果" width="120" align="center">
-		  </el-table-column>
-		  <el-table-column prop="sendTo" label="接受人" width="180"></el-table-column>
-		  <el-table-column prop="sendFromPhone" label="发送骑手" width="180"></el-table-column>
-		  <el-table-column prop="sendTime" label="发送时间" width="100"></el-table-column>
-		</el-table>
-		<div style="text-align: center;margin-top: 10px;">
-			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-				:page-sizes="[10, 20, 30, 40]" :page-size="limit" :current-page="page"
-				layout="total,sizes, prev, pager, next,jumper" :total="duanxinData.totalCount">
-			</el-pagination>
-		</div>
-	</div>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				limit: 10,
-				page: 1,
-				activeName: 'first',
-				tableDataLoading: false,
-				dialogFormVisible: false,
-				tableData: [],
-				checkBoxData: [], //多选框选择的值
-				helpTakeId:'',
-				info: {
-					stockDate: this.getNowTime(), //日期
-				},
-				info1: {
-					stockDate1: this.getNowTime1(), //日期
-				},
-				info2: {
-					stockDate2: this.getNowTime2(), //日期
-				},
-				startTime: '',
-				endTime: '',
-				orderId:'',
-				sendTo:'',
-				fromTo:'',
-				statesnum2: [{
-					label: '全部',
-					value: ''
-					},
-					{
-					label: '发送成功',
-					value: 1
-					},
-					{
-					label: '发送失败',
-					value: 0
-					},
-				],
-				successFlag:'',
-				duanxinData:[],
-				// info: {
-				// 	stockDate: this.getNowTime(), //日期
-				// },
-				// info1: {
-				// 	stockDate1: this.getNowTime1(), //日期
-				// },
-				// info2: {
-				// 	stockDate2: this.getNowTime2(), //日期
-				// },
-			}
-		},
-		methods: {
-			handleSizeChange(val) {
-				this.limit = val;
-				this.dataSelect()
-			},
-			handleCurrentChange(val) {
-				this.page = val;
-				this.dataSelect()
-			},
-			//处理默认选中当前日期
-			getNowTime1() {
-				var now = new Date();
-				var year = now.getFullYear(); //得到年份
-				var month = now.getMonth(); //得到月份
-				var date = now.getDate(); //得到日期
-				var hh = now.getHours() < 10 ? "0" + now.getHours() : now.getHours();
-				var mm = now.getMinutes() < 10 ? "0" + now.getMinutes() : now.getMinutes();
-				var ss = now.getSeconds() < 10 ? "0" + now.getSeconds() : now.getSeconds();
-				month = month + 1;
-				month = month.toString().padStart(2, "0");
-				date = date.toString().padStart(2, "0");
-				var defaultDate = `${year}-${month}-${date} ${hh}:${mm}:${ss}`;
-				return defaultDate;
-				this.$set(this.info, "stockDate", defaultDate);
-			},
-			getNowTime2() {
-				var now = new Date();
-				var year = now.getFullYear(); //得到年份
-				var month = now.getMonth(); //得到月份
-				var date = now.getDate(); //得到日期
-				month = month + 1;
-				month = month.toString().padStart(2, "0");
-				date = date.toString().padStart(2, "0");
-				var defaultDate = `${year}-${month}-${date}`;
-				return defaultDate;
-				this.$set(this.info, "stockDate", defaultDate);
-			},
-			//处理默认选中当前日期
-			getNowTime() {
-				var now = new Date()
-				var year = now.getFullYear() //得到年份
-				var month = now.getMonth() - now.getMonth() //得到月份
-				var date = now.getDate() - now.getDate() + 1 //得到日期
-				month = month + 1
-				month = month.toString().padStart(2, '0')
-				date = date.toString().padStart(2, '0')
-				var defaultDate = `${year}-${month}-${date}`
-				return defaultDate
-				this.$set(this.info, 'stockDate', defaultDate)
-			},
-			// 查询
-			select() {
-				this.page = 1
-				this.limit = 10
-				this.dataSelect()
-			},
-			// 重置
-			cleans() {
-				this.orderId = ''
-				this.successFlag = ''
-				this.sendTo = ''
-				this.fromTo= ''
-				this.startTime = ''
-				this.endTime = ''
-				this.page = 1
-				this.dataSelect()
-			},
-			// 获取派单数据列表
-			dataSelect() {
-				// if (this.endTime == '') {
-				// 	  this.endTime = this.info2.stockDate2
-				//   }
-				//   if (this.startTime == '') {
-				// 	  this.startTime = this.info.stockDate
-				//   }
-				this.tableDataLoading = true
-				this.$http({
-					url: this.$http.adornUrl('admin/tb-indent-sms/log'),
-					method: 'get',
-					params: this.$http.adornParams({
-					'page': this.page,
-					'limit': this.limit,
-					'orderId': this.orderId,//订单id
-					'successFlag': this.successFlag,//是否发送成功
-					'sendTo': this.sendTo,//接受人
-					'fromTo': this.fromTo,//发送骑手
-					'startTime': this.startTime,//开始时间
-					'endTime': this.endTime,//结束时间
-					})
-				}).then(({
-					data
-				}) => {
-					if (data && data.code === 0) {
-					this.tableDataLoading = false
-					for (var i in data.data.list) {
-						if (data.data.list[i].imgs) {
-						data.data.list[i].imgs = data.data.list[i].imgs.split(',')
-						}
-
-					}
-					let returnData = data.data
-					this.duanxinData = returnData
-					}
-				})
-			}
-		},
-		mounted() {
-			this.dataSelect()
-		}
-	};
-</script>
-
-<style>
-
-</style>
+<template>
+	<div>
+		<div style="display: inline-block;">
+			<span>状态：</span>
+			<el-select v-model="successFlag" style="width:150px;margin-left: 10px;" @change="select()">
+				<el-option v-for="item in statesnum2" :key="item.value" :label="item.label" :value="item.value">
+				</el-option>
+			</el-select>&nbsp;&nbsp;
+			<div style="position: relative;display: inline-block;">
+				<span>订单id：</span>
+				<el-input style="width: 200px;" @keydown.enter.native="select" placeholder="请输入订单编号" v-model="orderId">
+				</el-input>&nbsp;&nbsp;
+			</div>
+			<div style="position: relative;display: inline-block;">
+				<span>发送骑手：</span>
+				<el-input style="width: 200px;" @keydown.enter.native="select" placeholder="请输入发送骑手姓名" v-model="fromTo">
+				</el-input>&nbsp;&nbsp;
+			</div>
+			<div style="position: relative;display: inline-block;">
+				<span>接收人：</span>
+				<el-input style="width: 200px;" @keydown.enter.native="select" placeholder="请输入接收人姓名" v-model="sendTo">
+				</el-input>&nbsp;&nbsp;
+			</div>
+			<div style="margin:5px;display: inline-block;">
+					<span>开始时间：</span>
+					<el-date-picker style="width: 160px;margin-left: 10px;" v-model="startTime" align="right"
+						type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择开始时间">
+					</el-date-picker>&nbsp;&nbsp;&nbsp;
+				</div>
+				<div style="margin:5px;display: inline-block;">
+					<span>截止时间：</span>
+					<el-date-picker style="width: 160px;margin-left: 10px;" v-model="endTime" align="right"
+						type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择截止时间">
+					</el-date-picker>
+				</div>
+			<el-button style='margin-left:15px;' size="mini" type="primary" icon="document" @click="select">查询
+			</el-button>
+			<el-button style='margin-left:15px;' size="mini" type="primary" icon="document" @click="cleans">重置
+			</el-button>
+			<!-- <el-button style='margin:0 0 20px 20px;' v-if="isAuth('autonym:tongguo')" size="mini" type="primary"
+				icon="document" @click="passClick()" :disabled="checkBoxData.length <= 0">通过</el-button> -->
+		</div>
+		<el-table v-loading="tableDataLoading" :data="duanxinData.list">
+		  <el-table-column fixed prop="complaintId" label="编号" width="80">
+			 <template slot-scope="scope">
+					  <span>{{scope.$index+1}}</span>
+				  </template>
+		  </el-table-column>
+		  <el-table-column prop="orderId" label="订单id" width="200" align="center">
+		  </el-table-column>
+		  <el-table-column prop="goodsCover" label="图片" width="150">
+            <template slot-scope="scope">
+              <div v-for="(item,index) in scope.row.imgs" :key="index"
+                style="display: inline-block; margin: 3px;">
+                <el-popover placement="top-start" title="" trigger="hover">
+                  <img style="width: 50px; height: 50px" :src="item" alt="" slot="reference">
+                  <img style="width: 300px; height: auto" :src="item" alt="">
+                </el-popover>
+              </div>
+            </template>
+          </el-table-column>
+		  <el-table-column prop="successFlag" label="发送状态" width="150">
+			<template slot-scope="scope">
+					  <div v-if="scope.row.successFlag==0">发送失败</div>
+					  <div v-if="scope.row.successFlag==1">发送成功</div>
+				  </template>
+		  </el-table-column>
+		  <el-table-column prop="sendContent" label="短信内容" width="180"></el-table-column>
+		  <el-table-column prop="sendResult" label="发送结果" width="120" align="center">
+		  </el-table-column>
+		  <el-table-column prop="sendTo" label="接受人" width="180"></el-table-column>
+		  <el-table-column prop="sendFromPhone" label="发送骑手" width="180"></el-table-column>
+		  <el-table-column prop="sendTime" label="发送时间" width="100"></el-table-column>
+		</el-table>
+		<div style="text-align: center;margin-top: 10px;">
+			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+				:page-sizes="[10, 20, 30, 40]" :page-size="limit" :current-page="page"
+				layout="total,sizes, prev, pager, next,jumper" :total="duanxinData.totalCount">
+			</el-pagination>
+		</div>
+	</div>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				limit: 10,
+				page: 1,
+				activeName: 'first',
+				tableDataLoading: false,
+				dialogFormVisible: false,
+				tableData: [],
+				checkBoxData: [], //多选框选择的值
+				helpTakeId:'',
+				info: {
+					stockDate: this.getNowTime(), //日期
+				},
+				info1: {
+					stockDate1: this.getNowTime1(), //日期
+				},
+				info2: {
+					stockDate2: this.getNowTime2(), //日期
+				},
+				startTime: '',
+				endTime: '',
+				orderId:'',
+				sendTo:'',
+				fromTo:'',
+				statesnum2: [{
+					label: '全部',
+					value: ''
+					},
+					{
+					label: '发送成功',
+					value: 1
+					},
+					{
+					label: '发送失败',
+					value: 0
+					},
+				],
+				successFlag:'',
+				duanxinData:[],
+				// info: {
+				// 	stockDate: this.getNowTime(), //日期
+				// },
+				// info1: {
+				// 	stockDate1: this.getNowTime1(), //日期
+				// },
+				// info2: {
+				// 	stockDate2: this.getNowTime2(), //日期
+				// },
+			}
+		},
+    watch: {
+    // 监听路由参数的变化
+      '$route.query.indentId': {
+        immediate: true, // 如果需要在组件创建时立即触发，设置为true
+        handler(newVal, oldVal) {
+          // 当路由参数变化时，这里会被调用
+          // 你可以在这里根据新的参数执行你的逻辑
+          console.log(newVal,oldVal);
+          this.orderId = newVal
+          this.dataSelect()
+        }
+      }
+    },
+		methods: {
+			handleSizeChange(val) {
+				this.limit = val;
+				this.dataSelect()
+			},
+			handleCurrentChange(val) {
+				this.page = val;
+				this.dataSelect()
+			},
+			//处理默认选中当前日期
+			getNowTime1() {
+				var now = new Date();
+				var year = now.getFullYear(); //得到年份
+				var month = now.getMonth(); //得到月份
+				var date = now.getDate(); //得到日期
+				var hh = now.getHours() < 10 ? "0" + now.getHours() : now.getHours();
+				var mm = now.getMinutes() < 10 ? "0" + now.getMinutes() : now.getMinutes();
+				var ss = now.getSeconds() < 10 ? "0" + now.getSeconds() : now.getSeconds();
+				month = month + 1;
+				month = month.toString().padStart(2, "0");
+				date = date.toString().padStart(2, "0");
+				var defaultDate = `${year}-${month}-${date} ${hh}:${mm}:${ss}`;
+				return defaultDate;
+				this.$set(this.info, "stockDate", defaultDate);
+			},
+			getNowTime2() {
+				var now = new Date();
+				var year = now.getFullYear(); //得到年份
+				var month = now.getMonth(); //得到月份
+				var date = now.getDate(); //得到日期
+				month = month + 1;
+				month = month.toString().padStart(2, "0");
+				date = date.toString().padStart(2, "0");
+				var defaultDate = `${year}-${month}-${date}`;
+				return defaultDate;
+				this.$set(this.info, "stockDate", defaultDate);
+			},
+			//处理默认选中当前日期
+			getNowTime() {
+				var now = new Date()
+				var year = now.getFullYear() //得到年份
+				var month = now.getMonth() - now.getMonth() //得到月份
+				var date = now.getDate() - now.getDate() + 1 //得到日期
+				month = month + 1
+				month = month.toString().padStart(2, '0')
+				date = date.toString().padStart(2, '0')
+				var defaultDate = `${year}-${month}-${date}`
+				return defaultDate
+				this.$set(this.info, 'stockDate', defaultDate)
+			},
+			// 查询
+			select() {
+				this.page = 1
+				this.limit = 10
+				this.dataSelect()
+			},
+			// 重置
+			cleans() {
+				this.orderId = ''
+				this.successFlag = ''
+				this.sendTo = ''
+				this.fromTo= ''
+				this.startTime = ''
+				this.endTime = ''
+				this.page = 1
+				this.dataSelect()
+			},
+			// 获取派单数据列表
+			dataSelect() {
+				// if (this.endTime == '') {
+				// 	  this.endTime = this.info2.stockDate2
+				//   }
+				//   if (this.startTime == '') {
+				// 	  this.startTime = this.info.stockDate
+				//   }
+				this.tableDataLoading = true
+				this.$http({
+					url: this.$http.adornUrl('admin/tb-indent-sms/log'),
+					method: 'get',
+					params: this.$http.adornParams({
+					'page': this.page,
+					'limit': this.limit,
+					'orderId': this.orderId,//订单id
+					'successFlag': this.successFlag,//是否发送成功
+					'sendTo': this.sendTo,//接受人
+					'fromTo': this.fromTo,//发送骑手
+					'startTime': this.startTime,//开始时间
+					'endTime': this.endTime,//结束时间
+					})
+				}).then(({
+					data
+				}) => {
+					if (data && data.code === 0) {
+					this.tableDataLoading = false
+					for (var i in data.data.list) {
+						if (data.data.list[i].imgs) {
+						data.data.list[i].imgs = data.data.list[i].imgs.split(',')
+						}
+
+					}
+					let returnData = data.data
+					this.duanxinData = returnData
+					}
+				})
+			}
+		},
+		mounted() {
+			this.dataSelect()
+		},
+	};
+</script>
+
+<style>
+
+</style>

src/views/shopManagement/duanxinlist.vue

@@ -1,251 +1,352 @@
 <template>
-	<div>
-		<div style="display: inline-block;">
-			<span>状态：</span>
-			<el-select v-model="successFlag" style="width:150px;margin-left: 10px;" @change="select()">
-				<el-option v-for="item in statesnum2" :key="item.value" :label="item.label" :value="item.value">
-				</el-option>
-			</el-select>&nbsp;&nbsp;
-			<div style="position: relative;display: inline-block;">
-				<span>订单id：</span>
-				<el-input style="width: 200px;" @keydown.enter.native="select" placeholder="请输入订单编号" v-model="orderId">
-				</el-input>&nbsp;&nbsp;
-			</div>
-			<div style="position: relative;display: inline-block;">
-				<span>发送商户：</span>
-				<el-input style="width: 200px;" @keydown.enter.native="select" placeholder="请输入发送商户手机号" v-model="fromTo">
-				</el-input>&nbsp;&nbsp;
-			</div>
-			<div style="position: relative;display: inline-block;">
-				<span>接收人：</span>
-				<el-input style="width: 200px;" @keydown.enter.native="select" placeholder="请输入接收人手机号" v-model="sendTo">
-				</el-input>&nbsp;&nbsp;
-			</div>
-			<div style="margin:5px;display: inline-block;">
-					<span>开始时间：</span>
-					<el-date-picker style="width: 160px;margin-left: 10px;" v-model="startTime" align="right"
-						type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择开始时间">
-					</el-date-picker>&nbsp;&nbsp;&nbsp;
-				</div>
-				<div style="margin:5px;display: inline-block;">
-					<span>截止时间：</span>
-					<el-date-picker style="width: 160px;margin-left: 10px;" v-model="endTime" align="right"
-						type="datetime" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择截止时间">
-					</el-date-picker>
-				</div>
-			<el-button style='margin-left:15px;' size="mini" type="primary" icon="document" @click="select">查询
-			</el-button>
-			<el-button style='margin-left:15px;' size="mini" type="primary" icon="document" @click="cleans">重置
-			</el-button>
-			<!-- <el-button style='margin:0 0 20px 20px;' v-if="isAuth('autonym:tongguo')" size="mini" type="primary"
+  <div>
+    <div style="display: inline-block;">
+      <span>状态：</span>
+      <el-select
+        v-model="successFlag"
+        style="width:150px;margin-left: 10px;"
+        @change="select()"
+      >
+        <el-option
+          v-for="item in statesnum2"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option> </el-select
+      >&nbsp;&nbsp;
+      <div style="position: relative;display: inline-block;">
+        <span>订单id：</span>
+        <el-input
+          style="width: 200px;"
+          @keydown.enter.native="select"
+          placeholder="请输入订单编号"
+          v-model="orderId"
+        >
+        </el-input
+        >&nbsp;&nbsp;
+      </div>
+      <div style="position: relative;display: inline-block;">
+        <span>发送商户：</span>
+        <el-input
+          style="width: 200px;"
+          @keydown.enter.native="select"
+          placeholder="请输入发送商户手机号"
+          v-model="fromTo"
+        >
+        </el-input
+        >&nbsp;&nbsp;
+      </div>
+      <div style="position: relative;display: inline-block;">
+        <span>接收人：</span>
+        <el-input
+          style="width: 200px;"
+          @keydown.enter.native="select"
+          placeholder="请输入接收人手机号"
+          v-model="sendTo"
+        >
+        </el-input
+        >&nbsp;&nbsp;
+      </div>
+      <div style="margin:5px;display: inline-block;">
+        <span>开始时间：</span>
+        <el-date-picker
+          style="width: 160px;margin-left: 10px;"
+          v-model="startTime"
+          align="right"
+          type="datetime"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          placeholder="选择开始时间"
+        >
+        </el-date-picker
+        >&nbsp;&nbsp;&nbsp;
+      </div>
+      <div style="margin:5px;display: inline-block;">
+        <span>截止时间：</span>
+        <el-date-picker
+          style="width: 160px;margin-left: 10px;"
+          v-model="endTime"
+          align="right"
+          type="datetime"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          placeholder="选择截止时间"
+        >
+        </el-date-picker>
+      </div>
+      <el-button
+        style="margin-left:15px;"
+        size="mini"
+        type="primary"
+        icon="document"
+        @click="select"
+        >查询
+      </el-button>
+      <el-button
+        style="margin-left:15px;"
+        size="mini"
+        type="primary"
+        icon="document"
+        @click="cleans"
+        >重置
+      </el-button>
+      <!-- <el-button style='margin:0 0 20px 20px;' v-if="isAuth('autonym:tongguo')" size="mini" type="primary"
 				icon="document" @click="passClick()" :disabled="checkBoxData.length <= 0">通过</el-button> -->
-		</div>
-		<el-table v-loading="tableDataLoading" :data="duanxinData.list">
-		  <el-table-column fixed prop="complaintId" label="编号" width="80">
-			 <template slot-scope="scope">
-					  <span>{{scope.$index+1}}</span>
-				  </template>
-		  </el-table-column>
-		  <el-table-column prop="orderId" label="订单id" width="200" align="center">
-		  </el-table-column>
-		  <el-table-column prop="goodsCover" label="图片" width="150">
-            <template slot-scope="scope">
-              <div v-for="(item,index) in scope.row.imgs" :key="index"
-                style="display: inline-block; margin: 3px;">
-                <el-popover placement="top-start" title="" trigger="hover">
-                  <img style="width: 50px; height: 50px" :src="item" alt="" slot="reference">
-                  <img style="width: 300px; height: auto" :src="item" alt="">
-                </el-popover>
-              </div>
-            </template>
-          </el-table-column>
-		  <el-table-column prop="successFlag" label="发送状态" width="150">
-			<template slot-scope="scope">
-					  <div v-if="scope.row.successFlag==0">发送失败</div>
-					  <div v-if="scope.row.successFlag==1">发送成功</div>
-				  </template>
-		  </el-table-column>
-		  <el-table-column prop="sendContent" label="短信内容" width="180"></el-table-column>
-		  <el-table-column prop="sendResult" label="发送结果" width="120" align="center">
-		  </el-table-column>
-		  <el-table-column prop="sendTo" label="接受人" width="180"></el-table-column>
-		  <el-table-column prop="sendFromShopName" label="发送商户" width="180"></el-table-column>
-		  <el-table-column prop="sendTime" label="发送时间" width="100"></el-table-column>
-		</el-table>
-		<div style="text-align: center;margin-top: 10px;">
-			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-				:page-sizes="[10, 20, 30, 40]" :page-size="limit" :current-page="page"
-				layout="total,sizes, prev, pager, next,jumper" :total="duanxinData.totalCount">
-			</el-pagination>
-		</div>
-	</div>
+    </div>
+    <el-table v-loading="tableDataLoading" :data="duanxinData.list">
+      <el-table-column fixed prop="complaintId" label="编号" width="80">
+        <template slot-scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="orderId" label="订单id" width="200" align="center">
+      </el-table-column>
+      <el-table-column prop="goodsCover" label="图片" width="150">
+        <template slot-scope="scope">
+          <div
+            v-for="(item, index) in scope.row.imgs"
+            :key="index"
+            style="display: inline-block; margin: 3px;"
+          >
+            <el-popover placement="top-start" title="" trigger="hover">
+              <img
+                style="width: 50px; height: 50px"
+                :src="item"
+                alt=""
+                slot="reference"
+              />
+              <img style="width: 300px; height: auto" :src="item" alt="" />
+            </el-popover>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="successFlag" label="发送状态" width="150">
+        <template slot-scope="scope">
+          <div v-if="scope.row.successFlag == 0">发送失败</div>
+          <div v-if="scope.row.successFlag == 1">发送成功</div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="sendContent"
+        label="短信内容"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="sendResult"
+        label="发送结果"
+        width="120"
+        align="center"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="sendTo"
+        label="接受人"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="sendFromShopName"
+        label="发送商户"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="sendTime"
+        label="发送时间"
+        width="100"
+      ></el-table-column>
+    </el-table>
+    <div style="text-align: center;margin-top: 10px;">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 20, 30, 40]"
+        :page-size="limit"
+        :current-page="page"
+        layout="total,sizes, prev, pager, next,jumper"
+        :total="duanxinData.totalCount"
+      >
+      </el-pagination>
+    </div>
+  </div>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				limit: 10,
-				page: 1,
-				activeName: 'first',
-				tableDataLoading: false,
-				dialogFormVisible: false,
-				tableData: [],
-				checkBoxData: [], //多选框选择的值
-				helpTakeId:'',
-				info: {
-					stockDate: this.getNowTime(), //日期
-				},
-				info1: {
-					stockDate1: this.getNowTime1(), //日期
-				},
-				info2: {
-					stockDate2: this.getNowTime2(), //日期
-				},
-				startTime: '',
-				endTime: '',
-				orderId:'',
-				sendTo:'',
-				fromTo:'',
-				statesnum2: [{
-					label: '全部',
-					value: ''
-					},
-					{
-					label: '发送成功',
-					value: 1
-					},
-					{
-					label: '发送失败',
-					value: 0
-					},
-				],
-				successFlag:'',
-				duanxinData:[],
-				// info: {
-				// 	stockDate: this.getNowTime(), //日期
-				// },
-				// info1: {
-				// 	stockDate1: this.getNowTime1(), //日期
-				// },
-				// info2: {
-				// 	stockDate2: this.getNowTime2(), //日期
-				// },
-			}
-		},
-		methods: {
-			handleSizeChange(val) {
-				this.limit = val;
-				this.dataSelect()
-			},
-			handleCurrentChange(val) {
-				this.page = val;
-				this.dataSelect()
-			},
-			//处理默认选中当前日期
-			getNowTime1() {
-				var now = new Date();
-				var year = now.getFullYear(); //得到年份
-				var month = now.getMonth(); //得到月份
-				var date = now.getDate(); //得到日期
-				var hh = now.getHours() < 10 ? "0" + now.getHours() : now.getHours();
-				var mm = now.getMinutes() < 10 ? "0" + now.getMinutes() : now.getMinutes();
-				var ss = now.getSeconds() < 10 ? "0" + now.getSeconds() : now.getSeconds();
-				month = month + 1;
-				month = month.toString().padStart(2, "0");
-				date = date.toString().padStart(2, "0");
-				var defaultDate = `${year}-${month}-${date} ${hh}:${mm}:${ss}`;
-				return defaultDate;
-				this.$set(this.info, "stockDate", defaultDate);
-			},
-			getNowTime2() {
-				var now = new Date();
-				var year = now.getFullYear(); //得到年份
-				var month = now.getMonth(); //得到月份
-				var date = now.getDate(); //得到日期
-				month = month + 1;
-				month = month.toString().padStart(2, "0");
-				date = date.toString().padStart(2, "0");
-				var defaultDate = `${year}-${month}-${date}`;
-				return defaultDate;
-				this.$set(this.info, "stockDate", defaultDate);
-			},
-			//处理默认选中当前日期
-			getNowTime() {
-				var now = new Date()
-				var year = now.getFullYear() //得到年份
-				var month = now.getMonth() - now.getMonth() //得到月份
-				var date = now.getDate() - now.getDate() + 1 //得到日期
-				month = month + 1
-				month = month.toString().padStart(2, '0')
-				date = date.toString().padStart(2, '0')
-				var defaultDate = `${year}-${month}-${date}`
-				return defaultDate
-				this.$set(this.info, 'stockDate', defaultDate)
-			},
-			// 查询
-			select() {
-				this.page = 1
-				this.limit = 10
-				this.dataSelect()
-			},
-			// 重置
-			cleans() {
-				this.orderId = ''
-				this.successFlag = ''
-				this.sendTo = ''
-				this.fromTo= ''
-				this.startTime = ''
-				this.endTime = ''
-				this.page = 1
-				this.dataSelect()
-			},
-			// 获取派单数据列表
-			dataSelect() {
-				// if (this.endTime == '') {
-				// 	  this.endTime = this.info2.stockDate2
-				//   }
-				//   if (this.startTime == '') {
-				// 	  this.startTime = this.info.stockDate
-				//   }
-				this.tableDataLoading = true
-				this.$http({
-					url: this.$http.adornUrl('admin/tb-indent-sms/log'),
-					method: 'get',
-					params: this.$http.adornParams({
-					'page': this.page,
-					'limit': this.limit,
-					'orderId': this.orderId,//订单id
-					'successFlag': this.successFlag,//是否发送成功
-					'sendTo': this.sendTo,//接受人
-					'fromTo': this.fromTo,//发送骑手
-					'startTime': this.startTime,//开始时间
-					'endTime': this.endTime,//结束时间
-          'sourceType':2//1骑手、2商家，默认为1
-					})
-				}).then(({
-					data
-				}) => {
-					if (data && data.code === 0) {
-					this.tableDataLoading = false
-					for (var i in data.data.list) {
-						if (data.data.list[i].imgs) {
-						data.data.list[i].imgs = data.data.list[i].imgs.split(',')
-						}
-
-					}
-					let returnData = data.data
-					this.duanxinData = returnData
-					}
-				})
-			}
-		},
-		mounted() {
-			this.dataSelect()
-		}
-	};
+export default {
+  data() {
+    return {
+      limit: 10,
+      page: 1,
+      activeName: "first",
+      tableDataLoading: false,
+      dialogFormVisible: false,
+      tableData: [],
+      checkBoxData: [], //多选框选择的值
+      helpTakeId: "",
+      info: {
+        stockDate: this.getNowTime() //日期
+      },
+      info1: {
+        stockDate1: this.getNowTime1() //日期
+      },
+      info2: {
+        stockDate2: this.getNowTime2() //日期
+      },
+      startTime: "",
+      endTime: "",
+      orderId: "",
+      sendTo: "",
+      fromTo: "",
+      statesnum2: [
+        {
+          label: "全部",
+          value: ""
+        },
+        {
+          label: "发送成功",
+          value: 1
+        },
+        {
+          label: "发送失败",
+          value: 0
+        }
+      ],
+      successFlag: "",
+      duanxinData: []
+      // info: {
+      // 	stockDate: this.getNowTime(), //日期
+      // },
+      // info1: {
+      // 	stockDate1: this.getNowTime1(), //日期
+      // },
+      // info2: {
+      // 	stockDate2: this.getNowTime2(), //日期
+      // },
+    };
+  },
+  watch: {
+  // 监听路由参数的变化
+    '$route.query.indentId': {
+      immediate: true, // 如果需要在组件创建时立即触发，设置为true
+      handler(newVal, oldVal) {
+        // 当路由参数变化时，这里会被调用
+        // 你可以在这里根据新的参数执行你的逻辑
+        console.log(newVal,oldVal);
+        this.orderId = newVal
+        this.dataSelect();
+      }
+    }
+  },
+  methods: {
+    handleSizeChange(val) {
+      this.limit = val;
+      this.dataSelect();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.dataSelect();
+    },
+    //处理默认选中当前日期
+    getNowTime1() {
+      var now = new Date();
+      var year = now.getFullYear(); //得到年份
+      var month = now.getMonth(); //得到月份
+      var date = now.getDate(); //得到日期
+      var hh = now.getHours() < 10 ? "0" + now.getHours() : now.getHours();
+      var mm =
+        now.getMinutes() < 10 ? "0" + now.getMinutes() : now.getMinutes();
+      var ss =
+        now.getSeconds() < 10 ? "0" + now.getSeconds() : now.getSeconds();
+      month = month + 1;
+      month = month.toString().padStart(2, "0");
+      date = date.toString().padStart(2, "0");
+      var defaultDate = `${year}-${month}-${date} ${hh}:${mm}:${ss}`;
+      return defaultDate;
+      this.$set(this.info, "stockDate", defaultDate);
+    },
+    getNowTime2() {
+      var now = new Date();
+      var year = now.getFullYear(); //得到年份
+      var month = now.getMonth(); //得到月份
+      var date = now.getDate(); //得到日期
+      month = month + 1;
+      month = month.toString().padStart(2, "0");
+      date = date.toString().padStart(2, "0");
+      var defaultDate = `${year}-${month}-${date}`;
+      return defaultDate;
+      this.$set(this.info, "stockDate", defaultDate);
+    },
+    //处理默认选中当前日期
+    getNowTime() {
+      var now = new Date();
+      var year = now.getFullYear(); //得到年份
+      var month = now.getMonth() - now.getMonth(); //得到月份
+      var date = now.getDate() - now.getDate() + 1; //得到日期
+      month = month + 1;
+      month = month.toString().padStart(2, "0");
+      date = date.toString().padStart(2, "0");
+      var defaultDate = `${year}-${month}-${date}`;
+      return defaultDate;
+      this.$set(this.info, "stockDate", defaultDate);
+    },
+    // 查询
+    select() {
+      this.page = 1;
+      this.limit = 10;
+      this.dataSelect();
+    },
+    // 重置
+    cleans() {
+      this.orderId = "";
+      this.successFlag = "";
+      this.sendTo = "";
+      this.fromTo = "";
+      this.startTime = "";
+      this.endTime = "";
+      this.page = 1;
+      this.dataSelect();
+    },
+    // 获取派单数据列表
+    dataSelect() {
+      // if (this.endTime == '') {
+      // 	  this.endTime = this.info2.stockDate2
+      //   }
+      //   if (this.startTime == '') {
+      // 	  this.startTime = this.info.stockDate
+      //   }
+      this.tableDataLoading = true;
+      this.$http({
+        url: this.$http.adornUrl("admin/tb-indent-sms/log"),
+        method: "get",
+        params: this.$http.adornParams({
+          page: this.page,
+          limit: this.limit,
+          orderId: this.orderId, //订单id
+          successFlag: this.successFlag, //是否发送成功
+          sendTo: this.sendTo, //接受人
+          fromTo: this.fromTo, //发送骑手
+          startTime: this.startTime, //开始时间
+          endTime: this.endTime, //结束时间
+          sourceType: 2 //1骑手、2商家，默认为1
+        })
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.tableDataLoading = false;
+          for (var i in data.data.list) {
+            if (data.data.list[i].imgs) {
+              data.data.list[i].imgs = data.data.list[i].imgs.split(",");
+            }
+          }
+          let returnData = data.data;
+          this.duanxinData = returnData;
+          console.log(data.data,'商家短信列表');
+        }
+      });
+    }
+  },
+  mounted() {
+    this.dataSelect();
+  },
+};
 </script>
 
-<style>
-
-</style>
+<style></style>

src/views/shopsList/shopAdmin.vue

@@ -143,7 +143,7 @@
             <span style="color: #4f9dec;cursor: pointer;" v-if="scope.row.status === 1 ">下架</span>
           </template> -->
           </el-table-column>
-          </el-table-column>
+          <!-- </el-table-column> -->
           <el-table-column prop="createTime" label="创建时间" width="160">
           </el-table-column>
           <el-table-column fixed="right" label="操作" width="180">

src/views/shopsList/shopsList.vue

@@ -309,7 +309,7 @@
               >修改密码
             </el-button>
             <el-button
-            :disabled="!isAuth('shopsList:delete')"
+            :disabled="!isAuth('shopsList:update')"
               size="mini"
               type="primary"
               @click="shopsListOrder(scope.row)"
@@ -326,7 +326,7 @@
               >修改信息
             </el-button>
             <el-button
-              :disabled="!isAuth('shopsList:delete')"
+            :disabled="!isAuth('shopsList:update')"
               size="mini"
               type="primary"
               @click="shopsListSr(scope.row)"
@@ -334,7 +334,7 @@
               >收入统计
             </el-button>
             <el-button
-            :disabled="!isAuth('shopsList:delete')"
+            :disabled="!isAuth('shopsList:update')"
               size="mini"
               type="primary"
               @click="shopsListQb(scope.row)"
@@ -342,7 +342,7 @@
               >商铺钱包
             </el-button>
             <el-button
-            :disabled="!isAuth('shopsList:delete')"
+            :disabled="!isAuth('shopsList:update')"
               size="mini"
               type="primary"
               @click="shopsListBzj(scope.row)"
@@ -358,7 +358,7 @@
               >评价明细
             </el-button>
             <el-button
-            :disabled="!isAuth('shopsList:delete')"
+            :disabled="!isAuth('shopsList:update')"
               size="mini"
               type="primary"
               @click="shopsListYhq(scope.row)"

src/views/taskConfig/taskConfig.vue

@@ -1,163 +1,163 @@
-<template>
-	<div>
-		<el-table
-				v-loading="tableDataLoading"
-				:data="renwuData">
-				<el-table-column
-				  fixed
-					prop="type"
-				  label="编号"
-				  align="center"
-				  width="80">
-				</el-table-column>
-				<el-table-column
-				  prop="min"
-				  label="类型">
-				</el-table-column>
-				<el-table-column
-				  prop="value"
-				  label="内容"
-				  width="500">
-				</el-table-column>
-				<el-table-column
-					prop="createAt"
-					label="创建时间">
-				</el-table-column>
-				<el-table-column
-					label="操作"
-					prop="id"
-					width="120">
-					<template slot-scope="scope">
-						<el-button
-						  size="mini"
-						  type="primary"
-							:disabled="!isAuth('allocationList:update')"
-						  @click="renwuAmend(scope.$index, scope.row)">编辑
-						</el-button>
-					</template>
-				</el-table-column>
-			</el-table>
-		</el-tab-pane>
-		<!-- 修改任务弹框 -->
-		<el-dialog title="修改" :visible.sync="dialogFormVisible1" center>
-			<el-form :model="form1">
-			  <el-form-item label="配置类型：" :label-width="formLabelWidth" >
-				<el-input v-model="form1.min" style="width:65%;" readonly ></el-input>
-			  </el-form-item>
-			  <el-form-item label="内容：" :label-width="formLabelWidth" >
-				<el-input v-model="form1.value" style="width:65%;"></el-input>
-			  </el-form-item>
-			</el-form>
-		  <div slot="footer" class="dialog-footer">
-			<el-button @click="dialogFormVisible1 = false">取 消</el-button>
-			<el-button type="primary" @click="renwuNoticeTo()">确 定</el-button>
-		  </div>
-		</el-dialog>
-	</div>
-</template>
-
-<script>
-    export default {
-        data() {
-            return {
-				page:1,
-				limit:10,
-				state:1,
-				openValue:1,
-				closeValue:2,
-				classify:1,
-				money:'',
-				condition:'renwu',
-				activeName: 'first',
-				dialogFormVisible:false,
-                tableDataLoading: true,
-				dialogFormVisible1:false,
-				formLabelWidth:'200px',
-                tableData: [],
-				renwuData:[],
-				form:{
-					id:'',
-					rate:''
-				},
-				form1:{
-					id:'',
-					min:'',
-					value:'',
-					type:'',
-				},
-            }
-        },
-        methods: {
-            handleSizeChange(val) {
-                this.limit = val;
-                this.dataSelect();
-            },
-            handleCurrentChange(val) {
-                this.page = val;
-                this.dataSelect();
-            },
-			// 修改任务弹框
-			renwuAmend(index,rows){
-				this.dialogFormVisible1=true;
-				this.form1.id = rows.id;
-				this.form1.type = rows.type
-				this.form1.min = rows.min;
-				this.form1.value = rows.value;
-				this.form1.max = rows.max;
-				this.form1.createAt = rows.createAt;
-				this.form1.conditionFrom = rows.conditionFrom
-			},
-			// 修改任务
-			renwuNoticeTo(){
-				this.$http({
-				  url: this.$http.adornUrl('common/update'),
-				  method: 'post',
-				  data: this.$http.adornData({
-					'id':this.form1.id,
-				   'type': this.form1.type,
-					'value': this.form1.value,
-					'min':this.form1.min,
-					'max': this.form1.max,
-					'createAt':this.form1.createAt,
-					'conditionFrom':this.form1.conditionFrom
-				  })
-				}).then(({data}) => {
-				  if (data && data.code === 0) {
-					this.dialogFormVisible1 = false
-				    this.$message({
-				      message: '操作成功',
-				      type: 'success',
-				      duration: 1500,
-				      onClose: () => {
-				        this.dataSelect()
-				      }
-				    })
-				  } else {
-				    this.$message.error(data.msg)
-				  }
-				})
-			},
-			dataSelect(){
-				this.tableDataLoading = true
-				this.$http({
-				  url: this.$http.adornUrl(`common/type/condition/${this.condition}`),
-				  method: 'get',
-				  params: this.$http.adornParams({
-				  })
-				}).then(({data}) => {
-				  if (data && data.code === 0) {
-					this.tableDataLoading = false
-					let returnData = data.data;
-					this.renwuData = returnData
-				  }
-				})
-			}
-        },
-        mounted() {
-			 this.dataSelect() 
-        }
-    }
-</script>
-
-<style>
-</style>
+<template>
+	<div>
+		<el-table
+				v-loading="tableDataLoading"
+				:data="renwuData">
+				<el-table-column
+				  fixed
+					prop="type"
+				  label="编号"
+				  align="center"
+				  width="80">
+				</el-table-column>
+				<el-table-column
+				  prop="min"
+				  label="类型">
+				</el-table-column>
+				<el-table-column
+				  prop="value"
+				  label="内容"
+				  width="500">
+				</el-table-column>
+				<el-table-column
+					prop="createAt"
+					label="创建时间">
+				</el-table-column>
+				<el-table-column
+					label="操作"
+					prop="id"
+					width="120">
+					<template slot-scope="scope">
+						<el-button
+						  size="mini"
+						  type="primary"
+							:disabled="!isAuth('allocationList:update')"
+						  @click="renwuAmend(scope.$index, scope.row)">编辑
+						</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+		<!-- </el-tab-pane> -->
+		<!-- 修改任务弹框 -->
+		<el-dialog title="修改" :visible.sync="dialogFormVisible1" center>
+			<el-form :model="form1">
+			  <el-form-item label="配置类型：" :label-width="formLabelWidth" >
+				<el-input v-model="form1.min" style="width:65%;" readonly ></el-input>
+			  </el-form-item>
+			  <el-form-item label="内容：" :label-width="formLabelWidth" >
+				<el-input v-model="form1.value" style="width:65%;"></el-input>
+			  </el-form-item>
+			</el-form>
+		  <div slot="footer" class="dialog-footer">
+			<el-button @click="dialogFormVisible1 = false">取 消</el-button>
+			<el-button type="primary" @click="renwuNoticeTo()">确 定</el-button>
+		  </div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+				page:1,
+				limit:10,
+				state:1,
+				openValue:1,
+				closeValue:2,
+				classify:1,
+				money:'',
+				condition:'renwu',
+				activeName: 'first',
+				dialogFormVisible:false,
+                tableDataLoading: true,
+				dialogFormVisible1:false,
+				formLabelWidth:'200px',
+                tableData: [],
+				renwuData:[],
+				form:{
+					id:'',
+					rate:''
+				},
+				form1:{
+					id:'',
+					min:'',
+					value:'',
+					type:'',
+				},
+            }
+        },
+        methods: {
+            handleSizeChange(val) {
+                this.limit = val;
+                this.dataSelect();
+            },
+            handleCurrentChange(val) {
+                this.page = val;
+                this.dataSelect();
+            },
+			// 修改任务弹框
+			renwuAmend(index,rows){
+				this.dialogFormVisible1=true;
+				this.form1.id = rows.id;
+				this.form1.type = rows.type
+				this.form1.min = rows.min;
+				this.form1.value = rows.value;
+				this.form1.max = rows.max;
+				this.form1.createAt = rows.createAt;
+				this.form1.conditionFrom = rows.conditionFrom
+			},
+			// 修改任务
+			renwuNoticeTo(){
+				this.$http({
+				  url: this.$http.adornUrl('common/update'),
+				  method: 'post',
+				  data: this.$http.adornData({
+					'id':this.form1.id,
+				   'type': this.form1.type,
+					'value': this.form1.value,
+					'min':this.form1.min,
+					'max': this.form1.max,
+					'createAt':this.form1.createAt,
+					'conditionFrom':this.form1.conditionFrom
+				  })
+				}).then(({data}) => {
+				  if (data && data.code === 0) {
+					this.dialogFormVisible1 = false
+				    this.$message({
+				      message: '操作成功',
+				      type: 'success',
+				      duration: 1500,
+				      onClose: () => {
+				        this.dataSelect()
+				      }
+				    })
+				  } else {
+				    this.$message.error(data.msg)
+				  }
+				})
+			},
+			dataSelect(){
+				this.tableDataLoading = true
+				this.$http({
+				  url: this.$http.adornUrl(`common/type/condition/${this.condition}`),
+				  method: 'get',
+				  params: this.$http.adornParams({
+				  })
+				}).then(({data}) => {
+				  if (data && data.code === 0) {
+					this.tableDataLoading = false
+					let returnData = data.data;
+					this.renwuData = returnData
+				  }
+				})
+			}
+        },
+        mounted() {
+			 this.dataSelect()
+        }
+    }
+</script>
+
+<style>
+</style>

src/views/user/userDetail.vue

@@ -432,6 +432,13 @@
               <div>{{scope.row.orderType==1?'到店取餐':'外卖配送'}}</div>
             </template>
           </el-table-column>
+          <el-table-column prop="orderTypeExtra" label="配送类型">
+            <template slot-scope="scope">
+              <div v-if="scope.row.orderTypeExtra==1">上门</div>
+              <div v-if="scope.row.orderTypeExtra==2">骑手配送</div>
+              <div v-if="scope.row.orderTypeExtra==3">商家配送</div>
+            </template>
+          </el-table-column>
           <el-table-column prop="content" label="内容" width="300">
             <template slot-scope="scope">
               <div>
@@ -631,7 +638,7 @@
       		</el-button> -->
         </div>
         <el-table v-loading="tableDataLoading" :data="fadanData.list">
-          <el-table-column fixed prop="indentId" label="编号" width="80" fixed="left">
+          <el-table-column  prop="indentId" label="编号" width="80" fixed="left">
           </el-table-column>
           <el-table-column prop="indentType" label="任务类型" width="200">
           	<template slot-scope="scope">
@@ -779,7 +786,7 @@
         </div>
         <el-table v-loading="tableDataLoading" :data="userDataJ.list">
 
-          <el-table-column fixed prop="id" label="编号" width="80" fixed="left">
+          <el-table-column  prop="id" label="编号" width="80" fixed="left">
             <template slot-scope="scope">
               <div>{{scope.$index +1}}</div>
             </template>
@@ -980,7 +987,7 @@
           </el-row>
         </div>
         <el-table v-loading="tableDataLoading" :data="tableData3.list">
-          <el-table-column fixed prop="indentId" label="编号" width="80" fixed="left">
+          <el-table-column  prop="indentId" label="编号" width="80" fixed="left">
             <!-- <template slot-scope="scope">
       				<div>{{scope.$index +1}}</div>
       			</template> -->
@@ -1350,7 +1357,7 @@
         </div>
         <div style="margin-bottom: 10px;">
           <span style="width: 200px;display: inline-block;text-align: right;">金额：</span>
-          <el-input style="width:50%;" v-model="money" type="number" :min="0" :max="100" :controls="false"
+          <el-input style="width:50%;" v-model.number="money" @input="validateNumber" type="number" :min="0" :max="100" :controls="false"
             placeholder="请输入金额"></el-input>
         </div>
         <div slot="footer" class="dialog-footer">
@@ -1395,7 +1402,6 @@
           <el-cascader style="width:45%" size="large" :options="options" ref="cascaderAddr" v-model="storeAddress"
             :placeholder="storeAddre" @change="handleChange55" :value="storeAddre">
           </el-cascader>
-          </el-input>
         </div>
         <div style="margin-bottom: 10px;">
           <span style="width: 200px;display: inline-block;text-align: right;">详细地址：</span>
@@ -1634,6 +1640,14 @@
       }
     },
     methods: {
+      validateNumber(event) {
+        // 使用正则表达式来判断输入是否为数字
+        const regex = /^[0-9]*$/;
+        if (!regex.test(event.target.value)) {
+          // 如果不是数字，则将输入值重置为上一个值
+          this.money = event.target.value.slice(0, -1);
+        }
+      },
       // 返回上一级
       prev() {
         this.$router.back()
@@ -2231,7 +2245,9 @@
         }).then(({
           data
         }) => {
+          console.log(data);
           if (data.code === 0) {
+
             let returnData = data.data
             this.tablenum = returnData
             this.tablemoney = returnData
@@ -2462,6 +2478,8 @@
 
 
           }
+          console.log(this.takeData.list);
+
         })
       },
       // 我的优惠券

src/views/user/userDetail1.vue

@@ -631,7 +631,7 @@
       		</el-button> -->
         </div>
         <el-table v-loading="tableDataLoading" :data="fadanData.list">
-          <el-table-column fixed prop="indentId" label="编号" width="80" fixed="left">
+          <el-table-column prop="indentId" label="编号" width="80" fixed="left">
           </el-table-column>
           <el-table-column prop="indentType" label="任务类型" width="200">
           	<template slot-scope="scope">
@@ -779,7 +779,7 @@
         </div>
         <el-table v-loading="tableDataLoading" :data="userDataJ.list">
 
-          <el-table-column fixed prop="id" label="编号" width="80" fixed="left">
+          <el-table-column prop="id" label="编号" width="80" fixed="left">
             <template slot-scope="scope">
               <div>{{scope.$index +1}}</div>
             </template>
@@ -980,7 +980,7 @@
           </el-row>
         </div>
         <el-table v-loading="tableDataLoading" :data="tableData3.list">
-          <el-table-column fixed prop="indentId" label="编号" width="80" fixed="left">
+          <el-table-column prop="indentId" label="编号" width="80" fixed="left">
             <!-- <template slot-scope="scope">
       				<div>{{scope.$index +1}}</div>
       			</template> -->
@@ -1395,7 +1395,6 @@
           <el-cascader style="width:45%" size="large" :options="options" ref="cascaderAddr" v-model="storeAddress"
             :placeholder="storeAddre" @change="handleChange55" :value="storeAddre">
           </el-cascader>
-          </el-input>
         </div>
         <div style="margin-bottom: 10px;">
           <span style="width: 200px;display: inline-block;text-align: right;">详细地址：</span>