剩余课时的文案

app/src/components/alert.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <mu-dialog title="警告" width="360" :open.sync="openSimple">
+    <mu-dialog title="通知" width="360" :open.sync="openSimple">
        {{text}}
       <mu-button slot="actions" flat color="primary" @click="closeSimpleDialog">关闭</mu-button>
     </mu-dialog>
@@ -12,7 +12,7 @@ export default {
   data() {
     return {
       openSimple: false,
-      text:'1111'
+      text:''
     };
   },
   methods: {
@@ -29,4 +29,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

app/src/page/appoint.vue

@@ -179,25 +179,25 @@ export default {
     numberToWeek(val) {
       switch (parseInt(val)) {
         case 1:
-          return '星期一'
+          return '星期一';
           break;
         case 2:
-          return '星期二'
+          return '星期二';
           break;
         case 3:
-          return '星期三'
+          return '星期三';
           break;
         case 4:
-          return '星期四'
+          return '星期四';
           break;
         case 5:
-          return '星期五'
+          return '星期五';
           break;
         case 6:
-          return '星期六'
+          return '星期六';
           break;
         case 0:
-          return '星期天'
+          return '星期天';
           break;
       }
     },
@@ -712,4 +712,4 @@ li .title span.lessons {
     top: 21%;
   }
 }
-</style>
+</style>

pc/src/api/Navs.js

@@ -170,7 +170,7 @@ let navs = [
         "grouplist": "2,5",
         "icon": "el-icon-s-claim",
     },  {
-        "clmid": "15",
+        "clmid": "22",
         "clmcode": "setting",
         "clmname": "系统设置",
         "clmurl": "/adminSetting",
@@ -242,26 +242,8 @@ let navs = [
         "show": 4,
         "grouplist": "2,5",
         "icon": "el-icon-bank-card",
-    }, {
-        "clmid": "11",
-        "clmcode": "finish",
-        "clmname": "下课管理",
-        "clmurl": "/finish",
-        "prname": "",
-        "show": 4,
-        "grouplist": "2,5",
-        "icon": "el-icon-bell",
-    },
-    {
-        "clmid": "15",
-        "clmcode": "setting",
-        "clmname": "系统设置",
-        "clmurl": "/adminSetting",
-        "prname": "",
-        "show": 4,
-        "grouplist": "2,5",
-        "icon": "el-icon-setting",
     },
+
     {
         "clmid": "21",
         "clmcode": "courses",
@@ -281,15 +263,16 @@ let navs = [
         "show": 4,//2
         "grouplist": "2,5",
         "icon": "el-icon-cpu",
-    }, {
-        "clmid": "17",
-        "clmcode": "region",
-        "clmname": "区域管理",
-        "clmurl": "/region",
+    },
+    {
+        "clmid": "22",
+        "clmcode": "setting",
+        "clmname": "系统设置",
+        "clmurl": "/adminSetting",
         "prname": "",
-        "show": 4,//2
+        "show": 4,
         "grouplist": "2,5",
-        "icon": "el-icon-map-location",
+        "icon": "el-icon-setting",
     },
 ];
 

pc/src/api/getApiRes.js

@@ -782,3 +782,10 @@ export function ShopGroupQuery(postdata) {
     let url = headapi + 'v1/Shop/ShopGroupQuery ';
     return getApiBasic(url, postdata);
 }
+
+//
+// 剩余课时统计
+export function ClassHourStatistics(postdata) {
+    let url = headapi + 'v1/SchoolTimeTable/ClassHourStatistics ';
+    return getApiBasic(url, postdata);
+}

pc/src/components/Headside.vue

@@ -92,11 +92,11 @@
                         localStorage.ServiceKey = json.Rs.Shop.ServiceKey;
                     } else {
                         if(json.Code == 1010){
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                             that.$router.push({path: '/login', query: {status: 1}});
                             return false
                         }else{
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     }
                 })
@@ -150,7 +150,7 @@
                                 type: 'success'
                             });
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     })
                 }).catch(() => {

pc/src/components/Navside.vue

@@ -99,11 +99,11 @@
                         this.panelSelect(json.Rs.ShopId);
                     } else {
                         if (json.Code == 1010) {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                             that.$router.push({path: '/login', query: {status: 1}});
                             return false
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     }
                 })
@@ -124,7 +124,7 @@
                             }
                         })
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },

pc/src/router/index.js

