zhangzl
/
nsgk_web
1
0
Форк 0
Код Проблеми 0 Запити на злиття 0 Релізи 0 Вікі Активність
Переглянути джерело

Merge branch 'newProperty' of http://116.255.223.226:3000/zhangzl/nsgk_web into newProperty

RongCheng
庞东旭 2 роки тому
джерело
bee5098e07 41a79adc71
коміт
f681b9727e
11 змінених файлів з 22 додано та 19 видалено
Об'єднаний перегляд
Параметри порівняння
Показати статистику Завантажити патч Завантажити файл різниці
  1. +2
    -2
      infoport/homestead.html
  2. +2
    -2
      infoport/homesteadDetail.html
  3. +2
    -2
      infoport/index.html
  4. +2
    -2
      infoport/newDetail.html
  5. +2
    -2
      infoport/property.html
  6. +2
    -2
      infoport/propertyDetail.html
  7. +2
    -2
      infoport/resource.html
  8. +2
    -2
      infoport/resourceDetail.html
  9. +2
    -1
      infoport/static/js/project/homestead.js
  10. +2
    -1
      infoport/static/js/project/property.js
  11. +2
    -1
      infoport/static/js/project/resource.js

+ 2
- 2
infoport/homestead.html Переглянути файл

@@ -4,7 +4,7 @@


<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>乳山农村资源信息港</title>
<title>农村资源信息港</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="keywords" content="" /> <meta name="keywords" content="" />
@@ -247,4 +247,4 @@
</div> </div>
</body> </body>
<script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/homestead.js" defer type="text/javascript"></script> <script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/homestead.js" defer type="text/javascript"></script>
</html>
</html>

+ 2
- 2
infoport/homesteadDetail.html Переглянути файл

@@ -4,7 +4,7 @@


<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>乳山农村资源信息港</title>
<title>农村资源信息港</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="keywords" content="" /> <meta name="keywords" content="" />
@@ -194,4 +194,4 @@
</div> </div>
</body> </body>
<script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/homesteadDetail.js" defer type="text/javascript"></script> <script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/homesteadDetail.js" defer type="text/javascript"></script>
</html>
</html>

+ 2
- 2
infoport/index.html Переглянути файл

@@ -4,7 +4,7 @@


<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>乳山农村资源信息港</title>
<title>农村资源信息港</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="keywords" content="" /> <meta name="keywords" content="" />
@@ -145,4 +145,4 @@
</div> </div>
</body> </body>
<script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/index.js" defer type="text/javascript"></script> <script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/index.js" defer type="text/javascript"></script>
</html>
</html>

+ 2
- 2
infoport/newDetail.html Переглянути файл

@@ -4,7 +4,7 @@


<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>乳山农村资源信息港</title>
<title>农村资源信息港</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="keywords" content="" /> <meta name="keywords" content="" />
@@ -78,4 +78,4 @@
</div> </div>
</body> </body>
<script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/new.js" defer type="text/javascript"></script> <script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/new.js" defer type="text/javascript"></script>
</html>
</html>

+ 2
- 2
infoport/property.html Переглянути файл

@@ -4,7 +4,7 @@


<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>乳山农村资源信息港</title>
<title>农村资源信息港</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="keywords" content="" /> <meta name="keywords" content="" />
@@ -231,4 +231,4 @@
</div> </div>
</body> </body>
<script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/property.js" defer type="text/javascript"></script> <script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/property.js" defer type="text/javascript"></script>
</html>
</html>

+ 2
- 2
infoport/propertyDetail.html Переглянути файл

@@ -4,7 +4,7 @@


<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>乳山农村资源信息港</title>
<title>农村资源信息港</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="keywords" content="" /> <meta name="keywords" content="" />
@@ -175,4 +175,4 @@
</div> </div>
</body> </body>
<script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/propertyDetail.js" defer type="text/javascript"></script> <script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/propertyDetail.js" defer type="text/javascript"></script>
</html>
</html>

+ 2
- 2
infoport/resource.html Переглянути файл

@@ -4,7 +4,7 @@


