Browse Source

Merge remote-tracking branch 'origin/luckly_dev' into luckly_dev

huangxutao 6 years ago
parent
commit
b151d1a7ff
4 changed files with 6 additions and 6 deletions
  1. 1 1
      package.json
  2. 2 2
      public/cdn/avue/index.js
  3. 1 1
      src/main.js
  4. 2 2
      src/page/login/userlogin.vue

+ 1 - 1
package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@xkeshi/vue-qrcode": "^1.0.0",
-    "avue-form-design": "^1.1.1",
+    "avue-plugin-formdesign": "^1.0.0",
     "axios": "^0.18.0",
     "babel-polyfill": "^6.26.0",
     "classlist-polyfill": "^1.2.0",

File diff suppressed because it is too large
+ 2 - 2
public/cdn/avue/index.js


+ 1 - 1
src/main.js

@@ -15,7 +15,7 @@ import * as filters from './filters' // 全局filter
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 import './styles/common.scss'
-import avueFormDesign from 'avue-form-design'
+import avueFormDesign from 'avue-plugin-formdesign'
 import basicContainer from './components/basic-container/main'
 // 插件 json 展示
 import vueJsonTreeView from 'vue-json-tree-view'

+ 2 - 2
src/page/login/userlogin.vue

@@ -30,9 +30,9 @@
           slot="suffix"
           class="el-icon-view el-input__icon"
           @click="showPassword"/>
-        <router-link to="/forgetlogin" slot="suffix">
+        <!--<router-link to="/forgetlogin" slot="suffix">
           <a href="#" class="alink" style="padding-left:8px;">忘记密码?</a>
-        </router-link>
+        </router-link>-->
         <i slot="prefix" class="iconfont icon-mima"></i>
       </el-input>
     </el-form-item>