添加长跑节管理页面，健身活动添加时间筛选

6f8241c3 · gaolei · d0a91c7d · 6f8241c3 · 6f8241c3 · 6f8241c3
Commit 6f8241c3 authored Apr 25, 2022 by gaolei
8 changed files
--- a/package-lock.json
+++ b/package-lock.json
@@ -4037,6 +4037,12 @@
        "domelementtype": "1"
      }
    },
+    "domready": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmmirror.com/domready/-/domready-1.0.8.tgz",
+      "integrity": "sha512-uIzsOJUNk+AdGE9a6VDeessoMCzF8RrZvJCX/W8QtyfgdR6Uofn/MvRonih3OtCO79b2VDzDOymuiABrQ4z3XA==",
+      "dev": true
+    },
    "domutils": {
      "version": "1.7.0",
      "resolved": "https://registry.npm.taobao.org/domutils/download/domutils-1.7.0.tgz",
@@ -6621,6 +6627,12 @@
      "integrity": "sha1-Cpf7h2mG6AgcYxFg+PnziRV/AEM=",
      "dev": true
    },
+    "image-size": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmmirror.com/image-size/-/image-size-0.5.5.tgz",
+      "integrity": "sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==",
+      "dev": true
+    },
    "import-cwd": {
      "version": "2.1.0",
      "resolved": "https://registry.npm.taobao.org/import-cwd/download/import-cwd-2.1.0.tgz",
@@ -7761,6 +7773,15 @@
      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
      "dev": true
    },
+    "merge-options": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/merge-options/-/merge-options-1.0.1.tgz",
+      "integrity": "sha512-iuPV41VWKWBIOpBsjoxjDZw8/GbSfZ2mk7N1453bwMrfzdrIk7EzBd+8UVR6rkw67th7xnk9Dytl3J+lHPdxvg==",
+      "dev": true,
+      "requires": {
+        "is-plain-obj": "^1.1"
+      }
+    },
    "merge-source-map": {
      "version": "1.1.0",
      "resolved": "https://registry.npm.taobao.org/merge-source-map/download/merge-source-map-1.1.0.tgz",
@@ -7929,6 +7950,12 @@
        "through2": "^2.0.0"
      }
    },
+    "mitt": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/mitt/-/mitt-1.1.2.tgz",
+      "integrity": "sha512-3btxP0O9iGADGWAkteQ8mzDtEspZqu4I32y4GZYCV5BrwtzdcRpF4dQgNdJadCrbBx7Lu6Sq9AVrerMHR0Hkmw==",
+      "dev": true
+    },
    "mixin-deep": {
      "version": "1.3.2",
      "resolved": "https://registry.npm.taobao.org/mixin-deep/download/mixin-deep-1.3.2.tgz?cache=0&sync_timestamp=1561436244196&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmixin-deep%2Fdownload%2Fmixin-deep-1.3.2.tgz",
@@ -9428,6 +9455,12 @@
        "postcss-value-parser": "^3.0.0"
      }
    },
+    "postcss-prefix-selector": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmmirror.com/postcss-prefix-selector/-/postcss-prefix-selector-1.15.0.tgz",
+      "integrity": "sha512-9taaTPs6I4906QC03zBBt0LfTWAhrqEWlKSj0jRlxrg1yV+O91h0wcquu6krcA5L6aEv3QnCeG8B1vZ5WT4ecQ==",
+      "dev": true
+    },
    "postcss-reduce-initial": {
      "version": "4.0.3",
      "resolved": "https://registry.npm.taobao.org/postcss-reduce-initial/download/postcss-reduce-initial-4.0.3.tgz",
@@ -9492,6 +9525,64 @@
      "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
      "dev": true
    },
