订单管理-客户单号修改为椰子单号，时间筛选添加默认值

src/main.js

@@ -6,7 +6,8 @@ import App from './App.vue'
 import router from './router'
 import axios from 'axios'
 Vue.prototype.$axios = axios
-import 'lib-flexible'
+// import 'lib-flexible'
+import '@/utils/flexible'
 
 
 Vue.use(ElementUI);

src/pages/subPages/balance.vue

@@ -19,23 +19,13 @@
             </el-form>
         </el-col>
         <el-col :span="14">
-            <el-form label-width="152px" :model="balanceForm" :rules="balanceRules">
+            <el-form label-width="152px" :model="balanceForm">
                 <el-form-item label="当前余额：">
                     {{available_predeposit}}
                 </el-form-item>
                 <el-form-item
                     label="余额预警："
                     prop="alarm_amount">
-                    <!-- <el-input
-                        size="small"
-                        v-model="balanceForm.alarm_amount"
-                        autocomplete="off"
-                        style="width: 140px;margin-right:10px"
-                        onkeyup="value=value.replace(/[^\d.]/g,'')"
-                        @blur="balanceForm.alarm_amount = $event.target.value"
-                        ></el-input>
-                    <el-button type="primary" size="small" @click="onBalance">设置</el-button>
-                    <span style="color:rgb(255 1 1 / 0.7);margin-left:10px;font-size:12px;">建议设置50000及以上余额预警</span> -->
                     <template v-if="balanceForm.alarm_amount">
                         {{balanceForm.alarm_amount}}
                     </template>
@@ -45,7 +35,6 @@
                     <template v-if="this.cWarningList">
                         <span style="display: block;height: 30px;">{{this.cWarningList}}</span>
                     </template>
-                    <!-- 请设置余额预警电话，当账户所剩余额达到预警额度时，将会给预留电话发送短信提醒，以免给您的业务带来不便。每隔五分钟提醒一次，最多提示五次。 -->
                     <span v-else style="color:rgb(255 1 1 / 0.7);font-size:12px;line-height:20px;display: inline-block;margin-top: 9px;">当前还未设置预警电话，请去设置页面设置预警电话。</span>
                 </el-form-item>
                 <el-form-item label="今日已申请成功次数：">
