Merge branch 'master' of http://git.dayaedu.com/molingzhide/dy-admin-manager

dist/static/css/chunk-26a1a7d2.5ef61903.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-7165f328],.el-button--primary[data-v-7165f328]:active,.el-button--primary[data-v-7165f328]:focus,.el-button--primary[data-v-7165f328]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-7165f328]{margin-top:40px}.el-col[data-v-7165f328]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-7165f328]{width:200px;margin:0 20px}[data-v-7165f328] .el-tree-node__content{height:40px!important}.moreRule[data-v-7165f328]{background:#f0f0f0;position:relative}.moreRule .el-form-item__error[data-v-7165f328]{color:#f56c6c;font-size:12px;line-height:1;position:absolute;left:120px;top:100%;margin-top:-21px}.add[data-v-7165f328]{margin-bottom:22px;background:#f0f0f0;padding-bottom:22px}.moreRuleIn .el-form-item[data-v-7165f328]{display:inline-block}.moreRuleIn .el-form-item[data-v-7165f328]:first-child .el-form-item__content{margin-left:120px!important}.moreRuleIn .el-form-item[data-v-7165f328] .el-form-item__content{margin-left:0!important}.max[data-v-7165f328],.min[data-v-7165f328]{display:inline-block;width:180px;text-align:center;margin-right:10px}

dist/static/css/chunk-4ea75eda.bccd24f3.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-3d572e2a],.el-button--primary[data-v-3d572e2a]:active,.el-button--primary[data-v-3d572e2a]:focus,.el-button--primary[data-v-3d572e2a]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-3d572e2a]{margin-top:40px}.el-col[data-v-3d572e2a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-3d572e2a]{width:200px;margin:0 20px}[data-v-3d572e2a] .el-tree-node__content{height:40px!important}[data-v-3d572e2a] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-3d572e2a]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-3d572e2a]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-3d572e2a]{width:120px;height:120px;display:block}

