bug：15689、15669

pages/application/safetymeeting/safetymeeting-detail.vue

@@ -37,7 +37,8 @@
 
 
           <view class="message-warp" v-if="pd.VIDEO_SIGN_ROUTE">
-            <video :src="baseImgPath + pd.VIDEO_SIGN_ROUTE" controls="true"></video>
+            <image v-show="!isPlayVideo" src="/static/video_placeholder.jpg" style="width: 300px;height: 225px;" @click="playVideo"/>
+            <video v-show="isPlayVideo" id="video" :src="baseImgPath + pd.VIDEO_SIGN_ROUTE" controls="true"></video>
           </view>
 
 
@@ -150,6 +151,8 @@
         LIVEPHOTOS: '',
         SIGNATUREPICTURE: '',
         ATTENDANCE_STATUS: '',
+        videoContext:null,
+        isPlayVideo: false,
 			}
 		},
 		onLoad(e){
@@ -159,6 +162,13 @@
 
 		},
 		methods: {
+      playVideo(){
+        if (!this.videoContext) {
+          this.videoContext = uni.createVideoContext("video");
+        }
+        this.videoContext.play();
+        this.isPlayVideo = true;
+      },
 			//跳转事件
 			goToEdit(e) {
 				uni.navigateTo({
@@ -467,6 +477,8 @@
         this.$refs['showHiddenWindow'].open()
         this.showHiddenWindow = true
         this.hiddenIsEdit = true
+        this.videoContext && this.videoContext.pause()
+        this.isPlayVideo = false
       },
 
       openAuth(permissionID){

pages/basics/basic-info/confirm.vue

@@ -45,7 +45,15 @@
 </template>
 
 <script>
-import {basePath, loginUser} from "../../../common/tool";
+import {
+  basePath,
+  loginUser,
+  setCorpinfoId,
+  setDeptId,
+  setIsRest,
+  setloginUser,
+  setloginUserId, setPremission
+} from "../../../common/tool";
 	export default {
 		data() {
 			return {
@@ -130,7 +138,19 @@ import {basePath, loginUser} from "../../../common/tool";
                       title: '提交成功',
                       duration: 1500
                     });
-                    that.goback()
+                    // that.goback()
+                    if(this.form.REVIEW_RESULT=='1'){
+                      setloginUserId(null);
+                      setCorpinfoId(null);
+                      setDeptId(null);
+                      setloginUser(null);
+                      setIsRest(null);
+                      setPremission(null)
+                      uni.removeStorage({key: 'USER'});
+                      uni.reLaunch({
+                        url: '/pages/login/home'
+                      });
+                    }
                   }else{
                     uni.hideLoading();
                     uni.showToast({