From 800ffe29f328c84d4de46e8867ad3ca5cbae0d4f Mon Sep 17 00:00:00 2001
From: liuwh <liuwh@hugeinfo.com.cn>
Date: Tue, 10 Mar 2020 15:44:59 +0800
Subject: [PATCH] 提交

---
 SunshineLnsMinApp/pages/xsuojb/xsuojb.wxml               |   12 
 SunshineLnsMinApp/pages/zscqdxalInfo/zscqdxalInfo.wxml   |   25 
 SunshineLnsMinApp/pages/flcx/flcx.js                     |  138 +++
 SunshineLnsMinApp/pages/wdjbInfo/wdjbInfo.wxss           |    1 
 SunshineLnsMinApp/pages/zscqdxal/zscqdxal.js             |  102 ++
 SunshineLnsMinApp/pages/wdjb/wdjb.js                     |  112 +++
 SunshineLnsMinApp/pages/zscqdxal/zscqdxal.wxss           |   11 
 SunshineLnsMinApp/pages/zscqdxal/zscqdxal.json           |    3 
 SunshineLnsMinApp/pages/flcx/flcx.wxml                   |   50 
 SunshineLnsMinApp/pages/wdjbInfo/wdjbInfo.json           |    3 
 SunshineLnsMinApp/pages/xsuojb/xsuojb.js                 |   32 
 SunshineLnsMinApp/pages/law2Publicity/law2Publicity.json |    6 
 SunshineLnsMinApp/pages/znjj/znjj.json                   |    6 
 SunshineLnsMinApp/pages/law2Publicity/law2Publicity.js   |  107 ++
 SunshineLnsMinApp/pages/wdjb/wdjb.json                   |    3 
 SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.js         |  227 ++++++
 SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.json       |   22 
 SunshineLnsMinApp/app.js                                 |    2 
 SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.wxss       |   71 +
 SunshineLnsMinApp/pages/me/me.wxml                       |  102 +-
 SunshineLnsMinApp/pages/zhghInfo/zhghInfo.js             |    3 
 SunshineLnsMinApp/pages/law2Publicity/law2Publicity.wxss |   47 +
 SunshineLnsMinApp/pages/znjj/znjj.wxss                   |    9 
 SunshineLnsMinApp/pages/wdjb/wdjb.wxml                   |   23 
 SunshineLnsMinApp/pages/flcxInfo/flcxInfo.wxss           |    8 
 SunshineLnsMinApp/pages/xsjb/xsjb.wxss                   |   28 
 SunshineLnsMinApp/pages/xsuojb/xsuojb.wxss               |    1 
 SunshineLnsMinApp/pages/zscqdxalInfo/zscqdxalInfo.wxss   |    8 
 SunshineLnsMinApp/pages/flcx/flcx.json                   |    3 
 SunshineLnsMinApp/pages/wdjbInfo/wdjbInfo.wxml           |    2 
 SunshineIns/src/fetch/_fetch.js                          |    4 
 SunshineLnsMinApp/app.json                               |    7 
 SunshineLnsMinApp/pages/zhwj/zhwj.wxml                   |    8 
 SunshineLnsMinApp/pages/me/me.js                         |    5 
 SunshineLnsMinApp/pages/znjj/znjj.wxml                   |   32 
 SunshineLnsMinApp/pages/zscqdxal/zscqdxal.wxml           |   18 
 SunshineLnsMinApp/pages/xsuojb/xsuojb.json               |    7 
 SunshineLnsMinApp/pages/zscqdxalInfo/zscqdxalInfo.json   |   12 
 SunshineLnsMinApp/pages/wdjbInfo/wdjbInfo.js             |   66 +
 SunshineLnsMinApp/pages/znjj/znjj.js                     |   41 +
 SunshineLnsMinApp/pages/flcxInfo/flcxInfo.js             |   47 +
 SunshineLnsMinApp/pages/flcxInfo/flcxInfo.json           |   12 
 SunshineLnsMinApp/pages/xsjb/xsjb.js                     |  224 +++++
 SunshineLnsMinApp/project.config.json                    |    3 
 SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.wxml       |  105 ++
 SunshineLnsMinApp/pages/law2Publicity/law2Publicity.wxml |   27 
 SunshineLnsMinApp/pages/flcxInfo/flcxInfo.wxml           |   25 
 SunshineLnsMinApp/pages/wdjb/wdjb.wxss                   |  110 +++
 SunshineLnsMinApp/pages/xsjb/xsjb.wxml                   |  158 ++--
 SunshineLnsMinApp/pages/zscqdxalInfo/zscqdxalInfo.js     |   47 +
 SunshineLnsMinApp/pages/index/index.wxml                 |   11 
 51 files changed, 1,893 insertions(+), 243 deletions(-)

diff --git a/SunshineIns/src/fetch/_fetch.js b/SunshineIns/src/fetch/_fetch.js
index dbde3fd..c1f0b48 100644
--- a/SunshineIns/src/fetch/_fetch.js
+++ b/SunshineIns/src/fetch/_fetch.js
@@ -1,8 +1,8 @@
 import fetch from 'hife/fetch';
 
 // export const base = 'http://xnwj.gznsjc.gov.cn';
-export const base = 'http://nsjc.vaiwan.com';
-// export const base = 'http://nsjcy.hugeinfo.com.cn';
+// export const base = 'http://nsjc.vaiwan.com';
+export const base = 'http://nsjcy.hugeinfo.com.cn';
 
 // export const base = 'http://192.168.0.147:8081';
 
diff --git a/SunshineLnsMinApp/app.js b/SunshineLnsMinApp/app.js
index 825b320..b434732 100644
--- a/SunshineLnsMinApp/app.js
+++ b/SunshineLnsMinApp/app.js
@@ -12,7 +12,7 @@
     pageData: {},
     // url: 'https://nsjcy.hugeinfo.com.cn/nsjc-charge',
     //url: 'http://192.168.0.31:8085/nsjc-charge',
-    //imgUrl: 'https://hugeinfo.com.cn/nsjc-charge',
+    // imgUrl: 'https://nsjcy.hugeinfo.com.cn/nsjc-charge',
     url: 'http://nsjc.vaiwan.com/nsjc-charge',
     imgUrl: 'http://nsjc.vaiwan.com/nsjc-charge'
   },
diff --git a/SunshineLnsMinApp/app.json b/SunshineLnsMinApp/app.json
index 1f0e254..3635482 100644
--- a/SunshineLnsMinApp/app.json
+++ b/SunshineLnsMinApp/app.json
@@ -16,6 +16,8 @@
     "pages/zhdt/zhdt",
     "pages/zhdtInfo/zhdtInfo",
     "pages/me/me",
+    "pages/wdjb/wdjb",
+    "pages/wdjbInfo/wdjbInfo",
     "pages/drafts/drafts",
     "pages/personInfo/personInfo",
     "pages/guide/guide",
@@ -50,10 +52,14 @@
     "pages/schedulelawyer/schedulelawyer",
     "pages/schedulecase/schedulecase",
     "pages/face/face",
+    "pages/znjj/znjj",
+    "pages/xsuojb/xsuojb",
+    "pages/xsuojbInfo/xsuojbInfo",
     "pages/lawServiceLogin/lawServiceLogin",
     "pages/visitAgentInfo/visitAgentInfo",
     "pages/countryAgentInfo/countryAgentInfo",
     "pages/lawPublicity/lawPublicity",
+    "pages/law2Publicity/law2Publicity",
     "pages/lawPublicityDetail/lawPublicityDetail",
     "pages/developIng/developIng",
     "pages/publicSnapshot/publicSnapshot",
@@ -84,6 +90,7 @@
     "pages/zscqxsjb/zscqxsjb",
     "pages/zscqjb/zscqjb",
     "pages/zscqdxal/zscqdxal",
