Home Explore Help
Register Sign In
gyfl
/
merchant
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

商家区分两个后台

dujingxian 4 years ago
parent
074ff81d33
commit
2a5eca925e
17 changed files with 328 additions and 88 deletions
Unified View Show Diff Stats
  1. 2 1
      public/index.html
  2. BIN
      public/linzhu.ico
  3. 0 0
      public/yezi.ico
  4. 13 0
      src/api/index.js
  5. 21 12
      src/pages/index.vue
  6. 4 3
      src/pages/login.vue
  7. 7 11
      src/pages/subPages/balance.vue
  8. 16 9
      src/pages/subPages/home.vue
  9. 172 0
      src/pages/subPages/interfaceDoc_linzhu.vue
  10. 0 0
      src/pages/subPages/interfaceDoc_yezi.vue
  11. 36 2
      src/pages/subPages/message.vue
  12. 31 21
      src/pages/subPages/order.vue
  13. 0 20
      src/pages/subPages/reconciliation.vue
  14. 3 2
      src/router/index.js
  15. 1 0
      src/utils/flexible.js
  16. 18 6
      src/utils/userInfo.js
  17. 4 1
      vue.config.js

+ 2 - 1
public/index.html
View File 

@@ -4,7 +4,8 @@
 
     <meta charset="utf-8">

     <meta charset="utf-8">

     <meta http-equiv="X-UA-Compatible" content="IE=edge">

     <meta http-equiv="X-UA-Compatible" content="IE=edge">

     <!-- <meta name="viewport" content="width=device-width,initial-scale=1.0"> -->

     <!-- <meta name="viewport" content="width=device-width,initial-scale=1.0"> -->

-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">

+    <!-- <link rel="icon" href="<%= BASE_URL %>favicon.ico"> -->

+    <link rel="icon" href="<%= htmlWebpackPlugin.options.faviconPath %>">

     <title><%= htmlWebpackPlugin.options.title %></title>

     <title><%= htmlWebpackPlugin.options.title %></title>

   </head>

   </head>

   <body>

   <body>

BIN
public/linzhu.ico
View File


public/favicon.ico → public/yezi.ico
View File


+ 13 - 0
src/api/index.js
View File 

@@ -269,6 +269,19 @@ export const queryMovingAccount = (params) => {
 
         timeout: 120000,

         timeout: 120000,

     })

     })

 }

 }

+// 导出日志 

+export const exportMovingAccount = (params) => {

+    return axios({

+        method: 'post',

+        url: `${Prefix}act=merchant_info&op=pdlogexport&client_type=ajax&page=50`,

+        withCredentials: true,

+        headers: {

+            "Content-Type": "application/x-www-form-urlencoded"

+          },

+        data: params,

+        timeout: 120000,

+    })

+}

 

 

 // 设置密钥

 // 设置密钥

 // export const updateKey = (secure_key) => {

 // export const updateKey = (secure_key) => {

+ 21 - 12
src/pages/index.vue
View File 

@@ -1,13 +1,13 @@
 
 <template>

 <template>

 <el-container>

 <el-container>

-    <el-header style="background-color:#545c64">

+    <el-header :style="{backgroundColor:userInfo.indexColor}">

         <el-row type="flex" style="height:100%;" justify="space-between" align="middle">

         <el-row type="flex" style="height:100%;" justify="space-between" align="middle">

             <div style="color:#fff">

             <div style="color:#fff">

-                <span class="title" style="font-size: 18px">{{UserInfo.name}}后台管理系统</span>

+                <span class="title" style="font-size: 18px">{{userInfo.name}}后台管理系统</span>

             </div>

             </div>

             <div>

             <div>

                 <el-dropdown @command="onUserEdit">

                 <el-dropdown @command="onUserEdit">

-                    <span class="el-dropdown-link">

+                    <span :style="{color:userInfo.dropdownColor}">

                         <i class="el-icon-user" style="margin-right: 10px"></i>管理员

                         <i class="el-icon-user" style="margin-right: 10px"></i>管理员

                         <i class="el-icon-arrow-down el-icon--right"></i>

                         <i class="el-icon-arrow-down el-icon--right"></i>

                     </span>

                     </span>

@@ -22,7 +22,7 @@
 
     <!-- border: 1px solid #ccc -->

     <!-- border: 1px solid #ccc -->

     <el-container style="height: 100%; ">

     <el-container style="height: 100%; ">

         <el-aside width="240px">

         <el-aside width="240px">

-            <el-menu router class="el-menu" background-color="#545c64" text-color="#fff" active-text-color="#ffd04b" :default-active="curPath">

+            <el-menu router class="el-menu" :background-color="userInfo.indexColor" text-color="#fff" active-text-color="#ffd04b" :default-active="curPath">

                 <el-menu-item index="home" route="/">

                 <el-menu-item index="home" route="/">

                     <i class="el-icon-house"></i>

                     <i class="el-icon-house"></i>

                     <span style="font-size: 19px;" slot="title">首页</span>

                     <span style="font-size: 19px;" slot="title">首页</span>

@@ -55,10 +55,18 @@
 
                     <i class="el-icon-s-platform"></i>

                     <i class="el-icon-s-platform"></i>

                     <span style="font-size: 19px;" slot="title">设置</span>

                     <span style="font-size: 19px;" slot="title">设置</span>

                 </el-menu-item>

                 </el-menu-item>

-                <el-menu-item index="interfaceDoc" route="interfaceDoc" >