@@ -98,7 +98,7 @@ const routes = [
                 component: () => import('@/views/AdminSetting.vue'),
                 meta: {
                     title: "系统设置",
-                    clmid: "17",
+                    clmid: "22",
                 }
             }, {
                 path: '/lessonManage',

pc/src/views/AcrossVip.vue

@@ -271,7 +271,7 @@
                     if (json.Code == 0) {
                         that.form.vipList = turnResToOptionBySimViper(json.Rs);
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -286,7 +286,7 @@
                     if (json.Code == 0) {
                         that.form.groupList = turnResToOptionByGroup(json.Rs);
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -335,7 +335,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -382,7 +382,7 @@
                             // 重载列表
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     });
                 }).catch(() => {
@@ -439,7 +439,7 @@
                         // 设置分页数据
                         that.setPaginations();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },

pc/src/views/AdminManage.vue

@@ -84,11 +84,13 @@
         <el-table-column
             prop="Phone"
             label="手机号"
+            sortable
         >
         </el-table-column>
         <el-table-column
-            prop="AdminType "
+            prop="AdminType"
             label="角色"
+            sortable
         >
           <template slot-scope="scope">
             <!--                        // 1 会员 2 系统 3 店铺 4 教练-->
@@ -297,7 +299,7 @@ export default {
           that.panel.options = turnShopResToOption(json.Rs);
           that.panel.options.unshift({value: '', label: "全部"});
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -376,7 +378,7 @@ export default {
           // 重载列表
           that.getTableQuery();
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -452,7 +454,7 @@ export default {
           // 重载列表
           that.getTableQuery();
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -475,7 +477,7 @@ export default {
           that.form.shopId = json.Rs[0].ShopID;
           that.panel.options.unshift({value: '', label: "全部"});
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -511,7 +513,7 @@ export default {
             // 重载列表
             that.getTableQuery();
           } else {
-            that.$message.error(json.Memo);
+            that.$message.error(json.Memo + '错误码：' + json.Code);
           }
         });
       }).catch(() => {
@@ -540,7 +542,7 @@ export default {
           // 重载列表
           that.getTableQuery();
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -633,7 +635,7 @@ export default {
           // 设置分页数据
           that.setPaginations();
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },

pc/src/views/AdminSetting.vue

@@ -115,7 +115,7 @@
                         // 重载列表
                         that.getTableQuery();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },

pc/src/views/Basic.vue

@@ -74,7 +74,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },

pc/src/views/EditLessonManage.vue

@@ -324,7 +324,7 @@
                         that.panel.options = turnClassResToOption(json.Rs)
                         console.log(that.panel.options);
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -345,7 +345,7 @@
                         // row.WxOrder = json.Rs.WxOrder; //不支持联动
                         row.WxVisible = json.Rs.WxVisible;
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -379,7 +379,7 @@
                         let curIndex = parseInt(this.activeName) - 1;
                         this.tabs[curIndex].tableData.splice(delIndex, 1)
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -427,7 +427,7 @@
                         // 提交课程内容
                         that.EditLessonTable(json.Id);
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -489,7 +489,7 @@
                         });
                         // 提交后清掉内存里的课表
                         this.clearTableRAM();
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -631,7 +631,7 @@
                             that.recordsTotal = 0;
                         }
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },

pc/src/views/EditLessonTable.vue

@@ -276,7 +276,7 @@
                         if (json.Rs == null) return false
                         that.panel.options = turnClassResToOption(json.Rs)
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -295,7 +295,7 @@
                         row.TopLimit = json.Rs.TopLimit;
                         row.ConsumeHour = json.Rs.ConsumeHour;
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -341,7 +341,7 @@
                         // 提交课程内容
                         that.EditLessonTable(id);
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -381,7 +381,7 @@
                         // 提交课程内容
                         that.EditLessonTable(json.Id);
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -463,7 +463,7 @@
                         // });
                         // 提交后清掉内存里的课表
                         // this.clearTableRAM();
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -599,7 +599,7 @@
                             that.recordsTotal = 0;
                         }
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },

pc/src/views/EditLessonTable2.vue

@@ -220,7 +220,7 @@
                         that.setPaginations();
 
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },

pc/src/views/Equip.vue

@@ -372,7 +372,7 @@
                         // 设置分页数据
                         that.setPaginations();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -393,7 +393,7 @@
                         that.panel.regionidOptions = json.Rs;
                         that.panel.regionidOptions.unshift({Id: 0, Name: "全部", DisplayName: "全部"});
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -410,7 +410,7 @@
                         that.dialog.regionlevelOneIdOptions = json.Rs;
                         that.dialog.regionId = json.Rs[0].Id;
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -439,7 +439,7 @@
                             }
                         }
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -572,7 +572,7 @@
                             that.getTableQuery();
                             that.dialog_state = false;
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     });
                 }).catch(() => {
@@ -640,7 +640,7 @@
                             that.dialog.CoordsId = 0;
                         }
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -745,7 +745,7 @@
                         that.dialog_state = false;
 
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 });
             },
@@ -809,7 +809,7 @@
                         that.dialog_state = false;
 
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 });
             },
@@ -833,7 +833,7 @@
                         // table 重载
                         that.getTableQuery();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -868,7 +868,7 @@
                     if (json.Code == 0) {
                         that.dialog.plateImgSrc = json.EncodeString;
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },

pc/src/views/Lesson.vue

@@ -380,7 +380,7 @@
                         that.dialogVisible = false;
                         that.getTableQuery();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -433,7 +433,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -485,7 +485,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -524,7 +524,7 @@
                         // 重载列表
                         that.getTableQuery();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -559,7 +559,7 @@
                             // 重载列表
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     });
                 }).catch(() => {
@@ -587,7 +587,7 @@
                         // that.dialogdata = json.Rs;
                         that.form.dialogdata = turnResToOption(json.Rs)
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -612,7 +612,7 @@
                         // 重载列表
                         that.getTableQuery();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -715,7 +715,7 @@
                         // 设置分页数据
                         that.setPaginations();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },

pc/src/views/LessonTable.vue

@@ -234,7 +234,7 @@
                         that.previewDate.SttPlanPreviewClassList.sort((a, b) => a.ClassIndex - b.ClassIndex);//升序
                         that.previewShow = true;
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -267,7 +267,7 @@
                         // 重载列表
                         // that.getTableQuery();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -310,7 +310,7 @@
                             // 重载列表
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     });
                 }).catch(() => {
@@ -368,7 +368,7 @@
                             // 重载列表
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     });
                 // }).catch(() => {
@@ -416,7 +416,7 @@
                         that.getTableQuery();
                         this.dialogVisible = false;
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 });
             },
@@ -440,7 +440,7 @@
                         // 重载列表
                         that.getTableQuery();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 });
             },
@@ -482,7 +482,7 @@
                         // 设置分页数据
                         that.setPaginations();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },

pc/src/views/Log.vue