@@ -229,34 +218,6 @@ import { balanceType } from '@/utils/constants'
 export default {
     name: 'balance',
     data() {
-        var checkAmount = (rule, value, callback) => {
-            console.log('rule', rule, value);
-            console.log('value', value);
-            if (value === '') {
-                return callback(new Error('余额预警不能为空'));
-            } else if (value.indexOf(".") != -1 && value.split('.').length > 2) {
-                callback(new Error('请输入正确格式，只能有一位小数点'));
-            } else if (value.indexOf(".") != -1 && value.split('.')[1].length > 2) {
-                callback(new Error('小数点后面只能有两位'));
-            } else {
-                var Money = parseFloat(value).toFixed(3);
-                var MoneyResult = Money.substring(0, Money.length - 1);
-                var xsd = MoneyResult.toString().split(".");
-                // console.log('Money', Money, MoneyResult, xsd, xsd[1].length);
-                if (xsd.length == 1) {
-                    this.balanceForm.alarm_amount = creditResult.toString() + ".00";
-                }
-                if (xsd.length > 1) {
-                    if (xsd[1].length == 1) {
-                        this.balanceForm.alarm_amount = MoneyResult;
-                    }
-                    if (xsd[1].length > 1) {
-                        this.balanceForm.alarm_amount = xsd[0].toString() + "." + xsd[1].toString().substring(0, 2);
-                    }
-                }
-                callback()
-            }
-        };
         return {
             tableData: [
                 // {id: 1, money: '100', recharge_code: ''},
@@ -323,11 +284,6 @@ export default {
             },
             // 当前余额
             available_predeposit: '',
-            balanceRules: {
-                alarm_amount: [
-                    {validator: checkAmount, trigger: 'blur'}
-                ]
-            },
             // 近日已申请次数
             evidence_count: '',
             // 预警电话列表
@@ -623,26 +579,6 @@ export default {
                 console.log(error);
             }
         },
-        // 设置余额预警
-        async onBalance() {
-            try {
-                // if (!this.warningList.length) {
-                //     this.warningDialogVisible = true
-                //     return
-                // }
-                let param = new URLSearchParams()
-                param.append('alarm_amount', this.balanceForm.alarm_amount)
-                const res = await onSubUser(param)
-                // console.log('设置余额预警', res);
-                if (res && res.code == 200) {
-                    this.getUserInfo()
-                    this.$message.success('设置余额预警成功')
-                }
-            } catch (error) {
-                console.log(error);
-                this.$message.error('设置余额预警失败')
-            }
-        },
         // 开户人姓名
         querySearch(queryString, cb) {
             // 调用 callback 返回建议列表的数据

src/pages/subPages/order.vue

@@ -9,7 +9,7 @@
             clearable></el-input>
         <el-input
             style="width:200px;margin-bottom:20px;margin-right: 10px;"
-            placeholder="请输入平台单号"
+            placeholder="请输入椰子单号"
             v-model.trim="order_sn"
             clearable></el-input>
         <el-input
@@ -77,7 +77,7 @@
         <el-table-column align="center" prop="refill_amount" label="充值面额" width="80"></el-table-column>
         <el-table-column align="center" prop="card_type_name" label="充值卡类型" width="95"></el-table-column>
         <el-table-column align="center" prop="order_time" width="160" label="充值时间"></el-table-column>
-        <el-table-column align="center" prop="diff_time_text" width="70" label="耗时"></el-table-column>
+        <el-table-column align="center" prop="diff_time_text" width="80" label="耗时"></el-table-column>
         <el-table-column align="center" label="充值状态" width="85">
             <template slot-scope="{row}">
                 <el-tag type = 'success' v-if="row.order_state == '40'">充值成功</el-tag>
@@ -88,7 +88,7 @@
             </template>
         </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="180" label="椰子单号"></el-table-column>
         <el-table-column align="center" prop="official_sn" width="250" label="官方流水号">
             <template slot-scope="{row}">
                 {{row.official_sn ? row.official_sn : '无'}}
@@ -158,6 +158,7 @@ export default {
     },
     created () {
         this.getOrderList()
+        this.fetchData()
     },
     // 监听器
     watch: {
@@ -281,6 +282,18 @@ export default {
                 }
             }
         },
+        // 设置默认日期
+        fetchData() {
+            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()
+            this.dataRange[0] = timeStart
+            this.dataRange[1] = timeEnd
+        }
     },
 };
 </script>

src/utils/constants.js

@@ -19,6 +19,8 @@ export const balanceType = [
 
 // 充值卡类型
 export const moneyType = [
+  {value: 'oil', label: '油卡'},
+  {value: 'phone', label: '手机卡'},
   {value: 1, label: '中石油'},
   {value: 2, label: '中石化'},
   {value: 4, label: '中国移动'},

src/utils/flexible.js

@@ -0,0 +1,125 @@
+
+;(function(win, lib) {
+  var doc = win.document;
+  var docEl = doc.documentElement;
+  var metaEl = doc.querySelector('meta[name="viewport"]');
+  var flexibleEl = doc.querySelector('meta[name="flexible"]');
+  var dpr = 0;
+  var scale = 0;
+  var tid;
+  var flexible = lib.flexible || (lib.flexible = {});
+
+  if (metaEl) {
+      console.warn('将根据已有的meta标签来设置缩放比例');
+      var match = metaEl.getAttribute('content').match(/initial\-scale=([\d\.]+)/);
+      if (match) {
+          scale = parseFloat(match[1]);
+          dpr = parseInt(1 / scale);
+      }
+  } else if (flexibleEl) {
+      var content = flexibleEl.getAttribute('content');
+      if (content) {
+          var initialDpr = content.match(/initial\-dpr=([\d\.]+)/);
+          var maximumDpr = content.match(/maximum\-dpr=([\d\.]+)/);
+          if (initialDpr) {
+              dpr = parseFloat(initialDpr[1]);
+              scale = parseFloat((1 / dpr).toFixed(2));
+          }
+          if (maximumDpr) {
+              dpr = parseFloat(maximumDpr[1]);
+              scale = parseFloat((1 / dpr).toFixed(2));
+          }
+      }
+  }
+
+  if (!dpr && !scale) {
+      var isAndroid = win.navigator.appVersion.match(/android/gi);
+      var isIPhone = win.navigator.appVersion.match(/iphone/gi);
+      var devicePixelRatio = win.devicePixelRatio;
+      if (isIPhone) {
+          // iOS下，对于2和3的屏，用2倍的方案，其余的用1倍方案
+          if (devicePixelRatio >= 3 && (!dpr || dpr >= 3)) {
+              dpr = 3;
+          } else if (devicePixelRatio >= 2 && (!dpr || dpr >= 2)){
+              dpr = 2;
+          } else {
+              dpr = 1;
+          }
+      } else {
+          // 其他设备下，仍旧使用1倍的方案
+          dpr = 1;
+      }
+      scale = 1 / dpr;
+  }
+
+  docEl.setAttribute('data-dpr', dpr);
+  if (!metaEl) {
+      metaEl = doc.createElement('meta');
+      metaEl.setAttribute('name', 'viewport');
+      metaEl.setAttribute('content', 'initial-scale=' + scale + ', maximum-scale=' + scale + ', minimum-scale=' + scale + ', user-scalable=no');
+      if (docEl.firstElementChild) {
+          docEl.firstElementChild.appendChild(metaEl);
+      } else {
+          var wrap = doc.createElement('div');
+          wrap.appendChild(metaEl);
+          doc.write(wrap.innerHTML);
+      }
+  }
+
+  function refreshRem(){
+      var width = docEl.getBoundingClientRect().width;
+      // if (width / dpr > 540) {
+      //     // width = 540 * dpr;
+      //     width = width * dpr;
+      // }
+      if (width / dpr > 1100) {
+          // width = 540 * dpr;
+          width = width * dpr;
+      } else {
+          width = 1100 * dpr;
+      }
+      var rem = width / 10;
+      docEl.style.fontSize = rem + 'px';
+      flexible.rem = win.rem = rem;
+  }
+
+  win.addEventListener('resize', function() {
+      clearTimeout(tid);
+      tid = setTimeout(refreshRem, 300);
+  }, false);
+  win.addEventListener('pageshow', function(e) {
+      if (e.persisted) {
+          clearTimeout(tid);
+          tid = setTimeout(refreshRem, 300);
+      }
+  }, false);
+
+  if (doc.readyState === 'complete') {
+      doc.body.style.fontSize = 12 * dpr + 'px';
+  } else {
+      doc.addEventListener('DOMContentLoaded', function(e) {
+          doc.body.style.fontSize = 12 * dpr + 'px';
+      }, false);
+  }
+
+
+  refreshRem();
+
+  flexible.dpr = win.dpr = dpr;
+  flexible.refreshRem = refreshRem;
+  flexible.rem2px = function(d) {
+      var val = parseFloat(d) * this.rem;
+      if (typeof d === 'string' && d.match(/rem$/)) {
+          val += 'px';
+      }
+      return val;
+  }
+  flexible.px2rem = function(d) {
+      var val = parseFloat(d) / this.rem;
+      if (typeof d === 'string' && d.match(/px$/)) {
+          val += 'rem';
+      }
+      return val;
+  }
+
+})(window, window['lib'] || (window['lib'] = {}));