= - =

genkey/readme.txt

@@ -1,2 +1,8 @@
 pwd
-asdf*123
+asdf*123
+
+GoAllOut.keystore
+是TV版的
+
+xflylongonling.keystore
+是online版的

hbuild/online/manifest.json

@@ -23,9 +23,6 @@
         "Console" : {
             "description" : "跟踪调试输出日志"
         },
-        "Contacts" : {
-            "description" : "访问系统联系人信息"
-        },
         "Events" : {
             "description" : "应用扩展事件"
         },
@@ -63,29 +60,24 @@
                 "password" : "", /*Android应用打包使用密钥库中证书的密码*/
                 "aliasname" : "", /*Android应用打包使用密钥库中证书的别名*/
                 "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
                     "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"com.android.launcher.permission.UNINSTALL_SHORTCUT\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-                    "<uses-permission android:name=\"com.android.launcher.permission.INSTALL_SHORTCUT\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },
@@ -182,7 +174,8 @@
                         "appkey_ios" : "",
                         "appkey_android" : ""
                     }
-                }
+                },
+                "ad" : {}
             }
         }
     },

online/src/api/getApiRes.js

@@ -71,97 +71,103 @@ export function PhoneSignIn(postdata) {
     return getApiBasic(url,postdata);
 }
 