+    "posthtml": {
+      "version": "0.9.2",
+      "resolved": "https://registry.npmmirror.com/posthtml/-/posthtml-0.9.2.tgz",
+      "integrity": "sha512-spBB5sgC4cv2YcW03f/IAUN1pgDJWNWD8FzkyY4mArLUMJW+KlQhlmUdKAHQuPfb00Jl5xIfImeOsf6YL8QK7Q==",
+      "dev": true,
+      "requires": {
+        "posthtml-parser": "^0.2.0",
+        "posthtml-render": "^1.0.5"
+      }
+    },
+    "posthtml-parser": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmmirror.com/posthtml-parser/-/posthtml-parser-0.2.1.tgz",
+      "integrity": "sha512-nPC53YMqJnc/+1x4fRYFfm81KV2V+G9NZY+hTohpYg64Ay7NemWWcV4UWuy/SgMupqQ3kJ88M/iRfZmSnxT+pw==",
+      "dev": true,
+      "requires": {
+        "htmlparser2": "^3.8.3",
+        "isobject": "^2.1.0"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmmirror.com/isobject/-/isobject-2.1.0.tgz",
+          "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+          "dev": true,
+          "requires": {
+            "isarray": "1.0.0"
+          }
+        }
+      }
+    },
+    "posthtml-rename-id": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmmirror.com/posthtml-rename-id/-/posthtml-rename-id-1.0.12.tgz",
+      "integrity": "sha512-UKXf9OF/no8WZo9edRzvuMenb6AD5hDLzIepJW+a4oJT+T/Lx7vfMYWT4aWlGNQh0WMhnUx1ipN9OkZ9q+ddEw==",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "1.0.5"
+      }
+    },
+    "posthtml-render": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmmirror.com/posthtml-render/-/posthtml-render-1.4.0.tgz",
+      "integrity": "sha512-W1779iVHGfq0Fvh2PROhCe2QhB8mEErgqzo1wpIt36tCgChafP+hbXIhLDOM8ePJrZcFs0vkNEtdibEWVqChqw==",
+      "dev": true
+    },
+    "posthtml-svg-mode": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/posthtml-svg-mode/-/posthtml-svg-mode-1.0.3.tgz",
+      "integrity": "sha512-hEqw9NHZ9YgJ2/0G7CECOeuLQKZi8HjWLkBaSVtOWjygQ9ZD8P7tqeowYs7WrFdKsWEKG7o+IlsPY8jrr0CJpQ==",
+      "dev": true,
+      "requires": {
+        "merge-options": "1.0.1",
+        "posthtml": "^0.9.2",
+        "posthtml-parser": "^0.2.1",
+        "posthtml-render": "^1.0.6"
+      }
+    },
    "prelude-ls": {
      "version": "1.1.2",
      "resolved": "https://registry.npm.taobao.org/prelude-ls/download/prelude-ls-1.1.2.tgz",
@@ -11419,6 +11510,255 @@
        "has-flag": "^3.0.0"
      }
    },
