Przeglądaj źródła

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

黄琪勇 10 miesięcy temu
rodzic
commit
6a53abf77d

Plik diff jest za duży
+ 1 - 0
dist/app.708be71fc8a46c34f099.js


Plik diff jest za duży
+ 0 - 0
dist/app.883621f3a6a6cc4e1f3e.js


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

@@ -1 +0,0 @@
-.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}

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

@@ -0,0 +1 @@
+.studentDetail[data-v-d66454f2]{min-height:100vh;overflow:hidden}.studentMember[data-v-d66454f2]{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-d66454f2]{width:18px;height:18px;margin-right:5px}.studentLogo[data-v-d66454f2]{width:.48rem;height:.48rem;border-radius:50%;margin-right:10px;overflow:hidden}.title[data-v-d66454f2]{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-d66454f2]{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-d66454f2],.NORMAL[data-v-d66454f2],.QUIT[data-v-d66454f2]{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-d66454f2]{color:#01c1b5;background:#e5f8f7}.APPLY[data-v-d66454f2]{color:#fa6400;background:#fee1cd}.iconCopy[data-v-d66454f2]{font-size:.14rem;color:#01c1b5;line-height:.2rem;padding-left:.16rem}.van-cell[data-v-d66454f2]{font-size:.14rem;padding:.16rem .14rem}.van-cell__label[data-v-d66454f2]{font-size:.14rem}.memberSection[data-v-d66454f2]{margin:.1rem .12rem;background-color:#fff;border-radius:8px;padding:.16rem .14rem}.memberItem[data-v-d66454f2]{font-size:.14rem;color:#333;line-height:.2rem;padding-bottom:.16rem}.memberItem[data-v-d66454f2]:last-child{padding-bottom:0}.memberItem i[data-v-d66454f2]{width:4px;height:4px;display:inline-block;background:#02cdbc;border-radius:50%;vertical-align:middle}.memberItem span[data-v-d66454f2]{color:#f44541;font-weight:700;padding:0 4px}

Plik diff jest za duży
+ 1 - 0
dist/index.html


Plik diff jest za duży
+ 0 - 0
dist/js/studentDetail.461894b0.js


Plik diff jest za duży
+ 0 - 0
dist/js/studentDetail.9bf985d7.js


Plik diff jest za duży
+ 0 - 0
dist/js/studentList.6060ff57.js


Plik diff jest za duży
+ 0 - 0
dist/js/studentList.93eee207.js


+ 1 - 1
src/views/studentList/api.js

@@ -26,7 +26,7 @@ export const findStudentMusicGroups = (data) => {
 
 export const api_studentQueryUserInfo = (data) => {
   return request({
-    url: "/eduStudent/queryUserInfo",
+    url: "/student/queryUserInfo",
     method: "get",
     params: data,
   });

+ 2 - 2
src/views/studentList/studentDetail.vue

@@ -23,8 +23,8 @@
       </van-cell> -->
     </van-cell-group>
 
-    <div class="title"><i></i>会员信息</div>
-    <div class="memberSection">
+    <div class="title" v-if="memberList.length > 0"><i></i>会员信息</div>
+    <div class="memberSection" v-if="memberList.length > 0">
       <div class="memberItem" v-for="(item, index) in memberList" :key="index">
         <i></i>「{{item.memberRankName}}」剩余有效期<span>{{ item.remainingDays }}</span>天
       </div>

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików