dujingxian 3 years ago
parent
commit
8d6eb630f6

+ 10 - 3
src/api/index.js

@@ -104,8 +104,12 @@ let requestLoading = (url, method, params) => {
 
 // const Prefix = 'http://192.168.1.220/mchsrv/index.php?';
 
-const Prefix = 'http://192.168.1.218/mchsrv/index.php?';
-// const Prefix = 'https://www.xyzshops.cn/mchsrv/index.php?';
+// const Prefix = 'http://dd.guozipay.com/mchsrv/index.php?';
+
+// const Prefix = 'http://192.168.1.218/mchsrv/index.php?';
+const Prefix = 'https://admin.xyzshops.cn/mchsrv/index.php?';
+// const Prefix = 'https://test.xyzshops.cn/mchsrv/index.php?';
+
 // 椰子临时线上地址
 // const Prefix = 'http://121.89.196.45/mobile/index.php?';
 
@@ -315,8 +319,11 @@ export const updateVoucher = (name) => {
     // return requestLoading(`${Prefix}act=merchant_recharge&op=voucherupload&client_type=ajax`, 'post', {voucher})
     return axios({
         method: "post",
-        url: `http://192.168.1.218/upfile.php`,
+        // url: `http://192.168.1.218/upfile.php`,
+        // url: `http://dd.guozipay.com/upfile.php`,
         // url: `https://www.xyzshops.cn/upfile.php`,
+        url: `https://admin.xyzshops.cn/upfile.php`,
+        // url: `https://test.xyzshops.cn/upfile.php`,
         // 椰子临时
         // url: `http://121.89.196.45/upfile.php`,
         // withCredentials: true,

+ 5 - 5
src/pages/index.vue

@@ -23,18 +23,18 @@
     <el-container style="height: 100%; ">
         <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-item index="home" route="/">
+                <!-- <el-menu-item index="home" route="/">
                     <i class="el-icon-house"></i>
                     <span style="font-size: 19px;" slot="title">首页</span>
-                </el-menu-item>
-                <el-menu-item index="order" route="order">
+                </el-menu-item> -->
+                <el-menu-item index="order" route="/">
                     <i class="el-icon-edit-outline"></i>
                     <span style="font-size: 19px;" slot="title">订单管理</span>
                 </el-menu-item>
-                <el-menu-item index="message" route="message">
+                <!-- <el-menu-item index="message" route="message">
                     <i class="el-icon-message"></i>
                     <span style="font-size: 19px;" slot="title">账户日志</span>
-                </el-menu-item>
+                </el-menu-item> -->
                 <el-menu-item index="oilCard" route="oilCard">
                     <i class="el-icon-bank-card"></i>
                     <span style="font-size: 19px;" slot="title">油卡充值</span>

+ 6 - 6
src/pages/phoneIndex.vue

@@ -9,9 +9,9 @@
           <div class="hdBottom">
             <div @click="isCollapse=!isCollapse">
               <i :class="isCollapse ? 'el-icon-s-fold'  : 'el-icon-s-unfold'" style="margin-right:10px"></i>
-              <template v-if="phoneCurPath == 'phoneHome'">首页</template>
+              <!-- <template v-if="phoneCurPath == 'phoneHome'">首页</template> -->
               <template v-if="phoneCurPath == 'phoneOrder'">订单管理</template>
-              <template v-if="phoneCurPath == 'phoneMessage'">账户日志</template>
+              <!-- <template v-if="phoneCurPath == 'phoneMessage'">账户日志</template> -->
               <template v-if="phoneCurPath == 'phoneOilCard'">油卡充值</template>
               <template v-if="phoneCurPath == 'phoneMobileCard'">手机卡充值</template>
               <template v-if="phoneCurPath == 'phoneBalance'">充值管理</template>
@@ -41,18 +41,18 @@
               :collapse="!isCollapse"
               :collapse-transition="false"
               style="height:100%">
-              <el-menu-item index="phoneHome" route="phoneHome" style="padding:0 5px">
+              <!-- <el-menu-item index="phoneHome" route="phoneHome" style="padding:0 5px">
                 <i class="el-icon-house"></i>
                 <span style="font-size: 14px;" slot="title">首页</span>
-              </el-menu-item>
+              </el-menu-item> -->
               <el-menu-item index="phoneOrder" route="phoneOrder" style="padding: 0 5px">
                 <i class="el-icon-edit-outline"></i>
                 <span style="font-size: 14px;" slot="title">订单管理</span>
               </el-menu-item>
-              <el-menu-item index="phoneMessage" route="phoneMessage" style="padding: 0 5px">
+              <!-- <el-menu-item index="phoneMessage" route="phoneMessage" style="padding: 0 5px">
                 <i class="el-icon-message"></i>
                 <span style="font-size: 14px;" slot="title">账户日志</span>
-              </el-menu-item>
+              </el-menu-item> -->
               <el-menu-item index="phoneOilCard" route="phoneOilCard" style="padding: 0 5px">
                 <i class="el-icon-bank-card"></i>
                 <span style="font-size: 14px;" slot="title">油卡充值</span>

+ 2 - 2
src/pages/phoneSubPages/phoneBalance.vue

@@ -5,10 +5,10 @@
         <el-col :span="24">
             <el-form >
                 <el-form-item label="银行账号:">
-                  110945155010101
+                  91160078801200002500 
                 </el-form-item>
                 <el-form-item label="开户银行:">
-                  招商银行北苑路支行
+                  上海浦东发展银行北京亚运村支行
                 </el-form-item>
                 <el-form-item label="开户名:">
                   北京椰子电子商务有限责任公司

+ 2 - 2
src/pages/phoneSubPages/phoneMobileCard.vue

@@ -29,7 +29,7 @@
           </template>
           <span v-else style="margin-left: 20px;font-size: 13px;color: #909399;">请选择充值金额</span>
         </el-form-item>
-        <el-form-item label="通道质量:">
+        <!-- <el-form-item label="通道质量:">
           <el-button
             :type="item.value === qualityBtn ? 'success' : 'info'"
             v-for="item in qualityCon"
@@ -37,7 +37,7 @@
             @click="hQucharge(item)"
             size="mini"
             style="margin-left:0;margin-right:6px">{{item.label}}</el-button>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="手机号:">
             <el-input
               type="textarea"

+ 126 - 8
src/pages/phoneSubPages/phoneOrder.vue

@@ -23,13 +23,17 @@
         <el-date-picker
             class="yezi_date"
             v-model="dataRange"
+            :disabled="isDisabled"
+            @focus="hFocusDate"
             clearable
             value-format="timestamp"
-            format="yyyy-MM-dd"
+            format="yyyy-MM-dd HH:mm:ss"
             type="datetimerange"
             range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
-            style="margin-bottom:10px;margin-right: 10px;width:260px"
+            style="margin-bottom:10px;margin-right: 10px;width:330px"
             size="small"></el-date-picker>
+        <p style="font-size: 12px;color: #909399;margin: -6px 0 7px;">仅展示一小时内订单,如需查询历史订单,请输入单号或充值号码</p>
+
         <el-select v-model="RechargeType" clearable placeholder="--充值卡类型--" size="small" style="margin-right: 10px;margin-bottom:10px;width: 140px;">
             <el-option
                 v-for="item in moneyType"
@@ -81,7 +85,9 @@
         <div>
             <el-button style="margin-right:10px;margin-bottom:20px" size="small" type="primary" @click="queryList">查询</el-button>
             <el-button style="margin-right:10px;margin-bottom:20px" size="small" type="danger" @click="onReset">重置</el-button>
-            <el-button style="margin-bottom:20px" type="warning" size="small" @click="onExport">导出</el-button>
+            <el-button style="margin-bottom:20px;margin-right:10px;" type="warning" size="small" @click="onExport">导出</el-button>
+            <el-button style="margin-bottom:20px;margin-left:10px" size="small" type="success" @click="onExcopy">复制</el-button>
+
         </div>
     </el-header>
    
@@ -135,6 +141,8 @@ export default {
             pageSize: 50,
             pageNumber: 1,
             total: 0,
+            isDisabled: false,
+
             // 筛选时间 start_time end_time
             dataRange: [],
             startTime: '',
@@ -189,7 +197,40 @@ export default {
             if (newVal != 30) {
                 this.time = ''
             }
+        },
+                    mch_order: {
+      handler(newVal) {
+        // console.log('newVal', newVal);
+        if (!newVal) {
+          this.isDisabled = true
+        } else {
+          this.isDisabled = false
+        }
+      },
+      immediate: true
+    },
+        order_sn: {
+      handler(newVal) {
+        // console.log('newVal', newVal);
+        if (!newVal) {
+          this.isDisabled = true
+        } else {
+          this.isDisabled = false
         }
+      },
+      immediate: true
+    },
+        card_no: {
+      handler(newVal) {
+        // console.log('newVal', newVal);
+        if (!newVal) {
+          this.isDisabled = true
+        } else {
+          this.isDisabled = false
+        }
+      },
+      immediate: true
+    }
     },
     methods: {
         // 获取订单列表
@@ -312,16 +353,43 @@ export default {
         },
         // 设置默认日期
         fetchData() {
-            let date = new Date()
+             let date = new Date()
             let y = date.getFullYear()
             let m = date.getMonth() + 1
             let d = date.getDate()
             let dEnd = date.getDate() + 1
-            let timeStart =  (new Date(`${y}/${m}/${d}`)).getTime()
-            let timeEnd = (new Date(`${y}/${m}/${dEnd}`)).getTime()
+            let h = date.getHours(); //获取系统时
+            let hend = date.getHours() - 1; //获取系统时
+            let mm = date.getMinutes(); //获取系统时
+            let s = date.getSeconds(); //获取系统时
+            let sEnd = date.getSeconds()  + 1; //获取系统时
+            let p = 0
+            // let timeStart =  (new Date(`${y}/${m}/${d} ${h}:${mm}:${s}`)).getTime()
+            // let timeEnd = (new Date(`${y}/${m}/${dEnd} ${h}:${mm}:${sEnd}`)).getTime()
+           if (!this.mch_order || !this.order_sn || !this.mch_order) {
+             let timeStart =  (new Date(`${y}/${m}/${d} ${hend}:${mm}:${s}`)).getTime()
+            let timeEnd = (new Date(`${p}/${p}/${p} ${p}:${p}:${p}`)).getTime()
             this.dataRange[0] = timeStart
             this.dataRange[1] = timeEnd
+           } else {
+       let timeStart =  (new Date(`${y}/${m}/${d} ${h}:${mm}:${s}`)).getTime()
+            let timeEnd = (new Date(`${y}/${m}/${dEnd} ${h}:${mm}:${sEnd}`)).getTime()
+              this.dataRange[0] = timeStart
+
+            this.dataRange[1] = timeEnd
+           }
         },
+        // 时间获取焦点
+    hFocusDate() {
+      if (!this.mch_order && !this.order_sn && !this.card_no) {
+        if (this.timer) {
+            window.clearTimeout(this.timer)
+          }
+          this.timer = setTimeout(() => {
+            this.$message.warning('请先输入单号')
+          }, 1000)
+      }
+    },
         // 导出
         async onExport() {
             if (this.dataRange == null) {
@@ -351,7 +419,57 @@ export default {
             } catch (error) {
                 console.log(error);
             }
-        }
+        },
+                //复制
+         async onExcopy() {
+             
+            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('card_type', this.RechargeType)
+                param.append('order_state', this.RechargeStatus)
+                param.append('refill_amount', this.amount)
+                param.append('mch_order', this.mch_order)
+                param.append('time', this.time)
+                param.append('card_no', this.card_no)
+                param.append('order_sn', this.order_sn)
+                param.append('quality', this.quality)
+                const res = await queryList(param)
+                console.log('复制', res);
+                if (res && res.code == 200) {
+                    this.tableData = res.datas.data
+                    this.total = res.datas.total * this.pageSize
+                    const { data } = res.datas;
+                    // eslint-disable-next-line no-unused-vars
+                    let str = ''
+                    data.forEach(i => {
+                        // eslint-disable-next-line no-const-assign
+                        str += i.order_sn + '\n'
+                    })
+                    console.log(str);
+        let oInput = document.createElement("textarea");
+        oInput.style.border = "0 none";
+        oInput.style.color = "transparent";
+        oInput.value = str;
+        document.body.appendChild(oInput);
+        oInput.select(); // 选择对象
+        document.execCommand("Copy"); // 执行浏览器复制命令
+        oInput.parentNode.removeChild(oInput)
+                }
+            } catch (error) {
+                console.log(error);
+            }
+        }, 
     },
 };
 </script>
@@ -377,7 +495,7 @@ export default {
     width: 20px;/*no */
 }
 /deep/.el-date-editor.yezi_date .el-range-input {
-    width: 100px;/*no */
+    width: 132px;/*no */
 }
 /deep/.el-input,
 /deep/.el-date-editor.yezi_date .el-range-input,

+ 6 - 0
src/pages/phoneSubPages/phoneView.vue

@@ -23,6 +23,9 @@
         <el-container direction="vertical">
             <h3 style="margin-bottom:10px">开发者设置:</h3>
             <el-form :model="formKey" :rules="ruleKey" ref="keyForm" label-position="left">
+                  <el-form-item label="商户号:">
+                    <span>{{merchantDatamchid}}</span>
+                </el-form-item>
                 <el-form-item label="密钥设置:" :prop="useKey == '1' ? 'ReSecurityKey' : 'securityKey'"  class="keySet">
                     <el-input v-if="useKey == '1'" size="small" v-model.trim="formKey.ReSecurityKey" autocomplete="off" style="width: 300px;margin-right:10px"></el-input>
                     <el-input v-else size="small" v-model.trim="formKey.securityKey" autocomplete="off" style="width: 300px;margin-right:10px"></el-input>
@@ -169,6 +172,7 @@ export default {
             }
         };
         return {
+            merchantDatamchid: '',
             pageSize: 10,
             pageNumber: 1,
             ipList: [],
@@ -366,6 +370,8 @@ export default {
                     this.warningList = res.datas.warning_phone
                     // this.phoneForm.time_out = res.datas.time_out
                     this.phoneForm.quality = res.datas.quality
+                    this.merchantDatamchid = res.datas.mchid
+
                 }
             } catch (error) {
                 console.log(error);

+ 2 - 2
src/pages/subPages/balance.vue

@@ -5,10 +5,10 @@
         <el-col :span="10">
             <el-form >
                 <el-form-item label="银行账号:">
-                   110945155010101
+                   91160078801200002500 
                 </el-form-item>
                 <el-form-item label="开户银行:">
-                    招商银行北苑路支行
+                    上海浦东发展银行北京亚运村支行
                 </el-form-item>
                 <el-form-item label="开户名:">
                     北京椰子电子商务有限责任公司

+ 1 - 0
src/pages/subPages/home.vue

@@ -231,6 +231,7 @@ export default {
       let dateArr = []
       let myDate = new Date()
       myDate.setDate(myDate.getDate() -6)
+
       let dateTemp
       let flag = 1
       for (let i = 0; i <7; i++) {

+ 126 - 7
src/pages/subPages/order.vue

@@ -1,3 +1,5 @@
+/* eslint-disable no-unused-vars */
+/* eslint-disable no-unused-vars */
 <template>
 <el-card>
 <el-container direction="vertical">
@@ -20,12 +22,14 @@
         <el-date-picker
             class="yezi_date"
             v-model="dataRange"
+             :disabled="isDisabled"
+            @focus="hFocusDate"
             clearable
             value-format="timestamp"
-            format="yyyy-MM-dd"
+            format="yyyy-MM-dd HH:mm:ss"
             type="datetimerange"
             range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
-            style="margin-bottom:20px;margin-right: 10px;width:260px"></el-date-picker>
+            style="margin-bottom:20px;margin-right: 10px;width:380px"></el-date-picker>
         <el-select v-model="RechargeType" clearable placeholder="--充值卡类型--" style="margin-right: 10px;margin-bottom:20px;width: 140px;">
             <el-option
                 v-for="item in moneyType"
@@ -73,10 +77,12 @@
                 :value="item.value">
             </el-option>
         </el-select>
+        <p style="float: right;font-size: 13px;color: #909399;margin: 17px 576px 0 0;">仅展示一小时内订单,如需查询历史订单,请输入单号或充值号码</p>
         <div>
             <el-button style="margin-right:10px;margin-bottom:20px" type="primary" @click="queryList">查询</el-button>
             <el-button style="margin-right:10px;margin-left:0px;margin-bottom:20px" type="danger" @click="onReset">重置</el-button>
             <el-button style="margin-right:10px;margin-left:0px;margin-bottom:20px" type="warning" @click="onExport">导出</el-button>
+            <el-button style="margin-right:10px;margin-left:0px;margin-bottom:20px" type="success" @click="onExcopy">复制</el-button>
         </div>
     </el-header>
    
@@ -130,6 +136,7 @@ export default {
             pageSize: 50,
             pageNumber: 1,
             total: 0,
+            isDisabled: false,
             // 筛选时间 start_time end_time
             dataRange: [],
             startTime: '',
@@ -162,6 +169,7 @@ export default {
             quality: '',
             // 充值质量-常量
             qualityCon,
+            str: ''
         };
     },
     created () {
@@ -184,7 +192,40 @@ export default {
             if (newVal != 30) {
                 this.time = ''
             }
+        },
+            mch_order: {
+      handler(newVal) {
+        // console.log('newVal', newVal);
+        if (!newVal) {
+          this.isDisabled = true
+        } else {
+          this.isDisabled = false
+        }
+      },
+      immediate: true
+    },
+        order_sn: {
+      handler(newVal) {
+        // console.log('newVal', newVal);
+        if (!newVal) {
+          this.isDisabled = true
+        } else {
+          this.isDisabled = false
+        }
+      },
+      immediate: true
+    },
+        card_no: {
+      handler(newVal) {
+        // console.log('newVal', newVal);
+        if (!newVal) {
+          this.isDisabled = true
+        } else {
+          this.isDisabled = false
         }
+      },
+      immediate: true
+    }
     },
     methods: {
         // 获取订单列表
@@ -307,16 +348,43 @@ export default {
         },
         // 设置默认日期
         fetchData() {
-            let date = new Date()
+             let date = new Date()
             let y = date.getFullYear()
             let m = date.getMonth() + 1
             let d = date.getDate()
             let dEnd = date.getDate() + 1
-            let timeStart =  (new Date(`${y}/${m}/${d}`)).getTime()
-            let timeEnd = (new Date(`${y}/${m}/${dEnd}`)).getTime()
+            let h = date.getHours(); //获取系统时
+            let hend = date.getHours() - 1; //获取系统时
+            let mm = date.getMinutes(); //获取系统时
+            let s = date.getSeconds(); //获取系统时
+            let sEnd = date.getSeconds()  + 1; //获取系统时
+            let p = 0
+            // let timeStart =  (new Date(`${y}/${m}/${d} ${h}:${mm}:${s}`)).getTime()
+            // let timeEnd = (new Date(`${y}/${m}/${dEnd} ${h}:${mm}:${sEnd}`)).getTime()
+           if (!this.mch_order || !this.order_sn || !this.mch_order) {
+             let timeStart =  (new Date(`${y}/${m}/${d} ${hend}:${mm}:${s}`)).getTime()
+            let timeEnd = (new Date(`${p}/${p}/${p} ${p}:${p}:${p}`)).getTime()
             this.dataRange[0] = timeStart
             this.dataRange[1] = timeEnd
+           } else {
+       let timeStart =  (new Date(`${y}/${m}/${d} ${h}:${mm}:${s}`)).getTime()
+            let timeEnd = (new Date(`${y}/${m}/${dEnd} ${h}:${mm}:${sEnd}`)).getTime()
+              this.dataRange[0] = timeStart
+
+            this.dataRange[1] = timeEnd
+           }
         },
+                    // 时间获取焦点
+    hFocusDate() {
+      if (!this.mch_order && !this.order_sn && !this.card_no) {
+        if (this.timer) {
+            window.clearTimeout(this.timer)
+          }
+          this.timer = setTimeout(() => {
+            this.$message.warning('请先输入单号')
+          }, 1000)
+      }
+    },
         // 导出
         async onExport() {
             if (this.dataRange == null) {
@@ -346,7 +414,58 @@ export default {
             } catch (error) {
                 console.log(error);
             }
-        }
+        },
+        //复制
+         async onExcopy() {
+             
+            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('card_type', this.RechargeType)
+                param.append('order_state', this.RechargeStatus)
+                param.append('refill_amount', this.amount)
+                param.append('mch_order', this.mch_order)
+                param.append('time', this.time)
+                param.append('card_no', this.card_no)
+                param.append('order_sn', this.order_sn)
+                param.append('quality', this.quality)
+                const res = await queryList(param)
+                console.log('复制', res);
+                if (res && res.code == 200) {
+                    this.tableData = res.datas.data
+                    this.total = res.datas.total * this.pageSize
+                    const { data } = res.datas;
+                    console.log("zhu", data);
+                    // eslint-disable-next-line no-unused-vars
+                    let str = ''
+                    data.forEach(i => {
+                        // eslint-disable-next-line no-const-assign
+                        str += i.order_sn + '\n'
+                    })
+                    console.log(str);
+                    let oInput = document.createElement("textarea");
+                    oInput.style.border = "0 none";
+                    oInput.style.color = "transparent";
+                    oInput.value = str;
+                    document.body.appendChild(oInput);
+                    oInput.select(); // 选择对象
+                    document.execCommand("Copy"); // 执行浏览器复制命令
+                    oInput.parentNode.removeChild(oInput)
+                }
+            } catch (error) {
+                console.log(error);
+            }
+        },       
     },
 };
 </script>
@@ -372,7 +491,7 @@ export default {
     width: 20px;/*no */
 }
 /deep/.el-date-editor.yezi_date .el-range-input {
-    width: 100px;/*no */
+    width: 135px;/*no */
 }
 /deep/.el-input,
 /deep/.el-date-editor.yezi_date .el-range-input,

+ 6 - 0
src/pages/subPages/view.vue

@@ -23,6 +23,10 @@
         <el-container direction="vertical">
             <h3 style="margin-bottom:20px">开发者设置:</h3>
             <el-form label-width="120px" :model="formKey" :rules="ruleKey" ref="keyForm">
+                
+                <el-form-item label="商户号:">
+                    <span>{{merchantDatamchid}}</span>
+                </el-form-item>
                 <el-form-item label="密钥设置:" :prop="useKey == '1' ? 'ReSecurityKey' : 'securityKey'"  class="keySet">
                     <el-input v-if="useKey == '1'" v-model.trim="formKey.ReSecurityKey" autocomplete="off" style="width: 300px;margin-right:10px"></el-input>
                     <el-input v-else v-model.trim="formKey.securityKey" autocomplete="off" style="width: 300px;margin-right:10px"></el-input>
@@ -216,6 +220,7 @@ export default {
         //     }
         // };
         return {
+            merchantDatamchid:'',
             pageSize: 10,
             pageNumber: 1,
             ipList: [],
@@ -417,6 +422,7 @@ export default {
                     this.warningList = res.datas.warning_phone
                     // this.phoneForm.time_out = res.datas.time_out
                     this.phoneForm.quality = res.datas.quality
+                    this.merchantDatamchid = res.datas.mchid
                 }
             } catch (error) {
                 console.log(error);

+ 26 - 26
src/router/index.js

@@ -5,10 +5,10 @@ import { getUser } from '@/utils/auth'
 const Index = () => import('@/pages/index');
 const Login = () => import('@/pages/login');
 // 首页
-const Home = () => import('@/pages/subPages/home');
+// const Home = () => import('@/pages/subPages/home');
 const order = () => import('@/pages/subPages/order');
 const balance = () => import('@/pages/subPages/balance');
-const Message = () => import('@/pages/subPages/message');
+// const Message = () => import('@/pages/subPages/message');
 const View = () => import('@/pages/subPages/view');
 // 油卡充值
 const OilCard = () => import('@/pages/subPages/oilCard');
@@ -22,10 +22,10 @@ const Reconciliation = () =>import('@/pages/subPages/reconciliation');
 // 手机
 const phoneIndex = () => import('@/pages/phoneIndex');
 // 首页
-const phoneHome = () => import('@/pages/phoneSubPages/phoneHome');
+// const phoneHome = () => import('@/pages/phoneSubPages/phoneHome');
 const phoneBalance = () => import('@/pages/phoneSubPages/phoneBalance');
 const phoneOrder = () => import('@/pages/phoneSubPages/phoneOrder');
-const phoneMessage = () => import('@/pages/phoneSubPages/phoneMessage');
+// const phoneMessage = () => import('@/pages/phoneSubPages/phoneMessage');
 const phoneOilCard = () => import('@/pages/phoneSubPages/phoneOilCard');
 const phoneMobileCard = () => import('@/pages/phoneSubPages/phoneMobileCard');
 const phoneReconciliation = () => import('@/pages/phoneSubPages/phoneReconciliation');
@@ -43,14 +43,14 @@ Vue.use(VueRouter)
     // redirect:'/order',
     children:[
       // 主页
-      {
-        path: '',
-        name: 'home',
-        component: Home
-      },
+      // {
+      //   path: '',
+      //   name: 'home',
+      //   component: Home
+      // },
       // 订单统计
       {
-        path:'/order',
+        path:'',
         name:'order',
         component:order
       },
@@ -61,11 +61,11 @@ Vue.use(VueRouter)
         component:balance
       },
       // 实时动账
-      {
-        path:'/message',
-        name:'message',
-        component:Message
-      },
+      // {
+      //   path:'/message',
+      //   name:'message',
+      //   component:Message
+      // },
       // 开发者设置
       {
         path:'/view',
@@ -107,14 +107,14 @@ Vue.use(VueRouter)
     path: '/phoneIndex',
     name: 'phoneIndex',
     component: phoneIndex,
-    redirect:'/phoneHome',
+    redirect:'/phoneBalance',
     children: [
       // 主页
-      {
-        path: '/phoneHome',
-        name: 'phoneHome',
-        component: phoneHome
-      },
+      // {
+      //   path: '/phoneHome',
+      //   name: 'phoneHome',
+      //   component: phoneHome
+      // },
       // 余额充值
       {
         path:'/phoneBalance',
@@ -128,11 +128,11 @@ Vue.use(VueRouter)
         component:phoneOrder
       },
       // 账户日志 phoneMessage
-      {
-        path:'/phoneMessage',
-        name:'phoneMessage',
-        component:phoneMessage
-      },
+      // {
+      //   path:'/phoneMessage',
+      //   name:'phoneMessage',
+      //   component:phoneMessage
+      // },
       // 油卡充值
       {
         path:'/phoneOilCard',

+ 3 - 0
src/utils/constants.js

@@ -54,6 +54,7 @@ export const timeConstant = [
 
 // 通道质量
 export const qualityCon = [
+  {value: 0, label: '默认充值'},
   {value: 1, label: '普充'},
   {value: 2, label: '快充'},
   {value: 3, label: '卡密'},
@@ -61,6 +62,8 @@ export const qualityCon = [
   {value: 5, label: '慢充24小时'},
   {value: 6, label: '慢充6小时'},
   {value: 7, label: '慢充2小时'},
+  {value: 8, label: '慢充48小时'},
+  {value: 9, label: '慢充72小时'},
 ]
 
 // 对账管理

+ 7 - 2
vue.config.js

@@ -1,8 +1,13 @@
 // const targetUrl = 'http://192.168.1.220/'
 
-const targetUrl = 'http://192.168.1.218/'
+// const targetUrl = 'http://192.168.1.218/'
+
+// const targetUrl = 'http://dd.guozipay.com/'
+
+const targetUrl = 'https://admin.xyzshops.cn/'
+
+// const targetUrl = 'https://test.xyzshops.cn/'
 
-// const targetUrl = 'https://www.xyzshops.cn/'
 
 // 椰子临时线上
 // const targetUrl = 'http://121.89.196.45/'