Merge branch '0717-v3.3.5' into test

application/index/controller/Login.php

@@ -69,7 +69,7 @@ class Login extends Basic
 
         $fields = 'a.id,a.store_id,a.auth_group_id,a.district_id,a.level,a.name,a.phone,a.sex,a.img,a.status,a.admin_off
                     ,b.store_name,c.district_name,a.site_id';
-        $where['a.status'] = ['<>', 3];
+//        $where['a.status'] = ['<>', 3];
         try {
             $where['password'] = md5($password);
             $where['phone']    = trim($name);

application/index/view/news/new_text.html

@@ -324,7 +324,7 @@
 													<label class="col-sm-2 control-label">内容:</label>
 													<div class="col-sm-9">
 														<div class="" style="width: 100%;">
-															<iframe id='dajiangtang' style="width: 100%;height: 402px;border: 0;" src="baiduText"></iframe>
+															<iframe id='dajiangtang' style="width: 100%;height: 402px;border: 0;" src=""></iframe>
 															<!--<div class="input-group" style="width: 100%;" id="dajiangtang">
 																<?php
 																if (CURRENT_URL == 'https://pre2.tonglianjituan.com/') {
@@ -400,4 +400,15 @@
 <div id="img_mask_area" title="点击任意位置可关闭">
 	<img />
 </div>
-d
+<script>
\ No newline at end of file
+	window.onload = function(){
+		let ServerHostImageLiu = 'https://pre2.tonglianjituan.com';//测试 本地 用 测试域名
+	//	let ServerHostImageLiu = 'https://images.tonglianjituan.com';//测试 本地 暂时用正式域名
+		if(location.origin === 'https://api.tonglianjituan.com') {
+			ServerHostImageLiu = 'https://images.tonglianjituan.com';//正式用正式域名
+		};
+		let a = ServerHostImageLiu + '/index/baiduText' ; 
+		let iframe = document.getElementById('dajiangtang').setAttribute('src',a)
+		console.log(a);
+	}
+</script>
\ No newline at end of file

public/resource/lib/ueditor/ueditor.config.js

@@ -21,6 +21,7 @@
      */
     var URL = window.UEDITOR_HOME_URL || getUEBasePath();
 
+//	var URL = 'https://images.tonglianjituan.com';
     /**
      * 配置项主体。注意，此处所有涉及到路径的配置别遗漏URL变量。
      */
@@ -432,6 +433,8 @@
 
     function getUEBasePath(docUrl, confUrl) {
 
+//		console.log(docUrl,confUrl,self.document.URL,self.location.href,getConfigFilePath())
+
         return getBasePath(docUrl || self.document.URL || self.location.href, confUrl || getConfigFilePath());
 
     }
@@ -448,7 +451,7 @@
 
         var basePath = confUrl;
 
-
+console.log(docUrl,confUrl)
         if (/^(\/|\\\\)/.test(confUrl)) {
 
             basePath = /^.+?\w(\/|\\\\)/.exec(docUrl)[0] + confUrl.replace(/^(\/|\\\\)/, '');
@@ -486,7 +489,8 @@
             }
 
         }
-
+//		https://images.tonglianjituan.com
+		console.log(protocol+ res.join("/"))
         return protocol + res.join("/");
 
     }
@@ -494,5 +498,5 @@
     window.UE = {
         getUEBasePath: getUEBasePath
     };
-
+	console.log(window.UE)
 })();