1209

pc/src/api/getApiRes.js

@@ -795,3 +795,9 @@ export function VipUserQueryByPhone(postdata) {
     let url = headapi + 'v1/User/VipUserQueryByPhone ';
     return getApiBasic(url, postdata);
 }
+
+// 关联手机号删除
+export function VipUserAssociatedPhoneDel(postdata) {
+    let url = headapi + 'v1/User/VipUserAssociatedPhoneDel ';
+    return getApiBasic(url, postdata);
+}

pc/src/views/AdminManage.vue

@@ -9,10 +9,10 @@
               <em>姓名:</em>
               <el-input v-model="panel.name" placeholder="请输入用户名"></el-input>
             </el-col>
-            <el-col :span="4">
-              <em>手机号:</em>
-              <el-input v-model="panel.phone" placeholder="请输入手机号" type="number" ></el-input>
-            </el-col>
+            <!--<el-col :span="4">-->
+              <!--<em>手机号:</em>-->
+              <!--<el-input v-model="panel.phone" placeholder="请输入手机号" type="number" ></el-input>-->
+            <!--</el-col>-->
             <el-col :span="4">
               <em>店面:</em>
               <el-select v-model="panel.shopId">
@@ -81,12 +81,12 @@
             sortable
         >
         </el-table-column>
-        <el-table-column
-            prop="Phone"
-            label="手机号"
-            sortable
-        >
-        </el-table-column>
+        <!--<el-table-column-->
+            <!--prop="Phone"-->
+            <!--label="手机号"-->
+            <!--sortable-->
+        <!--&gt;-->
+        <!--</el-table-column>-->
         <el-table-column
             prop="AdminType"
             label="角色"
@@ -167,9 +167,9 @@
           <el-form-item label="姓名">
             <el-input v-model="form.name"></el-input>
           </el-form-item>
-          <el-form-item label="手机号">
-            <el-input v-model="form.phone"></el-input>
-          </el-form-item>
+          <!--<el-form-item label="手机号">-->
+            <!--<el-input v-model="form.phone"></el-input>-->
+          <!--</el-form-item>-->
           <el-form-item label="所属门店">
             <el-select v-model="form.shopId" placeholder="请选择所属门店">
               <el-option
@@ -338,14 +338,14 @@ export default {
         this.$message.error('错了哦，姓名字数超过8个字');
         return false
       }
