Merge branch 'development' of http://git.singsingenglish.com/new-sing/admin into development

src/components/achievement/index.vue

@@ -32,22 +32,22 @@
           </el-table-column>
           <el-table-column
             prop="total_money"
-            label="销售额"
+            label="销售额" sortable
           >
           </el-table-column>
           <el-table-column
             prop="three_month"
-            label="季课"
+            label="季课" sortable
           >
           </el-table-column>
           <el-table-column
             prop="one_year"
-            label="年课"
+            label="年课" sortable
           >
           </el-table-column>
           <el-table-column
             prop="two_year"
-            label="2年课"
+            label="2年课" sortable
           >
           </el-table-column>
         </el-table>
@@ -77,7 +77,7 @@
           style="width: 100%">
           <el-table-column
             prop="cur_date"
-            label="时间"
+            label="时间" sortable
           >
           </el-table-column>
           <el-table-column
@@ -87,22 +87,22 @@
           </el-table-column>
           <el-table-column
             prop="total_money"
-            label="销售额"
+            label="销售额" sortable
           >
           </el-table-column>
           <el-table-column
             prop="three_month"
-            label="季课"
+            label="季课" sortable
           >
           </el-table-column>
           <el-table-column
             prop="one_year"
-            label="年课"
+            label="年课" sortable
           >
           </el-table-column>
           <el-table-column
             prop="two_year"
-            label="2年课"
+            label="2年课" sortable
           >
           </el-table-column>
         </el-table>
@@ -129,6 +129,7 @@
         }
       },
       mounted(){
+        this.defaultTime();
         this.searchFirstPage();
       },
       methods: {
@@ -163,7 +164,21 @@
           getTeacherDayRankListApi(json).then(res=>{
             this.secondList = res;
           })
+        },
+        defaultTime(){
+        let date = new Date();
+        let year = date.getFullYear();
+        let Month = date.getMonth()+1;
+        if(Month < 10){
+          Month = `0${Month}`
         }
+        let Day = date.getDate();
+        if(Day<10)Day = `0${Day}`
+        let star = `${year}-${Month}-01`;
+        let end = `${year}-${Month}-${Day}`
+        this.searchFirstFrom.dateValue = [star,end]
+        this.searchSecondFrom.dateValue = [star,end]
+      }
       }
     }
 </script>

src/components/class/userList.vue

@@ -123,7 +123,7 @@
           type="selection"
           width="55">
         </el-table-column>
-        <el-table-column label="用户" className="f-c" width="150">
+        <el-table-column label="用户" className="f-c" width="150" sortable>
           <template slot-scope="scope">
             <img :src="scope.row.avatar" style="width: 40px;height: 40px;border-radius: 50px"> {{scope.row.nickname}}(ID:{{scope.row.user_id}})
           </template>
@@ -141,7 +141,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          label="最后登录时间">
+          label="最后登录时间" sortable  width="140">
           <template slot-scope="scope">
             {{ scope.row.last_login_at }}
           </template>
@@ -159,25 +159,25 @@
           </template>
         </el-table-column>
         <el-table-column
-          label="课包查看次数">
+          label="课包查看次数" sortable  width="140">
           <template slot-scope="scope">
             {{ scope.row.watch_course_num }}
           </template>
         </el-table-column>
         <el-table-column
-          label="学习时长（分）">
+          label="学习时长（分）" sortable width="150">
           <template slot-scope="scope">
             {{ Math.round(scope.row.watch_course_time / 60 * 100) / 100}}
           </template>
         </el-table-column>
         <el-table-column
-          label="作业率">
+          label="作业率" sortable>
           <template slot-scope="scope">
             {{ scope.row.work_rate | percent}}
           </template>
         </el-table-column>
         <el-table-column
-          label="打卡率">
+          label="打卡率" sortable>
           <template slot-scope="scope">
             {{ scope.row.clock_rate | percent}}
           </template>
@@ -189,7 +189,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          label="是否添加老师">
+          label="是否添加老师"  width="120">
           <template slot-scope="scope">
             {{ scope.row.is_add_teacher === 0 ? '否' : '是'}}
           </template>

src/components/coupon/index.vue

@@ -66,7 +66,7 @@
       </el-table-column>
       <el-table-column
         prop="use_at"
-        label="使用时间">
+        label="使用时间" sortable>
       </el-table-column>
     </el-table>
     <page :nowPage="nowPage" :total="total" @pageChange="onPageChange" @sizeChange="onSizeChange"/>

src/components/externalLaunch/index.vue

@@ -56,7 +56,7 @@
       </el-table-column>
       <el-table-column
         prop="create_at"
