Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/src/view/auth/Product.less

@@ -98,4 +98,17 @@
     color: #1cc0f3;
     padding-left: 5px;
     line-height: 18px;
+}
+.product-status-tag {
+    font-size: 12px;
+    user-select: none;
+    color: white;
+    background: #ed4014;
+    position: absolute;
+    right: -28px;
+    top: 10px;
+    width: 100px;
+    padding: 2px 0px;
+    text-align: center;
+    transform: rotate(45deg);
 }

TEAMModelOS/ClientApp/src/view/auth/Product.vue

@@ -28,9 +28,12 @@
                     </span>
                     <div>
                         {{$t('auth.authT3')}}
-                        <span style="color: #1890ff;">
+                        <span style="color: #1890ff;" v-if="spaceInfo.avaliableStartDate && spaceInfo.avaliableEndDate">
                             {{`${$jsFn.dateFormat(spaceInfo.avaliableStartDate)}-${$jsFn.dateFormat(spaceInfo.avaliableEndDate)}`}}
                         </span>
+                        <span v-else style="color: #ed4014">
+                            {{$t('learnActivity.createEv.noAuth')}}
+                        </span>
                     </div>
                 </div>
                 <Alert show-icon v-if="spaceStatus == 2" type="warning">
@@ -51,9 +54,12 @@
                     </span>
                     <div>
                         {{$t('auth.authT3')}}
-                        <span style="color: #1890ff;">
+                        <span style="color: #1890ff;" v-if="scaleInfo.avaliableStartDate && scaleInfo.avaliableEndDate">
                             {{`${$jsFn.dateFormat(scaleInfo.avaliableStartDate)}-${$jsFn.dateFormat(scaleInfo.avaliableEndDate)}`}}
                         </span>
+                        <span v-else style="color: #ed4014">
+                            {{$t('learnActivity.createEv.noAuth')}}
+                        </span>
                     </div>
                 </div>
                 <!-- 学校人数规模 -->
@@ -62,7 +68,7 @@
                         {{$t('auth.noBuy')}}
                     </span>
                     <p class="scale-count-num" :style="{background:scaleInfo.avaliable ? '#9bc84d':'#ed4014'}">
-                        {{scaleInfo.avaliable}}
+                        {{scaleInfo.avaliable || 0}}
                         <span style="font-size:14px">
                             {{$t('unit.text7')}}
                         </span>
@@ -88,7 +94,7 @@
                         {{ schoolBase.type == 2 ? $t('auth.periodInfo2') : $t('auth.periodInfo1')}}
                     </p>
                 </div>
-                <!-- 购买记录 -->
+                <!-- 购买记录  -->
                 <!-- <div class="auth-tab-wrap" style="margin-top:30px">
                     <span>
                         {{$t('auth.prodRecord')}}