Merge branch 'master' of git.beswell.com:duanchangpeng/flyLong

app/src/page/mainpage.vue

@@ -1,341 +1,341 @@
 <template>
-  <div id="mainPage">
-    <img src="../static/images/main/banner.png" height="121" width="414"/>
-    <span class="shopNum">
+    <div id="mainPage">
+        <img src="../static/images/main/banner.png" height="121" width="414"/>
+        <span class="shopNum">
             俱乐部场馆共 {{ list.length }} 处
         </span>
-    <ul class="list">
-      <li v-for="l in list" @click="goAppoint(l)" v-if="l.Status == 1 ">
-        <img src="../static/images/main/shop.jpg" width="130px" v-if="l.ShopID == 4"/>
-        <img src="../static/images/main/shop2.jpg" width="130px" v-else/>
-        <div class="rt">
-          <h5>{{ l.ShopName }}</h5>
-          <span>今日预约名额剩余
+        <ul class="list">
+            <li v-for="l in list" @click="goAppoint(l)" v-if="l.Status == 1 ">
+                <img src="../static/images/main/shop.jpg" width="130px" v-if="l.ShopID == 4"/>
+                <img src="../static/images/main/shop2.jpg" width="130px" v-else/>
+                <div class="rt">
+                    <h5>{{ l.ShopName }}</h5>
+                    <span>今日预约名额剩余
                         <i v-if="l.RemainOrdernum > 0">{{ l.RemainOrdernum }}</i>
                         <i v-if="l.RemainOrdernum == 0" class="red">{{ l.RemainOrdernum }}</i>
                         人</span>
-          <span>地址：{{ l.Addr }}</span>
-          <em class="green" v-if="l.WxStatus == 1 && l.IsJoin ==1">点击预约</em>
-          <em class="red" v-else>不可预约</em>
-        </div>
-      </li>
-      <div class="tips" v-if="list == ''">
-        <p style="text-align: center">
-          暂无可预约的门店
-        </p>
-      </div>
-    </ul>
-    <bottomTab :curTab="thisTab"></bottomTab>
-    <alert ref="alertPart"></alert>
-  </div>
+                    <span>地址：{{ l.Addr }}</span>
+                    <em class="green" v-if="l.WxStatus == 1 && l.IsJoin ==1">点击预约</em>
+                    <em class="red" v-else>不可预约</em>
+                </div>
+            </li>
+            <div class="tips" v-if="list == ''">
+                <p style="text-align: center">
+                    暂无可预约的门店
+                </p>
+            </div>
+        </ul>
+        <bottomTab :curTab="thisTab"></bottomTab>
+        <alert ref="alertPart"></alert>
+    </div>
 </template>
 
 <script>