@@ -211,7 +211,7 @@ export default {
           that.panel.shopOptions = turnShopResToOption(json.Rs);
           that.panel.shopOptions.unshift({value: '', label: "全部"});
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -231,7 +231,7 @@ export default {
           that.panel.options.unshift({value: '', label: "全部"});
           console.log(that.panel.options);
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -304,7 +304,7 @@ export default {
           // 设置分页数据
           that.setPaginations();
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },

pc/src/views/Login.vue

@@ -151,11 +151,11 @@ export default {
           }
         } else {
           if (json.Code == 1010) {
-            that.$message.error(json.Memo);
+            that.$message.error(json.Memo + '错误码：' + json.Code);
             that.$router.push({path: '/login', query: {status: 1}});
             return false
           }
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },

pc/src/views/Main.vue

@@ -37,11 +37,12 @@
                             </em>
                         </div>
                     </li>
-                    <li @click="goPage('lesson')">
+                    <li @click="goPage('lesson')" v-if="userLevel != 3">
                         <img src="../assets/img/main/lesson.png" height="54" width="54"/>
                         <div class="liRight">
                             <h5>课程数量</h5>
-                            <span>{{ ClassNum }}</span>
+                            <span>{{ ClassNum }}
+                            </span>
                         </div>
                         <div class="btLine">
                             <em class="emlt">
@@ -50,6 +51,24 @@
                             </em>
                         </div>
                     </li>
+                    <li @click="goPage('lesson')" v-if="userLevel == 3">
+                        <img src="../assets/img/main/lesson.png" height="54" width="54"/>
+                        <div class="liRight">
+                            <h5>剩余课时</h5>
+                            <span>{{ TotalRemainNormalhour +  TotalRemainGifthour}}
+                            </span>
+                        </div>
+                        <div class="btLine">
+                            <em class="emlt">
+                                <i class="el-icon-caret-top"></i>
+                                正常课时 {{ TotalRemainNormalhour }}
+                            </em>
+                            <em class="emlt">
+                                <i class="el-icon-caret-top"></i>
+                                赠送课时 {{ TotalRemainGifthour }}
+                            </em>
+                        </div>
+                    </li>
                 </ul>
             </div>
 
@@ -72,9 +91,13 @@
                             <em>
 
                             </em>
-                            <el-button type="primary" plain @click="goFinish(c)" v-if="c.FinishClass == 0">上课</el-button>
-                            <el-button type="primary" plain @click="checkClassOverPrepare(c)" v-if="c.FinishClass == 2">管理</el-button>
-                            <el-button type="primary" plain @click="goFinish(c)"  v-if="c.FinishClass == 3">编辑</el-button>
+                            <el-button type="primary" plain @click="goFinish(c)" v-if="c.FinishClass == 0">上课
+                            </el-button>
+                            <el-button type="primary" plain @click="checkClassOverPrepare(c)" v-if="c.FinishClass == 2">
+                                管理
+                            </el-button>
+                            <el-button type="primary" plain @click="goFinish(c)" v-if="c.FinishClass == 3">编辑
+                            </el-button>
                         </div>
                     </li>
                     <span class="tips" v-if="PreFinishList == 0">
@@ -166,6 +189,7 @@
         ClassStatistics,
         ClassOverPrepare,
         VipUserOrderQuery,
+        ClassHourStatistics,
         LastOrderQuery,
     } from "../api/getApiRes";
 
@@ -189,15 +213,18 @@
                 TodayOrderNum: 0,
                 ClassNum: 0,
                 TodayOrderSttNum: 0,
+                TotalRemainNormalhour: 0,
+                TotalRemainGifthour: 0,
+                userLevel: localStorage.userLevel,
             }
         },
         mounted() {
             let that = this;
-
             // 下课管理
             this.getVipUserStatistics();
             this.getClassStatistics();
             this.ClassQuery();
+            this.getClassHourStatistics();
             this.getVipUserOrderQuery();
             // 预约统计
             this.getOrderStatistics();
@@ -211,6 +238,21 @@
                 this.getWaitingBeginClassList();
             }, 10000);
         },
+        watch: {
+            $route(to) {
+                if (to.name == 'Main') {
+                    this.getVipUserStatistics();
+                    this.getClassStatistics();
+                    this.ClassQuery();
+                    this.getClassHourStatistics();
+                    this.getVipUserOrderQuery();
+                    this.getOrderStatistics();
+                    this.getWaitingBeginClassList();
+                } else {
+                    clearInterval(this.timer);//页面销毁时清除定时器
+                }
+            },
+        },
         destroyed() {
             clearInterval(this.timer);//页面销毁时清除定时器
         },
@@ -253,11 +295,11 @@
                         that.CountAdd = json.Rs.CountAdd;
                     } else {
                         if (json.Code == 1010) {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                             that.$router.push({path: '/login', query: {status: 1}});
                             return false
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     }
                 })
@@ -275,7 +317,7 @@
                         that.ClassNum = json.Rs.ClassNum;
                         that.TodayOrderSttNum = json.Rs.TodayOrderSttNum;
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -296,7 +338,7 @@
                             that.YestodayOrderNum = json.Rs.YestodayOrderNum;
                         }
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -336,7 +378,7 @@
                         that.loading = false;
                         that.classList = json.Rs;
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -355,6 +397,22 @@
                         if (json.Rs) {
                             that.PreFinishList = json.Rs;
                         }
+                    } else {
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
+                    }
+                })
+            },
+            getClassHourStatistics() {
+                let that = this;
+                let param = {
+                    token: localStorage.token,
+                };
+                let postdata = qs.stringify(param);
+                ClassHourStatistics(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        that.TotalRemainNormalhour = json.Rs.TotalRemainNormalhour;
+                        that.TotalRemainGifthour = json.Rs.TotalRemainGifthour;
                     } else {
                         that.$message.error(json.Memo);
                     }
@@ -380,7 +438,7 @@
                             that.appointList = json.Rs;
                         }
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             }
@@ -395,20 +453,6 @@
                 }
             },
         },