-// 用户微信绑定
-export function WXBind(postdata) {
-    let url = headapi + 'v1/Auth/WXBind';
-    return getApiBasic(url,postdata);
-}
-
-// 用户微信登录
-export function WXSignIn(postdata) {
-    let url = headapi + 'v1/Auth/WXSignIn';
-    return getApiBasic(url,postdata);
-}
-
-// 用户微信解除绑定
-export function WXUnbind(postdata) {
-    let url = headapi + 'v1/Auth/WXUnbind';
-    return getApiBasic(url,postdata);
-}
-
-
-// Weixin
-
-// 预约课程
-export function OderAddByVipUser(postdata) {
-    let url = headapi + 'v1/Weixin/OderAddByVipUser';
-    return getApiBasic(url,postdata);
-}
-
-// 取消预约
-export function OderCancelByVipUser(postdata) {
-    let url = headapi + 'v1/Weixin/OderCancelByVipUser';
-    return getApiBasic(url,postdata);
-}
-// 预约记录查询
-export function OrderListQuery(postdata) {
-    let url = headapi + 'v1/Weixin/OrderListQuery';
-    return getApiBasic(url,postdata);
-}
-// 可预约店铺信息查询
-export function OrderShopQuery(postdata) {
-    let url = headapi + 'v1/Weixin/OrderShopQuery';
-    return getApiBasic(url,postdata);
-}
-// 可预约课程列表查询(未完成)
-export function CanOrderSchoolTimeTableListQuery(postdata) {
-    let url = headapi + 'v1/Weixin/CanOrderSchoolTimeTableListQuery';
-    return getApiBasic(url,postdata);
-}
-// 消费记录查询
-export function VipUserConsumeListQuery(postdata) {
-    let url = headapi + 'v1/Weixin/VipUserConsumeListQuery';
-    return getApiBasic(url,postdata);
-}
-// 用户自身信息查询
-export function VipUserSelfQuery(postdata) {
-    let url = headapi + 'v1/Weixin/VipUserSelfQuery';
-    return getApiBasic(url,postdata);
-}
-
-// 某日课程表查询
-export function SchoolTimeQueryByDate(postdata) {
-    let url = headapi + 'v1/Weixin/SchoolTimeQueryByDate';
-    return getApiBasic(url,postdata);
-}
-
-// 通过session查询用户自身信息
-export function ManagerSelfQuery(postdata) {
-    let url = headapi + 'v1/User/ManagerSelfQuery';
-    return getApiBasic(url,postdata);
-}
-
-// 课程表预览
-export function SchoolTimetablePreview(postdata) {
-    let url = headapi + 'v1/SchoolTimeTable/SchoolTimetablePreview';
-    return getApiBasic(url, postdata);
-}
-// CleCk查询
-export function VipUserCleCkSum(postdata) {
-    let url = headapi + 'v1/Weixin/VipUserCleCkSum';
-    return getApiBasic(url, postdata);
-}
-// 查询下周是否有课
-export function QueryNextWeek(postdata) {
-    let url = headapi + 'v1/Weixin/QueryNextWeek';
-    return getApiBasic(url, postdata);
-}
-
-
-// 用户店铺信息查询
-export function MyShopQuery(postdata) {
-    let url = headapi + 'v1/Weixin/MyShopQuery';
-    return getApiBasic(url, postdata);
-}
-
-
+// 查询用户自身信息
+export function UserSelfQuery(postdata) {
+    let url = headapi + 'v1/User/UserSelfQuery';
+    return getApiBasic(url,postdata);
+}
+
+// // 用户微信绑定
+// export function WXBind(postdata) {
+//     let url = headapi + 'v1/Auth/WXBind';
+//     return getApiBasic(url,postdata);
+// }
+//
+// // 用户微信登录
+// export function WXSignIn(postdata) {
+//     let url = headapi + 'v1/Auth/WXSignIn';
+//     return getApiBasic(url,postdata);
+// }
+//
+// // 用户微信解除绑定
+// export function WXUnbind(postdata) {
+//     let url = headapi + 'v1/Auth/WXUnbind';
+//     return getApiBasic(url,postdata);
+// }
+//
+//
+// // Weixin
+//
+// // 预约课程
+// export function OderAddByVipUser(postdata) {
+//     let url = headapi + 'v1/Weixin/OderAddByVipUser';
+//     return getApiBasic(url,postdata);
+// }
+//
+// // 取消预约
+// export function OderCancelByVipUser(postdata) {
+//     let url = headapi + 'v1/Weixin/OderCancelByVipUser';
+//     return getApiBasic(url,postdata);
+// }
+// // 预约记录查询
+// export function OrderListQuery(postdata) {
+//     let url = headapi + 'v1/Weixin/OrderListQuery';
+//     return getApiBasic(url,postdata);
+// }
+// // 可预约店铺信息查询
+// export function OrderShopQuery(postdata) {
+//     let url = headapi + 'v1/Weixin/OrderShopQuery';
+//     return getApiBasic(url,postdata);
+// }
+// // 可预约课程列表查询(未完成)
+// export function CanOrderSchoolTimeTableListQuery(postdata) {
+//     let url = headapi + 'v1/Weixin/CanOrderSchoolTimeTableListQuery';
+//     return getApiBasic(url,postdata);
+// }
+// // 消费记录查询
+// export function VipUserConsumeListQuery(postdata) {
+//     let url = headapi + 'v1/Weixin/VipUserConsumeListQuery';
+//     return getApiBasic(url,postdata);
+// }
+// // 用户自身信息查询
+// export function VipUserSelfQuery(postdata) {
+//     let url = headapi + 'v1/Weixin/VipUserSelfQuery';
+//     return getApiBasic(url,postdata);
+// }
+//
+// // 某日课程表查询
+// export function SchoolTimeQueryByDate(postdata) {
+//     let url = headapi + 'v1/Weixin/SchoolTimeQueryByDate';
+//     return getApiBasic(url,postdata);
+// }
+//
+// // 通过session查询用户自身信息
+// export function ManagerSelfQuery(postdata) {
+//     let url = headapi + 'v1/User/ManagerSelfQuery';
+//     return getApiBasic(url,postdata);
+// }
+//
+// // 课程表预览
+// export function SchoolTimetablePreview(postdata) {
+//     let url = headapi + 'v1/SchoolTimeTable/SchoolTimetablePreview';
+//     return getApiBasic(url, postdata);
+// }
+// // CleCk查询
+// export function VipUserCleCkSum(postdata) {
+//     let url = headapi + 'v1/Weixin/VipUserCleCkSum';
+//     return getApiBasic(url, postdata);
+// }
+// // 查询下周是否有课
+// export function QueryNextWeek(postdata) {
+//     let url = headapi + 'v1/Weixin/QueryNextWeek';
+//     return getApiBasic(url, postdata);
+// }
+//
+//
+// // 用户店铺信息查询
+// export function MyShopQuery(postdata) {
+//     let url = headapi + 'v1/Weixin/MyShopQuery';
+//     return getApiBasic(url, postdata);
+// }
+//
+//

online/src/page/login.vue

@@ -33,6 +33,12 @@
 
 <script>
     import '../Global'
