添加会员信息

src/views/creation/share-model/index.vue

@@ -183,7 +183,6 @@ export default {
       input.value = textString;
       // ios必须先选中文字且不支持 input.select();
       selectText(input, 0, textString.length);
-      console.log(document.execCommand("copy"), "execCommand");
       if (document.execCommand("copy")) {
         document.execCommand("copy");
         this.$toast("复制成功");

src/views/studentList/api.js

@@ -24,6 +24,14 @@ export const findStudentMusicGroups = (data) => {
   });
 };
 
+export const api_studentQueryUserInfo = (data) => {
+  return request({
+    url: "/student/queryUserInfo",
+    method: "get",
+    params: data,
+  });
+};
+
 // export const queryPageStudent = (data) => {
 //   return request({
 //     url: "/imLiveBroadcastRoom/queryPage",

src/views/studentList/index.vue

@@ -43,12 +43,12 @@
           <template #title>
             <div style="display: flex; align-items: center; font-size: 0.16rem">
               {{ item.username }}
-              <img
+              <!-- <img
                 v-if="item.memberRankSettingId > 0"
                 style="width: 16px; height: 16px; margin-left: 3px"
                 src="./images/icon_member.png"
                 alt=""
-              />
+              /> -->
             </div>
           </template>
           <template #label>
@@ -108,15 +108,15 @@ export default {
         path: "/studentDetail",
         query: {
           id: item.userId,
-          avatar: item.avatar,
-          username: item.username,
-          subjectName: item.subjectName,
-          phone: item.parentsPhone,
-          organName: item.organName,
-          currentGrade: item.currentGrade,
-          currentClass: item.currentClass,
-          memberRankSettingId: item.memberRankSettingId,
-          membershipDay: item.membershipDay,
+          // avatar: item.avatar,
+          // username: item.username,
+          // subjectName: item.subjectName,
+          // phone: item.parentsPhone,
+          // organName: item.organName,
+          // currentGrade: item.currentGrade,
+          // currentClass: item.currentClass,
+          // memberRankSettingId: item.memberRankSettingId,
+          // membershipDay: item.membershipDay,
         },
       });
     },

src/views/studentList/studentDetail.vue

@@ -1,30 +1,40 @@
 <template>
   <div class="studentDetail">
-    <van-cell-group inset style="margin: 0.1rem 0.12rem">
+    <van-cell-group inset style="margin: 0.1rem 0.12rem" :border="false">
       <van-cell center :border="false">
         <template #icon>
           <van-image class="studentLogo" :src="avatar || iconStudent" />
         </template>
         <template #title>
-          <div style="display: flex; align-items: center; font-size: 0.16rem">
+          <div v-if="username"style="display: flex; align-items: center; font-size: 0.16rem">
             {{ username }}
-            <img v-if="memberRankSettingId > 0" style="width: 16px; height: 16px; margin-left: 3px" src="./images/icon_member.png" alt="" />
-          </div>
+            <img v-if="memberList.length > 0" style="width: 44px; height: 17px; margin-left: 4px" src="./images/icon-vip-active.png" alt="" />
+            <img v-if="memberList.length <= 0" style="width: 44px; height: 17px; margin-left: 4px" src="./images/icon-vip.png" alt="" /></div>
         </template>
         <template #label>
           {{ subjectName }}
         </template>
       </van-cell>
-      <van-cell style="padding-top: 3px; padding-bottom: 15px">
+      <!-- <van-cell style="padding-top: 3px; padding-bottom: 15px">
         <div class="studentMember">
           <img src="./images/icon_tips.png" />
           <span>该学员会员有效期剩余： {{ membershipDay }} 天</span>
         </div>
-      </van-cell>
+      </van-cell> -->
     </van-cell-group>
 
+    <div class="title"><i></i>会员信息</div>
+    <!-- <van-cell-group inset style="margin: 0.1rem 0.12rem" :border="false">
+      <van-cell title="学员编号" :value="id"></van-cell>
+    </van-cell-group> -->
+    <div class="memberSection">
+      <div class="memberItem" v-for="(item, index) in memberList" :key="index">
+        <i></i>「{{item.memberRankName}}」剩余有效期<span>{{ item.remainingDays }}</span>天
+      </div>
+    </div>
+
     <div class="title"><i></i>基础信息</div>
-    <van-cell-group inset style="margin: 0.1rem 0.12rem">
+    <van-cell-group inset style="margin: 0.1rem 0.12rem" :border="false">
       <van-cell title="学员编号" :value="id"></van-cell>
       <van-cell title="分部" :value="organName"></van-cell>
       <van-cell title="手机号" :value="phone" center>
