From ec511e31e01a195bfea5145f9e7e929a68cd9f7e Mon Sep 17 00:00:00 2001
From: liuwh <hugeinfo123>
Date: Wed, 25 Mar 2020 01:05:55 +0800
Subject: [PATCH] 提交
---
SunshineIns/src/page/LawSubscribeDetail.jsx | 2
SunshineLnsMinApp/pages/pfyy/pfyy.js | 43 ++++
SunshineLnsMinApp/pages/rzcx/rzcx.wxss | 25 ++
SunshineLnsMinApp/pages/rzcx/rzcx.wxml | 97 +++++++--
SunshineLnsMinApp/pages/rzcx/rzcx.js | 26 +-
SunshineIns/src/page/ActiveManageEdit.jsx | 8
SunshineIns/src/page/NoInspectionReportDetail.jsx | 13
SunshineIns/src/page/ApplyForEdit.jsx | 3
SunshineIns/src/page/QuestionDetail.jsx | 15 +
SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxss | 33 +++
SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml | 204 ++++++++++---------
SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js | 54 +++-
SunshineLnsMinApp/pages/pfyy/pfyy.wxml | 33 +++
SunshineIns/src/page/LawSubscribe.jsx | 2
SunshineLnsMinApp/app.js | 4
SunshineLnsMinApp/pages/xsjb/xsjb.wxml | 4
SunshineIns/src/page/ArticleEidt.jsx | 10
SunshineLnsMinApp/pages/xsjb/xsjb.js | 7
18 files changed, 412 insertions(+), 171 deletions(-)
diff --git a/SunshineIns/src/page/ActiveManageEdit.jsx b/SunshineIns/src/page/ActiveManageEdit.jsx
index 00ccef8..54d86a0 100644
--- a/SunshineIns/src/page/ActiveManageEdit.jsx
+++ b/SunshineIns/src/page/ActiveManageEdit.jsx
@@ -164,7 +164,7 @@
questionnaireCancle = () => {
- const {selectedQuestionnaireData}=this.state;
+ const { selectedQuestionnaireData } = this.state;
// this.props.history.push(`/questionnaire/detail/${selectedQuestionnaireData.id}`)
window.open('index.html#/activeManageEditquestionnaire/' + selectedQuestionnaireData.id);
}
@@ -730,6 +730,12 @@
</Modal>
</Col>
</Row>
+ <Row type="flex" align='top' justify="space-around">
+ <Col span={6} pull={0} style={{ textAlign: 'center' }}><span>培训结果</span></Col>
+ <Col span={18} push={0} >
+ <span>{savedate.result}</span>
+ </Col>
+ </Row>
</div>
</div> : null) : null
diff --git a/SunshineIns/src/page/ApplyForEdit.jsx b/SunshineIns/src/page/ApplyForEdit.jsx
index bd5a04b..66dbb56 100644
--- a/SunshineIns/src/page/ApplyForEdit.jsx
+++ b/SunshineIns/src/page/ApplyForEdit.jsx
@@ -69,7 +69,7 @@
},
disabled: res.status ? true : false,
loading: false,
- fileList: res.list ? res.list.map((item, index) => ({ uid: index, id: item.id, name: item.name, status: 'done', url: domain + `/api/v1/attachment/download/${item.id}?online=false` })) : []
+ fileList: res.list ? res.list.map((item, index) => ({ uid: item.uid, id: item.uid, name: item.name, status: 'done', url: domain + `/api/v1/attachment/download/${item.uid}?online=false` })) : []
});
})
@@ -242,6 +242,7 @@
},
fileList: fileList,
onDownload: (file) => {
+ console.log(file)
Fetch.attachmentDownload(file.uid)
.then(res => {
message.success("下载成功！");
diff --git a/SunshineIns/src/page/ArticleEidt.jsx b/SunshineIns/src/page/ArticleEidt.jsx
index 4932e77..51588eb 100644
--- a/SunshineIns/src/page/ArticleEidt.jsx
+++ b/SunshineIns/src/page/ArticleEidt.jsx
@@ -89,6 +89,10 @@
const list = this.state.selectedRow.map(({ id }) => id);
const { savedate } = this.state;
savedate.list = list;
+ if (!savedate.channelIdd) {
+ message.warning("请选择信息分类");
+ return;
+ }
Fetch.saveArticle(savedate)
.then(res => {
if (res.statuscode === 1) {
@@ -220,9 +224,9 @@
<div className="app-page">
<HeadView history={this.props.history} />
<Breadcrumb style={{ padding: '20px' }}>
- <Breadcrumb.Item><a href="index.html#/articlePublish">信息发布</a></Breadcrumb.Item>
- <Breadcrumb.Item>信息公布详情</Breadcrumb.Item>
- </Breadcrumb>
+ <Breadcrumb.Item><a href="index.html#/articlePublish">信息发布</a></Breadcrumb.Item>
+ <Breadcrumb.Item>信息公布详情</Breadcrumb.Item>
+ </Breadcrumb>
<BusDetailView type='信息添加' >
<div style={divStyle}>
<Row type="flex" align='middle' justify="space-around">
diff --git a/SunshineIns/src/page/LawSubscribe.jsx b/SunshineIns/src/page/LawSubscribe.jsx
index ea15bff..9d939fb 100644
--- a/SunshineIns/src/page/LawSubscribe.jsx
+++ b/SunshineIns/src/page/LawSubscribe.jsx
@@ -141,7 +141,7 @@
<Divider type="vertical" />
</span> : null
}
- <label className='theme-color' onClick={() => this.onClick(record.id, 'see')} style={{ cursor: 'pointer' }}>查看</label>
+ <label className='theme-color' onClick={() => this.onClick(record.id, 'do')} style={{ cursor: 'pointer' }}>查看</label>
</span>
),
}];
diff --git a/SunshineIns/src/page/LawSubscribeDetail.jsx b/SunshineIns/src/page/LawSubscribeDetail.jsx
index 098b53f..77976e7 100644
--- a/SunshineIns/src/page/LawSubscribeDetail.jsx
+++ b/SunshineIns/src/page/LawSubscribeDetail.jsx
@@ -176,7 +176,7 @@
</LineView>
: null}
{flag == "do" ?
- (data.status == 1 ? (
+ (data.status ? (
<LineView title="回复" lineHeight="50px">
<table>
<tbody>
diff --git a/SunshineIns/src/page/NoInspectionReportDetail.jsx b/SunshineIns/src/page/NoInspectionReportDetail.jsx
index 753673c..10fb38a 100644
--- a/SunshineIns/src/page/NoInspectionReportDetail.jsx
+++ b/SunshineIns/src/page/NoInspectionReportDetail.jsx
@@ -11,6 +11,7 @@
import LineView from "../view/LineView";
import HeadView from "../view/HeadView";
import Fetch from "../fetch";
+import {domain} from "../fetch/_fetch";
const { TextArea } = Input;
const replyAdmin = {
display: 'block',
@@ -116,12 +117,10 @@
<tr>
<td className="table-vaule1">举报对象</td>
<td className="table-vaule2">{detail.tipoffObject}</td>
- <td className="table-vaule3">举报行为</td>
- <td className="table-vaule4">{detail.tipoffAction}</td>
- </tr>
- <tr>
<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.tipoffType)}</td>
</tr>
@@ -159,10 +158,10 @@
(
data.type != 21 ?
< div style={{ marginRight: "10px" }} key={key}>
- <a href={data.path} target='_black'> <img src={data.path} width='70' height='70' /></a>
+ <a href={domain + 'api/v1/attachment/image/'+data.id} target='_black'> <img src={domain + 'api/v1/attachment/image/'+data.id} width='70' height='70' /></a>
</div>
: < div style={{ marginRight: "10px" }} key={key}>
- <a href={data.path} target='_black'><video src={data.path} width='70' height='70'></video></a>
+ <a href={domain + 'api/v1/attachment/image/'+data.id} target='_black'><video src={domain + 'api/v1/attachment/image/'+data.id} width='70' height='70'></video></a>
</div>
)
))
@@ -250,3 +249,5 @@
return '暂无';
}
}
+
+
diff --git a/SunshineIns/src/page/QuestionDetail.jsx b/SunshineIns/src/page/QuestionDetail.jsx
index 85413ad..ffce5d7 100644
--- a/SunshineIns/src/page/QuestionDetail.jsx
+++ b/SunshineIns/src/page/QuestionDetail.jsx
@@ -106,7 +106,7 @@
问卷描述：{initData.content || '暂无'}
</h4>
<h4 style={{ marginBottom: 0 }}>
- 业务类型：{initData.businessType || '暂无'}
+ 业务类型：{typeStatus( ) || '暂无'}
</h4>
</div>
</div>
@@ -123,3 +123,16 @@
}
}
+
+function typeStatus(type) {
+ switch (type) {
+ case 1:
+ return "企业体检";
+ case 2:
+ return "培训活动";
+ case 3:
+ return "未检调查";
+ case 4:
+ return "刑执监督";
+ }
+}
diff --git a/SunshineLnsMinApp/app.js b/SunshineLnsMinApp/app.js
index 5ba6922..629c510 100644
--- a/SunshineLnsMinApp/app.js
+++ b/SunshineLnsMinApp/app.js
@@ -10,8 +10,8 @@
globalData: {
userInfo: null,
pageData: {},
- url: 'https://nsjcy.hugeinfo.com.cn/nsjc-charge',
- // url: 'http://1p885086k1.iok.la/nsjc-charge',
+ // url: 'https://nsjcy.hugeinfo.com.cn/nsjc-charge',
+ url: 'http://1p885086k1.iok.la/nsjc-charge',
// url: 'http://192.168.0.31:8085/nsjc-charge',
imgUrl: 'https://nsjcy.hugeinfo.com.cn/nsjc-charge',
// url: 'http://nsjc.vaiwan.com/nsjc-charge',
diff --git a/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js b/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js
index 4704e66..934abec 100644
--- a/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js
+++ b/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js
@@ -9,18 +9,20 @@
* 页面的初始数据
*/
data: {
+ user: app.globalData.imgUrl + '/image/user.svg',
loading: false,
peopleInfo: {},
signStatus: '',
id: "",
- topattList:[],
- bottomattList:[]
+ topattList: [],
+ bottomattList: [],
+ statequeId: ''
},
/**
* 生命周期函数--监听页面加载
*/
- onLoad: function (options) {
+ onLoad: function(options) {
var that = this;
that.setData({
id: options.id,
@@ -33,7 +35,7 @@
})
wx.request({
url: app.globalData.url + '/api/activity/find?id=' + options.id,
- success: function (res) {
+ success: function(res) {
console.log(res);
that.setData({
loading: false
@@ -41,10 +43,21 @@
wx.hideLoading();
if (res.data.code == 0) {
res.data.data.startTime = app.formatDate(res.data.data.startTime)
+ if (res.data.data.activityStatus == 3) {
+ if (res.data.data.queId) {
+ that.setData({
+ statequeId: res.data.data.queId
+ })
+ }
+ } else {
+ that.setData({
+ statequeId: ''
+ })
+ }
that.setData({
activity: res.data.data,
- bottomattList:res.data.data.attList.filter((item)=>(item.associateType==1020)),
- topattList:res.data.data.attList.filter((item)=>(item.associateType==1000))
+ bottomattList: res.data.data.attList.filter((item) => (item.associateType == 1020)),
+ topattList: res.data.data.attList.filter((item) => (item.associateType == 1000))
})
console.log('传过来', options.flag)
console.log('传过来', options.signStatus)
@@ -53,7 +66,8 @@
that.setData({
signStatus: options.signStatus
})
- } else {sign
+ } else {
+ sign
if (options.flag == 'true') {
//可报名
console.log('可报名')
@@ -98,7 +112,7 @@
},
// 跳转
- linkFunction: function () {
+ linkFunction: function() {
wx.showToast({
title: '抱歉，报名人数已满',
icon: 'none',
@@ -107,14 +121,22 @@
},
// 呼叫组织方
- makePhoneCall: function (e) {
+ makePhoneCall: function(e) {
var phone = e.currentTarget.dataset['phone'];
wx.makePhoneCall({
phoneNumber: phone
})
},
- inputChange: function (e) {
+ //跳转问卷调查
+ businessSchedule: function(e) {
+ var id = e.currentTarget.dataset['id'];
+ wx.navigateTo({
+ url: '/pages/createSub/createSub?id=' + id,
+ })
+ },
+
+ inputChange: function(e) {
var name = e.currentTarget.dataset.name;
this.setData({
peopleInfo: {
@@ -125,7 +147,7 @@
},
// 签到
- sign: function () {
+ sign: function() {
var id = this.data.id;
var userinfo = wx.getStorageSync("user");
var userId = userinfo.id;
@@ -138,12 +160,12 @@
title: '识别中',
})
wx.request({
- url: app.globalData.url + '/api/activity/sign?id='+id+'&code='+res.result+'&userId='+userId,
+ url: app.globalData.url + '/api/activity/sign?id=' + id + '&code=' + res.result + '&userId=' + userId,
method: 'GET',
header: {
"Content-Type": "application/json"
},
- success: function (res) {
+ success: function(res) {
wx.hideLoading();
if (res.data.code == 0) {
wx.showToast({
@@ -164,14 +186,14 @@
},
// 返回
- goBack: function () {
+ goBack: function() {
wx.navigateBack({
delta: 1
});
},
// 提交报名
- submit: function () {
+ submit: function() {
var peopleInfo = this.data.peopleInfo;
var userinfo = wx.getStorageSync("user");
var personId = userinfo.id;
@@ -209,7 +231,7 @@
header: {
"Content-Type": "application/json"
},
- success: function (res) {
+ success: function(res) {
wx.hideLoading();
if (res.data.code == 0) {
wx.reLaunch({
diff --git a/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml b/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml
index 08fa44b..2df5591 100644
--- a/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml
+++ b/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml
@@ -1,116 +1,124 @@
<!--pages/fzpxInfo/fzpxInfo.wxml-->
<view class="fzpxInfo-bg" wx:if="{{!loading}}">
- <view class="flex1">
- <swiper class="screen-swiper square-dot" indicator-dots="true" circular="true" autoplay="true" interval="5000" duration="500">
- <swiper-item wx:for="{{topattList}}" wx:key>
- <image src="{{item.imgPath}}" mode="aspectFill"></image>
- <!-- <video src="{{item.url}}" autoplay loop muted show-play-btn="{{false}}" controls="{{false}}" objectFit="cover" wx:if="{{item.type=='video'}}"></video> -->
- </swiper-item>
- </swiper>
+ <view class="flex1">
+ <swiper class="screen-swiper square-dot" indicator-dots="true" circular="true" autoplay="true" interval="5000" duration="500">
+ <swiper-item wx:for="{{topattList}}" wx:key>
+ <image src="{{item.imgPath}}" mode="aspectFill"></image>
+ <!-- <video src="{{item.url}}" autoplay loop muted show-play-btn="{{false}}" controls="{{false}}" objectFit="cover" wx:if="{{item.type=='video'}}"></video> -->
+ </swiper-item>
+ </swiper>
- <view class="fzpxInfo-main">
- <view class="fzpxInfo-main-t">{{activity.activityTitle}}</view>
- <view class="fzpxInfo-main-group">
- <view class="fzpxInfo-main-group-title">培训时间</view>
- <view class="fzpxInfo-main-group-around">{{activity.startTime}}</view>
- </view>
- <view class="fzpxInfo-main-group">
- <view class="fzpxInfo-main-group-title">报名人数</view>
- <view class="fzpxInfo-main-group-around">{{activity.activityPersonNum}}/{{activity.activityPersonQuota}}人</view>
- </view>
- <view class="fzpxInfo-main-group">
- <view class="fzpxInfo-main-group-title">培训地点</view>
- <view class="fzpxInfo-main-group-around">{{activity.activityAddress}}</view>
- </view>
- <view class="fzpxInfo-main-group">
- <view class="fzpxInfo-main-group-title">组织方</view>
- <view style="display: flex; line-height:48rpx;">
- <view class="fzpxInfo-main-group-around">{{activity.host || '无'}}</view>
- <text class="cuIcon-dianhua lg text-blue margin-left" data-phone="{{activity.activityPhone}}" bindtap="makePhoneCall"></text>
- </view>
- </view>
- <view class="fzpxInfo-main-group">
- <view class="fzpxInfo-main-group-title">报名要求</view>
- <view class="fzpxInfo-main-group-around">{{activity.requirement}}</view>
- </view>
- <view class="fzpxInfo-main-group">
- <view class="fzpxInfo-main-group-title">培训进程</view>
- <view class="fzpxInfo-main-group-around">
- <rich-text nodes="{{activity.course||'暂无'}}"></rich-text></view>
- </view>
- <view class="fzpxInfo-main-group" style="display:block;padding: 10rpx 30rpx;">
- <view class="fzpxInfo-main-group-title">培训内容</view>
- <view>
- <view class="fzpxInfo-main-group-around">{{activity.activityDesc}}</view>
- </view>
- </view>
+ <view class="fzpxInfo-main">
+ <view class="fzpxInfo-main-t">{{activity.activityTitle}}</view>
+ <view class="fzpxInfo-main-group">
+ <view class="fzpxInfo-main-group-title">培训时间</view>
+ <view class="fzpxInfo-main-group-around">{{activity.startTime}}</view>
+ </view>
+ <view class="fzpxInfo-main-group">
+ <view class="fzpxInfo-main-group-title">报名人数</view>
+ <view class="fzpxInfo-main-group-around">{{activity.activityPersonNum}}/{{activity.activityPersonQuota}}人</view>
+ </view>
+ <view class="fzpxInfo-main-group">
+ <view class="fzpxInfo-main-group-title">培训地点</view>
+ <view class="fzpxInfo-main-group-around">{{activity.activityAddress}}</view>
+ </view>
+ <view class="fzpxInfo-main-group">
+ <view class="fzpxInfo-main-group-title">组织方</view>
+ <view style="display: flex; line-height:48rpx;">
+ <view class="fzpxInfo-main-group-around">{{activity.host || '无'}}</view>
+ <text class="cuIcon-dianhua lg text-blue margin-left" data-phone="{{activity.activityPhone}}" bindtap="makePhoneCall"></text>
+ </view>
+ </view>
+ <view class="fzpxInfo-main-group">
+ <view class="fzpxInfo-main-group-title">报名要求</view>
+ <view class="fzpxInfo-main-group-around">{{activity.requirement}}</view>
+ </view>
+ <view class="fzpxInfo-main-group">
+ <view class="fzpxInfo-main-group-title">培训进程</view>
+ <view class="fzpxInfo-main-group-around">
+ <rich-text nodes="{{activity.course||'暂无'}}"></rich-text>
+ </view>
+ </view>
+ <view class="fzpxInfo-main-group" style="display:block;padding: 10rpx 30rpx;">
+ <view class="fzpxInfo-main-group-title">培训内容</view>
+ <view>
+ <view class="fzpxInfo-main-group-around">{{activity.activityDesc}}</view>
+ </view>
+ </view>
- <view wx:if="{{activity.result}}" class="fzpxInfo-main-group">
- <view class="fzpxInfo-main-group-title">培训结果</view>
- <view class="fzpxInfo-main-group-around">{{activity.result}}</view>
- </view>
+ <view class="fzpxInfo-main-group" wx:if="{{statequeId}}" data-id="{{statequeId}}" bindtap='businessSchedule'>
+ <view class="fzpxInfo-main-group-title">问卷调查</view>
+ <view style="display: flex; line-height:48rpx;">
+ <image class="index-pane-icon " src="{{user}} " />
+ </view>
+ </view>
- <view wx:if="{{activity.result}}" class="fzpxInfo-main-group">
- <view class="fzpxInfo-main-group-title">培训材料</view>
- <view class="fzpxInfo-main-group-around" style="display:flex;flex-wrap: wrap">
- <view class="educt_hasupload_pic" wx:for="{{bottomattList}}" wx:key="index">
- <image src="{{item.imgPath}}" class="upload"></image>
- </view>
- </view>
- </view>
- </view>
+ <view wx:if="{{activity.result}}" class="fzpxInfo-main-group">
+ <view class="fzpxInfo-main-group-title">培训结果</view>
+ <view class="fzpxInfo-main-group-around">{{activity.result}}</view>
+ </view>
- <block wx:if="{{activity.activityStatus == 1 && flag == 'true'}}">
- <view class="sub-title">报名信息</view>
- <form>
- <view class="cu-form-group">
- <view class="title">姓名
- <span style="color: red;">*</span>
- </view>
- <input placeholder="请输入姓名" data-name="proposerName" bindinput="inputChange" value='{{peopleInfo.proposerName}}'></input>
- </view>
- <view class="cu-form-group">
- <view class="title">电话号码
- <span style="color: red;">*</span>
- </view>
- <input placeholder="请输入电话号码" data-name="proposerPhone" bindinput="inputChange" value='{{peopleInfo.proposerPhone}}'></input>
- </view>
- </form>
- </block>
+ <view wx:if="{{activity.result}}" class="fzpxInfo-main-group">
+ <view class="fzpxInfo-main-group-title">培训材料</view>
+ <view class="fzpxInfo-main-group-around" style="display:flex;flex-wrap: wrap">
+ <view class="educt_hasupload_pic" wx:for="{{bottomattList}}" wx:key="index">
+ <image src="{{item.imgPath}}" class="upload"></image>
+ </view>
+ </view>
+ </view>
+ </view>
- </view>
+ <block wx:if="{{activity.activityStatus == 1 && flag == 'true'}}">
+ <view class="sub-title">报名信息</view>
+ <form>
+ <view class="cu-form-group">
+ <view class="title">姓名
+ <span style="color: red;">*</span>
+ </view>
+ <input placeholder="请输入姓名" data-name="proposerName" bindinput="inputChange" value='{{peopleInfo.proposerName}}'></input>
+ </view>
+ <view class="cu-form-group">
+ <view class="title">电话号码
+ <span style="color: red;">*</span>
+ </view>
+ <input placeholder="请输入电话号码" data-name="proposerPhone" bindinput="inputChange" value='{{peopleInfo.proposerPhone}}'></input>
+ </view>
+ </form>
+ </block>
- <view class="fzpxInfo-foot margin-top">
- <view wx:if="{{signStatus}}">
- <view wx:if="{{signStatus == 2}}">
- <view class="fzpxInfo-foot-button bg-grey" bindtap='sign'>签到</view>
- </view>
+ </view>
- <view wx:else>
- <view class="fzpxInfo-foot-button bg-grey" bindtap='goBack'>返回</view>
- </view>
- </view>
+ <view class="fzpxInfo-foot margin-top">
+ <view wx:if="{{signStatus}}">
+ <view wx:if="{{signStatus == 2}}">
+ <view class="fzpxInfo-foot-button bg-grey" bindtap='sign'>签到</view>
+ </view>
- <view wx:else>
- <!-- <view class="fzpxInfo-foot-title">报名须知</view>
+ <view wx:else>
+ <view class="fzpxInfo-foot-button bg-grey" bindtap='goBack'>返回</view>
+ </view>
+ </view>
+
+ <view wx:else>
+ <!-- <view class="fzpxInfo-foot-title">报名须知</view>
<view class="fzpxInfo-foot-txt">请确认所有参赛人员的排列顺序。相关信息会在参赛证件、参赛证明、获取证书等重要比赛文件中提现。</view>
<view class="fzpxInfo-foot-txt">由于参赛队信息填报原因产生的任何错误，在相关文件完成制作后一律不予修改；</view> -->
- <view wx:if="{{flag == 'false'}}">
- <view class="fzpxInfo-foot-button bg-grey">您已报名</view>
- </view>
- <view wx:if="{{flag == 'true'}}">
+ <view wx:if="{{flag == 'false'}}">
+ <view class="fzpxInfo-foot-button bg-grey">您已报名</view>
+ </view>
+ <view wx:if="{{flag == 'true'}}">
- <view class="fzpxInfo-foot-button bg-blue" wx:if="{{activity.activityStatus == 1}}" bindtap='submit'>我要报名</view>
- <view class="fzpxInfo-foot-button bg-blue" wx:elif="{{activity.activityStatus == 2}}">活动正在进行</view>
- <view class="fzpxInfo-foot-button bg-grey" wx:elif="{{activity.activityStatus == 3}}">活动已结束</view>
- <view class="fzpxInfo-foot-button bg-grey" wx:else>报名人数已满</view>
+ <view class="fzpxInfo-foot-button bg-blue" wx:if="{{activity.activityStatus == 1}}" bindtap='submit'>我要报名</view>
+ <view class="fzpxInfo-foot-button bg-blue" wx:elif="{{activity.activityStatus == 2}}">活动正在进行</view>
+ <view class="fzpxInfo-foot-button bg-grey" wx:elif="{{activity.activityStatus == 3}}">活动已结束</view>
+ <view class="fzpxInfo-foot-button bg-grey" wx:else>报名人数已满</view>
- </view>
- </view>
+ </view>
+ </view>
- <view>
+ <view>
- </view>
- </view>
+ </view>
+ </view>
</view>
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxss b/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxss
index 014d402..c9f50a5 100644
--- a/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxss
+++ b/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxss
@@ -6,6 +6,39 @@
background-color: #f1f1f1;
}
+.guide-all-list {
+ display: flex;
+ flex-direction: column;
+ padding: 2vh;
+ border-bottom: 1px solid #f2f2f2;
+}
+
+.guide-all-list-top {
+ font-size: 16px;
+ color: #333;
+}
+
+.guide-all-list-bottom {
+ font-size: 14px;
+ color: #999;
+ display: flex;
+ margin-top: 1vh;
+}
+
+.guide-all-list-left {
+ margin-right: auto;
+}
+
+.guide-all-list-right {
+ width: 3vh;
+ height: 3vh;
+}
+.index-pane-icon {
+ width: 16px;
+ height: 16px;
+ float:right;
+}
+
.fzpxInfo-bg {
background-color: #f1f1f1;
height: 100%;
diff --git a/SunshineLnsMinApp/pages/pfyy/pfyy.js b/SunshineLnsMinApp/pages/pfyy/pfyy.js
index d859116..37a4b35 100644
--- a/SunshineLnsMinApp/pages/pfyy/pfyy.js
+++ b/SunshineLnsMinApp/pages/pfyy/pfyy.js
@@ -13,7 +13,8 @@
id: '',
picType: '',
evalList: {},
- picturesInfo: {}
+ picturesInfo: {},
+ ReplyLogs:[]
},
/**
@@ -30,12 +31,14 @@
success: function (res) {
console.log(res.data.data.lawAppointment)
if (res.data.code == 0) {
+ var data1 = res.data.data.ReplyLogs || [];
that.setData({
picturesInfo: {
...res.data.data.lawAppointment,
createId: userinfo.id,
activitiesTime: app.formatDateday(res.data.data.lawAppointment.activitiesTime)
},
+ ReplyLogs: data1,
disabled
})
} else {
@@ -59,6 +62,44 @@
},
+ reply: function (e) {
+ var that = this;
+ var openId = wx.getStorageSync("openId")
+ var obj = {
+ openId: openId,
+ content: that.data.picturesInfo.replyContent,
+ busType: 25,
+ busId: that.data.picturesInfo.id
+ };
+ wx.request({
+ url: app.globalData.url + '/api/v1/pictures/reply',
+ data: obj,
+ method: 'POST',
+ header: {
+ "Content-Type": "application/json"
+ },
+ success: function (res) {
+ if (res.data.code == 0) {
+ wx.showToast({
+ title: '提交回复成功',
+ icon: 'success',
+ duration: 2000
+ })
+ setTimeout(function () {
+ wx.navigateBack({
+ changed: true
+ }); //返回上一页
+ }, 2000)
+ } else {
+ wx.showModal({
+ title: '提示',
+ content: "提交失败！"
+ })
+ }
+ }
+ })
+ },
+
submit: function (e) {
var picturesInfo = this.data.picturesInfo;
if (!picturesInfo.schoolName) {
diff --git a/SunshineLnsMinApp/pages/pfyy/pfyy.wxml b/SunshineLnsMinApp/pages/pfyy/pfyy.wxml
index aa06cf0..0e06b6e 100644
--- a/SunshineLnsMinApp/pages/pfyy/pfyy.wxml
+++ b/SunshineLnsMinApp/pages/pfyy/pfyy.wxml
@@ -63,6 +63,39 @@
</div>
<div class="index-gray"></div>
+<div class="{{ReplyLogs.length > 0 ? '':'displayNone'}}">
+ <div class="reply-div">注：如有疑问，可在下方继续咨询</div>
+ <div class="publicSnapshot-message">
+ <span></span>
+ <span>回复内容记录</span>
+ </div>
+ <div class="publicSnapshot-textarea">
+
+ <div class='msg-reply-view-content' wx:for="{{ReplyLogs}}" wx:key="id">
+
+ <div class='msg-reply-view-time-user' wx:if="{{item.userType ==2}}">检察官：{{item.createTime}}</div>
+ <div class='msg-reply-view-time-admin' wx:if="{{item.userType ==1}}">我：{{item.createTime}}</div>
+ <div class='msg-reply-view-user' wx:if="{{item.userType ==2}}">{{item.content}}</div>
+ <div class='msg-reply-view-admin' wx:if="{{item.userType ==1}}">{{item.content}}</div>
+ </div>
+ </div>
+ <div class="index-gray"></div>
+</div>
+
<div class="{{disabled? 'displayNone':'submitButton'}}">
<div style='width:90%' class="mini-submit" bindtap="submit">提交申请</div>
+</div>
+<div wx:if="{{ReplyLogs.length > 0}}" class="">
+ <div class="index-gray"></div>
+ <div class="publicSnapshot-message">
+ <span></span>
+ <span>继续回复</span>
+ </div>
+ <div class="publicSnapshot-textarea">
+ <textarea data-name="replyContent" bindinput="inputChange" placeholder="请输入回复内容" />
+ </div>
+</div>
+<div wx:if="{{ReplyLogs.length > 0}}" class="submitButton">
+ <div class="mini-submit" bindtap="reply">提交回复</div>
+ <div class="drafts" bindtap="goback">返回</div>
</div>
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/rzcx/rzcx.js b/SunshineLnsMinApp/pages/rzcx/rzcx.js
index a378fa9..d5bb9da 100644
--- a/SunshineLnsMinApp/pages/rzcx/rzcx.js
+++ b/SunshineLnsMinApp/pages/rzcx/rzcx.js
@@ -16,13 +16,14 @@
evalList: {},
dataSet: {},
picturesInfo: {},
- entityId: ''
+ entityId: '',
+ approveLogs: []
},
/**
* 生命周期函数--监听页面加载
*/
- onLoad: function (options) {
+ onLoad: function(options) {
var that = this;
console.log(options)
let id = options.id
@@ -34,7 +35,7 @@
var userinfo = wx.getStorageSync("user");
wx.request({
url: app.globalData.url + '/api/entry/find?id=' + id + '&flag=' + flag,
- success: function (res) {
+ success: function(res) {
console.log(res.data)
// if (res.data.code == 0) {
console.log(res.data)
@@ -59,6 +60,7 @@
...res.data,
createrId: userinfo.id,
},
+ approveLogs: res.data.approveLogs || [],
entityId: res.data.id,
disabled,
evalList
@@ -73,7 +75,7 @@
})
},
- inputChange: function (e) {
+ inputChange: function(e) {
var name = e.currentTarget.dataset.name;
this.setData({
picturesInfo: {
@@ -84,7 +86,7 @@
},
- submit: function (e) {
+ submit: function(e) {
var picturesInfo = this.data.picturesInfo;
if (!picturesInfo.reason) {
@@ -99,14 +101,14 @@
header: {
"Content-Type": "application/json"
},
- success: function (res) {
+ success: function(res) {
// if (res.data.code == 0) {
wx.showToast({
title: '提交成功',
icon: 'success',
duration: 2000
})
- setTimeout(function () {
+ setTimeout(function() {
wx.reLaunch({
url: '../zhwj/zhwj',
})
@@ -122,24 +124,24 @@
},
// 删除图片
- clearImg: function (e) {
+ clearImg: function(e) {
var that = this;
app.clearImg(e, that)
},
//预览图片
- previewImage: function (e) {
+ previewImage: function(e) {
app.previewImage(e)
},
- uploadFiles: function (e) {
+ uploadFiles: function(e) {
var that = this;
wx.showActionSheet({
itemList: ['拍照上传', '选择图片'],
- success: function (res) {
+ success: function(res) {
app.joinPicture(e, that, 1019, that.data.entityId)
},
- fail: function (res) {}
+ fail: function(res) {}
})
},
})
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/rzcx/rzcx.wxml b/SunshineLnsMinApp/pages/rzcx/rzcx.wxml
index 11a3aba..e44038c 100644
--- a/SunshineLnsMinApp/pages/rzcx/rzcx.wxml
+++ b/SunshineLnsMinApp/pages/rzcx/rzcx.wxml
@@ -1,33 +1,86 @@
<!--pages/rzcx/rzcx.wxml-->
<div class="boxshadow">
- <div class="publicSnapshot-message">
- <span></span>
- <span>照片上传</span>
- </div>
- <div class="border-bottom"></div>
- <div class="activity-uploadImage">
- <view class="educt_hasupload_pic" wx:for="{{evalList.evalList1019}}" wx:key="index">
- <image src="{{item.pic}}" class="upload" name="{{item.pic}}" bindtap="previewImage" data-src="{{item.pic}}"></image>
- <image src="{{del}}" bindtap='clearImg' data-index="{{index}}" id="{{item.id}}" data-associatetypeid="{{1019}}" class="{{disabled? 'displayNone':'activity-uploadImag-del'}}"></image>
- </view>
- <view bindtap="uploadFiles" class="{{disabled? 'displayNone':'educt_upload_add'}}">
- <image class="activity-uploadImag-icon" src="{{add}}"></image>
- </view>
- </div>
+ <div class="publicSnapshot-message">
+ <span></span>
+ <span>照片上传</span>
+ </div>
+ <div class="border-bottom"></div>
+ <div class="activity-uploadImage">
+ <view class="educt_hasupload_pic" wx:for="{{evalList.evalList1019}}" wx:key="index">
+ <image src="{{item.pic}}" class="upload" name="{{item.pic}}" bindtap="previewImage" data-src="{{item.pic}}"></image>
+ <image src="{{del}}" bindtap='clearImg' data-index="{{index}}" id="{{item.id}}" data-associatetypeid="{{1019}}" class="{{disabled? 'displayNone':'activity-uploadImag-del'}}"></image>
+ </view>
+ <view bindtap="uploadFiles" class="{{disabled? 'displayNone':'educt_upload_add'}}">
+ <image class="activity-uploadImag-icon" src="{{add}}"></image>
+ </view>
+ </div>
</div>
<div class="boxshadow">
- <div class="publicSnapshot-message">
- <span></span>
- <span>申请理由</span>
- </div>
- <div class="border-bottom"></div>
- <div class="publicSnapshot-main" style='display:block'>
- <textarea data-name="reason" bindinput="inputChange" disabled="{{disabled}}" value='{{picturesInfo.reason}}' placeholder="请输入备注内容" />
- </div>
+ <div class="publicSnapshot-message">
+ <span></span>
+ <span>申请理由</span>
+ </div>
+ <div class="border-bottom"></div>
+ <div class="publicSnapshot-main" style='display:block'>
+ <textarea data-name="reason" bindinput="inputChange" disabled="{{disabled}}" value='{{picturesInfo.reason}}' placeholder="请输入备注内容" />
+ </div>
</div>
<div class="index-gray"></div>
+<div class="boxshadow">
+ <div class="publicSnapshot-message">
+ <span></span>
+ <span>申请理由</span>
+ </div>
+ <div class="border-bottom"></div>
+ <div class="publicSnapshot-main" style='display:block'>
+ <textarea data-name="reason" bindinput="inputChange" disabled="{{disabled}}" value='{{picturesInfo.reason}}' placeholder="请输入备注内容" />
+ </div>
+</div>
+
+<div wx:if="{{approveLogs.length == 1}}">
+ <div class="index-gray"></div>
+ <div class="boxshadow">
+ <div class="publicSnapshot-message">
+ <span></span>
+ <span>检察院审核</span>
+ </div>
+ <view class="fzpxInfo-main-group">
+ <view class="fzpxInfo-main-group-title">审核意见</view>
+ <view class="fzpxInfo-main-group-around">{{approveLogs[0].opinion}}</view>
+ </view>
+ </div>
+</div>
+
+<div wx:if="{{approveLogs.length == 2}}">
+ <div class="index-gray"></div>
+ <div class="boxshadow">
+ <div class="publicSnapshot-message">
+ <span></span>
+ <span>检察院审核</span>
+ </div>
+ <view class="fzpxInfo-main-group">
+ <!-- <view class="fzpxInfo-main-group-title">审核意见</view> -->
+ <view class="fzpxInfo-main-group-around">{{approveLogs[0].opinion}}</view>
+ </view>
+ </div>
+ <div class="index-gray"></div>
+ <div class="boxshadow">
+ <div class="publicSnapshot-message">
+ <span></span>
+ <span>公安审核</span>
+ </div>
+ <view class="fzpxInfo-main-group">
+ <view class="fzpxInfo-main-group-around">{{approveLogs[1].opinion}}</view>
+ </view>
+ </div>
+
+</div>
+
+
+
+
<div class="{{disabled? 'displayNone':'submitButton'}}">
<div style='width:90%' class="mini-submit" bindtap="submit">提交申请</div>
</div>
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/rzcx/rzcx.wxss b/SunshineLnsMinApp/pages/rzcx/rzcx.wxss
index e74b02d..e8d66d7 100644
--- a/SunshineLnsMinApp/pages/rzcx/rzcx.wxss
+++ b/SunshineLnsMinApp/pages/rzcx/rzcx.wxss
@@ -14,6 +14,31 @@
height: 48px;
}
+.fzpxInfo-main-group {
+ background-color: var(--white);
+ padding: 1rpx 30rpx;
+ display: flex;
+ align-items: center;
+ min-height: 78rpx;
+ justify-content: space-between;
+ border-top: 1rpx solid #eee;
+}
+
+.fzpxInfo-main-group-title {
+ text-align: justify;
+ padding-right: 30rpx;
+ font-size: 30rpx;
+ position: relative;
+ height: 60rpx;
+ line-height: 60rpx;
+ min-width: calc(4em + 30rpx);
+ font-weight: 600;
+}
+
+.fzpxInfo-main-group-around {
+ line-height: 48rpx;
+}
+
.activity-uploadImag-del {
width: 20px;
height: 20px;
diff --git a/SunshineLnsMinApp/pages/xsjb/xsjb.js b/SunshineLnsMinApp/pages/xsjb/xsjb.js
index 231e8dd..03df3e6 100644
--- a/SunshineLnsMinApp/pages/xsjb/xsjb.js
+++ b/SunshineLnsMinApp/pages/xsjb/xsjb.js
@@ -32,6 +32,7 @@
evalList: {},
disabled: true,
showInfo: false,
+ id:''
},
/**
@@ -114,9 +115,6 @@
if(!this.data.thisData.tipoffObject){
return app.showModal("请填写举报对象！");
}
- if(!this.data.thisData.tipoffAction){
- return app.showModal("请选择举报行为！");
- }
if(!this.data.thisData.tipoffAddress){
return app.showModal("请填写发生地！");
}
@@ -183,7 +181,8 @@
console.log(e)
var that = this;
console.log(that)
- app.joinPicture(e, that, e.currentTarget.dataset.associatetypeid, that.data.id);
+ console.log('that.data.id', that.data.thisData.id)
+ app.joinPicture(e, that, e.currentTarget.dataset.associatetypeid, that.data.thisData.id);
},
// 删除图片
diff --git a/SunshineLnsMinApp/pages/xsjb/xsjb.wxml b/SunshineLnsMinApp/pages/xsjb/xsjb.wxml
index 12a76f7..fa226f5 100644
--- a/SunshineLnsMinApp/pages/xsjb/xsjb.wxml
+++ b/SunshineLnsMinApp/pages/xsjb/xsjb.wxml
@@ -10,11 +10,11 @@
</wux-cell>
</wux-field>
- <wux-field name="举报行为" initialValue="{{ displaytipoffAction }}">
+ <!-- <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> -->
<!-- <wux-field name="发生地" value="{{ meetingWay }}">
<wux-cell hover-class="none" extra="{{dom}}">
--
Gitblit v1.8.0