+    "svg-baker": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmmirror.com/svg-baker/-/svg-baker-1.7.0.tgz",
+      "integrity": "sha512-nibslMbkXOIkqKVrfcncwha45f97fGuAOn1G99YwnwTj8kF9YiM6XexPcUso97NxOm6GsP0SIvYVIosBis1xLg==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.5.0",
+        "clone": "^2.1.1",
+        "he": "^1.1.1",
+        "image-size": "^0.5.1",
+        "loader-utils": "^1.1.0",
+        "merge-options": "1.0.1",
+        "micromatch": "3.1.0",
+        "postcss": "^5.2.17",
+        "postcss-prefix-selector": "^1.6.0",
+        "posthtml-rename-id": "^1.0",
+        "posthtml-svg-mode": "^1.0.3",
+        "query-string": "^4.3.2",
+        "traverse": "^0.6.6"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==",
+              "dev": true
+            }
+          }
+        },
+        "clone": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmmirror.com/clone/-/clone-2.1.2.tgz",
+          "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+          "dev": true
+        },
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmmirror.com/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmmirror.com/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==",
+          "dev": true
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmmirror.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "6.0.3",
+              "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+              "dev": true
+            }
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmmirror.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "6.0.3",
+              "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+              "dev": true
+            }
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "6.0.3",
+              "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz",
+              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+              "dev": true
+            }
+          }
+        },
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-3.1.0.tgz",
+          "integrity": "sha512-3StSelAE+hnRvMs8IdVW7Uhk8CVed5tp+kLLGlBP6WiRAXS21GPGu/Nat4WNPXj2Eoc24B02SaeoyozPMfj0/g==",
+          "dev": true,
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.2.2",
+            "define-property": "^1.0.0",
+            "extend-shallow": "^2.0.1",
+            "extglob": "^2.0.2",
+            "fragment-cache": "^0.2.1",
+            "kind-of": "^5.0.2",
+            "nanomatch": "^1.2.1",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          }
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmmirror.com/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "dev": true,
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "query-string": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmmirror.com/query-string/-/query-string-4.3.4.tgz",
+          "integrity": "sha512-O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q==",
+          "dev": true,
+          "requires": {
+            "object-assign": "^4.1.0",
+            "strict-uri-encode": "^1.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "svg-baker-runtime": {
+      "version": "1.4.7",
+      "resolved": "https://registry.npmmirror.com/svg-baker-runtime/-/svg-baker-runtime-1.4.7.tgz",
+      "integrity": "sha512-Zorfwwj5+lWjk/oxwSMsRdS2sPQQdTmmsvaSpzU+i9ZWi3zugHLt6VckWfnswphQP0LmOel3nggpF5nETbt6xw==",
+      "dev": true,
+      "requires": {
+        "deepmerge": "1.3.2",
+        "mitt": "1.1.2",
+        "svg-baker": "^1.7.0"
+      },
+      "dependencies": {
+        "deepmerge": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-1.3.2.tgz",
+          "integrity": "sha512-qjMjTrk+RKv/sp4RPDpV5CnKhxjFI9p+GkLBOls5A8EEElldYWCWA9zceAkmfd0xIo2aU1nxiaLFoiya2sb6Cg==",
+          "dev": true
+        }
+      }
+    },
+    "svg-sprite-loader": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmmirror.com/svg-sprite-loader/-/svg-sprite-loader-5.2.1.tgz",
+      "integrity": "sha512-n2IZc87rpOeXh+PQFksFMGCfMV/BT01YG+Dlbyjoh2Cz8BSTL5Vi/7KDr86Pt/u1NRDCVb3vY74BF5rKCmqbNA==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.5.0",
+        "deepmerge": "1.3.2",
+        "domready": "1.0.8",
+        "escape-string-regexp": "1.0.5",
+        "loader-utils": "^1.1.0",
+        "svg-baker": "^1.5.0",
+        "svg-baker-runtime": "^1.4.7",
+        "url-slug": "2.0.0"
+      },
+      "dependencies": {
+        "deepmerge": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-1.3.2.tgz",
+          "integrity": "sha512-qjMjTrk+RKv/sp4RPDpV5CnKhxjFI9p+GkLBOls5A8EEElldYWCWA9zceAkmfd0xIo2aU1nxiaLFoiya2sb6Cg==",
+          "dev": true
+        }
+      }
+    },
    "svg-tags": {
      "version": "1.0.0",
      "resolved": "https://registry.npm.taobao.org/svg-tags/download/svg-tags-1.0.0.tgz",
@@ -11749,6 +12089,12 @@
        }
      }
    },
+    "traverse": {
+      "version": "0.6.6",
+      "resolved": "https://registry.npmmirror.com/traverse/-/traverse-0.6.6.tgz",
+      "integrity": "sha512-kdf4JKs8lbARxWdp7RKdNzoJBhGUcIalSYibuGyHJbmk40pOysQ0+QPvlkCOICOivDWU2IJo2rkrxyTK2AH4fw==",
+      "dev": true
+    },
    "trim-newlines": {
      "version": "1.0.0",
      "resolved": "https://registry.npm.taobao.org/trim-newlines/download/trim-newlines-1.0.0.tgz",
@@ -11886,6 +12232,12 @@
      "integrity": "sha1-qcxsx85joKMCP8meNBuUQx1AWlc=",
      "dev": true
    },
+    "unidecode": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmmirror.com/unidecode/-/unidecode-0.1.8.tgz",
+      "integrity": "sha512-SdoZNxCWpN2tXTCrGkPF/0rL2HEq+i2gwRG1ReBvx8/0yTzC3enHfugOf8A9JBShVwwrRIkLX0YcDUGbzjbVCA==",
+      "dev": true
+    },
    "union-value": {
      "version": "1.0.1",
      "resolved": "https://registry.npm.taobao.org/union-value/download/union-value-1.0.1.tgz",
@@ -12065,6 +12417,15 @@
        "requires-port": "^1.0.0"
      }
    },
