排名取消自动轮询

pc/src/api/Navs.js

@@ -141,6 +141,16 @@ let navs = [
         "show": 2,
         "grouplist": "2,5",
         "icon": "el-icon-s-shop",
+    }
+    , {
+        "clmid": "13",
+        "clmcode": "adminManage",
+        "clmname": "管理员管理",
+        "clmurl": "/adminManage",
+        "prname": "",
+        "show": 2,
+        "grouplist": "2,5",
+        "icon": "el-icon-user",
     },
     {
         "clmid": "11",
@@ -151,15 +161,6 @@ let navs = [
         "show": 2,
         "grouplist": "2,5",
         "icon": "el-icon-user-solid",
-    },{
-        "clmid": "13",
-        "clmcode": "adminManage",
-        "clmname": "管理员管理",
-        "clmurl": "/adminManage",
-        "prname": "",
-        "show": 2,
-        "grouplist": "2,5",
-        "icon": "el-icon-user",
     }, {
         "clmid": "14",
         "clmcode": "log",
@@ -169,7 +170,7 @@ let navs = [
         "show": 2,
         "grouplist": "2,5",
         "icon": "el-icon-s-claim",
-    },  {
+    }, {
         "clmid": "22",
         "clmcode": "setting",
         "clmname": "系统设置",

pc/src/views/Lesson.vue

@@ -153,7 +153,7 @@
                             <el-input-number v-model="form.TopLimit" :min="0" :max="99999"
                                              label="（天）"></el-input-number>
                         </el-form-item>
-                        <el-form-item label="微信可见">
+                        <el-form-item label="微信可见" v-if="form.btnType == 0">
                             <el-switch
                                     v-model="form.wxVisible"
                                     :active-value="1"
@@ -162,15 +162,15 @@
                                     inactive-color="#D9D9D9">
                             </el-switch>
                         </el-form-item>
-                        <!--<el-form-item label="是否可选课">-->
-                        <!--<el-switch-->
-                        <!--v-model="form.ShopId"-->
-                        <!--:active-value="form.ShopId"-->
-                        <!--:inactive-value="0"-->
-                        <!--active-color="#409EFF"-->
-                        <!--inactive-color="#D9D9D9">-->
-                        <!--</el-switch>-->
-                        <!--</el-form-item>-->
+                        <el-form-item label="是否可选课">
+                            <el-switch
+                                    v-model="form.ClassType"
+                                    :active-value="1"
+                                    :inactive-value="0"
+                                    active-color="#409EFF"
+                                    inactive-color="#D9D9D9">
+                            </el-switch>
+                        </el-form-item>
                         <el-form-item label="是否跨店">
                             <el-switch
                                     v-model="form.allUse"
@@ -296,8 +296,8 @@
                     ClassName: "",
                     ConsumeHour: 0,
                     TopLimit: 0,
+                    ClassType: 0,
                     wxVisible: 1,
-                    classType: 1,
                     ClassColor: "#ffffff",
                     teacherId: "",
                     classId: "",
@@ -412,7 +412,7 @@
                     className: that.form.ClassName,
                     consumeHour: that.form.ConsumeHour,
                     topLimit: that.form.TopLimit,
-                    classType: that.form.classType,
+                    classType: that.form.ClassType,
                     wxVisible: that.form.wxVisible,
                     classColor: that.form.ClassColor,
                     userlist: userlist,
@@ -465,7 +465,7 @@
                     className: that.form.ClassName,
                     consumeHour: that.form.ConsumeHour,
                     topLimit: that.form.TopLimit,
-                    classType: that.form.classType,
+                    classType: that.form.ClassType,
                     wxVisible: that.form.wxVisible,
                     classColor: that.form.ClassColor,
                     teacherId: teacherId,
@@ -657,7 +657,8 @@
                 this.form.ClassColor = row.ClassColor;
                 this.form.Memo = row.Memo;
                 this.form.dialogValue = row.teacherId;
-                this.form.classId = row.ClassId
+                this.form.classId = row.ClassId;
+                this.form.ClassType = row.ClassType;
                 this.form.ShopId = row.ShopId;
                 this.form.allUse = row.ShopId;
                 this.dialogLesson = true;

pc/src/views/Log.vue

@@ -113,6 +113,17 @@
             label="操作信息"
             sortable
         >
+            <template slot-scope="scope">
+                <el-popover
+                        placement="top"
+                        title="具体语句"
+                        trigger="hover"
+                        :content="scope.row.OptInfo">
+                            <span slot="reference"
+                                  v-if="scope.row.OptInfo.length > 30">{{ scope.row.OptInfo.substr(0, 30) }} ....</span>
+                </el-popover>
+                <span v-if="scope.row.OptInfo.length <= 30">{{ scope.row.OptInfo }}</span>
+            </template>
         </el-table-column>
         <el-table-column
             prop="Result"
@@ -170,7 +181,7 @@ export default {
         multipleSelection: [],
         detectedmac: '',
         time1: globalBt(),
-        timeScope: globalBt2(30),
+        timeScope: globalBt2(0),
       },
       multipleSelection: [],
       pageination: {

pc/src/views/Main.vue

@@ -146,25 +146,29 @@
                     <!--                    TodayVipOrder-->
                     <li v-for="as in appointList" @click="goAppointDetail(as.UserName)">
                         <div class="asTitle">
-                            <img :src="as.Head" alt="" v-if="as.Head" width="25px" height="25px">
-                            <img src="../assets/img/nav/head.png" alt="" v-else width="25px" height="25px">
                             <span>
-                                {{ as.UserName }}
-                                {{ as.Phone }}  &nbsp; &nbsp; &nbsp;
-                                <em>预约时间：  {{ as.Base.CreatedAt |parseDate }}</em>
+                                  <img :src="as.Head" alt="" v-if="as.Head" width="25px" height="25px">
+                            <img src="../assets/img/nav/head.png" alt="" v-else width="25px" height="25px">
+                                <div>
+                                       {{ as.UserName }} {{ as.Phone }}
+                                </div>
                           </span>
+                            <span>
+                                 <div>预约时间：</div>{{ as.Base.CreatedAt |parseDate }}
+                            </span>
                         </div>
                         <div class="asContent">
-                            <span>上课时间：<em>{{ as.CurrentDate.substr(5, 6) }} {{ as.BeginStr }}</em></span>
-                            <span>预约状态：
+                            <span><div>上课时间：</div><em>{{ as.CurrentDate.substr(5, 6) }} {{ as.BeginStr }}</em></span>
+                            <span><div>预约状态：</div>
                                 <em v-if="as.Status == 1" class="green">已预约</em>
                                 <em v-if="as.Status == 2" class="red">已取消</em>
                                 <em v-if="as.Status == 3" class="yellow">预约未到</em>
                                 <em v-if="as.Status == 4">已完成</em>
                             </span>
-                            <span>预约课程：<s class="blue"
-                                          :style="{ background:as.ClassColor }"> {{ as.ClassName }}</s></span>
-                            <span>剩余课时：<em :class="[{'red':as.RemainHour == 0}]">{{ as.RemainHour }}课时</em></span>
+                            <span><div>预约课程：</div><s class="blue"
+                                                     :style="{ background:as.ClassColor }"> {{ as.ClassName }}</s></span>
+                            <span v-if=" as.RemainHour != ''"><div>剩余课时：</div><em :class="[{'red':as.RemainHour == 0}]">{{ as.RemainHour }}课时</em></span>
+                            <span v-else><div>用户类型：</div><em>跨店用户</em></span>
                         </div>
                     </li>
                     <span class="tips middleTips" v-if="appointList == 0">
@@ -910,7 +914,6 @@
     }
 
     .asTitle {
-        width: 100%;
         height: 30px;
         overflow: hidden;
         display: block;
@@ -919,7 +922,10 @@
         line-height: 20px;
         color: #000000;
         font-size: 14px;
+    }
 
+    .asTitle span div {
+        margin-left: 8px;
     }
 
     .asTitle img {
@@ -928,18 +934,21 @@
     }
 
     .asTitle span {
-        /*width: 26px;*/
-        min-width: 300px;
+        width: 50%;
         height: 30px;
         line-height: 26px;
         float: left;
-        margin-right: 10px;
+        margin-right: 0px;
     }
 
     .asTitle em {
-        float: right;
+        width: 50%;
+        float: left;
         text-align: right;
     }
+    .asTitle span div {
+        float: left;
+    }
 
     .asContent {
         width: 100%;
@@ -961,6 +970,7 @@
     .asContent span em {
         color: #000;
         text-align: left;
+        float: left;
     }
 
     .asContent span s {
@@ -971,6 +981,10 @@
         text-align: center;
     }
 
+    .asContent span div {
+        float: left;
+    }
+
     .asContent span s.blue {
         background-color: #E5F2FF;
     }
@@ -1034,6 +1048,18 @@
             width: 80%;
         }
 
+        .asTitle {
+            height: 60px;
+        }
+
+        .asTitle img {
+            display: none;
+        }
+
+        .asTitle span {
+            width: 100%;
+        }
+
         .lt .top {
             width: 96%;
         }
@@ -1132,12 +1158,11 @@
         }
 
         .asTitle {
-            width: 30px;
             float: left;
         }
 
         .asContent {
-            width: 82%;
+            width: 100%;
         }
 
         .asContent span {

pc/src/views/Member.vue

@@ -757,6 +757,7 @@
                 let that = this;
                 this.allDialogClose();
                 // 重载课程列表选项
+                this.form.dialogValue = [];
                 this.panelSelect();
                 if (this.tableRadio.length == 0) {
                     that.$message.error("请先选中一条记录");

pc/src/views/ShopManage.vue

@@ -1,563 +1,571 @@
 <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.shopName" placeholder="请输入店面名称"></el-input>
-            </el-col>
-            <el-col :span="4">
-              <em>负责人:</em>
-              <el-input v-model="panel.contacts" 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="4">
-              <el-button size="" type="primary" @click="query" plain :disabled="serachBtnStatus">查询</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.shopName" placeholder="请输入店面名称"></el-input>
+                        </el-col>
+                        <el-col :span="4">
+                            <em>负责人:</em>
+                            <el-input v-model="panel.contacts" 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="4">
+                            <el-button size="" type="primary" @click="query" plain :disabled="serachBtnStatus">查询
+                            </el-button>
+                        </el-col>
+                    </el-row>
+                </div>
+            </div>
         </div>
-      </div>
-    </div>
-    <div class="change">
-      <el-button @click="addAdmin" type="primary">新增店面</el-button>
-      <el-button @click="editList">编辑店面</el-button>
-      <el-button @click="delList" type="danger">删除店面</el-button>
-    </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" @current-change="clickChange"
-      >
+        <div class="change">
+            <el-button @click="addAdmin" type="primary">新增店面</el-button>
+            <el-button @click="editList">编辑店面</el-button>
+            <el-button @click="delList" type="danger">删除店面</el-button>
+        </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" @current-change="clickChange"
+            >
 
-        >
-        <el-table-column label="选择" width="55">
-          <template slot-scope="scope">
-            <el-radio v-model="tableRadio" :label="scope.row"><i></i></el-radio>
-          </template>
-        </el-table-column>
-        <el-table-column
-            type="index"
-            label="序号"
-            align="center"
+                >
+                <el-table-column label="选择" width="55">
+                    <template slot-scope="scope">
+                        <el-radio v-model="tableRadio" :label="scope.row"><i></i></el-radio>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        type="index"
+                        label="序号"
+                        align="center"
 
-            width="50">
-        </el-table-column>
-        <el-table-column
-            prop="ShopName"
-            label="店面名称"
-            sortable
-        >
-        </el-table-column>
-        <el-table-column
-            prop="Addr"
-            label="位置"
-            sortable
-        >
-        </el-table-column>
-        <el-table-column
-            prop="Contacts"
-            label="负责人"
-            sortable
-        >
-        </el-table-column>
-        <el-table-column
-            prop="Phone"
-            label="联系电话"
-        >
-        </el-table-column>
-      </el-table>
-      <br>
-      <el-pagination
-          background
-          :total="pageination.total"
-          :page-size="pageination.pageItem"
-          @current-change="pageChange"
-      ></el-pagination>
-    </div>
+                        width="50">
+                </el-table-column>
+                <el-table-column
+                        prop="ShopName"
+                        label="店面名称"
+                        sortable
+                >
+                </el-table-column>
+                <el-table-column
+                        prop="Addr"
+                        label="位置"
+                        sortable
+                >
+                </el-table-column>
+                <el-table-column
+                        prop="Contacts"
+                        label="负责人"
+                        sortable
+                >
+                </el-table-column>
+                <el-table-column
+                        prop="Phone"
+                        label="联系电话"
+                >
+                </el-table-column>
+            </el-table>
+            <br>
+            <el-pagination
+                    background
+                    :total="pageination.total"
+                    :page-size="pageination.pageItem"
+                    @current-change="pageChange"
+            ></el-pagination>
+        </div>
 
-    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="650px">
-      <div>
-        <el-form ref="form" :model="form" label-width="80px">
-          <el-form-item label="店面名称">
-            <el-input v-model="form.shopName"></el-input>
-          </el-form-item>
-          <el-form-item label="位置">
-            <el-input v-model="form.addr"></el-input>
-          </el-form-item>
-          <el-form-item label="负责人">
-            <el-input v-model="form.contacts"></el-input>
-          </el-form-item>
-          <el-form-item label="联系电话">
-            <el-input v-model="form.phone"></el-input>
-          </el-form-item>
-        </el-form>
-      </div>
-      <div class="dialogFooter">
-        <el-button type="primary" size="small" @click="confirmAdmin" v-if="form.btnState == 0">确定</el-button>
-        <el-button type="primary" size="small" @click="confirmEdite" v-if="form.btnState == 1">确定</el-button>
-        <el-button @click="dialogVisible = false" size="small">取消</el-button>
-      </div>
-    </el-dialog>
-  </div>
+        <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="650px">
+            <div>
+                <el-form ref="form" :model="form" label-width="80px">
+                    <el-form-item label="店面名称">
+                        <el-input v-model="form.shopName"></el-input>
+                    </el-form-item>
+                    <el-form-item label="位置">
+                        <el-input v-model="form.addr"></el-input>
+                    </el-form-item>
+                    <el-form-item label="负责人">
+                        <el-input v-model="form.contacts"></el-input>
+                    </el-form-item>
+                    <el-form-item label="联系电话">
+                        <el-input v-model="form.phone"></el-input>
+                    </el-form-item>
+                </el-form>
+            </div>
+            <div class="dialogFooter">
+                <el-button type="primary" size="small" @click="confirmAdmin" v-if="form.btnState == 0">确定</el-button>
+                <el-button type="primary" size="small" @click="confirmEdite" v-if="form.btnState == 1">确定</el-button>
+                <el-button @click="dialogVisible = false" size="small">取消</el-button>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-import Global from '../Global.js'
-import {
-  ShopAdd,
-  ShopDetailQuery,
-  ShopEdit,
-  ShopListQuery,
-  ShopStatusEdit,
-  testTable,
-  testSelect
-} from "../api/getApiRes";
+    import Global from '../Global.js'
+    import {
+        ShopAdd,
+        ShopDetailQuery,
+        ShopEdit,
+        ShopListQuery,
+        ShopStatusEdit,
+        testTable,
+        testSelect
+    } from "../api/getApiRes";
 
-let qs = require('qs');
-export default {
-  data() {
-    return {
-      dialogVisible: false,
-      dialogTitle: '新增店面',
-      // panel 配置项目
-      panel: {
-        shopName: '',
-        contacts: '',
-        phone: '',
-        userCode: '',
-        tel: '',
-        shopList: 0,
-        options: [],
-        draw: 1,
-        start: 0,
-        recordsTotal: 0,
-        tableData: [],
-        allTableData: [],
-        limit: '10',
-        multipleSort: false,
-        loading: false,
-        fileList: [],
-        multipleSelection: [],
-        detectedmac: '',
-        time1: globalBt(),
-      },
-      multipleSelection: [],
-      pageination: {
-        pageItem: 100,
-        pageoptions: pageOptions(),
-        total: 100,
-        pageIndex: 1,
-      },
-      form: {
-        shopName: '',
-        addr: '',
-        name: '',
-        contacts: '',
-        phone: '',
-        userCode: '',
-        shopId: '',
-        btnState: 0,
-      },
-      shops: [],
-      tableData: [],
-      tableRadio: [],
-      serachBtnStatus: false,
-    }
-  },
-  mounted() {
-    this.getTableQuery();
-  },
-  methods: {
-    clickChange(item) {
-      this.tableRadio = item
-    },
-    // 新增 确认提交
-    confirmAdmin() {
-      let that = this;
-      // checkNum
-      if (!that.form.shopName) {
-        this.$message.error('错了哦，店面名称不能为空');
-        return false
-      }
-      if (that.form.shopName.length > 18) {
-        this.$message.error('错了哦，姓名字数超过18个字');
-        return false
-      }
-      if (!that.form.addr) {
-        this.$message.error('错了哦，位置不能为空');
-        return false
-      }
-      if (that.form.addr.length > 38) {
-        this.$message.error('错了哦，位置字数超过38个字');
-        return false
-      }
-      if (!that.form.contacts) {
-        this.$message.error('错了哦，负责人不能为空');
-        return false
-      }
-      if (that.form.contacts.length > 8) {
-        this.$message.error('错了哦，负责人字数超过8个字');
-        return false
-      }
-      if (!that.form.phone) {
-        this.$message.error('错了哦，联系电话不能为空');
-        return false
-      }
-      // if (!globalCheckPhone(that.form.phone)) {
-      //   this.$message.error('错了哦，联系电话格式不正确');
-      //   return false
-      // }
-      let param = {
-        token: localStorage.token,
-        shopName: that.form.shopName,
-        addr: that.form.addr,
-        contacts: that.form.contacts,
-        phone: that.form.phone,
-        shopid: that.form.shopid,
-      };
-      let postdata = qs.stringify(param);
-      ShopAdd(postdata).then(res => {
-        let json = res;
-        if (json.Code == 0) {
-          // 关闭弹窗
-          that.dialogVisible = false;
-          // 重载列表
-          that.getTableQuery();
-          that.$message({
-            showClose: true,
-            message: '店面添加成功！',
-            type: 'success'
-          });
-        } else {
-          that.$message.error(json.Memo + '错误码：' + json.Code);
-        }
-      })
-    },
-    // 修改
-    confirmEdite() {
-      let that = this;
-      // checkNum
-      if (!that.form.shopName) {
-        this.$message.error('错了哦，店面名称不能为空');
-        return false
-      }
-      if (that.form.shopName.length > 18) {
-        this.$message.error('错了哦，姓名字数超过18个字');
-        return false
-      }
-      if (!that.form.addr) {
-        this.$message.error('错了哦，位置不能为空');
-        return false
-      }
-      if (that.form.addr.length > 38) {
-        this.$message.error('错了哦，位置字数超过38个字');
-        return false
-      }
-      if (!that.form.contacts) {
-        this.$message.error('错了哦，负责人不能为空');
-        return false
-      }
-      if (that.form.contacts.length > 8) {
-        this.$message.error('错了哦，负责人字数超过8个字');
-        return false
-      }
-      if (!that.form.phone) {
-        this.$message.error('错了哦，联系电话不能为空');
-        return false
-      }
-      // if (!globalCheckPhone(that.form.phone)) {
-      //   this.$message.error('错了哦，联系电话格式不正确');
-      //   return false
-      // }
-      let param = {
-        token: localStorage.token,
-        shopName: that.form.shopName,
-        addr: that.form.addr,
-        contacts: that.form.contacts,
-        phone: that.form.phone,
-        shopId: that.form.shopId,
-      };
-      let postdata = qs.stringify(param);
-      ShopEdit(postdata).then(res => {
-        let json = res;
-        if (json.Code == 0) {
-          // 关闭弹窗
-          that.dialogVisible = false;
+    let qs = require('qs');
+    export default {
+        data() {
+            return {
+                dialogVisible: false,
+                dialogTitle: '新增店面',
+                // panel 配置项目
+                panel: {
+                    shopName: '',
+                    contacts: '',
+                    phone: '',
+                    userCode: '',
+                    tel: '',
+                    shopList: 0,
+                    options: [],
+                    draw: 1,
+                    start: 0,
+                    recordsTotal: 0,
+                    tableData: [],
+                    allTableData: [],
+                    limit: '10',
+                    multipleSort: false,
+                    loading: false,
+                    fileList: [],
+                    multipleSelection: [],
+                    detectedmac: '',
+                    time1: globalBt(),
+                },
+                multipleSelection: [],
+                pageination: {
+                    pageItem: 100,
+                    pageoptions: pageOptions(),
+                    total: 100,
+                    pageIndex: 1,
+                },
+                form: {
+                    shopName: '',
+                    addr: '',
+                    name: '',
+                    contacts: '',
+                    phone: '',
+                    userCode: '',
+                    shopId: '',
+                    btnState: 0,
+                },
+                shops: [],
+                tableData: [],
+                tableRadio: [],
+                serachBtnStatus: false,
+            }
+        },
+        mounted() {
+            this.getTableQuery();
+        },
+        watch: {
+            $route(to) {
+                if (to.name == 'shopManage') {
+                    this.getTableQuery();
+                }
+            },
+        },
+        methods: {
+            clickChange(item) {
+                this.tableRadio = item
+            },
+            // 新增 确认提交
+            confirmAdmin() {
+                let that = this;
+                // checkNum
+                if (!that.form.shopName) {
+                    this.$message.error('错了哦，店面名称不能为空');
+                    return false
+                }
+                if (that.form.shopName.length > 18) {
+                    this.$message.error('错了哦，姓名字数超过18个字');
+                    return false
+                }
+                if (!that.form.addr) {
+                    this.$message.error('错了哦，位置不能为空');
+                    return false
+                }
+                if (that.form.addr.length > 38) {
+                    this.$message.error('错了哦，位置字数超过38个字');
+                    return false
+                }
+                if (!that.form.contacts) {
+                    this.$message.error('错了哦，负责人不能为空');
+                    return false
+                }
+                if (that.form.contacts.length > 8) {
+                    this.$message.error('错了哦，负责人字数超过8个字');
+                    return false
+                }
+                if (!that.form.phone) {
+                    this.$message.error('错了哦，联系电话不能为空');
+                    return false
+                }
+                // if (!globalCheckPhone(that.form.phone)) {
+                //   this.$message.error('错了哦，联系电话格式不正确');
+                //   return false
+                // }
+                let param = {
+                    token: localStorage.token,
+                    shopName: that.form.shopName,
+                    addr: that.form.addr,
+                    contacts: that.form.contacts,
+                    phone: that.form.phone,
+                    shopid: that.form.shopid,
+                };
+                let postdata = qs.stringify(param);
+                ShopAdd(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        // 关闭弹窗
+                        that.dialogVisible = false;
+                        // 重载列表
+                        that.getTableQuery();
+                        that.$message({
+                            showClose: true,
+                            message: '店面添加成功！',
+                            type: 'success'
+                        });
+                    } else {
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
+                    }
+                })
+            },
+            // 修改
+            confirmEdite() {
+                let that = this;
+                // checkNum
+                if (!that.form.shopName) {
+                    this.$message.error('错了哦，店面名称不能为空');
+                    return false
+                }
+                if (that.form.shopName.length > 18) {
+                    this.$message.error('错了哦，姓名字数超过18个字');
+                    return false
+                }
+                if (!that.form.addr) {
+                    this.$message.error('错了哦，位置不能为空');
+                    return false
+                }
+                if (that.form.addr.length > 38) {
+                    this.$message.error('错了哦，位置字数超过38个字');
+                    return false
+                }
+                if (!that.form.contacts) {
+                    this.$message.error('错了哦，负责人不能为空');
+                    return false
+                }
+                if (that.form.contacts.length > 8) {
+                    this.$message.error('错了哦，负责人字数超过8个字');
+                    return false
+                }
+                if (!that.form.phone) {
+                    this.$message.error('错了哦，联系电话不能为空');
+                    return false
+                }
+                // if (!globalCheckPhone(that.form.phone)) {
+                //   this.$message.error('错了哦，联系电话格式不正确');
+                //   return false
+                // }
+                let param = {
+                    token: localStorage.token,
+                    shopName: that.form.shopName,
+                    addr: that.form.addr,
+                    contacts: that.form.contacts,
+                    phone: that.form.phone,
+                    shopId: that.form.shopId,
+                };
+                let postdata = qs.stringify(param);
+                ShopEdit(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        // 关闭弹窗
+                        that.dialogVisible = false;
 
-          // 重载列表
-          that.getTableQuery();
-          that.$message({
-            showClose: true,
-            message: '店面编辑成功！',
-            type: 'success'
-          });
-        } else {
-          that.$message.error(json.Memo + '错误码：' + json.Code);
-        }
-      })
-    },
-    // 删除
-    delList() {
-      let that = this;
-      if (this.tableRadio.length == 0) {
-        this.$message.error("请先选中一条记录");
-        return false
-      }
-      let ShopID = this.tableRadio.ShopID;
+                        // 重载列表
+                        that.getTableQuery();
+                        that.$message({
+                            showClose: true,
+                            message: '店面编辑成功！',
+                            type: 'success'
+                        });
+                    } else {
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
+                    }
+                })
+            },
+            // 删除
+            delList() {
+                let that = this;
+                if (this.tableRadio.length == 0) {
+                    this.$message.error("请先选中一条记录");
+                    return false
+                }
+                let ShopID = this.tableRadio.ShopID;
 
-      let param = {
-        token: localStorage.token,
-        shopId: ShopID,
-        status: 9,//0禁用1启用9删除
-      };
-      let postdata = qs.stringify(param);
+                let param = {
+                    token: localStorage.token,
+                    shopId: ShopID,
+                    status: 9,//0禁用1启用9删除
+                };
+                let postdata = qs.stringify(param);
 
-      this.$confirm('此操作将永久删除该店面, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        ShopStatusEdit(postdata).then(res => {
-          let json = res;
-          if (json.Code == 0) {
-            that.$message({
-              showClose: true,
-              message: '选中的店面已删除！',
-              type: 'success'
-            });
-            // 重载列表
-            that.getTableQuery();
-          } else {
-            that.$message.error(json.Memo + '错误码：' + json.Code);
-          }
-        });
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        });
-      });
-    },
-    clearForm() {
-      // clear
-      this.form.shopName = '';
-      this.form.addr = '';
-      this.form.name = '';
-      this.form.userCode = '';
-      this.form.shopId = '';
-      this.form.phone = '';
-      this.form.contacts = '';
-    },
-    // 新增店面
-    addAdmin() {
-      this.clearForm();
-      this.dialogVisible = true
-      this.dialogTitle = '新增店面'
-      this.form.btnState = 0; //新增
-    },
-    // 编辑店面
-    editList() {
-      let that = this;
-      // checkNum
-      this.clearForm();
-      this.form.btnState = 1; //编辑
-      if (this.tableRadio.length == 0) {
-        this.$message.error("请先选中一条记录");
-        return false
-      }
-      let row = this.tableRadio;
-      this.form.shopId = row.ShopID;
-      this.form.shopName = row.ShopName;
-      this.form.addr = row.Addr;
-      this.form.contacts = row.Contacts;
-      this.form.phone = row.Phone;
+                this.$confirm('此操作将永久删除该店面, 是否继续?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    ShopStatusEdit(postdata).then(res => {
+                        let json = res;
+                        if (json.Code == 0) {
+                            that.$message({
+                                showClose: true,
+                                message: '选中的店面已删除！',
+                                type: 'success'
+                            });
+                            // 重载列表
+                            that.getTableQuery();
+                        } else {
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
+                        }
+                    });
+                }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消删除'
+                    });
+                });
+            },
+            clearForm() {
+                // clear
+                this.form.shopName = '';
+                this.form.addr = '';
+                this.form.name = '';
+                this.form.userCode = '';
+                this.form.shopId = '';
+                this.form.phone = '';
+                this.form.contacts = '';
+            },
+            // 新增店面
+            addAdmin() {
+                this.clearForm();
+                this.dialogVisible = true;
+                this.dialogTitle = '新增店面';
+                this.form.btnState = 0; //新增
+            },
+            // 编辑店面
+            editList() {
+                let that = this;
+                // checkNum
+                this.clearForm();
+                this.form.btnState = 1; //编辑
+                if (this.tableRadio.length == 0) {
+                    this.$message.error("请先选中一条记录");
+                    return false
+                }
+                let row = this.tableRadio;
+                this.form.shopId = row.ShopID;
+                this.form.shopName = row.ShopName;
+                this.form.addr = row.Addr;
+                this.form.contacts = row.Contacts;
+                this.form.phone = row.Phone;
 
-      this.dialogVisible = true;
-      this.dialogTitle = '编辑店面'
-    },
-    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.dialogVisible = true;
+                this.dialogTitle = '编辑店面'
+            },
+            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('查询完毕');
-    },
-    // 页面数据查询
-    getTableQuery() {
-      let that = this;
-      that.loading = true;
-      // 查询检测设备。上级区域id，区域id必传。regionid传0，查询supregionid对应所有子区域的检测设备。 如果supregionid，regionid都传0，默认查询企业ID下所有检测设备
-      let param = {
-        token: localStorage.token,
-        shopName: this.panel.shopName,//
-        contacts: this.panel.contacts,//
-        phone: this.panel.phone,//
-      };
-      let postdata = qs.stringify(param);
-      ShopListQuery(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);
-    },
-  },
-}
+                this.getTableQuery();
+                this.$message.success('查询完毕');
+            },
+            // 页面数据查询
+            getTableQuery() {
+                let that = this;
+                that.loading = true;
+                // 查询检测设备。上级区域id，区域id必传。regionid传0，查询supregionid对应所有子区域的检测设备。 如果supregionid，regionid都传0，默认查询企业ID下所有检测设备
+                let param = {
+                    token: localStorage.token,
+                    shopName: this.panel.shopName,//
+                    contacts: this.panel.contacts,//
+                    phone: this.panel.phone,//
+                };
+                let postdata = qs.stringify(param);
+                ShopListQuery(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);
+            },
+        },
+    }
 </script>
 
 <style scoped>
-@import "../assets/css/panel.css";
+    @import "../assets/css/panel.css";
 
-.context {
-  height: 770px;
-  overflow-y: scroll;
+    .context {
+        height: 770px;
+        overflow-y: scroll;
 
-  display: block;
-  margin: 0 auto;
-  background-color: #fff !important;
-  padding: 30px;
-  padding-bottom: 60px;
-}
+        display: block;
+        margin: 0 auto;
+        background-color: #fff !important;
+        padding: 30px;
+        padding-bottom: 60px;
+    }
 
-.panel-body {
-  padding: 20px;
-  background: #F0F2F5;
-}
+    .panel-body {
+        padding: 20px;
+        background: #F0F2F5;
+    }
 
-.change {
-  width: 100%;
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-  padding-top: 10px;
-  padding-bottom: 10px;
-}
+    .change {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        padding-top: 10px;
+        padding-bottom: 10px;
+    }
 
-.change button {
-  float: left;
-}
+    .change button {
+        float: left;
+    }
 
-.change button.pull-right {
-  float: right;
-}
+    .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 {
+        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;
-}
+    .dialogTitle em {
+        float: none;
+        font-style: normal;
+        color: #3799FF;
+        margin: 0;
+    }
 
-/deep/ .el-transfer-panel__item .el-checkbox__input {
-  left: 40px;
-}
+    /deep/ .el-transfer-panel__item .el-checkbox__input {
+        left: 40px;
+    }
 