+    "pages/zscqdxalInfo/zscqdxalInfo",
     "pages/createSub/createSub"
   ],
   "networkTimeout": {
diff --git a/SunshineLnsMinApp/pages/flcx/flcx.js b/SunshineLnsMinApp/pages/flcx/flcx.js
index 8da6e22..b8fd8f4 100644
--- a/SunshineLnsMinApp/pages/flcx/flcx.js
+++ b/SunshineLnsMinApp/pages/flcx/flcx.js
@@ -1,5 +1,11 @@
-// pages/flcx/flcx.js
-const app = getApp();
+// pages/dxal/dxal.js
+import {
+  $startWuxRefresher,
+  $stopWuxRefresher,
+  $stopWuxLoader
+} from '../../templeteDist/wuxDist/index';
+
+var app = getApp();
 
 Page({
 
@@ -7,19 +13,131 @@
    * 页面的初始数据
    */
   data: {
-    CustomBar: app.globalData.CustomBar,
-    wordList: ['标签', '标签', '标签', '标签', '标签', '标签', '标签', '标签', '标签'],
-    items: [...new Array(20)].map((n, i) => ({
-      title: `Pull down ${i}`,
-      content: 'Wux Weapp'
-    }))
+    dongtai1_1: app.globalData.imgUrl + '/image/dongtai1-1.jpg',
+    dongtai2_1: app.globalData.imgUrl + '/image/dongtai2-1.jpg',
+    dongtai3_1: app.globalData.imgUrl + '/image/dongtai3-1.jpg',
+    inputShowed: false,
+    inputVal: "",
+    value: '知识产权',
+    items: [],
+    count: 1000,
+    scrollTop: 0,
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function(options) {
+  onLoad: function (options) {
+    $startWuxRefresher();
+  },
 
-  }
+  showList: function () {
+    var that = this;
+    // wx.showLoading();
+    wx.request({
+      url: app.globalData.url + '/api/v1/searchLaw/search?page=1&size=' + this.data.count + '&words=' + this.data.value,
+      success: function (res) {
+        // wx.hideLoading();
+        console.log('res.data.data', res.data.data.data)
+        console.log('res', res)
+        if (res.data.code == 0) {
+          that.setData({
+            items: [...res.data.data.data]
+          })
+          $stopWuxRefresher()
+          $stopWuxLoader('#wux-refresher', this, true)
+        } else {
+          wx.showToast({
+            title: res.data.msg,
+          })
+        }
+      }
+    })
+  },
+  onPageScroll(e) {
+    this.setData({
+      scrollTop: e.scrollTop
+    })
+  },
+  onRefresh() {
+    console.log('onRefresh')
 
+    // this.setData({
+    //   count: 10
+    // })
+
+    this.showList();
+
+
+    // setTimeout(() => {
+    //   this.setData({
+    //     items: this.getList()
+    //   })
+    //   $stopWuxRefresher()
+    // }, 1000)
+  },
+  onLoadmore() {
+    console.log('onLoadmore')
+    this.showList();
+  },
+
+  getList: (count = 10, step = 0) => [...new Array(count)].map((n, i) => ({
+    title: `Pull down ${i + step}`,
+    content: 'Wux Weapp'
+  })),
+
+  linkFunction: function (event) {
+    var str = event.currentTarget.dataset['str'];
+    var id = event.currentTarget.dataset['id'];
+    wx.navigateTo({
+      url: '../' + str + '/' + str + '?id=' + id
+    })
+  },
+
+  showInput: function () {
+    this.setData({
+      inputShowed: true
+    });
+  },
+
+  hideInput: function () {
+    this.setData({
+      inputVal: "",
+      inputShowed: false
+    });
+  },
+  clearInput: function () {
+    this.setData({
+      inputVal: ""
+    }, () => {});
+  },
+
+  onChange(e) {
+    console.log('onChange', e)
+    this.setData({
+      value: e.detail.value,
+    })
+  },
+  onFocus(e) {
+    console.log('onFocus', e)
+  },
+  onBlur(e) {
+    console.log('onBlur', e)
+    this.setData({
+      value: e.detail.value
+    })
+    this.showList();
+  },
+  onConfirm(e) {
+    console.log('onConfirm', e)
+  },
+  onClear(e) {
+    console.log('onClear', e)
+    this.setData({
+      value: '',
+    })
+  },
+  onCancel(e) {
+    console.log('onCancel', e)
+  },
 })
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/flcx/flcx.json b/SunshineLnsMinApp/pages/flcx/flcx.json
index 71a39b2..e6f5a13 100644
--- a/SunshineLnsMinApp/pages/flcx/flcx.json
+++ b/SunshineLnsMinApp/pages/flcx/flcx.json
@@ -5,6 +5,7 @@
   "navigationBarTextStyle": "black",
   "usingComponents": {
     "wux-refresher": "../../templeteDist/wuxDist/refresher/index",
-    "wux-cell": "../../templeteDist/wuxDist/cell/index"
+    "wux-cell": "../../templeteDist/wuxDist/cell/index",
+    "wux-search-bar": "../../templeteDist/wuxDist/search-bar/index"
   }
 }
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/flcx/flcx.wxml b/SunshineLnsMinApp/pages/flcx/flcx.wxml
index bc16f14..db01533 100644
--- a/SunshineLnsMinApp/pages/flcx/flcx.wxml
+++ b/SunshineLnsMinApp/pages/flcx/flcx.wxml
@@ -1,44 +1,30 @@
-<!--pages/flcx/flcx.wxml-->
-<view class="cu-bar bg-white search solid-top" style="top:{{CustomBar}}px">
+<!-- <view class="cu-bar bg-white search solid-top fixed" style="top:{{CustomBar}}px">
   <view class="search-form round">
     <text class="cuIcon-search"></text>
     <input type="text" placeholder="搜索" confirm-type="search" bindinput="searchIcon"></input>
-  </view>
-</view>
-
-<!-- <view class="flex1">
-  <view class="cu-bar bg-white margin-top">
-    <view class="action">
-      <text class="cuIcon-title text-blue"></text>热门搜索
-    </view>
-  </view>
-
-  <view class="padding-sm flex flex-wrap">
-    <view class="padding-xs" wx:for="{{wordList}}" wx:key  >
-      <view class="cu-tag bg-white">{{item}}</view>
-    </view>
-  </view>
-
-   <view class="cu-bar bg-white margin-top">
-    <view class="action">
-      <text class="cuIcon-title text-blue"></text>历史搜索
-    </view>
-  </view>
-
-  <view class="padding-sm flex flex-wrap">
-    <view class="padding-xs" wx:for="{{wordList}}" wx:key  >
-      <view class="cu-tag bg-white">{{item}}</view>
-    </view>
+    <wux-search-bar clear value="{{ value }}" controlled placeholder="Search" bind:change="onChange" bind:focus="onFocus" bind:blur="onBlur" bind:confirm="onConfirm" bind:clear="onClear" bind:cancel="onCancel"/>
   </view>
 </view> -->
+		<wux-search-bar class="zscqdxal-top" clear value="{{ value }}" controlled placeholder="搜索" bind:change="onChange" bind:focus="onFocus" bind:blur="onBlur" bind:confirm="onConfirm" bind:clear="onClear" bind:cancel="onCancel"/>
+		<!-- <wux-search-bar clear show-cancel value="{{ value }}" controlled placeholder="Search" bind:change="onChange" bind:focus="onFocus" bind:blur="onBlur" bind:confirm="onConfirm" bind:clear="onClear" bind:cancel="onCancel" /> -->
 
-<view class="flex1 bg-white margin-top">
+
+<wux-refresher id="wux-refresher" bind:pulling="onPulling" bind:refresh="onRefresh" bind:loadmore="onLoadmore" scrollTop="{{scrollTop}}">
   <view class="weui-panel weui-panel_access">
     <view class="weui-panel__bd">
       <view class="weui-media-box weui-media-box_text" wx:for="{{ items }}" wx:key="">
-        <view class="weui-media-box__title weui-media-box__title_in-text">{{ item.title }}</view>
-        <view class="weui-media-box__desc">{{ item.content }}</view>
+        <!-- <view class="weui-media-box__title weui-media-box__title_in-text">{{ item.title }}</view>
+                <view class="weui-media-box__desc">{{ item.content }}</view> -->
+        <view class="zhwj-b-main" data-str="flcxInfo" data-id="{{item.code_id}}" bindtap='linkFunction'>
+          <view class="zhwj-b-head-l">
+            <view class="zhwj-b-head-l-title text-black"><rich-text nodes="{{item.code_name}}"></rich-text></view>
+            <view class="text-grey">{{item.law_type}} {{item.issuing_agency}} {{item.release}} {{item.implement_date}}</view>
+          </view>
+          <!-- <view class="zhwj-b-head-r">
+            <image mode='widthFix' src="{{dongtai1_1}}"></image>
+          </view> -->
+        </view>
       </view>
     </view>
   </view>
-</view>
\ No newline at end of file
+</wux-refresher>
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/flcxInfo/flcxInfo.js b/SunshineLnsMinApp/pages/flcxInfo/flcxInfo.js
new file mode 100644
index 0000000..ecf4658
--- /dev/null
+++ b/SunshineLnsMinApp/pages/flcxInfo/flcxInfo.js
@@ -0,0 +1,47 @@
+// pages/zscqdxalInfo/zscqdxalInfo.js
+
+var app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    data: {},
+    ywsqjd: app.globalData.imgUrl +'/image/ywsqjd.svg',
+    fulltextList:[]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.showList(options.id)
+  },
+  showList: function (id) {
+    var that = this;
+    wx.showLoading();
+    wx.request({
+      url: app.globalData.url + '/api/v1/searchLaw/lawInfo?id=' + id,
+      success: function (res) {
+        wx.hideLoading();
+        console.log('data', res.data.data.data.laws)
+        console.log('res', res)
+        if (res.data.code == 0) {
+          that.setData({
+            data: res.data.data.data,
+            fulltextList:res.data.data.data.laws.filter((item)=>(item.tag !=='开始'&&item.tag!=='结束'))
+          })
+        } else {
+          wx.showToast({
+            title: res.data.msg,
+          })
+        }
+      }
+    })
+  },
+
+
+
+
+})
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/flcxInfo/flcxInfo.json b/SunshineLnsMinApp/pages/flcxInfo/flcxInfo.json
new file mode 100644
index 0000000..832ed82
--- /dev/null
+++ b/SunshineLnsMinApp/pages/flcxInfo/flcxInfo.json
@@ -0,0 +1,12 @@
+{
+  "navigationBarTitleText": "法律查询详情",
+  "backgroundTextStyle": "light",
+  "navigationBarBackgroundColor": "#fff",
+  "navigationBarTextStyle": "black",
+  "usingComponents": {
+    "wux-refresher": "../../templeteDist/wuxDist/refresher/index",
+    "wux-search-bar": "../../templeteDist/wuxDist/search-bar/index",
+    "wux-cell-group": "../../templeteDist/wuxDist/cell-group/index",
+    "wux-cell": "../../templeteDist/wuxDist/cell/index"
+  }
+}
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/flcxInfo/flcxInfo.wxml b/SunshineLnsMinApp/pages/flcxInfo/flcxInfo.wxml
new file mode 100644
index 0000000..93d9f38
--- /dev/null
+++ b/SunshineLnsMinApp/pages/flcxInfo/flcxInfo.wxml
@@ -0,0 +1,25 @@
+<!--pages/zscqdxalInfo/zscqdxalInfo.wxml-->
+
+
+<view class="zhgk-main">
+	<view class=" text-lg" style="padding:30rpx 30rpx 0;">
+		<text class="zhgk-main-title text-black">{{data.code_name}}</text>
+	</view>
+	<!-- <view class=' text-df padding'> 2016年4月,南沙检察成立了未成年人检察工作办公室。2019年1月,我院成立“许淑妍命名检察官办公室”,适用“捕诉监防助”一体化工作模式,负责办理未成年人犯罪和侵害未成年人犯罪案件,开展未成年人司法保护和预防未成年人犯罪等工作。南沙检察以专业化办案为依托,以规范化建设为抓手,认真贯彻“教育、感化、挽救”方针,坚持“教育为主、惩罚为辅”原则,全面落实未成年人指定辩护、社会调查、心理评估、合适成年人等特别程序,不断打造未检新品牌。以社会化服务为路径,以多元化平台为支点,组建心理咨询师团队和社工团队,通过法治宣传大平台、两微一端、“沙鸥”法治宣讲团开展普法宣传,构建多维度的未成年人维权、犯罪预防网络。近年来,南沙检察先后获评全国青少年维权岗、全国检察机关未成年人检察工作联系点。队伍中涌现出全国检察机关未成年人检察业务竞赛能手和全市检察机关未成年人检察业务标兵。</view> -->
+	<view class=' text-df padding'>
+		<view class="zhgk-main"  wx:for="{{fulltextList}}">
+			<!-- <view class=" text-lg" style="padding:30rpx 30rpx 0;">
+				<text class="zhgk-main-title text-black">{{item.tag}}</text>
+			</view> -->
+			<view class="padding">
+				<view class=' text-df'> {{item.text}}</view>
+			</view>
+		</view>
+	</view>
+</view>
+
+
+<!-- <wux-cell-group title="{{item.tag}}" wx:for="{{fulltextList}}">
+	<wux-cell extra="{{item.content}}"></wux-cell>
+
+</wux-cell-group> -->
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/flcxInfo/flcxInfo.wxss b/SunshineLnsMinApp/pages/flcxInfo/flcxInfo.wxss
new file mode 100644
index 0000000..30bd389
--- /dev/null
+++ b/SunshineLnsMinApp/pages/flcxInfo/flcxInfo.wxss
@@ -0,0 +1,8 @@
+/* pages/zscqdxalInfo/zscqdxalInfo.wxss */
+.zhgk-main {
+  background-color: #fff;
+}
+
+.zhgk-main-title {
+  color: #249eff;
+}
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/index/index.wxml b/SunshineLnsMinApp/pages/index/index.wxml
index ea7779e..10c9d97 100644
--- a/SunshineLnsMinApp/pages/index/index.wxml
+++ b/SunshineLnsMinApp/pages/index/index.wxml
@@ -39,7 +39,7 @@
         <image class="eight-pane-icon " src="{{sjxf}} " />
         <div class="eight-pane-title ">在线申诉</div>
       </div>
-      <div class="eight-pane-bottom-item " data-url='../lawPublicity/lawPublicity' bindtap="login">
+      <div class="eight-pane-bottom-item " data-str="lawPublicity" bindtap='linkFunction'>
         <image class="eight-pane-icon " src="{{flxc}} " />
         <div class="eight-pane-title ">法律宣传</div>
       </div>
@@ -144,7 +144,7 @@
     <!-- 营商环境企业服务 -->
     <view class='VerticalNav-flex' wx:if="{{moduleDiv==3}}">
       <view class='VerticalNav-flex-t'>
-        <view class="bg-img" data-str="weiwc" 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>
@@ -294,7 +294,7 @@
           </view>
         </view>
         <view class="bg-img" style="margin: 6px;height: 78px;flex: 1; line-height: 78px;">
-          <view class="bg-img" data-str="fzxkt" bindtap='linkFunction' style="background-image: url('https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=1291150546,1510144282&fm=26&gp=0.jpg');">
+          <view class="bg-img" data-str="znjj" bindtap='linkFunction' style="background-image: url('https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=1291150546,1510144282&fm=26&gp=0.jpg');">
             <view class="bg-shadeTop">
               职能简介
             </view>
@@ -308,13 +308,16 @@
             典型案例
           </view>
         </view>
+        
         <view class="bg-img" style="margin: 6px;height: 78px;flex: 1; line-height: 78px;">
-          <view class="bg-img" data-str="zscqjb" bindtap='linkFunction' style="background-image: url('https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=1291150546,1510144282&fm=26&gp=0.jpg');">
+          <view class="bg-img" data-str="xsuojb" bindtap='linkFunction' style="background-image: url('https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=1291150546,1510144282&fm=26&gp=0.jpg');">
             <view class="bg-shadeTop">
               线索举报
             </view>
           </view>
         </view>
+        <!-- <view class="bg-img" style="margin: 6px;height: 78px;flex: 1; line-height: 78px;">
+        </view> -->
       </view>
     </view>
 
