diff --git a/package-lock.json b/package-lock.json
index 7db7dc1..347e8e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,13 +10,14 @@
       "dependencies": {
         "axios": "^0.24.0",
         "good-storage": "^1.1.1",
-        "jquery": "^3.5.1",
+        "jquery": "^2.2.3",
         "mobile-detect": "^1.4.5",
         "static-extend": "^0.1.2",
         "vue": "^2.5.2",
         "vue-awesome-swiper": "^4.1.1",
         "vue-router": "^3.0.1",
-        "vue-seamless-scroll": "^1.1.23"
+        "vue-seamless-scroll": "^1.1.23",
+        "vue-touch": "^2.0.0-beta.4"
       },
       "devDependencies": {
         "autoprefixer": "^7.1.2",
@@ -1263,8 +1264,7 @@
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.nlark.com/balanced-match/download/balanced-match-1.0.2.tgz",
-      "integrity": "sha1-6D46fj8wCzTLnYf2FfoMvzV2kO4=",
-      "dev": true
+      "integrity": "sha1-6D46fj8wCzTLnYf2FfoMvzV2kO4="
     },
     "node_modules/base": {
       "version": "0.11.2",
@@ -1415,7 +1415,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.nlark.com/brace-expansion/download/brace-expansion-1.1.11.tgz",
       "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
-      "dev": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -1440,6 +1439,19 @@
       "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
       "dev": true
     },
+    "node_modules/browser-resolve": {
+      "version": "1.11.3",
+      "resolved": "https://registry.nlark.com/browser-resolve/download/browser-resolve-1.11.3.tgz",
+      "integrity": "sha1-m3y7PQ9RDky4a9vXlhJNKLWJCvY=",
+      "dependencies": {
+        "resolve": "1.1.7"
+      }
+    },
+    "node_modules/browser-resolve/node_modules/resolve": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmmirror.com/resolve/download/resolve-1.1.7.tgz",
+      "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
+    },
     "node_modules/browserify-aes": {
       "version": "1.2.0",
       "resolved": "https://registry.npm.taobao.org/browserify-aes/download/browserify-aes-1.2.0.tgz",
@@ -1576,6 +1588,14 @@
       "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
       "dev": true
     },
+    "node_modules/builtin-modules": {
+      "version": "1.1.1",
+      "resolved": "https://registry.nlark.com/builtin-modules/download/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/builtin-status-codes": {
       "version": "3.0.0",
       "resolved": "https://registry.npm.taobao.org/builtin-status-codes/download/builtin-status-codes-3.0.0.tgz",
@@ -2213,8 +2233,7 @@
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.nlark.com/concat-map/download/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "node_modules/concat-stream": {
       "version": "1.6.2",
@@ -4157,6 +4176,11 @@
         "node": ">=4.0"
       }
     },
+    "node_modules/estree-walker": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmmirror.com/estree-walker/download/estree-walker-0.3.1.tgz",
+      "integrity": "sha1-5rGlHPcpJSTnI3wxLl/mZgwc4ao="
+    },
     "node_modules/esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.nlark.com/esutils/download/esutils-2.0.3.tgz",
@@ -4841,8 +4865,7 @@
     "node_modules/function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.nlark.com/function-bind/download/function-bind-1.1.1.tgz",
-      "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=",
-      "dev": true
+      "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0="
     },
     "node_modules/get-caller-file": {
       "version": "1.0.3",
@@ -4987,6 +5010,14 @@
         "node": ">=4"
       }
     },
+    "node_modules/hammerjs": {
+      "version": "2.0.8",
+      "resolved": "https://registry.nlark.com/hammerjs/download/hammerjs-2.0.8.tgz",
+      "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/handle-thing": {
       "version": "2.0.1",
       "resolved": "https://registry.nlark.com/handle-thing/download/handle-thing-2.0.1.tgz",
@@ -4997,7 +5028,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.nlark.com/has/download/has-1.0.3.tgz",
       "integrity": "sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y=",
-      "dev": true,
       "dependencies": {
         "function-bind": "^1.1.1"
       },
@@ -5710,7 +5740,6 @@
       "version": "2.8.0",
       "resolved": "https://registry.npmmirror.com/is-core-module/download/is-core-module-2.8.0.tgz?cache=0&sync_timestamp=1634236731601&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-core-module%2Fdownload%2Fis-core-module-2.8.0.tgz",
       "integrity": "sha1-AyEzbD0JJeSX/Zf12VyxFKXM1Ug=",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "has": "^1.0.3"
@@ -6043,9 +6072,9 @@
       }
     },
     "node_modules/jquery": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmmirror.com/jquery/download/jquery-3.6.0.tgz",
-      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
+      "version": "2.2.4",
+      "resolved": "https://registry.npmmirror.com/jquery/download/jquery-2.2.4.tgz",
+      "integrity": "sha512-lBHj60ezci2u1v2FqnZIraShGgEXq35qCzMv4lITyHGppTnA13rwR0MgwyNJh9TnDs3aXUvd1xjAotfraMHX/Q=="
     },
     "node_modules/js-base64": {
       "version": "2.6.4",
@@ -6353,6 +6382,14 @@
         "yallist": "^2.1.2"
       }
     },
+    "node_modules/magic-string": {
+      "version": "0.16.0",
+      "resolved": "https://registry.nlark.com/magic-string/download/magic-string-0.16.0.tgz",
+      "integrity": "sha1-lw67DacZMwEoX7GqZQ85vdgetFo=",
+      "dependencies": {
+        "vlq": "^0.2.1"
+      }
+    },
     "node_modules/make-dir": {
       "version": "1.3.0",
       "resolved": "https://registry.nlark.com/make-dir/download/make-dir-1.3.0.tgz",
@@ -6692,7 +6729,6 @@
       "version": "3.0.4",
       "resolved": "https://registry.nlark.com/minimatch/download/minimatch-3.0.4.tgz",
       "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-      "dev": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -7536,8 +7572,7 @@
     "node_modules/path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.nlark.com/path-parse/download/path-parse-1.0.7.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpath-parse%2Fdownload%2Fpath-parse-1.0.7.tgz",
-      "integrity": "sha1-+8EUtgykKzDZ2vWFjkvWi77bZzU=",
-      "dev": true
+      "integrity": "sha1-+8EUtgykKzDZ2vWFjkvWi77bZzU="
     },
     "node_modules/path-to-regexp": {
       "version": "0.1.7",
@@ -10831,7 +10866,6 @@
       "version": "1.20.0",
       "resolved": "https://registry.nlark.com/resolve/download/resolve-1.20.0.tgz",
       "integrity": "sha1-YpoBP7P3B1XW8LeTXMHCxTeLGXU=",
-      "dev": true,
       "dependencies": {
         "is-core-module": "^2.2.0",
         "path-parse": "^1.0.6"
@@ -10933,6 +10967,100 @@
         "inherits": "^2.0.1"
       }
     },