-        watch: {
-            $route(to) {
-                if (to.name == 'Main') {
-                    this.getVipUserStatistics();
-                    this.getClassStatistics();
-                    this.ClassQuery();
-                    this.getVipUserOrderQuery();
-                    this.getOrderStatistics();
-                    this.getWaitingBeginClassList();
-                } else {
-                    clearInterval(this.timer);//页面销毁时清除定时器
-                }
-            },
-        },
     }
 </script>
 
@@ -500,6 +544,11 @@
         margin-bottom: 20px;
     }
 
+    .liRight em {
+        font-size: 14px;
+        text-align: right;
+    }
+
     .btLine {
         width: 84%;
         overflow: hidden;
@@ -601,11 +650,13 @@
         border-top-right-radius: 7px;
         color: #000;
     }
+
     li .finListTitle em {
         float: left;
         color: #fff;
         padding-left: 5%;
     }
+
     li .finListTitle s {
         float: right;
         text-decoration: none;
@@ -635,6 +686,7 @@
         line-height: 30px;
         color: #BDBDBD;
     }
+
     .context button {
         height: 30px;
         line-height: 30px;
@@ -965,6 +1017,12 @@
         margin-top: 180px;
     }
 
+    .esmall {
+        float: right;
+        font-size: 14px;
+        text-align: right;
+    }
+
     /*ipad only*/
     @media only screen and (max-width: 1366px) {
         .container {

pc/src/views/Member.vue

@@ -564,7 +564,7 @@
                             console.log('null');
                         }
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -590,7 +590,7 @@
                         // 读取列表
                         this.getTableQuery();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -644,7 +644,7 @@
                             // table 重载
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     })
                 }).catch(() => {
@@ -679,7 +679,7 @@
                             // table 重载
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     })
                 }).catch(() => {
@@ -854,7 +854,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -929,7 +929,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -957,7 +957,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -984,7 +984,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -1012,7 +1012,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -1041,7 +1041,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -1063,7 +1063,7 @@
                         if (json.Rs == null) return false
                         that.form.dialogdata = turnClassResToOption(json.Rs);
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -1108,7 +1108,7 @@
                             // 重载列表
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     });
                 }).catch(() => {
@@ -1182,7 +1182,7 @@
                         // 设置分页数据
                         that.setPaginations();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },

pc/src/views/Pwd.vue

@@ -111,7 +111,7 @@
                         that.again = '';
                         that.logoutPage();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 });
             },
@@ -129,7 +129,7 @@
                             }
                         })
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             }

pc/src/views/ShopManage.vue

@@ -14,8 +14,8 @@
               <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>
+              <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>
@@ -73,7 +73,7 @@
         </el-table-column>
         <el-table-column
             prop="Phone"
-            label="手机号"
+            label="联系电话"
         >
         </el-table-column>
       </el-table>
@@ -98,7 +98,7 @@
           <el-form-item label="负责人">
             <el-input v-model="form.contacts"></el-input>
           </el-form-item>
-          <el-form-item label="手机号">
+          <el-form-item label="联系电话">
             <el-input v-model="form.phone"></el-input>
           </el-form-item>
         </el-form>
@@ -211,13 +211,13 @@ export default {
         return false
       }
       if (!that.form.phone) {
-        this.$message.error('错了哦，手机号不能为空');
-        return false
-      }
-      if (!globalCheckPhone(that.form.phone)) {
-        this.$message.error('错了哦，手机号格式不正确');
+        this.$message.error('错了哦，联系电话不能为空');
         return false
       }
+      // if (!globalCheckPhone(that.form.phone)) {
+      //   this.$message.error('错了哦，联系电话格式不正确');
+      //   return false
+      // }
       let param = {
         token: localStorage.token,
         shopName: that.form.shopName,
@@ -240,7 +240,7 @@ export default {
             type: 'success'
           });
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -273,13 +273,13 @@ export default {
         return false
       }
       if (!that.form.phone) {
-        this.$message.error('错了哦，手机号不能为空');
-        return false
-      }
-      if (!globalCheckPhone(that.form.phone)) {
-        this.$message.error('错了哦，手机号格式不正确');
+        this.$message.error('错了哦，联系电话不能为空');
         return false
       }
+      // if (!globalCheckPhone(that.form.phone)) {
+      //   this.$message.error('错了哦，联系电话格式不正确');
+      //   return false
+      // }
       let param = {
         token: localStorage.token,
         shopName: that.form.shopName,
@@ -303,7 +303,7 @@ export default {
             type: 'success'
           });
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -339,7 +339,7 @@ export default {
             // 重载列表
             that.getTableQuery();
           } else {
-            that.$message.error(json.Memo);
+            that.$message.error(json.Memo + '错误码：' + json.Code);
           }
         });
       }).catch(() => {
@@ -432,7 +432,7 @@ export default {
           // 设置分页数据
           that.setPaginations();
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },

pc/src/views/appoint.vue

@@ -462,7 +462,7 @@
                         } else {
                             // 状态返回
                             appoint.WxOrder = e == 0 ? 1 : 0;
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     })
                 }).catch(() => {
@@ -486,7 +486,7 @@
                         that.panel.classOptions = turnClassResToOption(json.Rs);
                         that.panel.classOptions.unshift({value: '0', label: '全部'})
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -508,7 +508,7 @@
                                 that.form.userId = '';
                                 that.form.userList = turnResToOptionBySimViper(json.Rs);
                             } else {
-                                that.$message.error(json.Memo);
+                                that.$message.error(json.Memo + '错误码：' + json.Code);
                             }
                         })
                     }
