Bläddra i källkod

Merge branch 'jenkins' of http://git.dayaedu.com/yonge/mteacher into jenkins

黄琪勇 11 månader sedan
förälder
incheckning
ca011b8a46

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/app.c37c6af8957a011bd799.js


+ 1 - 0
dist/css/studentDetail.0860a57e.css

@@ -0,0 +1 @@
+.studentDetail[data-v-49e00886]{min-height:100vh;overflow:hidden}.studentMember[data-v-49e00886]{padding:6px 8px;background:#fcedd3;border-radius:.14rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;line-height:.18rem}.studentMember img[data-v-49e00886]{width:18px;height:18px;margin-right:5px}.studentLogo[data-v-49e00886]{width:.48rem;height:.48rem;border-radius:50%;margin-right:10px;overflow:hidden}.title[data-v-49e00886]{font-size:.16rem;font-weight:500;color:#333;line-height:.22rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin:0 .12rem .1rem}.title i[data-v-49e00886]{display:inline-block;width:4px;height:14px;background:-webkit-gradient(linear,left top,left bottom,from(#02e2db),to(#01c1b5));background:linear-gradient(180deg,#02e2db,#01c1b5);border-radius:2px;margin-right:.06rem}.APPLY[data-v-49e00886],.NORMAL[data-v-49e00886],.QUIT[data-v-49e00886]{background:#efefef;border-radius:.06rem;font-size:.12rem;margin-left:.08rem;color:#999;line-height:.18rem;padding:.02rem .08rem;vertical-align:text-bottom}.NORMAL[data-v-49e00886]{color:#01c1b5;background:#e5f8f7}.APPLY[data-v-49e00886]{color:#fa6400;background:#fee1cd}.iconCopy[data-v-49e00886]{font-size:.14rem;color:#01c1b5;line-height:.2rem;padding-left:.16rem}.van-cell[data-v-49e00886]{font-size:.14rem;padding:.16rem .14rem}.van-cell__label[data-v-49e00886]{font-size:.14rem}.memberSection[data-v-49e00886]{margin:.1rem .12rem;background-color:#fff;border-radius:8px;padding:.16rem .14rem}.memberItem[data-v-49e00886]{font-size:.14rem;color:#333;line-height:.2rem;padding-bottom:.16rem}.memberItem[data-v-49e00886]:last-child{padding-bottom:0}.memberItem i[data-v-49e00886]{width:4px;height:4px;display:inline-block;background:#02cdbc;border-radius:50%;vertical-align:middle}.memberItem span[data-v-49e00886]{color:#f44541;font-weight:700;padding:0 4px}

+ 0 - 1
dist/css/studentDetail.c482167e.css

@@ -1 +0,0 @@
-.studentDetail[data-v-02f3e2fa]{min-height:100vh;overflow:hidden}.studentMember[data-v-02f3e2fa]{padding:6px 8px;background:#fcedd3;border-radius:.14rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;line-height:.18rem}.studentMember img[data-v-02f3e2fa]{width:18px;height:18px;margin-right:5px}.studentLogo[data-v-02f3e2fa]{width:.48rem;height:.48rem;border-radius:50%;margin-right:10px;overflow:hidden}.title[data-v-02f3e2fa]{font-size:.16rem;font-weight:500;color:#333;line-height:.22rem;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin:0 .12rem .1rem}.title i[data-v-02f3e2fa]{display:inline-block;width:4px;height:14px;background:-webkit-gradient(linear,left top,left bottom,from(#02e2db),to(#01c1b5));background:linear-gradient(180deg,#02e2db,#01c1b5);border-radius:2px;margin-right:.06rem}.APPLY[data-v-02f3e2fa],.NORMAL[data-v-02f3e2fa],.QUIT[data-v-02f3e2fa]{background:#efefef;border-radius:.06rem;font-size:.13rem;color:#999;line-height:.18rem;padding:.03rem .12rem}.NORMAL[data-v-02f3e2fa]{color:#01c1b5;background:#e5f8f7}.APPLY[data-v-02f3e2fa]{color:#fa6400;background:#fee1cd}.iconCopy[data-v-02f3e2fa]{font-size:.14rem;color:#01c1b5;line-height:.2rem;padding-left:.16rem}

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/css/studentList.7e25d609.css


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/css/trainStatistics.f9cdce31.css


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/index.html


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/creation.31d367d4.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/studentDetail.1f8bede1.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/studentDetail.9bf985d7.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/studentList.93eee207.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/studentList.cf05dbe5.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/trainStatistics.84894159.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/js/trainStatistics.869a2d19.js


+ 0 - 1
src/views/creation/share-model/index.vue

@@ -213,7 +213,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("复制成功");

+ 11 - 0
src/views/studentList/api.js

@@ -24,6 +24,17 @@ export const findStudentMusicGroups = (data) => {
   });
 };
 
+export const api_studentQueryUserInfo = (data) => {
+  return request({
+    url: "/eduStudent/queryUserInfo",
+    method: "get",
+    params: data,
+  });
+};
+
+// GET http://192.168.3.253:8805/api-web/studentManage/queryUserInfo?userId=225006
+// GET http://192.168.3.253:8805/api-web/eduStudent/queryUserInfo?userId=225006
+
 // export const queryPageStudent = (data) => {
 //   return request({
 //     url: "/imLiveBroadcastRoom/queryPage",

BIN
src/views/studentList/images/icon-vip-active.png


BIN
src/views/studentList/images/icon-vip.png


+ 2 - 2
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>

+ 63 - 11
src/views/studentList/studentDetail.vue

@@ -1,6 +1,6 @@
 <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" />
@@ -8,23 +8,30 @@
         <template #title>
           <div 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>
+    <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,15 +45,18 @@
 
     <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;
@@ -63,10 +73,14 @@ export default {
       memberRankSettingId: query.memberRankSettingId,
       membershipDay: query.membershipDay,
       musicGroupList: [],
+      memberList: [],
     };
   },
   async mounted() {
     try {
+      const {data} = await api_studentQueryUserInfo({ userId: this.id })
+      this.memberList = data.vipInfo || [];
+
       const res = await findStudentMusicGroups({ userId: this.id });
       this.musicGroupList = res.data || [];
     } catch {
@@ -171,10 +185,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 +212,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>

+ 0 - 1
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;

+ 1 - 1
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'

Vissa filer visades inte eftersom för många filer har ändrats