bug 修改

application/index/view/news/index.html

@@ -376,10 +376,10 @@
 							<div class="form-group" style="width: 100%;">
 								<!--<label for="" style="width: 100%;">内容</label>-->
 								<div class="input-group" style="width: 100%;" id="dajiangtang">
-									<?php
+									<!--<?php
      											create_editor('describe');
  											?>
-								</div>
+								</div>-->
 							</div>
 						</div>
 

application/index/view/news/new_text.html

@@ -324,7 +324,7 @@
 																	<!--<label for="" style="width: 100%;">内容</label>-->
 																	<div class="input-group" style="width: 100%;" id="dajiangtang">
 																		<?php
-     											create_editor('goods_sup_id','');
+     											create_editor('goods_sup_id');
  											?>
 																	</div>
 																</div>
@@ -433,9 +433,9 @@
 							<div class="form-group" style="width: 100%;">
 								<!--<label for="" style="width: 100%;">内容</label>-->
 								<div class="input-group" style="width: 100%;" id="dajiangtang">
-									<?php
-     											create_editor('goods_sup_id','');
- 											?>
+									<!--<?php
+     											create_editor('describe');
+ 											?>-->
 								</div>
 							</div>
 						</div>

public/appnew/src/components/reportDetails/reportDetails.vue

@@ -46,7 +46,7 @@
 					</li>
 
 					<li class="main-sec-li">
-						<div>应收佣金<span class="left">{{commission}}元</span></div>
+						<div class="bottom-border">应收佣金<span class="left">{{commission}}元</span></div>
 					</li>
 					<li class="main-sec-li" v-if="!(estimated_receipt_date==''||estimated_receipt_date==null)">
 						<div>预计收款时间<span class="left">{{estimated_receipt_date}}</span></div>

public/resource/js/schoolBusiness.js

@@ -369,7 +369,9 @@ define (['doT', 'text!temp/schoolBusiness_template_tpl.html','ckfinder','ckfinde
 											'0': _data['cover_plan']
 										}));
 									};
-			 _dajiangtangObj.find('iframe').contents().find('body').html(_data['content']); //大讲堂
+									//获取编辑器里的内容
+//		                            setCKeditorValue(id,content)
+		                            setCKeditorValue("goods_sup_id",_data['content']);
 					} else {
 					}
 				}
@@ -427,7 +429,7 @@ define (['doT', 'text!temp/schoolBusiness_template_tpl.html','ckfinder','ckfinde
                     $ ("#modal_add_user").modal ('hide');//提交成功 关闭模态框
                         user.getList(1);
                         alert('提交成功')
-                         //window.location.href='/index/business_school';
+                           window.location.href='/index/business_school';
                         console.log(66);
                     } else {
                         alert(data.msg);