@@ -536,7 +536,7 @@
                     if (json.Code == 0) {
                         that.form.stdList = turnStdToOption(json.Rs);
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
 
@@ -560,7 +560,7 @@
                         this.getTableQuery2();
                         that.dialogMemberVisible = false;
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -592,7 +592,7 @@
                         this.gridData = json.Rs;
                         console.log(123);
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -623,7 +623,7 @@
                             // table 重载
                             that.getTableQuery2();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     })
                 }).catch(() => {
@@ -658,7 +658,7 @@
                             // table 重载
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     })
                 }).catch(() => {
@@ -693,7 +693,7 @@
                             // table 重载
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     })
                 }).catch(() => {
@@ -875,7 +875,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -929,7 +929,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -957,7 +957,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -985,7 +985,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -1013,7 +1013,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -1041,7 +1041,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -1070,7 +1070,7 @@
                     if (json.Code == 0) {
                         that.form.stdList = turnStdToOption(json.Rs);
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -1120,7 +1120,7 @@
                             // 重载列表
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     });
                 }).catch(() => {
@@ -1183,7 +1183,7 @@
                         // 设置分页数据
                         that.setPaginations();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -1214,7 +1214,7 @@
                         // 设置分页数据
                         that.setPaginations2();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },

pc/src/views/bindRecord.vue

@@ -275,7 +275,7 @@
                         // 设置分页数据
                         that.setPaginations();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },

pc/src/views/classInfoDetail.vue

@@ -185,7 +185,7 @@
                         // 设置分页数据
                         that.setPaginations();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },

pc/src/views/coach.vue

@@ -225,7 +225,7 @@
                             // table 重载
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     })
                 }).catch(() => {
@@ -260,7 +260,7 @@
                             // table 重载
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     })
                 }).catch(() => {
@@ -319,7 +319,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -363,7 +363,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -391,7 +391,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -448,7 +448,7 @@
                             // 重载列表
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     });
                 }).catch(() => {
@@ -499,7 +499,7 @@
                         // 设置分页数据
                         that.setPaginations();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },

pc/src/views/cost.vue

@@ -352,7 +352,7 @@ export default {
             // table 重载
             that.getTableQuery();
           } else {
-            that.$message.error(json.Memo);
+            that.$message.error(json.Memo + '错误码：' + json.Code);
           }
         })
       }).catch(() => {
@@ -387,7 +387,7 @@ export default {
             // table 重载
             that.getTableQuery();
           } else {
-            that.$message.error(json.Memo);
+            that.$message.error(json.Memo + '错误码：' + json.Code);
           }
         })
       }).catch(() => {
@@ -598,7 +598,7 @@ export default {
             type: 'success'
           });
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -653,7 +653,7 @@ export default {
             type: 'success'
           });
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -681,7 +681,7 @@ export default {
             type: 'success'
           });
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -709,7 +709,7 @@ export default {
             type: 'success'
           });
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -737,7 +737,7 @@ export default {
             type: 'success'
           });
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -765,7 +765,7 @@ export default {
             type: 'success'
           });
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -784,7 +784,7 @@ export default {
           that.panel.options = turnClassResToOption(json.Rs);
           that.panel.options.unshift({label: "全部", value: ''})
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -841,7 +841,7 @@ export default {
             // 重载列表
             that.getTableQuery();
           } else {
-            that.$message.error(json.Memo);
+            that.$message.error(json.Memo + '错误码：' + json.Code);
           }
         });
       }).catch(() => {
@@ -909,7 +909,7 @@ export default {
           // 设置分页数据
           that.setPaginations();
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },

pc/src/views/courseEdit.vue

@@ -406,7 +406,7 @@
                         // 重置心率带可选列表
                         // that.getSelectHrSensors();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -445,7 +445,7 @@
                             // 重置心率带可选列表
                             // that.getSelectHrSensors();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     })
                 }).catch(() => {
@@ -482,7 +482,7 @@
                     if (json.Code == 0) {
                         that.form.dialogCoachdata = turnResToOptionByUsers(json.Rs);
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -514,7 +514,7 @@
                         // that.$router.push({path: '/finish'});
                         this.$router.go(-1);
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -598,7 +598,7 @@
                         // that.FinishClass = 2;
                         // that.getTableQuery();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -640,7 +640,7 @@
                         that.form.dialogdata = turnResToOptionBySimViper(json.Rs);
                         console.log(that.form.dialogdata);
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -669,7 +669,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -693,7 +693,7 @@
                         // table 重载
                         that.getTableQuery();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -721,7 +721,7 @@
                             });
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     })
                 }).catch(() => {
@@ -768,7 +768,7 @@
                         that.loading = false;
                         if (json.Rs) {
                             // 分队处理
-                            // 未上课的分，已上课的旧的不处理，新人需要处理
+                            // 未上课的分队，已上课的旧的不处理，新人需要处理
                             if (that.FinishClass == 3) {
                                 if (that.ClassType == 2) {
                                     that.TurnUnit(json.Rs);
@@ -781,9 +781,10 @@
                                 // 已上课的状态
                                 json.Rs.map(function (item, i) {
                                     if (that.ClassType == 2) {
-                                        if (item.group_no == 0) {
-                                            item.group_no = i % that.PkNum;
-                                            console.log(i % that.PkNum);
+                                        if (item.GroupNo == 0) {
+                                            item.group_no = i % that.PkNum + 1;
+                                        } else {
+                                            item.group_no = item.GroupNo;
                                         }
                                     } else {
                                         item.group_no = item.GroupNo;
@@ -799,7 +800,7 @@
                         // 设置分页数据
                         that.setPaginations();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -852,7 +853,7 @@
                             that.panel.bindList = [];
                         }
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -944,7 +945,7 @@
                         });
                         this.getTableQuery();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             }

pc/src/views/courses.vue

@@ -370,7 +370,7 @@
                         this.getTableQuery();
 
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -400,7 +400,7 @@
                         that.dialogMemberVisible = false;
                         this.getTableQuery();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -449,7 +449,7 @@
                     if (json.Code == 0) {
                         that.form.svList = json.Rs;
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -470,7 +470,7 @@
                                 that.form.userId = '';
                                 that.form.userList = turnResToOptionBySimViper(json.Rs);
                             } else {
-                                that.$message.error(json.Memo);
+                                that.$message.error(json.Memo + '错误码：' + json.Code);
                             }
                         })
                     }
@@ -510,7 +510,7 @@
                     if (json.Code == 0) {
                         that.goFinish(row);
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -570,7 +570,7 @@
                         // 设置分页数据
                         that.setPaginations();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },

pc/src/views/coursesHistory.vue

@@ -368,7 +368,7 @@
                             }
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -398,7 +398,7 @@
                         that.dialogMemberVisible = false;
                         this.getTableQuery();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -445,7 +445,7 @@
                     if (json.Code == 0) {
                         that.form.svList = json.Rs;
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -466,7 +466,7 @@
                                 that.form.userId = '';
                                 that.form.userList = turnResToOptionBySimViper(json.Rs);
                             } else {
-                                that.$message.error(json.Memo);
+                                that.$message.error(json.Memo + '错误码：' + json.Code);
                             }
                         })
                     }
