diff --git a/config/index.js b/config/index.js index 4d05fbb6161bd9fa978e2037d76e6d06ec642a1b..a0325b196a0c4f710414500e5f6b4cdab8b49171 100644 --- a/config/index.js +++ b/config/index.js @@ -12,8 +12,8 @@ module.exports = { //本地代ç†è®¾ç½® proxyTable: { '/api': { - target: 'http://local.base-api.sing.com', // 接å£çš„域å - // target: 'http://wechat.test.singsingenglish.com/', + // target: 'http://local.base-api.sing.com', // 接å£çš„域å + target: 'http://wechat.test.singsingenglish.com/', changeOrigin: true, // 如果接å£è·¨åŸŸï¼Œéœ€è¦è¿›è¡Œè¿™ä¸ªå‚æ•°é…ç½® } }, diff --git a/src/components/periods/index.vue b/src/components/periods/index.vue index f3467c17a535b34df6612ed74eadf4f5636ec810..c37df3f9e71bb1ceb352923584d5a053f64f3931 100644 --- a/src/components/periods/index.vue +++ b/src/components/periods/index.vue @@ -28,7 +28,7 @@ <el-form-item> <el-button @click="onSearch" type="primary">查询</el-button> </el-form-item> - <el-form-item style="float: right;"> + <el-form-item style="float: right;" v-if="!$store.state.readonly"> <el-button @click="onAdd" type="primary">æ·»åŠ æœŸæ•°</el-button> </el-form-item> </el-form> @@ -67,23 +67,16 @@ label="当剿Œæ›²"> </el-table-column> <el-table-column - prop="watch_num" - label="å¯çœ‹è¯¾åŒ…æ•°"> - </el-table-column> - <el-table-column - prop="duration_num" - label="ç»çœ‹è¯¾åŒ…æ•°"> - </el-table-column> - <el-table-column - prop="has_watch_num" - label="已看课包数"> - </el-table-column> - <el-table-column - prop="has_duration_num" - label="å·²ç»çœ‹è¯¾åŒ…æ•°"> + label="看课情况" + min-width="150"> + <template slot-scope="scope"> + å¯çœ‹è¯¾åŒ…æ•°: {{scope.row.watch_num}}<br> 已看课包数:{{scope.row.has_watch_num}} <br> + ç»çœ‹è¯¾åŒ…æ•°: {{scope.row.duration_num}}<br> å·²ç»çœ‹è¯¾åŒ…æ•°:{{scope.row.has_duration_num}} + </template> </el-table-column> <el-table-column - label="å‘¨å‡ ä¸ä¸Šè¯¾"> + label="å‘¨å‡ ä¸ä¸Šè¯¾" + min-width="120"> <template slot-scope="scope"> {{scope.row.rest_week_day | dayFilter}} </template> @@ -94,7 +87,7 @@ </el-table-column> <el-table-column label="æ“作" - width="148"> + width="148" v-if="!$store.state.readonly"> <template slot-scope="scope"> <el-button size="mini" plain type="primary" @click="onEdit(scope.row)"> 编辑 diff --git a/src/components/shop/index.vue b/src/components/shop/index.vue index cf00cec10745ef4fd33ae64306ed910be931552e..523889a46f81cbf82792766104764c3f0125fbb8 100644 --- a/src/components/shop/index.vue +++ b/src/components/shop/index.vue @@ -82,18 +82,20 @@ <el-button size="mini" plain type="primary" @click="detail(scope.row)"> 查看详情 </el-button> - <el-button v-if="scope.row.status === 1" size="mini" plain type="primary" @click="onUp(scope.row)"> - 上架 - </el-button> - <el-button size="mini" v-if="scope.row.status === 0" plain type="primary" @click="onDown(scope.row)"> - 下架 - </el-button> - <el-button size="mini" plain type="warning" @click="edit(scope.row)"> - 编辑 - </el-button> - <el-button size="mini" plain type="danger" @click="onDel(scope.row)"> - åˆ é™¤ - </el-button> + <template v-if="!$store.state.readonly"> + <el-button v-if="scope.row.status === 1" size="mini" plain type="primary" @click="onUp(scope.row)"> + 上架 + </el-button> + <el-button size="mini" v-if="scope.row.status === 0" plain type="primary" @click="onDown(scope.row)"> + 下架 + </el-button> + <el-button size="mini" plain type="warning" @click="edit(scope.row)"> + 编辑 + </el-button> + <el-button size="mini" plain type="danger" @click="onDel(scope.row)"> + åˆ é™¤ + </el-button> + </template> </div> <el-button slot="reference" size="mini" type="text" >æ“作</el-button> </el-popover> diff --git a/src/components/user/index.vue b/src/components/user/index.vue index 5f4393a5bf0a0ca6f9c5ec5697c03154f306fd01..dfe81ac81765f539b38e251ac1c465cb172da5f8 100644 --- a/src/components/user/index.vue +++ b/src/components/user/index.vue @@ -66,7 +66,7 @@ label="æ“作" width="300"> <template slot-scope="scope"> - <el-button size="mini" plain type="warning" @click="bindTeacher(scope.row)"> + <el-button size="mini" plain type="warning" v-if="!$store.state.readonly" @click="bindTeacher(scope.row)"> 绑定è€å¸ˆ </el-button> <el-button size="mini" plain type="primary" @click="detail(scope.row)"> diff --git a/src/router/index.js b/src/router/index.js index d7fb2bf9dd24edb93a1c24a6d74a9af3424fbff3..ea1d421817379eb1b167b449a11f6ecc188f41e2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -17,6 +17,16 @@ const router =new Router({ path: '', name:'first', component: e=>require(['@/components/main'],e), + }, + { + path: '/userOrder/:id', + name:'userOrder', + component: e=>require(['@/components/userOrder'],e), + }, + { + path: '/teacher/:id', + name:'teacherDetail', + component: e=>require(['@/components/teacherDetail'],e), } ] }, @@ -27,8 +37,7 @@ const router =new Router({ meta:{ skip_auth:true, } - }, - + } ] }); router.beforeEach((to,from,next)=> {