Browse Source

26.PC图片上传限制容量取消 √
27.PC课后详情CK有小数,卡路里取整数 √
28.团课改色 √

Changpeng Duan 5 years ago
parent
commit
3722cfbb89

+ 2 - 2
pc/src/views/Member.vue

@@ -616,12 +616,12 @@
             // 验证文件合法性
             beforeUpload(file) {
                 const isJPG = file.type === 'image/jpeg' || file.type === 'image/png';
-                const isLt2M = file.size / 1024 / 1024 < 2;
+                const isLt2M = file.size / 1024 / 1024 < 70;
                 if (!isJPG) {
                     this.$message.error('上传头像图片只能是 JPG 格式!')
                 }
                 if (!isLt2M) {
-                    this.$message.error('上传头像图片大小不能超过 2MB!')
+                    this.$message.error('上传头像图片大小不能超过 70MB!')
                 }
                 return isJPG && isLt2M
             },

+ 2 - 2
pc/src/views/classInfoDetail.vue

@@ -229,11 +229,11 @@
             },
             // 单位转换去6个零
             filterCle(value, row, column) {
-                return parseFloat(column / 1000000).toFixed(1);
+                return parseInt(column / 1000000);
             },
             // 单位转换去6个零
             filterCK(value, row, column) {
-                return parseInt(column / 1000000);
+                return parseFloat(column / 1000000).toFixed(1);
             },
             // 单位转换去1个零
             filterWeight(value, row, column) {

+ 534 - 521
pc/src/views/record.vue

@@ -1,535 +1,548 @@
 <template>
-  <div class="context">
-    <div class="panel">
-      <h5>预约记录</h5>
-      <div class="panel-body">
-        <div class="panel_control">
-          <el-row :gutter="20">
-            <el-col :span="4">
-              <em>姓名:</em>
-              <el-input v-model="panel.name" placeholder="请输入姓名"></el-input>
-            </el-col>
-            <el-col :span="4">
-              <em>手机号:</em>
-              <el-input v-model="panel.phone" placeholder="请输入手机号" type="number" ></el-input>
-            </el-col>
-            <el-col :span="7">
-              <em>日期:</em>
-              <el-date-picker
-                  v-model="panel.timeScope"
-                  type="daterange"
-                  range-separator="至"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期">
-              </el-date-picker>
-            </el-col>
-            <el-col :span="4">
-              <em>预约课程:</em>
-              <el-select v-model="panel.classId">
-                <el-option
-                    v-for="item in panel.classOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                </el-option>
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <em>状态:</em>
-              <el-select v-model="panel.status">
-                <el-option
-                    v-for="item in panel.options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                </el-option>
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-button size="" type="primary" @click="query" :disabled="serachBtnStatus" plain>查询</el-button>
-            </el-col>
-          </el-row>
+    <div class="context">
+        <div class="panel">
+            <h5>预约记录</h5>
+            <div class="panel-body">
+                <div class="panel_control">
+                    <el-row :gutter="20">
+                        <el-col :span="4">
+                            <em>姓名:</em>
+                            <el-input v-model="panel.name" placeholder="请输入姓名"></el-input>
+                        </el-col>
+                        <el-col :span="4">
+                            <em>手机号:</em>
+                            <el-input v-model="panel.phone" placeholder="请输入手机号" type="number"></el-input>
+                        </el-col>
+                        <el-col :span="7">
+                            <em>日期:</em>
+                            <el-date-picker
+                                    v-model="panel.timeScope"
+                                    type="daterange"
+                                    range-separator="至"
+                                    start-placeholder="开始日期"
+                                    end-placeholder="结束日期">
+                            </el-date-picker>
+                        </el-col>
+                        <el-col :span="4">
+                            <em>预约课程:</em>
+                            <el-select v-model="panel.classId">
+                                <el-option
+                                        v-for="item in panel.classOptions"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-col>
+                        <el-col :span="4">
+                            <em>状态:</em>
+                            <el-select v-model="panel.status">
+                                <el-option
+                                        v-for="item in panel.options"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </el-col>
+                        <el-col :span="4">
+                            <el-button size="" type="primary" @click="query" :disabled="serachBtnStatus" plain>查询
+                            </el-button>
+                        </el-col>
+                    </el-row>
+                </div>
+            </div>
+        </div>
+        <div class="table">
+            <el-table
+                    :data="tableData"
+                    border
+                    is-horizontal-resize
+                    :default-sort="{prop: 'date', order: 'descending'}"
+                    element-loading-background="rgba(0, 0, 0, 0.8)"
+                    class=""
+                    @selection-change="handleSelectionChange"
+            >
+
+                >
+                <el-table-column
+                        type="index"
+                        label="序号"
+                        align="center"
+                        width="50">
+                </el-table-column>
+                <el-table-column
+                        prop="UserName"
+                        label="会员名"
+                        width="90"
+                >
+                </el-table-column>
+                <el-table-column
+                        prop="Phone"
+                        label="手机号"
+                        width="110"
+                        sortable
+                >
+                </el-table-column>
+                <el-table-column
+                        prop="ClassName"
+                        label="预约课程"
+                        sortable
+                >
+                    <template slot-scope="scope">
+                        <span class="lessons"
+                              :style="{ background:scope.row.ClassColor }">{{ scope.row.ClassName }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        prop="ConsumeHour"
+                        label="课时"
+                        width="80"
+                        sortable
+                >
+                </el-table-column>
+                <el-table-column
+                        prop="Base.CreatedAt"
+                        label="预约日期"
+                        width="180"
+                        :formatter="filterFmtDate"
+                        sortable
+                >
+                </el-table-column>
+                <el-table-column
+                        prop="BeginStr"
+                        label="上课时间"
+                        width="180"
+                        sortable
+                >
+                    <template slot-scope="scope">
+                        {{ scope.row.BeginTime |filterNoTTime }} - {{ scope.row.EndStr }}
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        prop="RemainHour"
+                        label="是否跨店"
+                        width="110"
+                        sortable
+                >
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.RemainHour == ''" style="color:red;">跨店</span>
+                        <span v-else style="color: #000">本店用户</span>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        prop="Status"
+                        label="状态"
+                        width="110"
+                        sortable
+                >
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.Status == 1" style="color:yellowgreen;">已预约</span>
+                        <span v-if="scope.row.Status == 2" style="color: #ccc">已取消</span>
+                        <span v-if="scope.row.Status == 3" style="color: red">预约未到</span>
+                        <span v-if="scope.row.Status == 4" style="color:#000;">已完成</span>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <br>
+            <el-pagination
+                    background
+                    :total="pageination.total"
+                    :page-size="pageination.pageItem"
+                    @current-change="pageChange"
+            ></el-pagination>
         </div>
-      </div>
-    </div>
-    <div class="table">
-      <el-table
-          :data="tableData"
-          border
-          is-horizontal-resize
-          :default-sort="{prop: 'date', order: 'descending'}"
-          element-loading-background="rgba(0, 0, 0, 0.8)"
-          class=""
-          @selection-change="handleSelectionChange"
-      >
-
-        >
-        <el-table-column
-            type="index"
-            label="序号"
-            align="center"
-            width="50">
-        </el-table-column>
-        <el-table-column
-            prop="UserName"
-            label="会员名"
-            width="90"
-        >
-        </el-table-column>
-        <el-table-column
-            prop="Phone"
-            label="手机号"
-            width="110"
-            sortable
-        >
-        </el-table-column>
-        <el-table-column
-            prop="ClassName"
-            label="预约课程"
-            sortable
-        >
-          <template slot-scope="scope">
-            <span class="lessons" :style="{ background:scope.row.ClassColor }">{{ scope.row.ClassName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="ConsumeHour"
-            label="课时"
-            width="80"
-            sortable
-        >
-        </el-table-column>
-        <el-table-column
-            prop="Base.CreatedAt"
-            label="预约日期"
-            width="180"
-            :formatter="filterFmtDate"
-            sortable
-        >
-        </el-table-column>
-        <el-table-column
-            prop="BeginStr"
-            label="上课时间"
-            width="180"
-            sortable
-        >
-          <template slot-scope="scope">
-            {{ scope.row.BeginTime |filterNoTTime }} - {{ scope.row.EndStr }}
-          </template>
-        </el-table-column>
-          <el-table-column
-                  prop="RemainHour"
-                  label="是否跨店"
-                  width="110"
-                  sortable
-          >
-              <template slot-scope="scope">
-                  <span v-if="scope.row.RemainHour == ''" style="color:red;">跨店</span>
-                  <span v-else style="color: #000">本店用户</span>
-              </template>
-          </el-table-column>
-        <el-table-column
-            prop="Status"
-            label="状态"
-            width="110"
-            sortable
-        >
-          <template slot-scope="scope">
-            <span v-if="scope.row.Status == 1" style="color:yellowgreen;">已预约</span>
-            <span v-if="scope.row.Status == 2" style="color: #ccc">已取消</span>
-            <span v-if="scope.row.Status == 3" style="color: red">预约未到</span>
-            <span v-if="scope.row.Status == 4" style="color:#000;">已完成</span>
-          </template>
-        </el-table-column>
-      </el-table>
-      <br>
-      <el-pagination
-          background
-          :total="pageination.total"
-          :page-size="pageination.pageItem"
-          @current-change="pageChange"
-      ></el-pagination>
     </div>
-  </div>
 </template>
 
 <script>
-import Global from '../Global.js'
-import {
-  OrderListQuery,
-  ClassListQuery,
-} from "../api/getApiRes";
-
-let qs = require('qs');
-export default {
-  data() {
-    return {
-      serachBtnStatus: false,
-      dialogVisible: false,//其他dialog
-      dialogMemberVisible: false,//新增会员dialog
-      dialogLesson: false,//课时调整
-      dialogGift: false,//赠送课时调整
-      dialogExpTime: false,//有效期调整
-      dialogLessonTable: false,//会员课程
-      dialogTitle: '新增会员',
-      dialogValue: [],
-      // panel 配置项目
-      panel: {
-        status: '',
-        classId: '',
-        usercode: '',
-        username: '',
-        timeScope: globalBt2(30),
-        compname: '',
-        keyword: '',
-        USERCODE: '',
-        endType: '',
-        taskstatus: 99,
-        draw: 1,
-        start: 0,
-        recordsTotal: 0,
-        tableData: [],
-        allTableData: [],
-        limit: '10',
-        multipleSort: false,
-        loading: false,
-        fileList: [],
-        multipleSelection: [],
-        detectedmac: '',
-        classOptions: [],
-        options: [
-          {value: '', label: '全部'},
-          {value: 1, label: '已预约'},
-          {value: 2, label: '已取消'},
-          {value: 3, label: '预约未到'},
-          {value: 4, label: '已完成'},
-        ],
-        endTypeOptions: [
-          {value: 99, label: '全部'},
-          {value: 30, label: '近一个月'},
-          {value: 7, label: '近一周'},
-          {value: 1, label: '当日'},
-        ],
-        time1: globalBt(),
-      },
-      multipleSelection: [],
-      pageination: {
-        pageItem: 100,
-        pageoptions: pageOptions(),
-        total: 100,
-        pageIndex: 1,
-      },
-      form: {
-        name: '',
-        userCode: '',
-        shopId: '',
-        memberType: 1,
-        lesson: 1,
-        gift: 1,
-        btnType: 0,//0新建,1编辑编辑
-        memo: '',
-        expTime: '',
-        dialogdata: [],//穿梭待选
-        dialogValue: [],//穿梭已选
-      },
-      memberTypes: [
-        {value: 1, label: '年会员'},
-        {value: 2, label: '充值会员'},
-      ],
-      tableData: []
+    import Global from '../Global.js'
+    import {
+        OrderListQuery,
+        ClassListQuery,
+    } from "../api/getApiRes";
+
+    let qs = require('qs');
+    export default {
+        data() {
+            return {
+                serachBtnStatus: false,
+                dialogVisible: false,//其他dialog
+                dialogMemberVisible: false,//新增会员dialog
+                dialogLesson: false,//课时调整
+                dialogGift: false,//赠送课时调整
+                dialogExpTime: false,//有效期调整
+                dialogLessonTable: false,//会员课程
+                dialogTitle: '新增会员',
+                dialogValue: [],
+                // panel 配置项目
+                panel: {
+                    status: '',
+                    classId: '',
+                    usercode: '',
+                    username: '',
+                    timeScope: globalBt2(7),
+                    compname: '',
+                    keyword: '',
+                    USERCODE: '',
+                    endType: '',
+                    taskstatus: 99,
+                    draw: 1,
+                    start: 0,
+                    recordsTotal: 0,
+                    tableData: [],
+                    allTableData: [],
+                    limit: '10',
+                    multipleSort: false,
+                    loading: false,
+                    fileList: [],
+                    multipleSelection: [],
+                    detectedmac: '',
+                    classOptions: [],
+                    options: [
+                        {value: '', label: '全部'},
+                        {value: 1, label: '已预约'},
+                        {value: 2, label: '已取消'},
+                        {value: 3, label: '预约未到'},
+                        {value: 4, label: '已完成'},
+                    ],
+                    endTypeOptions: [
+                        {value: 99, label: '全部'},
+                        {value: 30, label: '近一个月'},
+                        {value: 7, label: '近一周'},
+                        {value: 1, label: '当日'},
+                    ],
+                    time1: globalBt(),
+                },
+                multipleSelection: [],
+                pageination: {
+                    pageItem: 100,
+                    pageoptions: pageOptions(),
+                    total: 100,
+                    pageIndex: 1,
+                },
+                form: {
+                    name: '',
+                    userCode: '',
+                    shopId: '',
+                    memberType: 1,
+                    lesson: 1,
+                    gift: 1,
+                    btnType: 0,//0新建,1编辑编辑
+                    memo: '',
+                    expTime: '',
+                    dialogdata: [],//穿梭待选
+                    dialogValue: [],//穿梭已选
+                },
+                memberTypes: [
+                    {value: 1, label: '年会员'},
+                    {value: 2, label: '充值会员'},
+                ],
+                tableData: []
+            }
+        },
+        mounted() {
+            this.panelSelect();
+            this.getTableQuery();
+        },
+        methods: {
+            // 加载选项
+            panelSelect() {
+                let that = this;
+                let param = {
+                    token: localStorage.token,
+                    classType: 1//去掉午休
+                };
+                let postdata = qs.stringify(param);
+                ClassListQuery(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        if (json.Rs == null) return false;
+                        that.panel.classOptions = turnClassResToOption(json.Rs);
+                        that.panel.classOptions.unshift({value: '', label: '全部'})
+                    } else {
+                        that.$message.error(json.Memo + '错误码:' + json.Code);
+                    }
+                })
+            },
+            handleSelectionChange(val) {
+                this.multipleSelection = val;
+            },
+            // 查询按钮
+            query() {
+                let that = this;
+                that.serachBtnStatus = true;
+                let totalTime = 2;
+                let clock = window.setInterval(() => {
+                    totalTime--;
+                    if (totalTime < 0) {
+                        totalTime = 2;
+                        that.serachBtnStatus = false;
+                    }
+                }, 1000);
+                this.getTableQuery();
+                this.$message.success('查询完毕');
+            },
+            clearForm() {
+                // clear
+                this.form.name = '';
+                this.form.userCode = '';
+                this.form.shopId = '';
+            },
+            // 页面数据查询
+            getTableQuery() {
+                let that = this;
+                // this.getGetChildRegionSelect(0, 1);
+                that.loading = true;
+                console.log(that.panel.timeScope[0]);
+                let beginOrdertime = parseInt(that.panel.timeScope[0].valueOf() / 1000);
+                let endOrdertime = parseInt(that.panel.timeScope[1].valueOf() / 1000);
+
+                beginOrdertime = '';
+                endOrdertime = '';
+                // 查询检测设备。上级区域id,区域id必传。regionid传0,查询supregionid对应所有子区域的检测设备。 如果supregionid,regionid都传0,默认查询企业ID下所有检测设备
+                let param = {
+                    token: localStorage.token,
+                    classId: that.panel.classId,//
+                    name: that.panel.name,//
+                    phone: that.panel.phone,//
+                    // beginOrdertime:beginOrdertime,//
+                    // endOrdertime: endOrdertime,//
+                    status: that.panel.status,//标签名
+                };
+                let postdata = qs.stringify(param);
+                OrderListQuery(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        that.loading = false;
+                        if (json.Rs) {
+                            that.allTableData = json.Rs;
+                            that.recordsTotal = json.Rs.length;
+                        } else {
+                            that.allTableData = [];
+                            that.recordsTotal = 0;
+                        }
+
+                        // 设置分页数据
+                        that.setPaginations();
+                    } else {
+                        that.$message.error(json.Memo + '错误码:' + json.Code);
+                    }
+                })
+            },
+
+            // 设置分页数据
+            setPaginations() {
+                // 分页属性
+                let that = this;
+                that.pageination.total = that.recordsTotal;
+
+                // 默认分页
+                that.tableData = that.allTableData.filter((item, index) => {
+                    return index < that.pageination.pageItem;
+                });
+            },
+            // 每页显示数量
+            handleSizeChange() {
+                let that = this;
+                that.tableData = that.allTableData.filter((item, index) => {
+                    return index < that.pageination.pageItem;
+                });
+                that.draw = that.pageination.pageItem;
+                // that.getTableQuery();
+            },
+            // 翻页
+            pageChange(pageIndex) {
+                let that = this;
+                // 获取当前页
+                let index = that.pageination.pageItem * (pageIndex - 1);
+                // 数据总数
+                let nums = that.pageination.pageItem * pageIndex;
+                // 容器
+                let tables = [];
+                for (var i = index; i < nums; i++) {
+                    if (that.allTableData[i]) {
+                        tables.push(that.allTableData[i])
+                    }
+                    this.tableData = tables;
+                }
+                that.start = index * that.draw;
+                // that.getTableQuery();
+            },
+            // 自动排序
+            sortChange(params) {
+                console.log(params)
+            },
+            // 过滤时间
+            filterFmtDate(value, row, column) {
+                let that = this;
+                return nonTfmtDate(column, 11);
+            },
+            // 过滤金额
+            filterMoney(value, row, column) {
+                let that = this;
+                return parseFloat(column).toFixed(2);
+            },
+        },
+        filters: {
+            filterNoTTime: function (value) {
+                if (!value) {
+                    return 0
+                } else {
+                    return nonTfmtDatetoLength(value, 16);
+                }
+            },
+        },
+        watch: {
+            $route(to) {
+                if (to.name == 'record') {
+                    this.panelSelect();
+                    this.getTableQuery();
+                }
+            },
+        },
     }
-  },
-  mounted() {
-    this.panelSelect();
-    this.getTableQuery();
-  },
-  methods: {
-    // 加载选项
-    panelSelect() {
-      let that = this;
-      let param = {
-        token: localStorage.token,
-        classType:1//去掉午休
-      };
-      let postdata = qs.stringify(param);
-      ClassListQuery(postdata).then(res => {
-        let json = res;
-        if (json.Code == 0) {
-          if (json.Rs == null) return false
-          that.panel.classOptions = turnClassResToOption(json.Rs);
-          that.panel.classOptions.unshift({value: '', label: '全部'})
-        } else {
-          that.$message.error(json.Memo + '错误码:' + json.Code);
-        }
-      })
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    // 查询按钮
-    query() {
-      let that = this;
-      that.serachBtnStatus = true;
-      let totalTime = 2
-      let clock = window.setInterval(() => {
-        totalTime--
-        if (totalTime < 0) {
-          totalTime = 2;
-          that.serachBtnStatus = false;
-        }
-      }, 1000)
-      this.getTableQuery();
-      this.$message.success('查询完毕');
-    },
-    clearForm() {
-      // clear
-      this.form.name = '';
-      this.form.userCode = '';
-      this.form.shopId = '';
-    },
-    // 页面数据查询
-    getTableQuery() {
-      let that = this;
-      // this.getGetChildRegionSelect(0, 1);
-      that.loading = true;
-      // 查询检测设备。上级区域id,区域id必传。regionid传0,查询supregionid对应所有子区域的检测设备。 如果supregionid,regionid都传0,默认查询企业ID下所有检测设备
-      let param = {
-        token: localStorage.token,
-        classId: that.panel.classId,//
-        name: that.panel.name,//
-        phone: that.panel.phone,//
-        beginOrdertime: that.panel.beginOrdertime,//
-        endOrdertime: that.panel.endOrdertime,//
-        status: that.panel.status,//标签名
-      };
-      let postdata = qs.stringify(param);
-      OrderListQuery(postdata).then(res => {
-        let json = res;
-        if (json.Code == 0) {
-          that.loading = false;
-          if (json.Rs) {
-            that.allTableData = json.Rs;
-            that.recordsTotal = json.Rs.length;
-          } else {
-            that.allTableData = [];
-            that.recordsTotal = 0;
-          }
-
-          // 设置分页数据
-          that.setPaginations();
-        } else {
-          that.$message.error(json.Memo + '错误码:' + json.Code);
-        }
-      })
-    },
-
-    // 设置分页数据
-    setPaginations() {
-      // 分页属性
-      let that = this;
-      that.pageination.total = that.recordsTotal;
-
-      // 默认分页
-      that.tableData = that.allTableData.filter((item, index) => {
-        return index < that.pageination.pageItem;
-      });
-    },
-    // 每页显示数量
-    handleSizeChange() {
-      let that = this;
-      that.tableData = that.allTableData.filter((item, index) => {
-        return index < that.pageination.pageItem;
-      });
-      that.draw = that.pageination.pageItem;
-      // that.getTableQuery();
-    },
-    // 翻页
-    pageChange(pageIndex) {
-      let that = this;
-      // 获取当前页
-      let index = that.pageination.pageItem * (pageIndex - 1);
-      // 数据总数
-      let nums = that.pageination.pageItem * pageIndex;
-      // 容器
-      let tables = [];
-      for (var i = index; i < nums; i++) {
-        if (that.allTableData[i]) {
-          tables.push(that.allTableData[i])
-        }
-        this.tableData = tables;
-      }
-      that.start = index * that.draw;
-      // that.getTableQuery();
-    },
-    // 自动排序
-    sortChange(params) {
-      console.log(params)
-    },
-    // 过滤时间
-    filterFmtDate(value, row, column) {
-      let that = this;
-      return nonTfmtDate(column, 11);
-    },
-    // 过滤金额
-    filterMoney(value, row, column) {
-      let that = this;
-      return parseFloat(column).toFixed(2);
-    },
-  },
-  filters: {
-    filterNoTTime: function (value) {
-      if (!value) {
-        return 0
-      } else {
-        return nonTfmtDatetoLength(value, 16);
-      }
-    },
-  },
-  watch: {
-    $route(to) {
-      if (to.name == 'record') {
-        this.panelSelect();
-        this.getTableQuery();
-      }
-    },
-  },
-}
 </script>
 
 <style scoped>
-@import "../assets/css/panel.css";
-
-.context {
-  height: 770px;
-  overflow-y: scroll;
-
-  display: block;
-  margin: 0 auto;
-  background-color: #fff !important;
-  padding: 30px;
-}
-
-.panel-body {
-  padding: 20px;
-  background: #F0F2F5;
-}
-
-.change {
-  width: 100%;
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-  padding-top: 10px;
-  padding-bottom: 10px;
-}
-
-.change button {
-  float: left;
-}
-
-.change button.pull-right {
-  float: right;
-}
-
-.dialogTitle {
-  width: 100%;
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-  color: #000000;
-  font-size: 18px;
-  text-align: center;
-}
-
-.dialogTitle em {
-  float: none;
-  font-style: normal;
-  color: #3799FF;
-  margin: 0;
-}
-
-/deep/ .el-transfer-panel__item .el-checkbox__input {
-  left: 40px;
-}
-
-.dialogFooter {
-  width: 90%;
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-  margin-top: 10px;
-}
-
-.dialogFooter button {
-  float: right;
-  margin-left: 10px;
-}
-
-.dialogContent {
-  width: 100%;
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-}
-
-.dialogContent .pull-left {
-  width: 30%;
-  float: left;
-}
-
-.dialogContent .pull-right {
-  width: 70%;
-  float: right;
-}
-
-.panel /deep/ .el-date-editor--daterange {
-  /*width: 260px;*/
-}
-
-/deep/ .el-col-4 {
-  width: 15% !important;
-}
-
-.panel /deep/ .el-input__inner {
-  /*width: 130px;*/
-}
-
-.panel /deep/ .el-input {
-  /*width: 130px;*/
-}
-
-.panel /deep/ .el-select {
-  width: 130px;
-}
-
-/deep/ .el-date-editor .el-range-separator {
-  line-height: 22px;
-}
-
-.lessons {
-  padding: 1px 7px;
-  border-radius: 250px;
-  float: left;
-  color: #000;
-}
-.el-col-7 {
-    width: 25%;
-}
-/*ipad only*/
-@media only screen and (max-width: 1366px) {
-  .panel-body {
-  }
- .panel .el-button {
-   margin-top: 5px;
- }
- .panel .el-col-4:nth-child(6) {
-   width: 9%!important;
-   float: right;
-   margin-top: 25px;
- }
+    @import "../assets/css/panel.css";
+
+    .context {
+        height: 770px;
+        overflow-y: scroll;
+
+        display: block;
+        margin: 0 auto;
+        background-color: #fff !important;
+        padding: 30px;
+    }
+
+    .panel-body {
+        padding: 20px;
+        background: #F0F2F5;
+    }
+
+    .change {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        padding-top: 10px;
+        padding-bottom: 10px;
+    }
+
+    .change button {
+        float: left;
+    }
+
+    .change button.pull-right {
+        float: right;
+    }
+
+    .dialogTitle {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        color: #000000;
+        font-size: 18px;
+        text-align: center;
+    }
+
+    .dialogTitle em {
+        float: none;
+        font-style: normal;
+        color: #3799FF;
+        margin: 0;
+    }
+
+    /deep/ .el-transfer-panel__item .el-checkbox__input {
+        left: 40px;
+    }
+
+    .dialogFooter {
+        width: 90%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        margin-top: 10px;
+    }
+
+    .dialogFooter button {
+        float: right;
+        margin-left: 10px;
+    }
+
+    .dialogContent {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+    }
+
+    .dialogContent .pull-left {
+        width: 30%;
+        float: left;
+    }
+
+    .dialogContent .pull-right {
+        width: 70%;
+        float: right;
+    }
+
+    .panel /deep/ .el-date-editor--daterange {
+        /*width: 260px;*/
+    }
+
+    /deep/ .el-col-4 {
+        width: 15% !important;
+    }
+
+    .panel /deep/ .el-input__inner {
+        /*width: 130px;*/
+    }
+
+    .panel /deep/ .el-input {
+        /*width: 130px;*/
+    }
+
+    .panel /deep/ .el-select {
+        width: 130px;
+    }
+
+    /deep/ .el-date-editor .el-range-separator {
+        line-height: 22px;
+    }
+
+    .lessons {
+        padding: 1px 7px;
+        border-radius: 250px;
+        float: left;
+        color: #000;
+    }
+
     .el-col-7 {
-        width: 29%;
+        width: 25%;
+    }
+
+    /*ipad only*/
+    @media only screen and (max-width: 1366px) {
+        .panel-body {
+        }
+
+        .panel .el-button {
+            margin-top: 5px;
+        }
+
+        .panel .el-col-4:nth-child(6) {
+            width: 9% !important;
+            float: right;
+            margin-top: 25px;
+        }
+
+        .el-col-7 {
+            width: 29%;
+        }
     }
-}
 
 </style>

+ 7 - 7
tv/README.md

@@ -76,17 +76,17 @@ http://192.168.0.162:9000/Hello
 21.无感知更新wgt文件 (刷新后重进,上传被限制文件大小 todo *上传路径未更换真实路径√ 
 
 
+26.PC图片上传限制容量取消 √ 
+27.PC课后详情CK有小数,卡路里取整数 √
+28.团课改色 √
+
+https://developer.qiniu.com/kodo/sdk/1283/javascript
+https://segmentfault.com/a/1190000021281307
+29.PC图片上传进行压缩 todo
 19.等待页面的数字使用图片替换 todo  
 23.彩蛋和新学生接口可以合并 todo  
 24.管理端预约查询,没有按照时间范围搜索  
 25.PC端兼容小pad
-26.PC图片上传限制容量取消
-
-https://developer.qiniu.com/kodo/sdk/1283/javascript
-
-https://segmentfault.com/a/1190000021281307
-
-27.PC课后详情CK有小数,卡路里取整数
 
 
 // 上课中学生信息

+ 1 - 1
tv/src/Global.js

@@ -7,7 +7,7 @@ companyInfo = {
 
 // headapi = process.env.NODE_ENV === 'development' ? '/api/' : '../';
 // headapi = 'http://192.168.0.110:8080/';//从郑伟那里获得数据源
-headapi = 'http://192.168.0.10:8080/';//从郑伟那里获得数据源
+headapi = 'http://192.168.0.74:8080/';//从郑伟那里获得数据源
 
 // 七牛云imgsrc
 imgUrl = "http://qjzpcd34v.hb-bkt.clouddn.com";

+ 1 - 1
tv/src/views/Main.vue

@@ -507,7 +507,7 @@
     }
 
     .yellow .centerLi {
-        background: #A6B700;
+        background: #B5C700;
     }
 
     .brown .centerLi {

+ 1 - 1
tv/src/views/pk.vue

@@ -1535,7 +1535,7 @@
     }
 
     .user .umd img.yellow {
-        border-color: #A6B700;
+        border-color: #B5C700;
     }
 
     .user .umd img.brown {

+ 1 - 1
tv/src/views/threepk.vue

@@ -1702,7 +1702,7 @@
     }
 
     .user .umd img.yellow {
-        border-color: #A6B700;
+        border-color: #B5C700;
     }
 
     .user .umd img.brown {