@@ -504,7 +504,7 @@
                     if (json.Code == 0) {
                         that.goFinish(row);
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -564,7 +564,7 @@
                         // 设置分页数据
                         that.setPaginations();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },

pc/src/views/finish.vue

@@ -172,7 +172,7 @@
                     if (json.Code == 0) {
                         that.goFinish(row);
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -214,7 +214,7 @@
                         // 设置分页数据
                         that.setPaginations();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },

pc/src/views/finishDetail.vue

@@ -275,7 +275,7 @@
                     if (json.Code == 0) {
                         that.form.dialogCoachdata = turnResToOptionByUsers(json.Rs);
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -295,7 +295,7 @@
                         that.form.dialogdata = turnResToOptionBySimViper(json.Rs);
                         console.log(that.form.dialogdata);
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -323,7 +323,7 @@
                             });
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     })
                 }).catch(() => {
@@ -372,7 +372,7 @@
                         // table 重载
                         that.getTableQuery();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -410,7 +410,7 @@
                         });
                         that.getTableQuery()
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -442,7 +442,7 @@
                         // that.$router.push({path: '/finish'});
                         this.$router.go(-1);
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -469,7 +469,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -544,7 +544,7 @@
                             // 重载列表
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     });
                 }).catch(() => {
@@ -610,7 +610,7 @@
                         // 设置分页数据
                         that.setPaginations();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },

pc/src/views/heartEquip.vue

@@ -301,7 +301,7 @@
                             // table 重载
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     })
                 }).catch(() => {
@@ -359,7 +359,7 @@
                         row.TopLimit = json.Rs.TopLimit;
                         row.ConsumeHour = json.Rs.ConsumeHour;
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -394,7 +394,7 @@
                         // table 重载
                         that.getTableQuery();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -422,7 +422,7 @@
             //                 // table 重载
             //                 that.getTableQuery();
             //             } else {
-            //                 that.$message.error(json.Memo);
+            //                 that.$message.error(json.Memo + '错误码：' + json.Code);
             //             }
             //         })
             //     }).catch(() => {
@@ -457,7 +457,7 @@
                             // table 重载
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     })
                 }).catch(() => {
@@ -493,7 +493,7 @@
                             // 重载列表
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     });
                 }).catch(() => {
@@ -552,7 +552,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -597,7 +597,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -625,7 +625,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -668,7 +668,7 @@
                             // 重载列表
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     });
                 }).catch(() => {
@@ -722,7 +722,7 @@
                         // 设置分页数据
                         that.setPaginations();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },

pc/src/views/heartEquipPerson.vue

@@ -278,7 +278,7 @@
                         that.form.userId = '';
                         that.form.userList = turnResToOptionBySimViper(json.Rs);
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -318,7 +318,7 @@
                             // table 重载
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     })
                 }).catch(() => {
@@ -376,7 +376,7 @@
                         row.TopLimit = json.Rs.TopLimit;
                         row.ConsumeHour = json.Rs.ConsumeHour;
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -412,7 +412,7 @@
                         that.getTableQuery();
                         that.vipSelect();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -440,7 +440,7 @@
             //                 // table 重载
             //                 that.getTableQuery();
             //             } else {
-            //                 that.$message.error(json.Memo);
+            //                 that.$message.error(json.Memo + '错误码：' + json.Code);
             //             }
             //         })
             //     }).catch(() => {
@@ -475,7 +475,7 @@
                             // table 重载
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     })
                 }).catch(() => {
@@ -511,7 +511,7 @@
                             // 重载列表
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     });
                 }).catch(() => {
@@ -561,7 +561,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -598,7 +598,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -626,7 +626,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -669,7 +669,7 @@
                             // 重载列表
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     });
                 }).catch(() => {
@@ -724,7 +724,7 @@
                         // 设置分页数据
                         that.setPaginations();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },

pc/src/views/heartLog.vue

@@ -200,7 +200,7 @@
                             // 重载列表
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     });
                 }).catch(() => {
@@ -266,7 +266,7 @@
                             // 重载列表
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     });
                 }).catch(() => {
@@ -337,7 +337,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -376,7 +376,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -421,7 +421,7 @@
                         // 设置分页数据
                         that.setPaginations();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -501,7 +501,7 @@
                             // table 重载
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     })
                 }).catch(() => {
@@ -540,7 +540,7 @@
                             // table 重载
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     })
                 }).catch(() => {

pc/src/views/lessonManage.vue

@@ -281,7 +281,7 @@ export default {
           that.previewDate.SttPreviewClassList.sort((a, b) => a.ClassIndex - b.ClassIndex);//升序
           that.previewShow = true;
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -333,7 +333,7 @@ export default {
             // 重载列表
             that.getTableQuery();
           } else {
-            that.$message.error(json.Memo);
+            that.$message.error(json.Memo + '错误码：' + json.Code);
           }
         });
       }).catch(() => {
@@ -375,7 +375,7 @@ export default {
           this.getTableQuery();
           this.dialogNameVisible = false;
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -404,7 +404,7 @@ export default {
           this.dialogCopyVisible = false;
           this.getTableQuery();
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -456,7 +456,7 @@ export default {
           that.getTableQuery();
           this.dialogVisible = false;
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       });
     },
@@ -480,7 +480,7 @@ export default {
           // 重载列表
           that.getTableQuery();
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       });
     },
