Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into rc

src/modules/root/App.tsx

@@ -74,6 +74,8 @@ const App: React.FC = (props: any) => {
         surplusDayTime: version.surplusDayTime,
         surplusDayTime: version.surplusDayTime,
         validEndTime: moment(version.validEndTime).format('YYYY-MM-DD'),
         validEndTime: moment(version.validEndTime).format('YYYY-MM-DD'),
         validStartTime: moment(version.validStartTime).format('YYYY-MM-DD'),
         validStartTime: moment(version.validStartTime).format('YYYY-MM-DD'),
+        validEndTimeST: version.validEndTime,
+        validStartTimeST: version.validStartTime,
         whetherReachUserNum: version.whetherReachUserNum,
         whetherReachUserNum: version.whetherReachUserNum,
       };
       };
       setVersionInfo(versioninfo)
       setVersionInfo(versioninfo)

src/modules/root/Menu.tsx

@@ -64,7 +64,7 @@ function VersionPanel(props: any) {
           <div className='widget' style={{ marginBottom: '16px', width: '212px' }}>
           <div className='widget' style={{ marginBottom: '16px', width: '212px' }}>
             <div className='lable'>有效起止日期</div>
             <div className='lable'>有效起止日期</div>
             <div className='lable-text'>
             <div className='lable-text'>
-              {versionInfo?.validStartTime}~{versionInfo?.validEndTime}
+              {versionInfo?.validStartTimeST === versionInfo?.validEndTimeST ? "-" : `${versionInfo?.validStartTime}~${versionInfo?.validEndTime}`}
             </div>
             </div>
           </div>
           </div>
           <div className='widget' style={{ marginRight: '26px', marginBottom: '8px', width: '70px' }}>
           <div className='widget' style={{ marginRight: '26px', marginBottom: '8px', width: '70px' }}>

src/store/context.ts

@@ -16,6 +16,8 @@ export interface VersionInfo {
     userNum: number; //限制人数
     userNum: number; //限制人数
     validEndTime: string;
     validEndTime: string;
     validStartTime: string;
     validStartTime: string;
+    validEndTimeST: number;
+    validStartTimeST: number;
     whetherReachUserNum: boolean;
     whetherReachUserNum: boolean;
   }
   }