-        label="添加时间">
+        label="添加时间" sortable>
       </el-table-column>
       <el-table-column
         prop="source"

src/components/order/index.vue

@@ -189,11 +189,11 @@
       </el-table-column>
       <el-table-column
         prop="pay_at"
-        label="购买时间">
+        label="购买时间" sortable>
       </el-table-column>
       <el-table-column
         prop="created_at"
-        label="下单时间">
+        label="下单时间" sortable>
       </el-table-column>
       <el-table-column
         prop="desc"

src/components/periods/index.vue

@@ -157,7 +157,7 @@
       </el-table-column>
       <el-table-column
         prop="start_at"
-        label="起止时间">
+        label="起止时间" sortable>
         <template slot-scope="scope">
           {{scope.row.start_at}}
           <br>
@@ -166,7 +166,7 @@
       </el-table-column>
       <el-table-column
         prop="created_at"
-        label="创建时间">
+        label="创建时间" sortable>
       </el-table-column>
       <el-table-column
         label="操作"

src/components/refund/index.vue

@@ -84,7 +84,7 @@
       </el-table-column>
       <el-table-column
         prop="success_at"
-        label="退款成功时间">
+        label="退款成功时间" sortable>
       </el-table-column>
       <el-table-column
         label="操作"

src/components/sourceManage/index.vue

@@ -36,7 +36,7 @@
       </el-table-column>
       <el-table-column
         prop="created_at"
-        label="创建时间">
+        label="创建时间" sortable>
       </el-table-column>
       <el-table-column
         label="操作"

src/components/system/admin.vue

@@ -56,7 +56,7 @@
       </el-table-column>
       <el-table-column
         prop="last_login_at"
-        label="最后登陆时间">
+        label="最后登陆时间" sortable>
       </el-table-column>
       <el-table-column
         v-if="!$store.state.readonly"

src/components/system/adminLog.vue

@@ -61,7 +61,7 @@
       </el-table-column>
       <el-table-column
         prop="created_at"
-        label="创建时间">
+        label="创建时间" sortable>
       </el-table-column>
     </el-table>
     <page :total="total" :limit="limit" @pageChange="onPageChange" @sizeChange="onSizeChange"/>

src/components/system/role.vue

@@ -16,7 +16,7 @@
       </el-table-column>
       <el-table-column
         prop="created_at"
-        label="创建时间">
+        label="创建时间" sortable>
       </el-table-column>
       <el-table-column
         v-if="!$store.state.readonly"

src/components/system/sysConfig.vue

@@ -35,7 +35,7 @@
       </el-table-column>
       <el-table-column
         prop="created_at"
-        label="创建时间">
+        label="创建时间" sortable>
       </el-table-column>
       <el-table-column
         width="250"

src/components/system/sysConfigDialog.vue

@@ -26,7 +26,7 @@
         <el-row>
           <el-col :span="4"><label>描述</label></el-col>
           <el-col :span="8">
-            <el-form-item>
+            <el-form-item  prop="desc">
               <el-input v-model="form.desc" type="textarea"></el-input>
             </el-form-item>
           </el-col>

src/components/teacherDetail/chooseGoodDialog.vue

 <template>
-  <el-dialog title="复制链接" :visible.sync="show" :modal="false">
+  <el-dialog title="复制链接" :visible.sync="show" :modal="false" width="80%">
     <el-form ref="searchFrom" :model="searchFrom" label-width="100px" class="search-form" inline>
       <el-form-item label="商品名称">
         <el-input v-model="searchFrom.name"></el-input>
@@ -120,7 +120,7 @@
         label="操作">
         <template slot-scope="scope">
           <el-button size="mini" plain type="success" @click="copyUrl(scope.row.id)">
-            复制商品
+            复制链接
           </el-button>
         </template>
       </el-table-column>

src/components/teacherDetail/index.vue

@@ -30,7 +30,7 @@
           {{detail.user_info.nickname}}(ID:{{detail.user_info.user_id}})
         </el-col>
 
-        <el-col v-if="detail.user_info">
+        <el-col v-if="detail.user_info" :span="6">
           <el-button @click="createInviteLink(detail.user_info.user_id)" size="mini" plain type="primary">
             复制专属链接
           </el-button>

src/components/user/index.vue

@@ -48,11 +48,11 @@
       </el-table-column>
       <el-table-column
         prop="created_at"
-        label="注册时间">
+        label="注册时间" sortable>
       </el-table-column>
       <el-table-column
         prop="last_login_at"
-        label="最后登录时间">
+        label="最后登录时间" sortable>
       </el-table-column>
       <el-table-column
         label="操作">