dist/static/css/chunk-5ab5a3f4.1309e11b.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-bef884a0],.el-button--primary[data-v-bef884a0]:active,.el-button--primary[data-v-bef884a0]:focus,.el-button--primary[data-v-bef884a0]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-bef884a0]{margin-top:40px}.el-col[data-v-bef884a0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-bef884a0]{width:200px;margin:0 20px}[data-v-bef884a0] .el-tree-node__content{height:40px!important}[data-v-bef884a0] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-bef884a0]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-bef884a0]{font-size:28px;color:#8c939d;width:120px;height:120px;line-height:120px;text-align:center}.avatar[data-v-bef884a0]{width:120px;height:120px;display:block}

dist/static/css/chunk-7a1b3ebc.5a0b0199.css → dist/static/css/chunk-6168c896.0781446e.css

@@ -1 +1 @@
-.m-core[data-v-2c5c6151]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-2c5c6151]{width:180px}.m-core h4[data-v-2c5c6151]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-2c5c6151],.m-core .right[data-v-2c5c6151],.m-core .vipLeft[data-v-2c5c6151]{width:400px}.planList[data-v-2c5c6151]{padding:0 25px}.planList .planTop[data-v-2c5c6151]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-2c5c6151]{font-size:14px}.planList .planCore .row[data-v-2c5c6151]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px}.okBtn[data-v-2c5c6151]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}
+.m-core[data-v-75610906]{margin-top:30px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-pack:distribute;justify-content:space-around}.m-core .el-input[data-v-75610906]{width:180px}.m-core h4[data-v-75610906]{font-size:16px;background-color:#ccc;color:#fff;text-align:center;width:100%;height:40px;line-height:40px;margin-bottom:20px}.m-core .center[data-v-75610906],.m-core .right[data-v-75610906],.m-core .vipLeft[data-v-75610906]{width:400px}.planList[data-v-75610906]{padding:0 25px}.planList .planTop[data-v-75610906]{height:40px;line-height:40px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;border-bottom:1px solid #ccc;margin-top:20px}.planList .planTop>p[data-v-75610906]{font-size:14px}.planList .planCore .row[data-v-75610906]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:40px;line-height:40px;font-size:14px}.okBtn[data-v-75610906]{width:120px;height:40px;line-height:40px;text-align:center;color:#fff;border-radius:4px;margin-right:20px;cursor:pointer;background-color:#f97215;float:right}

dist/static/css/chunk-da74c238.3f2597cc.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-1948c35e],.el-button--primary[data-v-1948c35e]:active,.el-button--primary[data-v-1948c35e]:focus,.el-button--primary[data-v-1948c35e]:hover{background:#14928a;border-color:#14928a;color:#fff}.el-row[data-v-1948c35e]{margin-top:40px}.el-col[data-v-1948c35e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:20px;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-right:50%}.el-input-group[data-v-1948c35e]{width:200px;margin:0 20px}[data-v-1948c35e] .el-tree-node__content{height:40px!important}.moreRule[data-v-1948c35e]{background:#f0f0f0;position:relative}.moreRule .el-form-item__error[data-v-1948c35e]{color:#f56c6c;font-size:12px;line-height:1;position:absolute;left:120px;top:100%;margin-top:-21px}.add[data-v-1948c35e]{margin-bottom:22px;background:#f0f0f0;padding-bottom:22px}.moreRuleIn .el-form-item[data-v-1948c35e]{display:inline-block}.moreRuleIn .el-form-item[data-v-1948c35e]:first-child .el-form-item__content{margin-left:120px!important}.moreRuleIn .el-form-item[data-v-1948c35e] .el-form-item__content{margin-left:0!important}.max[data-v-1948c35e],.min[data-v-1948c35e]{display:inline-block;width:180px;text-align:center;margin-right:10px}

src/api/silder.js

@@ -29,7 +29,7 @@ export function deleteSilder (id) {
 // 修改菜单
 export function resetSilder (data) {
   return request({
-    url: `/auth-server//menu/update`,
+    url: `/auth-server/menu/update`,
     method: 'PUT',
     data
   })

src/api/systemManage.js

@@ -194,12 +194,12 @@ export function courseScheduleRewardsAdd (data) {
 }
 
 // 修改
-export function courseScheduleRewardsUpdate (data) {
-  return request({
-    url: `/web-server/courseScheduleRewards/Update`,
-    method: 'post',
-    data: qs.stringify(data)
-  })
+export function courseScheduleRewardsUpdate(data) {
+    return request({
+        url: `/web-server/courseScheduleRewards/update`,
+        method: 'post',
+        data: qs.stringify(data)
+    })
 }
 
 // 分页查询热词列表

src/store/modules/user.js

@@ -56,7 +56,8 @@ const actions = {
           if (!data.data) {
             reject('获取用户信息错误,请重新登录')
           }
-          const username = data.data.username;
+
+          const username = data.data.phone;
           const avatar = data.data.avatar;
           const organ = data.data.organId;
           // const { name, avatar } = data

src/views/businessManager/shopManager/shopOperation.vue

@@ -102,8 +102,10 @@ export default {
         desc: null
       },
       rules: {
-        brand: [{ required: true, message: '请输入品牌', trigger: 'blur' }],
-        name: [{ required: true, message: '请输入商品名称', trigger: 'blur' }],
+        brand: [{ required: true, message: '请输入品牌', trigger: 'blur' },
+          { min: 3, max: 30, message: '长度在 3 到 30 个字符', trigger: 'blur' }],
+        name: [{ required: true, message: '请输入商品名称', trigger: 'blur' },
+          { min: 3, max: 30, message: '长度在 3 到 30 个字符', trigger: 'blur' }],
         type: [{ required: true, message: '请选择商品分类', trigger: 'change' }],
         goodsCategoryId: [{ required: true, message: '请选择商品类型', trigger: 'change' }],
         specification: [{ required: true, message: '请输入商品型号', trigger: 'blur' }],

src/views/categroyManager/insideSetting/adminManager.vue

@@ -10,7 +10,7 @@
                            label="角色类型">
           </el-table-column>
           <el-table-column align='center' prop="roleDesc"
-                           label="权限范围">
+                           label="角色描述">
           </el-table-column>
           <el-table-column align='center'
                            label="操作">
@@ -60,6 +60,7 @@ export default {
       }).then(res => {
         if(res.code == 200 && res.data && res.data.rows.length > 0) {
           this.tableList = res.data.rows
+          this.pageInfo.total = res.data.total
         }
       })
     },

src/views/categroyManager/insideSetting/branchActive.vue

@@ -17,7 +17,7 @@
               {{ scope.row.rewardMode == 'PER' ? '阶梯奖励' : '累计奖励' }}
             </template>
           </el-table-column>
-          <el-table-column align='center' prop='organIdList'
+          <el-table-column align='center' prop='organNameList'
                            label="适用分部">
           </el-table-column>
           <el-table-column align='center'

src/views/categroyManager/insideSetting/branchActiveOperation.vue

@@ -219,7 +219,7 @@ export default {
             form.errorText = '最小值不能小于0'
             return
         } else if(singleLength > 1 && parseInt(lastDate.min) <= parseInt(domains[singleLength - 2].max)) {
-            form.errorText = '最小值不能大于或等上一个梯度的最大值'
+            form.errorText = '最小值不能小于或等于上一个梯度的最大值'
             return
         }
 
@@ -227,7 +227,7 @@ export default {
             form.errorText = '最大值不能为空'
             return
         } else if(parseInt(lastDate.max) <= parseInt(lastDate.min)) {
-            form.errorText = '最大值不能小于或等于最小值'
+            form.errorText = '最小值不能小于或等于上一个梯度的最大值'
             return
         }
 

src/views/setSilder/addSilder.vue

@@ -1,9 +1,6 @@
 <template>
   <div class="slider-container">
     <el-button @click='onOperation("create")'>添加按钮</el-button>
-    <!-- <el-button @click='removeSilder'>删除按钮</el-button> -->
-    <!-- <el-button @click='resetSilder'>修改按钮</el-button> -->
-    <!-- <el-button @click="lookSilder" type='error'>查询</el-button> -->
 
     <el-table :data="tableList"
               style="width: 100%;margin-bottom: 20px;"
@@ -13,19 +10,21 @@
       <el-table-column prop="name"
                        label="菜单名称">
       </el-table-column>
-      <el-table-column prop="hid"
-                       label="是否隐藏">
-      </el-table-column>
       <el-table-column prop="id"
                        label="元素ID">
       </el-table-column>
+      <el-table-column prop="type"
+                       label="菜单类型">
+      </el-table-column>
       <el-table-column prop="path"
                        label="文件路径">
       </el-table-column>
       <el-table-column prop="permission"
                        label="权限标识">
       </el-table-column>
-      
+      <el-table-column prop="hid"
+                       label="是否隐藏">
+      </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button @click="onOperation('update', scope.row)"
@@ -69,8 +68,17 @@
         </el-form-item>
         <el-form-item label="是否隐藏"
                       :label-width="formLabelWidth">
-          <el-input v-model="form.hid"
-                    autocomplete="off"></el-input>
+          <el-select v-model="form.hid">
+            <el-option label="否" :value="0"></el-option>
+            <el-option label="是" :value="1"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="菜单类型"
+                      :label-width="formLabelWidth">
+          <el-select v-model="form.type">
+            <el-option label="菜单" :value="0"></el-option>
+            <el-option label="按钮" :value="1"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="排序"
                       :label-width="formLabelWidth">
@@ -103,7 +111,8 @@ export default {
         parentId: null,
         sort: 1,
         component: null,
-        hid: 0
+        hid: 0,
+        type: 0
       }
     }
   },
@@ -136,7 +145,8 @@ export default {
           sort: row.sort,
           component: row.component,
           id: row.id,
-          hid: row.hid
+          hid: row.hid,
+          type: row.type
         }
       }
     },