-import {
-  ManagerSelfQuery,
-  OrderShopQuery,
-} from '../api/getApiRes.js'
-
-import bottomTab from '../components/bottomTab'
-import alert from '../components/alert'
-import axios from 'axios';
-
-let qs = require('qs');
-import Global from '../Global.js'
-
-export default {
-  data() {
-    return {
-      thisTab: '预约课程',
-      shopNum: 0,
-      recordNum: 0,
-      Dannum: 0,
-      GetHotelCounts: 0,
-      GetDetectorNum: 0,
-      currShopId: 0,
-      list: [],
-    }
-  },
-  mounted() {
-    this.getManagerSelfQuery();
-  },
-  destroyed() {
-  },
-  methods: {
-    alertInfo(info){
-      this.$refs.alertPart.openSimpleDialog(info);
-    },
-    getManagerSelfQuery() {
-      let that = this;
-      let param = {
-        token: localStorage.token,
-      };
-      let postdata = qs.stringify(param);
-      ManagerSelfQuery(postdata).then(res => {
-        let json = res;
-        if (json.Code == 0) {
-          this.currShopId = json.Rs.ShopId;
-          this.getList();
-        } else {
-          that.alertInfo(json.Memo);
-          if (json.Code == 1010) {
-            localStorage.clear();
-            console.log(1010);
-            that.$router.push({path: '/login'});
-          }
-        }
-      })
-    },
-    getList() {
-      let that = this;
-      let param = {
-        token: localStorage.token,
-      };
-      let postdata = qs.stringify(param);
-      OrderShopQuery(postdata).then(res => {
-        let json = res;
-        if (json.Code == 0) {
-          that.list = json.Rs;
-          if (that.list) {
-            that.shopNum = json.Rs.length;
-          }
-        } else {
-          that.alertInfo(json.Memo);
-          // 权限失效后，删掉本地token
-          if (json.Code == 1004) {
-            localStorage.clear();
-            console.log(1010);
-            this.$router.push({path: '/login'});
-          }
+    import {
+        ManagerSelfQuery,
+        OrderShopQuery,
+    } from '../api/getApiRes.js'
+
+    import bottomTab from '../components/bottomTab'
+    import alert from '../components/alert'
+    import axios from 'axios';
+
+    let qs = require('qs');
+    import Global from '../Global.js'
+
+    export default {
+        data() {
+            return {
+                thisTab: '预约课程',
+                shopNum: 0,
+                recordNum: 0,
+                Dannum: 0,
+                GetHotelCounts: 0,
+                GetDetectorNum: 0,
+                currShopId: 0,
+                list: [],
+            }
+        },
+        mounted() {
+            this.getManagerSelfQuery();
+        },
+        destroyed() {
+        },
+        watch: {
+            $route(to) {
+                if (to.name == 'main') {
+                    this.getList();
+                }
+            },
+            'active'() {
+                this.getList();
+            }
+        },
+        methods: {
+            alertInfo(info) {
+                this.$refs.alertPart.openSimpleDialog(info);
+            },
+            getManagerSelfQuery() {
+                let that = this;
+                let param = {
+                    token: localStorage.token,
+                };
+                let postdata = qs.stringify(param);
+                ManagerSelfQuery(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        this.currShopId = json.Rs.ShopId;
+                        this.getList();
+                    } else {
+                        that.alertInfo(json.Memo);
+                        if (json.Code == 1010) {
+                            localStorage.clear();
+                            console.log(1010);
+                            that.$router.push({path: '/login'});
+                        }
+                    }
+                })
+            },
+            getList() {
+                let that = this;
+                let param = {
+                    token: localStorage.token,
+                };
+                let postdata = qs.stringify(param);
+                OrderShopQuery(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        that.list = json.Rs;
+                        if (that.list) {
+                            that.shopNum = json.Rs.length;
+                        }
+                    } else {
+                        that.alertInfo(json.Memo);
+                        // 权限失效后，删掉本地token
+                        if (json.Code == 1004) {
+                            localStorage.clear();
+                            console.log(1010);
+                            this.$router.push({path: '/login'});
+                        }
+                    }
+                })
+            },
+            onGoNewPage(path) {
+                this.$router.push({path: '/' + path});
+            },
+            goPage(pages) {
+                this.$router.push({path: pages});
+            },
+            goAppoint(row) {
+                let that = this;
+                if (row.IsJoin == 0) {
+                    that.alertInfo('您不是该店会员，不可预约');
+                    return false
+                }
+                if (row.Status == 2) {
+                    that.alertInfo(row.name + '不可预约');
+                    return false
+                } else {
+                    this.$router.push({
+                        path: '/appoint', query: {
+                            shopId: row.ShopID
+                        }
+                    });
+                }
+            }
+        },
+        beforeRouteEnter(to, from, next) {
+            next(vm => {
+                //因为当钩子执行前，组件实例还没被创建
+                // vm 就是当前组件的实例相当于上面的 this，所以在 next 方法里你就可以把 vm 当 this 来用了。
+                if (to.name == '') {
+                    vm.getList();
+                }
+            });
+        },
+        components: {
+            bottomTab, alert
         }
-      })
-    },
-    onGoNewPage(path) {
-      this.$router.push({path: '/' + path});
-    },
-    goPage(pages) {
-      this.$router.push({path: pages});
-    },
-    goAppoint(row) {
-      let that = this;
-      if (row.IsJoin == 0) {
-        that.alertInfo('您不是该店会员，不可预约');
-        return false
-      }
-      if (row.Status == 2) {
-        that.alertInfo(row.name + '不可预约');
-        return false
-      } else {
-        this.$router.push({
-          path: '/appoint', query: {
-            shopId: row.ShopID
-          }
-        });
-      }
     }
-  },
-  beforeRouteEnter(to, from, next) {
-    next(vm => {
-      //因为当钩子执行前，组件实例还没被创建
-      // vm 就是当前组件的实例相当于上面的 this，所以在 next 方法里你就可以把 vm 当 this 来用了。
-      if (to.name == '') {
-        vm.getList();
-      }
-    });
-  },
-  watch: {
-    $route(to) {
-      if (to.name == '') {
-        this.getList();
-      }
-    },
-    'active'() {
-      this.getList();
-    }
-  },
-  components: {
-    bottomTab, alert
-  }
-}
 </script>
 
 <style scoped>