+    import {
+        GetPhoneVFCode,
+        SignIn,
+    } from '../api/getApiRes.js'
+
+    let qs = require('qs');
 
     export default {
         data() {
@@ -95,15 +101,28 @@
             },
             stepCode() {
                 // login ajax todo
-                this.tipsState = true;
-                this.$router.push({path:'/'});
+                let that = this;
+                let param = {
+                    token: localStorage.token,
+                };
+                let postdata = qs.stringify(param);
+                SignIn(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        this.tipsState = true;
+                        this.$router.push({path: '/'});
+                    } else {
+                        this.tipsState = true;
+                        that.$message.error(json.Memo);
+                    }
+                })
             },
             // 获取焦点
-            focusVcode(){
-                this.$nextTick(() =>{
+            focusVcode() {
+                this.$nextTick(() => {
                     this.$refs.vcodeInput.focus()
                 })
-            }
+            },
         }
     }
 </script>
@@ -225,14 +244,18 @@
         height: 50px;
         line-height: 50px;
         font-size: 30px;
-        color: #E75296;
+        /*color: #fff;*/
         text-indent: 40px;
         letter-spacing: 33px;
+        color: transparent;
+        text-shadow: 0 0 0 #E75296;
+        /*E75296*/
     }
 
     .cubesContainer /deep/ .mu-input-line {
         background: none;
     }