@@ -150,7 +160,8 @@ export default {
           permission: form.permission,
           sort: form.sort,
           parentId: form.parentId,
-          hid: form.hid
+          hid: form.hid,
+          type: form.type
         }).then(res => {
           if (res.code == 200) {
             this.$message({
@@ -195,7 +206,8 @@ export default {
           parentId: res.parentId,
           component: res.component,
           sort: res.sort,
-          hid: res.hid
+          hid: res.hid,
+          type: res.type
         }
         if (res.sysMenus && res.sysMenus.length > 0) {
           tempList.children = this.setTableData(res.sysMenus)
@@ -224,22 +236,10 @@ export default {
         parentId: null,
         sort: 1,
         component: null,
+        hid: 0,
+        type: 0
       }
       this.$refs[formName].resetFields()
-    },
-    // 修改菜单栏
-    resetSilder () {
-      resetSilder({
-        // path: 'insideSetting',
-        // component: 'insideSetting',
-        // name: '分部内部设置',
-        // permission: '/insideSetting',
-        // sort: '1',
-        // parentId: '21',
-        // id: '24'
-      }).then(res => {
-        console.log(res)
-      })
     }
 
   },

src/views/studentManager/index.vue

@@ -61,8 +61,8 @@ export default {
   name: 'studentDetail',
   data () {
     return {
-      activeIndex: '6',
-      acitveStatus: [false, false, false, false, false, true, false]
+      activeIndex: '1',
+      acitveStatus: [true, false, false, false, false, false, false]
     }
   },
   methods: {

src/views/teacherManager/teacherDetail/index.vue

@@ -60,8 +60,8 @@ export default {
   data () {
     return {
       teacherName: this.$route.query.teacherName,
-      activeName: "7",
-      activeStatus: [false, false, false, false, false, false, false, true]
+      activeName: "0",
+      activeStatus: [true, false, false, false, false, false, false, false]
     }
   },
   methods: {

vue.config.js

@@ -17,10 +17,10 @@ const name = defaultSettings.title || 'vue Admin Template' // page title
 // http://47.99.212.176:8000
 // 
 // let target = 'http://192.168.3.27:8000' // 箭河
-let target = 'http://192.168.3.28:8000' //邹璇
+// let target = 'http://192.168.3.28:8000' //邹璇
 // let target = 'http://192.168.3.8:8000' //勇哥
 // let target = 'http://47.99.212.176:8000' // 测试服
-// let target = 'http://192.168.3.48:8000' // 乔
+let target = 'http://192.168.3.48:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**