Merge branch 'master' of http://git.shengws.com/csx/Pad_New

.postcssrc.js

@@ -5,6 +5,16 @@ module.exports = {
     "postcss-import": {},
     "postcss-url": {},
     // to edit target browsers: use "browserslist" field in package.json
-    autoprefixer: {}
+    autoprefixer: {},
+    "postcss-pxtorem": {
+      // 此处为添加部分
+      rootValue: 16, // 对应16px 适配移动端750px宽度
+      unitPrecision: 5,
+      propList: ["*"],
+      selectorBlackList: [],
+      replace: true,
+      mediaQuery: false,
+      minPixelValue: 0
+    }
   }
 };

package-lock.json

@@ -473,6 +473,11 @@
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
       "dev": true
     },
+    "amfe-flexible": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/amfe-flexible/-/amfe-flexible-2.2.1.tgz",
+      "integrity": "sha1-NT8AKJ5NOMqIoh6zhUQgMIrwtVk="
+    },
     "ansi-escapes": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
@@ -2327,6 +2332,7 @@
       "resolved": "http://registry.npm.taobao.org/boom/download/boom-2.10.1.tgz",
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
       "dev": true,
+      "optional": true,
       "requires": {
         "hoek": "2.x.x"
       }
@@ -3559,6 +3565,18 @@
         "randomfill": "^1.0.3"
       }
     },
+    "css": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
+      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "source-map": "^0.6.1",
+        "source-map-resolve": "^0.5.2",
+        "urix": "^0.1.0"
+      }
+    },
     "css-color-names": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
@@ -5723,6 +5741,28 @@
         "readable-stream": "^2.0.0"
       }
     },
+    "fs-extra": {
+      "version": "0.16.5",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.16.5.tgz",
+      "integrity": "sha1-GtZh+myGyWCM0bSe/G/Og0k5p1A=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^3.0.5",
+        "jsonfile": "^2.0.0",
+        "rimraf": "^2.2.8"
+      },
+      "dependencies": {
+        "graceful-fs": {
+          "version": "3.0.12",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.12.tgz",
+          "integrity": "sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg==",
+          "dev": true,
+          "requires": {
+            "natives": "^1.1.3"
+          }
+        }
+      }
+    },
     "fs-write-stream-atomic": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
@@ -5761,7 +5801,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5782,12 +5823,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5802,17 +5845,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5929,7 +5975,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5941,6 +5988,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5955,6 +6003,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5962,12 +6011,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -5986,6 +6037,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -6066,7 +6118,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -6078,6 +6131,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -6163,7 +6217,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -6199,6 +6254,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -6218,6 +6274,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -6261,12 +6318,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -6724,7 +6783,8 @@
       "version": "2.16.3",
       "resolved": "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
       "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "home-or-tmp": {
       "version": "2.0.0",
@@ -8258,6 +8318,15 @@
       "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
       "dev": true
     },
+    "jsonfile": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
     "jsonify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
@@ -9271,6 +9340,12 @@
         }
       }
     },
+    "natives": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz",
+      "integrity": "sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==",
+      "dev": true
+    },
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -11822,6 +11897,131 @@
         }
       }
     },
+    "postcss-px2rem": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/postcss-px2rem/-/postcss-px2rem-0.3.0.tgz",
+      "integrity": "sha1-DfpOiiaPp0eCc/DEtHxhmDSJQEE=",
+      "dev": true,
+      "requires": {
+        "postcss": "^5.0.0",
+        "px2rem": "~0.5.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+              "dev": true
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "dev": true,
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "dev": true,
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-pxtorem": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-pxtorem/-/postcss-pxtorem-5.1.1.tgz",
+      "integrity": "sha512-uvgIujL/pn0GbZ+rczESD2orHsbXrrCqi+q9wJO8PCk3ZGCoVVtu5hZTbtk+tbZHZP5UkTfCvqOrTZs9Ncqfsg==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.27"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "postcss": {
+          "version": "7.0.27",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz",
+          "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
     "postcss-reduce-idents": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz",
@@ -12548,6 +12748,76 @@
       "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
       "dev": true
     },
+    "px2rem": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/px2rem/-/px2rem-0.5.0.tgz",
+      "integrity": "sha1-JLOmz3TRSttO13byB4cdmJPkEOI=",
+      "dev": true,
+      "requires": {
+        "chalk": "~0.5.1",
+        "commander": "~2.6.0",
+        "css": "~2.2.0",
+        "extend": "~3.0.0",
+        "fs-extra": "~0.16.3"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+          "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
+          "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+          "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^1.1.0",
+            "escape-string-regexp": "^1.0.0",
+            "has-ansi": "^0.1.0",
+            "strip-ansi": "^0.3.0",
+            "supports-color": "^0.2.0"
+          }
+        },
+        "commander": {
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz",
+          "integrity": "sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0=",
+          "dev": true
+        },
+        "has-ansi": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+          "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^0.2.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+          "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^0.2.1"
+          }
+        },
+        "supports-color": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
+          "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=",
+          "dev": true
+        }
+      }
+    },
     "q": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",