-                    <i class="el-icon-document"></i>

-                    <span style="font-size: 19px;" slot="title">接口文档</span>

-                </el-menu-item>

+                <template v-if="userInfo.name==='椰子充值'">

+                    <el-menu-item index="interfaceDoc" route="interfaceDoc" >

+                        <i class="el-icon-document"></i>

+                        <span style="font-size: 19px;" slot="title">接口文档</span>

+                    </el-menu-item>

+                </template>

+                <template v-else>

+                    <el-menu-item index="interfaceDoc" route="interfaceDoc" >

+                        <i class="el-icon-document"></i>

+                        <span style="font-size: 19px;" slot="title">接口文档</span>

+                    </el-menu-item>

+                </template>

             </el-menu>

             </el-menu>

         </el-aside>

         </el-aside>

         <el-main class="el-menu" style="min-width:860px;">

         <el-main class="el-menu" style="min-width:860px;">

@@ -89,7 +97,8 @@ import {
 
 } from "@/api";

 } from "@/api";

 import { removeUser } from '@/utils/auth'

 import { removeUser } from '@/utils/auth'

 // 商家区分

 // 商家区分

-import UserInfo from '@/utils/userInfo'

+// import UserInfo from '@/utils/userInfo'

+const userInfo = require('@/utils/userInfo')

 export default {

 export default {

     name: 'homePage',

     name: 'homePage',

     created() {

     created() {

@@ -115,7 +124,7 @@ export default {
 
                     trigger: "blur",

                     trigger: "blur",

                 }, ],

                 }, ],

             },

             },

-            UserInfo