@@ -38,35 +48,48 @@
 
     <div class="title" v-if="musicGroupList.length > 0"><i></i>乐团信息</div>
     <van-cell-group inset style="margin: 0.1rem 0.12rem">
-      <van-cell v-for="(item, index) in musicGroupList" :key="index" :title="item.musicGroupName" :label="item.musicGroupId" center>
-        <span :class="item.userMusicGroupStatus">{{ item.userMusicGroupStatus | musicGroupStudentType }}</span>
+      <van-cell v-for="(item, index) in musicGroupList" :key="index" :label="item.musicGroupId" center>
+        <template #title>
+          <span style="font-weight: bold;font-size: .16rem;">{{ item.musicGroupName }}</span>
+          <span :class="item.userMusicGroupStatus">{{ item.userMusicGroupStatus | musicGroupStudentType }}</span>
+        </template>
       </van-cell>
     </van-cell-group>
   </div>
 </template>
 
 <script>
-import { findStudentMusicGroups } from "./api";
+import { findStudentMusicGroups, api_studentQueryUserInfo } from "./api";
 export default {
   data() {
     const query = this.$route.query;
     return {
       iconStudent: require("@/assets/images/icon_student.png"),
       id: query.id,
-      avatar: query.avatar,
-      username: query.username,
-      subjectName: query.subjectName,
-      phone: query.phone,
-      organName: query.organName,
-      currentGrade: query.currentGrade,
-      currentClass: query.currentClass,
-      memberRankSettingId: query.memberRankSettingId,
-      membershipDay: query.membershipDay,
+      avatar: null,
+      username: null,
+      subjectName: null,
+      phone: null,
+      organName: null,
+      currentGrade: null,
+      currentClass: null,
+      membershipDay: null,
       musicGroupList: [],
+      memberList: [],
     };
   },
   async mounted() {
     try {
+      const {data} = await api_studentQueryUserInfo({ userId: this.id })
+      this.memberList = data.vipInfo || [];
+      this.avatar = data.student.avatar
+      this.username = data.student.username
+      this.subjectName = data.student.subjectName
+      this.phone = data.student.phone
+      this.organName = data.student.organName
+      this.currentGrade = data.student.currentGrade
+      this.currentClass = data.student.currentClass
+
       const res = await findStudentMusicGroups({ userId: this.id });
       this.musicGroupList = res.data || [];
     } catch {
@@ -171,10 +194,12 @@ export default {
 .APPLY {
   background: #efefef;
   border-radius: 0.06rem;
-  font-size: 0.13rem;
+  font-size: 0.12rem;
+  margin-left: .08rem;
   color: #999999;
   line-height: 0.18rem;
-  padding: 0.03rem 0.12rem;
+  padding: 0.02rem 0.08rem;
+  vertical-align: text-bottom;
 }
 
 .NORMAL {
@@ -196,4 +221,40 @@ export default {
   // color: #333;
   // margin-left: 0.08rem;
 }
+.van-cell {
+  font-size: .14rem;
+  padding: .16rem .14rem;
+}
+.van-cell__label {
+  font-size: .14rem;
+}
+
+.memberSection {
+  margin: 0.1rem 0.12rem;
+  background-color: #fff;
+  border-radius: 8px;
+  padding: .16rem .14rem;
+}
+.memberItem {
+  font-size: .14rem;
+  color: #333333;
+  line-height: .2rem;
+  padding-bottom: .16rem;
+  &:last-child {
+    padding-bottom: 0;
+  }
+  i {
+    width: 4px;
+    height: 4px;
+    display: inline-block;
+    background: #02CDBC;
+    border-radius: 50%;
+    vertical-align: middle;
+  }
+  span {
+    color: #F44541;
+    font-weight: bold;
+    padding: 0 4px;
+  }
+}
 </style>

src/views/trainStatistics/trainModel.vue

@@ -183,7 +183,6 @@ export default {
       this.studentType = "3";
     }
 
-    console.log(day, "day");
     if (selectValues.startTime && selectValues.endTime) {
       startTime = selectValues.startTime;
       endTime = selectValues.endTime;

vue.config.js

@@ -1,4 +1,4 @@
-let targetUrl = "https://test.gym.lexiaoya.cn";
+let targetUrl = "https://dev.gym.lexiaoya.cn";
 // let targetUrl = "http://192.168.3.26:8000";
 // let targetUrl = 'http://192.168.3.20:8000'
 // let targetUrl = 'https://online.gym.lexiaoya.cn'