app 间距修改

app/src/page/appoint.vue

@@ -650,7 +650,7 @@
         }
 
         .context {
-            top: 35%;
+            top: 227px;
         }
     }
 
@@ -660,7 +660,7 @@
         }
 
         .context {
-            top: 35%;
+            top: 227px;
         }
     }
 
@@ -670,7 +670,7 @@
         }
 
         .context {
-            top: 40%;
+            top: 230px;
         }
     }
 
@@ -680,7 +680,7 @@
         }
 
         .context {
-            top: 34%;
+            top: 230px;
         }
     }
 
@@ -690,7 +690,7 @@
         }
 
         .context {
-            top: 34%;
+            top: 230px;
         }
     }
 
@@ -700,7 +700,7 @@
         }
 
         .context {
-            top: 35%;
+            top: 230px;
         }
     }
 
@@ -710,13 +710,13 @@
         }
 
         .context {
-            top: 36%;
+            top: 230px;
         }
     }
 
     @media (min-width: 481px) and (max-width: 640px) {
         .context {
-            top: 36%;
+            top: 230px;
         }
     }
 

pc/src/api/getApiRes.js

@@ -805,3 +805,26 @@ export function ClassSimpleQuery(postdata) {
     let url = headapi + 'v1/Class/ClassSimpleQuery ';
     return getApiBasic(url, postdata);
 }
+
+// 2020/12/21
+//
+// 临时会员添加
+export function TmpUserAdd(postdata) {
+    let url = headapi + 'v1/User/TmpUserAdd ';
+    return getApiBasic(url, postdata);
+}
+// 临时会员删除
+export function TmpUserDel(postdata) {
+    let url = headapi + 'v1/User/TmpUserDel ';
+    return getApiBasic(url, postdata);
+}
+// 临时会员修改
+export function TmpUserEdit(postdata) {
+    let url = headapi + 'v1/User/TmpUserEdit ';
+    return getApiBasic(url, postdata);
+}
+// 临时会员查询
+export function TmpUserQuery(postdata) {
+    let url = headapi + 'v1/User/TmpUserQuery ';
+    return getApiBasic(url, postdata);
+}

pc/src/views/Member.vue

@@ -515,6 +515,16 @@
             // 读取列表
             this.getTableQuery();
         },
+        watch: {
+            $route(to) {
+                if (to.name == 'Member') {
+                    // 加载课程选项
+                    this.panelSelect();
+                    // 读取列表
+                    this.getTableQuery();
+                }
+            },
+        },
         methods: {
             // 查询用户是否乃跨店用户
             // todo 逻辑
@@ -1328,16 +1338,6 @@
                 }
             },
         },
-        watch: {
-            $route(to) {
-                if (to.name == 'Member') {
-                    // 加载课程选项
-                    this.panelSelect();
-                    // 读取列表
-                    this.getTableQuery();
-                }
-            },
-        },
         components: {
             ImgCutter
         }

pc/src/views/tempUser.vue

@@ -53,11 +53,11 @@
                         width="50"
                 >
                     <template slot-scope="scope">
-                        <div class="demo-image__preview" v-if="scope.row.UserInfo.Head">
+                        <div class="demo-image__preview" v-if="scope.row.Head">
                             <el-image
                                     style="width: 25px; height: 25px"
-                                    :src="scope.row.UserInfo.Head"
-                                    :preview-src-list="[scope.row.UserInfo.Head]"
+                                    :src="scope.row.Head"
+                                    :preview-src-list="[scope.row.Head]"
 
                             >
                             </el-image>
@@ -66,39 +66,48 @@
                     </template>
                 </el-table-column>
                 <el-table-column
-                        prop="UserInfo.Name"
+                        prop="Name"
                         label="会员名"
                         width="90"
                 >
                 </el-table-column>
                 <el-table-column
-                        prop="UserInfo.Phone"
+                        prop="Phone"
                         label="手机号"
                         width="110"
                         sortable
                 >
                 </el-table-column>
                 <el-table-column
-                        prop="ClassInfo"
-                        label="会员课程"
-                        width="220px"
+                        prop="Sex"
+                        label="类型"
+                        align="center"
+                        width="80px"
+                        sortable
                 >
                     <template slot-scope="scope">
-                        <span class="lessonSpan" :style="{background:lesson.ClassColor}"
-                              v-for="lesson in scope.row.ClassInfo">{{ lesson.ClassName }}</span>
+                        <span v-if="scope.row.Sex == 1">男</span>
+                        <span v-if="scope.row.Sex == 2">女</span>
                     </template>
                 </el-table-column>
                 <el-table-column