+            userInfo

         };

         };

     },

     },

     methods: {

     methods: {

@@ -245,7 +254,7 @@ export default {
 
 /deep/.el-aside {

 /deep/.el-aside {

     width: 200px;

     width: 200px;

 }

 }

-.el-dropdown-link {

+/* .el-dropdown-link {

     color: #409eff;

     color: #409eff;

-}

+} */

 </style>

 </style>

+ 4 - 3
src/pages/login.vue
View File 

@@ -5,7 +5,7 @@
 
       <el-card style="width:400px;height:300px;" shadow="always">

       <el-card style="width:400px;height:300px;" shadow="always">

         <div slot="header" class="clearfix">

         <div slot="header" class="clearfix">

           <!-- <span style="font-size: 18px">欢迎使用椰子充值后台管理系统</span> -->

           <!-- <span style="font-size: 18px">欢迎使用椰子充值后台管理系统</span> -->

-          <span style="font-size: 18px">欢迎使用{{UserInfo.name}}后台管理系统</span>

+          <span style="font-size: 18px">欢迎使用{{userInfo.name}}后台管理系统</span>

         </div>

         </div>

         <el-row type="flex" justify="center">

         <el-row type="flex" justify="center">

           <div class="login_container">

           <div class="login_container">

@@ -40,7 +40,8 @@
 
 // import LoginBg from "@/assets/login.jpg";

 // import LoginBg from "@/assets/login.jpg";

 const LoginBg = require('../assets/login.jpg');

 const LoginBg = require('../assets/login.jpg');

 // 商家区分

 // 商家区分

-import UserInfo from '@/utils/userInfo'

+// import userInfo from '@/utils/userInfo'

+const userInfo = require('@/utils/userInfo')

 import { login } from "@/api";

 import { login } from "@/api";

 import { setUser } from '@/utils/auth'

 import { setUser } from '@/utils/auth'

 export default {

 export default {

@@ -48,7 +49,7 @@ export default {
 
   data() {

   data() {

     return {

     return {

       LoginBg,

       LoginBg,

-      UserInfo,

+      userInfo,

       ruleForm: {

       ruleForm: {

         name: "",

         name: "",

         pwd: "",

         pwd: "",

+ 7 - 11
src/pages/subPages/balance.vue
View File 

@@ -5,13 +5,13 @@
 
         <el-col :span="10">
 
         <el-col :span="10">
 
             <el-form >
 
             <el-form >
 
                 <el-form-item label="银行账号：">
 
                 <el-form-item label="银行账号：">
 
-                    11001079900053013913
 
+                    {{userInfo.bankAccount}}
 
                 </el-form-item>
 
                 </el-form-item>
 
                 <el-form-item label="开户银行：">
 
                 <el-form-item label="开户银行：">
 
-                    中国建设银行北京清华园支行
 
+                    {{userInfo.bankDeposit}}
 
                 </el-form-item>
 
                 </el-form-item>
 
                 <el-form-item label="开户名：">
 
                 <el-form-item label="开户名：">
 
-                    北京国研方略信息科学研究院
 
+                    {{userInfo.AccountName}}
 
                 </el-form-item>
 
                 </el-form-item>
 
                 <el-form-item label="备注：">
 
                 <el-form-item label="备注：">
 
                     代收款/代付款
 
                     代收款/代付款
 
@@ -50,7 +50,6 @@
 
 </el-card>
 
 </el-card>
 
 <el-card>
 
 <el-card>
 
 <el-container direction="vertical">
 
 <el-container direction="vertical">
 
-    <!-- <el-header height="40px" style="border-bottom: 1px solid #eee">余额充值</el-header> -->
 
     <div style="margin-bottom:20px;">
 
     <div style="margin-bottom:20px;">
 
         <el-date-picker v-model="dataRange" :clearable="false" value-format="timestamp" format="yyyy-MM-dd" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width:260px;"></el-date-picker>
 
         <el-date-picker v-model="dataRange" :clearable="false" value-format="timestamp" format="yyyy-MM-dd" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width:260px;"></el-date-picker>
 
         <el-button style="margin-left:10px;" type="primary" @click="onSearch" :loading="searchLoading">查询</el-button>
 
         <el-button style="margin-left:10px;" type="primary" @click="onSearch" :loading="searchLoading">查询</el-button>
 
@@ -85,7 +84,6 @@
 
 
 
     <!-- 查看弹层 -->
 
     <!-- 查看弹层 -->
 
     <el-dialog title="充值凭证" :visible.sync="seeDialogVisible" width="20%" class="seeDialog">
 
     <el-dialog title="充值凭证" :visible.sync="seeDialogVisible" width="20%" class="seeDialog">
 
-        <!-- display: flex;align-items: center;margin: auto; -->
 
         <el-image 
         <el-image 
             style="width: 200px;height:200px;"
 
             style="width: 200px;height:200px;"
 
             :src="url" 
             :src="url" 
@@ -155,7 +153,7 @@
 
 <script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.js"></script>
 
 <script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.js"></script>
 
 <script>
 
 <script>
 
 // getVoucherList-获取充值列表 updateVoucher-上传凭证 queryVoucherList-查询充值 updateVoucherList-上传凭证列表
 
 // getVoucherList-获取充值列表 updateVoucher-上传凭证 queryVoucherList-查询充值 updateVoucherList-上传凭证列表
 
-// getUserInfo-用户信息（余额预警） onSubUser-设置余额预警 addwphone-添加预警电话
 
+// getUserInfo-用户信息（余额预警
 
 import {
 
 import {
 
     // balanceList,
 
     // balanceList,
 
     getVoucherList,
 
     getVoucherList,
 
@@ -163,10 +161,10 @@ import {
 
     queryVoucherList,
 
     queryVoucherList,
 
     updateVoucherList,
 
     updateVoucherList,
 
     getUserInfo,
 
     getUserInfo,
 
-    onSubUser,
 
-    // addwphone
 
 } from "@/api";
 
 } from "@/api";
 
 import { balanceType } from '@/utils/constants'
 
 import { balanceType } from '@/utils/constants'
 
+// 商家区分
 
+const userInfo = require('@/utils/userInfo')
 
 export default {
 
 export default {
 
     name: 'balance',
 
     name: 'balance',
 
     data() {
 
     data() {
 
@@ -197,6 +195,7 @@ export default {
 
             }
 
             }
 
         };
 
         };
 
         return {
 
         return {
 
+            userInfo,
 
             tableData: [
 
             tableData: [
 
                 // {id: 1, money: '100', recharge_code: ''},
 
                 // {id: 1, money: '100', recharge_code: ''},
 
                 // {id: 2, money: '100', recharge_code: ''},
 
                 // {id: 2, money: '100', recharge_code: ''},
 
@@ -580,9 +579,6 @@ export default {
 
 .seeDialog /deep/.el-dialog__body {
 
 .seeDialog /deep/.el-dialog__body {
 
     text-align: center;
 
     text-align: center;
 
 }
 
 }
 
-/* .avatar-uploader {
 
-    text-align: center;
 
-} */
 
 .avatar-uploader /deep/.el-upload {
 
 .avatar-uploader /deep/.el-upload {
 
   border: 1px dashed hsl(0, 0%, 85%);
 
   border: 1px dashed hsl(0, 0%, 85%);
 
   border-radius: 6px;
 
   border-radius: 6px;

+ 16 - 9
src/pages/subPages/home.vue
View File 

@@ -1,12 +1,8 @@
 
 <template>
 
 <template>
 
   <div class="box">
 
   <div class="box">
 
-    <!-- <div class="header"> -->
 
       <div class="head">
 
       <div class="head">
 
         <div class="headLeft">
 
         <div class="headLeft">
 
-          <!-- <div class="title">
 
-            您好，欢迎登陆椰子充值后台管理系统！
 
-          </div> -->
 
-          <div class="merchants">
 
+          <div class="merchants" :class="[userInfo.name==='椰子充值' ? 'yezi_merchant' : 'linzhu_merchant']">
 
             <img src="../../assets/home-user@2x.png" alt="" style="">
 
             <img src="../../assets/home-user@2x.png" alt="" style="">
 
             商户名称:<span>{{merchantData.company_name}}</span>
 
             商户名称:<span>{{merchantData.company_name}}</span>
 
             商户号:<span>{{merchantData.mchid}}</span>
 
             商户号:<span>{{merchantData.mchid}}</span>
 
@@ -33,7 +29,7 @@
 
       <div class="center">
 
       <div class="center">
 
         <div class="centerLeft">
 
         <div class="centerLeft">
 
           <div class="todayOrder">
 
           <div class="todayOrder">
 
-            <table>
 
+            <table :class="[userInfo.name==='椰子充值' ? 'yezi_table' : 'linzhu_table']">
 
               <tr>
 
               <tr>
 
                 <th style="color:#666">单位（元）</th>
 
                 <th style="color:#666">单位（元）</th>
 
                 <th>今日</th>
 
                 <th>今日</th>
 
@@ -61,7 +57,7 @@
 
             </table>
 
             </table>
 
           </div>
 
           </div>
 
           <div class="todayOrder">
 
           <div class="todayOrder">
 
-            <table>
 
+            <table :class="[userInfo.name==='椰子充值' ? 'yezi_table' : 'linzhu_table']">
 
               <tr>
 
               <tr>
 
                 <th style="color:#666">单位（个）</th>
 
                 <th style="color:#666">单位（个）</th>
 
                 <th>今日</th>
 
                 <th>今日</th>
 
@@ -126,6 +122,8 @@ require('echarts/lib/chart/bar');
 
 // 引入提示框和标题组件
 
 // 引入提示框和标题组件
 
 require('echarts/lib/component/tooltip');
 
 require('echarts/lib/component/tooltip');
 
 require('echarts/lib/component/title');
 
 require('echarts/lib/component/title');
 
+// 商家区分
 
+const userInfo = require('@/utils/userInfo')
 
 export default {
 
 export default {
 
   name: 'homeMain',
 
   name: 'homeMain',
 
   data() {
 
   data() {
 
@@ -164,7 +162,8 @@ export default {
 
         amountCount: '',
 
         amountCount: '',
 
         errorAmounts: '',
 
         errorAmounts: '',
 
         successAmounts: ''
 
         successAmounts: ''
 
-      }
 
+      },
 
+      userInfo
 
     }
 
     }
 
   },
 
   },
 
   created() {
 
   created() {
 
@@ -334,8 +333,13 @@ export default {
 
 }
 
 }
 
 .merchants span {
 
 .merchants span {
 
   margin: 0 20px;
 
   margin: 0 20px;
 
+}
 
+.yezi_merchant span {
 
   color: #4B8AF2;
 
   color: #4B8AF2;
 
 }
 
 }
 
+.linzhu_merchant span {
 
+  color: #002033;
 
+}
 
 .merchants span:nth-child(2) {
 
 .merchants span:nth-child(2) {
 
   margin-right: 50px;
 
   margin-right: 50px;
 
 }
 
 }
 
@@ -415,9 +419,12 @@ export default {
 
 table {
 
 table {
 
   width: 100%;
 
   width: 100%;
 
 }
 
 }
 
-table tr td:nth-child(n+2) {
 
+.yezi_table tr td:nth-child(n+2) {
 
   color: #4B8AF2;
 
   color: #4B8AF2;
 
 }
 
 }
 
+.linzhu_table tr td:nth-child(n+2) {
 
+  color: #002033;
 
+}
 
 tr {
 
 tr {
 
   line-height: 30px;
 
   line-height: 30px;
 
 }
 
 }

+ 172 - 0
src/pages/subPages/interfaceDoc_linzhu.vue
View File 

@@ -0,0 +1,172 @@
 
+<template>
 
+  <div class="interfaceDoc">
 
+    <el-card>
 
+      <h1 style="font-size: 18px;">接 口 规 范</h1>
 
+      <h4>查询网址：</h4>
 
+      <p>
 
+        登录帐号和密码: 由提服务商提供
 
+      </p>
 
+      <p>接口地址: 联系服务商</p>
 
+      <p>参数传递方式: 采用http 网页get方式提交 UTF8编码</p><br/>
 
+      <h4>提交充值号码充值：</h4>
 
+      <pre>
 
+        入参数：
 
+            act —— lzrefill 固定参数
 
+            op —— add_mob  固定参数
 
+            usr —— 用户名
 
+            ord —— 本次交易的订单号 三天内不得重复，30位以内
 
+            mob —— 被充值手机号码
 
+            amt —— 本次充值金额，单位 元
 
+            tim —— 订单提交时间。固定格式为“YYYYMMDDHHMMSS” 年月日时分秒。 
+            notifyurl —— 充值业务回调地址
 
+            sgn —— 交易签名。 MD5(usr+ord+mob+amt+tim+key)转大写 key为密钥 
+        示例：key= 1993754181DDA6E8A1878EF3AAA97BC6
 
+        加密字符串：001ets1231328888888820201607061200001993754181DDA6E8A1878EF3AAA97BC6
 
+        提交字符串：act=lzrefill&op=add_mob&usr=001&ord=ets123&mob=13288888888&amt=20&tim=20160706120000&sgn=1891957542D35801B20F490412B9D9AA   
+        接口地址：https://www.lzkj168.cn/racc/index.php
 
+        接口描述：用户根据这个函数提交需要充值的手机号码 
+        函数返回结果：
 
+            0 —— 订单提交成功
 
+            2 —— 运营商充值账户余额不足
 
+            4 —— 账户余额不足 
+            6 —— 暂不支持此商品
 
+            7 —— 连接该运营商设备失败
 
+            8 —— 在规定时间内不得重复提交同一号码 
+            10 —— 该帐号不能在此计算机缴费
 
+            11 —— 流水号重复
 
+            30 —— 面值不符
 
+            41 —— 该地区维护
 
+            42 —— 运营商设备忙
 
+            43 —— 暂不支持该面额的缴费
 
+            44 —— 无该地区缴费权限
 
+            -2 —— 命令已发送，请查看交易流水是否有缴费成功(这种情况是服务器在排队等待处理,间隔10-20分钟后查单核实)
 
+            -3 —— 数据添加失败
 
+            -4 —— 签名错误
 
+            -5 —— 没有此代理商
 
+            -6 —— 提交失败
 
+            -7 —— 无此接口权限
 
+            -8 —— 提交日期不是当天日期
 
+            -9 —— 参数不对
 
+            -11 —— 手机号码位数不符
 
+            -12 —— 绑定IP不符
 
+
 
+            1001 —— 销售数量请大于0
 
+            1002 —— 该商品库存维护 
+            1003 —— 该供货商品库存维护
 
+            其他返回代码，具体参见返回说明
 
+            结果返回形式：返回值|返回说明|代理商余额
 
+        示例：https://www.lzkj168.cn/racc/index.php?act=lzrefill&op=add_mob&usr=001&ord=123&mob=13559023976&amt=10&tim=201303261212&sgn=9FC6B13125C343AFF070B0F30D87CC19
 
+        返回示例：0|提交成功|70.00
 
+      </pre>
 
+      <h4>查询充值状态：</h4>
 
+        <pre>
 
+          传入参数：
 
+              act —— lzrefill 固定参数
 
+              op —— query固定参数
 
+              usr —— 用户名 
+              ord —— 订单号, 交易的订单号 不得重复，30位以内
 
+              sgn —— 交易签名。 MD5(usr+ord+key) 转大写 key为密钥  
+          接口地址：https://www.lzkj168.cn/racc/index.php
 
+          接口描述：用户根据此参数查询提交的订单充值情况
 
+          函数返回结果：
 
+              返回参数为：
 
+                    0 —— 充值中 
+                    1 —— 充值成功 
+                    2 —— 充值失败 
+                    3 —— 无此订单
 
+              其他返回代码，具体参见返回说明
 
+              结果返回形式：|返回值|订单号+返回说明|备注
 
+          示例：act=lzrefill&op=query&usr=001&ord=123&sgn=B6A523AC1DE885E5CE3F94D74F5DA1F7
 
+          返回示例：|0|123-充值中|流水号:1234567890
 
+        </pre>
 
+      <h4>余额查询：</h4>
 
+      <pre>
 
+        传入参数：
 
+            act —— lzrefill 固定参数
 
+            op —— query固定参数
 
+            usr —— 用户名 
+            sgn —— 交易签名。 MD5(usr+key) 转大写 key为密钥
 
+        接口地址：https://www.lzkj168.cn/racc/index.php
 
+        接口描述：查询代理商帐户余额以及佣金。
 
+        函数返回结果：
 
+            返回参数为：
 
+                0 —— 查询成功 
+                其他返回代码，具体参见返回说明
 
+            结果返回形式：返回值|代理商余额|代理商佣金
 
+        示例：act=lzrefill&op=balance&usr=001&sgn=E52C57F6D5D5E53EC038D61AC936B398
 
+        返回示例：0|70.00|0.00
 
+      </pre>
 
+      <h4>缴费状态回调：</h4>
 
+      <pre>
 
+        传入参数：
 
+            usr —— 用户名 
+            ord —— 本次交易的订单号
 
+            state —— 状态
 
+            bz —— 备注信息（运营商流水号），采用URL UTF8编码
 
+            sgn —— 交易签名。 MD5(usr+key) 转大写 key为密钥
 
+        接口地址：回调网址?usr=&ord=&state=&bz=&sgn=
 
+        接口描述：缴费状态回调。
 
+        state：
 
+            1 —— 缴费成功 
+            2 —— 缴费失败 
+        说明：
 
+            此回调只管通知，接收方可不返回。只要回调地址是通的，就表示有通知完成，如因网络问题造成没通知成功的，系统会连续回调三次，如果三次都失败将不会再发送。
 
+            如果由于接收方没有处理回调通知（由于签名失败原因等），不在重新发送回调范围。
 
+      </pre>
 
+    </el-card>
 
+
 
+  </div>
 
+</template>
 
+
 
+<script>
 
+export default {
 
+  name: 'interfaceDoc'
 
+}
 
+</script>
 
+
 
+<style scoped>
 
+.el-card {
 
+  padding: 0 5%;
 
+}
 
+h1 {
 
+  text-align: center;
 
+  font-family: "Microsoft YaHei";
 
+  margin-bottom: 20px;
 
+}
 
+h4 {
 
+  line-height: 36px; /*no */
 
+  font-size: 16px; /*no */
 
+  font-family: "Microsoft YaHei";
 
+}
 
+h6 {
 
+  line-height: 32px; /*no */
 
+  font-family: "Microsoft YaHei";
 
+}
 
+p {
 
+  text-indent: 2em;
 
+  line-height: 32px; /*no */
 
+  font-size: 16px; /*no */
 
+  font-family: "Microsoft YaHei";
 
+}
 
+pre {
 
+  line-height: 32px; /*no */
 
+  font-size: 16px; /*no */
 
+  font-family: "Microsoft YaHei";
 
+  white-space: pre-wrap;       /* css-3 */
 
+  white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
 
+  white-space: -pre-wrap;      /* Opera 4-6 */
 
+  white-space: -o-pre-wrap;    /* Opera 7 */
 
+  word-wrap: break-word;       /* Internet Explorer 5.5+ */
 
+  overflow: auto;
 
+  word-break: break-all;
 
+}
 
+</style>
 
+<style>
 
+.el-main {
 
+  padding: 0;
 
+  margin-right: calc(100% - 100vw);
 
+}
 
+.el-card {
 
+  margin: 20px 30px;
 
+}
 
+</style>

src/pages/subPages/interfaceDoc.vue → src/pages/subPages/interfaceDoc_yezi.vue
View File


+ 36 - 2
src/pages/subPages/message.vue
View File 

@@ -15,6 +15,11 @@
 
         <!-- <el-input placeholder="变更内容" style="width:182px;margin-right: 10px" v-model="changeContent"></el-input> -->

         <!-- <el-input placeholder="变更内容" style="width:182px;margin-right: 10px" v-model="changeContent"></el-input> -->

         <el-button type="primary" @click="queryMovingAccount" style="margin-bottom:20px;">查询</el-button>

         <el-button type="primary" @click="queryMovingAccount" style="margin-bottom:20px;">查询</el-button>

         <el-button style="margin-left:10px;margin-bottom:20px;" type="danger" @click="onReset">重置</el-button>

         <el-button style="margin-left:10px;margin-bottom:20px;" type="danger" @click="onReset">重置</el-button>

+        <el-button

+            v-if="userInfo.name==='琳珠网络'"

+            style="margin-left:10px;margin-bottom:20px"

+            type="warning"

+            @click="onExport">导出</el-button>

     </div>

     </div>

     <el-table :data="tableData" border style="width:100%;font-size:13px;" v-loading="isLoading">

     <el-table :data="tableData" border style="width:100%;font-size:13px;" v-loading="isLoading">

         <el-table-column align="left" prop="lg_type_text" label="资金变动类型" width="200"></el-table-column>

         <el-table-column align="left" prop="lg_type_text" label="资金变动类型" width="200"></el-table-column>

@@ -29,18 +34,23 @@
 
 </el-container>

 </el-container>

 </el-card>

 </el-card>

 </template>

 </template>

-

+<script src="https://code.jquery.com/jquery-3.0.0.min.js"></script>

 <script>

 <script>

 import {

 import {

     getMovingAccount,

     getMovingAccount,

-    queryMovingAccount

+    queryMovingAccount,

+    exportMovingAccount

 } from "@/api";

 } from "@/api";

 // 常量

 // 常量

 import { changeType } from '@/utils/constants'

 import { changeType } from '@/utils/constants'

+import {JSONToExcelConvertor} from '@/utils/export.js'

+// 商家区分

+const userInfo = require('@/utils/userInfo')

 export default {

 export default {

     name: 'message',

     name: 'message',

     data() {

     data() {

         return {

         return {

+            userInfo,

             pageSize: 50,

             pageSize: 50,

             pageNumber: 1,

             pageNumber: 1,

             cabinetValue: "",

             cabinetValue: "",

@@ -162,6 +172,30 @@ export default {
 
             this.dataRange = [];

             this.dataRange = [];

             this.changeVal = '';

             this.changeVal = '';

             this.getMovingAccount();

             this.getMovingAccount();

+        },

+        // 导出

+        async onExport() {

+            if (this.dataRange == null) {

+                this.startTime = ''

+                this.endTime = ''

+            } else {

+                this.startTime =  this.dataRange[0]/1000 || ''

+                this.endTime = this.dataRange[1]/1000 || ''

+            }

+            try {

+                let param = new URLSearchParams()

+                param.append('curpage', this.pageNumber)

+                param.append('start_time', this.startTime)

+                param.append('end_time', this.endTime)

+                param.append('lg_type', this.changeVal)

+                const res = await exportMovingAccount(param)

+                console.log('导出', res);

+                if (res && res.code == 200) {

+                    JSONToExcelConvertor(res.datas.data, "资金明细", res.datas.title )

+                }

+            } catch (error) {

+                console.log(error);

+            }

         }

         }

     },

     },

 };

 };

+ 31 - 21
src/pages/subPages/order.vue
View File 

@@ -17,14 +17,29 @@
 
             placeholder="请输入卡号"
 
             placeholder="请输入卡号"
 
             v-model.trim="card_no"
 
             v-model.trim="card_no"
 
             clearable></el-input>
 
             clearable></el-input>
 
-        <el-date-picker
 
-            v-model="dataRange"
 
-            clearable
 
-            value-format="timestamp"
 
-            format="yyyy-MM-dd"
 
-            type="datetimerange"
 
-            range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
 
-            style="margin-bottom:20px;margin-right: 10px;width:260px"></el-date-picker>
 
+        <template v-if="userInfo.name==='椰子充值'">
 
+            <el-date-picker
 
+                class="yezi_date"
 
+                v-model="dataRange"
 
+                clearable
 
+                value-format="timestamp"
 
+                format="yyyy-MM-dd"
 
+                type="datetimerange"
 
+                range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
 
+                style="margin-bottom:20px;margin-right: 10px;width:260px"></el-date-picker>
 
+        </template>
 
+        <template v-else>
 
+            <el-date-picker
 
+                v-model="dataRange"
 
+                clearable
 
+                type="datetimerange"
 
+                value-format="timestamp"
 
+                range-separator="至"
 
+                start-placeholder="开始日期"
 
+                end-placeholder="结束日期"
 
+                style="margin-bottom:20px;margin-right: 10px;">
 
+            </el-date-picker>
 
+        </template>
 
         <el-select v-model="RechargeType" clearable placeholder="--充值卡类型--" style="margin-right: 10px;margin-bottom:20px;width: 140px;">
 
         <el-select v-model="RechargeType" clearable placeholder="--充值卡类型--" style="margin-right: 10px;margin-bottom:20px;width: 140px;">
 
             <el-option
 
             <el-option
 
                 v-for="item in moneyType"
 
                 v-for="item in moneyType"
 
@@ -89,7 +104,7 @@
 
             </template>
 
             </template>
 
         </el-table-column>
 
         </el-table-column>
 
         <!-- <el-table-column align="center" prop="official_sn" label="批次号"></el-table-column> -->
 
         <!-- <el-table-column align="center" prop="official_sn" label="批次号"></el-table-column> -->
 
-        <el-table-column align="center" prop="order_sn" width="180" label="椰子单号"></el-table-column>
 
+        <el-table-column align="center" prop="order_sn" width="185" label="椰子单号"></el-table-column>
 
         <el-table-column align="center" prop="official_sn" width="250" label="官方流水号">
 
         <el-table-column align="center" prop="official_sn" width="250" label="官方流水号">
 
             <template slot-scope="{row}">
 
             <template slot-scope="{row}">
 
                 {{row.official_sn ? row.official_sn : '无'}}
 
                 {{row.official_sn ? row.official_sn : '无'}}
 
@@ -97,34 +112,29 @@
 
         </el-table-column>
 
         </el-table-column>
 
         <el-table-column align="center" prop="err_msg" label="失败原因" width="300"></el-table-column>
 
         <el-table-column align="center" prop="err_msg" label="失败原因" width="300"></el-table-column>
 
         <el-table-column align="center" prop="mch_amount" label="扣款" width="70" fixed="right"></el-table-column>
 
         <el-table-column align="center" prop="mch_amount" label="扣款" width="70" fixed="right"></el-table-column>
 
-        <!-- <el-table-column align="center" width="200" label="状态查询">
 
-            <template slot-scope="{row}">
 
-                <el-button type="primary" size="small" v-show="row && row.order_state_text == '充值中'">查询</el-button>
 
-            </template>
 
-        </el-table-column> -->
 
     </el-table>
 
     </el-table>
 
     <el-row style="margin-top:10px;" type="flex" justify="end">
 
     <el-row style="margin-top:10px;" type="flex" justify="end">
 
         <el-pagination background layout="prev, pager, next" :total="total" :page-size="pageSize" :current-page="pageNumber" @current-change="onPageChange"></el-pagination>
 
         <el-pagination background layout="prev, pager, next" :total="total" :page-size="pageSize" :current-page="pageNumber" @current-change="onPageChange"></el-pagination>
 
     </el-row>
 
     </el-row>
 
 </el-container>
 
 </el-container>
 
 </el-card>
 
 </el-card>
 
-<!-- 状态查询弹层 -->
 
 </template>
 
 </template>
 
 
 
 <script>
 
 <script>
 
 import {
 
 import {
 
-    // actionLogList
 
     getOrderList,
 
     getOrderList,
 
     queryList,
 
     queryList,
 
     exportList
 
     exportList
 
 } from "@/api";
 
 } from "@/api";
 
 import { moneyType, orderState, amountConstant, timeConstant } from '@/utils/constants'
 
 import { moneyType, orderState, amountConstant, timeConstant } from '@/utils/constants'
 
-// import getIp from '@/utils/ip'
 
 import {JSONToExcelConvertor} from '@/utils/export.js'
 
 import {JSONToExcelConvertor} from '@/utils/export.js'
 
+// 商家区分
 
+const userInfo = require('@/utils/userInfo')
 
 export default {
 
 export default {
 
     name: 'order',
 
     name: 'order',
 
     data() {
 
     data() {
 
         return {
 
         return {
 
+            userInfo,
 
             tableData: [],
 
             tableData: [],
 
             pageSize: 50,
 
             pageSize: 50,
 
             pageNumber: 1,
 
             pageNumber: 1,
 
@@ -359,16 +369,16 @@ export default {
 
 /deep/.el-table .cell {
 
 /deep/.el-table .cell {
 
     padding-right: 7px;
 
     padding-right: 7px;
 
 }
 
 }
 
-/deep/.el-date-editor .el-range-separator {
 
+/deep/.el-date-editor.yezi_date .el-range-separator {
 
     padding: 0;
 
     padding: 0;
 
     width: 20px;/*no */
 
     width: 20px;/*no */
 
 }
 
 }
 
-/deep/.el-date-editor .el-range-input {
 
+/deep/.el-date-editor.yezi_date .el-range-input {
 
     width: 100px;/*no */
 
     width: 100px;/*no */
 
 }
 
 }
 
 /deep/.el-input,
 
 /deep/.el-input,
 
-/deep/.el-date-editor .el-range-input,
 
-/deep/.el-date-editor .el-range-separator {
 
+/deep/.el-date-editor.yezi_date .el-range-input,
 
+/deep/.el-date-editor.yezi_date .el-range-separator {
 
     font-size: 13px; /*no */
 
     font-size: 13px; /*no */
 
 }
 
 }
 
 </style>
 
 </style>

+ 0 - 20
src/pages/subPages/reconciliation.vue
View File 

@@ -23,26 +23,6 @@
 
           <el-button style="margin-left:10px;" type="primary" @click="onSearch" :loading="searchLoading">查询</el-button>
 
           <el-button style="margin-left:10px;" type="primary" @click="onSearch" :loading="searchLoading">查询</el-button>
 
           <el-button style="margin-left:10px;" type="danger" @click="onReset">重置</el-button>
 
           <el-button style="margin-left:10px;" type="danger" @click="onReset">重置</el-button>
 
       </div>
 
       </div>
 
-      <!-- <el-form :model="recForm">
 
-          <el-form-item label="订单总数：">
 
-              {{recForm.count}}
 
-          </el-form-item>
 
-          <el-form-item label="成功订单数：">
 
-              {{recForm.successCount}}
 
-          </el-form-item>
 
-          <el-form-item label="失败订单数：">
 
-              {{recForm.errorCount}}
 
-          </el-form-item>
 
-          <el-form-item label="充值中订单数：">
 
-              {{recForm.sendCount}}
 
-          </el-form-item>
 
-          <el-form-item label="总充值金额：">
 
-              {{recForm.refill_amounts}}
 
-          </el-form-item>
 
-          <el-form-item label="总扣款金额：">
 
-              {{recForm.mch_amounts}}
 
-          </el-form-item>
 
-      </el-form> -->
 
       <el-table :data="tableData" border style="width: 100%;font-size:13px;" v-loading="isLoading">
 
       <el-table :data="tableData" border style="width: 100%;font-size:13px;" v-loading="isLoading">
 
         <el-table-column align="center" prop="count" label="订单总数" />
 
         <el-table-column align="center" prop="count" label="订单总数" />
 
         <el-table-column align="center" prop="successCount" label="成功订单数" />
 
         <el-table-column align="center" prop="successCount" label="成功订单数" />

+ 3 - 2
src/router/index.js
View File 

@@ -1,6 +1,7 @@
 
 import Vue from 'vue'

 import Vue from 'vue'

 import VueRouter from 'vue-router'

 import VueRouter from 'vue-router'

 import { getUser } from '@/utils/auth'

 import { getUser } from '@/utils/auth'

+const userInfo = require('@/utils/userInfo')

 

 

 const Index = () => import('@/pages/index');

 const Index = () => import('@/pages/index');

 const Login = () => import('@/pages/login');

 const Login = () => import('@/pages/login');

@@ -18,9 +19,9 @@ const OilCard = () => import('@/pages/subPages/oilCard');
 
 // 手机卡充值

 // 手机卡充值

 const MobileCard = () => import('@/pages/subPages/mobileCard');

 const MobileCard = () => import('@/pages/subPages/mobileCard');

 // 接口文档

 // 接口文档

-const InterfaceDoc = () => import('@/pages/subPages/interfaceDoc');

+const InterfaceDoc = () => userInfo.name==='椰子充值' ? import('@/pages/subPages/interfaceDoc_yezi') : import('@/pages/subPages/interfaceDoc_linzhu');

 // 对账管理

 // 对账管理

-const Reconciliation = () => import('@/pages/subPages/reconciliation');

+const Reconciliation = () =>import('@/pages/subPages/reconciliation');

 

 

 Vue.use(VueRouter)

 Vue.use(VueRouter)

+ 1 - 0
src/utils/flexible.js
View File 

@@ -1,3 +1,4 @@
 
+/* eslint-disable no-extra-semi */
 
 
 
 ;(function(win, lib) {
 
 ;(function(win, lib) {
 
   var doc = win.document;
 
   var doc = win.document;

+ 18 - 6
src/utils/userInfo.js
View File 

@@ -1,9 +1,21 @@
 
-// const userInfo = {
 
-//   name: '琳珠网络',
 
-// }
 
+/* eslint-disable no-unused-vars */
 
+const linzhu_userInfo = {
 
+  name: '琳珠网络',
 
+  indexColor: '#002033',
 
+  dropdownColor: '#fff',
 
+  bankAccount: '379900663110901',
 
+  bankDeposit: '招商银行洛阳分行凯旋路支行',
 
+  AccountName: '河南创之星文化传媒有限公司',
 
+}
 
 
 
-const userInfo = {
 
+const yezi_userInfo = {
 
   name: '椰子充值',
 
   name: '椰子充值',
 
+  indexColor: '#545c64',
 
+  dropdownColor: '#409eff',
 
+  bankAccount: '11001079900053013913',
 
+  bankDeposit: '中国建设银行北京清华园支行',
 
+  AccountName: '北京国研方略信息科学研究院',
 
 }
 
 }
 
-
 
-export default userInfo
 
+// export default userInfo
 
+module.exports = yezi_userInfo
 
+// module.exports = linzhu_userInfo

+ 4 - 1
vue.config.js
View File 

@@ -9,6 +9,7 @@ const targetUrl = 'http://192.168.1.195/'
 
 

 

 // const targetUrl = 'http://10.64.81.2:8080';

 // const targetUrl = 'http://10.64.81.2:8080';

 

 

+const userInfo = require('./src/utils/userInfo')

 module.exports = {

 module.exports = {

     publicPath:'./',

     publicPath:'./',

     productionSourceMap: false,

     productionSourceMap: false,

@@ -21,7 +22,9 @@ module.exports = {
 
             // 在 dist/index.html 的输出

             // 在 dist/index.html 的输出

             filename: 'index.html',

             filename: 'index.html',

             // 当使用 title 选项时，template 中的 title 标签需要是 <title><%= htmlWebpackPlugin.options.title %></title>

             // 当使用 title 选项时，template 中的 title 标签需要是 <title><%= htmlWebpackPlugin.options.title %></title>

-            title: '椰子充值后台管理系统程序',

+            // title: '椰子充值后台管理系统程序',

+            title: `${userInfo.name}后台管理系统程序`,

+            faviconPath: userInfo.name === '椰子充值' ? 'yezi.ico' : 'linzhu.ico'

         },

         },

     },

     },

     devServer: {

     devServer: {