Merge branch 'master' into ljyBranch

cloud/businessCard/edit.vue

@@ -252,7 +252,7 @@ export default {
                 },
             }).then(res => {
                 console.log("获取个人信息", res)
-                // if (this.cutoff(res.msg)) return;
+                if (this.cutoff(res.msg)) return;
                 if (res.msg == '成功') {
                     this.headportraits = res.data.attinfos;
                     this.headportrait = this.headportraits.find(v => v.usetype == "headportrait") && this.headportraits.find(v => v.usetype == "headportrait").url || this.headportrait;

cloud/businessCard/share.vue

@@ -123,6 +123,7 @@ export default {
                     userid:this.userid
                 },
             })
+            if (this.cutoff(res.msg)) return;
             this.userInfo = res.data
             console.log(this.userInfo,'用户信息');
         },

pages/index/index/videoDetail.vue

@@ -1,19 +0,0 @@
-<!--  -->
-<template>
-  <div>
-    11111111111
-  </div>
-</template>
-
-<script>
-export default {
-  data () {
-    return {
-    }
-  }
-}
-</script>
-
-<style  scoped>
-
-</style>