-#mainPage {
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-  background: #f2f2f2;
-  overflow-y: scroll;
-}
-
-
-.goPage {
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-  background: #fff;
-  height: 50px;
-  line-height: 50px;
-  padding: 0 20px;
-  color: #333;
-  font-size: 18px;
-  border-bottom: 1px solid #f2f2f2;
-}
-
-.goPage span {
-  float: left;
-}
-
-.goPage i {
-  float: right;
-  margin-top: 12px;
-}
-
-.goPage img {
-  overflow: hidden;
-  display: block;
-  width: 8px;
-  height: 14px;
-  float: right;
-  margin-top: 16px;
-  margin-right: 10px;
-}
-
-.goTitle i {
-  margin-top: 10px;
-  float: right;
-}
-
-.mapContainer {
-  width: 100%;
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-  max-height: 317px;
-}
-
-.shopNum {
-  width: 100%;
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-  font-family: "PingFang SC";
-  font-weight: 300;
-  font-size: 14px;
-  color: #909090;
-  text-align: center;
-}
-
-.list {
-  width: 94%;
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-  padding-left: 3%;
-  padding-right: 3%;
-  margin-top: 10px;
-  padding-bottom: 20px;
-}
-
-.list li {
-  width: 100%;
-  height: 133px;
-  background: transparent;
-  margin-bottom: 20px;
-  border-radius: 13px;
-  background: #fff;
-  box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
-  overflow: hidden;
-}
-
-.list img {
-  float: left;
-}
-
-.list .rt {
-  width: 58%;
-  float: left;
-  padding-left: 15px;
-}
-
-.list .rt h5 {
-  font-family: "PingFang SC";
-  font-weight: normal;
-  font-size: 18px;
-  text-align: left;
-  color: #3b3b3b;
-  margin: 0;
-  margin-top: 18px;
-  margin-bottom: 7px;
-}
-
-.list .rt span {
-  width: 100%;
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-  font-family: "PingFang SC";
-  font-weight: normal;
-  font-size: 12px;
-  text-align: left;
-  color: #909090;
-}
-
-.list .rt em {
-  width: 100%;
-  overflow: hidden;
-  display: block;
-  margin: 0 auto;
-  font-family: "PingFang SC";
-  font-weight: normal;
-  font-size: 16px;
-  padding-right: 1px;
-  margin-top: 5px;
-  float: right;
-  text-align: right;
-}
-
-.list .rt em.green {
-  color: #37cb00;
-}
-
-.list .rt em.red {
-  color: #F8847F;
-}
-
-.red {
-  color: #F8847F;
-}
-
-@media only screen and (max-width: 640px) {
-
-}
-
-@media only screen and (max-width: 480px) {
-
-}
-
-@media only screen and (max-width: 375px) {
-
-}
-
-@media only screen and (max-width: 360px) {
-
-}
-
-@media only screen and (max-width: 320px) {
-  .list .rt {
-    width: 52%;
-  }
-
-  .list .rt em {
-    font-size: 14px;
-  }
-}
-
-@media only screen and (min-width: 641px) {
-
-}
+    #mainPage {
+        width: 100%;
+        height: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        background: #f2f2f2;
+        overflow-y: scroll;
+    }
+
+
+    .goPage {
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        background: #fff;
+        height: 50px;
+        line-height: 50px;
+        padding: 0 20px;
+        color: #333;
+        font-size: 18px;
+        border-bottom: 1px solid #f2f2f2;
+    }
+
+    .goPage span {
+        float: left;
+    }
+
+    .goPage i {
+        float: right;
+        margin-top: 12px;
+    }
+
+    .goPage img {
+        overflow: hidden;
+        display: block;
+        width: 8px;
+        height: 14px;
+        float: right;
+        margin-top: 16px;
+        margin-right: 10px;
+    }
+
+    .goTitle i {
+        margin-top: 10px;
+        float: right;
+    }
+
+    .mapContainer {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        max-height: 317px;
+    }
+
+    .shopNum {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        font-family: "PingFang SC";
+        font-weight: 300;
+        font-size: 14px;
+        color: #909090;
+        text-align: center;
+    }
+
+    .list {
+        width: 94%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        padding-left: 3%;
+        padding-right: 3%;
+        margin-top: 10px;
+        padding-bottom: 20px;
+    }
+
+    .list li {
+        width: 100%;
+        height: 133px;
+        background: transparent;
+        margin-bottom: 20px;
+        border-radius: 13px;
+        background: #fff;
+        box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
+        overflow: hidden;
+    }
+
+    .list img {
+        float: left;
+    }
+
+    .list .rt {
+        width: 58%;
+        float: left;
+        padding-left: 15px;
+    }
+
+    .list .rt h5 {
+        font-family: "PingFang SC";
+        font-weight: normal;
+        font-size: 18px;
+        text-align: left;
+        color: #3b3b3b;
+        margin: 0;
+        margin-top: 18px;
+        margin-bottom: 7px;
+    }
+
+    .list .rt span {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        font-family: "PingFang SC";
+        font-weight: normal;
+        font-size: 12px;
+        text-align: left;
+        color: #909090;
+    }
+
+    .list .rt em {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        font-family: "PingFang SC";
+        font-weight: normal;
+        font-size: 16px;
+        padding-right: 1px;
+        margin-top: 5px;
+        float: right;
+        text-align: right;
+    }
+
+    .list .rt em.green {
+        color: #37cb00;
+    }
+
+    .list .rt em.red {
+        color: #F8847F;
+    }
+
+    .red {
+        color: #F8847F;
+    }
+
+    @media only screen and (max-width: 640px) {
+
+    }
+
+    @media only screen and (max-width: 480px) {
+
+    }
+
+    @media only screen and (max-width: 375px) {
+
+    }
+
+    @media only screen and (max-width: 360px) {
+
+    }
+
+    @media only screen and (max-width: 320px) {
+        .list .rt {
+            width: 52%;
+        }
+
+        .list .rt em {
+            font-size: 14px;
+        }
+    }
+
+    @media only screen and (min-width: 641px) {
+
+    }
 </style>

pc/src/views/AcrossVip.vue

