online part

app/src/page/mainpage.vue

@@ -15,12 +15,15 @@
                          v-show="parseInt(l.ShopID) == 5"/>
                     <img src="../static/images/main/shop6.png" width="100%" height="100%"
                          v-show="parseInt(l.ShopID) == 6"/>
+                    <img src="../static/images/main/outdoor.png" width="100%" height="100%"
+                         v-show="parseInt(l.ShopID) == 7"/>
                 </div>
                 <div class="rt">
                     <h4 style="background-color: #FFA310" v-if="l.ShopID == 3">{{ l.ShopName.substr(5,12) }}</h4>
                     <h4 style="background-color: #37CB00" v-if="l.ShopID == 4">{{ l.ShopName.substr(5,12) }}</h4>
                     <h4 style="background-color: #028FE1" v-if="l.ShopID == 5">{{ l.ShopName.substr(5,12) }}</h4>
                     <h4 style="background-color: #d624e1" v-if="l.ShopID == 6">{{ l.ShopName }}</h4>
+                    <h4 style="background-color: #13e15c" v-if="l.ShopID == 7">{{ l.ShopName }}</h4>
                     <span>今日预约名额剩余
               <i v-if="l.RemainOrdernum > 0">{{ l.RemainOrdernum }}</i>
               <i v-if="l.RemainOrdernum == 0" class="red">{{ l.RemainOrdernum }}</i>

online/src/page/mainpage.vue

@@ -1,16 +1,16 @@
 <template>
-    <div class="container">
-        <div class="top" :style="backgroundColor">
+    <div class="content">
+        <div class="top" :style="{backgroundColor:bgColor}">
             <span class="watchState">{{watchState}}</span>
             <div class="toprow">
                 <div class="lt">
                     <div class="activeLevel">
-                        <div>
+                        <div v-if="activeState">
                             <s>%</s>
-                            <em>100</em>
+                            <em>{{activeLevel}}</em>
                         </div>
-                        <div>
-                            <s>- -</s>
+                        <div v-else>
+                            <s class="noValue">--</s>
                         </div>
                     </div>
                     <span>激活放松</span>
@@ -21,24 +21,38 @@
                     </div>
                     <span class="username">
                         <em>王胜寒</em>
-                    <img src="../static/images/main/male.png" height="60" width="60"/>
+                    <img src="../static/images/main/male.png" height="60" width="60" v-if="sex == 1"/>
+                    <img src="../static/images/main/female.png" height="60" width="60" v-if="sex == 2"/>
                     </span>
                 </div>
                 <div class="rt">
-                    <div class="activeLevel">
-                        <div>
+                    <div class="heartJump">
+                        <div v-if="activeState">
                             <img src="../static/images/main/heart.png" height="74" width="86"/>
-                            <em>89</em>
+                            <em>{{heartRate}}</em>
                         </div>
-                        <div>
-                            <s>- -</s>
+                        <div v-else>
+                            <s class="noValue">--</s>
                         </div>
                     </div>
                     <span>瞬时心率</span>
                 </div>
             </div>
         </div>
-        <div class="row"></div>
+        <div class="info">
+            <ul>
+                <li><em>{{height}}</em><span>身高cm</span></li>
+                <li><em>{{age}}</em><span>年龄</span></li>
+                <li><em>{{weight}}</em><span>体重kg</span></li>
+                <li><em>{{peaceHeart}}</em><span>静息心率</span></li>
+            </ul>
+        </div>
+        <div class="row">
+            <div class="rowCenter">
+                <img src="../static/images/main/chain.png"/>
+                <em></em>
+            </div>
+        </div>
         <div class="middle"></div>
         <div class="row"></div>
         <div class="bottom">
@@ -48,7 +62,7 @@
                     :width="390"
                     :height="200"
                     :dataLabels="dataLabels"
-                    :datadatasets="datadatasets"
+                    :datadatasets="dataDatasets"
             />
         </div>
     </div>
@@ -56,13 +70,22 @@
 
 <script>
     import LineExample from '../components/LineExample'