@@ -537,7 +537,7 @@ export default {
           // 设置分页数据
           that.setPaginations();
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -613,7 +613,7 @@ export default {
           // 重载列表
           that.getTableQuery();
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
           row.Online = 0;
         }
       })

pc/src/views/record.vue

@@ -248,7 +248,7 @@ export default {
           that.panel.classOptions = turnClassResToOption(json.Rs);
           that.panel.classOptions.unshift({value: '', label: '全部'})
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -307,7 +307,7 @@ export default {
           // 设置分页数据
           that.setPaginations();
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },

pc/src/views/region.vue

@@ -42,15 +42,15 @@
                         width="180">
                 </el-table-column>
                 <!--<el-table-column-->
-                        <!--prop="Status"-->
-                        <!--label="状态"-->
-                        <!--width="180">-->
-                    <!--&lt;!&ndash;1：启用，8：暂停，9：删除&ndash;&gt;-->
-                    <!--<template slot-scope="scope">-->
-                        <!--<span v-if="scope.row.Status == 1" style="color: rgb(103, 194, 58)">已启用</span>-->
-                        <!--<span v-if="scope.row.Status == 8" style="color: #E6A23C">已暂停</span>-->
-                        <!--<span v-if="scope.row.Status == 9" style="color: red">已删除</span>-->
-                    <!--</template>-->
+                <!--prop="Status"-->
+                <!--label="状态"-->
+                <!--width="180">-->
+                <!--&lt;!&ndash;1：启用，8：暂停，9：删除&ndash;&gt;-->
+                <!--<template slot-scope="scope">-->
+                <!--<span v-if="scope.row.Status == 1" style="color: rgb(103, 194, 58)">已启用</span>-->
+                <!--<span v-if="scope.row.Status == 8" style="color: #E6A23C">已暂停</span>-->
+                <!--<span v-if="scope.row.Status == 9" style="color: red">已删除</span>-->
+                <!--</template>-->
                 <!--</el-table-column>-->
                 <el-table-column
                         prop="id"
@@ -58,14 +58,14 @@
                 >
                     <template slot-scope="scope">
                         <!--<el-button type="success" v-if="scope.row.Status == 8" size="mini"-->
-                                   <!--@click="pauseRow(scope.row,1)">-->
-                            <!--启用-->
+                        <!--@click="pauseRow(scope.row,1)">-->
+                        <!--启用-->
                         <!--</el-button>-->
                         <!--<el-button type="warning" v-if="scope.row.Status == 1" size="mini"-->
-                                   <!--@click="pauseRow(scope.row,8)">-->
-                            <!--暂停-->
+                        <!--@click="pauseRow(scope.row,8)">-->
+                        <!--暂停-->
                         <!--</el-button>-->
-                        <el-button type="danger"  size="mini"
+                        <el-button type="danger" size="mini"
                                    @click="pauseRowDel(scope.row)">
                             删除
                         </el-button>
@@ -217,7 +217,7 @@
             //                 // table 重载
             //                 that.getTableQuery();
             //             } else {
-            //                 that.$message.error(json.Memo);
+            //                 that.$message.error(json.Memo + '错误码：' + json.Code);
             //             }
             //         })
             //     }).catch(() => {
@@ -253,7 +253,7 @@
                             // 重载列表
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     });
                 }).catch(() => {
@@ -267,7 +267,7 @@
             pauseRow(row, status) {
                 let that = this;
                 let param = {
-                    key : localStorage.ServiceKey,
+                    key: localStorage.ServiceKey,
                     shopId: localStorage.ServiceId,
                     svId: row.SvId,
                     status: status,
@@ -284,7 +284,7 @@
                         // table 重载
                         that.getTableQuery();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -338,7 +338,7 @@
                         row.TopLimit = json.Rs.TopLimit;
                         row.ConsumeHour = json.Rs.ConsumeHour;
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -378,7 +378,7 @@
             //                 // table 重载
             //                 that.getTableQuery();
             //             } else {
-            //                 that.$message.error(json.Memo);
+            //                 that.$message.error(json.Memo + '错误码：' + json.Code);
             //             }
             //         })
             //     }).catch(() => {
@@ -413,7 +413,7 @@
             //                 // table 重载
             //                 that.getTableQuery();
             //             } else {
-            //                 that.$message.error(json.Memo);
+            //                 that.$message.error(json.Memo + '错误码：' + json.Code);
             //             }
             //         })
             //     }).catch(() => {
@@ -463,7 +463,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -498,7 +498,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -526,7 +526,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -568,7 +568,7 @@
                             // 重载列表
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     });
                 }).catch(() => {
@@ -619,7 +619,11 @@
                         // 设置分页数据
                         that.setPaginations();
                     } else {
-                        that.$message.error(json.Memo);
+                        if (!localStorage.ServiceKey) {
+                            that.$message.error('还未与心率系统对接，请联系管理员');
+                        } else {
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
+                        }
                     }
                 })
             },