@@ -168,7 +168,7 @@
                 imageUrl: '',
                 token: {}, // 七牛云的上传地址，根据自己所在地区选择，我这里是华南区
                 domain: 'https://up-z1.qiniup.com', // 这是七牛云空间的外链默认域名
-                qiniuaddr: 'qjzpcd34v.hb-bkt.clouddn.com',
+                qiniuaddr: 'qjzpcd34v.hb-bkt.clouddn.com',//xhead.beswell.com
                 dialogVisible: false,//其他dialog
                 TakeVisible: false,//take dialog
                 dialogMemberVisible: false,//新增跨店会员dialog

pc/src/views/Member.vue

@@ -196,7 +196,9 @@
                         width="160px"
                 >
                     <template slot-scope="scope">
-                        <el-button class="btn" type="default" size="mini" @click="editMember(scope.row)" v-if="userLevel != 4">编辑</el-button>
+                        <el-button class="btn" type="default" size="mini" @click="editMember(scope.row)"
+                                   v-if="userLevel != 4">编辑
+                        </el-button>
                         <el-button class="btn" type="danger" v-if="scope.row.UserInfo.Status == 1" size="mini"
                                    @click="pauseRow(scope.row)">
                             禁用
@@ -407,7 +409,7 @@
                 imageUrl: '',
                 token: {}, // 七牛云的上传地址，根据自己所在地区选择，我这里是华南区
                 domain: 'https://up-z1.qiniup.com', // 这是七牛云空间的外链默认域名
-                qiniuaddr: 'qjzpcd34v.hb-bkt.clouddn.com',
+                qiniuaddr: 'qjzpcd34v.hb-bkt.clouddn.com',//xhead.beswell.com
                 pullRight: true,//其他dialog
                 addDisabled: true,//禁止添加新用户
                 dialogVisible: false,//其他dialog
@@ -422,6 +424,8 @@
                 Takevalue: 0,
                 Takeoptions: [],
                 TakeHid: 0,