diff --git a/SunshineLnsMinApp/pages/law2Publicity/law2Publicity.js b/SunshineLnsMinApp/pages/law2Publicity/law2Publicity.js
new file mode 100644
index 0000000..d34d9e0
--- /dev/null
+++ b/SunshineLnsMinApp/pages/law2Publicity/law2Publicity.js
@@ -0,0 +1,107 @@
+// lawPublicity.js
+const app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    dataSet: [],
+    isHideLoadMore: true, //loading样式
+    isHideMorebtn: true, //更多按钮样式
+    isHideEnd: true, //有底线样式  (三者默认隐藏)
+    size: 10
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function(options) {
+    this.setData({
+      isHideLoadMore: false
+    }, this.showList(options.id))
+  },
+
+  showList: function(id) {
+    var that = this;
+    // d46ee05998ce48f893a63623cbde6875
+    wx.request({
+      url: app.globalData.url + '/api/article/legalServiceQuery?page=1&size=' + that.data.size + '&ownerId=' +id,
+      success: function(res) {
+        console.log(res)
+        if (res.data.code == 0) {
+          (res.data.data.content).forEach(e => {
+            (e.createTime) = app.formatDate(e.createTime)
+          })
+          var dataSet = res.data.data.content;
+          if (res.data.data.totalElements < that.data.size) {
+            // 到底了,没数据加载
+            that.setData({
+              dataSet,
+              isHideMorebtn: true, //隐藏更多按钮
+              isHideEnd: false //显示已到底
+            })
+          } else {
+            that.setData({
+              dataSet,
+              size: that.data.size + 10,
+              isHideMorebtn: false, //显示更多按钮
+              isHideEnd: true //隐藏已到底
+            })
+          }
+        } else {
+          wx.showModal({
+            title: '提示',
+            content: "请求失败!"
+          })
+        }
+      },
+      complete: function() {
+        that.setData({
+          isHideLoadMore: true
+        })
+      }
+    })
+  },
+
+  // 跳转详情
+  link: function(e) {
+    var id = e.currentTarget.dataset.id;
+    console.log(e.currentTarget.dataset.id);
+    wx.navigateTo({
+      url: '../lawPublicityDetail/lawPublicityDetail?id=' + id
+    })
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function() {
+
+  },
+
+  // 加载更多
+  getMore: function() {
+    // 有加载更多按钮
+    if (!this.data.isHideMorebtn) {
+      this.setData({
+        isHideMorebtn: true, //隐藏点击按钮
+        isHideLoadMore: false //显示loading状态
+      })
+      setTimeout(() => {
+        this.setData({
+          isHideLoadMore: true //1.2s后隐藏loading
+        });
+        this.showList() //重新定义列表
+      }, 1200)
+    }
+  }
+
+})
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/law2Publicity/law2Publicity.json b/SunshineLnsMinApp/pages/law2Publicity/law2Publicity.json
new file mode 100644
index 0000000..4477a99
--- /dev/null
+++ b/SunshineLnsMinApp/pages/law2Publicity/law2Publicity.json
@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "自贸区法律服务",
+  "backgroundTextStyle": "light",
+  "navigationBarBackgroundColor": "#fff",
+  "navigationBarTextStyle": "black"
+}
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/law2Publicity/law2Publicity.wxml b/SunshineLnsMinApp/pages/law2Publicity/law2Publicity.wxml
new file mode 100644
index 0000000..5e24715
--- /dev/null
+++ b/SunshineLnsMinApp/pages/law2Publicity/law2Publicity.wxml
@@ -0,0 +1,27 @@
+<!--lawPublicity.wxml-->
+<view class="lawPublicity-list">
+  <view class="lawPublicity-item" wx:for="{{dataSet}}" wx:key="{{item.id}}"> 
+    <view class="content-left">
+      <view class="headLineTitle" data-Id="{{item.id}}" bindtap="link">
+        {{item.title}}
+      </view>
+      <view class="headLineInfo">
+        <view class="info-source">{{item.createTime}}</view>
+        <view class="info-viewer">{{item.readCount}}人阅读</view>
+      </view>
+    </view>
+    <view class="content-right" data-Id="{{item.id}}" bindtap="link">
+    <image src="{{item.coverUrl}}"></image>
+    </view>
+  </view>
+</view>
+<view class="weui-loadmore" hidden="{{isHideMorebtn}}">
+  <view class="weui-loadmore__tips" bindtap='getMore'>点击加载更多</view>
+</view>
+<view class="weui-loadmore" hidden="{{isHideLoadMore}}">
+  <view class="weui-loading"></view>
+  <view class="weui-loadmore__tips">正在加载</view>
+</view>
+<view class="weui-loadmore" hidden="{{isHideEnd}}">
+  <view class="weui-loadmore__tips">------------我是有底线的------------</view>
+</view>
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/law2Publicity/law2Publicity.wxss b/SunshineLnsMinApp/pages/law2Publicity/law2Publicity.wxss
new file mode 100644
index 0000000..e3604d5
--- /dev/null
+++ b/SunshineLnsMinApp/pages/law2Publicity/law2Publicity.wxss
@@ -0,0 +1,47 @@
+/* lawPublicity.wxss */
+
+.lawPublicity-item {
+  height: 148rpx;
+  display: flex;
+  flex-direction: row;
+  color: rgba(51, 51, 51, 1);
+  text-align: left;
+  font-family: PingFangSC-Regular;
+  padding: 24rpx 24rpx 0 24rpx;
+}
+
+.content-left {
+  width: 416rpx;
+}
+
+.content-right {
+  flex: 1;
+  margin-left: 50rpx;
+  background: #ccc;
+  width: 100%;
+  height: 100%;
+}
+.content-right image{
+  width: 100%;
+  height: 100%;
+}
+
+.headLineTitle {
+  height: 88rpx;
+  font-size: 16px;
+  line-break: 44rpx;
+  color: rgba(51, 51, 51, 1);
+  margin-bottom: 26rpx;
+}
+
+.headLineInfo {
+  display: flex;
+  font-size: 12px;
+  color: rgba(153, 153, 153, 1);
+}
+
+.info-source{
+  margin-right: 20rpx;
+}
+
+
diff --git a/SunshineLnsMinApp/pages/me/me.js b/SunshineLnsMinApp/pages/me/me.js
index 60e235a..c53e3d8 100644
--- a/SunshineLnsMinApp/pages/me/me.js
+++ b/SunshineLnsMinApp/pages/me/me.js
@@ -40,6 +40,11 @@
       url: '../myTranslate/myTranslate',
     })
   },