+
     export default {
         data() {
             return {
                 dataLabels: [],
-                datadatasets: [],
-                watchState:'',
-                backgroundColor:''
+                dataDatasets: [],
+                watchState: '心率带已连接  电量 39%',
+                bgColor: '#028FE1',
+                activeLevel: 100,
+                heartRate: 100,
+                activeState: true,
+                sex: 1,
+                height: 148,
+                age: 8,
+                weight: 38,
+                peaceHeart: 100,
             }
         },
         components: {
@@ -72,5 +95,224 @@
 </script>
 
 <style scoped>
+    .top {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+    }
+
+    .top .watchState {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        height: 20px;
+        line-height: 20px;
+        color: #fff;
+        text-align: center;
+        margin-top: 10px;
+        margin-bottom: 10px;
+    }
+
+    .toprow {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+    }
+
+    .toprow .lt {
+        width: 30%;
+        float: left;
+        overflow: hidden;
+    }
+
+    .toprow .md {
+        width: 40%;
+        float: left;
+        overflow: hidden;
+    }
+
+    .toprow .rt {
+        width: 30%;
+        float: right;
+        overflow: hidden;
+    }
+
+    .toprow .lt .activeLevel {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        margin-top: 10px;
+        color: #fff;
+    }
+
+    .activeLevel s {
+        float: right;
+        font-size: 20px;
+    }
+
+    .activeLevel em {
+        font-size: 40px;
+        text-align: right;
+        font-weight: bold;
+        float: right;
+    }
 
+    .toprow .lt span {
+        width: 80px;
+        height: 20px;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        color: #fff;
+        border: 1px solid #fff;
+        border-radius: 250px;
+        text-align: center;
+        line-height: 20px;
+        font-size: 12px;
+    }
+
+    .toprow .md .headContainer {
+        width: 70%;
+        height: 70%;
+        border: 3px solid rgba(255, 255, 255, 0.71);
+        border-radius: 250px;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+    }
+
+    .headContainer img {
+        width: 100%;
+        height: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+    }
+
+    .activeLevel .noValue {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        font-weight: bold;
+        font-size: 40px;
+        text-align: center;
+        float: none;
+    }
+    .username {
+        width: 100%;
+        height: 30px;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        font-size: 14px;
+        color: #fff;
+        margin-top: 10px;
+    }
+    .username em {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        text-align: center;
+    }
+    .username img {
+        position: relative;
+        bottom: 20px;
+        float: right;
+        width: 15px;
+        height: 15px;
+        right: 15%;
+    }
+    .heartJump {
+        width: 90%;
+        overflow: hidden;
+        float: left;
+        margin: 0 auto;
+        margin-top: 10px;
+        color: #fff;
+    }
+    .heartJump img {
+        width: 16px;
+        height: 14px;
+        float: right;
+    }
+    .heartJump em {
+        font-size: 40px;
+        text-align: right;
+        font-weight: bold;
+        float: right;
+    }
+    .heartJump .noValue {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        font-weight: bold;
+        font-size: 40px;
+        text-align: center;
+        float: none;
+    }
+    .toprow .rt span {
+        width: 80px;
+        height: 20px;
+        overflow: hidden;
+        float: left;
+        color: #fff;
+        border: 1px solid #fff;
+        border-radius: 250px;
+        text-align: center;
+        line-height: 20px;
+        font-size: 12px;
+    }
+    .info {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+    }
+    .info ul {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        margin-top: 10px;
+        margin-bottom: 10px;
+    }
+    .info li {
+        width: 25%;
+        border-left: 1px solid #fff;
+        border-right: 1px solid #fff;
+        float: left;
+        text-align: center;
+    }
+    .info li:nth-child(2){
+        border-color: #E2E2E2;
+    }
+    .info li:nth-child(3){
+        border-color: #E2E2E2;
+        border-left: 0;
+    }
+    .info li em {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        color: #363636;
+        font-size: 20px;
+        text-align: center;
+    }
+    .info li span {
+        width: 100%;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        color: #C4C4C4;
+        font-size: 12px;
+        text-align: center;
+    }
 </style>

pc/src/api/Navs.js

@@ -29,16 +29,17 @@ let navs = [
         "grouplist": "2,5",
         "icon": "el-icon-user-solid",
     }
-    , {
-        "clmid": "3",
-        "clmcode": "region",
-        "clmname": "在线上课",
-        "clmurl": "/online",
-        "prname": "",
-        "show": 3,//2
-        "grouplist": "2,5",
-        "icon": "el-icon-video-camera",
-    },
+    // , {
+    //     "clmid": "3",
+    //     "clmcode": "region",
+    //     "clmname": "在线上课",
+    //     "clmurl": "/online",
+    //     "prname": "",
+    //     "show": 3,//2
+    //     "grouplist": "2,5",
+    //     "icon": "el-icon-video-camera",
+    // }
+    ,
     {
         "clmid": "13",
         "clmcode": "lesson",

pc/src/api/getApiRes.js

@@ -871,7 +871,13 @@ export function AcrossUserSimpleQuery(postdata) {
 
 // 2021/02/02
 // 查询演示设备
-export function QueryDemoVenueEquip(postdata) {
-    let url = headbpi + 'v1/Shop/QueryDemoVenueEquip ';
+export function QueryDemoVenueEquipByLoallout(postdata) {
+    let url = headbpi + 'v1/Shop/QueryDemoVenueEquipByLoallout';
+    return getApiBasic(url, postdata);
+}
+
+// 小飞龙总管理员查询商家列表
+export function QueryShopListByLoallout(postdata) {
+    let url = headbpi + 'v1/Shop/QueryShopListByLoallout ';
     return getApiBasic(url, postdata);
 }

pc/src/views/demoDevice.vue

@@ -72,16 +72,6 @@
                         label="操作"
                 >
                     <template slot-scope="scope">
-
-                        <!--<el-button type="success" v-if="scope.row.Status == 8" size="mini"-->
-                        <!--@click="pauseRow(scope.row,1)">-->
-                        <!--启用-->
-                        <!--</el-button>-->
-                        <!--<el-button type="warning" v-if="scope.row.Status == 1" size="mini"-->
-                        <!--@click="pauseRow(scope.row,8)">-->
-                        <!--禁用-->
-                        <!--</el-button>-->
-
                         <el-button type="danger" size="mini"
                                    @click="pauseRowDel(scope.row)">
                             删除
@@ -146,7 +136,8 @@
 <script>
     import Global from '../Global.js'
     import {
-        QueryDemoVenueEquip,
+        QueryDemoVenueEquipByLoallout,
+        QueryShopListByLoallout,
         ShopListQuery,
         QueryShopVenue,
         QueryVenueEquip,
@@ -212,17 +203,16 @@
                         row = item;
                     }
                 });
-                that.getQueryShopVenue(row.ServiceKey, row.ServiceId);
+                that.getQueryShopVenue(row.Key, row.ShopID);
             },
             // 获取店面列表
             getShopListSelect() {
                 let that = this;
                 let param = {
-                    token: localStorage.token,
-                    shopId: localStorage.ServiceId,
+                    key: '73c845ca89d952074b36a5b18d961cac',
                 };
                 let postdata = qs.stringify(param);
-                ShopListQuery(postdata).then(res => {
+                QueryShopListByLoallout(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
                         if (json.Rs == '') {
@@ -275,17 +265,9 @@
             pauseRowDel(row) {
                 let that = this;
                 let line = "";
-                that.ShopList.map(function (item) {
-                    console.log(item);
-                    if (parseInt(item.ServiceId) == parseInt(row.ShopID)) {
-                        line = item;
-                    }
-                });
-                console.log(row);
-                console.log(line);
                 let param = {
-                    key: line.ServiceKey,
-                    shopId: line.ServiceId,
+                    key: row.ShopKey,
+                    shopId: row.ShopID,
                     svId: row.SvId,
                     eqId: row.EqId,
                     status: 9,//1：启用 8：暂停 9：删除
@@ -391,15 +373,18 @@
                     return false
                 }
                 let row = this.tableRadio;
-                let line = '';
-                that.ShopList.map(function (item) {
-                    if (parseInt(item.ShopID) == parseInt(row.ShopID)) {
-                        that.form.shopId = parseInt(item.ServiceId);
-                        line = item;
-                    }
-                });
-                that.getQueryShopVenue(line.ServiceKey, line.ServiceId);
-
+                // 蒙正ShopID 3 ServiceId 5
+                // console.log(row);
+                // let line = '';
+                // that.ShopList.map(function (item) {
+                //     if (parseInt(item.ShopID) == parseInt(row.ShopID)) {
+                //         line = item;
+                //     }
+                // });
+                // console.log(line);
+                that.getQueryShopVenue(row.ShopKey, row.ShopID);
+
+                this.form.shopId = row.ShopID;
                 this.form.venveId = row.SvId;
                 this.form.userId = row.Id;
                 this.form.name = row.Name;
@@ -528,7 +513,7 @@
                     key: '73c845ca89d952074b36a5b18d961cac',
                 };
                 let postdata = qs.stringify(param);
-                QueryDemoVenueEquip(postdata).then(res => {
+                QueryDemoVenueEquipByLoallout(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
                         that.loading = false;