+                start: 0,
+                draw: 1,
                 sexOptions: [
                     {value: 1, label: '男'},//性别 1：男， 2：女
                     {value: 2, label: '女'},
@@ -507,7 +511,7 @@
             getUsrInfoList() {
 
                 // 只有新增的时候启用当前功能
-                if(this.form.btnType == 1){
+                if (this.form.btnType == 1) {
                     return false
                 }
 
@@ -544,7 +548,7 @@
                                 that.pullRight = false;
                                 that.form.name = Info.Name;
                                 that.form.height = Info.Height;
-                                that.form.weight =  parseInt(Info.Weight) / 10;
+                                that.form.weight = parseInt(Info.Weight) / 10;
                                 that.form.birthday = Info.Birthday;
                                 that.imageUrl = Info.Head;
                                 that.form.head = Info.Head;
@@ -1234,8 +1238,8 @@
                     phone: that.panel.phone,//
                     name: that.panel.name,//
                     expDay: that.panel.expDay,//
-                    start: 0,//
-                    tableMax: 9999,//
+                    start: that.start,//
+                    tableMax: 20,//
                 };
                 let postdata = qs.stringify(param);
                 VipUserListQuery(postdata).then(res => {
@@ -1244,7 +1248,7 @@
                         that.loading = false;
                         if (json.Rs) {
                             that.allTableData = json.Rs;
-                            that.recordsTotal = json.Rs.length;
+                            that.recordsTotal = json.PageCount * that.pageination.pageItem;
                         } else {
                             that.allTableData = [];
                             that.recordsTotal = 0;
@@ -1292,7 +1296,9 @@
                     this.tableData = tables;
                 }
                 that.start = index * that.draw;
-                // that.getTableQuery();
+                console.log(index);
+                console.log(that.draw);
+                that.getTableQuery();
             },
             // 过滤时间
             filterFmtDate(value, row, column) {

pc/src/views/record.vue

@@ -124,7 +124,7 @@
                   sortable
           >
               <template slot-scope="scope">
-                  <span v-if="scope.row.Status == ''" style="color:red;">跨店</span>
+                  <span v-if="scope.row.RemainHour == ''" style="color:red;">跨店</span>
                   <span v-else style="color: #000">本店用户</span>
               </template>
           </el-table-column>

tv/src/Global.js

@@ -390,7 +390,7 @@ numberToWeekdays = function (val) {
 
 // 随机背景
 RandomBg = function () {
-    let bgClassNum = parseInt(Math.random() * 7) + 1;
+    let bgClassNum = parseInt(Math.random() * 10) + 1;
     return 'bgStyle' + bgClassNum + '  pages';
 };
 
@@ -433,8 +433,10 @@ fakeNews = function (num, team) {
                 "UserId": 1,
                 "Cle": parseInt(Math.random() * 100 + 50),
                 "realHr1": parseInt(Math.random() * 100 + 50),
-                "realHr": parseInt(Math.random() * 100 + 50),
                 "activePercent": parseInt(Math.random() * 100 + 50),
+                "realHr": parseInt(Math.random() * 100 + 50),
+                // "activePercent":0,
+                // "realHr": 0,
                 "heartRate": parseInt(Math.random() * 100 + 50),
                 "PureCalorieNoVo2": parseInt(Math.random() * 100 + 50),
                 "Name": "测试人",
@@ -443,7 +445,8 @@ fakeNews = function (num, team) {
                 "Ck": (nums + i + 1) * 2.2,
                 "formatCk":parseInt(Math.random() * 100 + 50),
                 "Head": "http://192.168.0.2/gc.png",
-                "GroupNo": i % teamNum + 1
+                "GroupNo": i % teamNum + 1,
+                "Sex": i % 2 + 1
             }
         )
     }

tv/src/assets/css/bg.css

@@ -1,5 +1,6 @@
 .bgStyle1 {
     background-color: #028fe1;
+
     background: url("../../static/img/bg/bg_1.png");
     background-size: 100%;
     background-repeat: no-repeat;
@@ -7,6 +8,7 @@
 
 .bgStyle2 {
     background-color: #028fe1;
+
     background: url("../../static/img/bg/bg_2.png");
     background-size: 100%;
     background-repeat: no-repeat;
@@ -14,6 +16,7 @@
 
 .bgStyle3 {
     background-color: #028fe1;
+
     background: url("../../static/img/bg/bg_3.png");
     background-size: 100%;
     background-repeat: no-repeat;
@@ -21,6 +24,7 @@
 
 .bgStyle4 {
     background-color: #028fe1;
+
     background: url("../../static/img/bg/bg_4.png");
     background-size: 100%;
     background-repeat: no-repeat;
@@ -28,6 +32,7 @@
 
 .bgStyle5 {
     background-color: #028fe1;
+
     background: url("../../static/img/bg/bg_5.png");
     background-size: 100%;
     background-repeat: no-repeat;
@@ -35,6 +40,7 @@
 
 .bgStyle6 {
     background-color: #028fe1;
+
     background: url("../../static/img/bg/bg_6.png");
     background-size: 100%;
     background-repeat: no-repeat;
@@ -42,17 +48,43 @@
 
 .bgStyle7 {
     background-color: #028fe1;
+
     background: url("../../static/img/bg/bg_7.png");
     background-size: 100%;
     background-repeat: no-repeat;
 }
 
+.bgStyle8 {
+    background-color: #028fe1;
+
+    background: url("../../static/img/bg/bg_8.png");
+    background-size: 100%;
+    background-repeat: no-repeat;
+}
+
+.bgStyle9 {
+    background-color: #028fe1;
+
+    background: url("../../static/img/bg/bg_9.png");
+    background-size: 100%;
+    background-repeat: no-repeat;
+}
+
+.bgStyle10 {
+    background-color: #028fe1;
+
+    background: url("../../static/img/bg/bg_10.png");
+    background-size: 100%;
+    background-repeat: no-repeat;
+}
+
 ul, li {
     list-style: none;
     margin: 0;
     padding: 0;
 }
-s,em,i {
+
+s, em, i {
     font-style: normal;
     text-decoration: none;
 }

tv/src/components/Headside.vue

@@ -43,7 +43,7 @@
                 nowWeeks: '',
                 nowDay: '',
                 nowTime: '',
-                version: '1.0'
+                version: localStorage.version
             }
         },
         mounted() {
@@ -56,9 +56,8 @@
                 this.nowDayFunc();
             }, 1000);
             this.getCurVersion();
-            if (localStorage.version) {
-                this.version = localStorage.version
-            }
+            // 获取版本号
+            this.version = localStorage.version;
         },
         beforeDestroy() {
             clearInterval(this.timer);

tv/src/views/3pkRank.vue

@@ -571,7 +571,7 @@
 
     .flagContainer {
         position: relative;
-        top: -1.1rem;
+        top: -0.5rem;
         float: right;
         right: 0;
     }

tv/src/views/Index.vue

@@ -33,19 +33,24 @@
                     clmurl: '/',
                 }],
                 editableTabsValue: '1',
-                curVersion: '1.0'
+                curVersion: '1.0.1'
             }
         },
         mounted() {
             // alert('clientWidth:' + document.documentElement.clientWidth);
             // alert('devicePixelRatio:' + window.devicePixelRatio);
+            //浏览器默认的
+            localStorage.eqSn = '30:9C:23:0C:8B:1E';
+            localStorage.version = '1.1.0';
             this.getCurVersion();
         },
         methods: {
             // 获取当前版本号
             getCurVersion() {
                 let that = this;
-                localStorage.eqSn = '30:9C:23:0C:8B:1E';//浏览器默认的
+                //浏览器默认的
+                localStorage.eqSn = '30:9C:23:0C:8B:1E';
+                localStorage.version = '1.1.0';
                 function plusReady() {
                     if (typeof plus == 'undefined') return false;
                     // 获取本地应用资源版本号
@@ -53,10 +58,8 @@
                         localStorage.version = inf.version;
                         that.curVersion = inf.version;
 
-                        //首发版本1.0.1
-                        console.log(localStorage.version);
+                        //首发版本 '1.1.0'
                         that.checkUpdate(that.curVersion); //开启自动升级
-
                     });
 
                     //   获取手机UUID
@@ -73,7 +76,7 @@
                             // });
                             // 8e501b0bde9ce600
                             // 打印uuid
-                            // alert('getDeviceInfo success: ' + JSON.stringify(e.uuid));
+                            alert('getDeviceInfo success: ' + JSON.stringify(e.uuid));
                             // alert('clientWidth:' + document.documentElement.clientWidth);
                             // alert('clientWidth:' + document.documentElement.clientHeight);
                             // alert('devicePixelRatio:' + window.devicePixelRatio);
@@ -90,7 +93,7 @@
                     plusReady();
                 } else {
                     console.log('mui is not ready');
-                    plusReady();
+                    // plusReady();
                     document.addEventListener('plusready', plusReady, false);
                 }
             },

tv/src/views/Main.vue

@@ -9,14 +9,20 @@
                     <div class="centerLi">
                         <div class="topLi">
                             <div class="human">
-                                <span class="name">{{ s.Name }}</span>
+                                <span class="name">
+                                    <div class="nameLt">
+                                        <i class="el-icon-male" v-if="s.Sex == 1"></i>
+                                        <i class="el-icon-female" v-if="s.Sex == 2"></i>
+                                    </div>
+                                    <div class="nameMd">{{ s.Name }}</div>
+                                    <div class="namert"></div>
+                                </span>
                                 <img :src="s.Head" alt="" v-if="s.Head">
                                 <img src="../static/img/people/flyhead.png" alt="" v-if="!s.Head">
                             </div>
                             <div class="cla">
-                                <!--<em v-if="s.activePercent != 0">{{  s.activePercent |fmtNum }}</em>-->
-                                <em v-if="s.activePercent != 0">{{ s.activePercent }}</em>
-                                <em class="plus" v-if="s.activePercent == 0">
+                                <em v-if="s.realHr != 0">{{ s.activePercent }}</em>
+                                <em class="plus" v-if="s.activePercent == 0 && s.realHr == 0">
                                     ---
                                 </em>
                             </div>
@@ -146,7 +152,7 @@
             } else {
                 // 彩蛋
                 // this.OpenEgg(this.fakeEgg);
-                let Rs = fakeNews(24);
+                let Rs = fakeNews(1);
                 this.giveClassName(Rs);
                 this.students = Rs;
                 // this.mainTimer = setInterval(() => {
@@ -380,7 +386,7 @@
             },
         },
         components: {
-            Headside, newRecord,levelIcon
+            Headside, newRecord, levelIcon
         }
     }
 </script>
