Merge remote-tracking branch 'origin/master'

src/views/activity/drawPrize.vue

@@ -4,7 +4,7 @@
       <div slot="content"></div>
       <slot>
         <div class="selects">
-          <div style="display: flex;align-items: center;">
+          <div style="display: flex;align-items: center;"  v-show="!sysInfo">
             <span style="padding: 0 6px;word-break: keep-all;">
               项目
             </span>
@@ -81,6 +81,7 @@
     },
     data() {
       return {
+        sysInfo:null,
         select: {
           page: 1,
           page_size: 20,
@@ -180,6 +181,14 @@
     created() {
       let type = parseInt(this.$route.path.split("_")[1]);
       this.type = this.select.is_auth = type;
+
+
+      let sysInfo = sessionStorage.getItem('sys_info')
+      if (sysInfo && sysInfo != "") {
+        let _sys = JSON.parse(sysInfo);
+        that.select.activity_list_id = _sys.id;
+        that.sysInfo=_sys;
+      }
     }
   }
 </script>

src/views/activity/drawPrizeLog.vue

@@ -1,10 +1,11 @@
+
 <template>
   <div>
     <lx-header icon="md-apps" style="margin-bottom: 10px; border: 0px; margin-top: 15px" text="项目抽奖日志">
       <div slot="content"></div>
       <slot>
         <div class="selects">
-          <div style="display: flex;align-items: center;">
+          <div style="display: flex;align-items: center;" v-show="!sysInfo"> 
             <span style="padding: 0 6px;word-break: keep-all;">
               项目
             </span>
@@ -55,6 +56,7 @@
   export default {
     data() {
       return {
+        sysInfo:null,
         select: {
           page: 1,
           page_size: 20,
@@ -216,6 +218,12 @@
     created() {
       let type = parseInt(this.$route.path.split("_")[1]);
       this.type = this.select.is_auth = type;
+      let sysInfo = sessionStorage.getItem('sys_info')
+      if (sysInfo && sysInfo != "") {
+        let _sys = JSON.parse(sysInfo);
+        that.select.activity_list_id = _sys.id;
+        that.sysInfo=_sys;
+      }
     }
   }
 </script>