修改样式及bug

dist/css/PeriodExchange.0ce9b63c.css

@@ -0,0 +1 @@
+.periodExchange[data-v-744c3b4c]{min-height:100vh;position:relative}.periodExchange .logo[data-v-744c3b4c]{width:.5rem;height:.5rem;border-radius:50%;overflow:hidden;margin-right:.13rem}.periodExchange[data-v-744c3b4c] .van-cell{padding:.26rem .16rem .88rem}.periodExchange .exchangeText[data-v-744c3b4c]{font-size:.18rem;color:#1a1a1a}.periodExchange .info[data-v-744c3b4c]{font-size:.16rem;color:grey}.activeList[data-v-744c3b4c]{padding:0 .16rem;margin-top:-.6rem;position:relative;z-index:99}.activeList .active[data-v-744c3b4c]{position:relative;margin-bottom:.15rem;line-height:0}.activeList img[data-v-744c3b4c]{width:100%}.activeList .icon_question[data-v-744c3b4c]{position:absolute;bottom:.1rem;right:.1rem;color:#fff;font-size:.18rem}.popupContent[data-v-744c3b4c]{padding:.4rem .16rem .1rem}.pay_btn[data-v-744c3b4c]{background:#14928a;line-height:.45rem;color:#fff;font-size:.18rem;border-radius:.5rem;text-align:center;position:absolute;width:90%;margin-left:5%;bottom:.2rem}

dist/css/PeriodExchange.ab49d13b.css

@@ -1 +0,0 @@
-.periodExchange[data-v-a086ca92]{min-height:100vh;position:relative}.periodExchange .logo[data-v-a086ca92]{width:.5rem;height:.5rem;border-radius:50%;overflow:hidden;margin-right:.13rem}.periodExchange[data-v-a086ca92] .van-cell{padding:.26rem .16rem .88rem}.periodExchange .exchangeText[data-v-a086ca92]{font-size:.18rem;color:#1a1a1a}.periodExchange .info[data-v-a086ca92]{font-size:.16rem;color:grey}.activeList[data-v-a086ca92]{padding:0 .16rem;margin-top:-.6rem;position:relative;z-index:99}.activeList .active[data-v-a086ca92]{margin-bottom:.15rem}.activeList img[data-v-a086ca92]{width:100%}.pay_btn[data-v-a086ca92]{background:#14928a;line-height:.45rem;color:#fff;font-size:.18rem;border-radius:.5rem;text-align:center;position:absolute;width:90%;margin-left:5%;bottom:.2rem}

src/views/app/Account.vue

@@ -2,22 +2,36 @@
     <div class="account">
         <m-header v-if="headerStatus" />
 
-        <div class="accountHeader">
+        <!-- <div class="accountHeader">
             <div class="bgColor"></div>
             <van-row class="content" type="flex" justify="center" align="center">
                 <van-col span="24">
-                    <i class="icon icon_times"></i>剩余时间<span>{{ availableMinutes }}</span>
+                    剩余时间<span>{{ availableMinutes }}</span>
                 </van-col>
-                <!-- <van-col span="12">
+                <van-col span="12">
                     <i class="icon icon_lock"></i>冻结时间<span class="lock">{{ frozenMinutes }}</span>
-                </van-col> -->
+                </van-col>
             </van-row>
-        </div>
-
+        </div> -->
+        <van-cell-group style="margin-bottom: .15rem;">
+            <van-cell title="剩余时间" >
+                <i class="icon icon_times" slot="icon"></i>
+                <div slot="default" class="available">
+                    {{ availableMinutes | calcMinute }}
+                </div>
+            </van-cell>
+        </van-cell-group>
         <van-cell-group>
-            <van-cell title="课时兑换" is-link to="periodExchange" />
-            <van-cell title="兑换记录" is-link to="exchangeRecord" />
-            <van-cell title="课时使用记录" is-link to="periodRecord" />
+            <van-cell title="课时兑换" is-link to="periodExchange" >
+                <i class="icon icon_change" slot="icon"></i>
+            </van-cell>
+            <van-cell title="兑换记录" is-link to="exchangeRecord" >
+                <i class="icon icon_record" slot="icon"></i>
+            </van-cell>
+
+            <van-cell title="课时使用记录" is-link to="periodRecord" >
+                <i class="icon icon_use" slot="icon"></i>
+            </van-cell>
         </van-cell-group>
 
     </div>
@@ -65,8 +79,7 @@ export default {
                 if(result.code == 200) {
                     let tempResult = result.data
                     if(tempResult) {
-                        this.availableMinutes = calcMinute(tempResult.availableMinutes ? tempResult.availableMinutes : 0)
-                        this.frozenMinutes = calcMinute(tempResult.frozenMinutes ? tempResult.frozenMinutes : 0)
+                        this.availableMinutes = (tempResult.availableMinutes ? tempResult.availableMinutes : 0)
                     }
                 } else {
                     this.$toast(result.msg)
@@ -82,62 +95,79 @@ export default {
     min-height: 100vh;
 }
 
-.accountHeader {
-    background: #fff;
-    padding-bottom: .2rem;
-    .bgColor {
-        margin-top: -1px;   
-        height: .9rem;
-        background: #14928A;
-    }
-    .content {
-        height:74px;
-        background: rgba(255,255,255,1);
-        box-shadow: 0px 0px 16px 0px rgba(0,0,0,0.19);
-        border-radius: .08rem;
-        margin: -.5rem .16rem 0;
-        text-align: center;
-        .van-col {
-            color: #1A1A1A;
-            display: flex;
-            align-items: center;
-            // justify-content: center;
-            padding-left: .2rem;
-            // &:first-child {
-            //     border-right: 1px solid #CCCCCC;
-            // }
-            span {
-                padding-left: .1rem;
-                color: #FF0909;
-                &.lock {
-                    color: #999999;
-                }
-            }
-        }
-        .icon {
-            display: inline-block;
-            width: .16rem;
-            height: .18rem;
-            margin-right: .05rem;
-            margin-top: -0.02rem;
-        }
-        .icon_times {
-            background: url('../../assets/images/app/icon_times.png') no-repeat center center;
-            background-size: contain;
-        }
-        .icon_lock {
-            background: url('../../assets/images/app/icon_lock.png') no-repeat center center;
-            background-size: contain;
-        }
-    }
+// .accountHeader {
+//     background: #fff;
+//     padding-bottom: .2rem;
+//     .bgColor {
+//         margin-top: -1px;   
+//         height: .9rem;
+//         background: #14928A;
+//     }
+//     .content {
+//         height:74px;
+//         background: rgba(255,255,255,1);
+//         box-shadow: 0px 0px 16px 0px rgba(0,0,0,0.19);
+//         border-radius: .08rem;
+//         margin: -.5rem .16rem 0;
+//         text-align: center;
+//         .van-col {
+//             color: #1A1A1A;
+//             display: flex;
+//             align-items: center;
+//             // justify-content: center;
+//             padding-left: .2rem;
+//             // &:first-child {
+//             //     border-right: 1px solid #CCCCCC;
+//             // }
+//             span {
+//                 padding-left: .1rem;
+//                 color: #FF0909;
+//                 &.lock {
+//                     color: #999999;
+//                 }
+//             }
+//         }
+        
+//     }
+// }
+.icon {
+    display: inline-block;
+    width: 0.2rem;
+    height: 0.22rem;
+    margin-right: .05rem;
+    margin-top: -0.02rem;
+}
+.icon_times {
+    background: url('../../assets/images/app/icon_times.png') no-repeat center center;
+    background-size: contain;
+}
+.icon_lock {
+    background: url('../../assets/images/app/icon_lock.png') no-repeat center center;
+    background-size: contain;
+}
+.icon_change {
+    background: url('../../assets/images/app/icon_change.png') no-repeat center center;
+    background-size: contain;
+}
+.icon_record {
+    background: url('../../assets/images/app/icon_record.png') no-repeat center center;
+    background-size: contain;
+}
+.icon_use {
+    background: url('../../assets/images/app/icon_use.png') no-repeat center center;
+    background-size: contain;
 }
-
 /deep/.van-cell-group {
     &::after {
         border-width: 0;;
     }
     /deep/.van-cell {
         padding: .16rem;
+        align-items: center;
+        .available {
+            color: #FF0909;
+            font-size: .17rem;
+        }
     }
 }
 

src/views/app/CourseApply.vue

@@ -13,7 +13,7 @@
         </van-cell-group>
         <van-cell-group>
             <van-field v-model="form.courseCount" label="排课数量" input-align="right" size="large" placeholder="请输入排课数量" type="digit" @input="onCourseChange" />
-            <van-field @click="dataForm.status = true" v-model="form.courseStart" label="排课开始时间" :readonly="true" input-align="right" is-link size="large" placeholder="请选择" />
+            <van-field @click="dataForm.status = true" v-model="formName.courseStart" label="排课开始时间" :readonly="true" input-align="right" is-link size="large" placeholder="请选择" />
 
             <van-cell title-class="title-time" v-for="(item, index) in scheduleList" :key="index">
                 <template slot="title">
@@ -78,7 +78,7 @@
                 <van-row v-for="(item, index) in timeTable" :key="index">
                     <!-- <van-col span="12">线上</van-col> -->
                     <van-col span="24">
-                        {{ item.classDate }} {{ item.startClassTimeStr }}
+                        {{ item.classDate }} {{ item.startClassTimeStr }} {{ getWeekStr(new Date(item.classDate).getDay()) }}
                     </van-col>
                 </van-row>
             </div>
@@ -159,6 +159,7 @@ export default {
             formName: courseList ? courseList.formName : {
                 subjectListName: null, // 声部名称
                 subjectListIndex: 0, // 声部名称
+                courseStart: null
             },
             scheduleList: courseList ? courseList.scheduleList : [], // 课时安排
             timeTable: [], // 生成的课表
@@ -283,6 +284,7 @@ export default {
             let tempMonth = selectDate.getMonth() + 1 >= 10 ? selectDate.getMonth() + 1 : '0' + (selectDate.getMonth() + 1)
             let tempDay = selectDate.getDate() >= 10 ? selectDate.getDate() : '0' + selectDate.getDate()
             this.form.courseStart = selectDate.getFullYear() + '-' + tempMonth + '-' + tempDay
+            this.formName.courseStart = selectDate.getFullYear() + '-' + tempMonth + '-' + tempDay + ' ' + this.getWeekStr(selectDate.getDay())
             this.dataForm.status = false
         },
         onCourseShedule() { // 课时安排
@@ -490,6 +492,18 @@ export default {
             }
             return template[str]
         },
+        getWeekStr(str) { // 获取周几索引值
+            let template = {
+                1: '周一',
+                2: '周二',
+                3: '周三',
+                4: '周四',
+                5: '周五',
+                6: '周六',
+                0: '周日'
+            }
+            return template[str]
+        },
         formatter(type, value) {
             if (type === 'year') {
                 return `${value}年`;

src/views/app/CourseDetail.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="courseEvaluation">
-        <MHeader />
+        <MHeader v-if="headerStatus" />
         
         <van-cell-group>
             <van-cell title="课程班名称" :value="teacherClassHeadInfo.classGroupName" />
@@ -88,6 +88,7 @@ export default {
     data () {
         let query = this.$route.query
         return {
+            headerStatus: false,
             checked: true,
             courseId: query.courseId,
             teachingMaterial: null,
@@ -101,6 +102,18 @@ export default {
         }
     },
     mounted() {
+        let params = this.$route.query
+        if(params.Authorization) {
+            localStorage.setItem('Authorization', decodeURI(params.Authorization))
+            localStorage.setItem('userInfo', decodeURI(params.Authorization))
+        }
+        // 判断是否在app里面
+        if(!browser().android && !browser().iPhone) {
+            this.headerStatus = true
+        } else {
+            document.title = '课程评价'
+        }
+
         this.__init()
     },
     methods: {

src/views/app/PeriodExchange.vue

@@ -19,11 +19,16 @@
 
         <div class="activeList">
             <div class="active" @click="onPayOrder(item)" v-for="(item, index) in dataList" :key="index">
+                <van-icon name="question-o" @click.stop="onMore(item)" class="icon_question" />
                 <img :src="item.coverImg" alt="">
             </div>
         </div>
     
         <!-- <div class="pay_btn" >确认兑换</div> -->
+        <van-popup v-model="popupShow" closeable position="bottom"
+        :style="{ minHeight: '30%', maxHeight: '60%' }" >
+            <div class="popupContent" v-html="popupContent"></div>
+        </van-popup>
     </div>
 </template>
 <script>
@@ -42,7 +47,9 @@ export default {
             headerStatus: true,
             result: {}, // 生成订单的数据
             dataList: [],
-            isClick: false
+            isClick: false,
+            popupShow: false,
+            popupContent: null
         }
     },
     mounted() {
@@ -148,6 +155,10 @@ export default {
             //         }
             //     })
             // }
+        },
+        onMore(item) {
+            this.popupContent = item.detail
+            this.popupShow = true
         }
     }
 }
@@ -183,12 +194,24 @@ export default {
     position: relative;
     z-index: 99;
     .active {
+        position: relative;
         margin-bottom: .15rem;
+        line-height: 0;
         // box-shadow:0px 0px 16px 0px rgba(155,145,41,0.19);
     }
     img {
         width: 100%;
     }
+    .icon_question {
+        position: absolute;
+        bottom: .1rem;
+        right: .1rem;
+        color: #fff;
+        font-size: .18rem;
+    }
+}
+.popupContent {
+    padding: .4rem .16rem .1rem;
 }
 .pay_btn {
     background: #14928A;