@@ -441,8 +447,6 @@
     }
 
 
-
-
     .slowJump {
         animation: mymove 3s infinite;
         -webkit-animation: mymove 3s infinite; /*Safari and Chrome*/
@@ -575,6 +579,17 @@
         margin: 0 auto;
         overflow: hidden;
     }
+    .human .name div {
+        float: left;
+        width: 20%;
+        text-align: left;
+        text-indent: 0.1rem;
+    }
+    .human .name .nameMd {
+        width: 60%;
+        text-align: center;
+        text-indent: 0;
+    }
 
     .lcla span {
         position: relative;

tv/src/views/Rank.vue

@@ -45,7 +45,7 @@
 
                             <div class="score">
                                 {{s.Ck|fmtFloat}}
-                                <em>CK值</em>
+                                <em>CK</em>
                             </div>
                             <div class="record">
                                 <img src="../static/img/rank/recordIcon.svg" class="king" alt=""

tv/src/views/Wait.vue

@@ -86,6 +86,17 @@
                 </el-carousel>
             </div>
         </div>
+
+        <el-dialog
+                title="提示"
+                :visible.sync="dialogVisible"
+                width="30%"
+                :before-close="handleClose">
+            <span>{{dialogText}}</span>
+            <span slot="footer" class="dialog-footer">
+    <el-button type="primary" @click="dialogVisible = false">知道了</el-button>
+  </span>
+        </el-dialog>
     </div>
 </template>
 
@@ -111,6 +122,8 @@
                 pageStyle: RandomBg(),
                 trueDate: true,//真实数据 true false
                 autoplayStatus: false,// false
+                dialogVisible: false,// false
+                dialogText: '',// false
                 fakeNums: 8,//
                 unite: '卡路里',
                 topMsg: '',
@@ -308,9 +321,9 @@
                         that.students = json.Rs;
                         that.$message.error(json.Memo);
                     }
-                }).catch(function(err){
-                        console.log(err);
-                    });
+                }).catch(function (err) {
+                    console.log(err);
+                });
             },
             GetHerosRankingQuery() {
                 let that = this;
@@ -324,7 +337,9 @@
                     if (json.Code == 0) {
                         that.bottom = json.Rs;
                     } else {
-                        that.$message.error(json.Memo);
+                        if (json.Code == 4002) {}else{
+                            that.$message.error(json.Memo);
+                        }
                     }
                 })
             },