+    "node_modules/rollup-plugin-cleanup": {
+      "version": "0.1.4",
+      "resolved": "https://registry.nlark.com/rollup-plugin-cleanup/download/rollup-plugin-cleanup-0.1.4.tgz",
+      "integrity": "sha1-n+06tDAJiKiC1j3jMh5BDNr8YzE=",
+      "dependencies": {
+        "acorn": "^3.3.0",
+        "magic-string": "^0.16.0",
+        "rollup-pluginutils": "^1.5.2"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/rollup-plugin-cleanup/node_modules/acorn": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmmirror.com/acorn/download/acorn-3.3.0.tgz",
+      "integrity": "sha512-OLUyIIZ7mF5oaAUT1w0TFqQS81q3saT46x8t7ukpPjMNk+nbs4ZHhs7ToV8EWnLYLepjETXd4XaCE4uxkMeqUw==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/rollup-plugin-commonjs": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmmirror.com/rollup-plugin-commonjs/download/rollup-plugin-commonjs-7.1.0.tgz",
+      "integrity": "sha1-w6dywuSl+hNQf1xXi2bME7DLink=",
+      "deprecated": "This package has been deprecated and is no longer maintained. Please use @rollup/plugin-commonjs.",
+      "dependencies": {
+        "acorn": "^4.0.1",
+        "estree-walker": "^0.3.0",
+        "magic-string": "^0.19.0",
+        "resolve": "^1.1.7",
+        "rollup-pluginutils": "^2.0.1"
+      }
+    },
+    "node_modules/rollup-plugin-commonjs/node_modules/acorn": {
+      "version": "4.0.13",
+      "resolved": "https://registry.npmmirror.com/acorn/download/acorn-4.0.13.tgz",
+      "integrity": "sha512-fu2ygVGuMmlzG8ZeRJ0bvR41nsAkxxhbyk8bZ1SS521Z7vmgJFTQQlfz/Mp/nJexGBz+v8sC9bM6+lNgskt4Ug==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/rollup-plugin-commonjs/node_modules/magic-string": {
+      "version": "0.19.1",
+      "resolved": "https://registry.nlark.com/magic-string/download/magic-string-0.19.1.tgz",
+      "integrity": "sha1-FNdoATyvLsj96hakmvgvw3fnUgE=",
+      "dependencies": {
+        "vlq": "^0.2.1"
+      }
+    },
+    "node_modules/rollup-plugin-commonjs/node_modules/rollup-pluginutils": {
+      "version": "2.8.2",
+      "resolved": "https://registry.nlark.com/rollup-pluginutils/download/rollup-pluginutils-2.8.2.tgz",
+      "integrity": "sha1-cvKvB0i1kjZNvTOJ5gDlqURKNR4=",
+      "dependencies": {
+        "estree-walker": "^0.6.1"
+      }
+    },
+    "node_modules/rollup-plugin-commonjs/node_modules/rollup-pluginutils/node_modules/estree-walker": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmmirror.com/estree-walker/download/estree-walker-0.6.1.tgz",
+      "integrity": "sha1-UwSRQ/QMbrkYsjZx0f4yGfOhs2I="
+    },
+    "node_modules/rollup-plugin-node-resolve": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/rollup-plugin-node-resolve/download/rollup-plugin-node-resolve-2.1.1.tgz",
+      "integrity": "sha1-y7eDsNFbAnlNWJFTULLw2QK43cg=",
+      "deprecated": "This package has been deprecated and is no longer maintained. Please use @rollup/plugin-node-resolve.",
+      "dependencies": {
+        "browser-resolve": "^1.11.0",
+        "builtin-modules": "^1.1.0",
+        "resolve": "^1.1.6"
+      }
+    },
+    "node_modules/rollup-pluginutils": {
+      "version": "1.5.2",
+      "resolved": "https://registry.nlark.com/rollup-pluginutils/download/rollup-pluginutils-1.5.2.tgz",
+      "integrity": "sha1-HhVud4+UtyVb+hs9AXi+j1xVJAg=",
+      "dependencies": {
+        "estree-walker": "^0.2.1",
+        "minimatch": "^3.0.2"
+      }
+    },
+    "node_modules/rollup-pluginutils/node_modules/estree-walker": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmmirror.com/estree-walker/download/estree-walker-0.2.1.tgz",
+      "integrity": "sha1-va/oCVOD2EFNXcLs9MkXO225QS4="
+    },
     "node_modules/run-queue": {
       "version": "1.0.3",
       "resolved": "https://registry.nlark.com/run-queue/download/run-queue-1.0.3.tgz",
@@ -12729,6 +12857,11 @@
       "integrity": "sha1-4rgApT56Kbk1BsPPQRANFsTErY4=",
       "dev": true
     },
+    "node_modules/vlq": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmmirror.com/vlq/download/vlq-0.2.3.tgz?cache=0&sync_timestamp=1634578054719&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvlq%2Fdownload%2Fvlq-0.2.3.tgz",
+      "integrity": "sha1-jz5DKM9jsVQMDWfhsneDhviXWyY="
+    },
     "node_modules/vm-browserify": {
       "version": "1.1.2",
       "resolved": "https://registry.nlark.com/vm-browserify/download/vm-browserify-1.1.2.tgz",
@@ -12876,6 +13009,17 @@
       "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=",
       "dev": true
     },
+    "node_modules/vue-touch": {
+      "version": "2.0.0-beta.4",
+      "resolved": "https://registry.nlark.com/vue-touch/download/vue-touch-2.0.0-beta.4.tgz",
+      "integrity": "sha1-Alml+/if7RLV5deJ//uZuHSuBQE=",
+      "dependencies": {
+        "hammerjs": "^2.0.8",
+        "rollup-plugin-cleanup": "^0.1.4",
+        "rollup-plugin-commonjs": "^7.0.0",
+        "rollup-plugin-node-resolve": "^2.0.0"
+      }
+    },
     "node_modules/watchpack": {
       "version": "1.7.5",
       "resolved": "https://registry.npmmirror.com/watchpack/download/watchpack-1.7.5.tgz",
@@ -15174,8 +15318,7 @@
     "balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.nlark.com/balanced-match/download/balanced-match-1.0.2.tgz",
-      "integrity": "sha1-6D46fj8wCzTLnYf2FfoMvzV2kO4=",
-      "dev": true
+      "integrity": "sha1-6D46fj8wCzTLnYf2FfoMvzV2kO4="
     },
     "base": {
       "version": "0.11.2",
@@ -15311,7 +15454,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.nlark.com/brace-expansion/download/brace-expansion-1.1.11.tgz",
       "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
-      "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -15333,6 +15475,21 @@
       "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
       "dev": true
     },
+    "browser-resolve": {
+      "version": "1.11.3",
+      "resolved": "https://registry.nlark.com/browser-resolve/download/browser-resolve-1.11.3.tgz",
+      "integrity": "sha1-m3y7PQ9RDky4a9vXlhJNKLWJCvY=",
+      "requires": {
+        "resolve": "1.1.7"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.1.7",
+          "resolved": "https://registry.npmmirror.com/resolve/download/resolve-1.1.7.tgz",
+          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
+        }
+      }
+    },
     "browserify-aes": {
       "version": "1.2.0",
       "resolved": "https://registry.npm.taobao.org/browserify-aes/download/browserify-aes-1.2.0.tgz",
@@ -15464,6 +15621,11 @@
       "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
       "dev": true
     },
+    "builtin-modules": {
+      "version": "1.1.1",
+      "resolved": "https://registry.nlark.com/builtin-modules/download/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
+    },
     "builtin-status-codes": {
       "version": "3.0.0",
       "resolved": "https://registry.npm.taobao.org/builtin-status-codes/download/builtin-status-codes-3.0.0.tgz",
@@ -15998,8 +16160,7 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.nlark.com/concat-map/download/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "concat-stream": {
       "version": "1.6.2",
@@ -17650,6 +17811,11 @@
       "integrity": "sha1-OYrT88WiSUi+dyXoPRGn3ijNvR0=",
       "dev": true
     },
+    "estree-walker": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmmirror.com/estree-walker/download/estree-walker-0.3.1.tgz",
+      "integrity": "sha1-5rGlHPcpJSTnI3wxLl/mZgwc4ao="
+    },
     "esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.nlark.com/esutils/download/esutils-2.0.3.tgz",
@@ -18205,8 +18371,7 @@
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.nlark.com/function-bind/download/function-bind-1.1.1.tgz",
-      "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=",
-      "dev": true
+      "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0="
     },
     "get-caller-file": {
       "version": "1.0.3",
@@ -18324,6 +18489,11 @@
         "pify": "^3.0.0"
       }
     },
+    "hammerjs": {
+      "version": "2.0.8",
+      "resolved": "https://registry.nlark.com/hammerjs/download/hammerjs-2.0.8.tgz",
+      "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
+    },
     "handle-thing": {
       "version": "2.0.1",
       "resolved": "https://registry.nlark.com/handle-thing/download/handle-thing-2.0.1.tgz",
@@ -18334,7 +18504,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.nlark.com/has/download/has-1.0.3.tgz",
       "integrity": "sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y=",
-      "dev": true,
       "requires": {
         "function-bind": "^1.1.1"
       }
@@ -18928,7 +19097,6 @@
       "version": "2.8.0",
       "resolved": "https://registry.npmmirror.com/is-core-module/download/is-core-module-2.8.0.tgz?cache=0&sync_timestamp=1634236731601&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-core-module%2Fdownload%2Fis-core-module-2.8.0.tgz",
       "integrity": "sha1-AyEzbD0JJeSX/Zf12VyxFKXM1Ug=",
-      "dev": true,
       "requires": {
         "has": "^1.0.3"
       }
@@ -19172,9 +19340,9 @@
       "dev": true
     },
     "jquery": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmmirror.com/jquery/download/jquery-3.6.0.tgz",
-      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
+      "version": "2.2.4",
+      "resolved": "https://registry.npmmirror.com/jquery/download/jquery-2.2.4.tgz",
+      "integrity": "sha512-lBHj60ezci2u1v2FqnZIraShGgEXq35qCzMv4lITyHGppTnA13rwR0MgwyNJh9TnDs3aXUvd1xjAotfraMHX/Q=="
     },
     "js-base64": {
       "version": "2.6.4",
@@ -19425,6 +19593,14 @@
         "yallist": "^2.1.2"
       }
     },