<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>乳山农村资源信息港</title>
<title>农村资源信息港</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="keywords" content="" /> <meta name="keywords" content="" />
@@ -225,4 +225,4 @@
</div> </div>
</body> </body>
<script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/resource.js" defer type="text/javascript"></script> <script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/resource.js" defer type="text/javascript"></script>
</html>
</html>

+ 2
- 2
infoport/resourceDetail.html Переглянути файл

@@ -4,7 +4,7 @@


<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>乳山农村资源信息港</title>
<title>农村资源信息港</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="keywords" content="" /> <meta name="keywords" content="" />
@@ -165,4 +165,4 @@
</div> </div>
</body> </body>
<script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/resourceDetail.js" defer type="text/javascript"></script> <script src="./static/js/common/require.js" data-main="./static/js/common/main.js?t=101" id="require-page" target-module="./static/js/project/resourceDetail.js" defer type="text/javascript"></script>
</html>
</html>

+ 2
- 1
infoport/static/js/project/homestead.js Переглянути файл

@@ -35,6 +35,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function


module.useContent = function (data) { module.useContent = function (data) {
if (data.code == 200) { if (data.code == 200) {
module.data.treeselectA = data.data;
module.data.phone = data.data.phone; module.data.phone = data.data.phone;
module.data.leader = data.data.leader; module.data.leader = data.data.leader;
var propertyDetailData = template('propertyDetailData', module.data); var propertyDetailData = template('propertyDetailData', module.data);
@@ -174,7 +175,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function
content.map(res=>{ content.map(res=>{
module.data.treeselect.push(res) module.data.treeselect.push(res)
}) })
module.data.treeselectA = data.data[0];
// module.data.treeselectA = data.data[0];
// module.data.treeselect = content[0].children; // module.data.treeselect = content[0].children;
var treeselectData = template('treeselectData', module.data); var treeselectData = template('treeselectData', module.data);
$("#treeselectContent").html(treeselectData); $("#treeselectContent").html(treeselectData);


+ 2
- 1
infoport/static/js/project/property.js Переглянути файл

@@ -33,6 +33,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function


module.useContent = function (data) { module.useContent = function (data) {
if (data.code == 200) { if (data.code == 200) {
module.data.treeselectA = data.data;
module.data.phone = data.data.phone; module.data.phone = data.data.phone;
module.data.leader = data.data.leader; module.data.leader = data.data.leader;
var propertyDetailData = template('propertyDetailData', module.data); var propertyDetailData = template('propertyDetailData', module.data);
@@ -178,7 +179,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function
content.map(res=>{ content.map(res=>{
module.data.treeselect.push(res) module.data.treeselect.push(res)
}) })
module.data.treeselectA = data.data[0];
// module.data.treeselectA = data.data[0];
var treeselectData = template('treeselectData', module.data); var treeselectData = template('treeselectData', module.data);
$("#treeselectContent").html(treeselectData); $("#treeselectContent").html(treeselectData);
var treeselectSecondData = template('treeselectSecondData', module.data); var treeselectSecondData = template('treeselectSecondData', module.data);


+ 2
- 1
infoport/static/js/project/resource.js Переглянути файл

@@ -34,6 +34,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function


module.useContent = function (data) { module.useContent = function (data) {
if (data.code == 200) { if (data.code == 200) {
module.data.treeselectA = data.data;
module.data.phone = data.data.phone; module.data.phone = data.data.phone;
module.data.leader = data.data.leader; module.data.leader = data.data.leader;
var propertyDetailData = template('propertyDetailData', module.data); var propertyDetailData = template('propertyDetailData', module.data);
@@ -174,7 +175,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function
module.data.treeselect.push(res) module.data.treeselect.push(res)
}) })
// module.data.treeselect = content[0].children; // module.data.treeselect = content[0].children;
module.data.treeselectA = data.data[0];
// module.data.treeselectA = data.data[0];
var treeselectData = template('treeselectData', module.data); var treeselectData = template('treeselectData', module.data);
$("#treeselectContent").html(treeselectData); $("#treeselectContent").html(treeselectData);
var treeselectSecondData = template('treeselectSecondData', module.data); var treeselectSecondData = template('treeselectSecondData', module.data);


Писати Попередній перегляд
Завантаження…
Відмінити
Зберегти