config index

npm-shrinkwrap.json

@@ -4943,7 +4943,7 @@
       "dependencies": {
         "commander": {
           "version": "2.14.1",
-          "resolved": "http://r.cnpmjs.org/commander/download/commander-2.14.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.14.1.tgz?cache=0&sync_timestamp=1595168224685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.14.1.tgz",
           "integrity": "sha1-IjUSPjevjKPGXfRbAm29NXsBuao="
         }
       }
@@ -5472,7 +5472,7 @@
     },
     "crc-32": {
       "version": "1.2.0",
-      "resolved": "http://r.cnpmjs.org/crc-32/download/crc-32-1.2.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/crc-32/download/crc-32-1.2.0.tgz",
       "integrity": "sha1-yy224puIUI4y2d0OwWk+e0Ghggg=",
       "requires": {
         "exit-on-epipe": "~1.0.1",
@@ -7369,7 +7369,7 @@
     },
     "exit-on-epipe": {
       "version": "1.0.1",
-      "resolved": "http://r.cnpmjs.org/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz",
       "integrity": "sha1-C92S6H1ShdJn2qgXHQ6wYVlolpI="
     },
     "expand-brackets": {
@@ -8020,7 +8020,7 @@
     },
     "frac": {
       "version": "1.1.2",
-      "resolved": "http://r.cnpmjs.org/frac/download/frac-1.1.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/frac/download/frac-1.1.2.tgz",
       "integrity": "sha1-PXT39keMiKG1AgMG10fcYxPHTQs="
     },
     "fragment-cache": {
@@ -15097,7 +15097,7 @@
     },
     "printj": {
       "version": "1.1.2",
-      "resolved": "http://r.cnpmjs.org/printj/download/printj-1.1.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/printj/download/printj-1.1.2.tgz",
       "integrity": "sha1-2Q3rKXWoufYA+zoclOP0xTx4oiI="
     },
     "private": {
@@ -20550,7 +20550,7 @@
     },
     "script-loader": {
       "version": "0.7.2",
-      "resolved": "http://r.cnpmjs.org/script-loader/download/script-loader-0.7.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/script-loader/download/script-loader-0.7.2.tgz",
       "integrity": "sha1-IBbbb4byX1z1baOJFdgzeLsWa6c=",
       "dev": true,
       "requires": {
@@ -21138,7 +21138,7 @@
     },
     "ssf": {
       "version": "0.10.3",
-      "resolved": "http://r.cnpmjs.org/ssf/download/ssf-0.10.3.tgz",
+      "resolved": "https://registry.npm.taobao.org/ssf/download/ssf-0.10.3.tgz",
       "integrity": "sha1-jq4fwpyQpVLnkhII+BiS1vd6yys=",
       "requires": {
         "frac": "~1.1.2"
@@ -23805,7 +23805,7 @@
     },
     "wmf": {
       "version": "1.0.2",
-      "resolved": "http://r.cnpmjs.org/wmf/download/wmf-1.0.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/wmf/download/wmf-1.0.2.tgz",
       "integrity": "sha1-fRnWIQcaCMK9xrfmiKnENSmMwto="
     },
     "word-wrap": {
@@ -23960,7 +23960,7 @@
     },
     "xlsx": {
       "version": "0.15.6",
-      "resolved": "http://r.cnpmjs.org/xlsx/download/xlsx-0.15.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/xlsx/download/xlsx-0.15.6.tgz?cache=0&sync_timestamp=1597272342311&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fxlsx%2Fdownload%2Fxlsx-0.15.6.tgz",
       "integrity": "sha1-Rh+EHW2eoag3XizSRr8jrs4IodU=",
       "requires": {
         "adler-32": "~1.2.0",
@@ -23975,7 +23975,7 @@
       "dependencies": {
         "commander": {
           "version": "2.17.1",
-          "resolved": "http://r.cnpmjs.org/commander/download/commander-2.17.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz?cache=0&sync_timestamp=1595168224685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.17.1.tgz",
           "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78="
         }
       }

pages/system/config/index.vue

 <template>
 <div class="config flex">
     <div class="menu">
-        <Menu theme="light" active-name="site">
-            <MenuItem name="site" to="#site">站点设置</MenuItem>
-            <MenuItem name="bus" to="#bus">业务设置</MenuItem>
+        <Menu theme="light" active-name="site" @on-select="pageTo">
+            <MenuItem name="site">站点设置</MenuItem>
+            <MenuItem name="bus">业务设置</MenuItem>
         </Menu>
     </div>
-    <<<<<<< HEAD <div class="main fg" id="mainDiv">
+    <div class="main fg" id="mainDiv">
         <div class="tr lt40 fr divTop pr20">
             <Button type="primary" size="small" @click="save">保存</Button>
             <Button type="text" size="small" @click="reset">恢复默认</Button>
-            =======
-            <div class="main fg">
-                <div class="tool tr">
-                    <Button type="primary" @click="save">保存</Button>
-                    <Button type="text" @click="reset">恢复默认</Button>
         </div>
         <Form ref="form" :model="config" :rules="rules" :label-width="120">
-                    <div id="site">
+            <div id="site" class="mt50">
                 <h3>站点设置</h3>
                 <FormItem label="默认语言" prop="site.language">
                     <Input v-model="config.site.language"></Input>
@@ -84,7 +79,6 @@
                     <i-switch v-model="config.site.windowMove" />
                     <span class="tip">开启后弹框可以进行移动</span>
                 </FormItem>
-                        >>>>>>> c26d050f1ec6b064c32ac1a3b4f647500a3dfe83
             </div>
             <div id="bus">
                 <h3>业务设置</h3>
@@ -138,7 +132,7 @@
             </div>
         </Form>
     </div>
-        </div>
+</div>
 </template>
 
 <script>
@@ -181,12 +175,7 @@ export default {
                 mainDiv.scrollTop = site.scrollHeight;
             }
         }
-    })
-},
-reset() {
-    this.$store.dispatch("loadSiteConfig");
-},
-},
+    },
 };
 </script>
 
@@ -205,6 +194,7 @@ reset() {
             width: 100%;
             top: 5px;
         }
+    }
 
     .main {
         margin: 0px -10px;
@@ -233,7 +223,5 @@ reset() {
         height: calc(100vh - 150px);
         overflow-y: auto;
     }
-
-    }
 }
 </style>