Merge branch 'master' of https://git.cocorobo.cn/jack/EvenManage

src/components/pages/race/addRace.vue

@@ -41,8 +41,6 @@
     <div class="race_body">
       <RaceDetail
         v-if="steps == 1"
-        :oid="oid"
-        :userid="userid"
         :raceInfo="raceInfo"
         @updateTitle="updateRaceInfoTitle"
       ></RaceDetail>
@@ -177,8 +175,8 @@ export default {
   data() {
     return {
       steps: 1,
-      userid: this.$route.query.userid,
-      oid: this.$route.query.oid,
+      userid: this.$store.state.userInfo.userid,
+      oid: this.$store.state.userInfo.school,
       aid: this.$route.query.aid ? this.$route.query.aid : "",
       dialogVisible: false,
       dialogVisible1: false,

src/components/pages/race/addRace/raceDetail.vue

@@ -529,7 +529,7 @@
 
 <script>
 export default {
-  props: ["userid", "oid", "raceInfo"],
+  props: ["raceInfo"],
   data() {
     return {
       tableHeight: "500px",

src/components/pages/race/eventCenter.vue

@@ -51,8 +51,8 @@ export default {
   data() {
     return {
       steps: 1,
-      userid: this.$route.query.userid,
-      oid: this.$route.query.oid,
+      userid: this.$store.state.userInfo.userid,
+      oid: this.$store.state.userInfo.school,
       bannerList: [
         "https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/bg1667830734044.png",
       ],

src/components/pages/race/eventCenter/anliDetail.vue

@@ -6,7 +6,7 @@
           <div class="anliImg">
             <img
               :src="
-                anliBox[0] && anliBox[0].info && anliBox[0].info.cover
+                anliBox[0] && anliBox[0].info && anliBox[0].info.cover.length
                   ? anliBox[0].info.cover[0].url
                   : noBanner
               "
@@ -1425,8 +1425,8 @@ export default {
       full: false,
       briefNav: "",
       pptImgUrl: "",
-      userid: this.$route.query.userid,
-      oid: this.$route.query.oid,
+      userid: this.$store.state.userInfo.userid,
+      oid: this.$store.state.userInfo.school,
       aid: this.$route.query.aid,
       anliBox: [],
       imgAnliBox: [],

src/components/pages/race/eventCenter/myAnli.vue

@@ -262,8 +262,8 @@ export default {
 
 <style scoped>
 @media screen and (max-width: 1280px) {
-  .myAnliBox {
-    /* height: 430px !important; */
+  .anliNav > div:nth-child(3){
+    width: 70% !important;
   }
 }
 .myAnliBox {