1

8876ee97 · 毛细亚 · 68877eac · 8876ee97 · 8876ee97 · 8876ee97
--- a/company_app/index.html
+++ b/company_app/index.html
-<!DOCTYPE html>
-<html lang="">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="favicon.ico">
-    <title>company_app</title>
-    <!-- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0,shrink-to-fit=no,user-scalable=no"> -->
-    <script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script>
-  <script defer src="static/js/chunk-vendors.js"></script><script defer src="static/js/app.js"></script></head>
-  <body>
-    <noscript>
-      <strong>We're sorry but company_app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-    <div id="app"></div>
-  </body>
-</html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><meta http-equiv="pragma" content="no-cache"><meta http-equiv="cache-control" content="no-cache"><meta http-equiv="expires" content="0"><meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9"/><title>company_app</title><script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script><script defer="defer" src="static/js/chunk-vendors.fc0c503d.js"></script><script defer="defer" src="static/js/app.d9997098.js"></script><link href="static/css/chunk-vendors.8e901099.css" rel="stylesheet"><link href="static/css/app.1a206877.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but company_app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
\ No newline at end of file
--- a/public/index.html
+++ b/public/index.html
@@ -5,6 +5,13 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <!-- HTTP 1.1 -->
+    <meta http-equiv="pragma" content="no-cache">
+    <!-- HTTP 1.0 -->
+    <meta http-equiv="cache-control" content="no-cache">
+    <!-- Prevent caching at the proxy server -->
+    <meta http-equiv="expires" content="0">
+    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9" />
    <title><%= htmlWebpackPlugin.options.title %></title>
    <!-- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0,shrink-to-fit=no,user-scalable=no"> -->
    <script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script>

--- a/src/views/orderList.vue
+++ b/src/views/orderList.vue
@@ -48,11 +48,9 @@
                  <el-option v-for="item in payList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
                </el-select>
              </el-form-item>
-              
              <el-form-item label="下单时间:">
                <selectDate :width="'100%'" :defaultValue="searchDate" @result="dateResult"/>
              </el-form-item>
-              
              <el-form-item label="角色名称:" >
                <searchSelect style="width: 100%" placeholder="请输入角色名称" @result="selectResult" />
              </el-form-item>
@@ -405,7 +403,7 @@
        this.loading = true
        this.pageInfo.page += 1
        const data = {
-          status: this.activeType,
+          status: this.activeType===4?'':this.activeType,
          pay_type: this.pay_type ? this.pay_type.join(',') : '',
          member_id: this.accountSelect,
          role_id: this.role_id,