mo 3 years ago
parent
commit
5d4f2e1e9e
4 changed files with 21 additions and 15 deletions
  1. 3 3
      src/App.vue
  2. 2 2
      src/views/OAMananger/index.vue
  3. 14 8
      src/views/tenantSetting/groupRecordManager.vue
  4. 2 2
      vue.config.js

+ 3 - 3
src/App.vue

@@ -94,14 +94,14 @@ body {
   position: absolute;
   left: 50%;
   margin-left: -40px;
-  width: 80px !important;
-  height: 80px;
+  width: 60px !important;
+  height: 60px;
   border-radius: 10px;
   background-color: #fff;
   -webkit-animation: rotateplane 1.5s infinite ease-in-out;
   animation: rotateplane 1.5s infinite ease-in-out;
   .iconfont {
-    font-size: 60px;
+    font-size: 40px;
   }
 }
 @-webkit-keyframes rotateplane {

+ 2 - 2
src/views/OAMananger/index.vue

@@ -91,10 +91,10 @@
               <copy-text>{{ scope.row.phone }}</copy-text>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="deptName" label="社保分部">
+          <!-- <el-table-column align="center" prop="deptName" label="社保分部">
           </el-table-column>
           <el-table-column align="center" prop="deptsName" label="所属部门">
-          </el-table-column>
+          </el-table-column> -->
           <!-- <el-table-column align="center" label="角色分类">
             <template slot-scope="scope">
               <tooltip

+ 14 - 8
src/views/tenantSetting/groupRecordManager.vue

@@ -53,14 +53,20 @@
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
         >
           <el-table-column align="center" label="交易流水号" prop="transNo">
+            <template slot-scope="scope">
+              <div>
+                  <copy-text>{{scope.row.transNo}}</copy-text>
+              </div>
+            </template>
           </el-table-column>
-          <el-table-column align="center" label="订单号" prop="orderNo">
+          <el-table-column align="center" label="订单号" prop="orderNo" width="160px">
           </el-table-column>
-          <el-table-column align="center" label="订单时间" prop="orderTime">
+          <el-table-column align="center" label="订单时间" prop="orderTime" width="160px">
           </el-table-column>
-          <el-table-column align="center" label="学员编号" prop="studentId">
+          <el-table-column align="center" label="学员编号" prop="studentId" width="80px">
+
           </el-table-column>
-          <el-table-column align="center" label="学员名称" prop="name">
+          <el-table-column align="center" label="学员名称" prop="name" width="120px">
           </el-table-column>
           <el-table-column align="center" label="手机号码" prop="phone">
           </el-table-column>
@@ -69,18 +75,18 @@
               {{ scope.row.type | tenantStatus }}
             </template>
           </el-table-column> -->
-          <el-table-column align="center" label="团练宝类型">
+          <el-table-column align="center" label="数量/团练宝类型">
             <template slot-scope="scope">
-              {{ scope.row.type | memberEnumType }}
+              {{ scope.row.time }}/{{ scope.row.type | memberEnumType }}
             </template>
           </el-table-column>
           <!-- <el-table-column align="center" label="网络教室剩余时长" prop="productName">
           </el-table-column> -->
-          <el-table-column align="center" label="数量">
+          <!-- <el-table-column align="center" label="数量" width="50px">
             <template slot-scope="scope">
               {{ scope.row.time }}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column align="center" label="激活费用(元)">
             <template slot-scope="scope">
               {{ scope.row.amount | moneyFormat }}

+ 2 - 2
vue.config.js

@@ -19,8 +19,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.251:8000' // 何国威
 // let target = 'http://192.168.3.250:8000' //邹璇
 // let target = 'http://192.168.3.119:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 开发环境
-// let target = 'https://test.dayaedu.com' //测试环境
+// let target = 'http://dev.dayaedu.com' // 开发环境
+let target = 'https://test.dayaedu.com' //测试环境
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**