-.dialogFooter {
-  width: 90%;
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-  margin-top: 10px;
-}
+    .dialogFooter {
+        width: 90%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        margin-top: 10px;
+    }
 
-.dialogFooter button {
-  float: right;
-  margin-left: 10px;
-}
+    .dialogFooter button {
+        float: right;
+        margin-left: 10px;
+    }
 </style>

pc/src/views/cost.vue

@@ -122,6 +122,17 @@
             sortable
         >
         </el-table-column>
+          <!--<el-table-column-->
+                  <!--prop="RemainHour"-->
+                  <!--label="是否跨店"-->
+                  <!--width="110"-->
+                  <!--sortable-->
+          <!--&gt;-->
+              <!--<template slot-scope="scope">-->
+                  <!--<span v-if="scope.row.Status == ''" style="color:red;">跨店</span>-->
+                  <!--<span v-else style="color: #000">本店用户</span>-->
+              <!--</template>-->
+          <!--</el-table-column>-->
         <el-table-column
             prop="CreatedAt"
             label="时间"

pc/src/views/courses.vue

@@ -443,6 +443,10 @@
                     key: localStorage.ServiceKey,
                     shopId: localStorage.ServiceId,
                 };
+                if(!localStorage.ServiceKey){
+                    that.$message.error('还未与心率系统对接，请联系管理员');
+                    return false
+                }
                 let postdata = qs.stringify(param);
                 QueryShopVenue(postdata).then(res => {
                     let json = res;

pc/src/views/coursesHistory.vue

@@ -439,6 +439,10 @@
                     key: localStorage.ServiceKey,
                     shopId: localStorage.ServiceId,
                 };
+                if(!localStorage.ServiceKey){
+                    that.$message.error('还未与心率系统对接，请联系管理员');
+                    return false
+                }
                 let postdata = qs.stringify(param);
                 QueryShopVenue(postdata).then(res => {
                     let json = res;

pc/src/views/record.vue

@@ -117,6 +117,17 @@
             {{ 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.Status == ''" style="color:red;">跨店</span>
+                  <span v-else style="color: #000">本店用户</span>
+              </template>
+          </el-table-column>
         <el-table-column
             prop="Status"
             label="状态"

tv/README.md

@@ -25,6 +25,13 @@
 4） 打开APP后，点击小飞龙logo获取uuid，在管理端添加当前区域
 5） 重启APP（非必须
 
+小飞龙wgt升级步骤
+
+1.将编译好的文件拖入hbuild的打包文件夹下，生成wgt文件
+2.将WGT文件放到线上文件夹中，同时修改数据库里当前的版本号
+3.重新打开TV版APP，确认升级。
+4.重启APP升级完成
+
 
 
 

tv/src/Global.js

@@ -390,7 +390,7 @@ numberToWeekdays = function (val) {
 
 // 随机背景
 RandomBg = function () {
-    let bgClassNum = parseInt(Math.random() * 3) + 1;
+    let bgClassNum = parseInt(Math.random() * 7) + 1;
     return 'bgStyle' + bgClassNum + '  pages';
 };
 

tv/src/components/levelIcon.vue

@@ -51,7 +51,6 @@
 
 <script>
     export default {
-        name: "legend"
     }
 </script>
 

tv/src/views/2pkRank.vue

@@ -115,9 +115,9 @@
             let that = this;
             if (this.trueDate) {
                 this.getClassUserRank();
-                this.rankTimer = setInterval(() => {
-                    this.getClassUserRank();
-                }, 5000);
+                // this.rankTimer = setInterval(() => {
+                //     this.getClassUserRank();
+                // }, 5000);
                 if (this.autoJump) {
                     // 倒计时60秒自动关闭
                     let that = this;
@@ -145,9 +145,9 @@
                 if (val.path == '/2pkRank') {
                     if (this.trueDate) {
                         this.getClassUserRank();
-                        this.rankTimer = setInterval(() => {
-                            this.getClassUserRank();
-                        }, 5000);
+                        // this.rankTimer = setInterval(() => {
+                        //     this.getClassUserRank();
+                        // }, 5000);
 
                         if (this.autoJump) {
                             // 倒计时60秒自动关闭
@@ -165,10 +165,8 @@
                         }
 
                     } else {
-                        this.rankTimer = setInterval(() => {
-                            this.students.redUnite = fakeNews(6,2);
-                            this.students.blueUnite = fakeNews(6,2);
-                        }, 5000);
+                        let Rs = fakeNews(18,2);
+                        this.UniteBreak(Rs);
                     }
 
                 } else {

tv/src/views/3pkRank.vue

@@ -178,9 +178,9 @@
             let that = this;
             if (this.trueDate) {
                 this.getClassUserRank();
-                this.rankTimer = setInterval(() => {
-                    this.getClassUserRank();
-                }, 5000);
+                // this.rankTimer = setInterval(() => {
+                //     this.getClassUserRank();
+                // }, 5000);
                 if (this.autoJump) {
                     // 倒计时60秒自动关闭
                     let that = this;
@@ -197,10 +197,8 @@
                     }, 1000)
                 }
             } else {
-                this.rankTimer = setInterval(() => {
-                    let Rs = fakeNews(18,3);
-                    that.UniteBreak(Rs);
-                }, 1000);
+                let Rs = fakeNews(18,3);
+                that.UniteBreak(Rs);
             }
 
         },
@@ -209,9 +207,9 @@
                 if (val.path == '/3pkRank') {
                     if (this.trueDate) {
                         this.getClassUserRank();
-                        this.rankTimer = setInterval(() => {
-                            this.getClassUserRank();
-                        }, 5000);
+                        // this.rankTimer = setInterval(() => {
+                        //     this.getClassUserRank();
+                        // }, 5000);
 
                         if (this.autoJump) {
                             // 倒计时60秒自动关闭
@@ -230,10 +228,8 @@
                         }
 
                     } else {
-                        this.rankTimer = setInterval(() => {
-                            let Rs = fakeNews(18,3);
-                            that.UniteBreak(Rs);
-                        }, 1000);
+                        let Rs = fakeNews(18,3);
+                        that.UniteBreak(Rs);
                     }
 
                 } else {

tv/src/views/Index.vue

@@ -73,7 +73,9 @@
                             // });
                             // 8e501b0bde9ce600
                             // 打印uuid
-                            // alert('getDeviceInfo success: ' + JSON.stringify(e.uuid))
+                            alert('getDeviceInfo success: ' + JSON.stringify(e.uuid));
+                            alert('clientWidth:' + document.documentElement.clientWidth);
+                            alert('devicePixelRatio:' + window.devicePixelRatio);
                             console.log('getDeviceInfo success: ' + JSON.stringify(e.uuid));
                         },
                         fail: function (e) {

tv/src/views/Rank.vue

@@ -81,15 +81,15 @@
         mounted() {
             if (this.trueDate) {
                 this.getClassUserRank();
-                this.rankTimer  = setInterval(() => {
-                    this.getClassUserRank();
-                }, 5000);
+                // this.rankTimer  = setInterval(() => {
+                //     this.getClassUserRank();
+                // }, 5000);
 
             } else {
-                this.rankTimer  = setInterval(() => {
+                // this.rankTimer  = setInterval(() => {
                     this.students.CkSort = this.fakeNews();
                     this.students.CalSort = this.fakeNews();
-                }, 5000);
+                // }, 5000);
             }
             if (this.autoJump) {
                 // 倒计时60秒自动关闭
@@ -111,15 +111,15 @@
                 if (val.path == '/rank') {
                     if (this.trueDate) {
                         this.getClassUserRank();
-                        this.rankTimer  = setInterval(() => {
-                            this.getClassUserRank();
-                        }, 5000);
+                        // this.rankTimer  = setInterval(() => {
+                        //     this.getClassUserRank();
+                        // }, 5000);
 
                     } else {
-                        this.rankTimer  = setInterval(() => {
+                        // this.rankTimer  = setInterval(() => {
                             this.students.CkSort = this.fakeNews();
                             this.students.CalSort = this.fakeNews();
-                        }, 5000);
+                        // }, 5000);
                     }
                     if (this.autoJump) {
                         // 倒计时60秒自动关闭
@@ -196,7 +196,7 @@
                         this.students.CkSort = [];
                         this.students.CalSort = [];
                         if (json.Code == '999') {
-                            that.$router.push({path: '/'});
+                            // that.$router.push({path: '/'});
                         } else {
                             // 已出错
                             that.$message.error(json.Memo);

tv/src/views/pk.vue

@@ -365,7 +365,7 @@
                         // 已下课
                         console.log(json.Code);
                         if (json.Code == '999') {
-                            that.$router.push({path: '/2pkRank'});
+                            // that.$router.push({path: '/2pkRank'});
                         } else {
                             // 已出错
                             that.$message.error(json.Memo);

tv/src/views/threepk.vue

@@ -438,7 +438,7 @@
                         // 已下课
                         console.log(json.Code);
                         if (json.Code == '999') {
-                            that.$router.push({path: '/3pkRank'});
+                            // that.$router.push({path: '/3pkRank'});
                         } else {
                             // 已出错
                             that.$message.error(json.Memo);