+
     .tips {
         float: left;
         margin-left: 15%;

online/src/page/mainpage.vue

@@ -123,8 +123,11 @@
 <script>
     import LineExample from '../components/LineExample'
     import {
-        SchoolTimeQueryByDate,
+        UserSelfQuery,
     } from '../api/getApiRes.js'
+
+    let qs = require('qs');
+
     export default {
         data() {
             return {
@@ -415,6 +418,24 @@
             // 获取基础身体数据
             getBodyInfo() {
                 // todo
+                let that = this;
+                let param = {
+                    token: localStorage.token,
+                };
+                let postdata = qs.stringify(param);
+                UserSelfQuery(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        that.username = json.Rs.username;
+                        that.sex = json.Rs.sex;
+                        that.height = json.Rs.height;
+                        that.age = json.Rs.age;
+                        that.weight = json.Rs.weight;
+                        that.peaceHeart = json.Rs.peaceHeart;
+                    } else {
+                        that.$message.error(json.Memo);
+                    }
+                })
             }
             ,
             parseHeartRate(data) {

pc/src/views/courseEdit.vue

@@ -33,7 +33,7 @@
                 <el-button @click="confirmBegin" type="primary" :disabled="BeginState" :loading="BeginState"
                            v-if="FinishClass == 3">确认上课
                 </el-button>
-              <el-button @click="confirmClose" type="danger" :disabled="!BeginState" >关闭课程</el-button>
+                <el-button @click="confirmClose" type="danger" :disabled="!BeginState">关闭课程</el-button>
                 <el-button @click="addFinish" type="primary" v-if="FinishClass == 2">确认下课</el-button>
                 <el-button @click="addFinishMember">添加上课会员</el-button>
                 <el-button @click="addTempMember" type="warning">添加临时会员</el-button>
@@ -128,17 +128,17 @@
                     <template slot-scope="scope">
                         <!--正式会员-->
                         <div v-if="scope.row.IsTmpUser != 1">
-                        <el-select v-model="scope.row.group_no"
-                                   filterable
-                                   :disabled="FinishClass == 2 && scope.row.DpId != 0"
-                                   placeholder="请选团队">
-                            <el-option
-                                    v-for="item in panel.groupList"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value">
-                            </el-option>
-                        </el-select>
+                            <el-select v-model="scope.row.group_no"
+                                       filterable
+                                       :disabled="FinishClass == 2 && scope.row.DpId != 0"
+                                       placeholder="请选团队">
+                                <el-option
+                                        v-for="item in panel.groupList"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
                         </div>
                         <div v-if="scope.row.IsTmpUser == 1">
                             <el-select v-model="scope.row.group_no"
@@ -165,6 +165,7 @@
                             <el-select v-model="scope.row.BindId"
                                        @change="bindSensorToUser(scope.row)"
                                        @focus="getSelectHrSensors(scope.row)"
+                                       :disabled="scope.row.isOnline == 1"
                                        filterable
                                        v-if="!scope.row.BindId" placeholder="请选心率带">
                                 <el-option
@@ -173,16 +174,18 @@
                                         :label="item.label"
                                         :value="item.HrId">
                                     <!--私有的-->
-                                        <span v-if="item.HrType == 1" style="background: #409eff;color: #fff">
+                                    <span v-if="item.HrType == 1" style="background: #409eff;color: #fff">
                                              {{ item.label }}
                                         </span>
                                     <!--共有的-->
-                                        <span v-else>
+                                    <span v-else>
                                               {{ item.label }}
                                         </span>
                                 </el-option>
                             </el-select>
-                            <el-button @click="takeBack(scope.row)" :type="scope.row.IsPrivate == 1 ?'primary':'danger'" v-if="scope.row.BindId"
+                            <el-button @click="takeBack(scope.row)" :type="scope.row.IsPrivate == 1 ?'primary':'danger'"
+                                       v-if="scope.row.BindId"
+                                       :disabled="scope.row.isOnline == 1"
                                        icon="el-icon-cpu">
                                 {{ scope.row.Sn }} {{scope.row.IsPrivate == 1 ? '私有':''}}
                                 设备收回
@@ -211,6 +214,17 @@
                         </div>
                     </template>
                 </el-table-column>
+                <el-table-column
+                        prop="isOnline"
+                        label="是否网课"
+                        width="120"
+                        sortable
+                >
+                    <template slot-scope="scope">
+                        <el-checkbox label="网课" v-model="scope.row.isOnline" name="type"
+                                     @change="showOrDiss(scope.row)"></el-checkbox>
+                    </template>
+                </el-table-column>
                 <el-table-column
                         prop="Status"
                         label="状态"
@@ -322,7 +336,8 @@
                 </div>
             </div>
             <div class="dialogFooter">
-                <el-button type="primary" size="small" :disabled="BtnAcrossConfirmMember" :loading="BtnAcrossConfirmMember"
+                <el-button type="primary" size="small" :disabled="BtnAcrossConfirmMember"
+                           :loading="BtnAcrossConfirmMember"
                            @click="AcrossConfirmMember">确定
                 </el-button>
                 <el-button size="small" @click="dialogAcrossVisible = false">取消</el-button>
@@ -357,24 +372,24 @@
 
     import Global from '../Global.js'
     import {
-      ClassDetailQuery,
-      ClassOverDetailListQuery,
-      VipUserSimpleQuery,
-      ClassOverDetailAdd,
-      ClassDetailAndSnAdd,
-      ClassOverDetailStatusEdit,
-      ClassOverDetailDel,
-      SelectHrSensors,
-      BindHrSensorsToUser,
-      UnBindHrSensorsToUser,
-      ClassStartConfirm,
-      ShopManagerListQuery,
-      ClassOverConfirm,
-      TmpUserQuery,
-      ClassOverTmpDetailAdd,
-      ClassTmpUserOverDetailDel,
-      BindHrSensorsToTempUser,
-      AcrossUserSimpleQuery, ClassGiveUpConfirm,
+        ClassDetailQuery,
+        ClassOverDetailListQuery,
+        VipUserSimpleQuery,
+        ClassOverDetailAdd,
+        ClassDetailAndSnAdd,
+        ClassOverDetailStatusEdit,
+        ClassOverDetailDel,
+        SelectHrSensors,
+        BindHrSensorsToUser,
+        UnBindHrSensorsToUser,
+        ClassStartConfirm,
+        ShopManagerListQuery,
+        ClassOverConfirm,
+        TmpUserQuery,
+        ClassOverTmpDetailAdd,
+        ClassTmpUserOverDetailDel,
+        BindHrSensorsToTempUser,
+        AcrossUserSimpleQuery, ClassGiveUpConfirm,
     } from "../api/getApiRes";
 
     let qs = require('qs');
@@ -499,6 +514,15 @@
             this.title = this.$route.query.ClassName + ' ' + this.$route.query.BeginStr + '-' + this.$route.query.EndStr;
         },
         methods: {
+            // 禁用或启用绑定心率带
+            showOrDiss(row) {
+                console.log(row);
+                // if (row.isOnline == 1) {
+                //     row.isOnline = 0
+                // } else {
+                //     row.isOnline = 1
+                // }
+            },
             // 请选心率带
             bindSensorToUser(row) {
                 let that = this;
@@ -619,11 +643,11 @@
                     });
                 });
             },
