供应商图表更新

components/ay-login/login-password.vue

@@ -32,6 +32,7 @@
 		mapState,
 		mapMutations
 	} from 'vuex';
+	import sha1 from "js-sha1";
 	export default {
 		components: {
 			fLogin
@@ -116,10 +117,12 @@
 				// 	});
 				// 	return;
 				// }
-				// let pad = md5(that.pwd).substr(8, 16).toUpperCase();
+				let pad = md5(that.pwd).substr(8, 16).toUpperCase();
 				let data = {
 					loginId: that.loginId,
-					pwd: that.pwd,
+					pwd: md5(
+						sha1(that.pwd).toUpperCase()
+					).toUpperCase(),
 				};
 				this.$emit('loginFun', data);
 			},

env.js

@@ -2,13 +2,13 @@ let baseurl = null;
 if (process.env.NODE_ENV === 'development') {
 	// TODO
 	// baseurl = 'http://192.168.0.58:8602';
-	baseurl = 'http://192.168.0.246:8602';
+	baseurl = 'http://192.168.0.246:7503/api/admin';
 	// baseurl = 'http://192.168.0.44:8602';
 
 }
-// uEnvProd
+//
 if (process.env.NODE_ENV === 'production') {
 	// TODO
-	baseurl = 'http://192.168.0.246:8602';
+	//baseurl = 'http://192.168.0.246:8602';
 }
 module.exports = baseurl;

node_modules/js-sha1/CHANGELOG.md

@@ -0,0 +1,76 @@
+# Change Log
+
+## v0.7.0 / 2024-01-24
+### Added
+- TypeScript interfaces. #6, #9
+- HMAC feature.
+- support for web worker. #14
+
+### Fixed
+- deprecated `new Buffer`, replace with `Buffer.from`. #10
+- dependencies and security issues.
+- refactor: simplify formatMessage internal logic.
+- Generates incorrect hash in some cases.
+
+### Changed
+- remove `eval` and use `require` directly. #8
+- throw error by Error oject.
+- throw error if update after finalize
+- use unsigned right shift.
+
+## v0.6.0 / 2017-12-21
+### Fixed
+- incorrect result when first bit is 1 of bytes.
+
+### Changed
+- prevent webpack to require dependencies.
+
+## v0.5.0 / 2017-10-31
+### Fixed
+- incorrect result when file size >= 512M.
+
+## v0.4.1 / 2016-12-30
+### Fixed
+- ArrayBuffer dosen't work in Webpack.
+
+## v0.4.0 / 2016-12-05
+### Added
+- update method.
+- support Array output.
+- support ArrayBuffer output.
+- support AMD.
+
+## v0.3.0 / 2015-03-04
+### Added
+- support ArrayBuffer input.
+### Changed
+- improve performance.
+
+## v0.2.0 / 2015-02-16
+### Added
+- support byte array input.
+- test cases.
+### Removed
+- ascii parameter.
+### Changed
+- improve performance.
+
+## v0.1.3 / 2015-01-07
+### Added
+- bower package.
+- travis.
+- coveralls.
+### Fixed
+- JSHint warnings.
+
+## v0.1.2 / 2014-07-27
+### Fixed
+- accents bug.
+
+## v0.1.1 / 2014-01-05
+### Changed
+- update license.
+
+## v0.1.0 / 2014-01-04
+### Added
+- initial release.

node_modules/js-sha1/LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright 2014-2024 Chen, Yi-Cyuan
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

node_modules/js-sha1/README.md

@@ -0,0 +1,94 @@
+# js-sha1
+[![Build Status](https://travis-ci.org/emn178/js-sha1.svg?branch=master)](https://travis-ci.org/emn178/js-sha1)
+[![Coverage Status](https://coveralls.io/repos/emn178/js-sha1/badge.svg?branch=master)](https://coveralls.io/r/emn178/js-sha1?branch=master)  
+[![NPM](https://nodei.co/npm/js-sha1.png?stars&downloads)](https://nodei.co/npm/js-sha1/)  
+A simple SHA1 hash function for JavaScript supports UTF-8 encoding.
+
+## Demo
+[SHA1 Online](http://emn178.github.io/online-tools/sha1.html)
+[SHA1 File Checksum Online](https://emn178.github.io/online-tools/sha1_checksum.html)
+
+## Download
+[Compress](https://raw.github.com/emn178/js-sha1/master/build/sha1.min.js)  
+[Uncompress](https://raw.github.com/emn178/js-sha1/master/src/sha1.js)
+
+## Installation
+You can also install js-sha1 by using Bower.
+
+    bower install js-sha1
+
+For node.js, you can use this command to install:
+
+    npm install js-sha1
+
+## Notice
+NIST formally deprecated use of SHA-1 in 2011 and disallowed its use for digital signatures in 2013, and declared that it should be phased out by 2030. However, SHA-1 is still secure for HMAC. [wiki](https://en.wikipedia.org/wiki/SHA-1)
+
+## Usage
+You could use like this:
+```JavaScript
+sha1('Message to hash');
+var hash = sha1.create();
+hash.update('Message to hash');
+hash.hex();
+
+// HMAC
+sha1.hmac('key', 'Message to hash');
+
+var hash = sha1.hmac.create('key');
+hash.update('Message to hash');
+hash.hex();
+```
+
+### Node.js
+If you use node.js, you should require the module first:
+```JavaScript
+var sha1 = require('js-sha1');
+```
+
+### TypeScript
+If you use TypeScript, you can import like this:
+```TypeScript
+import { sha1 } from 'js-sha1';
+```
+
+## RequireJS
+It supports AMD:
+```JavaScript
+require(['your/path/sha1.js'], function(sha1) {
+// ...
+});
+```
+
+## Example
+```JavaScript
+sha1(''); // da39a3ee5e6b4b0d3255bfef95601890afd80709
+sha1('The quick brown fox jumps over the lazy dog'); // 2fd4e1c67a2d28fced849ee1bb76e7391b93eb12
+sha1('The quick brown fox jumps over the lazy dog.'); // 408d94384216f890ff7a0c3528e8bed1e0b01621
+
+// It also supports UTF-8 encoding
+sha1('中文'); // 7be2d2d20c106eee0836c9bc2b939890a78e8fb3
+
+// It also supports byte `Array`, `Uint8Array`, `ArrayBuffer`
+sha1([]); // da39a3ee5e6b4b0d3255bfef95601890afd80709
+sha1(new Uint8Array([])); // da39a3ee5e6b4b0d3255bfef95601890afd80709
+
+// Different output
+sha1(''); // da39a3ee5e6b4b0d3255bfef95601890afd80709
+sha1.hex(''); // da39a3ee5e6b4b0d3255bfef95601890afd80709
+sha1.array(''); // [218, 57, 163, 238, 94, 107, 75, 13, 50, 85, 191, 239, 149, 96, 24, 144, 175, 216, 7, 9]
+sha1.digest(''); // [218, 57, 163, 238, 94, 107, 75, 13, 50, 85, 191, 239, 149, 96, 24, 144, 175, 216, 7, 9]
+sha1.arrayBuffer(''); // ArrayBuffer
+
+// HMAC
+sha1.hmac.hex('key', 'Message to hash');
+sha1.hmac.array('key', 'Message to hash');
+// ...
+```
+
+## License
+The project is released under the [MIT license](http://www.opensource.org/licenses/MIT).
+
+## Contact
+The project's website is located at https://github.com/emn178/js-sha1  
+Author: Chen, Yi-Cyuan (emn178@gmail.com)

node_modules/js-sha1/index.d.ts

@@ -0,0 +1,148 @@
+type Message = string | number[] | ArrayBuffer | Uint8Array;
+
+interface Hasher {
+  /**
+   * Update hash
+   *
+   * @param message The message you want to hash.
+   */
+  update(message: Message): Hasher;
+
+  /**
+   * Return hash in hex string.
+   */
+  hex(): string;
+
+  /**
+   * Return hash in hex string.
+   */
+  toString(): string;
+
+  /**
+   * Return hash in ArrayBuffer.
+   */
+  arrayBuffer(): ArrayBuffer;
+
+  /**
+   * Return hash in integer array.
+   */
+  digest(): number[];
+
+  /**
+   * Return hash in integer array.
+   */
+  array(): number[];
+}
+
+interface Hmac {
+  /**
+   * Computes a Hash-based message authentication code (HMAC) using a secret key
+   *
+   * @param secretKey The Secret Key
+   * @param message The message you want to hash.
+   */
+  (secretKey: Message, message: Message): string;
+
+  /**
+   * Create a hash object using a secret key.
+   *
+   * @param secretKey The Secret Key
+   */
+  create(secretKey: Message): Hasher;
+
+  /**
+   * Create a hash object and hash message using a secret key
+   *
+   * @param secretKey The Secret Key
+   * @param message The message you want to hash.
+   */
+  update(secretKey: Message, message: Message): Hasher;
+
+  /**
+   * Return hash in hex string.
+   *
+   * @param secretKey The Secret Key
+   * @param message The message you want to hash.
+   */
+  hex(secretKey: Message, message: Message): string;
+
+  /**
+   * Return hash in ArrayBuffer.
+   *
+   * @param secretKey The Secret Key
+   * @param message The message you want to hash.
+   */
+  arrayBuffer(secretKey: Message, message: Message): ArrayBuffer;
+
+  /**
+   * Return hash in integer array.
+   *
+   * @param secretKey The Secret Key
+   * @param message The message you want to hash.
+   */
+  digest(secretKey: Message, message: Message): number[];
+
+  /**
+   * Return hash in integer array.
+   *
+   * @param secretKey The Secret Key
+   * @param message The message you want to hash.
+   */
+  array(secretKey: Message, message: Message): number[];
+}
+
+interface Hash {
+  /**
+   * Hash and return hex string.
+   *
+   * @param message The message you want to hash.
+   */
+  (message: Message): string;
+
+  /**
+   * Create a hash object.
+   */
+  create(): Hasher;
+
+  /**
+   * Create a hash object and hash message.
+   *
+   * @param message The message you want to hash.
+   */
+  update(message: Message): Hasher;
+
+  /**
+   * Return hash in hex string.
+   *
+   * @param message The message you want to hash.
+   */
+  hex(message: Message): string;
+
+  /**
+   * Return hash in ArrayBuffer.
+   *
+   * @param message The message you want to hash.
+   */
+  arrayBuffer(message: Message): ArrayBuffer;
+
+  /**
+   * Return hash in integer array.
+   *
+   * @param message The message you want to hash.
+   */
+  digest(message: Message): number[];
+
+  /**
+   * Return hash in integer array.
+   *
+   * @param message The message you want to hash.
+   */
+  array(message: Message): number[];
+
+  /**
+   * HMAC interface
+   */
+  hmac: Hmac;
+}
+
+export var sha1: Hash;

node_modules/js-sha1/package.json

@@ -0,0 +1,75 @@
+{
+  "_from": "js-sha1",
+  "_id": "js-sha1@0.7.0",
+  "_inBundle": false,
+  "_integrity": "sha512-oQZ1Mo7440BfLSv9TX87VNEyU52pXPVG19F9PL3gTgNt0tVxlZ8F4O6yze3CLuLx28TxotxvlyepCNaaV0ZjMw==",
+  "_location": "/js-sha1",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "tag",
+    "registry": true,
+    "raw": "js-sha1",
+    "name": "js-sha1",
+    "escapedName": "js-sha1",
+    "rawSpec": "",
+    "saveSpec": null,
+    "fetchSpec": "latest"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "https://registry.npmmirror.com/js-sha1/-/js-sha1-0.7.0.tgz",
+  "_shasum": "fecaf5f36bb09a51b01da46b43a207c8452c9c1e",
+  "_spec": "js-sha1",
+  "_where": "/Users/liangbowen/Library/Containers/com.tencent.xinWeChat/Data/Library/Application Support/com.tencent.xinWeChat/2.0b4.0.9/cc7ac57a2ed0819bf09fd680c213c1be/Message/MessageTemp/1ddaefb0a1acb4834cac199fa4429fc2/File/consumoption",
+  "author": {
+    "name": "Chen, Yi-Cyuan",
+    "email": "emn178@gmail.com"
+  },
+  "browser": {
+    "crypto": false,
+    "buffer": false
+  },
+  "bugs": {
+    "url": "https://github.com/emn178/js-sha1/issues"
+  },
+  "bundleDependencies": false,
+  "deprecated": false,
+  "description": "A simple SHA1 hash function for JavaScript supports UTF-8 encoding.",
+  "devDependencies": {
+    "expect.js": "~0.3.1",
+    "mocha": "~10.2.0",
+    "nyc": "^15.1.0",
+    "requirejs": "^2.1.22",
+    "tiny-worker": "^2.3.0",
+    "uglify-js": "^3.1.9"
+  },
+  "homepage": "https://github.com/emn178/js-sha1",
+  "keywords": [
+    "sha",
+    "sha1",
+    "encryption",
+    "cryptography",
+    "HMAC"
+  ],
+  "license": "MIT",
+  "main": "src/sha1.js",
+  "name": "js-sha1",
+  "nyc": {
+    "exclude": [
+      "tests"
+    ]
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/emn178/js-sha1.git"
+  },
+  "scripts": {
+    "build": "uglifyjs src/sha1.js -c -m eval --comments -o build/sha1.min.js",
+    "coveralls": "nyc report --reporter=text-lcov | coveralls",
+    "report": "nyc --reporter=html --reporter=text mocha tests/node-test.js",
+    "test": "nyc mocha tests/node-test.js"
+  },
+  "version": "0.7.0"
+}

node_modules/js-sha1/src/sha1.js

@@ -0,0 +1,510 @@
+/*
+ * [js-sha1]{@link https://github.com/emn178/js-sha1}
+ *
+ * @version 0.7.0
+ * @author Chen, Yi-Cyuan [emn178@gmail.com]
+ * @copyright Chen, Yi-Cyuan 2014-2024
+ * @license MIT
+ */
+/*jslint bitwise: true */
+(function() {
+  'use strict';
+
+  var INPUT_ERROR = 'input is invalid type';
+  var FINALIZE_ERROR = 'finalize already called';
+  var WINDOW = typeof window === 'object';
+  var root = WINDOW ? window : {};
+  if (root.JS_SHA1_NO_WINDOW) {
+    WINDOW = false;
+  }
+  var WEB_WORKER = !WINDOW && typeof self === 'object';
+  var NODE_JS = !root.JS_SHA1_NO_NODE_JS && typeof process === 'object' && process.versions && process.versions.node;
+  if (NODE_JS) {
+    root = global;
+  } else if (WEB_WORKER) {
+    root = self;
+  }
+  var COMMON_JS = !root.JS_SHA1_NO_COMMON_JS && typeof module === 'object' && module.exports;
+  var AMD = typeof define === 'function' && define.amd;
+  var ARRAY_BUFFER = !root.JS_SHA1_NO_ARRAY_BUFFER && typeof ArrayBuffer !== 'undefined';
+  var HEX_CHARS = '0123456789abcdef'.split('');
+  var EXTRA = [-2147483648, 8388608, 32768, 128];
+  var SHIFT = [24, 16, 8, 0];
+  var OUTPUT_TYPES = ['hex', 'array', 'digest', 'arrayBuffer'];
+
+  var blocks = [];
+
+  var isArray = Array.isArray;
+  if (root.JS_SHA1_NO_NODE_JS || !isArray) {
+    isArray = function (obj) {
+      return Object.prototype.toString.call(obj) === '[object Array]';
+    };
+  }
+
+  var isView = ArrayBuffer.isView;
+  if (ARRAY_BUFFER && (root.JS_SHA1_NO_ARRAY_BUFFER_IS_VIEW || !isView)) {
+    isView = function (obj) {
+      return typeof obj === 'object' && obj.buffer && obj.buffer.constructor === ArrayBuffer;
+    };
+  }
+
+  // [message: string, isString: bool]
+  var formatMessage = function (message) {
+    var type = typeof message;
+    if (type === 'string') {
+      return [message, true];
+    }
+    if (type !== 'object' || message === null) {
+      throw new Error(INPUT_ERROR);
+    }
+    if (ARRAY_BUFFER && message.constructor === ArrayBuffer) {
+      return [new Uint8Array(message), false];
+    }
+    if (!isArray(message) && !isView(message)) {
+      throw new Error(INPUT_ERROR);
+    }
+    return [message, false];
+  }
+
+  var createOutputMethod = function (outputType) {
+    return function (message) {
+      return new Sha1(true).update(message)[outputType]();
+    };
+  };
+
+  var createMethod = function () {
+    var method = createOutputMethod('hex');
+    if (NODE_JS) {
+      method = nodeWrap(method);
+    }
+    method.create = function () {
+      return new Sha1();
+    };
+    method.update = function (message) {
+      return method.create().update(message);
+    };
+    for (var i = 0; i < OUTPUT_TYPES.length; ++i) {
+      var type = OUTPUT_TYPES[i];
+      method[type] = createOutputMethod(type);
+    }
+    return method;
+  };
+
+  var nodeWrap = function (method) {
+    var crypto = require('crypto')
+    var Buffer = require('buffer').Buffer;
+    var bufferFrom;
+    if (Buffer.from && !root.JS_SHA1_NO_BUFFER_FROM) {
+      bufferFrom = Buffer.from;
+    } else {
+      bufferFrom = function (message) {
+        return new Buffer(message);
+      };
+    }
+    var nodeMethod = function (message) {
+      if (typeof message === 'string') {
+        return crypto.createHash('sha1').update(message, 'utf8').digest('hex');
+      } else {
+        if (message === null || message === undefined) {
+          throw new Error(INPUT_ERROR);
+        } else if (message.constructor === ArrayBuffer) {
+          message = new Uint8Array(message);
+        }
+      }
+      if (isArray(message) || isView(message) ||
+        message.constructor === Buffer) {
+        return crypto.createHash('sha1').update(bufferFrom(message)).digest('hex');
+      } else {
+        return method(message);
+      }
+    };
+    return nodeMethod;
+  };
+
+  var createHmacOutputMethod = function (outputType) {
+    return function (key, message) {
+      return new HmacSha1(key, true).update(message)[outputType]();
+    };
+  };
+
+  var createHmacMethod = function () {
+    var method = createHmacOutputMethod('hex');
+    method.create = function (key) {
+      return new HmacSha1(key);
+    };
+    method.update = function (key, message) {
+      return method.create(key).update(message);
+    };
+    for (var i = 0; i < OUTPUT_TYPES.length; ++i) {
+      var type = OUTPUT_TYPES[i];
+      method[type] = createHmacOutputMethod(type);
+    }
+    return method;
+  };
+
+  function Sha1(sharedMemory) {
+    if (sharedMemory) {
+      blocks[0] = blocks[16] = blocks[1] = blocks[2] = blocks[3] =
+      blocks[4] = blocks[5] = blocks[6] = blocks[7] =
+      blocks[8] = blocks[9] = blocks[10] = blocks[11] =
+      blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0;
+      this.blocks = blocks;
+    } else {
+      this.blocks = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+    }
+
+    this.h0 = 0x67452301;
+    this.h1 = 0xEFCDAB89;
+    this.h2 = 0x98BADCFE;
+    this.h3 = 0x10325476;
+    this.h4 = 0xC3D2E1F0;
+
+    this.block = this.start = this.bytes = this.hBytes = 0;
+    this.finalized = this.hashed = false;
+    this.first = true;
+  }
+
+  Sha1.prototype.update = function (message) {
+    if (this.finalized) {
+      throw new Error(FINALIZE_ERROR);
+    }
+
+    var result = formatMessage(message);
+    message = result[0];
+    var isString = result[1];
+    var code, index = 0, i, length = message.length || 0, blocks = this.blocks;
+
+    while (index < length) {
+      if (this.hashed) {
+        this.hashed = false;
+        blocks[0] = this.block;
+        this.block = blocks[16] = blocks[1] = blocks[2] = blocks[3] =
+        blocks[4] = blocks[5] = blocks[6] = blocks[7] =
+        blocks[8] = blocks[9] = blocks[10] = blocks[11] =
+        blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0;
+      }
+
+      if(isString) {
+        for (i = this.start; index < length && i < 64; ++index) {
+          code = message.charCodeAt(index);
+          if (code < 0x80) {
+            blocks[i >>> 2] |= code << SHIFT[i++ & 3];
+          } else if (code < 0x800) {
+            blocks[i >>> 2] |= (0xc0 | (code >>> 6)) << SHIFT[i++ & 3];
+            blocks[i >>> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
+          } else if (code < 0xd800 || code >= 0xe000) {
+            blocks[i >>> 2] |= (0xe0 | (code >>> 12)) << SHIFT[i++ & 3];
+            blocks[i >>> 2] |= (0x80 | ((code >>> 6) & 0x3f)) << SHIFT[i++ & 3];
+            blocks[i >>> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
+          } else {
+            code = 0x10000 + (((code & 0x3ff) << 10) | (message.charCodeAt(++index) & 0x3ff));
+            blocks[i >>> 2] |= (0xf0 | (code >>> 18)) << SHIFT[i++ & 3];
+            blocks[i >>> 2] |= (0x80 | ((code >>> 12) & 0x3f)) << SHIFT[i++ & 3];
+            blocks[i >>> 2] |= (0x80 | ((code >>> 6) & 0x3f)) << SHIFT[i++ & 3];
+            blocks[i >>> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
+          }
+        }
+      } else {
+        for (i = this.start; index < length && i < 64; ++index) {
+          blocks[i >>> 2] |= message[index] << SHIFT[i++ & 3];
+        }
+      }
+
+      this.lastByteIndex = i;
+      this.bytes += i - this.start;
+      if (i >= 64) {
+        this.block = blocks[16];
+        this.start = i - 64;
+        this.hash();
+        this.hashed = true;
+      } else {
+        this.start = i;
+      }
+    }
+    if (this.bytes > 4294967295) {
+      this.hBytes += this.bytes / 4294967296 << 0;
+      this.bytes = this.bytes % 4294967296;
+    }
+    return this;
+  };
+
+  Sha1.prototype.finalize = function () {
+    if (this.finalized) {
+      return;
+    }
+    this.finalized = true;
+    var blocks = this.blocks, i = this.lastByteIndex;
+    blocks[16] = this.block;
+    blocks[i >>> 2] |= EXTRA[i & 3];
+    this.block = blocks[16];
+    if (i >= 56) {
+      if (!this.hashed) {
+        this.hash();
+      }
+      blocks[0] = this.block;
+      blocks[16] = blocks[1] = blocks[2] = blocks[3] =
+      blocks[4] = blocks[5] = blocks[6] = blocks[7] =
+      blocks[8] = blocks[9] = blocks[10] = blocks[11] =
+      blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0;
+    }
+    blocks[14] = this.hBytes << 3 | this.bytes >>> 29;
+    blocks[15] = this.bytes << 3;
+    this.hash();
+  };
+
+  Sha1.prototype.hash = function () {
+    var a = this.h0, b = this.h1, c = this.h2, d = this.h3, e = this.h4;
+    var f, j, t, blocks = this.blocks;
+
+    for(j = 16; j < 80; ++j) {
+      t = blocks[j - 3] ^ blocks[j - 8] ^ blocks[j - 14] ^ blocks[j - 16];
+      blocks[j] =  (t << 1) | (t >>> 31);
+    }
+
+    for(j = 0; j < 20; j += 5) {
+      f = (b & c) | ((~b) & d);
+      t = (a << 5) | (a >>> 27);
+      e = t + f + e + 1518500249 + blocks[j] << 0;
+      b = (b << 30) | (b >>> 2);
+
+      f = (a & b) | ((~a) & c);
+      t = (e << 5) | (e >>> 27);
+      d = t + f + d + 1518500249 + blocks[j + 1] << 0;
+      a = (a << 30) | (a >>> 2);
+
+      f = (e & a) | ((~e) & b);
+      t = (d << 5) | (d >>> 27);
+      c = t + f + c + 1518500249 + blocks[j + 2] << 0;
+      e = (e << 30) | (e >>> 2);
+
+      f = (d & e) | ((~d) & a);
+      t = (c << 5) | (c >>> 27);
+      b = t + f + b + 1518500249 + blocks[j + 3] << 0;
+      d = (d << 30) | (d >>> 2);
+
+      f = (c & d) | ((~c) & e);
+      t = (b << 5) | (b >>> 27);
+      a = t + f + a + 1518500249 + blocks[j + 4] << 0;
+      c = (c << 30) | (c >>> 2);
+    }
+
+    for(; j < 40; j += 5) {
+      f = b ^ c ^ d;
+      t = (a << 5) | (a >>> 27);
+      e = t + f + e + 1859775393 + blocks[j] << 0;
+      b = (b << 30) | (b >>> 2);
+
+      f = a ^ b ^ c;
+      t = (e << 5) | (e >>> 27);
+      d = t + f + d + 1859775393 + blocks[j + 1] << 0;
+      a = (a << 30) | (a >>> 2);
+
+      f = e ^ a ^ b;
+      t = (d << 5) | (d >>> 27);
+      c = t + f + c + 1859775393 + blocks[j + 2] << 0;
+      e = (e << 30) | (e >>> 2);
+
+      f = d ^ e ^ a;
+      t = (c << 5) | (c >>> 27);
+      b = t + f + b + 1859775393 + blocks[j + 3] << 0;
+      d = (d << 30) | (d >>> 2);
+
+      f = c ^ d ^ e;
+      t = (b << 5) | (b >>> 27);
+      a = t + f + a + 1859775393 + blocks[j + 4] << 0;
+      c = (c << 30) | (c >>> 2);
+    }
+
+    for(; j < 60; j += 5) {
+      f = (b & c) | (b & d) | (c & d);
+      t = (a << 5) | (a >>> 27);
+      e = t + f + e - 1894007588 + blocks[j] << 0;
+      b = (b << 30) | (b >>> 2);
+
+      f = (a & b) | (a & c) | (b & c);
+      t = (e << 5) | (e >>> 27);
+      d = t + f + d - 1894007588 + blocks[j + 1] << 0;
+      a = (a << 30) | (a >>> 2);
+
+      f = (e & a) | (e & b) | (a & b);
+      t = (d << 5) | (d >>> 27);
+      c = t + f + c - 1894007588 + blocks[j + 2] << 0;
+      e = (e << 30) | (e >>> 2);
+
+      f = (d & e) | (d & a) | (e & a);
+      t = (c << 5) | (c >>> 27);
+      b = t + f + b - 1894007588 + blocks[j + 3] << 0;
+      d = (d << 30) | (d >>> 2);
+
+      f = (c & d) | (c & e) | (d & e);
+      t = (b << 5) | (b >>> 27);
+      a = t + f + a - 1894007588 + blocks[j + 4] << 0;
+      c = (c << 30) | (c >>> 2);
+    }
+
+    for(; j < 80; j += 5) {
+      f = b ^ c ^ d;
+      t = (a << 5) | (a >>> 27);
+      e = t + f + e - 899497514 + blocks[j] << 0;
+      b = (b << 30) | (b >>> 2);
+
+      f = a ^ b ^ c;
+      t = (e << 5) | (e >>> 27);
+      d = t + f + d - 899497514 + blocks[j + 1] << 0;
+      a = (a << 30) | (a >>> 2);
+
+      f = e ^ a ^ b;
+      t = (d << 5) | (d >>> 27);
+      c = t + f + c - 899497514 + blocks[j + 2] << 0;
+      e = (e << 30) | (e >>> 2);
+
+      f = d ^ e ^ a;
+      t = (c << 5) | (c >>> 27);
+      b = t + f + b - 899497514 + blocks[j + 3] << 0;
+      d = (d << 30) | (d >>> 2);
+
+      f = c ^ d ^ e;
+      t = (b << 5) | (b >>> 27);
+      a = t + f + a - 899497514 + blocks[j + 4] << 0;
+      c = (c << 30) | (c >>> 2);
+    }
+
+    this.h0 = this.h0 + a << 0;
+    this.h1 = this.h1 + b << 0;
+    this.h2 = this.h2 + c << 0;
+    this.h3 = this.h3 + d << 0;
+    this.h4 = this.h4 + e << 0;
+  };
+
+  Sha1.prototype.hex = function () {
+    this.finalize();
+
+    var h0 = this.h0, h1 = this.h1, h2 = this.h2, h3 = this.h3, h4 = this.h4;
+
+    return HEX_CHARS[(h0 >>> 28) & 0x0F] + HEX_CHARS[(h0 >>> 24) & 0x0F] +
+           HEX_CHARS[(h0 >>> 20) & 0x0F] + HEX_CHARS[(h0 >>> 16) & 0x0F] +
+           HEX_CHARS[(h0 >>> 12) & 0x0F] + HEX_CHARS[(h0 >>> 8) & 0x0F] +
+           HEX_CHARS[(h0 >>> 4) & 0x0F] + HEX_CHARS[h0 & 0x0F] +
+           HEX_CHARS[(h1 >>> 28) & 0x0F] + HEX_CHARS[(h1 >>> 24) & 0x0F] +
+           HEX_CHARS[(h1 >>> 20) & 0x0F] + HEX_CHARS[(h1 >>> 16) & 0x0F] +
+           HEX_CHARS[(h1 >>> 12) & 0x0F] + HEX_CHARS[(h1 >>> 8) & 0x0F] +
+           HEX_CHARS[(h1 >>> 4) & 0x0F] + HEX_CHARS[h1 & 0x0F] +
+           HEX_CHARS[(h2 >>> 28) & 0x0F] + HEX_CHARS[(h2 >>> 24) & 0x0F] +
+           HEX_CHARS[(h2 >>> 20) & 0x0F] + HEX_CHARS[(h2 >>> 16) & 0x0F] +
+           HEX_CHARS[(h2 >>> 12) & 0x0F] + HEX_CHARS[(h2 >>> 8) & 0x0F] +
+           HEX_CHARS[(h2 >>> 4) & 0x0F] + HEX_CHARS[h2 & 0x0F] +
+           HEX_CHARS[(h3 >>> 28) & 0x0F] + HEX_CHARS[(h3 >>> 24) & 0x0F] +
+           HEX_CHARS[(h3 >>> 20) & 0x0F] + HEX_CHARS[(h3 >>> 16) & 0x0F] +
+           HEX_CHARS[(h3 >>> 12) & 0x0F] + HEX_CHARS[(h3 >>> 8) & 0x0F] +
+           HEX_CHARS[(h3 >>> 4) & 0x0F] + HEX_CHARS[h3 & 0x0F] +
+           HEX_CHARS[(h4 >>> 28) & 0x0F] + HEX_CHARS[(h4 >>> 24) & 0x0F] +
+           HEX_CHARS[(h4 >>> 20) & 0x0F] + HEX_CHARS[(h4 >>> 16) & 0x0F] +
+           HEX_CHARS[(h4 >>> 12) & 0x0F] + HEX_CHARS[(h4 >>> 8) & 0x0F] +
+           HEX_CHARS[(h4 >>> 4) & 0x0F] + HEX_CHARS[h4 & 0x0F];
+  };
+
+  Sha1.prototype.toString = Sha1.prototype.hex;
+
+  Sha1.prototype.digest = function () {
+    this.finalize();
+
+    var h0 = this.h0, h1 = this.h1, h2 = this.h2, h3 = this.h3, h4 = this.h4;
+
+    return [
+      (h0 >>> 24) & 0xFF, (h0 >>> 16) & 0xFF, (h0 >>> 8) & 0xFF, h0 & 0xFF,
+      (h1 >>> 24) & 0xFF, (h1 >>> 16) & 0xFF, (h1 >>> 8) & 0xFF, h1 & 0xFF,
+      (h2 >>> 24) & 0xFF, (h2 >>> 16) & 0xFF, (h2 >>> 8) & 0xFF, h2 & 0xFF,
+      (h3 >>> 24) & 0xFF, (h3 >>> 16) & 0xFF, (h3 >>> 8) & 0xFF, h3 & 0xFF,
+      (h4 >>> 24) & 0xFF, (h4 >>> 16) & 0xFF, (h4 >>> 8) & 0xFF, h4 & 0xFF
+    ];
+  };
+
+  Sha1.prototype.array = Sha1.prototype.digest;
+
+  Sha1.prototype.arrayBuffer = function () {
+    this.finalize();
+
+    var buffer = new ArrayBuffer(20);
+    var dataView = new DataView(buffer);
+    dataView.setUint32(0, this.h0);
+    dataView.setUint32(4, this.h1);
+    dataView.setUint32(8, this.h2);
+    dataView.setUint32(12, this.h3);
+    dataView.setUint32(16, this.h4);
+    return buffer;
+  };
+
+  function HmacSha1(key, sharedMemory) {
+    var i, result = formatMessage(key);
+    key = result[0];
+    if (result[1]) {
+      var bytes = [], length = key.length, index = 0, code;
+      for (i = 0; i < length; ++i) {
+        code = key.charCodeAt(i);
+        if (code < 0x80) {
+          bytes[index++] = code;
+        } else if (code < 0x800) {
+          bytes[index++] = (0xc0 | (code >>> 6));
+          bytes[index++] = (0x80 | (code & 0x3f));
+        } else if (code < 0xd800 || code >= 0xe000) {
+          bytes[index++] = (0xe0 | (code >>> 12));
+          bytes[index++] = (0x80 | ((code >>> 6) & 0x3f));
+          bytes[index++] = (0x80 | (code & 0x3f));
+        } else {
+          code = 0x10000 + (((code & 0x3ff) << 10) | (key.charCodeAt(++i) & 0x3ff));
+          bytes[index++] = (0xf0 | (code >>> 18));
+          bytes[index++] = (0x80 | ((code >>> 12) & 0x3f));
+          bytes[index++] = (0x80 | ((code >>> 6) & 0x3f));
+          bytes[index++] = (0x80 | (code & 0x3f));
+        }
+      }
+      key = bytes;
+    }
+
+    if (key.length > 64) {
+      key = (new Sha1(true)).update(key).array();
+    }
+
+    var oKeyPad = [], iKeyPad = [];
+    for (i = 0; i < 64; ++i) {
+      var b = key[i] || 0;
+      oKeyPad[i] = 0x5c ^ b;
+      iKeyPad[i] = 0x36 ^ b;
+    }
+
+    Sha1.call(this, sharedMemory);
+
+    this.update(iKeyPad);
+    this.oKeyPad = oKeyPad;
+    this.inner = true;
+    this.sharedMemory = sharedMemory;
+  }
+  HmacSha1.prototype = new Sha1();
+
+  HmacSha1.prototype.finalize = function () {
+    Sha1.prototype.finalize.call(this);
+    if (this.inner) {
+      this.inner = false;
+      var innerHash = this.array();
+      Sha1.call(this, this.sharedMemory);
+      this.update(this.oKeyPad);
+      this.update(innerHash);
+      Sha1.prototype.finalize.call(this);
+    }
+  };
+
+  var exports = createMethod();
+  exports.sha1 = exports;
+  exports.sha1.hmac = createHmacMethod();
+
+  if (COMMON_JS) {
+    module.exports = exports;
+  } else {
+    root.sha1 = exports;
+    if (AMD) {
+      define(function () {
+        return exports;
+      });
+    }
+  }
+})();

package-lock.json

@@ -1,13 +1,13 @@
 {
-  "name": "hello-uniapp",
-  "version": "1.0.0",
+  "name": "个人信息编辑表单",
+  "version": "1.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "image-tools": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmmirror.com/image-tools/-/image-tools-1.4.0.tgz",
-      "integrity": "sha512-TKtvJ6iUwM0mfaD4keMnk1ENHFC470QEjBfA3IlvKdEOufzvWbjbaoNcoyYq6HlViF8+d5tOS1ooE6j7CHf1lQ=="
+    "js-sha1": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmmirror.com/js-sha1/-/js-sha1-0.7.0.tgz",
+      "integrity": "sha512-oQZ1Mo7440BfLSv9TX87VNEyU52pXPVG19F9PL3gTgNt0tVxlZ8F4O6yze3CLuLx28TxotxvlyepCNaaV0ZjMw=="
     },
     "uni-read-pages": {
       "version": "1.0.5",

package.json

@@ -7,5 +7,8 @@
         "表单",
         "用户信息",
         "手机号"
-    ]
-}
+    ],
+    "dependencies": {
+        "js-sha1": "^0.7.0"
+    }
+}

pages.json

@@ -1,15 +1,24 @@
 {
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+	"pages": [
+	//pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+	{
+		"path": "pages/home/home",
+		"style": {
+			"navigationBarTitleText": "首页",
+			"enablePullDownRefresh": true
+		}
+	},
+	{
+		"path": "pages/mintir/index",
+		"style": {
+			"navigationBarTitleText": "数据检测",
+			"enablePullDownRefresh": true
+		}
+	},
 		{
 			"path": "pages/login/index",
 			"style": {
-				"navigationBarTitleText": "登录"
-			}
-		},
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "数据检测",
+				"navigationBarTitleText": "登录",
 				"enablePullDownRefresh": true
 			}
 		},
@@ -19,13 +28,6 @@
 				"navigationBarTitleText": "个人中心",
 				"enablePullDownRefresh": true
 			}
-		},
-		{
-			"path": "pages/home/home",
-			"style": {
-				"navigationBarTitleText": "编辑个人中心",
-				"enablePullDownRefresh": true
-			}
 		}
 	],
 	"tabBar": {
@@ -38,7 +40,7 @@
 		"iconWidth": "24px",
 		"spacing": "3px",
 		"list": [{
-			"pagePath": "pages/index/index",
+			"pagePath": "pages/mintir/index",
 			"text": "数据检测",
 			"iconPath": "static/home.jpg",
 			"selectedIconPath": "static/homeset.jpg"

pages/home/home.vue

@@ -1,304 +1,382 @@
 <template>
-	<view class="container">
-		<view class="ui-all">
-			<view class="ui-list">
-				<text>姓名</text>
-				<input type="text" :placeholder="value" :value="formData.userName" @input="bindnickName"
-					placeholder-class="place" />
-			</view>
-			<view class="ui-list">
-				<text>手机号</text>
-				<input type="tel" :placeholder="value" :value="formData.phone" @input="bindmobile"
-					placeholder-class="place" disabled="disabled" />
-			</view>
-			<view class="ui-list">
-				<text>地址</text>
-				<input type="text" :placeholder="value" :value="formData.areaName" @input="bindRegionChange"
-					placeholder-class="place" />
-			</view>
-			<!-- 	<view class="ui-list right">
-				<text>地址</text> -->
-			<!-- <picker @change="bindRegionChange" mode='region'>
-					<view class="picker">
-						{{region[0]}} {{region[1]}} {{region[2]}}
+	<view class="home-wrap">
+		<view class="home-title">
+			<view class="title-bac">
+				<view class="section-view">
+					<view class="user-cont">
+						<span class="user-spn">欢迎</span>
+						<span class="user-spn spnr">{{userData.userName}}</span>
 					</view>
-				</picker> -->
-			<!-- </view> -->
-			<view class="ui-list right">
-				<text>性别</text>
-				<picker @change="bindPickerChange" mode='selector' range-key="name" :value="index" :range="sex">
-					<view class="picker">
-						{{sex[index].name}}
+					<view class="curent-cont">
+						<span class="current-spn">当前所在医疗机构：</span>
+						<span class="user-spn spnr">{{userData.userName}}</span>
 					</view>
-				</picker>
-			</view>
-			<view class="ui-list right">
-				<text>生日</text>
-				<picker mode="date" :value="formData.birth" @change="bindDateChange">
-					<view class="picker">
-						{{formData.birth}}
+				</view>
+				<view class="all-app">
+					<view class="all-title">
+						请选择医疗机构
+					</view>
+					<view class="all-app-view">
+						<view class="app-view-item" v-for="(item,index) in appData" :key="index">
+							<view class="app-item-img" :style="{background: item.bgColor}" @click.stop="appView(item)">
+								<image class="app-item-svg" :src="item.iconUrl">
+								</image>
+							</view>
+							<view class="app-item-text">
+								{{item.name}}
+							</view>
+						</view>
 					</view>
-				</picker>
+				</view>
 			</view>
 		</view>
-		<view style="text-align: center;margin-top: 100rpx;" @tap="savaInfo()">
-			<view class="login" style="background-color: #49A992">保存修改</view>
-		</view>
+		<uni-popup ref="message" type="dialog">
+			<uni-popup-dialog type="warn" cancelText="取消" confirmText="确定" content="确定退出当前账号？" @confirm="dialogConfirm"
+				@close="dialogClose"></uni-popup-dialog>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
+	import {
+		mapState,
+		mapMutations,
+		mapActions
+	} from 'vuex';
 	export default {
-
+		components: {},
+		computed: {
+			...mapState(['houseData', 'houseSelectData', 'userData', 'homeAwaitData', 'messData']),
+		},
 		data() {
 			return {
-				value: '请填写',
-				sex: [{
-					id: 1,
-					name: '男'
-				}, {
-					id: 2,
-					name: '女'
-				}],
-				index: 0,
-				region: ['请填写'],
-				date: '请填写',
-				avater: '',
-				description: '',
-				url: '',
-				nickName: '',
-				mobile: '',
-				headimg: '',
-				formData: {
-					birth: "",
-					userName: "",
-					gend: "",
-					areaName: "",
-					phone: "",
-				}
+				listData: [],
+				msData: [],
+				outRoom: "请选择仓库",
+				romDetData: {
+					acpCnt: '待验收',
+					groundCnt: '待上架',
+					stooutCnt: "待出库",
+					stostrCnt: "待配送"
 
+				},
+				appData: [{
+						iconUrl: "../../static/pandian.svg",
+						name: "大同市人民医院",
+						bgColor: "#2CE4BF",
+					},
+					{
+						iconUrl: "../../static/pandian.svg",
+						name: "太原市人民医院",
+						bgColor: "#2CE4BF",
+					},
+
+				]
 			}
 		},
-		created() {
-			// this.wechatId = uni.getStorageSync('wechatId');
-			this.getData()
+		onLoad() {
+
+		},
+		mounted() {
+			this.getUserData();
+		},
+		watch: {
+			messData(newOld) {
+
+			}
 		},
 		methods: {
-			onPullDownRefresh() {
-				this.getData();
-				setTimeout(function() {
-					uni.stopPullDownRefresh(); //停止下拉刷新动画
-				}, 1000);
+			...mapActions(['getUserData']),
+			...mapMutations(['setHouseName']),
+			//跳转页面
+			appView(item) {
+				uni.switchTab({
+					url: '/pages/mintir/index',
+					success: function(res) {}
+				});
 			},
-			getData() {
-				this.$http('homePage.information', {}, '加载中').then((res) => {
-					this.formData = res.data;
-					if (this.formData.gend === '女') {
-						this.index = 1;
-					} else {
-						this.index = 0;
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.home-wrap {
+		width: 100%;
+		height: 100%;
+		background-color: #F5F5F5;
+
+		.home-title {
+			width: 100%;
+			height: auto;
+
+			.title-bac {
+				width: 100%;
+				height: 392rpx;
+				border-radius: 0rpx 0rpx 40rpx 40rpx;
+				background: linear-gradient(180deg, rgba(1, 169, 146, 1) 0%, rgba(1, 176, 164, 0.54) 46%, rgba(2, 181, 176, 0.24) 100%, rgba(2, 185, 185, 0) 100%);
+				padding: 20rpx;
+				box-sizing: border-box;
+
+				.roomt {
+					width: 100%;
+					height: 70rpx;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+
+					.rom-spn {
+						color: rgba(255, 255, 255, 0.9);
+						font-size: 36rpx;
+						text-align: left;
+						font-family: PingFangSC-bold;
 					}
-				})
-			},
-			bindPickerChange(e) {
-				this.index = e.detail.value;
-				if (this.index == '0') {
-					this.formData.gend = '男';
-				} else {
-					this.formData.gend = '女';
+
 				}
-			},
-			bindRegionChange(e) {
-				this.formData.areaName = e.detail.value;
-			},
-			bindDateChange(e) {
-				this.formData.birth = e.detail.value;
-			},
-			bindnickName(e) {
-				this.formData.userName = e.detail.value;
-			},
-			bindmobile(e) {
-				this.formData.phone = e.detail.value;
-			},
-			savaInfo() {
-				const getList = {
-					token: uni.getStorageSync('token'),
-					birth: this.formData.birth,
-					gend: this.formData.gend,
-					areaName: this.formData.areaName,
-					phone: this.formData.phone,
-					userName: this.formData.userName,
-				};
-				this.$http('homePage.informationData', getList, '加载中').then((res) => {
-					if (res.success == true) {
-						uni.showToast({
-							title: '保存成功',
-							icon: 'none',
-						});
+
+				.section-view {
+					width: 97%;
+					margin: 70rpx auto 40rpx auto;
+					height: 210rpx;
+					background-color: rgba(255, 255, 255, 1);
+					box-shadow: -2rpx 4rpx 10rpx 0rpx rgba(0, 0, 0, 0.4);
+					border-radius: 20rpx;
+					padding: 20rpx;
+					box-sizing: border-box;
+					margin-top: 130rpx;
+
+					.user-cont {
+						width: 100%;
+						height: 50rpx;
+
+						.user-spn {
+							color: rgba(0, 0, 0, 0.8);
+							font-size: 36rpx;
+							font-family: AlibabaPuHui-medium;
+						}
+
+						.spnr {
+							margin-left: 20rpx;
+							font-size: 35rpx;
+							font-family: AlibabaPuHui-medium;
+						}
 					}
-				});
-			},
 
-		},
-		onLoad() {}
+					.curent-cont {
+						width: 100%;
+						height: 100rpx;
+						display: flex;
+						align-items: center;
 
-	}
-</script>
+						.current-spn {
+							font-size: 32rpx;
+							color: #5AB7A5;
+						}
+					}
 
-<style lang="scss">
-	.container {
-		display: block;
-	}
+					.sec-data {
+						width: 100%;
+						height: 110rpx;
+						display: flex;
+						justify-content: space-around;
+						margin-top: 60rpx;
 
-	.ui-all {
-		padding: 20rpx 40rpx;
+						.sec-item {
+							width: 130rpx;
+							height: 100%;
+							display: flex;
+							flex-direction: column;
+							align-items: center;
+							justify-content: space-between;
 
-		.avatar {
-			width: 100%;
-			text-align: left;
-			padding: 20rpx 0;
-			border-bottom: solid 1px #f2f2f2;
-			position: relative;
-
-			.imgAvatar {
-				width: 140rpx;
-				height: 140rpx;
-				border-radius: 50%;
-				display: inline-block;
-				vertical-align: middle;
-				overflow: hidden;
-
-				.iavatar {
+							.item-spn {
+								font-size: 32rpx;
+								font-family: PingFangSC-bold;
+							}
+
+							.spnVal {
+								color: rgba(7, 190, 167, 1);
+							}
+						}
+					}
+				}
+
+				.app-view {
 					width: 100%;
-					height: 100%;
-					display: block;
+					height: 200rpx;
+					display: flex;
+					justify-content: space-between;
+
+					.app-item {
+						width: 48%;
+						height: 100%;
+						border-radius: 16rpx;
+						background-color: rgba(255, 255, 255, 1);
+						border: 2rpx solid rgba(187, 187, 187, 0.5);
+						padding: 20rpx;
+						box-sizing: border-box;
+
+						.app-title {
+							font-size: 32rpx;
+							font-family: SourceHanSansSC-bold;
+							color: rgba(0, 0, 0, 1);
+						}
+
+						.app-item-mut {
+							width: 100%;
+							height: 120rpx;
+							display: flex;
+							justify-content: space-between;
+							align-items: center;
+
+							.app-item-spn {
+								color: rgba(154, 154, 154, 0.8);
+								font-size: 20rpx;
+								font-family: AlibabaPuHui-medium;
+								width: 140rpx;
+								height: 50rpx;
+							}
+
+							.app-item-img {
+								width: 140rpx;
+								height: 106.68rpx;
+								background-size: 100% 100%;
+							}
+
+							.app-item-img-pan {
+								width: 140rpx;
+								height: 106.68rpx;
+								background-size: 100% 100%;
+							}
+						}
+					}
 				}
-			}
 
-			text {
-				display: inline-block;
-				vertical-align: middle;
-				color: #8e8e93;
-				font-size: 28rpx;
-				margin-left: 40rpx;
-			}
+				.message-view {
+					width: 100%;
+					margin-top: 20rpx;
+					position: relative;
+					padding-top: 20rpx;
+					margin-bottom: 20rpx;
 
-			&:after {
-				content: ' ';
-				width: 20rpx;
-				height: 20rpx;
-				border-top: solid 1px #030303;
-				border-right: solid 1px #030303;
-				transform: rotate(45deg);
-				-ms-transform: rotate(45deg);
-				/* IE 9 */
-				-moz-transform: rotate(45deg);
-				/* Firefox */
-				-webkit-transform: rotate(45deg);
-				/* Safari 和 Chrome */
-				-o-transform: rotate(45deg);
-				position: absolute;
-				top: 85rpx;
-				right: 0;
-			}
-		}
+					.all-message {
+						position: absolute;
+						right: 0rpx;
+						top: 5rpx;
+						width: 117rpx;
+						height: 20rpx;
+						color: rgba(1, 169, 146, 1);
+						font-size: 20rpx;
+						font-family: AlibabaPuHui-regular;
+						display: flex;
+						align-items: center;
+					}
 
-		.ui-list {
-			width: 100%;
-			text-align: left;
-			padding: 20rpx 0;
-			border-bottom: solid 1px #f2f2f2;
-			position: relative;
-
-			text {
-				color: #4a4a4a;
-				font-size: 28rpx;
-				display: inline-block;
-				vertical-align: middle;
-				min-width: 150rpx;
-			}
+					.message-item {
+						margin-top: 20rpx;
+						width: 100%;
+						height: 50rpx;
+						border-radius: 25rpx;
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						padding: 0 20rpx;
+						box-sizing: border-box;
+						color: rgba(0, 0, 0, 0.8);
+						font-size: 20rpx;
+						text-align: left;
+						font-family: AlibabaPuHui-regular;
+						background-color: rgba(255, 255, 255, 1);
+						box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.4);
 
-			input {
-				color: #030303;
-				font-size: 30rpx;
-				display: inline-block;
-				vertical-align: middle;
-			}
+						.item-mesage {
+							overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+						}
 
-			button {
-				color: #030303;
-				font-size: 30rpx;
-				display: inline-block;
-				vertical-align: middle;
-				background: none;
-				margin: 0;
-				padding: 0;
-
-				&::after {
-					display: none;
+						.fot-btn {
+							width: 170rpx;
+							margin-left: 20rpx;
+						}
+					}
 				}
-			}
 
-			picker {
-				width: 90%;
-				color: #030303;
-				font-size: 30rpx;
-				display: inline-block;
-				vertical-align: middle;
-				position: absolute;
-				top: 30rpx;
-				left: 150rpx;
-			}
+				.all-app {
+					width: 100%;
 
-			textarea {
-				color: #030303;
-				font-size: 30rpx;
-				vertical-align: middle;
-				height: 150rpx;
-				width: 100%;
-				margin-top: 50rpx;
-			}
+					.all-title {
+						width: 100%;
+						height: 46rpx;
+						color: rgba(0, 0, 0, 0.8);
+						font-size: 32rpx;
+						text-align: left;
+						font-family: AlibabaPuHui-bold;
+					}
 
-			.place {
-				color: #999999;
-				font-size: 28rpx;
+					.all-app-view {
+						margin-top: 20rpx;
+						width: 100%;
+						height: auto;
+						background-color: #fff;
+						border-radius: 20rpx;
+						display: flex;
+						flex-wrap: wrap;
+						align-content: flex-start;
+						padding-bottom: 50rpx;
+
+						.app-view-item {
+							width: 24%;
+							margin-left: 7rpx;
+							height: 150rpx;
+							display: flex;
+							flex-direction: column;
+							align-items: center;
+							margin-top: 20rpx;
+							margin-bottom: 20rpx;
+							justify-content: space-between;
+
+							.app-item-img {
+								width: 102rpx;
+								height: 102rpx;
+								border-radius: 20rpx;
+								display: flex;
+								align-items: center;
+								justify-content: center;
+
+								.app-item-svg {
+									width: 80rpx;
+									height: 80rpx;
+									background-size: 100% 100%;
+								}
+							}
+
+							.app-item-text {
+								width: 100%;
+								height: 34rpx;
+								color: rgba(0, 0, 0, 0.8);
+								font-size: 28rpx;
+								text-align: center;
+								font-family: AlibabaPuHui-bold;
+							}
+						}
+					}
+				}
 			}
 		}
+	}
 
-		.right:after {
-			content: ' ';
-			width: 20rpx;
-			height: 20rpx;
-			border-top: solid 1px #030303;
-			border-right: solid 1px #030303;
-			transform: rotate(45deg);
-			-ms-transform: rotate(45deg);
-			/* IE 9 */
-			-moz-transform: rotate(45deg);
-			/* Firefox */
-			-webkit-transform: rotate(45deg);
-			/* Safari 和 Chrome */
-			-o-transform: rotate(45deg);
-			position: absolute;
-			top: 40rpx;
-			right: 0;
-		}
+	uni-page-body {
+		width: 100%;
+		height: 100%;
+	}
 
-		.save {
-			background: #030303;
-			border: none;
-			color: #ffffff;
-			margin-top: 40rpx;
-			font-size: 28rpx;
-		}
+	uni-page-wrapper {
+		width: 100%;
+		height: 100%;
 	}
 
-	.login {
-		color: #FFFFFF;
-		width: 80%;
-		border-radius: 68rpx;
-		margin: 20rpx auto;
-		padding: 35rpx;
-		font-size: 28rpx;
+	uni-page {
+		width: 100%;
+		height: 100%;
 	}
 </style>

pages/login/index.vue

@@ -30,8 +30,8 @@
 							title: '登录成功',
 							icon: 'none',
 							success: function() {
-								uni.switchTab({
-									url: '/pages/index/index',
+								uni.redirectTo({
+									url: '/pages/home/home',
 									success: function(res) {}
 								});
 							}

pages/index/Pie.js

@@ -75,6 +75,10 @@ export const medicament = [{
 	{
 		value: '2',
 		text: "试剂",
+	},
+	{
+		value: '3',
+		text: "总务",
 	},
 ]
 export const CalendarList = [{

pages/index/enterprise/enterprise.vue

@@ -36,7 +36,7 @@
 					<uni-td align="left">
 						<view>{{ item.splerAmt }}</view>
 					</uni-td align="left">
-					<uni-td>{{ item.amtPer }}</uni-td>
+					<uni-td>{{ item.amtPer||""}}</uni-td>
 				</uni-tr>
 			</uni-table>
 		</view>

pages/index/index.vue

@@ -70,12 +70,18 @@
 		},
 		data() {
 			return {
-				navList: [{
-					name: "按科室"
-				}, {
-					name: "按种类"
-				}],
-				statType: "dept",
+				navList: [
+					// 	{
+					// 	name: "按科室"
+					// },
+
+					{
+						name: "按种类"
+					}, {
+						name: "集采"
+					}
+				],
+				statType: "mcsType",
 				LineData: [], //折线图数据
 				EllData: [], //总汇折线图
 				AllData: [], //存放全部数据
@@ -200,11 +206,15 @@
 			handleClickBtnE(index) {
 				this.flagE = index + 1;
 				if (index === 0) {
-					this.handleQuery("dept");
+					// this.handleQuery("dept");
+					// this.updateListData();
+					this.handleQuery("mcsType");
 					this.updateListData();
 				} else if (index === 1) {
-					this.handleQuery("mcsType");
+					this.handleQuery("isFas");
 					this.updateListData();
+				} else if (index === 2) {
+
 				}
 			},
 			handleQuery(param) {
@@ -496,10 +506,10 @@
 	}
 
 	.select-button {
-		width: 250rpx;
+		width: 375rpx;
 		position: absolute;
 		right: 100rpx;
-		top: 410rpx;
+		top: 510rpx;
 		z-index: 999;
 	}
 </style>

pages/index/scrollView/scrollView.vue

@@ -16,7 +16,7 @@
 					</view>
 					<view class="listview-table-many">
 						<span>￥</span>
-						{{dataList.appyCnt}}
+						{{dataList.sumAmt}}
 					</view>
 				</view>
 				<view class="listview-table-all-two">
@@ -25,7 +25,7 @@
 					</view>
 					<view class="listview-table-many">
 						<span style=" visibility: hidden;">￥</span>
-						{{dataList.cosmAmt}}
+						{{dataList.sumCnt}}
 					</view>
 				</view>
 				<view class="boxList"></view>
@@ -39,7 +39,7 @@
 					</view>
 					<view class="listview-table-many">
 						<span style=" visibility: hidden;">￥</span>
-						{{dataList.cosmCnt}}
+						{{dataList.appyCnt}}
 					</view>
 				</view>
 				<view class="listview-table-all-four">
@@ -48,9 +48,29 @@
 					</view>
 					<view class="listview-table-many">
 						<span style=" visibility: hidden;">￥</span>
-						{{dataList.stooutCnt}}
+						{{dataList.delvCnt}}
 					</view>
 				</view>
+			</view>
+			<view class="listview-all-b">
+				<view class="listview-table-all-three">
+					<view class="listview-table-name">
+						集采条目数
+					</view>
+					<view class="listview-table-many">
+						<span style=" visibility: hidden;">￥</span>
+						{{dataList.fasCnt}}
+					</view>
+				</view>
+				<view class="listview-table-all-four">
+					<view class="listview-table-name">
+						非集采条目数
+					</view>
+					<view class="listview-table-many">
+						<span style=" visibility: hidden;">￥</span>
+						{{dataList.othCnt}}
+					</view>
+				</view>
 			</view>
 		</view>
 	</view>

request/api.js

@@ -12,55 +12,62 @@ export default {
 			method: "POST",
 		}
 
+	},
+	home: {
+		getUserData: {
+			url: "/web/lgin/getUserRoleInfo",
+			auth: true,
+			method: "GET",
+		},
 	},
 	//首页
 	homePage: {
 		//配送企业排名
 		splerCosm: {
-			url: "/web/homePagMcsCosmRcdDMappere/splerCosm",
-			auth: false,
+			url: "/web/weChat/forms/amtSplerCosm",
+			auth: true,
 			method: "POST",
 		},
 		//关键指标统计
 		totalCosm: {
-			url: "/web/homePagMcsCosmRcdDMappere/totalCosm",
-			auth: false,
+			url: "/web/weChat/forms/totalCosm",
+			auth: true,
 			method: "POST",
 		},
 		//耗材类型消耗金额占比
 		amtCosm: {
-			url: "/web/homePagMcsCosmRcdDMappere/amtCosm",
-			auth: false,
+			url: "/web/weChat/forms/amtCosm",
+			auth: true,
 			method: "POST",
 		},
 		//耗材消耗数量排名
 		cntCosm: {
-			url: "/web/homePagMcsCosmRcdDMappere/cntCosm",
-			auth: false,
+			url: "/web/weChat/forms/cntCosm",
+			auth: true,
 			method: "POST",
 		},
 		//各科室消耗排名
 		deptCosm: {
-			url: "/web/homePagMcsCosmRcdDMappere/deptCosm",
-			auth: false,
+			url: "/web/weChat/forms/deptCosm",
+			auth: true,
 			method: "POST",
 		},
 		//消耗数据统计
 		statCosm: {
-			url: "/web/homePagMcsCosmRcdDMappere/statCosm",
-			auth: false,
+			url: "/web/weChat/forms/statCosm",
+			auth: true,
 			method: "POST",
 		},
 		//个人中心
 		information: {
 			url: "/app/wechat/select/information",
-			auth: false,
+			auth: true,
 			method: "POST",
 		},
 		//个人中心保存
 		informationData: {
 			url: "/app/wechat/save/information",
-			auth: false,
+			auth: true,
 			method: "POST",
 		},
 	}

request/index.js

@@ -9,13 +9,15 @@ export default function http(url,
 	let api = getApiPath(url);
 	/* 请求之前拦截器 */
 	shoproRequest.interceptor.request((config, cancel) => {
-		let token = uni.getStorageSync('token');
+		let token = uni.getStorageSync('token') || "";
 		if (api.auth && !token) {
 			uni.hideLoading();
 			uni.showToast({
 				title: '暂未登录，请先登录',
-				icon: 'none'
+				icon: 'none',
+				duration: 2000,
 			});
+
 			uni.navigateTo({
 				url: '/pages/login/index',
 				success: function(res) {}
@@ -36,34 +38,37 @@ export default function http(url,
 	/* 请求之后拦截器 */
 	shoproRequest.interceptor.response((response) => {
 		uni.hideLoading();
-		if (response.statusCode !== 200 || response.data.success === false) {
+		if (response.code != 0 || response.success === false) {
 			if (toastAfter) {
-				if (response.statusCode === 401 || response.code === 502) {
-					uni.showToast({
-						title: '请重新登录!',
-						icon: 'none',
-						duration: 1000,
-						mask: true
+				uni.showToast({
+					title: response.message || '请求出错,稍后重试',
+					icon: 'none',
+					duration: 1000,
+					mask: true
+				});
+			}
+			// token过期注销
+			if (response.code === 161099) {
+				if (response.message == '当前登录已失效,请重新登录') {
+					uni.navigateTo({
+						url: '/pages/login/index',
+						success: function(res) {}
 					});
-					// uni.navigateTo({
-					// 	url: '/pages/login/index',
-					// 	success: function(res) {}
-					// });
+					uni.removeStorageSync('token');
 				} else {
 					uni.showToast({
-						title: response.data && response.data.message || '请求出错,稍后重试',
+						title: response.message,
 						icon: 'none',
-						duration: 1000,
-						mask: true
 					});
 				}
+				throw (`登录已过期或注销,已阻止请求: '${api.url}'`);
 			}
-		}
 
-		return response.data
+		}
+		return response
 	})
 	return shoproRequest.request({
-		url: api.url,
+		url: api.url || url,
 		data,
 		method: api.method
 	})
@@ -71,10 +76,20 @@ export default function http(url,
 }
 // 组装接口路径
 function getApiPath(url) {
+	let api;
 	let apiArray = url.split(".");
-	let api = apiList;
-	apiArray.forEach(v => {
-		api = api[v];
-	});
+	if (apiArray.length == 1) {
+		api = {
+			auth: true,
+			method: "POST",
+			url: url,
+		}
+
+	} else {
+		api = apiList;
+		apiArray.forEach(v => {
+			api = api[v];
+		});
+	}
 	return api;
 }

request/request.js

@@ -89,7 +89,7 @@ export default class Request {
 			}
 			options.url = mergeUrl
 			options.success = res => {
-				resolve(this.requestAfter(res))
+				resolve(this.requestAfter(res.data))
 			}
 			options.fail = err => {
 				reject(this.requestAfter(err))

static/apploction.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" width="24" height="24" style="border-color: rgba(0,0,0,0);border-width: bpx;border-style: undefined" filter="none">
+    
+    <g>
+    <path d="M6 11H42" stroke="rgba(70.89,72.92999999999999,160.905,1)" stroke-width="4" fill="none"></path><path d="M22 24L42 24" stroke="rgba(70.89,72.92999999999999,160.905,1)" stroke-width="4" fill="none"></path><path d="M6 37L42 37" stroke="rgba(70.89,72.92999999999999,160.905,1)" stroke-width="4" fill="none"></path><path d="M8 20.8821L12.8185 24L8 27.1179L8 20.8821Z" stroke="rgba(70.89,72.92999999999999,160.905,1)" stroke-width="4" fill="none"></path>
+    </g>
+  </svg>

static/aright.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48" width="24" height="24" style="border-color: rgba(0,0,0,0);border-width: bpx;border-style: undefined" filter="none">
+    
+    <g>
+    <path d="M16 39.5127L31.5563 23.9563C31.5563 23.9563 20.6944 13.0944 16 8.4" stroke="rgba(16.065,16.065,16.065,0.77)" stroke-width="4" fill="none"></path>
+    </g>
+  </svg>

static/down.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 448 512" width="20" height="20" style="" filter="none">
+    
+    <g>
+    <path d="M207.029 381.476L12.686 187.132c-9.373-9.373-9.373-24.569 0-33.941l22.667-22.667c9.357-9.357 24.522-9.375 33.901-.04L224 284.505l154.745-154.021c9.379-9.335 24.544-9.317 33.901.04l22.667 22.667c9.373 9.373 9.373 24.569 0 33.941L240.971 381.476c-9.373 9.372-24.569 9.372-33.942 0z" fill="rgba(255,255,255,1)"></path>
+    </g>
+  </svg>

static/mdtext.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24" width="17.05" height="17.05" style="" filter="none">
+    
+    <g>
+    <path d="M20 2H4c-1.1 0-1.99.9-1.99 2L2 22l4-4h14c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zM9 11H7V9h2v2zm4 0h-2V9h2v2zm4 0h-2V9h2v2z" fill="rgba(255,255,255,1)"></path>
+    </g>
+  </svg>

store/modules/home.js

@@ -0,0 +1,116 @@
+import http from '@/request/index.js';
+export const state = {
+	houseData: [], //库房数据
+	houseSelectData: {
+		houseName: "",
+		houseId: ""
+	},
+	homeAwaitData: {},
+	userData: {},
+	messData: [] 
+};
+export const mutations = {
+	setHouseData(state, data) {
+		state.houseData = data
+	},
+	setHouseName(state, data) {
+		state.houseSelectData = data
+	},
+	setUserData(state, data) {
+		state.userData = data
+	},
+	setAwaitData(state, data) {
+		state.homeAwaitData = data
+	},
+	setMessData(state, data) {
+		state.messData = data
+	},
+}
+export const actions = {
+	getHomeAwaitData({
+		commit,
+		rootState
+	}, data) {
+		return new Promise((resolve, reject) => {
+			http('home.getAwaitData', data, '加载中').then(res => {
+				if (res.success == true) {
+					commit('setAwaitData', res.data);
+				}
+			}).catch(e => {
+				reject(e)
+			})
+		})
+	},
+	getHouseData({
+		dispatch,
+		commit,
+		rootState
+	}, data) {
+		return new Promise((resolve, reject) => {
+			http('home.getRoomData', data, '加载中').then(res => {
+				if (res.success == true&&res.data.length>0) {
+					res.data.length > 0 && res.data.forEach((item) => {
+						item['text'] = item.stroomName;
+						item['value'] = item.id;
+					})
+					commit('setHouseName', {
+						houseName: res.data && res.data[0].stroomName,
+						houseId: res.data &&res.data[0].id
+					});
+					dispatch('getHomeAwaitData', {
+						stroomId: res.data[0].id
+					})
+					commit('setHouseData', res.data);
+				} else {
+					commit('setHouseData', []);
+				}
+			}).catch(e => {
+				reject(e)
+			})
+		})
+	},
+	getUserData({
+		commit,
+		rootState
+	}, data) {
+		return new Promise((resolve, reject) => {
+			http('home.getUserData', data, '加载中').then(res => {
+				if (res.success == true) {
+					resolve(res);
+					commit('setUserData', res.data.userContext);
+				}
+			}).catch(e => {
+				reject(e)
+			})
+		})
+	},
+	getMessData({
+		commit,
+		rootState
+	}, data) {
+		return new Promise((resolve, reject) => {
+			http('home.getMessageData', data, '加载中').then(res => {
+				if (res.success == true) {
+					resolve(res);
+					commit('setMessData', res.data.records);
+				}
+			}).catch(e => {
+				reject(e)
+			})
+		})
+	},
+	getMentData({
+		commit,
+		rootState
+	}, data) {
+		return new Promise((resolve, reject) => {
+			http('home.menusData', data, '加载中').then(res => {
+				if (res.success == true) {
+					resolve(res);
+				}
+			}).catch(e => {
+				reject(e)
+			})
+		})
+	},
+}

vue.config.js

@@ -1,14 +1,14 @@
 const baseurl = require("./env.js");
 module.exports = {
-	devServer: {
-		proxy: {
-			[baseurl]: {
-				target: `http://192.168.0.246:8602`,
-				changeOrigin: true,
-				pathRewrite: {
-					["^" + baseurl]: ""
-				}
-			},
-		}
-	},
+	// devServer: {
+	// 	proxy: {
+	// 		[baseurl]: {
+	// 			target: `http://gys.ecloudbj.com:57505`,
+	// 			changeOrigin: true,
+	// 			pathRewrite: {
+	// 				["^" + baseurl]: ""
+	// 			}
+	// 		},
+	// 	}
+	// },
 }