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

pc/src/router/index.js

@@ -276,6 +276,14 @@ const routes = [
                     title: "跨店会员",
                     clmid: "11",
                 }
+            },{
+                path: '/versionControlMefisto',
+                name: 'versionControlMefisto',
+                component: () => import('@/views/versionControlMefisto.vue'),
+                meta: {
+                    title: "app版本控制",
+                    clmid: "999",
+                }
             },
         ]
     }, {

pc/src/views/Member.vue

@@ -163,6 +163,17 @@
                               v-for="lesson in scope.row.ClassInfo">{{ lesson.ClassName }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column
+                        prop="UserInfo.IsAcross"
+                        label="跨店会员"
+                        width="105"
+                        sortable
+                >
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.UserInfo.IsAcross == 0"  class="green">本店用户</span>
+                        <span v-else  class="red">跨店用户</span>
+                    </template>
+                </el-table-column>
                 <el-table-column
                         prop="TakeId"
                         label="Take绑定"

pc/src/views/courseEdit.vue

@@ -364,7 +364,6 @@
             // this.getSelectHrSensors();
             this.ClassType = this.$route.query.ClassType;
             this.PkNum = this.$route.query.PkNum;
-
             this.FinishClass = this.$route.query.FinishClass;
             this.title = this.$route.query.ClassName + ' ' + this.$route.query.BeginStr + '-' + this.$route.query.EndStr;
         },
@@ -976,13 +975,14 @@
             },
             PkNum(to) {
                 let that = this;
+                console.log(to);
                 if (to == 2) {
-                    that.groupList = [
+                    that.panel.groupList = [
                         {label: '红队', value: 1},
                         {label: '蓝队', value: 2},
                     ]
                 } else {
-                    that.groupList = [
+                    that.panel.groupList = [
                         {label: '红队', value: 1},
                         {label: '蓝队', value: 2},
                         {label: '黄队', value: 3}

pc/src/views/versionControlMefisto.vue

@@ -0,0 +1,140 @@
+<template>
+    <div>
+        <br>
+        <br>
+        <br>
+        <el-row :gutter="20">
+            <el-col :span="10">
+                <el-card class="box-card">
+                    <div slot="header" class="clearfix">
+                        <span>app版本控制</span>
+                    </div>
+                    <div class="text item">
+                        当前版本 {{ Version }}
+                    </div>
+                    <br>
+                    <div class="text item">
+                        时间 {{ CreatedAt }}
+                    </div>
+                    <br>
+                    <div class="text item">
+                        文件名 {{ FileName }}
+                    </div>
+                    <br>
+                    <div class="text item">
+                        升级内容 {{ UpdateContent }}
+                    </div>
+                </el-card>
+            </el-col>
+            <el-col :span="10">
+                <el-card class="box-card">
+                    <div slot="header" class="clearfix">
+                        <span>wgt上传</span>
+                    </div>
+                    <div class="text item">
+                        版本号
+                        <el-input v-model="upload.version" placeholder="如1.1.1"></el-input>
+                    </div>
+                    <div class="text item">
+                        更新内容
+                        <el-input v-model="upload.updateContent " placeholder="更新内容"></el-input>
+                    </div>
+                    <div class="text item">
+                        <el-upload
+                                class="upload-demo"
+                                :action=trueApi.UpVueFramework
+                                :http-request=upqiniu
+                                :show-file-list="false"
+                                :limit="1"
+                                :before-upload="beforeUpload"
+                        >
+                            <el-button size="small" type="primary">点击上传</el-button>
+                            <div slot="tip" class="el-upload__tip">只能上传wgt文件，且不超过50mb</div>
+                        </el-upload>
+                    </div>
+                </el-card>
+            </el-col>
+        </el-row>
+
+
+    </div>
+</template>
+
+<script>
+    let qs = require('qs');
+    export default {
+        name: "versionControlMefisto",
+        data() {
+            return {
+                trueApi: {
+                    UpVueFramework: 'http://cal.beswell.com:85/v1/Sensors/UpVueFramework',
+                    QueryVueFramework: 'http://cal.beswell.com:85/v1/Sensors/QueryVueFramework',
+                },
+                falseApi: {
+                    UpVueFramework: 'http://192.168.0.3:19096/v1/Sensors/UpVueFramework',
+                    QueryVueFramework: 'http://192.168.0.3:19096/v1/Sensors/QueryVueFramework',
+                },
+                Version: '',
+                CreatedAt: '',
+                FileName: '',
+                UpdateContent: '',
+                fileList: [],
+                upload: {
+                    version: '1.1.0',
+                    updateContent: '基础功能',
+                    file: [],
+                }
+            }
+        },
+        mounted() {
+            this.QueryVueFramework();
+        },
+        methods: {
+            upqiniu(req) {
+                let that = this;
+                const config = {
+                    headers: {'Content-Type': 'multipart/form-data'}
+                };
+                const formdata = new FormData();
+                formdata.append('file', req.file);
+                formdata.append('version', that.upload.version);
+                formdata.append('updateContent', that.upload.updateContent);
+                this.axios.post(this.trueApi.UpVueFramework, formdata, config).then(res => {
+                  console.log(res.data);
+                })
+
+            },
+            // 验证文件合法性
+            beforeUpload(file) {
+                const isLt50M = file.size / 1024 / 1024 < 50;
+                if (!isLt50M) {
+                    this.$message.error('上传wgt大小不能超过 50MB!')
+                }
+                return isLt50M
+            },
+            QueryVueFramework() {
+                let that = this;
+                let param = {
+                    token: localStorage.token,
+                };
+                let postdata = qs.stringify(param);
+                let url = that.trueApi.QueryVueFramework;
+                axios.post(url, postdata).then(function (data) {
+                    let json = data.data;
+                    if (json.Code == 0) {
+                        that.Version = json.Version;
+                        that.CreatedAt = json.CreatedAt;
+                        that.FileName = json.FileName;
+                        that.UpdateContent = json.UpdateContent;
+                    } else {
+                        console.log(json.Memo);
+                    }
+                })
+            }
+        }
+    }
+</script>
+
+<style scoped>
+
+</style>

tv/src/views/Index.vue

@@ -76,7 +76,7 @@
                             // });
                             // 8e501b0bde9ce600
                             // 打印uuid
-                            alert('getDeviceInfo success: ' + JSON.stringify(e.uuid));
+                            // alert('getDeviceInfo success: ' + JSON.stringify(e.uuid));
                             // alert('clientWidth:' + document.documentElement.clientWidth);
                             // alert('clientWidth:' + document.documentElement.clientHeight);
                             // alert('devicePixelRatio:' + window.devicePixelRatio);