Merge branch 'master' into leng_dev

src/const/crud/activiti/leave-bill.js

@@ -26,7 +26,6 @@ export const tableOption = {
   delBtn: false,
   addBtn: false,
   menuType: 'menu',
-  dicUrl: '/admin/dict/type/leave_status',
   column: [
     {
       label: 'ID',
@@ -67,7 +66,7 @@ export const tableOption = {
       label: '状态',
       prop: 'state',
       type: 'select',
-      dicData: 'leave_status',
+      dicUrl: '/admin/dict/type/leave_status',
       search: true,
       addVisdiplay: false
     },

src/const/crud/admin/log.js

@@ -29,7 +29,6 @@ export const tableOption = {
   editBtn: false,
   delBtn: false,
   viewBtn: true,
-  dicUrl: '/admin/dict/type/log_type',
   props: {
     label: 'label',
     value: 'value'
@@ -38,7 +37,7 @@ export const tableOption = {
     label: '类型',
     prop: 'type',
     type: 'select',
-    dicData: 'log_type',
+    dicUrl: '/admin/dict/type/log_type',
     search: true
   }, {
     label: '标题',

src/const/crud/admin/sys-social-details.js

@@ -25,7 +25,6 @@ export const tableOption = {
   delBtn: false,
   addBtn: false,
   viewBtn: true,
-  dicUrl: '/admin/dict/type/social_type',
   column: [{
     label: 'ID',
     prop: 'id',
@@ -37,7 +36,7 @@ export const tableOption = {
     label: '类型',
     prop: 'type',
     type: 'select',
-    dicData: 'social_type',
+    dicUrl: '/admin/dict/type/social_type',
     search: true,
     rules: [{
       required: true,

src/page/login/index.vue

@@ -127,7 +127,7 @@
     width: 100%;
     height: 100%;
     margin: 0 auto;
-    background: url("http://www.17sucai.com/preview/242158/2015-01-10/%E7%99%BB%E5%BD%95/images/cloud.jpg") 0 bottom repeat-x #049ec4;
+    background: url("/img/bg/cloud.jpg") 0 bottom repeat-x #049ec4;
     animation: animate-cloud 20s linear infinite;
   }