+  wdjb: function() {
+    wx.navigateTo({
+      url: '../wdjb/wdjb',
+    })
+  },
 
   onLoad: function() {
     this.notification();
diff --git a/SunshineLnsMinApp/pages/me/me.wxml b/SunshineLnsMinApp/pages/me/me.wxml
index a8ddf5a..3e081a0 100644
--- a/SunshineLnsMinApp/pages/me/me.wxml
+++ b/SunshineLnsMinApp/pages/me/me.wxml
@@ -1,57 +1,67 @@
 <div class="me-main">
-  <!-- 页头 -->
-  <div class="me-item">
-    <view class="userinfo-avatar">
-      <open-data class="me-item-icon" type="userAvatarUrl"></open-data>
-    </view>
-    <div class="me-item-name">
+	<!-- 页头 -->
+	<div class="me-item">
+		<view class="userinfo-avatar">
+			<open-data class="me-item-icon" type="userAvatarUrl"></open-data>
+		</view>
+		<div class="me-item-name">
 
-      <open-data class="me-item-name-top" type="userNickName"></open-data>
+			<open-data class="me-item-name-top" type="userNickName"></open-data>
 
-      <div class="me-item-name-bottom">欢迎你</div>
-    </div>
-    <image class="me-item-logo" src="{{logo}}" />
-  </div>
-  <div class="index-gray"></div>
+			<div class="me-item-name-bottom">欢迎你</div>
+		</div>
+		<image class="me-item-logo" src="{{logo}}" />
+	</div>
+	<div class="index-gray"></div>
 
-  <div class="shadow-bottom">
+	<div class="shadow-bottom">
 
-    <div class="me-business-nav" bindtap='businessSchedule'>
-      <image class="me-business-icon" src="{{ywsqjd}}" />
-      <div class="me-business-title">业务申请进度</div>
-      <image class="me-business-right-icon" src="{{user}}" />
-    </div>
+		<div class="me-business-nav" bindtap='businessSchedule'>
+			<image class="me-business-icon" src="{{ywsqjd}}" />
+			<div class="me-business-title">业务申请进度</div>
+			<image class="me-business-right-icon" src="{{user}}" />
+		</div>
 
-    <div class="me-business-nav" bindtap="myTranslate">
-      <image class="me-business-icon" src="{{xxtx}}" />
-      <div class="me-business-title">我的活动</div>
-      <block wx:if="{{notRead > 0}}">
-        <div class="me-business-info">{{notRead}}</div>
-      </block>
+		<div class="me-business-nav" bindtap="myTranslate">
+			<image class="me-business-icon" src="{{xxtx}}" />
+			<div class="me-business-title">我的活动</div>
+			<block wx:if="{{notRead > 0}}">
+				<div class="me-business-info">{{notRead}}</div>
+			</block>
 
-      <image class="me-business-right-icon" src="{{user}}" />
-    </div>
+			<image class="me-business-right-icon" src="{{user}}" />
+		</div>
 
-    <div class="me-business-nav" bindtap="msg">
-      <image class="me-business-icon" src="{{xxtx}}" />
-      <div class="me-business-title">消息提醒</div>
-      <block wx:if="{{notRead > 0}}">
-        <div class="me-business-info">{{notRead}}</div>
-      </block>
+		<div class="me-business-nav" bindtap="msg">
+			<image class="me-business-icon" src="{{xxtx}}" />
+			<div class="me-business-title">消息提醒</div>
+			<block wx:if="{{notRead > 0}}">
+				<div class="me-business-info">{{notRead}}</div>
+			</block>
 
-      <image class="me-business-right-icon" src="{{user}}" />
-    </div>
-    <div class="me-business-nav" bindtap='drafts'>
-      <image class="me-business-icon" src="{{cgx}}" />
-      <div class="me-business-title">我的草稿箱</div>
-      <image class="me-business-right-icon" src="{{user}}" />
-    </div>
-    <div class="me-business-nav" bindtap='personInfo'>
-      <image class="me-business-icon" src="{{zdtx}}" />
-      <div class="me-business-title">补充个人信息</div>
-      <image class="me-business-right-icon" src="{{user}}" />
-    </div>
-  </div>
+			<image class="me-business-right-icon" src="{{user}}" />
+		</div>
 
-  <div class="index-gray"></div>
+		<div class="me-business-nav" bindtap="wdjb">
+			<image class="me-business-icon" src="{{xxtx}}" />
+			<div class="me-business-title">我的举报</div>
+			<block wx:if="{{notRead > 0}}">
+				<div class="me-business-info">{{notRead}}</div>
+			</block>
+
+			<image class="me-business-right-icon" src="{{user}}" />
+		</div>
+		<div class="me-business-nav" bindtap='drafts'>
+			<image class="me-business-icon" src="{{cgx}}" />
+			<div class="me-business-title">我的草稿箱</div>
+			<image class="me-business-right-icon" src="{{user}}" />
+		</div>
+		<div class="me-business-nav" bindtap='personInfo'>
+			<image class="me-business-icon" src="{{zdtx}}" />
+			<div class="me-business-title">补充个人信息</div>
+			<image class="me-business-right-icon" src="{{user}}" />
+		</div>
+	</div>
+
+	<div class="index-gray"></div>
 </div>
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/wdjb/wdjb.js b/SunshineLnsMinApp/pages/wdjb/wdjb.js
new file mode 100644
index 0000000..9551f62
--- /dev/null
+++ b/SunshineLnsMinApp/pages/wdjb/wdjb.js
@@ -0,0 +1,112 @@
+// pages/wdjb/wdjb.js
+const app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    loading: app.globalData.imgUrl + '/image/loading.svg',
+    navbar: ['未检举报', '线索举报'],
+    currentTab: 0,
+    size: 10,
+    size1: 10,
+    content: '------加载中------',
+    hasMoreData: true,
+    createTime: '',
+    dataSet: []
+  },
+
+  navbarTap: function (e) {
+    this.setData({
+      currentTab: e.currentTarget.dataset.idx
+    })
+    this.showList(this.data.currentTab)
+
+  },
+
+  showList: function (tab) {
+    var userinfo = wx.getStorageSync("user");
+    var that = this;
+    var id = userinfo.id
+    var str;
+    var sizeQty;
+    switch (tab) {
+      case 0:
+        str = "&businessType=1";
+        sizeQty = 'size';
+        break;
+      case 1:
+        str = "&businessType=2";
+        sizeQty = 'size1';
+        break;
+    }
+    wx.showLoading();
+    wx.request({
+      url: app.globalData.url + '/api/tipoff/query?page=1&rows=' + that.data[sizeQty] + '&createId=' + id+ str,
+      success: function (res) {
+        wx.hideLoading();
+        console.log(res)
+        if (res.data.code == 0) {
+          let content = res.data.data.rows.map(({
+            createTime,
+            ...i
+          }) => ({
+            ...i,
+            createTime: app.formatDate(createTime),
+          }));
+          if (res.data.data.total < that.data[sizeQty]) {
+            that.setData({
+              dataSet: content,
+              hasMoreData: false,
+              content: '------我是有底线的------'
+            })
+          } else {
+            that.setData({
+              dataSet: content,
+              hasMoreData: true,
+              content: '------加载更多------',
+              size: that.data[sizeQty] + 10
+            })
+          }
+        } else {
+          wx.showToast({
+            title: res.data.msg,
+          })
+        }
+      }
+    })
+  },
+
+  businessSchedule: function (event) {
+    var id = event.currentTarget.dataset.id;
+
+    console.log(id)
+    console.log(event);
+    wx.navigateTo({
+      url: '../xsjb/xsjb?id=' + id,
+    })
+
+  },
+
+  onLoad: function () {
+    this.showList(0)
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    if (this.data.hasMoreData) {
+      this.showList(this.data.currentTab)
+      this.setData({
+        content: '------加载更多------'
+      })
+    } else {
+      this.setData({
+        content: '------我是有底线的------'
+      })
+    }
+  },
+
+})
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/wdjb/wdjb.json b/SunshineLnsMinApp/pages/wdjb/wdjb.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/SunshineLnsMinApp/pages/wdjb/wdjb.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/wdjb/wdjb.wxml b/SunshineLnsMinApp/pages/wdjb/wdjb.wxml
new file mode 100644
index 0000000..0d4e52e
--- /dev/null
+++ b/SunshineLnsMinApp/pages/wdjb/wdjb.wxml
@@ -0,0 +1,23 @@
+<!--pages/wdjb/wdjb.wxml-->
+
+<!--导航条-->
+<view class="navbar">
+  <text wx:for="{{navbar}}" data-idx="{{index}}" class="item {{currentTab==index ? 'active' : ''}}" wx:key="unique" bindtap="navbarTap">{{item}}</text>
+</view>
+
+<!--列表数据-->
+<view style='flex-direction:column;height:94vh;background-color:rgba(80, 119, 170, 0.06)'>
+	<div class="businessSchedule" bindtap='businessSchedule' data-id="{{item.id}}" id="{{key}}" wx:for="{{dataSet}}" wx:for-index='key' wx:key="*this">
+		<div class="businessSchedule-top">
+			<div class="businessSchedule-top-img">
+				<div class="businessSchedule-center">{{item.tipoffObject}}</div>
+			</div>
+			<div class="businessSchedule-top-status backgroundorange-title" wx:if="{{item.status==1}}">未回复</div>
+      <div class="businessSchedule-top-status backgroundgreen-title" wx:elif="{{item.status==2}}">已回复</div>
+      <div class="businessSchedule-top-status backgroundgray-title" wx:else>未知文件</div>
+		</div>
+		<div class="businessSchedule-center">{{item.tipoffContent}}</div>
+		<div class="businessSchedule-bottom">于 {{item.createTime}} 提交申请</div>
+	</div>
+	<div class="businessSchedule-load">------{{content}}------</div>
+</view>
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/wdjb/wdjb.wxss b/SunshineLnsMinApp/pages/wdjb/wdjb.wxss
new file mode 100644
index 0000000..b64e0d2
--- /dev/null
+++ b/SunshineLnsMinApp/pages/wdjb/wdjb.wxss
@@ -0,0 +1,110 @@
+/* pages/wdjb/wdjb.wxss */
+
+view {
+  display: flex;
+}
+
+.navbar {
+  flex: none;
+  display: flex;
+  background: #fff;
+  font-size: 18px;
+  color: #999;
+  height: 6vh;
+}
+
+.navbar .item {
+  position: relative;
+  flex: auto;
+  text-align: center;
+  line-height: 80rpx;
+}
+
+.navbar .item.active {
+  color: #2195ff;
+}
+
+.navbar .item.active:after {
+  content: "";
+  display: block;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 4rpx;
+  background: #2195ff;
+}
+
+.businessSchedule {
+  font-size: 16px;
+  padding: 2vh;
+  margin: 2vh;
+  background-color: #fff;
+  box-shadow: 0px 6px 6px 0 rgba(80, 119, 170, 0.06);
+}
+
+.businessSchedule-top {
+  display: flex;
+  color: #333;
+  align-items: center;
+  padding-bottom: 1vh;
+  border-bottom: 1px solid #f2f2f2;
+}
+
+.businessSchedule-top-img {
+}
+
+.businessSchedule-top-title {
+  padding-left: 1vh;
+}
+
+.businessSchedule-top-status {
+  margin-left: auto;
+  display: flex;
+  justify-content: center;
+  box-shadow: 0px 4px 8px 0px rgba(136, 136, 136, 0.11);
+  padding: 1vh;
+  border-radius: 18px;
+  color: #fff;
+}
+
+.businessSchedule-center {
+  font-size: 14px;
+  display: flex;
+  padding: 1vh 0;
+  color: #333;
+}
+
+.businessSchedule-bottom {
+  display: flex;
+  font-size: 14px;
+  color: #999;
+}
+
+.loading {
+  padding: 10rpx;
+  text-align: center;
+}
+
+.loading:before {
+  display: inline-block;
+  margin-right: 5rpx;
+  vertical-align: middle;
+  content: '';
+  width: 40rpx;
+  height: 40rpx;
+  background-size: contain;
+  animation: rotate 1s linear infinite;
+}
+
+.loading.complete:before {
+  display: none;
+}
+
+.businessSchedule-load {
+  display: flex;
+  justify-content: center;
+  color: #999;
+  font-size: 14px;
+  margin-bottom: 4vh;
+}
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/wdjbInfo/wdjbInfo.js b/SunshineLnsMinApp/pages/wdjbInfo/wdjbInfo.js
new file mode 100644
index 0000000..4953397
--- /dev/null
+++ b/SunshineLnsMinApp/pages/wdjbInfo/wdjbInfo.js
@@ -0,0 +1,66 @@
+// pages/wdjbInfo/wdjbInfo.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/wdjbInfo/wdjbInfo.json b/SunshineLnsMinApp/pages/wdjbInfo/wdjbInfo.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/SunshineLnsMinApp/pages/wdjbInfo/wdjbInfo.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/wdjbInfo/wdjbInfo.wxml b/SunshineLnsMinApp/pages/wdjbInfo/wdjbInfo.wxml
new file mode 100644
index 0000000..5dbf885
--- /dev/null
+++ b/SunshineLnsMinApp/pages/wdjbInfo/wdjbInfo.wxml
@@ -0,0 +1,2 @@
+<!--pages/wdjbInfo/wdjbInfo.wxml-->
+<text>pages/wdjbInfo/wdjbInfo.wxml</text>
diff --git a/SunshineLnsMinApp/pages/wdjbInfo/wdjbInfo.wxss b/SunshineLnsMinApp/pages/wdjbInfo/wdjbInfo.wxss
new file mode 100644
index 0000000..60afd5a
--- /dev/null
+++ b/SunshineLnsMinApp/pages/wdjbInfo/wdjbInfo.wxss
@@ -0,0 +1 @@
+/* pages/wdjbInfo/wdjbInfo.wxss */
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/xsjb/xsjb.js b/SunshineLnsMinApp/pages/xsjb/xsjb.js
index 269fc2e..231e8dd 100644
--- a/SunshineLnsMinApp/pages/xsjb/xsjb.js
+++ b/SunshineLnsMinApp/pages/xsjb/xsjb.js
@@ -1,63 +1,227 @@
 // pages/xsjb/xsjb.js
-import { $wuxForm } from '../../templeteDist/wuxDist/index';
-
+import {
+  $wuxForm
+} from '../../templeteDist/wuxDist/index';
+var app = getApp();
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
+    add: app.globalData.imgUrl + '/image/add.svg',
+    del: app.globalData.imgUrl + '/image/del.svg',
     meetingWayList: [{
-      value: 'HY000001',
-      title: '线下调解'
+      value: '1',
+      title: '违反犯罪暴力'
     }, {
-      value: 'HY000002',
-      title: '视频调解'
+      value: '2',
+      title: '未违反犯罪暴力'
     }],