-      if (!that.form.phone) {
-        this.$message.error('错了哦，手机号码不能为空');
-        return false
-      }
-      if (!globalCheckPhone(that.form.phone)) {
-        this.$message.error('错了哦，手机号格式不正确');
-        return false
-      }
+      // if (!that.form.phone) {
+      //   this.$message.error('错了哦，手机号码不能为空');
+      //   return false
+      // }
+      // if (!globalCheckPhone(that.form.phone)) {
+      //   this.$message.error('错了哦，手机号格式不正确');
+      //   return false
+      // }
       if (that.form.memo) {
         if (that.form.name.memo > 200) {
           this.$message.error('错了哦，备注字数超过200个字');
@@ -359,7 +359,7 @@ export default {
         usercode: that.form.userCode,
         password: that.form.password,
         name: that.form.name,
-        phone: that.form.phone,
+        // phone: that.form.phone,
         adminType: that.form.adminType,
         memo: that.form.memo,
       };
@@ -414,14 +414,14 @@ export default {
         this.$message.error('错了哦，姓名字数超过8个字');
         return false
       }
-      if (!that.form.phone) {
-        this.$message.error('错了哦，手机号码不能为空');
-        return false
-      }
-      if (!globalCheckPhone(that.form.phone)) {
-        this.$message.error('错了哦，手机号格式不正确');
-        return false
-      }
+      // if (!that.form.phone) {
+      //   this.$message.error('错了哦，手机号码不能为空');
+      //   return false
+      // }
+      // if (!globalCheckPhone(that.form.phone)) {
+      //   this.$message.error('错了哦，手机号格式不正确');
+      //   return false
+      // }
       if (that.form.memo) {
         if (that.form.name.memo > 200) {
           this.$message.error('错了哦，备注字数超过200个字');
@@ -436,7 +436,7 @@ export default {
         usercode: that.form.userCode,
         password: that.form.password,
         name: that.form.name,
-        phone: that.form.phone,
+        // phone: that.form.phone,
         memo: that.form.memo,
       };
       let postdata = qs.stringify(param);
@@ -615,7 +615,7 @@ export default {
         token: localStorage.token,
         shopId: this.panel.shopId,
         name: this.panel.name,
-        phone: this.panel.phone,
+        // phone: this.panel.phone,
         adminType: this.panel.adminType,
         start: 1,//
         tableMax: 9999,//

pc/src/views/LessonTable.vue

@@ -53,6 +53,7 @@
                 <el-table-column
                         prop="ShopId"
                         label="是否跨店"
+                        sortable
                 >
                     <template slot-scope="scope">
                         <el-switch

pc/src/views/Log.vue

@@ -89,6 +89,7 @@
             prop="OptPhone"
             label="手机号"
             width="120"
+            sortable
         >
         </el-table-column>
         <el-table-column

pc/src/views/Member.vue

@@ -196,7 +196,7 @@
                         width="160px"
                 >
                     <template slot-scope="scope">
-                        <el-button class="btn" type="default" size="mini" @click="editMember(scope.row)">编辑</el-button>
+                        <el-button class="btn" type="default" size="mini" @click="editMember(scope.row)" v-if="userLevel != 4">编辑</el-button>
                         <el-button class="btn" type="danger" v-if="scope.row.UserInfo.Status == 1" size="mini"
                                    @click="pauseRow(scope.row)">
                             禁用

pc/src/views/appoint.vue

@@ -95,6 +95,7 @@
                                     prop="BeginTime"
                                     label="上课时间"
                                     :formatter="filterFmtDate"
+                                    sortable
                             >
                             </el-table-column>
                             <el-table-column

pc/src/views/bindRecord.vue

@@ -87,6 +87,7 @@
                 <el-table-column
                         prop="IsPrivate"
                         label="是否私有"
+                        sortable
                 >
                     <template slot-scope="scope">
                         <span v-if="scope.row.IsPrivate == 1">私有</span>

pc/src/views/cost.vue

@@ -68,6 +68,7 @@
         <el-table-column
             prop="Phone"
             label="手机号"
+            sortable
         >
         </el-table-column>
         <el-table-column
@@ -269,7 +270,7 @@ export default {
         classId: '',
         usercode: '',
         username: '',
-        timeScope: globalBt2(30),
+        timeScope: globalBt2(7),
         compname: '',
         keyword: '',
         USERCODE: '',

pc/src/views/heartLog.vue

@@ -40,11 +40,13 @@
                 <el-table-column
                         prop="Version"
                         label="版本"
+                        sortable
                 >
                 </el-table-column>
                 <el-table-column
                         prop="EquipType"
                         label="类型"
+                        sortable
                 >
                     <template slot-scope="scope">
                         <span v-if="scope.row.EquipType == 1">TVBox</span>
@@ -54,6 +56,7 @@
                 <el-table-column
                         prop="Status"
                         label="状态"
+                        sortable
                 >
                     <!--1：启用  8：暂停  9：删除-->
                     <template slot-scope="scope">

pc/src/views/lessonManage.vue

@@ -70,6 +70,7 @@
         <el-table-column
             prop="Online"
             label="是否上线"
+            sortable
             v-if="userLevel != 4"
         >
           <!--                    上线状态	0：不上线 1:下线-->

pc/src/views/region.vue

@@ -39,7 +39,9 @@
                         prop="Base.CreatedAt"
                         label="创建日期"
                         :formatter="filterFmtDate"
-                        width="180">
+                        width="180"
+                        sortable
+                >
                 </el-table-column>
                 <!--<el-table-column-->
                 <!--prop="Status"-->

pc/src/views/relevancePhone.vue

@@ -103,6 +103,7 @@
         VipUserAssociatedPhoneAdd,
         EditShopVenueEquip,
         VipUserAssociatedPhoneEdit,
+        VipUserAssociatedPhoneDel,
         VipUserAssociatedPhoneStatusEdit
     } from "../api/getApiRes";
 
@@ -162,7 +163,6 @@
                     token: localStorage.token,
                     userId: this.$route.query.userId,
                     pId: row.PId,
-                    status: 9,//1：启用 8：暂停 9：删除
                 };
                 let postdata = qs.stringify(param);
                 this.$confirm('此操作将永久删除该手机号, 是否继续?', '提示', {
@@ -170,7 +170,7 @@
                     cancelButtonText: '取消',
                     type: 'warning'
                 }).then(() => {
-                    VipUserAssociatedPhoneStatusEdit(postdata).then(res => {
+                    VipUserAssociatedPhoneDel(postdata).then(res => {
                         let json = res;
                         if (json.Code == 0) {
                             that.$message({

tv/src/views/2pkRank.vue

@@ -32,8 +32,8 @@
                     <li v-for="(s,i) in students.redUnite" :class="[{'redUnite':true},{'mvpli':i == 0}]">
                         <div>
                             <div class="head">
-                                <img :src="s.Head"
-                                     class="headImg" alt="">
+                                <img :src="s.Head" class="headImg" v-if="s.Head">
+                                <img src="../static/img/people/flyhead.png" class="headImg" alt="" v-if="!s.Head">
                                 <img src="../assets/img/2pkRank/king.svg" class="king" alt="" v-if="redSum >= blueSum">
                             </div>
                             <div class="name">
@@ -61,7 +61,8 @@
                     >
                         <div>
                             <div class="head">
-                                <img :src="s.Head" class="headImg" alt="">
+                                <img :src="s.Head" class="headImg" v-if="s.Head">
+                                <img src="../static/img/people/flyhead.png" class="headImg" alt="" v-if="!s.Head">
                                 <img src="../assets/img/2pkRank/king.svg" class="king" alt="" v-if="redSum <= blueSum">
                             </div>
                             <div class="name">

tv/src/views/3pkRank.vue

@@ -57,8 +57,8 @@
                     <li v-for="(s,i) in students.redUnite" :class="[{'redUnite':true},{'mvpli':i == 0}]">
                         <div>
                             <div class="head">
-                                <img :src="s.Head"
-                                     class="headImg" alt="">
+                                <img :src="s.Head" class="headImg" v-if="s.Head">
+                                <img src="../static/img/people/flyhead.png" class="headImg" alt="" v-if="!s.Head">
                                 <img src="../assets/img/2pkRank/king.svg" class="king" alt="" v-if="red.rank == 1">
                             </div>
                             <div class="name">
@@ -83,8 +83,8 @@
                     <li v-for="(s,i) in students.blueUnite" :class="[{'blueUnite':true},{'mvpli':i == 0}]">
                         <div>
                             <div class="head">
-                                <img :src="s.Head"
-                                     class="headImg" alt="">
+                                <img :src="s.Head" class="headImg" v-if="s.Head">
+                                <img src="../static/img/people/flyhead.png" class="headImg" alt="" v-if="!s.Head">
                                 <img src="../assets/img/2pkRank/king.svg" class="king" alt="" v-if="blue.rank == 1">
                             </div>
                             <div class="name">
@@ -109,8 +109,8 @@
                     <li v-for="(s,i) in students.yellowUnite" :class="[{'yellowUnite':true},{'mvpli':i == 0}]">
                         <div>
                             <div class="head">
-                                <img :src="s.Head"
-                                     class="headImg" alt="">
+                                <img :src="s.Head" class="headImg" v-if="s.Head">
+                                <img src="../static/img/people/flyhead.png" class="headImg" alt="" v-if="!s.Head">
                                 <img src="../assets/img/2pkRank/king.svg" class="king" alt="" v-if="yellow.rank == 1">
                             </div>
                             <div class="name">

tv/src/views/Rank.vue

@@ -8,7 +8,8 @@
                     <li v-for="(s,i) in students.CalSort">
                         <div :class="['rows',{'row_0':i == 0},{'row_1':i == 1},{'row_2':i == 2},{'row_3':i == 3},{'row_4':i == 4},{'row_5':i == 5},{'row_6':i == 6},{'row_7':i == 7}]">
                             <div class="head">
-                                <img :src="s.Head" class="headImg" alt="">
+                                <img :src="s.Head" class="headImg" v-if="s.Head">
+                                <img src="../static/img/people/flyhead.png" class="headImg" alt="" v-if="!s.Head">
                                 <img src="../static/img/rank/king1.svg" class="king" alt="" v-if="i == 0">
                                 <img src="../static/img/rank/king2.svg" class="king" alt="" v-if="i == 1">
                                 <img src="../static/img/rank/king3.svg" class="king" alt="" v-if="i == 2">
@@ -32,7 +33,8 @@
                     <li v-for="(s,i) in students.CkSort">
                         <div :class="['rows',{'row_0':i == 0},{'row_1':i == 1},{'row_2':i == 2},{'row_3':i == 3},{'row_4':i == 4},{'row_5':i == 5},{'row_6':i == 6},{'row_7':i == 7}]">
                             <div class="head">
-                                <img :src="s.Head" class="headImg" alt="">
+                                <img :src="s.Head" class="headImg" v-if="s.Head">
+                                <img src="../static/img/people/flyhead.png" class="headImg" alt="" v-if="!s.Head">
                                 <img src="../static/img/rank/king1.svg" class="king" alt="" v-if="i == 0">
                                 <img src="../static/img/rank/king2.svg" class="king" alt="" v-if="i == 1">
                                 <img src="../static/img/rank/king3.svg" class="king" alt="" v-if="i == 2">
@@ -300,7 +302,7 @@
     }
 
     li .head .headImg {
-        width: 100%;
+        width: 0.8rem;
         height: 0.8rem;
         overflow: hidden;
         display: block;

tv/src/views/pk.vue

@@ -451,6 +451,7 @@
                             // 1：团课/私教 todo
                             // 2：竞技课2PK
                             // 3：竞技课3PK
+                            that.$router.push({path: '/2pkRank'});
                             switch (parseInt(json.dp)) {
                                 case 2:
                                     that.$router.push({path: '/2pkRank'});

tv/src/views/threepk.vue

@@ -172,7 +172,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=""
+                                        <img :class="s.sportLevel"
+                                             src="../static/img/people/flyhead.png"
                                              v-if="!s.Head">
                                     </div>
                                 </div>
@@ -525,6 +526,7 @@
                             // 1：团课/私教 todo
                             // 2：竞技课2PK
                             // 3：竞技课3PK
+                            that.$router.push({path: '/3pkRank'});
                             console.log('json.dp' + json.dp);
                             switch (parseInt(json.dp)) {
                                 case 2: