From 69155bb24070e22789fceb34d14fe3311874126f Mon Sep 17 00:00:00 2001
From: liuwh <hugeinfo123>
Date: Tue, 09 Jun 2020 09:12:42 +0800
Subject: [PATCH] 提交
---
SunshineLnsMinApp/pages/xsuojb/xsuojb.wxml | 8 +-
SunshineIns/src/page/TopImage.jsx | 2
SunshineLnsMinApp/pages/wjjb/wjjb.wxml | 8 +-
SunshineLnsMinApp/pages/zhwj/zhwj.wxss | 3 +
SunshineLnsMinApp/pages/wjjb/wjjb.json | 2
SunshineLnsMinApp/pages/xsuojb/xsuojb.js | 7 +-
SunshineLnsMinApp/pages/zhdt/zhdt.wxml | 7 +-
SunshineIns/src/page/NoInspectionReportDetail.jsx | 91 ++++++++++++++----------------
SunshineLnsMinApp/pages/zhdt/zhdt.wxss | 4 +
9 files changed, 68 insertions(+), 64 deletions(-)
diff --git a/SunshineIns/src/page/NoInspectionReportDetail.jsx b/SunshineIns/src/page/NoInspectionReportDetail.jsx
index 0415e4e..a306d84 100644
--- a/SunshineIns/src/page/NoInspectionReportDetail.jsx
+++ b/SunshineIns/src/page/NoInspectionReportDetail.jsx
@@ -5,7 +5,7 @@
*/
import React from "react";
-import { Input, Button, message, Breadcrumb } from "antd";
+import { Input, Button, message, Breadcrumb, Row, Col } from "antd";
import moment from "moment";
import BusDetailView from "../view/BusDetailView";
import LineView from "../view/LineView";
@@ -113,42 +113,33 @@
<BusDetailView>
<div>
<LineView title="举报信息" style="14vh" lineHeight="34px">
- <table>
- <tbody>
- <tr>
- <td className="table-vaule1">举报对象</td>
- <td className="table-vaule2">{detail.tipoffObject}</td>
- <td className="table-vaule1">发生地</td>
- <td className="table-vaule2">{detail.tipoffAddress}</td>
- </tr>
- <tr>
- <td className="table-vaule3">举报类型</td>
- <td className="table-vaule4">{businessType(detail.businessType)}</td>
- </tr>
-
- <tr>
- <td className="table-vaule1">具体事项</td>
- <td className="table-vaule2">{detail.tipoffContent}</td>
- </tr>
- </tbody>
- </table>
+ <Row>
+ <Col span={6}>举报对象</Col>
+ <Col span={6}>{detail.tipoffObject}</Col>
+ <Col span={6}>发生地</Col>
+ <Col span={6}>{detail.tipoffAddress}</Col>
+ </Row>
+ <Row>
+ <Col span={6}>举报类型</Col>
+ <Col span={6}>{businessType(detail.businessType)}</Col>
+ </Row>
+ <Row>
+ <Col span={6}>具体事项</Col>
+ <Col span={6}>{detail.tipoffContent}</Col>
+ </Row>
</LineView>
<LineView title="举报人信息" style="14vh" lineHeight="34px">
- <table>
- <tbody>
- <tr>
- <td className="table-vaule1">姓名</td>
- <td className="table-vaule2">{detail.createrName}</td>
- <td className="table-vaule3">手机号码</td>
- <td className="table-vaule4">{detail.createrMobile}</td>
- </tr>
- <tr>
- <td className="table-vaule1">联系地址</td>
- <td className="table-vaule2">{detail.createrAddress}</td>
- </tr>
- </tbody>
- </table>
+ <Row>
+ <Col span={6}>姓名</Col>
+ <Col span={6}>{detail.createrName}</Col>
+ <Col span={6}>手机号码</Col>
+ <Col span={6}>{detail.createrMobile}</Col>
+ </Row>
+ <Row>
+ <Col span={6}>联系地址</Col>
+ <Col span={6}>{detail.createrAddress}</Col>
+ </Row>
</LineView>
</div>
@@ -172,26 +163,30 @@
{
detail.tipoffResult ?
<LineView title="回复记录" style="15vh">
- <table>
- <tbody>
- <tr>
- <td className="table-vaule1">回复人</td>
- <td className="table-vaule2">{detail.handlerName}</td>
- <td className="table-vaule3">回复时间</td>
- <td className="table-vaule4">{moment(detail.handleTime).format('YYYY/MM/DD HH:mm:ss')}</td>
- </tr>
- <tr>
- <td className="table-vaule1">回复内容</td>
- <td className="table-vaule2">{detail.tipoffResult}</td>
- </tr>
- </tbody>
- </table>
+ <Row>
+ <Col span={6}>回复人</Col>
+ <Col span={6}>{detail.handlerName}</Col>
+ <Col span={6}>回复时间</Col>
+ <Col span={6}>{moment(detail.handleTime).format('YYYY/MM/DD HH:mm:ss')}</Col>
+ </Row>
+ <Row>
+ <Col span={6}>回复内容</Col>
+ <Col span={6}>{detail.tipoffResult}</Col>
+ </Row>
</LineView>
: null}
{
flag == "do" ?
(detail.status == 1 ? (
<LineView title="回复" lineHeight="50px">
+ {/* <Row>
+ <Col span={6}>回复内容</Col>
+ <Col span={12}> <TextArea
+ placeholder="请输入回复内容"
+ autosize={{ minRows: 2, maxRows: 6 }}
+ onChange={({ target: { value } }) => this.onInputChange({ target: { name: 'result', value } })}
+ /></Col>
+ </Row> */}
<table>
<tbody>
<tr>
diff --git a/SunshineIns/src/page/TopImage.jsx b/SunshineIns/src/page/TopImage.jsx
index 383e0cb..04c8a7a 100644
--- a/SunshineIns/src/page/TopImage.jsx
+++ b/SunshineIns/src/page/TopImage.jsx
@@ -83,7 +83,7 @@
<div className="top-image-main" style={{ background: '#fff', margin: 20 }}>
<div style={divStyle}>
<Breadcrumb>
- <Breadcrumb.Item>顶不图片设置</Breadcrumb.Item>
+ <Breadcrumb.Item>顶部图片设置</Breadcrumb.Item>
</Breadcrumb>
<Row type="flex" align='middle'>
<Col span={18} push={0} >
diff --git a/SunshineLnsMinApp/pages/wjjb/wjjb.json b/SunshineLnsMinApp/pages/wjjb/wjjb.json
index a84e3f9..e9476b6 100644
--- a/SunshineLnsMinApp/pages/wjjb/wjjb.json
+++ b/SunshineLnsMinApp/pages/wjjb/wjjb.json
@@ -1,6 +1,6 @@
{
"usingComponents": {},
- "navigationBarTitleText": "未检举报",
+ "navigationBarTitleText": "我要举报",
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black"
diff --git a/SunshineLnsMinApp/pages/wjjb/wjjb.wxml b/SunshineLnsMinApp/pages/wjjb/wjjb.wxml
index f69e7ef..e3d6141 100644
--- a/SunshineLnsMinApp/pages/wjjb/wjjb.wxml
+++ b/SunshineLnsMinApp/pages/wjjb/wjjb.wxml
@@ -3,7 +3,7 @@
<image class="index-icon" src="{{jb_background}}"></image>
</view>
<view class="paddingtop-12">
- <view class="wjjb-button" data-str="xsjb" bindtap='linkFunction'>
+ <view class="wjjb-button" data-str="xsjb" bindtap='makePhoneCall'>
<view class="wjjb-button-l">
<view class="wjjb-button-l-large-size">电话举报</view>
<view class="wjjb-button-l-s-size">一键拨打检察院官方举报电话</view>
@@ -17,9 +17,9 @@
<view class="paddingtop-12">
<view class="wjjb-button zise" data-str="xsjb" bindtap='linkFunction'>
<view class="wjjb-button-l">
- <view class="wjjb-button-l-large-size">电话举报</view>
- <view class="wjjb-button-l-s-size">一键拨打检察院官方举报电话</view>
- <view class="wjjb-button-l-button color_zise">立即拨打</view>
+ <view class="wjjb-button-l-large-size">人工举报</view>
+ <view class="wjjb-button-l-s-size">微信提交举报内容等待检查反馈</view>
+ <view class="wjjb-button-l-button color_zise">在线提交</view>
</view>
<view class="wjjb-button-r">
<image class="wjjb-button-r-img" src="{{jb_person}}"></image>
diff --git a/SunshineLnsMinApp/pages/xsuojb/xsuojb.js b/SunshineLnsMinApp/pages/xsuojb/xsuojb.js
index aa9fd38..48a0391 100644
--- a/SunshineLnsMinApp/pages/xsuojb/xsuojb.js
+++ b/SunshineLnsMinApp/pages/xsuojb/xsuojb.js
@@ -1,13 +1,14 @@
// pages/wjjb/wjjb.js
+var app = getApp();
Page({
/**
* 页面的初始数据
*/
data: {
- jb_background: './../../lib/jb_background.png',
- jb_person: './../../lib/jb_person.png',
- jb_phone: './../../lib/jb_phone.png',
+ jb_background: app.globalData.imgUrl + '/image/jb_background.png',
+ jb_person: app.globalData.imgUrl + '/image/jb_person.png',
+ jb_phone: app.globalData.imgUrl + '/image/jb_phone.png',
},
/**
diff --git a/SunshineLnsMinApp/pages/xsuojb/xsuojb.wxml b/SunshineLnsMinApp/pages/xsuojb/xsuojb.wxml
index f69e7ef..e3d6141 100644
--- a/SunshineLnsMinApp/pages/xsuojb/xsuojb.wxml
+++ b/SunshineLnsMinApp/pages/xsuojb/xsuojb.wxml
@@ -3,7 +3,7 @@
<image class="index-icon" src="{{jb_background}}"></image>
</view>
<view class="paddingtop-12">
- <view class="wjjb-button" data-str="xsjb" bindtap='linkFunction'>
+ <view class="wjjb-button" data-str="xsjb" bindtap='makePhoneCall'>
<view class="wjjb-button-l">
<view class="wjjb-button-l-large-size">电话举报</view>
<view class="wjjb-button-l-s-size">一键拨打检察院官方举报电话</view>
@@ -17,9 +17,9 @@
<view class="paddingtop-12">
<view class="wjjb-button zise" data-str="xsjb" bindtap='linkFunction'>
<view class="wjjb-button-l">
- <view class="wjjb-button-l-large-size">电话举报</view>
- <view class="wjjb-button-l-s-size">一键拨打检察院官方举报电话</view>
- <view class="wjjb-button-l-button color_zise">立即拨打</view>
+ <view class="wjjb-button-l-large-size">人工举报</view>
+ <view class="wjjb-button-l-s-size">微信提交举报内容等待检查反馈</view>
+ <view class="wjjb-button-l-button color_zise">在线提交</view>
</view>
<view class="wjjb-button-r">
<image class="wjjb-button-r-img" src="{{jb_person}}"></image>
diff --git a/SunshineLnsMinApp/pages/zhdt/zhdt.wxml b/SunshineLnsMinApp/pages/zhdt/zhdt.wxml
index 05ed8d4..8177473 100644
--- a/SunshineLnsMinApp/pages/zhdt/zhdt.wxml
+++ b/SunshineLnsMinApp/pages/zhdt/zhdt.wxml
@@ -1,6 +1,6 @@
<!--pages/zhdt/zhdt.wxml-->
<!-- 搜索 -->
- <!-- <view class="lawsList-search">
+<!-- <view class="lawsList-search">
<view class="page">
<view class="page__bd">
<view class="weui-search-bar">
@@ -24,10 +24,11 @@
</view> -->
<!-- <view class="index-gray "></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-main" wx:for="{{ dataSet }}" style="height:58px" 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 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>
diff --git a/SunshineLnsMinApp/pages/zhdt/zhdt.wxss b/SunshineLnsMinApp/pages/zhdt/zhdt.wxss
index 78ed655..5b396fd 100644
--- a/SunshineLnsMinApp/pages/zhdt/zhdt.wxss
+++ b/SunshineLnsMinApp/pages/zhdt/zhdt.wxss
@@ -16,6 +16,10 @@
width: 100%;
}
+.zhwj-b-head-l-title {
+ font-weight: 600
+}
+
.zhwj-b-head-r {
margin: 6px;
}
diff --git a/SunshineLnsMinApp/pages/zhwj/zhwj.wxss b/SunshineLnsMinApp/pages/zhwj/zhwj.wxss
index 8944066..b3f7afb 100644
--- a/SunshineLnsMinApp/pages/zhwj/zhwj.wxss
+++ b/SunshineLnsMinApp/pages/zhwj/zhwj.wxss
@@ -67,6 +67,8 @@
.zhwj-b-main {
display: flex;
border-bottom: 1px solid #ebf2fa;
+ height: 58px;
+
}
.zhwj-b-head-l {
@@ -79,6 +81,7 @@
}
.zhwj-b-head-l-title {
+ font-weight: 600
}
.zhwj-b-head-l-title-t {
--
Gitblit v1.8.0