充值记录

src/router/index.js

@@ -74,6 +74,12 @@ const mainRoutes = {
       meta: { title: "消息中心", isTab: true }
     },
     {
+      path: "/recharge",
+      component: _import("recharge/recharge"),
+      name: "recharge",
+      meta: { title: "充值记录", isTab: true }
+    },
+    {
       path: "/downList",
       component: _import("downLoad/downList"),
       name: "downList",
@@ -521,6 +527,7 @@ const router = new Router({
 router.beforeEach((to, from, next) => {
   let userId = Vue.cookie.get("userId");
   let menuList = sessionStorage.getItem("menuList");
+
   // 添加动态(菜单)路由
   // 1. 已经添加 or 全局路由, 直接访问
   // 2. 获取菜单列表, 添加并保存本地存储
@@ -533,6 +540,8 @@ router.beforeEach((to, from, next) => {
       params: http.adornParams()
     })
       .then(({ data }) => {
+        // console.log(data);
+
         if (data && data.code === 0) {
           fnAddDynamicMenuRoutes(data.menuList);
           router.options.isAddDynamicMenuRoutes = true;
@@ -574,6 +583,8 @@ router.beforeEach((to, from, next) => {
     })
       .then(({ data }) => {
         if (data && data.code === 0) {
+          console.log(data);
+
           fnAddDynamicMenuRoutes(data.menuList);
           router.options.isAddDynamicMenuRoutes = true;
           sessionStorage.setItem(
@@ -627,7 +638,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);

src/views/downLoad/downList.vue

@@ -14,40 +14,7 @@
           :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
@@ -91,69 +58,43 @@
         @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">
+      <el-table-column fixed prop="complaintId" label="编号" width="100">
         <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 prop="orderId" label="任务名称" 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 prop="successFlag" label="导出时间" align="center">
       </el-table-column>
       <el-table-column
         prop="sendContent"
-        label="短信内容"
-        width="180"
+        label="导出id"
+        align="center"
       ></el-table-column>
       <el-table-column
         prop="sendResult"
-        label="发送结果"
-        width="120"
+        label="导出条件"
         align="center"
       >
       </el-table-column>
       <el-table-column
         prop="sendTo"
-        label="接受人"
-        width="180"
+        label="文件大小"
+        align="center"
       ></el-table-column>
       <el-table-column
         prop="sendFromShopName"
-        label="发送商户"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="sendTime"
-        label="发送时间"
-        width="100"
+        label="状态"
+        align="center"
       ></el-table-column>
+      <el-table-column label="操作" width="150" align="center">
+        <template slot-scope="scope">
+          <span>下载</span>
+        </template>
+      </el-table-column>
     </el-table>
     <div style="text-align: center;margin-top: 10px;">
       <el-pagination
@@ -223,19 +164,6 @@ export default {
       // },
     };
   },
-  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;

src/views/main-navbar.vue

@@ -26,7 +26,7 @@
         </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>
+            <icon-svg name="xiazai" class="el-icon-setting" style="font-size: 22px;"></icon-svg>
           </template>
         </el-menu-item>
         <el-menu-item index="1" style="position: relative;" @click="$router.push({ name: 'vueMchat' })">

src/views/recharge/recharge.vue

@@ -0,0 +1,280 @@
+<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
+      >
+      <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>
+    </div>
+    <el-table v-loading="tableDataLoading" :data="duanxinData.list">
+      <el-table-column fixed prop="complaintId" label="编号" width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="orderId" label="任务名称" align="center">
+      </el-table-column>
+      <el-table-column prop="successFlag" label="导出时间" align="center">
+      </el-table-column>
+      <el-table-column
+        prop="sendContent"
+        label="导出id"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="sendResult"
+        label="导出条件"
+        align="center"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="sendTo"
+        label="文件大小"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        prop="sendFromShopName"
+        label="状态"
+        align="center"
+      ></el-table-column>
+      <el-table-column label="操作" width="150" align="center">
+        <template slot-scope="scope">
+          <span>下载</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, 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;
+          console.log(data.data,'商家短信列表');
+        }
+      });
+    }
+  },
+  mounted() {
+    // this.dataSelect();
+  },
+};
+</script>
+
+<style></style>

src/views/shopsList/shopsList.vue

@@ -249,6 +249,20 @@
             ></el-input-number>
           </template>
         </el-table-column>
+        <el-table-column label="是否供货商" width="120">
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.isSupplier"
+              @change="changeTj(scope.row)"
+              :disabled="!isAuth('userList:updateMoney')"
+              :active-value="0"
+              :inactive-value="1"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+            >
+            </el-switch>
+          </template>
+        </el-table-column>
         <el-table-column label="店铺二维码" width="100">
           <template slot-scope="scope">
             <el-button
@@ -1915,6 +1929,7 @@ export default {
       datas.userId = this.shopUserId;
       datas.phone = this.shopPhone;
 
+      // datas.isSupplier=1; // 是否为供货商
       datas.shopTypeId = this.shopType;
       datas.shopLable = this.labels.toString();
       datas.bannedFlag = this.bannedFlag;
@@ -3294,7 +3309,8 @@ export default {
         method: "post",
         data: this.$http.adornData({
           isRecommend: row.isRecommend,
-          shopId: row.shopId
+          shopId: row.shopId,
+          isSupplier:row.isSupplier
         })
       }).then(({ data }) => {
         if (data.code == 0) {

src/views/user/userDetail.vue

@@ -48,8 +48,9 @@
                   <th>余额</th>
                   <td style="color: rgb(245, 108, 108)">
                     {{ tablemoney.money ? `${tablemoney.money}元` : '0元' }}
+                    <!-- :disabled="!isAuth('userList:updateMoney')" -->
                     <el-button size="mini" type="danger" style="color: #4f9dec;background: #fff;border: none;"
-                      :disabled="!isAuth('userList:updateMoney')" @click="rechargenone(tableData.userId,1)">修改余额
+                       @click="rechargenone(tableData.userId,1)">修改余额
                     </el-button>
                   </td>
                   <th>本月提现金额</th>
@@ -1357,8 +1358,9 @@
         </div>
         <div style="margin-bottom: 10px;">
           <span style="width: 200px;display: inline-block;text-align: right;">金额：</span>
-          <el-input style="width:50%;" v-model.number="money" @input="validateNumber" type="number" :min="0" :max="100" :controls="false"
-            placeholder="请输入金额"></el-input>
+          <!-- type="number"  :min="0" :max="100" :controls="false" -->
+          <el-input style="width:50%;" v-model="money"
+            placeholder="请输入金额" @change="moneyChange"></el-input>
         </div>
         <div slot="footer" class="dialog-footer">
           <el-button @click="dialogFormVisible1 = false">取 消</el-button>
@@ -1637,15 +1639,25 @@
         },
 				pinglunsData:{},
 				campus:'',
+        homeData1:'',
       }
     },
     methods: {
-      validateNumber(event) {
-        // 使用正则表达式来判断输入是否为数字
-        const regex = /^[0-9]*$/;
-        if (!regex.test(event.target.value)) {
-          // 如果不是数字，则将输入值重置为上一个值
-          this.money = event.target.value.slice(0, -1);
+      moneyChange(val){
+        console.log(val);
+        let reg=/^(([1-9]\d*)|\d)(\.\d{1,2})?$/
+        if(val==''){
+
+        }
+        else if(reg.test(val)){
+
+        }else{
+          // this.$message({
+          //   message: "输入金额有误，请重新输入",
+          //   type: "warning",
+          //   duration: 1500
+          // });
+          this.money=''
         }
       },
       // 返回上一级
@@ -2096,7 +2108,7 @@
           this.$notify({
             title: '提示',
             duration: 1800,
-            message: '请输入金额',
+            message: '请输入正确金额',
             type: 'warning'
           })
           return