+    "magic-string": {
+      "version": "0.16.0",
+      "resolved": "https://registry.nlark.com/magic-string/download/magic-string-0.16.0.tgz",
+      "integrity": "sha1-lw67DacZMwEoX7GqZQ85vdgetFo=",
+      "requires": {
+        "vlq": "^0.2.1"
+      }
+    },
     "make-dir": {
       "version": "1.3.0",
       "resolved": "https://registry.nlark.com/make-dir/download/make-dir-1.3.0.tgz",
@@ -19705,7 +19881,6 @@
       "version": "3.0.4",
       "resolved": "https://registry.nlark.com/minimatch/download/minimatch-3.0.4.tgz",
       "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-      "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -20390,8 +20565,7 @@
     "path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.nlark.com/path-parse/download/path-parse-1.0.7.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpath-parse%2Fdownload%2Fpath-parse-1.0.7.tgz",
-      "integrity": "sha1-+8EUtgykKzDZ2vWFjkvWi77bZzU=",
-      "dev": true
+      "integrity": "sha1-+8EUtgykKzDZ2vWFjkvWi77bZzU="
     },
     "path-to-regexp": {
       "version": "0.1.7",
@@ -23131,7 +23305,6 @@
       "version": "1.20.0",
       "resolved": "https://registry.nlark.com/resolve/download/resolve-1.20.0.tgz",
       "integrity": "sha1-YpoBP7P3B1XW8LeTXMHCxTeLGXU=",
-      "dev": true,
       "requires": {
         "is-core-module": "^2.2.0",
         "path-parse": "^1.0.6"
@@ -23214,6 +23387,91 @@
         "inherits": "^2.0.1"
       }
     },
+    "rollup-plugin-cleanup": {
+      "version": "0.1.4",
+      "resolved": "https://registry.nlark.com/rollup-plugin-cleanup/download/rollup-plugin-cleanup-0.1.4.tgz",
+      "integrity": "sha1-n+06tDAJiKiC1j3jMh5BDNr8YzE=",
+      "requires": {
+        "acorn": "^3.3.0",
+        "magic-string": "^0.16.0",
+        "rollup-pluginutils": "^1.5.2"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmmirror.com/acorn/download/acorn-3.3.0.tgz",
+          "integrity": "sha512-OLUyIIZ7mF5oaAUT1w0TFqQS81q3saT46x8t7ukpPjMNk+nbs4ZHhs7ToV8EWnLYLepjETXd4XaCE4uxkMeqUw=="
+        }
+      }
+    },
+    "rollup-plugin-commonjs": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmmirror.com/rollup-plugin-commonjs/download/rollup-plugin-commonjs-7.1.0.tgz",
+      "integrity": "sha1-w6dywuSl+hNQf1xXi2bME7DLink=",
+      "requires": {
+        "acorn": "^4.0.1",
+        "estree-walker": "^0.3.0",
+        "magic-string": "^0.19.0",
+        "resolve": "^1.1.7",
+        "rollup-pluginutils": "^2.0.1"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "4.0.13",
+          "resolved": "https://registry.npmmirror.com/acorn/download/acorn-4.0.13.tgz",
+          "integrity": "sha512-fu2ygVGuMmlzG8ZeRJ0bvR41nsAkxxhbyk8bZ1SS521Z7vmgJFTQQlfz/Mp/nJexGBz+v8sC9bM6+lNgskt4Ug=="
+        },
+        "magic-string": {
+          "version": "0.19.1",
+          "resolved": "https://registry.nlark.com/magic-string/download/magic-string-0.19.1.tgz",
+          "integrity": "sha1-FNdoATyvLsj96hakmvgvw3fnUgE=",
+          "requires": {
+            "vlq": "^0.2.1"
+          }
+        },
+        "rollup-pluginutils": {
+          "version": "2.8.2",
+          "resolved": "https://registry.nlark.com/rollup-pluginutils/download/rollup-pluginutils-2.8.2.tgz",
+          "integrity": "sha1-cvKvB0i1kjZNvTOJ5gDlqURKNR4=",
+          "requires": {
+            "estree-walker": "^0.6.1"
+          },
+          "dependencies": {
+            "estree-walker": {
+              "version": "0.6.1",
+              "resolved": "https://registry.npmmirror.com/estree-walker/download/estree-walker-0.6.1.tgz",
+              "integrity": "sha1-UwSRQ/QMbrkYsjZx0f4yGfOhs2I="
+            }
+          }
+        }
+      }
+    },
+    "rollup-plugin-node-resolve": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/rollup-plugin-node-resolve/download/rollup-plugin-node-resolve-2.1.1.tgz",
+      "integrity": "sha1-y7eDsNFbAnlNWJFTULLw2QK43cg=",
+      "requires": {
+        "browser-resolve": "^1.11.0",
+        "builtin-modules": "^1.1.0",
+        "resolve": "^1.1.6"
+      }
+    },
+    "rollup-pluginutils": {
+      "version": "1.5.2",
+      "resolved": "https://registry.nlark.com/rollup-pluginutils/download/rollup-pluginutils-1.5.2.tgz",
+      "integrity": "sha1-HhVud4+UtyVb+hs9AXi+j1xVJAg=",
+      "requires": {
+        "estree-walker": "^0.2.1",
+        "minimatch": "^3.0.2"
+      },
+      "dependencies": {
+        "estree-walker": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmmirror.com/estree-walker/download/estree-walker-0.2.1.tgz",
+          "integrity": "sha1-va/oCVOD2EFNXcLs9MkXO225QS4="
+        }
+      }
+    },
     "run-queue": {
       "version": "1.0.3",
       "resolved": "https://registry.nlark.com/run-queue/download/run-queue-1.0.3.tgz",
@@ -24731,6 +24989,11 @@
       "integrity": "sha1-4rgApT56Kbk1BsPPQRANFsTErY4=",
       "dev": true
     },
+    "vlq": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmmirror.com/vlq/download/vlq-0.2.3.tgz?cache=0&sync_timestamp=1634578054719&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvlq%2Fdownload%2Fvlq-0.2.3.tgz",
+      "integrity": "sha1-jz5DKM9jsVQMDWfhsneDhviXWyY="
+    },
     "vm-browserify": {
       "version": "1.1.2",
       "resolved": "https://registry.nlark.com/vm-browserify/download/vm-browserify-1.1.2.tgz",
@@ -24858,6 +25121,17 @@
       "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=",
       "dev": true
     },