-    displaymeetingWay: '请选择',
+    meetingWayList1: [{
+      value: '1',
+      title: '匿名'
+    }, {
+      value: '2',
+      title: '实名'
+    }],
+    uploadUrl: app.globalData.url + '/api/v1/attachment/materials',
+    displaytipoffAction: '请选择',
+    displaytipoffType: '请选择',
+    thisData: {},
+    evalList: {},
+    disabled: true,
+    showInfo: false,
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function(options) {
-
+  onLoad: function (options) {
+    const id = options.id || 'new';
+    let that = this;
+    var userinfo = wx.getStorageSync("user");
+    wx.showLoading();
+    wx.request({
+      url: app.globalData.url + '/api/tipoff/find',
+      method: 'GET',
+      data: {
+        id,
+      },
+      success: function (res) {
+        console.log('res', res);
+        var dataSet = res.data;
+        var evalList1000 = dataSet.attachments || [];
+        var evalList = {
+          evalList1000,
+        };
+        for (var i in evalList) {
+          evalList[i] = evalList[i].map(({
+            imgPath: pic,
+            attachmentId: id
+          }) => ({
+            pic,
+            id
+          }))
+        }
+        const data = res.data || {}
+        if (options.id) {
+          that.setData({
+            thisData: {
+              ...data,
+              createId: userinfo.id,
+              businessType: 1
+            },
+            evalList,
+            disabled: false,
+            displaytipoffAction: data.tipoffAction == 1 ? '违反犯罪暴力' : data.tipoffAction == 2 ? '未违反犯罪暴力' : '请选择',
+            displaytipoffType: data.tipoffType == 1 ? '匿名' : data.tipoffType == 2 ? '实名' : '请选择',
+            showInfo: data.tipoffType == 2 ? true : false,
+          })
+        } else {
+          that.setData({
+            thisData: {
+              ...data,
+              createId: userinfo.id,
+              businessType: 1
+            },
+            evalList,
+          })
+        }
+        wx.hideLoading();
+      }
+    })
   },
 
   formSubmit(e) {
     console.log('Default Form Submit \n', e.detail.value)
   },
 
-  onSubmit() {
-    const {
-      getFieldsValue,
-      getFieldValue,
-      setFieldsValue
-    } = $wuxForm()
-    const value = getFieldsValue()
-
-    console.log('Wux Form Submit \n', value)
-  },
-
-  // 选择地理位置
-  chooseLocation: function(e) {
-    const that = this;
-    wx.chooseLocation({
-      success: function(res) {
-        console.log('res', res);
+  inputOnchange(e) {
+    const key = e.currentTarget.dataset.key;
+    console.log(key)
+    console.log(e)
+    this.setData({
+      thisData: {
+        ...this.data.thisData,
+        [key]: e.detail.value
       }
     })
   },
 
+  onSubmit() {
+    console.log(this.data.thisData)
+    if(!this.data.thisData.tipoffObject){
+      return app.showModal("请填写举报对象!");
+    }
+    if(!this.data.thisData.tipoffAction){
+      return app.showModal("请选择举报行为!");
+    }
+    if(!this.data.thisData.tipoffAddress){
+      return app.showModal("请填写发生地!");
+    }
+    if(!this.data.thisData.tipoffContent){
+      return app.showModal("请填写具体事项!");
+    }
+    if(!this.data.evalList){
+      return app.showModal("请上传证明材料!");
+    }
+    if(!this.data.thisData.tipoffType){
+      return app.showModal("请选择方式!");
+    }
+    if(this.data.thisData.tipoffType=='2'){
+      if(!this.data.thisData.createrName){
+        return app.showModal("请填写姓名!");
+      }
+      if(!this.data.thisData.createrMobile){
+        return app.showModal("请填写手机号码!");
+      }
+      if(!this.data.thisData.createrAddress){
+        return app.showModal("请填写联系方式!");
+      }
+    }
+    wx.request({
+      url: app.globalData.url + '/api/tipoff/save',
+      data: this.data.thisData,
+      method: 'POST',
+      header: {
+        "Content-Type": "application/json"
+      },
+      success: function (res) {
+        if (res.data.code == 0) {
+          wx.showToast({
+            title: '提交成功!',
+            icon: 'success',
+            duration: 2000
+          })
+          wx.navigateTo({
+            url: '../zhwj/zhwj',
+          })
+        }
+      }
+    })
+  },
+
+  // 选择地理位置
+  chooseLocation: function (e) {
+    const that = this;
+    wx.chooseLocation({
+      success: function (res) {
+        console.log('res', res);
+        that.setData({
+          thisData: {
+            ...that.data.thisData,
+            tipoffAddress: res.address
+          }
+        })
+      }
+    })
+  },
+
+  //添加图片
+  joinPicture: function (e) {
+    console.log(e)
+    var that = this;
+    console.log(that)
+    app.joinPicture(e, that, e.currentTarget.dataset.associatetypeid, that.data.id);
+  },
+
+  // 删除图片
+  clearImg: function (e) {
+    var that = this;
+    app.clearImg(e, that);
+  },
+
+  //预览图片
+  previewImage: function (e) {
+    app.previewImage(e);
+  },
 
 
   onPopupSelectChange(e) {
     let _this = this;
     var key = e.currentTarget.dataset['key'];
     console.log('key', key, e);
-    this.setData({
-      [key]: e.detail.value,
-      [`display${key}`]: e.detail.label
-    });
+    if (key == 'tipoffType' && e.detail.value == '2') {
+      this.setData({
+        [key]: e.detail.value,
+        [`display${key}`]: e.detail.label,
+        showInfo:true,
+        thisData: {
+          ...this.data.thisData,
+          [key]: e.detail.value,
+        }
+      });
+    }else{
+      this.setData({
+        [key]: e.detail.value,
+        [`display${key}`]: e.detail.label,
+        thisData: {
+          ...this.data.thisData,
+          [key]: e.detail.value,
+        }
+      });
+    }
+
   }
 })
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/xsjb/xsjb.wxml b/SunshineLnsMinApp/pages/xsjb/xsjb.wxml
index ea769df..f0cf6ce 100644
--- a/SunshineLnsMinApp/pages/xsjb/xsjb.wxml
+++ b/SunshineLnsMinApp/pages/xsjb/xsjb.wxml
@@ -1,22 +1,22 @@
 <!--pages/xsjb/xsjb.wxml-->
 <wux-form id="wux-form" bind:change="onChange">
-  <form id="form-dom" bindsubmit="formSubmit">
-    <wux-cell-group title="举报信息">
-      <wux-field name="举报对象">
-        <wux-cell hover-class="none">
-          <wux-field name="举报对象" value="柯礼钦">
-            <wux-input label="举报对象" bind:change="inputOnchange" data-key="handleContent" />
-          </wux-field>
-        </wux-cell>
-      </wux-field>
+	<form id="form-dom" bindsubmit="formSubmit">
+		<wux-cell-group title="举报信息">
+			<wux-field name="举报对象" >
+				<wux-cell hover-class="none">
+					<wux-field name="举报对象" initialValue="{{ thisData.tipoffObject }}">
+						<wux-input label="举报对象" bind:change="inputOnchange" data-key="tipoffObject" />
+					</wux-field>
+				</wux-cell>
+			</wux-field>
 
-      <wux-field name="举报行为" value="{{ meetingWay }}">
-        <wux-popup-select options="{{ meetingWayList }}" bind:change="onPopupSelectChange" data-key="meetingWay">
-          <wux-cell title="举报行为" is-link extra="{{ displaymeetingWay }}" required="{{true}}"></wux-cell>
-        </wux-popup-select>
-      </wux-field>
+			<wux-field name="举报行为" initialValue="{{ displaytipoffAction }}">
+				<wux-popup-select options="{{ meetingWayList }}" bind:change="onPopupSelectChange" data-key="tipoffAction">
+					<wux-cell title="举报行为" is-link extra="{{ displaytipoffAction }}" required="{{true}}"></wux-cell>
+				</wux-popup-select>
+			</wux-field>
 
-      <!-- <wux-field name="发生地" value="{{ meetingWay }}">
+			<!-- <wux-field name="发生地" value="{{ meetingWay }}">
       <wux-cell hover-class="none" extra="{{dom}}">
         <wux-field name="发生地" initialValue="123">
           <wux-input label="发生地" />
@@ -24,70 +24,82 @@
       </wux-cell>
     </wux-field> -->
 
-      <view class="cu-form-group">
-        <view class="title">发生地</view>
-        <input placeholder="发生地"></input>
-        <text class="cuIcon-locationfill text-orange" bindtap="chooseLocation"></text>
-      </view>
+			<!-- <view class="cu-form-group">
+				<view class="title">发生地</view>
+				<input value="{{data.tipoffAddress}}" bind:change="inputOnchange" data-key="tipoffAddress" placeholder="发生地"></input>
+				 <text class="cuIcon-locationfill text-orange" bind:change="chooseLocation"></text>
+			 </view>  -->
 
-      <wux-field name="具体事项" value="{{ meetingWay }}">
-        <wux-cell hover-class="none">
-          <wux-textarea rows="3" label="具体事项" placeholder="请输入具体事项" />
-        </wux-cell>
-      </wux-field>
+			<wux-field name="发生地" >
+				<wux-cell hover-class="none">
+					<wux-field name="发生地" initialValue="{{ thisData.tipoffAddress }}">
+						<wux-input label="发生地" bind:change="inputOnchange" data-key="tipoffAddress" />
+					</wux-field>
+				</wux-cell>
+			</wux-field>
 
-    </wux-cell-group>
+			<wux-field name="具体事项" initialValue="{{ thisData.tipoffContent }}">
+				<wux-cell hover-class="none">
+					<wux-textarea rows="3" bind:change="inputOnchange" data-key="tipoffContent" label="具体事项" placeholder="请输入具体事项" />
+				</wux-cell>
+			</wux-field>
 
-    <wux-cell-group title="证明材料上传">
-      <view style="padding: 20rpx 28rpx 0 30rpx;">
-        <wux-upload listType="picture-card" fileList="{{ supplyAttachmentList  }}" controlled url="{{uploadUrl}}entityId={{entityId}}&associateId={{5002}}" data-id="{{item.caseId}}" bind:change="onChange" bind:success="onSuccess" bind:fail="onFail" bind:complete="onComplete"
-          bind:preview="onPreview" bind:remove="onRemove">
-          <!-- <text>上传</text> -->
-          <wux-icon type="ios-add-circle-outline" color="color:rgba(153,153,153,1);" />
-        </wux-upload>
-      </view>
-    </wux-cell-group>
+		</wux-cell-group>
 
-    <view style="margin-top: 30rpx;">
-      <wux-cell-group>
-        <wux-field name="举报类型" value="{{ meetingWay }}">
-          <wux-popup-select options="{{ meetingWayList }}" bind:change="onPopupSelectChange" data-key="meetingWay">
-            <wux-cell title="举报类型" is-link extra="{{ displaymeetingWay }}" required="{{true}}"></wux-cell>
-          </wux-popup-select>
-        </wux-field>
-      </wux-cell-group>
-    </view>
+		<wux-cell-group title="证明材料上传">
+			<div class="activity-uploadImage">
+				<view class="educt_hasupload_pic" wx:for="{{evalList.evalList1000}}" wx:key="index">
+					<image src="{{item.pic}}" class="upload" bindtap="previewImage" data-src="{{item.pic}}"></image>
+					<image src="{{del}}" bindtap='clearImg' data-index="{{index}}" id="{{item.id}}" data-associatetypeid="{{1000}}"></image>
+				</view>
+				<view bindtap="joinPicture" data-index="{{0}}" data-associatetypeid="{{1000}}">
+					<image class="{{disabled? 'educt_upload_add activity-uploadImag-icon':'displayNone activity-uploadImag-icon'}}" src="{{add}}"></image>
+				</view>
+			</div>
+		</wux-cell-group>
 
-    <wux-cell-group title="举报人信息">
-      <wux-field name="姓名">
-        <wux-cell hover-class="none">
-          <wux-field name="姓名" initialValue="123">
-            <wux-input label="姓名" />
-          </wux-field>
-        </wux-cell>
-      </wux-field>
+		<view style="margin-top: 30rpx;">
+			<wux-cell-group>
+				<wux-field name="举报方式" initialValue="{{displaytipoffType }}">
+					<wux-popup-select options="{{ meetingWayList1 }}" bind:change="onPopupSelectChange" data-key="tipoffType">
+						<wux-cell title="举报方式" is-link extra="{{ displaytipoffType }}" required="{{true}}"></wux-cell>
+					</wux-popup-select>
+				</wux-field>
+			</wux-cell-group>
+		</view>
 
-      <wux-field name="手机号码">
-        <wux-cell hover-class="none">
-          <wux-field name="手机号码" initialValue="123">
-            <wux-input label="手机号码" />
-          </wux-field>
-        </wux-cell>
-      </wux-field>
+		
 
-      <wux-field name="联系地址">
-        <wux-cell hover-class="none">
-          <wux-field name="联系地址" initialValue="123">
-            <wux-input label="联系地址" />
-          </wux-field>
-        </wux-cell>
-      </wux-field>
-    </wux-cell-group>
+		<wux-cell-group title="举报人信息" wx:if="{{showInfo}}">
+			<wux-field name="姓名">
+				<wux-cell hover-class="none">
+					<wux-field name="姓名" initialValue="{{ thisData.createrName }}">
+						<wux-input label="姓名" bind:change="inputOnchange" data-key="createrName" />
+					</wux-field>
+				</wux-cell>
+			</wux-field>
 
-    <view class="padding-sm">
-      <button class="cu-btn block bg-blue margin-tb-sm lg" bindtap="onSubmit">
-        提交举报
-      </button>
-    </view>
-  </form>
+			<wux-field name="手机号码"  wx:if="{{showInfo}}">
+				<wux-cell hover-class="none">
+					<wux-field name="手机号码" initialValue="{{ thisData.createrMobile }}">
+						<wux-input label="手机号码" bind:change="inputOnchange" data-key="createrMobile" />
+					</wux-field>
+				</wux-cell>
+			</wux-field>
+
+			<wux-field name="联系地址"  wx:if="{{showInfo}}">
+				<wux-cell hover-class="none">
+					<wux-field name="联系地址" initialValue="{{ thisData.createrAddress }}">
+						<wux-input label="联系地址" bind:change="inputOnchange" data-key="createrAddress" />
+					</wux-field>
+				</wux-cell>
+			</wux-field>
+		</wux-cell-group>
+
+		<view class="padding-sm" wx:if="{{disabled}}">
+			<button class="cu-btn block bg-blue margin-tb-sm lg" bindtap="onSubmit">
+				提交举报
+			</button>
+		</view>
+	</form>
 </wux-form>
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/xsjb/xsjb.wxss b/SunshineLnsMinApp/pages/xsjb/xsjb.wxss
index 7defac1..db79719 100644
--- a/SunshineLnsMinApp/pages/xsjb/xsjb.wxss
+++ b/SunshineLnsMinApp/pages/xsjb/xsjb.wxss
@@ -19,6 +19,34 @@
   font-size: 28rpx;
 }
 
+.activity-uploadImage {
+  display: flex;
+  padding:1vh 2vh;
+}
+
+.upload {
+  width: 48px;
+  height: 48px;
+}
+
+.activity-uploadImag-del {
+  width: 20px;
+  height: 20px;
+  position: absolute;
+  left: 28px;
+}
+
+.educt_hasupload_pic {
+  display: flex;
+  position: relative;
+  padding-right: 1vh;
+}
+
+.activity-uploadImag-icon {
+  width: 48px;
+  height: 48px;
+}
+
 #form-dom .cu-form-group:after {
   content: " ";
   position: absolute;
diff --git a/SunshineLnsMinApp/pages/xsuojb/xsuojb.js b/SunshineLnsMinApp/pages/xsuojb/xsuojb.js
new file mode 100644
index 0000000..02ee2f1
--- /dev/null
+++ b/SunshineLnsMinApp/pages/xsuojb/xsuojb.js
@@ -0,0 +1,32 @@
+// pages/wjjb/wjjb.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  // 跳转
+  linkFunction: function (event) {
+    var str = event.currentTarget.dataset['str'];
+    wx.navigateTo({
+      url: `../${str}/${str}`
+    })
+  },
+
+  makePhoneCall() {
+    wx.makePhoneCall({
+      phoneNumber: '12309' // 仅为示例,并非真实的电话号码
+    })
+  }
+
+})
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/xsuojb/xsuojb.json b/SunshineLnsMinApp/pages/xsuojb/xsuojb.json
new file mode 100644
index 0000000..7c4a5c7
--- /dev/null
+++ b/SunshineLnsMinApp/pages/xsuojb/xsuojb.json
@@ -0,0 +1,7 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "线索举报",
+  "backgroundTextStyle": "light",
+  "navigationBarBackgroundColor": "#fff",
+  "navigationBarTextStyle": "black"
+}
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/xsuojb/xsuojb.wxml b/SunshineLnsMinApp/pages/xsuojb/xsuojb.wxml
new file mode 100644
index 0000000..e4f30fd
--- /dev/null
+++ b/SunshineLnsMinApp/pages/xsuojb/xsuojb.wxml
@@ -0,0 +1,12 @@
+<!--pages/wjjb/wjjb.wxml-->
+<view class="padding-xl">
+  <button class="cu-btn block line-blue lg" data-str="xsuojbInfo" bindtap='linkFunction'>
+    <!-- <text class="cuIcon-upload"></text> -->
+    线上举报
+  </button>
+
+  <button class="cu-btn block line-blue lg margin-tb-lg" bindtap='makePhoneCall'>
+    <!-- <text class="cuIcon-upload"></text> -->
+    电话举报
+  </button>
+</view>
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/xsuojb/xsuojb.wxss b/SunshineLnsMinApp/pages/xsuojb/xsuojb.wxss
new file mode 100644
index 0000000..9e21f1c
--- /dev/null
+++ b/SunshineLnsMinApp/pages/xsuojb/xsuojb.wxss
@@ -0,0 +1 @@
+/* pages/wjjb/wjjb.wxss */
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.js b/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.js
new file mode 100644
index 0000000..4ce6725
--- /dev/null
+++ b/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.js
@@ -0,0 +1,227 @@
+// pages/xsjb/xsjb.js
+import {
+  $wuxForm
+} from '../../templeteDist/wuxDist/index';
+var app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    add: app.globalData.imgUrl + '/image/add.svg',
+    del: app.globalData.imgUrl + '/image/del.svg',
+    meetingWayList: [{
+      value: '1',
+      title: '违反犯罪暴力'
+    }, {
+      value: '2',
+      title: '未违反犯罪暴力'
+    }],
+    meetingWayList1: [{
+      value: '1',
+      title: '匿名'
+    }, {
+      value: '2',
+      title: '实名'
+    }],
+    uploadUrl: app.globalData.url + '/api/v1/attachment/materials',
+    displaytipoffAction: '请选择',
+    displaytipoffType: '请选择',
+    thisData: {},
+    evalList: {},
+    disabled: true,
+    showInfo: false,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    const id = options.id || 'new';
+    let that = this;
+    var userinfo = wx.getStorageSync("user");
+    wx.showLoading();
+    wx.request({
+      url: app.globalData.url + '/api/tipoff/find',
+      method: 'GET',
+      data: {
+        id,
+      },
+      success: function (res) {
+        console.log('res', res);
+        var dataSet = res.data;
+        var evalList1000 = dataSet.attachments || [];
+        var evalList = {
+          evalList1000,
+        };
+        for (var i in evalList) {
+          evalList[i] = evalList[i].map(({
+            imgPath: pic,
+            attachmentId: id
+          }) => ({
+            pic,
+            id
+          }))
+        }
+        const data = res.data || {}
+        if (options.id) {
+          that.setData({
+            thisData: {
+              ...data,
+              createId: userinfo.id,
+              businessType: 2
+            },
+            evalList,
+            disabled: false,
+            displaytipoffAction: data.tipoffAction == 1 ? '违反犯罪暴力' : data.tipoffAction == 2 ? '未违反犯罪暴力' : '请选择',
+            displaytipoffType: data.tipoffType == 1 ? '匿名' : data.tipoffType == 2 ? '实名' : '请选择',
+            showInfo: data.tipoffType == 2 ? true : false,
+          })
+        } else {
+          that.setData({
+            thisData: {
+              ...data,
+              createId: userinfo.id,
+              businessType: 2
+            },
+            evalList,
+          })
+        }
+        wx.hideLoading();
+      }
+    })
+  },
+
+  formSubmit(e) {
+    console.log('Default Form Submit \n', e.detail.value)
+  },
+
+  inputOnchange(e) {
+    const key = e.currentTarget.dataset.key;
+    console.log(key)
+    console.log(e)
+    this.setData({
+      thisData: {
+        ...this.data.thisData,
+        [key]: e.detail.value
+      }
+    })
+  },
+
+  onSubmit() {
+    console.log(this.data.thisData)
+    if(!this.data.thisData.tipoffObject){
+      return app.showModal("请填写举报对象!");
+    }
+    if(!this.data.thisData.tipoffAction){
+      return app.showModal("请选择举报行为!");
+    }
+    if(!this.data.thisData.tipoffAddress){
+      return app.showModal("请填写发生地!");
+    }
+    if(!this.data.thisData.tipoffContent){
+      return app.showModal("请填写具体事项!");
+    }
+    if(!this.data.evalList){
+      return app.showModal("请上传证明材料!");
+    }
+    if(!this.data.thisData.tipoffType){
+      return app.showModal("请选择方式!");
+    }
+    if(this.data.thisData.tipoffType=='2'){
+      if(!this.data.thisData.createrName){
+        return app.showModal("请填写姓名!");
+      }
+      if(!this.data.thisData.createrMobile){
+        return app.showModal("请填写手机号码!");
+      }
+      if(!this.data.thisData.createrAddress){
+        return app.showModal("请填写联系方式!");
+      }
+    }
+    wx.request({
+      url: app.globalData.url + '/api/tipoff/save',
+      data: this.data.thisData,
+      method: 'POST',
+      header: {
+        "Content-Type": "application/json"
+      },
+      success: function (res) {
+        if (res.data.code == 0) {
+          wx.showToast({
+            title: '提交成功!',
+            icon: 'success',
+            duration: 2000
+          })
+          wx.navigateTo({
+            url: '../zhwj/zhwj',
+          })
+        }
+      }
+    })
+  },
+
+  // 选择地理位置
+  chooseLocation: function (e) {
+    const that = this;
+    wx.chooseLocation({
+      success: function (res) {
+        console.log('res', res);
+        that.setData({
+          thisData: {
+            ...that.data.thisData,
+            tipoffAddress: res.address
+          }
+        })
+      }
+    })
+  },
+
+  //添加图片
+  joinPicture: function (e) {
+    console.log(e)
+    var that = this;
+    console.log(that)
+    app.joinPicture(e, that, e.currentTarget.dataset.associatetypeid, that.data.id);
+  },
+
+  // 删除图片
+  clearImg: function (e) {
+    var that = this;
+    app.clearImg(e, that);
+  },
+
+  //预览图片
+  previewImage: function (e) {
+    app.previewImage(e);
+  },
+
+
+  onPopupSelectChange(e) {
+    let _this = this;
+    var key = e.currentTarget.dataset['key'];
+    console.log('key', key, e);
+    if (key == 'tipoffType' && e.detail.value == '2') {
+      this.setData({
+        [key]: e.detail.value,
+        [`display${key}`]: e.detail.label,
+        showInfo:true,
+        thisData: {
+          ...this.data.thisData,
+          [key]: e.detail.value,
+        }
+      });
+    }else{
+      this.setData({
+        [key]: e.detail.value,
+        [`display${key}`]: e.detail.label,
+        thisData: {
+          ...this.data.thisData,
+          [key]: e.detail.value,
+        }
+      });
+    }
+
+  }
+})
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.json b/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.json
new file mode 100644
index 0000000..b9ce25e
--- /dev/null
+++ b/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.json
@@ -0,0 +1,22 @@
+{
+  "navigationBarTitleText": "线索举报(线上举报)",
+  "backgroundTextStyle": "light",
+  "navigationBarBackgroundColor": "#fff",
+  "navigationBarTextStyle": "black",
+  "usingComponents": {
+    "wux-upload": "../../templeteDist/wuxDist/upload/index",
+    "wux-popup-select": "../../templeteDist/wuxDist/popup-select/index",
+    "wux-cell": "../../templeteDist/wuxDist/cell/index",
+    "wux-accordion-group": "../../templeteDist/wuxDist/accordion-group/index",
+    "wux-accordion": "../../templeteDist/wuxDist/accordion/index",
+    "wux-icon": "../../templeteDist/wuxDist/icon/index",
+    "wux-date-picker-view": "../../templeteDist/wuxDist/date-picker-view/index",
+    "wux-date-picker": "../../templeteDist/wuxDist/date-picker/index",
+    "wux-select": "../../templeteDist/wuxDist/select/index",
+    "wux-field": "../../templeteDist/wuxDist/field/index",
+    "wux-textarea": "../../templeteDist/wuxDist/textarea/index",
+    "wux-cell-group": "../../templeteDist/wuxDist/cell-group/index",
+    "wux-input": "../../templeteDist/wuxDist/input/index",
+    "wux-form": "../../templeteDist/wuxDist/form/index"
+  }
+}
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.wxml b/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.wxml
new file mode 100644
index 0000000..f0cf6ce
--- /dev/null
+++ b/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.wxml
@@ -0,0 +1,105 @@
+<!--pages/xsjb/xsjb.wxml-->
+<wux-form id="wux-form" bind:change="onChange">
+	<form id="form-dom" bindsubmit="formSubmit">
+		<wux-cell-group title="举报信息">
+			<wux-field name="举报对象" >
+				<wux-cell hover-class="none">
+					<wux-field name="举报对象" initialValue="{{ thisData.tipoffObject }}">
+						<wux-input label="举报对象" bind:change="inputOnchange" data-key="tipoffObject" />
+					</wux-field>
+				</wux-cell>
+			</wux-field>
+
+			<wux-field name="举报行为" initialValue="{{ displaytipoffAction }}">
+				<wux-popup-select options="{{ meetingWayList }}" bind:change="onPopupSelectChange" data-key="tipoffAction">
+					<wux-cell title="举报行为" is-link extra="{{ displaytipoffAction }}" required="{{true}}"></wux-cell>
+				</wux-popup-select>
+			</wux-field>
+
+			<!-- <wux-field name="发生地" value="{{ meetingWay }}">
+      <wux-cell hover-class="none" extra="{{dom}}">
+        <wux-field name="发生地" initialValue="123">
+          <wux-input label="发生地" />
+        </wux-field>
+      </wux-cell>
+    </wux-field> -->
+
+			<!-- <view class="cu-form-group">
+				<view class="title">发生地</view>
+				<input value="{{data.tipoffAddress}}" bind:change="inputOnchange" data-key="tipoffAddress" placeholder="发生地"></input>
+				 <text class="cuIcon-locationfill text-orange" bind:change="chooseLocation"></text>
+			 </view>  -->
+
+			<wux-field name="发生地" >
+				<wux-cell hover-class="none">
+					<wux-field name="发生地" initialValue="{{ thisData.tipoffAddress }}">
+						<wux-input label="发生地" bind:change="inputOnchange" data-key="tipoffAddress" />
+					</wux-field>
+				</wux-cell>
+			</wux-field>
+
+			<wux-field name="具体事项" initialValue="{{ thisData.tipoffContent }}">
+				<wux-cell hover-class="none">
+					<wux-textarea rows="3" bind:change="inputOnchange" data-key="tipoffContent" label="具体事项" placeholder="请输入具体事项" />
+				</wux-cell>
+			</wux-field>
+
+		</wux-cell-group>
+
+		<wux-cell-group title="证明材料上传">
+			<div class="activity-uploadImage">
+				<view class="educt_hasupload_pic" wx:for="{{evalList.evalList1000}}" wx:key="index">
+					<image src="{{item.pic}}" class="upload" bindtap="previewImage" data-src="{{item.pic}}"></image>
+					<image src="{{del}}" bindtap='clearImg' data-index="{{index}}" id="{{item.id}}" data-associatetypeid="{{1000}}"></image>
+				</view>
+				<view bindtap="joinPicture" data-index="{{0}}" data-associatetypeid="{{1000}}">
+					<image class="{{disabled? 'educt_upload_add activity-uploadImag-icon':'displayNone activity-uploadImag-icon'}}" src="{{add}}"></image>
+				</view>
+			</div>
+		</wux-cell-group>
+
+		<view style="margin-top: 30rpx;">
+			<wux-cell-group>
+				<wux-field name="举报方式" initialValue="{{displaytipoffType }}">
+					<wux-popup-select options="{{ meetingWayList1 }}" bind:change="onPopupSelectChange" data-key="tipoffType">
+						<wux-cell title="举报方式" is-link extra="{{ displaytipoffType }}" required="{{true}}"></wux-cell>
+					</wux-popup-select>
+				</wux-field>
+			</wux-cell-group>
+		</view>
+
+		
+
+		<wux-cell-group title="举报人信息" wx:if="{{showInfo}}">
+			<wux-field name="姓名">
+				<wux-cell hover-class="none">
+					<wux-field name="姓名" initialValue="{{ thisData.createrName }}">
+						<wux-input label="姓名" bind:change="inputOnchange" data-key="createrName" />
+					</wux-field>
+				</wux-cell>
+			</wux-field>
+
+			<wux-field name="手机号码"  wx:if="{{showInfo}}">
+				<wux-cell hover-class="none">
+					<wux-field name="手机号码" initialValue="{{ thisData.createrMobile }}">
+						<wux-input label="手机号码" bind:change="inputOnchange" data-key="createrMobile" />
+					</wux-field>
+				</wux-cell>
+			</wux-field>
+
+			<wux-field name="联系地址"  wx:if="{{showInfo}}">
+				<wux-cell hover-class="none">
+					<wux-field name="联系地址" initialValue="{{ thisData.createrAddress }}">
+						<wux-input label="联系地址" bind:change="inputOnchange" data-key="createrAddress" />
+					</wux-field>
+				</wux-cell>
+			</wux-field>
+		</wux-cell-group>
+
+		<view class="padding-sm" wx:if="{{disabled}}">
+			<button class="cu-btn block bg-blue margin-tb-sm lg" bindtap="onSubmit">
+				提交举报
+			</button>
+		</view>
+	</form>
+</wux-form>
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.wxss b/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.wxss
new file mode 100644
index 0000000..db79719
--- /dev/null
+++ b/SunshineLnsMinApp/pages/xsuojbInfo/xsuojbInfo.wxss
@@ -0,0 +1,71 @@
+/* pages/xsjb/xsjb.wxss */
+
+page {
+  background: #f1f1f1;
+}
+
+.cu-form-group .title {
+  min-width: calc(4em + 30rpx);
+}
+
+#form-dom input {
+  text-align: right;
+}
+
+#form-dom .cu-form-group {
+  min-height: auto;
+  padding: 20rpx 30rpx;
+  position: relative;
+  font-size: 28rpx;
+}
+
+.activity-uploadImage {
+  display: flex;
+  padding:1vh 2vh;
+}
+
+.upload {
+  width: 48px;
+  height: 48px;
+}
+
+.activity-uploadImag-del {
+  width: 20px;
+  height: 20px;
+  position: absolute;
+  left: 28px;
+}
+
+.educt_hasupload_pic {
+  display: flex;
+  position: relative;
+  padding-right: 1vh;
+}
+
+.activity-uploadImag-icon {
+  width: 48px;
+  height: 48px;
+}
+
+#form-dom .cu-form-group:after {
+  content: " ";
+  position: absolute;
+  left: 30rpx;
+  bottom: 0;
+  right: 0;
+  height: 2rpx;
+  border-bottom: 2rpx solid #d9d9d9;
+  color: #d9d9d9;
+  transform-origin: 0 100%;
+  transform: scaleY(0.5);
+}
+
+#form-dom .cu-form-group .title {
+  height: 30rpx;
+  line-height: 30rpx;
+  font-size: 28rpx;
+}
+
+#form-dom .cu-form-group input {
+  font-size: 28rpx;
+}
diff --git a/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.js b/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.js
index 67cc594..8362d5a 100644
--- a/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.js
+++ b/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.js
@@ -67,7 +67,8 @@
   },
   //输入框
   inputChange: function (e) {
-    var taskReport = e.currentTarget.dataset.name;
+    console.log(e)
+    var taskReport = e.detail.value;
     this.setData({
       taskReport
     })
diff --git a/SunshineLnsMinApp/pages/zhwj/zhwj.wxml b/SunshineLnsMinApp/pages/zhwj/zhwj.wxml
index 997f9ee..0117ff8 100644
--- a/SunshineLnsMinApp/pages/zhwj/zhwj.wxml
+++ b/SunshineLnsMinApp/pages/zhwj/zhwj.wxml
@@ -36,14 +36,14 @@
 			</view>
 		</view>
 	</view>
-	<view class="zhwj-list-flex">
+	<!-- <view class="zhwj-list-flex">
 		<view class="zhwj-list-flex-l" data-str="weiwc" 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 class="text-gray">未检职工入职查询</view>
 			</view>
-		</view>
+		</view> -->
 		<!-- <view class="zhwj-list-flex-r" data-str="weiwc" 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">
@@ -52,7 +52,7 @@
       </view>
     </view> -->
 
-		<view class="zhwj-list-flex-r" data-str="fzjdvisitList" bindtap='linkFunction'>
+		<!-- <view class="zhwj-list-flex-r" data-str="fzjdvisitList" 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>
@@ -60,7 +60,7 @@
 			</view>
 		</view>
 
-	</view>
+	</view> -->
 </view>
 
 <view class="index-gray "></view>
diff --git a/SunshineLnsMinApp/pages/znjj/znjj.js b/SunshineLnsMinApp/pages/znjj/znjj.js
new file mode 100644
index 0000000..6c32bb9
--- /dev/null
+++ b/SunshineLnsMinApp/pages/znjj/znjj.js
@@ -0,0 +1,41 @@
+// pages/zhgk/zhgk.js
+var app = getApp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    wjgk: './../../images/wjgk.jpg',
+    data:{},
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this;
+    wx.request({
+      url: app.globalData.url + '/api/article/findByName',
+      data: {
+        typeName:'知识产权职能简介',
+      },
+      success: function (res) {
+        wx.hideLoading();
+        console.log(res)
+        if (res.data.code == 0) {
+          that.setData({
+            data: res.data.data
+          })
+        } else {
+          wx.showModal({
+            title: '提示',
+            content: "请求失败!"
+          })
+        }
+      }
+    })
+  },
+
+
+})
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/znjj/znjj.json b/SunshineLnsMinApp/pages/znjj/znjj.json
new file mode 100644
index 0000000..8d0d51e
--- /dev/null
+++ b/SunshineLnsMinApp/pages/znjj/znjj.json
@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "职能简介",
+  "backgroundTextStyle": "light",
+  "navigationBarBackgroundColor": "#fff",
+  "navigationBarTextStyle": "black"
+}
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/znjj/znjj.wxml b/SunshineLnsMinApp/pages/znjj/znjj.wxml
new file mode 100644
index 0000000..5165324
--- /dev/null
+++ b/SunshineLnsMinApp/pages/znjj/znjj.wxml
@@ -0,0 +1,32 @@
+<!--pages/zhgk/zhgk.wxml-->
+<!-- <view class="bg-img padding-tb-xl" style="background-image: url({{wjgk}});background-size:100% auto;height:200px"></view> -->
+
+<view class="zhgk-main">
+	<view class=" text-lg" style="padding:30rpx 30rpx 0;">
+		<text class="zhgk-main-title text-black">{{data.title}}</text>
+	</view>
+	<!-- <view class=' text-df padding'> 2016年4月,南沙检察成立了未成年人检察工作办公室。2019年1月,我院成立“许淑妍命名检察官办公室”,适用“捕诉监防助”一体化工作模式,负责办理未成年人犯罪和侵害未成年人犯罪案件,开展未成年人司法保护和预防未成年人犯罪等工作。南沙检察以专业化办案为依托,以规范化建设为抓手,认真贯彻“教育、感化、挽救”方针,坚持“教育为主、惩罚为辅”原则,全面落实未成年人指定辩护、社会调查、心理评估、合适成年人等特别程序,不断打造未检新品牌。以社会化服务为路径,以多元化平台为支点,组建心理咨询师团队和社工团队,通过法治宣传大平台、两微一端、“沙鸥”法治宣讲团开展普法宣传,构建多维度的未成年人维权、犯罪预防网络。近年来,南沙检察先后获评全国青少年维权岗、全国检察机关未成年人检察工作联系点。队伍中涌现出全国检察机关未成年人检察业务竞赛能手和全市检察机关未成年人检察业务标兵。</view> -->
+	<view class=' text-df padding'>
+		<rich-text nodes="{{data.content}}"></rich-text>
+	</view>
+</view>
+
+<!-- <view class="zhgk-main">
+  <view class=" text-lg" style="padding:30rpx 30rpx 0;">
+    <text class="zhgk-main-title text-black">指导文件</text>
+  </view>
+  <view class="padding">
+    <view class=' text-df'>最高人民检察院《中华人民共和国最高人民检察院检察建议书》</view>
+    <view class=' text-df'>最高人民检察院《2018-2022年检察改革工作规划》</view>
+    <view class=' text-df'>最高人民检察院《最高人民检察院关于全面加强未成年人国家司法救助工作的意见》</view>
+  </view>
+</view>
+
+<view class="zhgk-main">
+  <view class=" text-lg" style="padding:30rpx 30rpx 0;">
+    <text class="zhgk-main-title text-black">未检职能</text>
+  </view>
+  <view class="padding">
+  <view class=' text-df'> 负责未成年人犯罪和侵害未成年人犯罪案件的审查批捕、审查起诉、出庭公诉、诉讼监督、犯罪预防、教育挽救工作,实现专人审查、全程办理,“一竿子捅到底”,为涉罪未成年人提供全面高效、协调一致的检察保护。</view>
+  </view>
+</view> -->
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/znjj/znjj.wxss b/SunshineLnsMinApp/pages/znjj/znjj.wxss
new file mode 100644
index 0000000..0e23419
--- /dev/null
+++ b/SunshineLnsMinApp/pages/znjj/znjj.wxss
@@ -0,0 +1,9 @@
+/* pages/zhgk/zhgk.wxss */
+
+.zhgk-main {
+  background-color: #fff;
+}
+
+.zhgk-main-title {
+  color: #249eff;
+}
diff --git a/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.js b/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.js
index a1dc494..da82fe5 100644
--- a/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.js
+++ b/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.js
@@ -18,17 +18,41 @@
     dongtai3_1: app.globalData.imgUrl + '/image/dongtai3-1.jpg',
     inputShowed: false,
     inputVal: "",