-                        prop="UserInfo.IsAcross"
-                        label="跨店会员"
-                        width="105"
+                        prop="Birthday"
+                        label="生日"
+                        width="110"
+                        :formatter="filterFmtDate"
                         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="ClassInfo"-->
+                        <!--label="会员课程"-->
+                        <!--width="220px"-->
+                <!--&gt;-->
+                    <!--<template slot-scope="scope">-->
+                        <!--<span class="lessonSpan" :style="{background:lesson.ClassColor}"-->
+                              <!--v-for="lesson in scope.row.ClassInfo">{{ lesson.ClassName }}</span>-->
+                    <!--</template>-->
+                <!--</el-table-column>-->
                 <el-table-column
                         prop="UserInfo.Memo"
                         label="备注">
@@ -108,11 +117,11 @@
                                 title=""
                                 width="200"
                                 trigger="hover"
-                                :content="scope.row.UserInfo.Memo">
+                                :content="scope.row.Memo">
                             <span slot="reference"
-                                  v-if="scope.row.UserInfo.Memo.length > 6">{{ scope.row.UserInfo.Memo.substr(0, 6) }} ....</span>
+                                  v-if="scope.row.Memo.length > 6">{{ scope.row.Memo.substr(0, 6) }} ....</span>
                         </el-popover>
-                        <span v-if="scope.row.UserInfo.Memo.length <= 6">{{ scope.row.UserInfo.Memo }}</span>
+                        <span v-if="scope.row.Memo.length <= 6">{{ scope.row.Memo }}</span>
                     </template>
                 </el-table-column>
             </el-table>
@@ -132,6 +141,7 @@
         import Global from '../Global.js'
         import ImgCutter from 'vue-img-cutter'
         import {
+            TmpUserQuery,
             testTable,
             testSelect
         } from "../api/getApiRes";
@@ -148,6 +158,12 @@
                 tableRadio: [],
                 userLevel: localStorage.userLevel,
                 serachBtnStatus: false,
+                start: 0,
+                draw: 1,
+                sexOptions: [
+                    {value: 1, label: '男'},//性别 1：男， 2：女
+                    {value: 2, label: '女'},
+                ],
                 panel: {
                     usercode: '',
                     username: '',
@@ -182,6 +198,18 @@
                 },
             }
         },
+        mounted() {
+            // 读取列表
+            this.getTableQuery();
+        },
+        watch: {
+            $route(to) {
+                if (to.name == 'tempUser') {
+                    // 读取列表
+                    this.getTableQuery();
+                }
+            },
+        },
         methods: {
             addMember(){
 
@@ -213,15 +241,14 @@
                 that.loading = true;
                 let param = {
                     token: localStorage.token,
-                    vipType: that.panel.vipType,//
-                    phone: that.panel.phone,//
+                    shopId: that.panel.shopId,//
                     name: that.panel.name,//
                     expDay: that.panel.expDay,//
                     start: that.start,//
                     tableMax: 20,//
                 };
                 let postdata = qs.stringify(param);
-                VipUserListQuery(postdata).then(res => {
+                TmpUserQuery(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
                         that.loading = false;
@@ -300,6 +327,11 @@
                 console.log(that.draw);
                 that.getTableQuery();
             },
+            //            过滤时间
+            filterFmtDate(value, row, column) {
+                let that = this;
+                return nonTfmtDatetoLength(column, 11);
+            },
         }
     }
 </script>

tv/需求修改和debug.md

@@ -109,14 +109,16 @@ let url = '';
  
  =========
  12/21
-    5.管理端增加学生连点问题√  
-    3.关联手机号左侧选中的栏不对√  
-    4.关联手机号增加用户名√  
-     6.TV PK的间距调整回以前那种√ 
+5.管理端增加学生连点问题√  
+3.关联手机号左侧选中的栏不对√  
+4.关联手机号增加用户名√  
+6.TV PK的间距调整回以前那种√ 
  
  1.临时会员管理-添加/删除
  2.课程管理 单独添加,绑定,删除访客
  *downloadwgt下的还是旧的包是为什么?
-
+ 7.上课学生分组,改由后台进行第一次分组,每次改队上传后台处理
+ 8. app 预约界面的上边距问题
+ 9.心率带电量显示