package.json

@@ -18,6 +18,7 @@
   },
   "dependencies": {
     "@types/better-scroll": "^1.12.1",
+    "amfe-flexible": "^2.2.1",
     "axios": "^0.19.0",
     "better-scroll": "^1.15.2",
     "cropperjs": "^1.4.3",
@@ -87,6 +88,8 @@
     "portfinder": "^1.0.13",
     "postcss-import": "^11.0.0",
     "postcss-loader": "^2.0.8",
+    "postcss-px2rem": "^0.3.0",
+    "postcss-pxtorem": "^5.1.1",
     "postcss-url": "^7.2.1",
     "qiniu-webpack-plugin": "^0.4.2",
     "rimraf": "^2.6.0",

src/api/patient/patient.js

@@ -737,7 +737,6 @@ export function saveName(id, name) {
     id: id,
     name: name
   }
-  console.log('params', params)
   return request({
     url: '/m/api/patient/savename',
     method: 'get',

src/libs/functionRem.js

@@ -12,6 +12,15 @@ export function setRem() {
     //   let htmlDom = document.getElementsByTagName("html")[0];
     //   //设置根元素字体大小
     //   htmlDom.style.fontSize = htmlWidth / 23.4375 + "px";
+    // console.log(
+    //   (document.documentElement.style.fontSize =
+    //     baseSize * Math.min(scale, 2) + "px" + " " + "!important")
+    // );
+    document.documentElement.style.setProperty(
+      "font-size",
+      baseSize * Math.min(scale, 2) + "px",
+      "important"
+    );
   }
   // 初始化
   setRem();

src/main.js

@@ -9,6 +9,8 @@ import "mint-ui/lib/style.css";
 import "./assets/styles/iconfont.css";
 import "./permission";
 
+import "lib-flexible";
+
 import "@/styles/reset.scss";
 import "@/styles/variables.scss";
 // import "@/styles/style.scss";

src/pages/home/login.vue

@@ -38,11 +38,17 @@
       </div>
     </div>
     <div class="agreeBox">
-      <van-checkbox v-model="checked" v-on:input="watchNum" shape="square" icon-size="14px">我已阅读并同意</van-checkbox>
+      <van-checkbox
+        v-model="checked"
+        v-on:input="watchNum"
+        shape="square"
+        icon-size="14px"
+        >我已阅读并同意</van-checkbox
+      >
       <span class="newColor" @click="agree()">《隐私服务协议》</span>
       <span class="newColor" @click="agree1()">《用户协议》</span>
     </div>
-    <van-overlay :show="show" @click="show = false">
+    <van-overlay :show="show" type="spinner" size="30px">
       <div class="wrapper">
         <van-loading size="24px" vertical>正在登录...</van-loading>
       </div>
@@ -247,11 +253,13 @@ export default {
     line-height: 2.875rem;
     color: #fff;
     text-align: center;
+    font-size: 1rem;
   }
   .login2 {
     margin-top: 1.75rem;
     font-size: 0.8125rem;
     color: #1a8cff;
+
     > p:first-child {
       float: left;
       margin-left: 3rem;
@@ -270,6 +278,7 @@ export default {
     line-height: 2.875rem;
     color: #fff;
     text-align: center;
+    font-size: 1rem;
   }
   .wrapper {
     position: fixed;

src/pages/homeIndex/index.vue

@@ -2,14 +2,26 @@
   <div class="page_homeIndex">
     <van-sticky>
       <div class="homeTitle">
-        <div class="homeTitleLeft" style="visibility: hidden" v-if="isCreateOrg == false">
+        <div
+          class="homeTitleLeft"
+          style="visibility: hidden"
+          v-if="isCreateOrg == false"
+        >
           <van-dropdown-menu>
-            <van-dropdown-item @change="changeOrg" v-model="value1" :options="org_arr" />
+            <van-dropdown-item
+              @change="changeOrg"
+              v-model="value1"
+              :options="org_arr"
+            />
           </van-dropdown-menu>
         </div>
         <div class="homeTitleLeft" v-if="isCreateOrg == true">
           <van-dropdown-menu>
-            <van-dropdown-item @change="changeOrg" v-model="value1" :options="org_arr" />
+            <van-dropdown-item
+              @change="changeOrg"
+              v-model="value1"
+              :options="org_arr"
+            />
           </van-dropdown-menu>
         </div>
         <div class="homeTitleRight">
@@ -21,7 +33,11 @@
     </van-sticky>
     <div class="banner">
       <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white">
-        <van-swipe-item v-for="(banner, index) in this.banners" @click="jump(banner.url)" :key="index">
+        <van-swipe-item
+          v-for="(banner, index) in this.banners"
+          @click="jump(banner.url)"
+          :key="index"
+        >
           <img :src="banner.thumb" alt />
         </van-swipe-item>
       </van-swipe>
@@ -46,30 +62,37 @@
     <!--</div>-->
     <div class="background1"></div>
 
-
-    <div class="management" v-if="(this.$store.getters.user.admin.id == this.$store.getters.user.org.creator&&this.isCreateOrg) || (this.isSubSuperAdmin)">
+    <div
+      class="management"
+      v-if="
+        (this.$store.getters.user.admin.id ==
+          this.$store.getters.user.org.creator &&
+          this.isCreateOrg) ||
+          this.isSubSuperAdmin
+      "
+    >
       <div class="managementTitle">
         <div class="managementName">
           管理控制台
           <span>（仅管理员可见）</span>
         </div>
         <div class="setting" @click="toConsole()">
-          <van-icon name="setting-o"/>
+          <van-icon name="setting-o" />
           管理
         </div>
       </div>
       <div class="managementBox">
         <div class="managementOne" @click="toStaffManage()">
-          <img src="../../assets/images/M1.png" alt/>员工管理
+          <img src="../../assets/images/M1.png" alt />员工管理
         </div>
         <div class="managementOne" @click="toRoleManage()">
-          <img src="../../assets/images/M2.png" alt/>权限管理
+          <img src="../../assets/images/M2.png" alt />权限管理
         </div>
         <div class="managementOne" @click="toConfigCenter()">
-          <img src="../../assets/images/M3.png" alt/>配置中心
+          <img src="../../assets/images/M3.png" alt />配置中心
         </div>
         <div class="managementOne" @click="toOrgSetting()">
-          <img src="../../assets/images/M4.png" alt/>机构设置
+          <img src="../../assets/images/M4.png" alt />机构设置
         </div>
       </div>
     </div>
@@ -103,26 +126,33 @@
         <!--<div class="applicationService">+ 更多应用</div>-->
       </div>
       <div class="applicationBox">
-        <div v-for="(item, index) in this.apps" :key="index"  :class="item.open_status == 1? 'applicationOne':'applicationOne opacity'" @click="jumpApp(item)">
-          <img :src="item.url" alt/>{{item.name}}
+        <div
+          v-for="(item, index) in this.apps"
+          :key="index"
+          :class="
+            item.open_status == 1 ? 'applicationOne' : 'applicationOne opacity'
+          "
+          @click="jumpApp(item)"
+        >
+          <img :src="item.url" alt />{{ item.name }}
         </div>
       </div>
     </div>
   </div>
 </template>
 <script>
-  // import "../libs/rem.js";
-  import { Toast } from "vant";
+// import "../libs/rem.js";
+import { Toast } from "vant";
 
-  import {GetHomeData,ChangeOrg} from "@/api/home";
-  import "../../libs/rem.js";
-  import "../../styles/newStyle.scss";
-  import {setRem} from "@/libs/functionRem";
+import { GetHomeData, ChangeOrg } from "@/api/home";
+import "../../libs/rem.js";
+import "../../styles/newStyle.scss";
+import { setRem } from "@/libs/functionRem";
 
 export default {
   data() {
     return {
-      show: true,
+      show: false,
       value1: 0,
       isCreateOrg: false,
       org_arr: [],
@@ -181,143 +211,127 @@ export default {
         if (response.data.state === 1) {
           // 清除之前的数据
 
-            var user = response.data.data.user;
-            var admin = response.data.data.admin;
-            var org = response.data.data.org;
-            var subscibe = response.data.data.subscibe;
-            var config_list = response.data.data.config_list;
-            var template_info = response.data.data.template_info;
-            var filed_list = response.data.data.filed_list;
-            this.$store.dispatch("InitUserInfo", {
-              admin: admin,
-              user: user,
-              org: org,
-              subscibe: subscibe,
-              template_info: template_info,
-              filed_list: filed_list
-            });
-            this.$store.dispatch("SetConfigList", config_list);
-            this.GetHomeData()
-            Toast.success('切换机构成功')
-            // this.$toast({
-            //   message: "切换机构成功"
-            // });
-          } else {
-            Toast(response.data.msg)
-          }
-        });
-
-
-      },
-      jump(url){
-        if (url.length != 0){
-          window.location.href = url
+          var user = response.data.data.user;
+          var admin = response.data.data.admin;
+          var org = response.data.data.org;
+          var subscibe = response.data.data.subscibe;
+          var config_list = response.data.data.config_list;
+          var template_info = response.data.data.template_info;
+          var filed_list = response.data.data.filed_list;
+          this.$store.dispatch("InitUserInfo", {
+            admin: admin,
+            user: user,
+            org: org,
+            subscibe: subscibe,
+            template_info: template_info,
+            filed_list: filed_list
+          });
+          this.$store.dispatch("SetConfigList", config_list);
+          this.GetHomeData();
+          Toast.success("切换机构成功");
+          // this.$toast({
+          //   message: "切换机构成功"
+          // });
+        } else {
+          Toast(response.data.msg);
         }
+      });
+    },
+    jump(url) {
+      if (url.length != 0) {
+        window.location.href = url;
+      }
+    },
+    jumpApp(app) {
+      if (!this.isCreateOrg) {
+        Toast("你尚未创建机构，请先创建机构");
+        return;
+      }
+      if (app.open_status == 0) {
+        Toast("敬请期待");
 
-      },jumpApp(app){
-        if(!this.isCreateOrg){
-          Toast('你尚未创建机构，请先创建机构')
-          return
-        }
-        if(app.open_status == 0){
-          Toast('敬请期待')
-
-          return
-        }
-        console.log(app.name)
-        switch (app.app_type) {
-          case 6:
-            this.toPatients()
-            break
-          case 7:
-            this.$router.push({ path: "/main" });
-            break
-          case 8:
-            this.$router.push({ path: "/shop" });
-
-            break
-          case 9:
-
-            break
-          case 10:
-
-            break
-          case 11:
-
-            break
-          case 12:
-
-            break
-          case 13:
-
-            break
-          case 14:
-
-            break
-        }
-
-
-
-
-      },toCreateOrg(){
-        this.$router.push({path: "/perfectOrg"});
+        return;
+      }
+      console.log(app.name);
+      switch (app.app_type) {
+        case 6:
+          this.toPatients();
+          break;
+        case 7:
+          this.$router.push({ path: "/main" });
+          break;
+        case 8:
+          this.$router.push({ path: "/shop" });
 
-      },
-      toPatients() {
-        this.$router.push({path: "/patients"});
-      },
-      toSearch() {
-        if(!this.isCreateOrg){
-          Toast('你尚未创建机构，请先创建机构')
-          return
-        }
-        this.$router.push({path: "/search"});
-      }, GetHomeData() {
-        GetHomeData().then(response => {
-          if (response.data.state === 1) {
-            this.isCreateOrg = response.data.data.isCreateOrg
-            this.isSubSuperAdmin = response.data.data.isSubSuperAdmin
+          break;
+        case 9:
+          break;
+        case 10:
+          break;
+        case 11:
+          break;
+        case 12:
+          break;
+        case 13:
+          break;
+        case 14:
+          break;
+      }
+    },
+    toCreateOrg() {
+      this.$router.push({ path: "/perfectOrg" });
+    },
+    toPatients() {
+      this.$router.push({ path: "/patients" });
+    },
+    toSearch() {
+      if (!this.isCreateOrg) {
+        Toast("你尚未创建机构，请先创建机构");
+        return;
+      }
+      this.$router.push({ path: "/search" });
+    },
+    GetHomeData() {
+      GetHomeData().then(response => {
+        if (response.data.state === 1) {
+          this.isCreateOrg = response.data.data.isCreateOrg;
+          this.isSubSuperAdmin = response.data.data.isSubSuperAdmin;
 
-            if(this.isCreateOrg){
-              this.orgs = response.data.data.orgs
-              this.apps = response.data.data.apps
-              this.banners = response.data.data.banners
-              this.org_arr = []
-              for (let i = 0; i < this.orgs.length; i++){
-                let obj= {
-                  text: this.orgs[i].org_name,
-                  value: this.orgs[i].id
-                }
-                this.org_arr.push(obj)
-              }
-              this.value1 = this.$store.getters.user.org.id
-              this.show = false
-            }else{
-              this.apps = response.data.data.apps
-              this.banners = response.data.data.banners
-              this.show = true
+          if (this.isCreateOrg) {
+            this.orgs = response.data.data.orgs;
+            this.apps = response.data.data.apps;
+            this.banners = response.data.data.banners;
+            this.org_arr = [];
+            for (let i = 0; i < this.orgs.length; i++) {
+              let obj = {
+                text: this.orgs[i].org_name,
+                value: this.orgs[i].id
+              };
+              this.org_arr.push(obj);
             }
-
-
-
-
+            this.value1 = this.$store.getters.user.org.id;
+            this.show = false;
           } else {
-            this.$toast({
-              message: response.data.msg
-            });
+            this.apps = response.data.data.apps;
+            this.banners = response.data.data.banners;
+            this.show = true;
           }
-        });
-
-      },toConsole(){
-        this.$router.push({path: "/manageconsole"});
-
-      },
+        } else {
+          this.$toast({
+            message: response.data.msg
+          });
+        }
+      });
     },
-    created() {
-      this.GetHomeData()
-      setRem();
+    toConsole() {
+      this.$router.push({ path: "/manageconsole" });
     }
-  };
+  },
+  created() {
+    this.GetHomeData();
+    setRem();
+  }
+};
 </script>
 <style lang="scss" scoped>
 .page_homeIndex {
@@ -478,5 +492,4 @@ export default {
   }
 }
 </style>
-<style lang="scss">
-</style>
+<style lang="scss"></style>

src/pages/main/RecordPage.vue

@@ -12,14 +12,22 @@
         <router-link to="/add_urgent_schedule">
           <p class="order">临时排班</p>
           </router-link>-->
-          <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
+          <i
+            class="iconfont icon-zuojiantou jiantou"
+            @click="$router.go(-1)"
+          ></i>
           <span class="titleName">透析记录</span>
           <router-link to="/add_urgent_schedule">
             <p class="order">临时排班</p>
           </router-link>
           <!-- <van-icon class="icons" name="ellipsis" @click="show = true" /> -->
         </div>
-        <van-popup v-model="show" closeable position="top" :style="{ height: '200px' }">
+        <van-popup
+          v-model="show"
+          closeable
+          position="top"
+          :style="{ height: '200px' }"
+        >
           <div class="popupContent">
             <div class="popupBox">
               <div class="popupBoxOne" @click="goMonitoring">
@@ -102,9 +110,9 @@
               {{ "候诊区" }}
               <span class="redpoint" v-if="un_read_wait_num">
                 {{
-                un_read_wait_num > 99
-                ? un_read_wait_num + "+"
-                : un_read_wait_num
+                  un_read_wait_num > 99
+                    ? un_read_wait_num + "+"
+                    : un_read_wait_num
                 }}
               </span>
             </li>
@@ -116,9 +124,9 @@
               {{ "透析区" }}
               <span class="redpoint" v-if="un_read_dialysis_num">
                 {{
-                un_read_dialysis_num > 99
-                ? un_read_dialysis_num + "+"
-                : un_read_dialysis_num
+                  un_read_dialysis_num > 99
+                    ? un_read_dialysis_num + "+"
+                    : un_read_dialysis_num
                 }}
               </span>
             </li>

src/pages/main/index.vue

@@ -216,14 +216,15 @@ export default {
       let sqls = [
         // window.matchMedia("(max-width:418px)"), //和CSS一样，也要注意顺序！
         window.matchMedia("(max-width:767px)"),
-        window.matchMedia("(max-width:992px)"),
+        window.matchMedia("(max-width:1024px)"),
         window.matchMedia("(max-width:1200px)")
       ];
       if (sqls[0].matches) {
         console.log(">418 & <=768"); // do something...
         document.documentElement.style.fontSize = 30 + "px";
-      } else if (sqls[2].matches) {
+      } else if (sqls[1].matches) {
         console.log(">768 & <=992"); // do something...
+        document.documentElement.style.fontSize = 50 + "px";
       } else if (sqls[3].matches) {
         console.log("> 992 & <=1200"); // do something...
       } else {

src/pages/my/index.vue

@@ -2,24 +2,28 @@
   <div class="page_my">
     <div class="myTop">
       <img src="../../assets/images/myBanner.png" alt />
-        <div class="avatar">
-          <img v-if="roleInfo.avatar != ''" :src="roleInfo.avatar" alt />
-          <img
-            v-if="roleInfo.avatar == ''"
-            src="../../assets/images/mydefault.png"
-            alt
-          />
-        </div>
-        <div class="userMain" @click="toMyIndex">
-          <div class="userBox">
-            <div class="userTxt">
-              <span v-if="roleInfo.user_name!=''"><p class="userName">{{ roleInfo.user_name }}</p></span>
-                <span v-if="roleInfo.user_name==''"><p class="userName">{{ userName.name }}</p></span>
-              <p class="signature">{{ roleInfo.message }}</p>
-            </div>
-            <van-icon name="arrow" />
+      <div class="avatar">
+        <img v-if="roleInfo.avatar != ''" :src="roleInfo.avatar" alt />
+        <img
+          v-if="roleInfo.avatar == ''"
+          src="../../assets/images/mydefault.png"
+          alt
+        />
+      </div>
+      <div class="userMain" @click="toMyIndex">
+        <div class="userBox">
+          <div class="userTxt">
+            <span v-if="roleInfo.user_name != ''"
+              ><p class="userName">{{ roleInfo.user_name }}</p></span
+            >
+            <span v-if="roleInfo.user_name == ''"
+              ><p class="userName">{{ userName.name }}</p></span
+            >
+            <p class="signature">{{ roleInfo.message }}</p>
           </div>
+          <van-icon name="arrow" />
         </div>
+      </div>
       <div class="invitebox">
         <img src="../../assets/images/invite.png" alt />
       </div>
@@ -43,22 +47,38 @@
     </div>
 
     <div class="myBox">
-        <div class="myBoxOne">
-          <div class="myInfoLeft">
-            <img src="../../assets/images/myIcon2.png" alt />
-            <p>我的医院/组织/团队</p>
-          </div>
-          <van-icon class="arrow" name="arrow" />
+      <div class="myBoxOne">
+        <div class="myInfoLeft">
+          <img src="../../assets/images/myIcon2.png" alt />
+          <p>我的医院/组织/团队</p>
         </div>
-      <div class="myBoxTwo noBorder" v-for="(item,index) in organaziton" :key="index">
+        <van-icon class="arrow" name="arrow" />
+      </div>
+      <div
+        class="myBoxTwo noBorder"
+        v-for="(item, index) in organaziton"
+        :key="index"
+      >
         <div class="myInfoLeft">
-          <span v-if="item.org_logo == ''"><img src="../../assets/images/m01.png" alt /></span>
-          <span v-if="item.org_logo !==''"><img :src="item.org_logo"></span>
-          <p>{{item.org_name}}</p>
+          <span v-if="item.org_logo == ''"
+            ><img src="../../assets/images/m01.png" alt
+          /></span>
+          <span v-if="item.org_logo !== ''"><img :src="item.org_logo"/></span>
+          <p>{{ item.org_name }}</p>
         </div>
         <div class="myInfoRight">
-          <div v-if="item.creator == $store.getters.user.org.creator" class="myInfoRightBtn" @click="toEditOrg(item.id)">管理</div>
-          <van-icon class="arrow" name="arrow"  @click="toManage(item.creator,item.id)"/>
+          <div
+            v-if="item.creator == $store.getters.user.org.creator"
+            class="myInfoRightBtn"
+            @click="toEditOrg(item.id)"
+          >
+            管理
+          </div>
+          <van-icon
+            class="arrow"
+            name="arrow"
+            @click="toManage(item.creator, item.id)"
+          />
         </div>
       </div>
     </div>
@@ -83,21 +103,21 @@
       </router-link>
     </div>
     <div class="myBox">
-<!--      <div class="myBoxOne">-->
-<!--        <div class="myInfoLeft">-->
-<!--          <img src="../../assets/images/myIcon5.png" alt />-->
-<!--          <p>常见问题</p>-->
-<!--        </div>-->
-<!--        <van-icon class="arrow" name="arrow" />-->
-<!--      </div>-->
+      <!--      <div class="myBoxOne">-->
+      <!--        <div class="myInfoLeft">-->
+      <!--          <img src="../../assets/images/myIcon5.png" alt />-->
+      <!--          <p>常见问题</p>-->
+      <!--        </div>-->
+      <!--        <van-icon class="arrow" name="arrow" />-->
+      <!--      </div>-->
 
-<!--      <div class="myBoxOne" @click="toFeed">-->
-<!--        <div class="myInfoLeft">-->
-<!--          <img src="../../assets/images/myIcon6.png" alt />-->
-<!--          <p>意见反馈</p>-->
-<!--        </div>-->
-<!--        <van-icon class="arrow" name="arrow" />-->
-<!--      </div>-->
+      <!--      <div class="myBoxOne" @click="toFeed">-->
+      <!--        <div class="myInfoLeft">-->
+      <!--          <img src="../../assets/images/myIcon6.png" alt />-->
+      <!--          <p>意见反馈</p>-->
+      <!--        </div>-->
+      <!--        <van-icon class="arrow" name="arrow" />-->
+      <!--      </div>-->
 
       <router-link to="/about">
         <div class="myBoxOne">
@@ -304,6 +324,7 @@ export default {
         }
         p {
           margin-top: 0.125rem;
+          font-size: 1rem;
         }
       }
       .arrow {
@@ -329,6 +350,7 @@ export default {
         }
         p {
           margin-top: 0.125rem;
+          font-size: 1rem;
         }
       }
       .arrow {
@@ -350,6 +372,7 @@ export default {
       justify-content: space-between;
       padding: 0 0.875rem;
       border-bottom: 1px solid #e5e5e5;
+      font-size: 1rem;
       .myInfoLeft {
         display: flex;
         align-items: center;
@@ -376,6 +399,7 @@ export default {
       background: #fff;
       margin-left: 2.5rem;
       border-bottom: 1px solid #e5e5e5;
+      font-size: 1rem;
       .myInfoLeft {
         display: flex;
         align-items: center;

src/styles/newStyle.scss

@@ -1,6 +1,31 @@
-html,
-body {
-  height: 100%;
-  background: #fff !important;
-  color: #000 !important;
+// html,
+// body {
+//   height: 100%;
+//   background: #fff !important;
+//   color: #000 !important;
+// }
+
+@media only screen and (max-width: 414px) {
+  html,
+  body {
+    height: 100%;
+    font-size: 30px;
+    background: #fff !important;
+    color: #000 !important;
+  }
+}
+@media only screen and (min-width: 415px) and (max-width: 767px) {
+  html {
+    font-size: 40px !important;
+  }
+}
+@media only screen and (min-width: 768px) and (max-width: 1024px) {
+  html {
+    font-size: 50px !important;
+  }
+}
+@media only screen and (min-width: 768px) {
+  html {
+    font-size: 50px !important;
+  }
 }

src/styles/reset.scss

@@ -1,7 +1,7 @@
 html {
   -webkit-text-size-adjust: 100%;
   -ms-text-size-adjust: 100%;
-  font-size: 50px;
+  font-size: 50px !important;
 }
 
 input[type="submit"],
@@ -111,7 +111,7 @@ textarea:-ms-input-placeholder {
 //去掉黄色背景
 input:-webkit-autofill {
   -webkit-box-shadow: 0 0 0px 1000px white inset;
-} 
+}
 /* 初始化结束 */
 
 /* 针对缺省样式 (必须的) */