-
+    value: '知识产权',
     items: [],
-    count: 0,
+    count: 1000,
     scrollTop: 0,
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function(options) {
+  onLoad: function (options) {
     $startWuxRefresher();
+  },
+
+  showList: function () {
+    var that = this;
+    // wx.showLoading();
+    wx.request({
+      url: app.globalData.url + '/api/v1/searchLaw/caseSearch?page=1&size=' + this.data.count + '&words=' + this.data.value,
+      success: function (res) {
+        // wx.hideLoading();
+        console.log('res.data.data', res.data.data.data)
+        console.log('res', res)
+        if (res.data.code == 0) {
+          that.setData({
+            items: [...res.data.data.data]
+          })
+          $stopWuxRefresher()
+          $stopWuxLoader('#wux-refresher', this, true)
+        } else {
+          wx.showToast({
+            title: res.data.msg,
+          })
+        }
+      }
+    })
   },
   onPageScroll(e) {
     this.setData({
@@ -38,32 +62,23 @@
   onRefresh() {
     console.log('onRefresh')
 
-    this.setData({
-      count: 10
-    })
+    // this.setData({
+    //   count: 10
+    // })
 
-    setTimeout(() => {
-      this.setData({
-        items: this.getList()
-      })
-      $stopWuxRefresher()
-    }, 1000)
+    this.showList();
+
+
+    // setTimeout(() => {
+    //   this.setData({
+    //     items: this.getList()
+    //   })
+    //   $stopWuxRefresher()
+    // }, 1000)
   },
   onLoadmore() {
     console.log('onLoadmore')
-    setTimeout(() => {
-      this.setData({
-        items: [...this.data.items, ...this.getList(10, this.data.count)],
-        count: this.data.count + 10,
-      })
-
-      if (this.data.items.length < 30) {
-        $stopWuxLoader()
-      } else {
-        console.log('没有更多数据')
-        $stopWuxLoader('#wux-refresher', this, true)
-      }
-    }, 1000)
+    this.showList();
   },
 
   getList: (count = 10, step = 0) => [...new Array(count)].map((n, i) => ({
@@ -71,7 +86,7 @@
     content: 'Wux Weapp'
   })),
 
-  linkFunction: function(event) {
+  linkFunction: function (event) {
     var str = event.currentTarget.dataset['str'];
     var id = event.currentTarget.dataset['id'];
     wx.navigateTo({
@@ -79,21 +94,50 @@
     })
   },
 
-  showInput: function() {
+  showInput: function () {
     this.setData({
       inputShowed: true
     });
   },
 
-  hideInput: function() {
+  hideInput: function () {
     this.setData({
       inputVal: "",
       inputShowed: false
     });
   },
-  clearInput: function() {
+  clearInput: function () {
     this.setData({
       inputVal: ""
     }, () => {});
   },
+
+  onChange(e) {
+    console.log('onChange', e)
+    this.setData({
+      value: e.detail.value,
+    })
+  },
+  onFocus(e) {
+    console.log('onFocus', e)
+  },
+  onBlur(e) {
+    console.log('onBlur', e)
+    this.setData({
+      value: e.detail.value
+    })
+    this.showList();
+  },
+  onConfirm(e) {
+    console.log('onConfirm', e)
+  },
+  onClear(e) {
+    console.log('onClear', e)
+    this.setData({
+      value: '',
+    })
+  },
+  onCancel(e) {
+    console.log('onCancel', e)
+  },
 })
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.json b/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.json
index 375665e..72c3898 100644
--- a/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.json
+++ b/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.json
@@ -4,6 +4,7 @@
   "navigationBarBackgroundColor": "#fff",
   "navigationBarTextStyle": "black",
   "usingComponents": {
-    "wux-refresher": "../../templeteDist/wuxDist/refresher/index"
+    "wux-refresher": "../../templeteDist/wuxDist/refresher/index",
+    "wux-search-bar": "../../templeteDist/wuxDist/search-bar/index"
   }
 }
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.wxml b/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.wxml
index 2dad7b6..770ea7a 100644
--- a/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.wxml
+++ b/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.wxml
@@ -1,9 +1,13 @@
-<view class="cu-bar bg-white search solid-top fixed" style="top:{{CustomBar}}px">
+<!-- <view class="cu-bar bg-white search solid-top fixed" style="top:{{CustomBar}}px">
   <view class="search-form round">
     <text class="cuIcon-search"></text>
     <input type="text" placeholder="搜索" confirm-type="search" bindinput="searchIcon"></input>
+    <wux-search-bar clear value="{{ value }}" controlled placeholder="Search" bind:change="onChange" bind:focus="onFocus" bind:blur="onBlur" bind:confirm="onConfirm" bind:clear="onClear" bind:cancel="onCancel"/>
   </view>
-</view>
+</view> -->
+		<wux-search-bar class="zscqdxal-top" clear value="{{ value }}" controlled placeholder="搜索" bind:change="onChange" bind:focus="onFocus" bind:blur="onBlur" bind:confirm="onConfirm" bind:clear="onClear" bind:cancel="onCancel"/>
+		<!-- <wux-search-bar clear show-cancel value="{{ value }}" controlled placeholder="Search" bind:change="onChange" bind:focus="onFocus" bind:blur="onBlur" bind:confirm="onConfirm" bind:clear="onClear" bind:cancel="onCancel" /> -->
+
 
 <wux-refresher id="wux-refresher" bind:pulling="onPulling" bind:refresh="onRefresh" bind:loadmore="onLoadmore" scrollTop="{{scrollTop}}">
   <view class="weui-panel weui-panel_access">
@@ -11,14 +15,14 @@
       <view class="weui-media-box weui-media-box_text" wx:for="{{ items }}" wx:key="">
         <!-- <view class="weui-media-box__title weui-media-box__title_in-text">{{ item.title }}</view>
                 <view class="weui-media-box__desc">{{ item.content }}</view> -->
-        <view class="zhwj-b-main" data-str="zhdtInfo" data-id="1" bindtap='linkFunction'>
+        <view class="zhwj-b-main" data-str="zscqdxalInfo" data-id="{{item.case_id}}" bindtap='linkFunction'>
           <view class="zhwj-b-head-l">
-            <view class="zhwj-b-head-l-title text-black">南沙区院召开2019“沙鸥”法治宣讲团年度总结暨课件评选会</view>
-            <view class="text-grey">检察宣传部 60阅读</view>
+            <view class="zhwj-b-head-l-title text-black"><rich-text nodes="{{item.title}}"></rich-text></view>
+            <view class="text-grey">{{item.case_number}} | 裁决日期{{item.decide_date}}</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/zscqdxal/zscqdxal.wxss b/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.wxss
index 2092ffd..e4fadf1 100644
--- a/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.wxss
+++ b/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.wxss
@@ -1,9 +1,16 @@
 /* pages/dxal/dxal.wxss */
 @import '../../weui.wxss';
 
-page{
+page {
   margin-top: 130rpx;
   background: #f1f1f1;
+}
+
+.zscqdxal-top {
+  top: 0;
+  position: fixed;
+  width: 100%;
+
 }
 
 .weui-media-box {
@@ -35,4 +42,4 @@
 
 .zhwj-b {
   background-color: #fff;
-}
+}
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/zscqdxalInfo/zscqdxalInfo.js b/SunshineLnsMinApp/pages/zscqdxalInfo/zscqdxalInfo.js
new file mode 100644
index 0000000..84361dd
--- /dev/null
+++ b/SunshineLnsMinApp/pages/zscqdxalInfo/zscqdxalInfo.js
@@ -0,0 +1,47 @@
+// pages/zscqdxalInfo/zscqdxalInfo.js
+
+var app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    data: {},
+    ywsqjd: app.globalData.imgUrl +'/image/ywsqjd.svg',
+    fulltextList:[]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.showList(options.id)
+  },
+  showList: function (id) {
+    var that = this;
+    wx.showLoading();
+    wx.request({
+      url: app.globalData.url + '/api/v1/searchLaw/caseInfo?id=' + id,
+      success: function (res) {
+        wx.hideLoading();
+        console.log('data', res.data.data.data.fulltext)
+        console.log('res', res)
+        if (res.data.code == 0) {
+          that.setData({
+            data: res.data.data.data,
+            fulltextList:res.data.data.data.fulltext.filter((item)=>(item.tag !=='开始'&&item.tag!=='结束'))
+          })
+        } else {
+          wx.showToast({
+            title: res.data.msg,
+          })
+        }
+      }
+    })
+  },
+
+
+
+
+})
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/zscqdxalInfo/zscqdxalInfo.json b/SunshineLnsMinApp/pages/zscqdxalInfo/zscqdxalInfo.json
new file mode 100644
index 0000000..db88273
--- /dev/null
+++ b/SunshineLnsMinApp/pages/zscqdxalInfo/zscqdxalInfo.json
@@ -0,0 +1,12 @@
+{
+  "navigationBarTitleText": "典型案例详情",
+  "backgroundTextStyle": "light",
+  "navigationBarBackgroundColor": "#fff",
+  "navigationBarTextStyle": "black",
+  "usingComponents": {
+    "wux-refresher": "../../templeteDist/wuxDist/refresher/index",
+    "wux-search-bar": "../../templeteDist/wuxDist/search-bar/index",
+    "wux-cell-group": "../../templeteDist/wuxDist/cell-group/index",
+    "wux-cell": "../../templeteDist/wuxDist/cell/index"
+  }
+}
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/zscqdxalInfo/zscqdxalInfo.wxml b/SunshineLnsMinApp/pages/zscqdxalInfo/zscqdxalInfo.wxml
new file mode 100644
index 0000000..9d0d298
--- /dev/null
+++ b/SunshineLnsMinApp/pages/zscqdxalInfo/zscqdxalInfo.wxml
@@ -0,0 +1,25 @@
+<!--pages/zscqdxalInfo/zscqdxalInfo.wxml-->
+
+
+<view class="zhgk-main">
+	<view class=" text-lg" style="padding:30rpx 30rpx 0;">
+		<text class="zhgk-main-title text-black">{{data.title}}</text>
+	</view>
+	<!-- <view class=' text-df padding'> 2016年4月,南沙检察成立了未成年人检察工作办公室。2019年1月,我院成立“许淑妍命名检察官办公室”,适用“捕诉监防助”一体化工作模式,负责办理未成年人犯罪和侵害未成年人犯罪案件,开展未成年人司法保护和预防未成年人犯罪等工作。南沙检察以专业化办案为依托,以规范化建设为抓手,认真贯彻“教育、感化、挽救”方针,坚持“教育为主、惩罚为辅”原则,全面落实未成年人指定辩护、社会调查、心理评估、合适成年人等特别程序,不断打造未检新品牌。以社会化服务为路径,以多元化平台为支点,组建心理咨询师团队和社工团队,通过法治宣传大平台、两微一端、“沙鸥”法治宣讲团开展普法宣传,构建多维度的未成年人维权、犯罪预防网络。近年来,南沙检察先后获评全国青少年维权岗、全国检察机关未成年人检察工作联系点。队伍中涌现出全国检察机关未成年人检察业务竞赛能手和全市检察机关未成年人检察业务标兵。</view> -->
+	<view class=' text-df padding'>
+		<view class="zhgk-main"  wx:for="{{fulltextList}}">
+			<view class=" text-lg" style="padding:30rpx 30rpx 0;">
+				<text class="zhgk-main-title text-black">{{item.tag}}</text>
+			</view>
+			<view class="padding">
+				<view class=' text-df'> {{item.content}}</view>
+			</view>
+		</view>
+	</view>
+</view>
+
+
+<!-- <wux-cell-group title="{{item.tag}}" wx:for="{{fulltextList}}">
+	<wux-cell extra="{{item.content}}"></wux-cell>
+
+</wux-cell-group> -->
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/zscqdxalInfo/zscqdxalInfo.wxss b/SunshineLnsMinApp/pages/zscqdxalInfo/zscqdxalInfo.wxss
new file mode 100644
index 0000000..30bd389
--- /dev/null
+++ b/SunshineLnsMinApp/pages/zscqdxalInfo/zscqdxalInfo.wxss
@@ -0,0 +1,8 @@
+/* pages/zscqdxalInfo/zscqdxalInfo.wxss */
+.zhgk-main {
+  background-color: #fff;
+}
+
+.zhgk-main-title {
+  color: #249eff;
+}
\ No newline at end of file
diff --git a/SunshineLnsMinApp/project.config.json b/SunshineLnsMinApp/project.config.json
index 78b11fb..92c49a8 100644
--- a/SunshineLnsMinApp/project.config.json
+++ b/SunshineLnsMinApp/project.config.json
@@ -4,10 +4,13 @@
 		"urlCheck": false,
 		"es6": true,
 		"postcss": true,
+		"preloadBackgroundData": false,
 		"minified": true,
 		"newFeature": true,
 		"coverView": true,
 		"autoAudits": false,
+		"showShadowRootInWxmlPanel": true,
+		"scopeDataCheck": false,
 		"checkInvalidKey": true,
 		"checkSiteMap": true,
 		"uploadWithSourceMap": true,

--
Gitblit v1.8.0