Merge branch 'stage-6' into dev

# Conflicts:
#	components/course/courseSection.vue
#	pages/index/index.vue
#	pages2/wd/class.vue
#	pages4/login/login.vue

components/course/courseSection.vue

@@ -67,11 +67,12 @@
           </view>
           <view
             style="font-size: 20rpx; color: #ff3b30"
-            v-if="menuItem.sectionType == 3 && !menuItem.recordingUrl"
+            v-if="menuItem.sectionType == 3"
           >
-            <view>
+            <view v-if="!menuItem.recordingUrl">
               <text>当前直播回放视频请稍后再查看</text>
             </view>
+            <view v-else> 回放中 </view>
           </view>
         </view>
         <view v-if="menuItem.sectionType == null">{{

pages/index/index.vue

@@ -242,6 +242,7 @@ export default {
   },
   onPullDownRefresh() {},
   async onLoad(option) {
+    this.dictObj;
     this.getAdvertising();
     if (this.$method.isLogin()) {
       try {
@@ -760,7 +761,7 @@ export default {
     },
   },
   onReachBottom() {},
-  computed: { ...mapGetters(["userInfo"]) },
+  computed: { ...mapGetters(["dictObj", "userInfo"]) },
 };
 </script>
 

pages2/wd/class.vue

@@ -29,15 +29,18 @@
             <image src="/static/icon/wk_icon2.png" class="wk_icon"></image>
             学习服务期:
             <text class="content">
-							{{$method.timestampToTime(item.serviceStartTime, true, true)}}-{{$method.timestampToTime(item.serviceEndTime, true, true)}}
-						</text>
+              {{
+                $method.timestampToTime(item.serviceStartTime, true, true)
+              }}-{{ $method.timestampToTime(item.serviceEndTime, true, true) }}
+            </text>
           </view>
         </view>
 
         <!-- 不在学习服务期 -->
         <template
           v-if="
-            sysTime < item.serviceStartTime || sysTime > item.serviceEndTime
+            item.serviceStartTime &&
+            (sysTime < item.serviceStartTime || sysTime > item.serviceEndTime)
           "
         >
           <view
@@ -62,11 +65,17 @@
               >
               </u-icon>
               <view class="class-warm__text">
-                <view class="date">
-									班级有效期:{{$method.timestampToTime(item.classStartTime, true, true)}}-{{$method.timestampToTime(item.classEndTime, true, true)}}
-								</view>
+                <view class="date"
+                  >班级有效期：{{
+                    $method.timestampToTime(item.classStartTime, true, true)
+                  }}
+                  -
+                  {{
+                    $method.timestampToTime(item.classEndTime, true, true)
+                  }}</view
+                >
                 <view class="state"
-                  >班级状态:已过期，有疑问请联系
+                  >班级状态：已过期，有疑问请联系
                   <text @click="call">020-87085982</text></view
                 >
               </view>
@@ -173,23 +182,13 @@
                       >
                     </template>
                     <template v-else>
-                      已过学习服务期，不可以学习了哦！
+                      <template v-if="item.serviceStartTime"
+                        >已过学习服务期，不可以学习了哦！</template
+                      >
                     </template>
                   </view>
                 </view>
               </view>
-
-              <!-- <view class="class-warm" v-if="item.profileTpStatus == 1">
-								<view class="class-warm__text">
-									<view class="date">
-										资料审核状态:
-										<text v-if="item.profileStatus == null">未提交资料</text>
-										<text v-else-if="item.profileStatus == 1">已通过</text>
-										<text v-else-if="item.profileStatus == 2">审核中</text>
-										<text v-else-if="item.profileStatus == 3">待完善</text>
-									</view>
-								</view>
-							</view> -->
             </template>
 
             <!-- 学时审核状态可以审核 -->
@@ -327,8 +326,9 @@
               <u-button
                 :class="{
                   disabled:
-                    sysTime <= item.serviceStartTime ||
-                    sysTime >= item.serviceEndTime ||
+                    (item.serviceStartTime &&
+                      (sysTime <= item.serviceStartTime ||
+                        sysTime >= item.serviceEndTime)) ||
                     (item.classStartTime && sysTime <= item.classStartTime) ||
                     (item.classEndTime && sysTime >= item.classEndTime) ||
                     item.learningStatus == 2 ||

pages3/polyv/detail.vue

@@ -7,7 +7,7 @@
     <view id="top">
       <view class="video_box" v-if="!startStatus">
         <image
-          :src="$method.splitImgHost(detail.coverUrl)"
+          :src="$method.splitImgHost(goodsData.coverUrl)"
           mode="widthFix"
           style="width: 100%; height: 421rpx"
         ></image>

pages4/login/login.vue

@@ -2,7 +2,7 @@
   <view style="height: 100%">
     <image
       mode="widthFix"
-      src="/pages5/static/login_bg.jpg"
+      src="/pages4/static/login_bg.jpg"
       class="full_img"
     ></image>
     <u-navbar