微网站

src/scrm_pages/Enviroments/enviromentsdetail.vue

@@ -39,7 +39,8 @@
          getEnviromentImages(id,orgid){
             getEnviromentImages(id,orgid).then(response=>{
                  if(response.data.state == 1){
-                   
+                   var enviro =  response.data.data.enviro;
+                   console.log("enviro是什么",enviro)
                  }
             })
          }

src/scrm_pages/newsDetail/newsDetail.vue

@@ -2,7 +2,7 @@
   <div class="page_newsDetail">
     <div class="newsTitle">{{articles.title}}</div>
     <div class="msg" v-html="articles.content" v-show="articleshow"></div>
-<<<<<<< .mine
+
      <div class="video" v-show="videoshow">            
           <video id="example_video_1" class="video-js vjs-default-skin"
                  controls preload="auto" width="100%" height="100%"
@@ -11,30 +11,6 @@
                <source :src="articles.video_url" type='video/mp4' />
         </video>            
         </div>
-
-
-
-
-
-
-
-=======
-    <div class="video" v-show="videoshow">
-      <video
-        id="example_video_1"
-        class="video-js vjs-default-skin"
-        controls
-        preload="auto"
-        width="640"
-        height="300"
-        poster="http://video-js.zencoder.com/oceans-clip.png"
-        data-setup="{"example_option":true}"
-        ref="video"
-      >
-        <source :src="articles.video_url" type="video/mp4" />
-      </video>
-    </div>
->>>>>>> .theirs
   </div>
 </template>
   <script>