@@ -340,7 +355,9 @@
                     if (json.Code == 0) {
                         that.rt = json.Rs;
                     } else {
-                        that.$message.error(json.Memo);
+                        if (json.Code == 4002) {}else{
+                            that.$message.error(json.Memo);
+                        }
                     }
                 })
             },
@@ -365,7 +382,13 @@
                                 Result: [{'Values': '', Unite: ''}],
                             }
                         ];
-                        that.$message.error(json.Memo);
+                        if (json.Code == 4002) {
+                            that.dialogVisible = true;
+                            that.dialogText = json.Memo;
+                        }else{
+                            that.$message.error(json.Memo);
+                        }
+
                     }
                 })
             },
@@ -403,12 +426,12 @@
                             }
                         }
                     } else {
+
                         // that.$message.error(json.Memo);
                     }
                 })
             },
         },
-
         components: {
             Headside
         }
@@ -845,9 +868,11 @@
     /deep/ .el-carousel__indicators--horizontal {
         /*display: none;*/
     }
+
     /deep/ .el-carousel {
         height: 100%;
     }
+
     /deep/ .el-carousel__container {
 
     }

tv/src/views/pk.vue

@@ -17,16 +17,19 @@
                 <ul>
                     <li :class="RedstudentsClassName" v-for="(s,i) in students.redUnite">
                         <div class="bg">
-                            <h5>{{ s.Name }}</h5>
+                            <h5>
+                                <div class="nameLt">
+                                    <i class="el-icon-male" v-if="s.Sex == 1"></i>
+                                    <i class="el-icon-female" v-if="s.Sex == 2"></i>
+                                </div>
+                                <div class="nameMd">{{ s.Name }}</div>
+                                <div class="namert"></div>
+                            </h5>
                             <div class="user">
                                 <div class="ult">
                                     <em>
-                                        <div v-if="s.activePercent != 0">
-                                            {{ s.activePercent}}
-                                        </div>
-                                        <div class="plus" v-if="s.activePercent == 0">
-                                            ---
-                                        </div>
+                                        <div v-if="s.realHr != 0">{{ s.activePercent}}</div>
+                                        <div class="plus" v-if="s.activePercent == 0 && s.realHr == 0">---</div>
                                         <s>%</s>
                                     </em>
                                 </div>
@@ -107,14 +110,21 @@
                 <ul>
                     <li :class="BluestudentsClassName" v-for="(s,i) in students.blueUnite">
                         <div class="bg">
-                            <h5>{{ s.Name }}</h5>
+                            <h5>
+                                <div class="nameLt">
+                                    <i class="el-icon-male" v-if="s.Sex == 1"></i>
+                                    <i class="el-icon-female" v-if="s.Sex == 2"></i>
+                                </div>
+                                <div class="nameMd">{{ s.Name }}</div>
+                                <div class="namert"></div>
+                            </h5>
                             <div class="user">
                                 <div class="ult">
                                     <em>
-                                        <div v-if="s.activePercent != 0">
+                                        <div v-if="s.realHr != 0">
                                             {{ s.activePercent}}
                                         </div>
-                                        <div class="plus" v-if="s.activePercent == 0">
+                                        <div class="plus" v-if="s.activePercent == 0&& s.realHr == 0">
                                             ---
                                         </div>
                                         <s>%</s>
@@ -228,7 +238,7 @@
                 let Dp = json.Dp;
                 that.ReadLessonInfo(Dp);
                 // 载入学生信息
-                let Rs = fakeNews(14, 2);
+                let Rs = fakeNews(18, 2);
                 that.UniteBreak(Rs);
 
                 // 人口总数
@@ -247,7 +257,6 @@
                             this.curgetClassStat();
                         }, 1000);
                         this.GetgetUserList();
-
                         // this.PkEgg = setInterval(() => {
                         //     this.createEgg();
                         // }, 6000);
@@ -255,7 +264,6 @@
                     } else {
                         let Rs = fakeNews(16);
                         that.UniteBreak(Rs);
-
                     }
                 } else {
                     clearInterval(this.PkTimer);
@@ -324,10 +332,8 @@
                     blueFmtSum += item.formatCk
                 });
 
-
                 // pkVal
                 let sumMax = redFmtSum + blueFmtSum;
-                console.log(redFmtSum);
 
                 // 当为0时均分
                 if (sumMax == 0) {
@@ -390,7 +396,7 @@
                     case  parseInt(res.length) <= 6 && parseInt(res.length) > 4:
                         numberClass = 'four';
                         break;
-                    case  parseInt(res.length) <= 8 && parseInt(res.length) > 6:
+                    case  parseInt(res.length) > 6:
                         numberClass = 'eight';
                         break;
                 }
@@ -666,6 +672,18 @@
         margin-bottom: 0.1rem;
     }
 
+    .bg > h5 div {
+        float: left;
+        width: 20%;
+        text-align: left;
+        text-indent: 0.1rem;
+    }
+    .bg > h5 .nameMd {
+        width: 60%;
+        text-align: center;
+        text-indent: 0;
+    }
+
     .pk_container li .user {
         width: 100%;
         overflow: hidden;
@@ -1100,6 +1118,7 @@
         height: 0.5rem;
         margin-top: 0.12rem;
     }