+    "url-slug": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/url-slug/-/url-slug-2.0.0.tgz",
+      "integrity": "sha512-aiNmSsVgrjCiJ2+KWPferjT46YFKoE8i0YX04BlMVDue022Xwhg/zYlnZ6V9/mP3p8Wj7LEp0myiTkC/p6sxew==",
+      "dev": true,
+      "requires": {
+        "unidecode": "0.1.8"
+      }
+    },
    "use": {
      "version": "3.1.1",
      "resolved": "https://registry.npm.taobao.org/use/download/use-3.1.1.tgz",

--- a/src/assets/img/3UFjQv02188230.png
+++ b/src/assets/img/3UFjQv02188230.png
--- a/src/assets/img/logo1.png
+++ b/src/assets/img/logo1.png
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -47,7 +47,8 @@ export default {
  .header {
    height: 70px!important;
    padding: 0 20px;
-    background: #314057;
+    background: #fff;
+    border-bottom: 1px solid #666;
    box-sizing: border-box;
    position: fixed;
    z-index: 99;
@@ -55,7 +56,7 @@ export default {
    left: 0;
    top: 0;
    .header_inner {display: flex; align-items: center; justify-content: space-between; height: 100%; color: #FEFEFE;
-      h2 {font-size: 22px; font-weight: normal; padding-left: 82px; color: #ddd; position: relative;
+      h2 {font-size: 22px; font-weight: normal; padding-left: 82px; color: #666; position: relative;
        &:before {
          content: "";
          display: block;
@@ -71,7 +72,7 @@ export default {
      }
      ul {float: right;
        li {display: inline-block; vertical-align: middle; font-size: 14px; position: relative; padding: 0 15px;
-          a { color: #ddd;
+          a { color: #999;
          }
          &.change_pwd {
            &:after {

--- a/src/main.js
+++ b/src/main.js
@@ -25,7 +25,7 @@ Vue.prototype.$qs = QS
 Vue.prototype.$previewAlert = previewAlert
 // 开发环境
-const DEVDOMIN = 'http://10.2.98.32:8091/admin/'
+const DEVDOMIN = 'http://10.90.90.46:8081/admin/'
 // 测试环境
 const ALPHADOMIN = 'http://happy.cfldpe.com/admin/'
 // 生产环境

--- a/src/router.js
+++ b/src/router.js
@@ -44,6 +44,7 @@ import Administrator from './views/administrator/index'
 import Shop from './views/shop/index.vue'
 import FitActivity from './views/fitness/FitActivity.vue'
+import runningManager from './views/fitness/RunningManager.vue'
 import ActivityShenhe from './views/fitness/ActivityShenhe.vue'
 // const NewArticle = require(['./views/home/NewArticle'], resolve)
@@ -330,7 +331,16 @@ export default new Router({
              meta: {
                title: '活动审核'
              }
-            }
+            },
+            {
+              path: '/fitness/runningManager',
+              name: 'runningManager',
+              component: runningManager,
+              meta: {
+                title: '长跑节管理',
+                menuTab: true
+              }
+            },
          ]
        },
        {

--- a/src/views/fitness/FitActivity.vue
+++ b/src/views/fitness/FitActivity.vue
 <template>
  <div>
    <div class="btn-warp tr mb20">
+                  <el-col :sm="3" class="pl12">
+                    <el-date-picker
+                      type="datetime"
+                      :clearable="false"
+                      placeholder="选择日期"
+                      v-model="startTime"
+                      :picker-options="pickerOptionsStart"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      style="width: 100%; margin-bottom: 6px; margin-top: 5px">
+                    </el-date-picker>
+                  </el-col>
+                  <el-col class="line tc" :sm="1" style="margin-bottom: 6px; margin-top: 5px">至</el-col>
+                  <el-col :sm="3">
+                    <el-date-picker
+                      type="datetime"
+                      :clearable="false"
+                      placeholder="选择日期"
+                      v-model="endTime"
+                      :picker-options="pickerOptionsEnd"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      style="width: 100%;margin-bottom: 6px; margin-top: 5px">
+                    </el-date-picker>
+                  </el-col>
+       <el-button type="primary" size="small" @click="searchList">搜索</el-button>
      <el-button type="primary" class="el-button-link">
-        <a :href="$baseURL + 'exercise/exerciseActivityApplyExport'">导出</a>
+        <a :href="exportUrl">导出</a>
      </el-button>
      <el-button type="primary" class="el-button-link"><router-link to="/fitness/activityShenhe" style="color: #fff">活动审核</router-link></el-button>
    </div>
@@ -33,7 +59,7 @@
        prop="createTime"
        align="center"
        width="160"
-        label="时间">
+        label="报名时间">
      </el-table-column>
      <el-table-column
        prop="dept"
@@ -74,13 +100,41 @@ export default {
      personIdMdm: '',
      dept: '',
      p: '',
-      c: ''
+      c: '',
+      exportUrl:'',
+      pickerOptionsStart: {
+        disabledDate: time => {
+          if (this.endTime) {
+            return time.getTime() > new Date(this.endTime).getTime()
+          }
+        }
+      },
+      pickerOptionsEnd: {
+        disabledDate: time => {
+          if (this.startTime) {
+            return time.getTime() < new Date(this.startTime).getTime() - 86400000
+          }
+        }
+      },
+      startTime:"",
+      endTime:""
    }
  },
  mounted () {
    this.getActivityList()
  },
  methods: {
+    searchList(){
+      this.exportUrl = this.$baseURL + 'exercise/exerciseActivityApplyExport?'
+      if(!!this.startTime){
+      this.exportUrl += 'activityStartTime='+this.startTime
+      }
+      if(!!this.endTime){
+        this.exportUrl += '&activityEndTime='+this.endTime
+      }
+      console.log(this.exportUrl)
+      this.getActivityList()
+    },
    handleSizeChange: function (size) {
      this.pageSize = size
    },
@@ -89,18 +143,32 @@ export default {
      this.getActivityList()
    },
    getActivityList () {
+      let postObj = {
+        'p': this.currentPage,
+        'c': this.pageSize,
+      }
+      if(!!this.startTime){
+      this.$set(postObj,'activityStartTime',this.startTime)
+      }
+      if(!!this.endTime){
+      this.$set(postObj,'activityEndTime',this.endTime)
+      }
      this.$axios.get('/exercise/exerciseActivityApplyList', {
-        params: {
+        params: postObj
-          'p': this.currentPage,
-          'c': this.pageSize
-        }
      }).then(res => {
        if (res) {
          this.totalPage = res.count
          let list = res.list
          list.map(item => {
-            item.activityTitle = '第五届华夏幸福长跑节线上赛'
+            if(item.exerciseActivityId ==1 ){
-            item.activityTime = '2020年4月30日 16:30 -- 5月5日 22:00'
+              item.activityTitle = '第五届华夏幸福长跑节线上赛'
+              item.activityTime = '2020年4月30日 16:30 -- 5月5日 22:00'
+            } else if(item.exerciseActivityId ==2){
+              item.activityTitle = '第六届华夏幸福长跑节线上赛'
+              item.activityTime = '2022年4月29日 -- 5月22日 22:00'
+            }
          })
          this.photoList = list
        }

--- a/src/views/fitness/RunningManager.vue
+++ b/src/views/fitness/RunningManager.vue
+<template>
+  <div>
+    <el-form ref="form" style="margin-top: 3px">
+            <el-form-item label="活动标题" class="label_1">
+              <el-col :sm="7" class="pl12">{{activityName}}</el-col>
+            </el-form-item>
+            <el-form-item label="报名期限" class="label_2">
+                  <el-col :sm="3" class="pl12">
+                    <el-date-picker
+                      type="datetime"
+                      :clearable="false"
+                      placeholder="选择日期"
+                      v-model="activityStartTime"
+                      :picker-options="pickerOptionsStart"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      style="width: 100%; margin-bottom: 6px; margin-top: 5px">
+                    </el-date-picker>
+                  </el-col>
+                  <el-col class="line tc" :sm="1" style="margin-bottom: 6px; margin-top: 5px">至</el-col>
+                  <el-col :sm="3">
+                    <el-date-picker
+                      type="datetime"
+                      :clearable="false"
+                      placeholder="选择日期"
+                      v-model="activityEndTime"
+                      :picker-options="pickerOptionsEnd"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      style="width: 100%;margin-bottom: 6px; margin-top: 5px">
+                    </el-date-picker>
+                  </el-col>
+            </el-form-item>
+         <el-form-item label="图片上传期限" class="label_2">
+                  <el-col :sm="3" class="pl12">
+                    <el-date-picker
+                      type="datetime"
+                      :clearable="false"
+                      placeholder="选择日期"
+                      v-model="activityUploadStartTime"
+                      :picker-options="pickerOptionsStart2"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      style="width: 100%; margin-bottom: 6px; margin-top: 5px">
+                    </el-date-picker>
+                  </el-col>
+                  <el-col class="line tc" :sm="1" style="margin-bottom: 6px; margin-top: 5px">至</el-col>
+                  <el-col :sm="3">
+                    <el-date-picker
+                      type="datetime"
+                      :clearable="false"
+                      placeholder="选择日期"
+                      v-model="activityUploadEndTime"
+                      :picker-options="pickerOptionsEnd2"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      style="width: 100%;margin-bottom: 6px; margin-top: 5px">
+                    </el-date-picker>
+                  </el-col>
+            </el-form-item>
+          </el-form>
+          <el-row>
+            <el-col :span="5" class="tc" style="padding-top: 50px; padding-bottom: 30px">
+              <el-button type="danger" @click="saveData()">保 存</el-button>
+            </el-col>
+          </el-row>
+  </div>
+</template>
+<script>
+export default {
+  name: 'HappyRunning',
+  data () {
+    return {
+      classifyList: [], // 图集分类
+      classifyId: '', // 图集ID
+      currentPage: 1,
+      pageSize: 10,
+      totalPage: null,
+      photoList: [],
+      centerDialogVisible: false,
+      formLabelWidth: '120px',
+      form: {
+        pictureName: '',
+        pictureOriginalName: '',
+        imgFilePath: '',
+        pictureSize: '',
+        pictureOrder: '',
+        pictureMark: ''
+      },
+        activityStartTime: "",
+        activityEndTime: "",
+        activityName: "第六届华夏幸福长跑节--云开跑",
+        id:"",
+        activityUploadEndTime: "",
+        activityUploadStartTime: "",
+      pickerOptionsStart: {
+        disabledDate: time => {
+          if (this.activityEndTime) {
+            return time.getTime() > new Date(this.activityEndTime).getTime()
+          }
+        }
+      },
+      pickerOptionsEnd: {
+        disabledDate: time => {
+          if (this.activityStartTime) {
+            return time.getTime() < new Date(this.activityStartTime).getTime() - 86400000
+          }
+        }
+      },
+      pickerOptionsStart2: {
+        disabledDate: time => {
+          if (this.activityUploadEndTime) {
+            return time.getTime() > new Date(this.activityUploadEndTime).getTime()
+          }
+        }
+      },
+      pickerOptionsEnd2: {
+        disabledDate: time => {
+          if (this.activityUploadStartTime) {
+            return time.getTime() < new Date(this.activityUploadStartTime).getTime() - 86400000
+          }
+        }
+      },
+    }
+  },
+  mounted () {
+    this.getInfo()
+  },
+  methods: {
+    saveData(){
+        let _this = this
+      let params = {
+        activityEndTime: _this.activityEndTime,
+        activityStartTime: _this.activityStartTime,
+        activityUploadEndTime: _this.activityUploadEndTime,
+        activityUploadStartTime: _this.activityUploadStartTime,
+        id: _this.id
+      }
+      this.$axios.post('/exercise/exerciseActivityUpdate', params)
+        .then(function (res) {
+          if (res) {
+            _this.$message({
+              type: 'success',
+              message: '操作成功!'
+            })
+          }
+        })
+    },
+    getInfo(){
+        let _this = this
+      this.$axios.get('/exercise/exerciseActivityInfo', {}).then(function (res) {
+         console.log(res)
+         if(res){
+            _this.activityStartTime = res.activityStartTime
+            _this.activityEndTime = res.activityEndTime
+            _this.activityName =res.activityName
+            _this.activityUploadEndTime = res.activityUploadEndTime
+            _this.activityUploadStartTime = res.activityUploadStartTime
+            _this.id = res.id
+         }
+      })
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+  .avatar {
+    width: 178px;
+    height: auto;
+    max-height: 100px;
+    overflow: hidden;
+    display: block;
+    margin: auto;
+  }
+  .upload_infor {
+    padding-left: 20px;
+    p {
+      em {color: #D0021B;}
+    }
+  }
+</style>