From d99603fa4c5188d19991de978c185b2b9247c5af Mon Sep 17 00:00:00 2001
From: xuxj <hugeinfo123>
Date: Sat, 09 May 2020 09:22:02 +0800
Subject: [PATCH] Merge branch 'master' of http://git.hugeinfo.com.cn/r/nsjcy/frontEnd/nsjcy
---
SunshineIns/src/page/UnderAgeList.jsx | 4
SunshineLnsMinApp/pages/pfyy/pfyy.js | 6
SunshineIns/src/fetch/_fetch.js | 2
SunshineLnsMinApp/pages/pfyy/pfyy.wxml | 2
SunshineLnsMinApp/pages/zhwj/zhwj.wxml | 12 +-
SunshineIns/src/index.jsx | 2
SunshineLnsMinApp/pages/yshjqyfw/yshjqyfw.js | 13 ++
SunshineLnsMinApp/pages/zscqdxal/zscqdxal.json | 2
SunshineLnsMinApp/pages/dxal/dxal.wxml | 4
SunshineIns/src/data/menu.js | 2
SunshineLnsMinApp/pages/yshjqyfw/yshjqyfw.wxml | 130 +++++++++++++++++++++----------
SunshineLnsMinApp/pages/index/index.wxml | 18 +++
12 files changed, 130 insertions(+), 67 deletions(-)
diff --git a/SunshineIns/src/data/menu.js b/SunshineIns/src/data/menu.js
index f507c0b..8b44f77 100644
--- a/SunshineIns/src/data/menu.js
+++ b/SunshineIns/src/data/menu.js
@@ -102,7 +102,7 @@
path: '/careList'
}, {
id: 'underAgeList',
- name: '涉未成年负责部门组织',
+ name: '社会组织维护',
path: '/underAgeList'
}, {
id: 'lawSubscribe',
diff --git a/SunshineIns/src/fetch/_fetch.js b/SunshineIns/src/fetch/_fetch.js
index 6ff33d5..7c987a1 100644
--- a/SunshineIns/src/fetch/_fetch.js
+++ b/SunshineIns/src/fetch/_fetch.js
@@ -1,6 +1,6 @@
import fetch from 'hife/fetch';
-// export const base = 'http://xnwj.gznsjc.gov.cn';
+export const base = 'http://xnwj.gznsjc.gov.cn';
// export const base = 'http://1p885086k1.iok.la';
//export const base = 'http://120.79.193.119:9021/';
export const base = 'http://localhost:6060';
diff --git a/SunshineIns/src/index.jsx b/SunshineIns/src/index.jsx
index 5f8aab1..23ee264 100644
--- a/SunshineIns/src/index.jsx
+++ b/SunshineIns/src/index.jsx
@@ -14,7 +14,7 @@
import BusDetail from './page/BusDetail';
import SupPerson from './page/SupPerson';
import Company from './page/Company';
-// 涉未成年负责部门组织
+// 社会组织维护
import UnderAgeList from './page/UnderAgeList';
import KeyWord from './page/KeyWord';
import ActiveManage from './page/ActiveManage';
diff --git a/SunshineIns/src/page/UnderAgeList.jsx b/SunshineIns/src/page/UnderAgeList.jsx
index 2861502..83bd989 100644
--- a/SunshineIns/src/page/UnderAgeList.jsx
+++ b/SunshineIns/src/page/UnderAgeList.jsx
@@ -28,7 +28,7 @@
}
componentDidMount() {
- document.title = '涉未成年负责部门组织';
+ document.title = '社会组织维护';
this.getData();
}
@@ -264,7 +264,7 @@
]} />
<TableView columns={columns} data={data} pageSize='10' size='default' loading={loading} />
</div>
- {/* <TableBtnView key={-resetKey} type="infoManage" name='涉未成年负责部门组织' btnName='新建公司' onClick={() => this.showModal('new')}>
+ {/* <TableBtnView key={-resetKey} type="infoManage" name='社会组织维护' btnName='新建公司' onClick={() => this.showModal('new')}>
<Input placeholder="根据公司名称模糊查询" style={{ width: "200px" }} name='companyName' onChange={this.onInputChange} />
<Input placeholder="根据法人姓名模糊查询" style={{ width: "200px" }} name='companyLegal' onChange={this.onInputChange} />
<Input placeholder="根据联系电话模糊查询" style={{ width: "200px" }} name='companyTel' onChange={this.onInputChange} />
diff --git a/SunshineLnsMinApp/pages/dxal/dxal.wxml b/SunshineLnsMinApp/pages/dxal/dxal.wxml
index 6b99038..7efffe3 100644
--- a/SunshineLnsMinApp/pages/dxal/dxal.wxml
+++ b/SunshineLnsMinApp/pages/dxal/dxal.wxml
@@ -22,9 +22,9 @@
<view class="zhwj-b-head-l-title text-black">南沙区院召开2019“沙鸥”法治宣讲团年度总结暨课件评选会</view>
<view class="text-grey">检察宣传部 60阅读</view>
</view>
- <view class="zhwj-b-head-r">
+ <!-- <view class="zhwj-b-head-r">
<image mode='widthFix' src="{{dongtai1_1}}"></image>
- </view>
+ </view> -->
</view>
</view>
</view>
diff --git a/SunshineLnsMinApp/pages/index/index.wxml b/SunshineLnsMinApp/pages/index/index.wxml
index d91c47a..c5339f2 100644
--- a/SunshineLnsMinApp/pages/index/index.wxml
+++ b/SunshineLnsMinApp/pages/index/index.wxml
@@ -144,15 +144,17 @@
<!-- 营商环境企业服务 -->
<view class='VerticalNav-flex' wx:if="{{moduleDiv==3}}">
<view class='VerticalNav-flex-t'>
- <view class="bg-img" data-str="law2Publicity" bindtap='linkFunction' style="background-image: url('https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1576727354981&di=56a2d7e671ad06e8afcd30f52f17f9a6&imgtype=0&src=http%3A%2F%2Fpic4.zhimg.com%2Fv2-ea6a66baa63645a810559de96c015dd9_1200x500.jpg');margin: 6px;height: 78px;flex: 1; line-height: 78px;">
+ <!-- <view class="bg-img" data-str="law2Publicity" bindtap='linkFunction' style="background-image: url('https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1576727354981&di=56a2d7e671ad06e8afcd30f52f17f9a6&imgtype=0&src=http%3A%2F%2Fpic4.zhimg.com%2Fv2-ea6a66baa63645a810559de96c015dd9_1200x500.jpg');margin: 6px;height: 78px;flex: 1; line-height: 78px;">
<view class="bg-shadeTop">
自贸区法律服务
</view>
- </view>
+ </view> -->
<view class="bg-img" data-str="yshjqyfw" data-id="9" bindtap='clinkFunction' style="background-image: url('https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1577104674828&di=1ad5819ce06281fb5090a4038980917e&imgtype=0&src=http%3A%2F%2Fimage.sike.news.cn%2Fuploads%2F2019%2F05%2F2019-05-2451.jpg');margin: 6px;height: 78px;flex: 1; line-height: 78px;">
<view class="bg-shadeTop">
营商环境
</view>
+ </view>
+ <view class="bg-img" style="margin: 6px;height: 78px;flex: 1; line-height: 78px;">
</view>
</view>
</view>
@@ -309,7 +311,7 @@
<view class='VerticalNav-flex-t'>
<view class="bg-img" data-str="zscqdxal" data-id="9" bindtap='clinkFunction' style="background-image: url('https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1577104674828&di=1ad5819ce06281fb5090a4038980917e&imgtype=0&src=http%3A%2F%2Fimage.sike.news.cn%2Fuploads%2F2019%2F05%2F2019-05-2451.jpg');margin: 6px;height: 78px;flex: 1; line-height: 78px;">
<view class="bg-shadeTop">
- 典型案例
+ 案例检索
</view>
</view>
@@ -323,6 +325,16 @@
<!-- <view class="bg-img" style="margin: 6px;height: 78px;flex: 1; line-height: 78px;">
</view> -->
</view>
+
+ <view class='VerticalNav-flex-t'>
+ <view class="bg-img" data-str="dxal" bindtap='linkFunction' style="background-image: url('https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1576728478957&di=92cf3e9b32826d6c0ec68b6306dbcdde&imgtype=0&src=http%3A%2F%2Ffile02.16sucai.com%2Fd%2Ffile%2F2014%2F0929%2F3955d4164aff7094561456a5f429d0b3.jpg');margin: 6px;height: 78px;flex: 1; line-height: 78px;">
+ <view class="bg-shadeTop">
+ 典型案例
+ </view>
+ </view>
+ <view class="bg-img" style="margin: 6px;height: 78px;flex: 1; line-height: 78px;">
+ </view>
+ </view>
</view>
<!-- 营商环境 -->
diff --git a/SunshineLnsMinApp/pages/pfyy/pfyy.js b/SunshineLnsMinApp/pages/pfyy/pfyy.js
index a6d1c22..e08726e 100644
--- a/SunshineLnsMinApp/pages/pfyy/pfyy.js
+++ b/SunshineLnsMinApp/pages/pfyy/pfyy.js
@@ -129,9 +129,9 @@
if (!picturesInfo.activitiesAddress) {
return app.showModal("请填写活动场地！");
}
- if (!picturesInfo.remake) {
- return app.showModal("请填写备注！");
- }
+ // if (!picturesInfo.remake) {
+ // return app.showModal("请填写备注！");
+ // }
var that = this;
wx.request({
url: app.globalData.url + '/api/v1/appointment/save',
diff --git a/SunshineLnsMinApp/pages/pfyy/pfyy.wxml b/SunshineLnsMinApp/pages/pfyy/pfyy.wxml
index 0583f73..0dd5e25 100644
--- a/SunshineLnsMinApp/pages/pfyy/pfyy.wxml
+++ b/SunshineLnsMinApp/pages/pfyy/pfyy.wxml
@@ -55,7 +55,7 @@
</div>
<div class="publicSnapshot-main" style='display:block'>
<view class="zhghInfo-center-title">
- <span class="red-title">*</span>
+ <span class="red-title"></span>
<span>备注</span>
</view>
<textarea data-name="remake" bindinput="inputChange" disabled="{{disabled}}" value='{{picturesInfo.remake}}' placeholder="请输入备注内容" />
diff --git a/SunshineLnsMinApp/pages/yshjqyfw/yshjqyfw.js b/SunshineLnsMinApp/pages/yshjqyfw/yshjqyfw.js
index d2d0a3a..b39d961 100644
--- a/SunshineLnsMinApp/pages/yshjqyfw/yshjqyfw.js
+++ b/SunshineLnsMinApp/pages/yshjqyfw/yshjqyfw.js
@@ -68,7 +68,7 @@
/**
* 生命周期函数--监听页面加载
*/
- onLoad: function (options) {
+ onLoad: function(options) {
var that = this;
wx.showLoading();
wx.request({
@@ -78,7 +78,7 @@
size: 1000,
flag: '主动预防',
},
- success: function (res) {
+ success: function(res) {
wx.hideLoading();
console.log('res', res);
if (res.data.code == 0) {
@@ -102,8 +102,15 @@
})
},
+ folder: function(event) {
+ var title = event.currentTarget.dataset['title'];
+ wx.navigateTo({
+ url: '../law2Publicitylist/law2Publicitylist?title=' + title,
+ })
+ },
+
// 跳转
- linkFunction: function (event) {
+ linkFunction: function(event) {
var str = event.currentTarget.dataset['str'];
var id = event.currentTarget.dataset['id'];
wx.navigateTo({
diff --git a/SunshineLnsMinApp/pages/yshjqyfw/yshjqyfw.wxml b/SunshineLnsMinApp/pages/yshjqyfw/yshjqyfw.wxml
index f155c41..89d62eb 100644
--- a/SunshineLnsMinApp/pages/yshjqyfw/yshjqyfw.wxml
+++ b/SunshineLnsMinApp/pages/yshjqyfw/yshjqyfw.wxml
@@ -4,54 +4,98 @@
</view>
<view class="zhwj-list">
- <view class="zhwj-list-flex">
- <view class="zhwj-list-flex-l" data-str="zscqdxal" bindtap='linkFunction'>
- <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj6.png');"></view>
- <view class="zhwj-list-flex-l-text">
- <view class="text-black text-bold text-lg">典型案例</view>
- </view>
- </view>
- <view class="zhwj-list-flex-r" data-str="zdyf" bindtap='linkFunction'>
- <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj4.png');"></view>
- <view class="zhwj-list-flex-l-text">
- <view class="text-black text-bold text-lg">主动预防</view>
- </view>
- </view>
- </view>
- <view class="zhwj-list-flex">
- <view class="zhwj-list-flex-l" data-str="flcx" bindtap='linkFunction'>
- <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj5.png');"></view>
- <view class="zhwj-list-flex-l-text">
- <view class="text-black text-bold text-lg">法律查询</view>
- </view>
- </view>
- <view class="zhwj-list-flex-r" data-str="createSubList" bindtap='linkFunction'>
- <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj3.png');"></view>
- <view class="zhwj-list-flex-l-text">
- <view class="text-black text-bold text-lg">企业体检</view>
- </view>
- </view>
- </view>
+ <view class="zhwj-list-flex">
+ <view class="zhwj-list-flex-l" data-str="zscqdxal" bindtap='linkFunction'>
+ <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj6.png');"></view>
+ <view class="zhwj-list-flex-l-text">
+ <view class="text-black text-bold text-lg">案例检索</view>
+ </view>
+ </view>
+ <view class="zhwj-list-flex-r" data-str="dxal" bindtap='linkFunction'>
+ <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj4.png');"></view>
+ <view class="zhwj-list-flex-l-text">
+ <view class="text-black text-bold text-lg">典型案例</view>
+ </view>
+ </view>
+
+ </view>
+ <view class="zhwj-list-flex">
+ <view class="zhwj-list-flex-l" data-str="flcx" bindtap='linkFunction'>
+ <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj5.png');"></view>
+ <view class="zhwj-list-flex-l-text">
+ <view class="text-black text-bold text-lg">法律查询</view>
+ </view>
+ </view>
+ <view class="zhwj-list-flex-r" data-str="createSubList" bindtap='linkFunction'>
+ <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj3.png');"></view>
+ <view class="zhwj-list-flex-l-text">
+ <view class="text-black text-bold text-lg">企业体检</view>
+ </view>
+ </view>
+ </view>
+
+ <view class="zhwj-list-flex">
+ <view class="zhwj-list-flex-l" data-title="政府机关" bindtap='folder'>
+ <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj5.png');"></view>
+ <view class="zhwj-list-flex-l-text">
+ <view class="text-black text-bold text-lg">政府机关</view>
+ </view>
+ </view>
+ <view class="zhwj-list-flex-r" data-str="zdyf" bindtap='linkFunction'>
+ <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj4.png');"></view>
+ <view class="zhwj-list-flex-l-text">
+ <view class="text-black text-bold text-lg">主动预防</view>
+ </view>
+ </view>
+ </view>
+
+ <view class="zhwj-list-flex">
+ <view class="zhwj-list-flex-l" data-title="未成年人" bindtap='folder'>
+ <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj5.png');"></view>
+ <view class="zhwj-list-flex-l-text">
+ <view class="text-black text-bold text-lg">未成年人</view>
+ </view>
+ </view>
+ <view class="zhwj-list-flex-r" data-title="各类企业" bindtap='folder'>
+ <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj3.png');"></view>
+ <view class="zhwj-list-flex-l-text">
+ <view class="text-black text-bold text-lg">各类企业</view>
+ </view>
+ </view>
+ </view>
+
+ <view class="zhwj-list-flex">
+ <view class="zhwj-list-flex-l" data-str="createSubList" bindtap='linkFunction'>
+ <view class="cu-avatar round margin-left zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj5.png');"></view>
+ <view class="zhwj-list-flex-l-text">
+ <view class="text-black text-bold text-lg">风险防控</view>
+ </view>
+ </view>
+ <view class="zhwj-list-flex-r">
+
+ </view>
+ </view>
</view>
<view class="index-gray "></view>
<view class="zhwj-b">
- <view class="zhwj-b-head">
- <span></span>
- <view class="zhwj-b-head-title text-black">主动预防</view>
- </view>
+ <view class="zhwj-b-head">
+ <span></span>
+ <view class="zhwj-b-head-title text-black">主动预防</view>
+ </view>
- <view class="zhwj-b">
- <view class="zhwj-b-main" wx:for="{{ dataSet }}" data-str="zhdtInfo" data-Id="{{item.id}}" bindtap='linkFunction'>
- <view class="zhwj-b-head-l">
- <view class="zhwj-b-head-l-title text-black">{{item.title}}</view>
- <view class="text-grey">{{item.createTime}}<text decode="{{true}}" space="{{true}}"> </text>{{item.readCount}}阅读</view>
- </view>
- <view class="zhwj-b-head-r">
- <image mode='widthFix' src="{{item.attList[0].path}}"></image>
- </view>
- </view>
- </view>
+ <view class="zhwj-b">
+ <view class="zhwj-b-main" wx:for="{{ dataSet }}" data-str="zhdtInfo" data-Id="{{item.id}}" bindtap='linkFunction'>
+ <view class="zhwj-b-head-l">
+ <view class="zhwj-b-head-l-title text-black">{{item.title}}</view>
+ <view class="text-grey">{{item.createTime}}
+ <text decode="{{true}}" space="{{true}}"> </text>{{item.readCount}}阅读</view>
+ </view>
+ <view class="zhwj-b-head-r">
+ <image mode='widthFix' src="{{item.attList[0].path}}"></image>
+ </view>
+ </view>
+ </view>
</view>
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/zhwj/zhwj.wxml b/SunshineLnsMinApp/pages/zhwj/zhwj.wxml
index 6ec824a..cdef8b3 100644
--- a/SunshineLnsMinApp/pages/zhwj/zhwj.wxml
+++ b/SunshineLnsMinApp/pages/zhwj/zhwj.wxml
@@ -9,14 +9,14 @@
<view class="cu-avatar round margin-leftll zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj1.png');"></view>
<view class="zhwj-list-flex-l-text">
<view class="text-black text-bold text-lg">未检概况</view>
- <view class="text-gray">未检简介</view>
+ <!-- <view class="text-gray">未检简介</view> -->
</view>
</view>
<view class="zhwj-list-flex-r" data-str="zhdt" bindtap='linkFunction'>
<view class="cu-avatar round margin-leftll zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj2.png');"></view>
<view class="zhwj-list-flex-l-text">
<view class="text-black text-bold text-lg">未检动态</view>
- <view class="text-gray">最美未检剪影</view>
+ <!-- <view class="text-gray">最美未检剪影</view> -->
</view>
</view>
</view>
@@ -25,14 +25,14 @@
<view class="cu-avatar round margin-leftl zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj3.png');"></view>
<view class="zhwj-list-flex-l-text">
<view class="text-black text-bold text-lg">社会观护</view>
- <view class="text-gray">社会支持与配合</view>
+ <!-- <view class="text-gray">社会支持与配合</view> -->
</view>
</view>
<view class="zhwj-list-flex-r" data-str="wjjb" bindtap='linkFunction'>
<view class="cu-avatar round margin-leftl zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj4.png');"></view>
<view class="zhwj-list-flex-l-text">
<view class="text-black text-bold text-lg">举报平台</view>
- <view class="text-gray">未成年人侵害案件</view>
+ <!-- <view class="text-gray">未成年人侵害案件</view> -->
</view>
</view>
</view>
@@ -41,14 +41,14 @@
<view class="cu-avatar round margin-leftl zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj5.png');"></view>
<view class="zhwj-list-flex-l-text">
<view class="text-black text-bold text-lg">入职查询</view>
- <view class="text-gray">未检职工入职查询</view>
+ <!-- <view class="text-gray">未检职工入职查询</view> -->
</view>
</view>
<view class="zhwj-list-flex-r" data-str="pfyy" data-id='new' bindtap='linkFunction'>
<view class="cu-avatar round margin-leftl zhwj-list-flex-l-img" style="background-image: url('https://xnwj.gznsjc.gov.cn/nsjc-charge/image/zuj6.png');"></view>
<view class="zhwj-list-flex-l-text">
<view class="text-black text-bold text-lg">普法预约</view>
- <view class="text-gray">预约参观法治基地</view>
+ <!-- <view class="text-gray">预约参观法治基地</view> -->
</view>
</view>
diff --git a/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.json b/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.json
index 72c3898..a190577 100644
--- a/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.json
+++ b/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.json
@@ -1,5 +1,5 @@
{
- "navigationBarTitleText": "典型案例",
+ "navigationBarTitleText": "案例检索",
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black",
--
Gitblit v1.8.0