+
     .two .urt img {
         width: 0.3rem;
         height: 0.3rem;
@@ -1292,7 +1311,7 @@
 
     .eight .user .ult em div {
         width: 90%;
-        margin-right:0rem;
+        margin-right: 0rem;
         font-size: 0.5rem;
         line-height: 1rem;
         padding-right: 0.2rem;

tv/src/views/threepk.vue

@@ -54,14 +54,21 @@
                 <ul>
                     <li :class="RedstudentsClassName" v-for="(s,i) in students.redUnite">
                         <div class="bg">
-                            <h5>{{ s.Name }}</h5>
+                            <h5>
+                                <div class="nameLt">
+                                    <i class="el-icon-male" v-if="s.Sex == 1"></i>
+                                    <i class="el-icon-female" v-if="s.Sex == 2"></i>
+                                </div>
+                                <div class="nameMd">{{ s.Name }}</div>
+                                <div class="namert"></div>
+                            </h5>
                             <div class="user">
                                 <div class="ult">
                                     <em>
-                                        <div v-if="s.activePercent != 0">
+                                        <div v-if="s.realHr != 0">
                                             {{ s.activePercent}}
                                         </div>
-                                        <div class="plus" v-if="s.activePercent == 0">
+                                        <div class="plus" v-if="s.activePercent == 0&& s.realHr == 0">
                                             ---
                                         </div>
                                         <s>%</s>
@@ -105,14 +112,21 @@
                 <ul>
                     <li :class="RedstudentsClassName" v-for="(s,i) in students.blueUnite">
                         <div class="bg">
-                            <h5>{{ s.Name }}</h5>
+                            <h5>
+                                <div class="nameLt">
+                                    <i class="el-icon-male" v-if="s.Sex == 1"></i>
+                                    <i class="el-icon-female" v-if="s.Sex == 2"></i>
+                                </div>
+                                <div class="nameMd">{{ s.Name }}</div>
+                                <div class="namert"></div>
+                            </h5>
                             <div class="user">
                                 <div class="ult">
                                     <em>
-                                        <div v-if="s.activePercent != 0">
+                                        <div v-if="s.realHr != 0">
                                             {{ s.activePercent}}
                                         </div>
-                                        <div class="plus" v-if="s.activePercent == 0">
+                                        <div class="plus" v-if="s.activePercent == 0&& s.realHr == 0">
                                             ---
                                         </div>
                                         <s>%</s>
@@ -156,14 +170,21 @@
                 <ul>
                     <li :class="RedstudentsClassName" v-for="(s,i) in students.yellowUnite">
                         <div class="bg">
-                            <h5>{{ s.Name }}</h5>
+                            <h5>
+                                <div class="nameLt">
+                                    <i class="el-icon-male" v-if="s.Sex == 1"></i>
+                                    <i class="el-icon-female" v-if="s.Sex == 2"></i>
+                                </div>
+                                <div class="nameMd">{{ s.Name }}</div>
+                                <div class="namert"></div>
+                            </h5>
                             <div class="user">
                                 <div class="ult">
                                     <em>
-                                        <div v-if="s.activePercent != 0">
+                                        <div v-if="s.realHr != 0">
                                             {{ s.activePercent}}
                                         </div>
-                                        <div class="plus" v-if="s.activePercent == 0">
+                                        <div class="plus" v-if="s.activePercent == 0&& s.realHr == 0">
                                             ---
                                         </div>
                                         <s>%</s>
@@ -283,7 +304,7 @@
                 let Dp = json.Dp;
                 that.ReadLessonInfo(Dp);
                 // 载入学生信息
-                let Rs = fakeNews(24, 3);
+                let Rs = fakeNews(25, 3);
                 that.UniteBreak(Rs);
 
                 // 人口总数
@@ -461,7 +482,7 @@
                     case  parseInt(res.length) <= 6 && parseInt(res.length) > 4:
                         numberClass = 'four';
                         break;
-                    case  parseInt(res.length) <= 8 && parseInt(res.length) > 6:
+                    case  parseInt(res.length) > 6:
                         numberClass = 'eight';
                         break;
                 }
@@ -672,7 +693,7 @@
         float: right;
         margin-right: -0.5rem;
         background: url("../static/img/pk/light.png") no-repeat center;
-        background-size: cover;
+        background-size: 100%;
 
     }
 
@@ -683,7 +704,7 @@
         height: 1.3rem;
         margin-right: -0.5rem;
         background: url("../static/img/pk/light.png") no-repeat center;
-        background-size: cover;
+        background-size: 100%;
         left: -0.4rem;
         float: left;
     }
@@ -930,6 +951,18 @@
         margin-bottom: 0.1rem;
     }
 
+    .bg > h5 div {
+        float: left;
+        width: 20%;
+        text-align: left;
+        text-indent: 0.1rem;
+    }
+    .bg > h5 .nameMd {
+        width: 60%;
+        text-align: center;
+        text-indent: 0;
+    }
+
     .pk_container li .user {
         width: 100%;
         overflow: hidden;