pc/src/views/region2.vue

@@ -109,7 +109,7 @@ export default {
             that.tableData = [];
           }
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -152,4 +152,4 @@ ul {
 #queryBtn {
   float: right;
 }
-</style>
+</style>

pc/src/views/regionEquip.vue

@@ -131,7 +131,7 @@ export default {
           that.panel.shopOptions = turnShopResToOption(json.Rs);
           that.panel.shopOptions.unshift({value: '', label: "全部"});
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -151,7 +151,7 @@ export default {
           that.panel.options.unshift({value: '', label: "全部"});
           console.log(that.panel.options);
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },
@@ -224,7 +224,7 @@ export default {
           // 设置分页数据
           that.setPaginations();
         } else {
-          that.$message.error(json.Memo);
+          that.$message.error(json.Memo + '错误码：' + json.Code);
         }
       })
     },

pc/src/views/relevancePhone.vue

@@ -181,7 +181,7 @@
                             // 重载列表
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     });
                 }).catch(() => {
@@ -250,7 +250,7 @@
                             // 重载列表
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     });
                 }).catch(() => {
@@ -324,7 +324,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -368,7 +368,7 @@
                             type: 'success'
                         });
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -412,7 +412,7 @@
                         // 设置分页数据
                         that.setPaginations();
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -492,7 +492,7 @@
                             // table 重载
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     })
                 }).catch(() => {
@@ -531,7 +531,7 @@
                             // table 重载
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     })
                 }).catch(() => {

pc/src/views/setting.vue

@@ -128,7 +128,7 @@
                     if (json.Code == 0) {
                         this.appoint = json.Rs.WxStatus;
                     } else {
-                        that.$message.error(json.Memo);
+                        that.$message.error(json.Memo + '错误码：' + json.Code);
                     }
                 })
             },
@@ -158,7 +158,7 @@
                             // table 重载
                             that.getTableQuery();
                         } else {
-                            that.$message.error(json.Memo);
+                            that.$message.error(json.Memo + '错误码：' + json.Code);
                         }
                     })
                 }).catch(() => {

tv/README.md

@@ -18,10 +18,12 @@
 
 部署步骤
 
-1.获取设备的UUID
-    安装mefisto.getUUID app 写入区域列表
-
-2.
+前端篇
+1） 将中间件的IP地址和端口号填入 main.js 中
+2） 打开打包软件，hbuild，校验版本号
+3） 打包APP （注意打包为正式版
+4） 打开APP后，点击小飞龙logo获取uuid，在管理端添加当前区域
+5） 重启APP（非必须
 
 
 

tv/src/Global.js

@@ -441,6 +441,7 @@ fakeNews = function (num, team) {
                 "name": "测试人",
                 "updateTime": 1604568915582,
                 "Ck": nums + i * 2.2,
+                "formatCk":parseInt(Math.random() * 100 + 50),
                 "Head": "http://192.168.0.2/zw.png",
                 "GroupNo": i % teamNum + 1
             }

tv/src/views/pk.vue

@@ -33,7 +33,8 @@
                                 <div class="umd">
                                     <div class="circle">
                                         <img :class="s.sportLevel" :src="s.Head" alt="" v-if="s.Head">
-                                        <img :class="s.sportLevel" src="../static/img/people/flyhead.png" alt="" v-if="!s.Head">
+                                        <img :class="s.sportLevel" src="../static/img/people/flyhead.png" alt=""
+                                             v-if="!s.Head">
                                     </div>
                                 </div>
                                 <div class="urt">
@@ -122,7 +123,8 @@
                                 <div class="umd">
                                     <div class="circle">
                                         <img :class="s.sportLevel" :src="s.Head" alt="" v-if="s.Head">
-                                        <img :class="s.sportLevel" src="../static/img/people/flyhead.png" alt="" v-if="!s.Head">
+                                        <img :class="s.sportLevel" src="../static/img/people/flyhead.png" alt=""
+                                             v-if="!s.Head">
                                     </div>
                                 </div>
                                 <div class="urt">
@@ -197,7 +199,6 @@
             if (this.trueDate) {
                 this.PkTimer = setInterval(() => {
                     this.GetgetUserList();
-
                     this.curgetClassStat();
                 }, 1000);
                 this.GetgetUserList();
@@ -227,7 +228,7 @@
                 let Dp = json.Dp;
                 that.ReadLessonInfo(Dp);
                 // 载入学生信息
-                let Rs = fakeNews(16);
+                let Rs = fakeNews(16, 2);
                 that.UniteBreak(Rs);
 
                 // 人口总数
@@ -237,6 +238,7 @@
         },
         watch: {
             '$route': function (val) {
+                let that = this;
                 if (val.path == '/pk') {
                     if (this.trueDate) {
                         this.PkTimer = setInterval(() => {
@@ -325,6 +327,7 @@
 
                 // pkVal
                 let sumMax = redFmtSum + blueFmtSum;
+                console.log(redFmtSum);
 
                 // 当为0时均分
                 if (sumMax == 0) {
@@ -333,7 +336,6 @@
                     // 限制最大
                     let pkval = parseInt((redFmtSum / sumMax) * 100) > 100 ? 100 : parseInt((redFmtSum / sumMax) * 100);
                     that.pkVal = pkval + '%';
-                    console.log(pkval);
                 }
             },
             // 获取上课学生信息
@@ -896,6 +898,7 @@
     }
 
     .partInfo .title img {
+        width: 0.4rem;
         float: left;
         margin-right: 0.2rem;
     }