-            takeTempBack(row){
-                 let that = this;
-                if(this.FinishClass == 2){
+            takeTempBack(row) {
+                let that = this;
+                if (this.FinishClass == 2) {
                     that.$message.error('请删除临时会员后重新添加');
-                }else{
+                } else {
                     that.$message.error('临时会员无法替换心率带');
                 }
 
@@ -740,7 +764,8 @@
                 let that = this;
                 // 没绑心率带不能开课,预约未到的不管他
                 for (var i = 0; i < this.tableData.length; i++) {
-                    if (this.tableData[i].Sn == 0 && this.tableData[i].Status != 2) {
+                    console.log(this.tableData[i].isOnline);
+                    if (this.tableData[i].Sn == 0 && this.tableData[i].Status != 2 && this.tableData[i].isOnline != 1) {
                         that.$message.error("会员" + this.tableData[i].Name + '没绑心率带，不能开课');
                         return false
                     }
@@ -787,6 +812,7 @@
                         birthday: row.Birthday,
                         is_tmp_user: row.IsTmpUser,
                         is_private: row.IsPrivate,
+                        isOnline: row.isOnline,
                     }
                 }
                 // 确认上课
@@ -824,53 +850,53 @@
                     }
                 })
             },
-          //关闭课程
-          confirmClose(){
-            this.$confirm('您确认要关闭课程?', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              this.getConfirmClassClose()
-            }).catch(() => {
-              this.$message({
-                type: 'info',
-                message: '已取消'
-              });
-            });
-          },
-          //确认执行关闭课程
-          getConfirmClassClose(){
-            let that = this;
-            let param = {
-              token: localStorage.token,
-              stdId: this.$route.query.StdId,
-            };
-            let postdata = qs.stringify(param);
-            ClassGiveUpConfirm(postdata).then(res => {
-              let json = res;
-              if (json.Code == 0) {
-                that.$message({
-                  showClose: true,
-                  message: '课程关闭成功！',
-                  type: 'success'
-                });
-                // 返回课程管理
-                that.$router.push({
-                  path: '/courses', query: {}
+            //关闭课程
+            confirmClose() {
+                this.$confirm('您确认要关闭课程?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    this.getConfirmClassClose()
+                }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消'
+                    });
                 });
+            },
+            //确认执行关闭课程
+            getConfirmClassClose() {
+                let that = this;
+                let param = {
+                    token: localStorage.token,
+                    stdId: this.$route.query.StdId,
+                };
+                let postdata = qs.stringify(param);
+                ClassGiveUpConfirm(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        that.$message({
+                            showClose: true,
+                            message: '课程关闭成功！',
+                            type: 'success'
+                        });
+                        // 返回课程管理
+                        that.$router.push({
+                            path: '/courses', query: {}
+                        });
 
-              } else {
-                that.$message({
-                  showClose: true,
-                  message: '课程关闭失败',
-                  type: 'success'
-                });
-                that.$message.error(json.Memo + ' 错误码：' + json.Code);
-              }
-            })
+                    } else {
+                        that.$message({
+                            showClose: true,
+                            message: '课程关闭失败',
+                            type: 'success'
+                        });
+                        that.$message.error(json.Memo + ' 错误码：' + json.Code);
+                    }
+                })
 
-          },
+            },
             // 添加下课会员
             addFinishMember() {
                 let that = this;
@@ -882,7 +908,7 @@
                 let std = [];
                 if (this.tableData) {
                     this.tableData.map(function (item) {
-                        if(item.IsTmpUser != 1){
+                        if (item.IsTmpUser != 1) {
                             std.push(item.UserId)
                         }
                     })
@@ -936,7 +962,7 @@
                 let std = [];
                 if (this.tableData) {
                     this.tableData.map(function (item) {
-                        if(item.IsTmpUser == 1){
+                        if (item.IsTmpUser == 1) {
                             std.push(item.UserId)
                         }
                     })
@@ -953,7 +979,7 @@
                 let std = [];
                 if (this.tableData) {
                     this.tableData.map(function (item) {
-                            std.push(item.UserId)
+                        std.push(item.UserId)
                     })
                 }
                 that.dialogAcrossValue = std;