+    "vue-touch": {
+      "version": "2.0.0-beta.4",
+      "resolved": "https://registry.nlark.com/vue-touch/download/vue-touch-2.0.0-beta.4.tgz",
+      "integrity": "sha1-Alml+/if7RLV5deJ//uZuHSuBQE=",
+      "requires": {
+        "hammerjs": "^2.0.8",
+        "rollup-plugin-cleanup": "^0.1.4",
+        "rollup-plugin-commonjs": "^7.0.0",
+        "rollup-plugin-node-resolve": "^2.0.0"
+      }
+    },
     "watchpack": {
       "version": "1.7.5",
       "resolved": "https://registry.npmmirror.com/watchpack/download/watchpack-1.7.5.tgz",
diff --git a/package.json b/package.json
index ae54d55..bb5667d 100644
--- a/package.json
+++ b/package.json
@@ -12,13 +12,14 @@
   "dependencies": {
     "axios": "^0.24.0",
     "good-storage": "^1.1.1",
+    "jquery": "^2.2.3",
     "mobile-detect": "^1.4.5",
     "static-extend": "^0.1.2",
     "vue": "^2.5.2",
     "vue-awesome-swiper": "^4.1.1",
     "vue-router": "^3.0.1",
     "vue-seamless-scroll": "^1.1.23",
-	"jquery": "^2.2.3"
+    "vue-touch": "^2.0.0-beta.4"
   },
   "devDependencies": {
     "autoprefixer": "^7.1.2",
diff --git a/src/assets/css/electron.css b/src/assets/css/electron.css
index d4ee92f..c9d9ffe 100644
--- a/src/assets/css/electron.css
+++ b/src/assets/css/electron.css
@@ -75,14 +75,14 @@ img {
 }
 .logo img {
 	/* object-fit: cover; */
-	min-width: 76px;
+	width: 76px;
 	height: 76px;
 	border-radius: 100%;
 	background-color: #9c7cfa;
 	margin-right: 10px;
 }
 .logo div {
-	color: #b7cc56;
+	color: #7557cc;
 	/* font-size: 12.5px; */
 	/* margin-top: 6px; */
 	flex-shrink: 0;
@@ -230,7 +230,7 @@ img {
 	font-size: 30px!important;font-weight: bold!important;
 }
 .meal-box {padding-top: 10px;display: flex;align-items: center;}
-.meal-box img {width: 130px;max-height: 106px; border-radius: 10px;object-fit: cover;margin-right: 34px;}
+.meal-box img {width: 88px;max-height: 88px; border-radius: 10px;object-fit: cover;margin-right: 34px;}
 .meal-box div {font-size: 18px;line-height: 30px;}
 .main-center {
 	margin: 0 20px;
@@ -274,7 +274,7 @@ img {
 }
 .right-content {color: #7557CC;text-align: center;position: relative;
 height: 90%;
-overflow: hidden;overflow-y: scroll;}
+overflow: hidden;}
 #innerbox{position: absolute;width: 100%;}
 .right-content::-webkit-scrollbar {
   display: none;
@@ -441,7 +441,20 @@ overflow: hidden;overflow-y: scroll;}
 .time-item div:nth-child(2){
 	border-radius: 10px 0 0 10px;padding-left: 10px; background-color: #FFFFFF;height: 37px;margin-left: -10px;color: #9C7CFA;
 }
-
+.plan-box{
+	padding: 20px;
+	display: flex;justify-content: space-around;
+	align-items: center;
+}
+.plan-box button{
+	border: 2px solid #9C7CFA;
+	border-radius: 10px;
+	/* background-color: #9C7CFA; */
+	background-color: #FFFFFF;
+	color: #9C7CFA;
+	padding: 10px 20px;
+	font-size: 16px;
+}
 /* 出勤详情 */
 .attendance-box {
 	width: 1210px;
@@ -736,4 +749,17 @@ overflow: hidden;overflow-y: scroll;}
 .chengjian>div{display: flex;align-items: flex-end;width: 50%;line-height: 30px;}
 .wellcome-img{position: fixed;z-index: 100;top: 0;left: 0;right: 0;bottom: 0;}
 .erro-box{position: fixed;top: 0;left: 0;right: 0;bottom: 0;z-index: 9999999;display: flex;justify-content: center;align-items: center;background-color: #FFFFFF;}
-.erro-box img{width: 660px;height: 614px;}
\ No newline at end of file
+.erro-box img{width: 660px;height: 614px;}
+
+.notice-k{position: fixed;top: 0px;left: 0px;right: 0px;bottom: 0px;z-index: 99999;display: flex;justify-content: center;align-items: center;animation: noticed .3s linear forwards;}
+@keyframes noticed{
+	from{transform: scale(0);}
+	to{transform: scale(1);}
+}
+.notice-box{border: 5px solid #7557cc;border-radius: 20px;background-color: #FFFFFF; width: 520px;}
+.notice-title-box{height: 75px;color: #FFE68F;margin: -5px -5px 0 -5px;width: 102%; border-radius: 15px 15px 0 0;font-weight: bold;font-size: 36px;position: relative; line-height: 75px;display: flex;align-items: center;background-color: #7557cc;}
+.notice-title-box div{width: 100%;text-align: center;}
+.notice-title-box img{width: 20px;height: 20px;position: absolute;}
+.notice-title-box img:first-child{left: 20px;}
+.notice-title-box img:last-child{right: 20px;}
+
diff --git a/src/components/attendanceBabuDetail.vue b/src/components/attendanceBabuDetail.vue
index d915c59..d678740 100644
--- a/src/components/attendanceBabuDetail.vue
+++ b/src/components/attendanceBabuDetail.vue
@@ -25,7 +25,7 @@
 		<div class="attendance-con">
 			<div class="chengjian" v-if="dataArr.length!=0">
 				<div v-for="(item,index) in dataArr" :key="index" class="attendance-jian-item">
-					<img v-if="item.CheckDate!=null || item.CheckTime!=null" class="baby-img02" :src="dataObj.Head_Img" >
+					<img v-if="item.CheckDate!=null || item.CheckTime!=null" class="baby-img02" style="object-fit: contain;background-color: #FFFFFF;" :src="dataObj.Head_Img" >
 					<div v-else class="baby-img02" >
 						<img src="../../static/img/attendancedetail/icon-wu.png" style="width: 156px;height: 106px;" >
 					</div>
@@ -120,27 +120,27 @@
 			}
 		},
 		methods: {
-		async getuserattendanceinfo() {
-			let UserGuid=""
-			UserGuid="1ec20f7e-85c7-a982-b506-67f71d64d1f6"
+			// async getuserattendanceinfo() {
+			// 	let UserGuid=""
+			// 	UserGuid="1ec20f7e-85c7-a982-b506-67f71d64d1f6"
 
-				let data = await this.$axios({
-					// 调用 serviceAPI
-					url: this.$https.getuserattendanceinfo,
-					methods: "get",
-					params: {
-						EquipmentID: this.$storage.get('EquipmentID'),
-						UserGuid
-					},
-				});
-			},
+			// 		let data = await this.$axios({
+			// 			// 调用 serviceAPI
+			// 			url: this.$https.getuserattendanceinfo,
+			// 			methods: "get",
+			// 			params: {
+			// 				EquipmentID: this.$storage.get('EquipmentID'),
+			// 				UserGuid
+			// 			},
+			// 		});
+			// },
 			backNews(){
 				this.$emit('backNews',false);
 			},
 			
 		},
 		mounted() {
-			 this.getuserattendanceinfo()
+			 // this.getuserattendanceinfo()
 		}
 	}
 </script>
diff --git a/src/components/attendanceDetail.vue b/src/components/attendanceDetail.vue
index eaa2f6d..eae218e 100644
--- a/src/components/attendanceDetail.vue
+++ b/src/components/attendanceDetail.vue
@@ -12,13 +12,15 @@
 			<div class="attendance-right">
 				<div v-if="!showDetail" style="display: flex;flex-wrap: wrap;">
 					<div v-if="isNothing" class="attendance-right-item-box" @click="goDetail(index)" v-for="(item,index) in babyArr" :key="index">
-						<img :src="item.Head_Img" alt="">
+						<img v-if="item.Head_Img!='' && item.Head_Img!=null" :src="item.Head_Img" alt="">
+						<img v-if="(item.Head_Img=='' || item.Head_Img==null) && item.Sex==0" src="../../static/img/babyalbum/baby-boy.png" alt="">
+						<img v-if="(item.Head_Img=='' || item.Head_Img==null) && item.Sex==1" src="../../static/img/babyalbum/baby-gril.png" alt="">
 						<span>{{item.StuName}}</span>
 						<div :style="{background:['','#9C7CFA','#D3D3D3','#FF9393','#F4B52F'][item.CheckResult]}">{{['','正常','离校','未到校','请假'][item.CheckResult]}}</div>
 					</div>
 					<div v-if="!isNothing" class="nothing-box">
 						<img src="../../static/img/attendancedetail/icon-nothing.png">
-						<div>{{['没有出勤','暂无离校','暂无未到校','没有请假'][navIndex]}}的宝宝</div>
+						<div>{{['没有出勤','暂无到校','暂无离校','暂无未到校','没有请假'][navIndex]}}的宝宝</div>
 					</div>
 				</div>
 				<attendanceBabuDetail v-if="showDetail" :dataObj="dataObj" @backNews="backNews" :dataArr="dataArr" :checkResult="checkResult"></attendanceBabuDetail>
@@ -38,6 +40,7 @@
 			return {
 				navArr:[
 					{icon:require('../../static/img/attendancedetail/icon-attendancedetail.png'),title:'出勤详情',num:0},
+					{icon:require('../../static/img/attendancedetail/icon-to.png'),title:'到校情况',num:0},
 					{icon:require('../../static/img/attendancedetail/icon-lixiao.png'),title:'离校情况',num:0},
 					{icon:require('../../static/img/attendancedetail/icon-weidao.png'),title:'未到校宝宝',num:0},
 					{icon:require('../../static/img/attendancedetail/icon-qingj.png'),title:'请假宝宝',num:0},
@@ -76,14 +79,10 @@
 			},
 			chooseNavEv(e){
 				this.navIndex = e;
-				let newType = 0;
-				if(e==1) newType = 2;
-				if(e==2) newType = 3;
-				if(e==3) newType = 4;
 				if(e==0){
 					this.babyArr = this.cunArr;
 				} else {
-					this.babyArr = this.cunArr.filter(item=>item.CheckResult===newType);
+					this.babyArr = this.cunArr.filter(item=>item.CheckResult===e);
 				}
 				this.babyArr.length ? this.isNothing = true : this.isNothing = false
 				this.showDetail = false;
@@ -103,13 +102,15 @@
 					if(data.data.data!=undefined){
 						let leftInfo = data.data.data;
 						// 出勤详情
-						this.navArr[0].num = leftInfo.outSchoolNum + leftInfo.notSchoolNum + leftInfo.leaveSchoolNum;
+						this.navArr[0].num = leftInfo.allnum;
+						// 到校
+						this.navArr[1].num = leftInfo.toSchoolNum;
 						// 离校
-						this.navArr[1].num = leftInfo.outSchoolNum;
+						this.navArr[2].num = leftInfo.outSchoolNum;
 						// 未到校
-						this.navArr[2].num = leftInfo.notSchoolNum;
+						this.navArr[3].num = leftInfo.notSchoolNum;
 						// 请假
-						this.navArr[3].num = leftInfo.leaveSchoolNum;
+						this.navArr[4].num = leftInfo.leaveSchoolNum;
 						this.babyArr = leftInfo.list;
 						this.cunArr = leftInfo.list;
 						this.$storage.set('num0',this.navArr[0].num);
diff --git a/src/components/babyActivity.vue b/src/components/babyActivity.vue
index d3fd6aa..b661454 100644
--- a/src/components/babyActivity.vue
+++ b/src/components/babyActivity.vue
@@ -18,13 +18,23 @@
 								<div class="teather-title">班级老师</div>
 								<div class="teather-box">
 									<div v-for="(item,index) in teatherArr" :key="index">
-										<img :src="item.AvatarUrl" >
+										<img v-if="item.AvatarUrl!=''" :src="item.AvatarUrl" >
+										<img v-else src="../../static/img/kindergartenIntroduce/teacher-icon.jpg" >
 										<span>{{item.TeacherName}}</span>
 										<!-- <label @click="goDetail(index)" style="font-size: 14px;margin-top: 10px;color: #9c7cfa;">查看详情</label> -->
 									</div>
 								</div>
 							</div>
+							<div class="plan-box">
+								<v-touch v-on:swipeleft="touchDayEv" v-on:swiperight="touchDayEv">
+									<button type="button">查看周计划</button>
+								</v-touch>
+								<v-touch v-on:swipeleft="touchMonthEv" v-on:swiperight="touchMonthEv">
+									<button type="button">查看月计划</button>
+								</v-touch>
+							</div>
 							<!-- 当前活动 -->
+							<!-- 一种排版 -->
 							<!-- <div v-for="(item,index) in dangArr.Content" :key="index" class="class-item-box" style="height: 210px;">
 								<div class="teather-title">当前活动</div>
 								<div class="class-active">
@@ -32,7 +42,8 @@
 									<label>{{item.Name}}</label>
 								</div>
 							</div> -->
-							<div v-for="(item,index) in dangArr" :key="index">
+							<!-- 二种排版 -->
+							<!-- <div v-for="(item,index) in dangArr" :key="index">
 								<div v-if="item.NowTimePart!=null" class="class-item-box" style="height: 210px;">
 									<div class="teather-title">当前活动</div>
 									<div class="class-active">
@@ -47,7 +58,39 @@
 										<label>{{item.NextCourse || '暂无活动'}}</label>
 									</div>
 								</div>
-							</div>
+							</div> -->
+						</div>
+					</div>
+				</div>
+			</div>
+			<!-- 周计划弹框 -->
+			<div v-if="isDay" class="notice-k" @click="closeNotice">
+				<div @click.stop="isDay=true" class="notice-box">
+					<div class="notice-title-box">
+						<!-- <img src="../../static/img/home/flower.png"> -->
+						<div>第15周工作计划</div>
+						<!-- <img src="../../static/img/home/flower.png"> -->
+					</div>
+					<div style="padding: 0 20px;">
+						<div class="second-title">啥地方叫了</div>
+						<div class="line"></div>
+						<div class="three-content left-notice" style="height: auto;max-height: 600px;overflow: hidden;overflow-y: scroll;">
+							<div class="">阿萨德立方空间</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<!-- 月计划弹框 -->
+			<div v-if="isMonth" class="notice-k" @click="closeNotice">
+				<div @click.stop="isMonth=true" class="notice-box">
+					<div class="notice-title-box">
+						<div>(2022-2)月主题活动及工作要点</div>
+					</div>
+					<div style="padding: 0 20px;">
+						<div class="second-title">啥地方叫了</div>
+						<div class="line"></div>
+						<div class="three-content left-notice" style="height: auto;max-height: 600px;overflow: hidden;overflow-y: scroll;">
+							<div class="">阿萨德立方空间</div>
 						</div>
 					</div>
 				</div>
@@ -112,10 +155,25 @@
 				showLoading_right:true,
 				showError:false,
 				showDetail:false,
-				teacherInfo:{}
+				teacherInfo:{},
+				isDay:false,
+				isMonth:false
 			}
 		},
 		methods: {
+			// 手指滑动事件
+			touchDayEv(){
+				console.log(151);
+				this.isDay = true;
+			},
+			touchMonthEv(){
+				this.isMonth = true;
+			},
+			// 关闭通知公告弹框
+			closeNotice(){
+				this.isDay = false;
+				this.isMonth = false;
+			},
 			// 查看教师详情
 			goDetail(e){
 				if(this.$storage.get('network')){
diff --git a/src/components/babyAlbum.vue b/src/components/babyAlbum.vue
index be64abe..c139be5 100644
--- a/src/components/babyAlbum.vue
+++ b/src/components/babyAlbum.vue
@@ -5,7 +5,10 @@
 			<!-- 主体内容 -->
 			<div v-if="!showDetail" class="babyalbum-box">
 				<div v-if="isNothing" class="babyalbum-item-box" @click="goDetail(index)" v-for="(item,index) in babyArr" :key="index">
-					<img :src="item.Head_Img" alt="">
+					<img v-if="item.Head_Img!='' && item.Head_Img!=null" :src="item.Head_Img" alt="">
+					<!-- <img v-else :src="item.Sex==0?'../../static/img/babyalbum/baby-boy.png':'../../static/img/babyalbum/baby-gril.png'" alt=""> -->
+					<img v-if="(item.Head_Img=='' || item.Head_Img==null) && item.Sex==0" src="../../static/img/babyalbum/baby-boy.png" alt="">
+					<img v-if="(item.Head_Img=='' || item.Head_Img==null) && item.Sex==1" src="../../static/img/babyalbum/baby-gril.png" alt="">
 					<span>{{item.StuName}}</span>
 					<div :style="{background:'#9C7CFA'}">{{item.PhotoCount}}张图</div>
 				</div>
diff --git a/src/components/header.vue b/src/components/header.vue
index 4e269f7..5379ad6 100644
--- a/src/components/header.vue
+++ b/src/components/header.vue
@@ -8,18 +8,18 @@
 					<img v-if="logoImg!=''" :src="logoImg" style="object-fit: cover;">
 					<div style="display: flex;flex-direction: column;">
 						<span style="font-size: 33.8px;">都江堰市机关幼儿园</span>
-						<span style="font-size: 17.4px;">DOU JANG YAN JI GUAN YOU ER YUAN</span>
+						<span style="font-size: 18.1px;">DU JANG YAN JI GUAN YOU ER YUAN</span>
 					</div>
 				</div>
 			</div>
 			<!-- 文本导航 -->
 			<div class="title-box">
-				<div class="title-item" :class="activeIndex==index?activeTitle:''" v-for="(item,index) in titleArr" 
+				<div class="title-item" :class="activeIndex==index?activeTitle:''" v-for="(item,index) in titleArr"
 					:key="index" @click="chooseTitle(index)">{{item}}</div>
 			</div>
 			<!-- 天气 -->
 			<div class="weather-box">
-				<img :src="weather" v-if="weather!=''" style="margin-right: 10px;">
+				<img :src="weather || '../../static/weather/5.png'" style="margin-right: 10px;">
 				<div>
 					<div style="color: #FF9393;">{{date}}</div>
 					<div class="weather-three">
@@ -33,10 +33,10 @@
 			<div><img @click="clickFun" src="../../static/img/home/icon-set.png"></div>
 		</div>
 		<!-- 头部导航 end -->
-		
-		
-		
-		
+
+
+
+
 		<!-- 首页 -->
 		<homepage v-if="activeIndex==0"></homepage>
 		<!-- 幼儿园介绍 -->
@@ -49,19 +49,19 @@
 		<babyAlbum v-if="activeIndex==4"></babyAlbum>
 		<!-- 疫情管理 -->
 		<yiqingmanagement v-if="activeIndex==5"></yiqingmanagement>
-		
-		
+
+
 		<!-- 底部 -->
 		<div class="footer">
 			<img src="../../static/img/home/foot-icon.png">
-			<img v-if="activeIndex==1" src="../../static/img/kindergartenIntroduce/chahua-01.png" >
+			<img v-if="activeIndex==1" src="../../static/img/kindergartenIntroduce/chahua-01.png">
 			<img v-if="activeIndex==2" src="../../static/img/home/baby-foot.png">
 			<img v-if="activeIndex==3" src="../../static/img/attendancedetail/chah.png">
 			<img v-if="activeIndex==4 || activeIndex==5" src="../../static/img/babyalbum/chah.png">
 		</div>
 		<!-- 网络弹框 -->
 		<div v-if="isNetwork" class="popu-box">
-			<div class="item-row">班排设备ID：*******</div>
+			<div class="item-row">班排设备ID：{{classCardId}}</div>
 			<div class="item-row">网络链接状态：网络监测（{{onLine?'已连接':'已断开'}}）<img v-if="onLine"
 					src="../../static/img/home/icon-link.png" style="width: 20px;"></div>
 			<div class="item-row">
@@ -77,11 +77,17 @@
 			</div>
 			<div class="item-row">
 				控制操作：
-				<div class="refresh-btn" @click="refreshEv">刷新</div> 
+				<div class="refresh-btn" @click="refreshEv">刷新</div>
 				<div class="back-btn" @click="backHomeEv">返回首页</div>
 			</div>
 		</div>
-		<img v-if="wellcomeFlag" @click="closeWellcome" src="../../static/img/babyalbum/wellcome-baby.png" class="wellcome-img" >
+		<img v-if="wellcomeFlag" @click="closeWellcome" src="../../static/img/babyalbum/wellcome-baby.png"
+			class="wellcome-img">
+		<!-- <div style="position: fixed;background-color: rgba(0,0,0,.5);top: 120px;left: 0;right: 0;bottom: 0;z-index: 10000;">
+			<img style="width: 100px;height: 100px;object-fit: cover;" src="https://qqbaby-creating.oss-cn-beijing.aliyuncs.com/1.jpg" >
+			<img style="width: 100px;height: 100px;object-fit: cover;" src="https://qqbaby-creating.oss-cn-beijing.aliyuncs.com/2.jpg" >
+			<img style="width: 100px;height: 100px;object-fit: cover;" src="https://qqbaby-creating.oss-cn-beijing.aliyuncs.com/3.jpg" >
+		</div> -->
 	</div>
 </template>
 <script>
@@ -98,7 +104,7 @@
 	// 疫情管理
 	import yiqingmanagement from '@/components/yiqingmanagement.vue';
 	export default {
-		components:{
+		components: {
 			homepage,
 			kindIntroduction,
 			babyActivity,
@@ -111,7 +117,7 @@
 			return {
 				titleArr: ['首页', '幼儿园介绍', '宝宝活动', '出勤详情', '宝宝相册', '疫情防控'],
 				activeIndex: 0,
-				cunIndex:0,
+				cunIndex: 0,
 				modeArr: [{
 						isActive: false,
 						title: '欢迎模式'
@@ -125,8 +131,8 @@
 						title: '大数据模式'
 					},
 				],
-				modeIndex:'-1',
-				wellcomeFlag:false,//欢迎模式
+				modeIndex: '-1',
+				wellcomeFlag: false, //欢迎模式
 				onLine: navigator.onLine,
 				list: [],
 				city: '',
@@ -135,38 +141,75 @@
 				temperature: '', //天气温度
 				time: '', //当前时间
 				timer: null,
-				currentTemper:1,//
+				currentTemper: 1, //
 				activeTitle: 'activeTitle',
-				isNetwork:false,
-				weather:'',
-				OrgGuid:'',
-				logoImg:'',
+				isNetwork: false,
+				weather: '',
+				OrgGuid: '',
+				logoImg: '',
+				classCardId: '',
+				infoObj: '',
+				name: '',
+				ver: 0,
+				s: ''
 			}
 		},
 		methods: {
 			// 关闭欢迎模式
-			closeWellcome(){
+			closeWellcome() {
 				this.wellcomeFlag = false;
 				this.modeIndex = 2;
 				this.clearChoose();
 			},
 			// 选择班牌显示模式
 			chooseMode(e) {
-				if(this.onLine){
+				if (this.onLine) {
 					this.modeArr.forEach(item => {
 						item.isActive = false
 					})
 					this.modeArr[e].isActive = true;
-					if(e==0) {this.modeIndex = 1;this.wellcomeFlag = true;}
-					if(e==1) {this.modeIndex = 2;this.wellcomeFlag = false;}
-					if(e==2) {
+					if (e == 0) {
+						this.modeIndex = 1;
+						this.wellcomeFlag = true;
+					}
+					if (e == 1) {
+						this.modeIndex = 2;
+						this.wellcomeFlag = false;
+					}
+					if (e == 2) {
 						this.modeIndex = 4;
 						this.wellcomeFlag = false;
-						// window.open(`../../static/EverydayData/wisdomMedic.html`);
-						window.location.href = `./averydaydata/wisdomMedic.html`;
+						window.open(`http://47.108.248.86:56688/`,'_blank');
 					}
 					this.isNetwork = false;
 					this.updatemodelapiEv();
+					var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+					var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器
+					var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器
+					var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;
+					if (isIE) {
+						console.log(isIE);
+						var reIE = new RegExp("MSIE (\\d+\\.\\d+);");
+						reIE.test(userAgent);
+						var fIEVersion = parseFloat(RegExp["$1"]);
+						if (fIEVersion == 7) {
+							return 7;
+						} else if (fIEVersion == 8) {
+					 	return 8;
+						} else if (fIEVersion == 9) {
+							return 9;
+						} else if (fIEVersion == 10) {
+							return 10;
+						} else {
+					 	return 6; //IE版本<=7
+						}
+					} else if (isEdge) {
+						return 'edge'; //edge
+					} else if (isIE11) {
+						return 11; //IE11
+					} else {
+						return -1; //不是ie浏览器
+					}
 				}
 			},
 			// 导航切换
@@ -189,31 +232,13 @@
 				}
 			},
 			// 天气
-			// weatherEv() {
-			// 	// 获取时间
-			// 	this.dateEv();
-			// 	this.timer = setInterval(() => {
-			// 		this.dateEv();
-			// 	}, 1000)
-			// 	var that = this;
-			// 	this.$axios.get('http://wthrcdn.etouch.cn/weather_mini?city=' + '成都').then((res) => {
-			// 		let weatherList = res.data.data.forecast;
-			// 		// 星期几
-			// 		this.week = weatherList[0].date.slice(weatherList[0].date.indexOf('日') + 1);
-			// 		// 当天气温
-			// 		this.temperature = `${weatherList[0].low.slice(2,-1)} -${weatherList[0].high.slice(2)}`
-			// 	}).catch((err) => {
-			// 		console.log(err);
-			// 	})
-			// },
-			// 天气
 			async weatherEv() {
 				// 获取时间
 				this.dateEv();
 				this.timer = setInterval(() => {
 					this.dateEv();
 				}, 1000)
-				if(this.$storage.get('network')){
+				if (this.$storage.get('network')) {
 					let data = await this.$axios({
 						// 调用 serviceAPI
 						url: this.$https.weather,
@@ -222,14 +247,14 @@
 							EquipmentID: this.$storage.get('EquipmentID'),
 						},
 					});
-					if(data.data.code==200) {
+					if (data.data.code == 200) {
 						// 星期几
 						this.week = data.data.data.week;
-						this.$storage.set('week',this.week);
+						this.$storage.set('week', this.week);
 						let newtempera = data.data.data.weather.result.forecasts[0];
 						// 当天气温
 						this.temperature = `${newtempera.low}-${newtempera.high}°C`;
-						this.$storage.set('temperature',this.temperature);
+						this.$storage.set('temperature', this.temperature);
 						this.weather = require(`../../static/img/weather/2.png`);
 						let weatherObj = '晴|多云|阴|阵雨|'
 						// let text = data.data.data.weather.result.now.text;
@@ -258,17 +283,17 @@
 						} else if (text == "晴") {
 							this.weather = require(`../../static/img/weather/5.png`); //晴
 						} else if (
-							  text == "雨夹雪" ||
-							  text == "小雪" ||
-							  text == "中雪" ||
-							  text == "大雪" ||
-							  text == "暴雪"
+							text == "雨夹雪" ||
+							text == "小雪" ||
+							text == "中雪" ||
+							text == "大雪" ||
+							text == "暴雪"
 						) {
 							this.weather = require(`../../static/img/weather/9.png`); //雨夹雪
-						}else{
+						} else {
 							this.weather = require(`../../static/img/weather/1.png`) //晴
 						}
-						this.$storage.set('weather',this.weather);
+						this.$storage.set('weather', this.weather);
 					}
 				} else {
 					this.weather = this.$storage.get('weather');
@@ -276,7 +301,7 @@
 					this.temperature = this.$storage.get('temperature');
 					this.time = this.$storage.get('time');
 				}
-				
+
 			},
 			// 当前时间
 			dateEv() {
@@ -294,47 +319,47 @@
 				let minute = date.getMinutes();
 				// 当前时间
 				this.time = `${hour < 10 ? '0'+hour : hour}:${minute < 10 ? '0'+minute : minute}`;
-				this.$storage.set('time',this.time);
+				this.$storage.set('time', this.time);
 			},
 			// 右上角按钮点击
-			clickFun(){
+			clickFun() {
 				this.isNetwork = !this.isNetwork;
 				this.clearChoose();
 				this.classcardByIdEv();
 			},
 			// 全部不选中
-			clearChoose(){
-				this.modeArr.forEach(item=>{
+			clearChoose() {
+				this.modeArr.forEach(item => {
 					item.isActive = false;
 				})
 			},
 			// 刷新
-			refreshEv(){
+			refreshEv() {
 				this.activeIndex = '-1';
-				if(this.onLine) {
-					setTimeout(()=>{
+				if (this.onLine) {
+					setTimeout(() => {
 						this.isNetwork = false;
-					},100)
+					}, 100)
 				}
-				setTimeout(()=>{
+				setTimeout(() => {
 					this.activeIndex = this.cunIndex;
-				},100)
+				}, 100)
 				this.clearChoose();
 			},
 			// 返回首页
-			backHomeEv(){
+			backHomeEv() {
 				this.activeIndex = '-1';
-				if(this.onLine) {
+				if (this.onLine) {
 					this.isNetwork = false;
 				}
-				setTimeout(()=>{
+				setTimeout(() => {
 					this.activeIndex = 0;
-				},100)
+				}, 100)
 				this.clearChoose();
 			},
 			// 获取班牌模式
 			async classcardByIdEv() {
-				if(this.$storage.get('network')){
+				if (this.$storage.get('network')) {
 					let data = await this.$axios({
 						// 调用 serviceAPI
 						url: this.$https.classcardById,
@@ -344,94 +369,94 @@
 						},
 					});
 					let modeObj = data.data.data;
-					if(modeObj!=null){
+					if (modeObj != null) {
 						this.clearChoose();
-						if(modeObj.Mode==1){
+						if (modeObj.Mode == 1) {
 							this.modeArr[0].isActive = true;
 							this.wellcomeFlag = true;
-						} else if(modeObj.Mode==2 || modeObj.Mode==0){
+						} else if (modeObj.Mode == 2 || modeObj.Mode == 0) {
 							this.modeArr[1].isActive = true;
 							this.wellcomeFlag = false;
-						} else if(modeObj.Mode==4){
+						} else if (modeObj.Mode == 4) {
 							this.modeArr[2].isActive = true;
 							this.wellcomeFlag = false;
 							window.location.href = `./averydaydata/wisdomMedic.html`;
 						}
-						this.$storage.set('wellcomeFlag',this.wellcomeFlag);
+						this.$storage.set('wellcomeFlag', this.wellcomeFlag);
+						this.$storage.set('orgGuid', modeObj.OrgGuid);
 					} else {
 						this.modeArr[1].isActive = true;
 					}
 				} else {
 					this.modeArr[1].isActive = true;
-					if(this.$storage.get('wellcomeFlag')!=undefined){
+					if (this.$storage.get('wellcomeFlag') != undefined) {
 						this.wellcomeFlag = this.$storage.get('wellcomeFlag');
 					}
 				}
-				
+
 			},
 			// 设置班牌模式
 			async updatemodelapiEv() {
-				if(this.$storage.get('network')){
+				if (this.$storage.get('network')) {
 					let data = await this.$axios({
 						// 调用 serviceAPI
 						url: this.$https.updatemodelapi,
 						methods: "get",
 						params: {
-							Mode:this.modeIndex,
-							OrgGuid:storage.get('orgGuid')
+							Mode: this.modeIndex,
+							OrgGuid: storage.get('orgGuid')
 						},
 					});
 				}
-				// console.log(data.data.data);
 			},
 			// 获取设备型号(设备id)
-			obtainEv(){
+			obtainEv() {
+				// let Build = plus.android.importClass("android.os.Build");
+				// let serial = Build.SERIAL;
+				// this.$storage.set('EquipmentID',Build.SERIAL);
+				this.$storage.set('EquipmentID','B520P2RXM0');
+				this.classCardId = this.$storage.get('EquipmentID');
 				this.weatherEv();
 				this.introduce();
 				this.classcardByIdEv();
-				setInterval(()=>{
+				setInterval(() => {
 					this.classcardByIdEv();
-				},1000*60)
+					this.introduce();
+				}, 1000 * 60)
 			},
-			plusReady(){
+			plusReady() {
 				var that = this;
 				// 手机有效
-				this.$storage.set('EquipmentID',plus.device.imei);
-				// this.$storage.set('EquipmentID','yaohaotest001');
 				that.obtainEv();
-				if(plus.networkinfo.getCurrentType()!=1){
-					that.$storage.set('network',true);
+				// if(plus.networkinfo.getCurrentType()!=1){
+					that.$storage.set('network', true);
 					that.onLine = true;
-				} else {
-					that.onLine = false;
-				}
-				// 网页网络监听有效
-				// window.addEventListener('online', this.updateOnlineStatus); //网络由异常到正常时触发
-				// window.addEventListener('offline', this.updateOnlineStatus); //网络由正常到异常时触发
+				// } else {
+				// 	that.onLine = false;
+				// }
 				//网络更改
-				 document.addEventListener( "netchange", function(res) {
+				document.addEventListener("netchange", function(res) {
 					var network = plus.networkinfo.getCurrentType();
-					if(network == 1) {
+					if (network == 1) {
 						// that.isNetwork = true;
-						that.$storage.set('network',false);
+						that.$storage.set('network', false);
 						that.onLine = false;
 						// plus.nativeUI.toast('您的网络已断开');
-					}else {
+					} else {
 						that.activeIndex = '-1';
-						setTimeout(()=>{
+						setTimeout(() => {
 							that.activeIndex = that.cunIndex;
-						},100)
+						}, 100)
 						that.isNetwork = false;
-						that.$storage.set('network',true);
+						that.$storage.set('network', true);
 						that.obtainEv();
 						that.onLine = true;
-						// plus.nativeUI.toast('您的网络已连接');
 					}
 				})
 			},
 			// logo图标
 			async introduce() {
-				if(this.$storage.get('network')){
+				if (this.$storage.get('network')) {
 					this.showError = false;
 					this.logoImg = this.$storage.get('logoImg');
 					let data = await this.$axios({
@@ -442,9 +467,9 @@
 							EquipmentID: this.$storage.get('EquipmentID'),
 						},
 					});
-					if(data.data.data!=undefined){
+					if (data.data.data != undefined) {
 						this.logoImg = data.data.data.Img_Url;
-						this.$storage.set('logoImg',this.logoImg);
+						this.$storage.set('logoImg', this.logoImg);
 					}
 				} else {
 					this.logoImg = this.$storage.get('logoImg');
@@ -453,15 +478,9 @@
 		},
 		mounted() {
 			var that = this;
-			that.obtainEv();
-			// if (window.plus) {
-			// 	that.plusReady();
-			// } else {
-			// 	document.addEventListener("plusready", that.plusReady, false);
-			// }
-			setTimeout(()=>{
+			setTimeout(() => {
 				that.plusReady();
-			},500)
+			}, 500)
 		}
 	}
 </script>
diff --git a/src/components/homepage.vue b/src/components/homepage.vue
index dde2147..a9c05e4 100644
--- a/src/components/homepage.vue
+++ b/src/components/homepage.vue
@@ -53,20 +53,22 @@
 				</div>
 				<!-- 通知公告 -->
 				<div class="left-one">
-					<div class="left-content">
-						<div class="left-title">
-							<div class="pultitle">通知公告</div>
+					<v-touch v-on:swipeleft="touchEv" v-on:swiperight="touchEv">
+						<div class="left-content">
+							<div class="left-title">
+								<div class="pultitle">通知公告</div>
+							</div>
+							<div class="second-title">{{className}}</div>
+							<div class="line" v-if="noticeObj.Content!=''"></div>
+							<div class="three-content left-notice" v-if="noticeObj.Content!=''">
+								<div class="clips2">{{noticeObj.Content}}</div>
+							</div>
+							<div class="notice-time" v-if="noticeObj.Content!=''">
+								<div>{{noticeObj.PublishTime}}</div>
+								<!-- <div><img src="../../static/img/home/slices.png" />{{noticeObj.BroweTotal}}</div> -->
+							</div>
 						</div>
-						<div class="second-title">{{className}}</div>
-						<div class="line" v-if="noticeObj.Content!=''"></div>
-						<div class="three-content left-notice" v-if="noticeObj.Content!=''">
-							<div class="clips2">{{noticeObj.Content}}</div>
-						</div>
-						<div class="notice-time" v-if="noticeObj.Content!=''">
-							<div>{{noticeObj.PublishTime}}</div>
-							<div><img src="../../static/img/home/slices.png" />{{noticeObj.BroweTotal}}</div>
-						</div>
-					</div>
+					</v-touch>
 					<loading :isShow="showLoading_three"></loading>
 				</div>
 			</div>
@@ -122,6 +124,27 @@
 				<loading :isShow="showLoading_five"></loading>
 			</div>
 		</div>
+		<!-- 公告弹框 -->
+		<div v-if="isNotice" class="notice-k" @click="closeNotice">
+			<div @click.stop="isNotice=true" class="notice-box">
+				<div class="notice-title-box">
+					<!-- <img src="../../static/img/home/flower.png"> -->
+					<div>通知公告</div>
+					<!-- <img src="../../static/img/home/flower.png"> -->
+				</div>
+				<div style="padding: 0 20px;">
+					<div class="second-title">{{className}}</div>
+					<div class="line" v-if="noticeObj.Content!=''"></div>
+					<div class="three-content left-notice" style="height: auto;max-height: 600px;overflow: hidden;overflow-y: scroll;" v-if="noticeObj.Content!=''">
+						<div class="">{{noticeObj.Content}}</div>
+					</div>
+					<div class="notice-time" style="margin-top: 15px;" v-if="noticeObj.Content!=''">
+						<div>{{noticeObj.PublishTime}}</div>
+						<!-- <div><img src="../../static/img/home/slices.png" />{{noticeObj.BroweTotal}}</div> -->
+					</div>
+				</div>
+			</div>
+		</div>
 	</div>
 </template>
 <script>
@@ -173,39 +196,51 @@
 				},
 				showError:false,
 				monitorTimer:null,
+				chuTime:null,
 				animate:false,
 				topVal:0,
-				scrollTime:null
+				classCardId:'',
+				diffHeight:'',
+				isNotice:false
 			};
 		},
 		destroyed() {
 			clearInterval(this.timer);
 			this.topVal = 0;
-			clearInterval(this.scrollTime);
+			clearInterval(this.monitorTimer);
+			clearInterval(this.chuTime);
 		},
 		methods: {
+			// 手指滑动事件
+			touchEv(){
+				this.isNotice = true;
+			},
+			// 关闭通知公告弹框
+			closeNotice(){
+				this.isNotice = false;
+			}, 
 			// 滚动动画
 			scrollEv(){
 				this.topVal = 0;
-				clearInterval(this.scrollTime);
-				this.scrollTime = setInterval(()=>{
-					let containerHeight = $('.right-content').height();
-					let contentHeight = $('#innerbox').height();
-					if(contentHeight + this.topVal <= containerHeight) {
-						$('#innerbox').animate({top:`${0}px`});
-						clearInterval(this.scrollTime);
-						this.topVal = 0;
-						this.scrollEv();
-					} else {
-						this.topVal = this.topVal - 50;
-						$('#innerbox').animate({top:`${this.topVal}px`});
+				clearInterval(this.monitorTimer);
+				let parentHeight = $('.right-content').height();
+				let childrenHeight = $('#innerbox').height();
+				this.diffHeight = childrenHeight - parentHeight;
+				this.monitorTimer = setInterval(()=>{ 
+					let topFlag = $('#innerbox').position().top;
+					if(-topFlag*1==0){
+						this.upEv();
 					}
-				},4000)
-				// $(function(){
-				// 	$('.pultitle').on('click',function(){
-				// 		$('#innerbox').animate({top:`${30}%`});
-				// 	})
-				// })
+					if(-topFlag*1==this.diffHeight*1){
+						this.downEv();
+					}
+				},100)
+			},
+			downEv(){
+				$('#innerbox').animate({top:0+'px'},(this.diffHeight/4)*100,'linear');
+			},
+			upEv(){
+				$('#innerbox').animate({top:-this.diffHeight+'px'},(this.diffHeight/4)*100,'linear');
 			},
 			closeError(){
 				this.showError = false;
@@ -255,7 +290,6 @@
 						this.$storage.set('noticeData',this.noticeData)
 						this.$storage.set('noticeObj',this.noticeObj)
 						this.$storage.set('PublishTime',this.noticeObj.PublishTime)
-						storage.set('orgGuid',this.noticeObj.OrgGuid);
 					}
 				} else {
 					this.noticeData = this.$storage.get('noticeData');
@@ -280,14 +314,14 @@
 					if(data.data.data!=undefined){
 						this.noonArr = data.data.data[0].WeekData;
 						this.$storage.set('noonArr',this.noonArr)
-						this.scrollEv();
+						this.animate = true;
 					}
 				} else {
 					if(this.$storage.get('noonArr')==undefined){
 						this.noonArr = [];
 					} else {
 						this.noonArr = this.$storage.get('noonArr');
-						this.scrollEv();
+						this.animate = true;
 					}
 				}
 				this.showLoading_five = false;
@@ -412,24 +446,19 @@
 				}
 			},
 			plusReady(){
+				var device_type = navigator.userAgent;//获取userAgent信息
 				var that = this;
-				// 手机有效
-				this.$storage.set('EquipmentID',plus.device.imei);
-				// this.$storage.set('EquipmentID','yaohaotest001'); 
-				if(plus.networkinfo.getCurrentType()!=1){
+				// if(plus.networkinfo.getCurrentType()!=1){
 					that.$storage.set('network',true);
-				}
-				// 网页网络监听有效
-				// window.addEventListener('online', this.updateOnlineStatus); //网络由异常到正常时触发
-				// window.addEventListener('offline', this.updateOnlineStatus); //网络由正常到异常时触发
-				//网络更改
+				// }
+				that.requestEv();
+				//网络更改 
 				 document.addEventListener( "netchange", function(res) {
 					var network = plus.networkinfo.getCurrentType();
 					if(network == 1) {
 						that.isNetwork = true;
 						that.$storage.set('network',false);
 						that.onLine = false;
-						// plus.nativeUI.toast('您的网络已断开');
 					}else {
 						that.activeIndex = '-1';
 						setTimeout(()=>{
@@ -438,7 +467,6 @@
 						that.isNetwork = false;
 						that.$storage.set('network',true);
 						that.onLine = true;
-						// plus.nativeUI.toast('您的网络已连接');
 					}
 				})
 			},
@@ -453,12 +481,17 @@
 			},
 		},
 		mounted() {
+			clearInterval(this.monitorTimer);
+			clearInterval(this.chuTime);
+			this.chuTime = setInterval(()=>{
+				if(this.animate){
+					this.scrollEv()
+					clearInterval(this.chuTime);
+				}
+			},1000)
 			setTimeout(()=>{
 				this.plusReady();
 			},500)
-			setTimeout(()=>{
-				this.requestEv();
-			},1000)
 			setTimeout(()=>{
 				this.timer = setInterval(()=>{
 					// 宝宝提醒
diff --git a/src/components/teacherStyle.vue b/src/components/teacherStyle.vue
index e23e44d..f667e3f 100644
--- a/src/components/teacherStyle.vue
+++ b/src/components/teacherStyle.vue
@@ -5,7 +5,8 @@
 			<template v-if="!showDetail">
 				<div class="teacherstyle-right">
 					<div class="teacherstyle-item-box" @click="goDetail(index)" v-for="(item,index) in teatherArr" :key="index">
-						<img :src="item.PictureUrls" alt="">
+						<img v-if="item.PictureUrls!=null && item.PictureUrls!=''" :src="item.PictureUrls" alt="">
+						<img v-else src="../../static/img/kindergartenIntroduce/teacher-icon.jpg" >
 						<span class="clips1">{{item.Title}}</span>
 					</div>
 				</div>
@@ -44,7 +45,6 @@
 				} else {
 					this.showError = true;
 				}
-				
 			},
 			// 继承详情返回事件
 			backstyle(e){
@@ -59,6 +59,7 @@
 						methods: "get",
 						params: {
 							EquipmentID: this.$storage.get('EquipmentID'),
+							// EquipmentID: "yaohaotest001",
 						},
 					});
 					if(data.data.data!=undefined){
@@ -80,6 +81,7 @@
 						url: this.$https.getteachers_demeanor_detail,
 						methods: "get",
 						params: {
+							// EquipmentID: "yaohaotest001",
 							Guid:guid,
 							OrgGuid:this.$storage.get('orgGuid')
 						},
diff --git a/src/components/yiqingmanagement.vue b/src/components/yiqingmanagement.vue
index 67e37bf..12ba4b3 100644
--- a/src/components/yiqingmanagement.vue
+++ b/src/components/yiqingmanagement.vue
@@ -40,7 +40,7 @@
 					let cuo = yy_mm_dd.getTime() + '000';
 					let cuo1 = cuo.slice(0,7);
 					let cuo2 = cuo.slice(7);
-					console.log(cuo1,cuo2,storage.get('orgGuid'));
+					// console.log(cuo1,cuo2,this.$storage.get('orgGuid'));
 					let data = await this.$axios.post(
 						// 调用 serviceAPI
 						'http://47.109.29.153:50014/api/kindergarten/epidemicmanagementinfo/getdatalistbyorgguid',
@@ -48,7 +48,7 @@
 							timestamp:cuo1,
 							sign:cuo2,
 							data:{
-								orgGuid: storage.get('orgGuid'),
+								orgGuid: this.$storage.get('orgGuid'),
 							}
 						},
 						{
diff --git a/src/main.js b/src/main.js
index 6a2c97a..2d6f6e7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,12 @@ import https from './config.js'
 Vue.prototype.$https = https;
 import router from './router'
 
+// 引入 vue-touch
+// 1npm install vue-touch@next
+import VueTouch from 'vue-touch'
+Vue.use(VueTouch, {name: 'v-touch'})
+
+
 import storage from 'good-storage'
 Vue.prototype.$storage = storage
 require('swiper/dist/css/swiper.css')
diff --git a/static/img/attendancedetail/icon-to.png b/static/img/attendancedetail/icon-to.png
new file mode 100644
index 0000000..e52e3e2
Binary files /dev/null and b/static/img/attendancedetail/icon-to.png differ
diff --git a/static/img/babyalbum/baby-boy.png b/static/img/babyalbum/baby-boy.png
new file mode 100644
index 0000000..6f61d64
Binary files /dev/null and b/static/img/babyalbum/baby-boy.png differ
diff --git a/static/img/babyalbum/baby-gril.png b/static/img/babyalbum/baby-gril.png
new file mode 100644
index 0000000..192fd40
Binary files /dev/null and b/static/img/babyalbum/baby-gril.png differ
diff --git a/static/img/kindergartenIntroduce/teacher-icon.jpg b/static/img/kindergartenIntroduce/teacher-icon.jpg
new file mode 100644
index 0000000..7850c1b
Binary files /dev/null and b/static/img/kindergartenIntroduce/teacher-icon.jpg differ