修改商学院。。。。

e2472077 · duxinyuan · 533032ad · e2472077 · e2472077 · e2472077
Commit e2472077 authored Jul 29, 2019 by duxinyuan
21 changed files
--- a/application/index/view/news/baidu_text.html
+++ b/application/index/view/news/baidu_text.html
@@ -13,7 +13,7 @@
 <script type="text/javascript" charset="utf-8" src="/resource/lib/ueditor/lang/zh-cn/zh-cn.js"></script>
        
 <div>
-	<script type="text/plain" id="myEditor" style="width:760px;height:376px;">
+	<script type="text/plain" id="myEditor" style="width:100%;height:376px;">
    </script>
 </div>

@@ -32,6 +32,7 @@
    //编辑 新增 提交内容
    window.addEventListener('message', function (e) {
    	if(e.data*1 == 1){
+    		console.log(window.parent)
    	  window.parent.postMessage(ue.getContent(),'*');	
    	}
    }, false);
@@ -43,6 +44,11 @@
 			});
    	}
    }, false);
+    
+    window.onload = function(a){
+    	document.getElementById('edui1').style.width = '100%';
+    	document.getElementById('edui1_iframeholder').style.width = '100%'
+    }
 </script>

 </body>

--- a/application/index/view/news/new_text.html
+++ b/application/index/view/news/new_text.html
@@ -288,6 +288,7 @@
 														</ul>
 													</div>-->
 													
+													
 													<div class="col-xs-9">
 														<ul class="list-group">
 															<li class="list-group-item">
@@ -318,11 +319,13 @@
                	
 												</div>
 												
+												
 												<div class="form-group">
 													<label class="col-sm-2 control-label">内容:</label>
 													<div class="col-sm-9">
 														<div class="" style="width: 100%;">
-															<div class="input-group" style="width: 100%;" id="dajiangtang">
+															<iframe id='dajiangtang' style="width: 100%;height: 402px;border: 0;" src="baiduText"></iframe>
+															<!--<div class="input-group" style="width: 100%;" id="dajiangtang">
 																<?php
 																if (CURRENT_URL == 'https://pre2.tonglianjituan.com/') {
 																	$url = 'https://pre2.tonglianjituan.com/';
@@ -331,7 +334,7 @@
 																}
 	 											create_editor('goods_sup_id','',['filebrowserUploadUrl'=>$url.'index/uploadEditor?type=business_school']);
 											?>
-															</div>
+															</div>-->
 														</div>
 													</div>
 	
@@ -396,4 +399,5 @@
 </div>
 <div id="img_mask_area" title="点击任意位置可关闭">
 	<img />
-</div>
\ No newline at end of file
+</div>
+d
\ No newline at end of file
--- a/application/index/view/opensquare/opensquareLogList.html
+++ b/application/index/view/opensquare/opensquareLogList.html
@@ -499,7 +499,7 @@
 													<label class="col-sm-2 control-label">内容:</label>
 													<div class="col-sm-9">
 														<div>
-															<iframe id='ifram-kaipan' style="width: 782px;height: 402px;border: 0;"></iframe>
+															<iframe id='ifram-kaipan' style="width: 782px;height: 402px;border: 0;" src="baiduText"></iframe>
 									                                               <!--加载编辑器的容器--> 
 															    <!--<script type="text/plain" id="myEditor" style="width:716px;height:300px;">
 																</script>

--- a/public/app/dist/index.html
+++ b/public/app/dist/index.html
@@ -23,4 +23,4 @@
 				if(!doc.addEventListener) return;
 				win.addEventListener(resizeEvt, recalc, false);
 				doc.addEventListener('DOMContentLoaded', recalc, false);
-			})(document, window);</script><link href=./static/css/app.6cd03a207b1077bd0caf48cd7df40c33.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.ad0e0d131a0261acd8c6.js></script></body></html>
\ No newline at end of file
+			})(document, window);</script><link href=./static/css/app.9ddeca9c5d719cc60e2686573e525ac9.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.208ae12f6ff101858775.js></script></body></html>
\ No newline at end of file
--- a/public/app/dist/static/css/app.2e72f9029e8fc32a3fd2a726110578b1.css
+++ b/public/app/dist/static/css/app.2e72f9029e8fc32a3fd2a726110578b1.css
--- a/public/app/dist/static/css/app.3951cd878fec67723b7239904a08ed7f.css
+++ b/public/app/dist/static/css/app.3951cd878fec67723b7239904a08ed7f.css
--- a/public/app/dist/static/css/app.947e86d7015278635fd0e136e4b5f94d.css
+++ b/public/app/dist/static/css/app.947e86d7015278635fd0e136e4b5f94d.css
--- a/public/app/dist/static/css/app.9ddeca9c5d719cc60e2686573e525ac9.css
+++ b/public/app/dist/static/css/app.9ddeca9c5d719cc60e2686573e525ac9.css
--- a/public/app/dist/static/css/app.a87c676a2d4cfe985afb2676555e593c.css
+++ b/public/app/dist/static/css/app.a87c676a2d4cfe985afb2676555e593c.css
--- a/public/app/dist/static/css/app.b140580c7cd247eb57bb099fcb2c792f.css
+++ b/public/app/dist/static/css/app.b140580c7cd247eb57bb099fcb2c792f.css
--- a/public/app/dist/static/css/app.ce98fccd1ef44a43806bc8f981d3f024.css
+++ b/public/app/dist/static/css/app.ce98fccd1ef44a43806bc8f981d3f024.css
--- a/public/app/dist/static/js/app.0acd0e9ecd06cc617673.js
+++ b/public/app/dist/static/js/app.0acd0e9ecd06cc617673.js
--- a/public/app/dist/static/js/app.13ad1579b91069623d0a.js
+++ b/public/app/dist/static/js/app.13ad1579b91069623d0a.js
--- a/public/app/dist/static/js/app.208ae12f6ff101858775.js
+++ b/public/app/dist/static/js/app.208ae12f6ff101858775.js
--- a/public/app/dist/static/js/app.20b33c337e743fabd0ba.js
+++ b/public/app/dist/static/js/app.20b33c337e743fabd0ba.js
--- a/public/app/dist/static/js/app.60d5a0b01af1f97e0bd3.js
+++ b/public/app/dist/static/js/app.60d5a0b01af1f97e0bd3.js
--- a/public/app/dist/static/js/app.f1a4efe660e7763d4656.js
+++ b/public/app/dist/static/js/app.f1a4efe660e7763d4656.js
--- a/public/app/dist/static/js/app.fd81f08ab8b7d6f6172c.js
+++ b/public/app/dist/static/js/app.fd81f08ab8b7d6f6172c.js
--- a/public/appnew/src/components/phoneDetail/phoneDetail.vue
+++ b/public/appnew/src/components/phoneDetail/phoneDetail.vue
--- a/public/resource/js/opensquareList.js
+++ b/public/resource/js/opensquareList.js
--- a/public/resource/js/schoolBusinessNew.js
+++ b/public/resource/js/schoolBusinessNew.js