From 4e44bc1fd7806a6c1611302120882b91d96640b5 Mon Sep 17 00:00:00 2001
From: liuwh <hugeinfo123>
Date: Mon, 27 Apr 2020 17:50:19 +0800
Subject: [PATCH] bug修复
---
SunshineLnsMinApp/pages/fzpx/fzpx.wxml | 8
SunshineLnsMinApp/pages/flcx/flcx.js | 45 +--
SunshineLnsMinApp/pages/pfyy/pfyy.js | 27 +-
SunshineLnsMinApp/app.json | 3
SunshineLnsMinApp/pages/zscqdxal/zscqdxal.js | 53 ++--
SunshineLnsMinApp/pages/warning/warning.json | 3
SunshineLnsMinApp/pages/rzcx/rzcx.js | 6
SunshineLnsMinApp/pages/zscqdxal/zscqdxal.wxml | 37 +-
SunshineLnsMinApp/app.wxss | 1
SunshineLnsMinApp/pages/flcx/flcx.wxss | 38 ++
SunshineLnsMinApp/pages/flcx/flcx.wxml | 34 +-
SunshineLnsMinApp/pages/messageNotification/messageNotification.js | 17
SunshineLnsMinApp/pages/pfyy/pfyy.wxss | 26 +
SunshineLnsMinApp/pages/pfyy/pfyy.wxml | 6
SunshineLnsMinApp/pages/warning/warning.wxml | 7
SunshineLnsMinApp/pages/warning/warning.wxss | 36 +++
SunshineLnsMinApp/pages/index/index.js | 1
SunshineLnsMinApp/pages/personInfo/personInfo.js | 23 -
SunshineLnsMinApp/pages/xsjb/xsjb.js | 27 +
SunshineLnsMinApp/pages/createSub/createSub.wxml | 3
SunshineLnsMinApp/pages/createSub/createSub.js | 61 +---
SunshineLnsMinApp/pages/warning/warning.js | 70 +++++
SunshineLnsMinApp/utils/boy.svg | 1
SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml | 2
SunshineLnsMinApp/pages/zhgh/zhgh.wxml | 10
SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js | 18 +
SunshineLnsMinApp/app.js | 101 ++++++-
SunshineLnsMinApp/pages/activityDetail/activityDetail.js | 6
SunshineLnsMinApp/pages/activityList/activityList.json | 2
SunshineLnsMinApp/pages/fzpx/fzpx.js | 3
SunshineLnsMinApp/pages/fzxkt/fzxkt.wxml | 2
SunshineLnsMinApp/pages/fzxktDetail/fzxktDetail.wxml | 35 +-
SunshineLnsMinApp/pages/index/index.wxml | 8
33 files changed, 471 insertions(+), 249 deletions(-)
diff --git a/SunshineLnsMinApp/app.js b/SunshineLnsMinApp/app.js
index 6fb8d13..98dab51 100644
--- a/SunshineLnsMinApp/app.js
+++ b/SunshineLnsMinApp/app.js
@@ -1,7 +1,7 @@
var qcloud = require('./lib/index');
//app.js
App({
- onLaunch: function () {
+ onLaunch: function() {
// 展示本地存储能力
var logs = wx.getStorageSync('logs') || []
logs.unshift(Date.now())
@@ -10,17 +10,17 @@
globalData: {
userInfo: null,
pageData: {},
- //url: 'https://nsjcy.hugeinfo.com.cn/nsjc-charge',
+ // url: 'https://nsjcy.hugeinfo.com.cn/nsjc-charge',
// url: 'http://1p885086k1.iok.la/nsjc-charge',
- url: 'http://localhost:6060/nsjc-charge',
+ // url: 'http://localhost:6060/nsjc-charge',
imgUrl: 'https://nsjcy.hugeinfo.com.cn/nsjc-charge',
- // url: 'http://nsjc.vaiwan.com/nsjc-charge',
+ url: 'http://nsjc.vaiwan.com/nsjc-charge',
// imgUrl: 'http://nsjc.vaiwan.com/nsjc-charge'
},
// 过滤数组
where: (collection, source) => {
var sourceKeys = Object.keys(source);
- return collection.filter(function (obj) {
+ return collection.filter(function(obj) {
for (var i = 0; i < sourceKeys.length; i++) {
if (!obj.hasOwnProperty(sourceKeys[i]) || obj[sourceKeys[i]] !== source[sourceKeys[i]]) {
return false;
@@ -31,7 +31,7 @@
},
//控制是否能够编辑
- judgeDisable: function (status) {
+ judgeDisable: function(status) {
if (status == null || status == 0 || status == 4) {
return false; //可以
} else {
@@ -40,14 +40,14 @@
},
//提示弹窗
- showModal: function (warn) {
+ showModal: function(warn) {
wx.showModal({
title: '提示',
content: warn
})
},
//添加图片
- joinPicture: function (e, these, associateTypeId, attId) {
+ joinPicture: function(e, these, associateTypeId, attId) {
var th = this;
var index = e.currentTarget.dataset.index;
var associateTypeId = e.currentTarget.dataset.associatetypeid || associateTypeId;
@@ -75,7 +75,7 @@
},
// 上传视频
- joinVideo: function (e, these, associateTypeId, attId) {
+ joinVideo: function(e, these, associateTypeId, attId) {
var th = this;
var index = e.currentTarget.dataset.index;
var associateTypeId = e.currentTarget.dataset.associatetypeid || associateTypeId;
@@ -92,7 +92,7 @@
})
},
//上传文件
- upload: function (these, path, associateTypeId, way, id) {
+ upload: function(these, path, associateTypeId, way, id) {
console.log(these)
console.log(path)
console.log(associateTypeId)
@@ -122,7 +122,7 @@
associateTypeId: associateTypeId,
batch
},
- success: function (res) {
+ success: function(res) {
console.log(res)
var evalList = these.data.evalList;
var evalListType = 'evalList' + associateTypeId;
@@ -141,7 +141,7 @@
},
})
},
- complete: function () {
+ complete: function() {
wx.hideToast(); //隐藏Toast
}
})
@@ -149,7 +149,7 @@
},
//删除图片
- clearImg: function (e, these) {
+ clearImg: function(e, these) {
var id = e.currentTarget.id;
var index = e.currentTarget.dataset.index;
var associateTypeId = e.currentTarget.dataset.associatetypeid;
@@ -162,12 +162,12 @@
}),
wx.request({
url: this.globalData.url + '/api/v1/attachment/delete/' + id,
- success: function (res) {
+ success: function(res) {
if (res.data.code == 0) {
console.log('删除成功!')
}
},
- complete: function () {
+ complete: function() {
wx.hideToast(); //隐藏Toast
}
})
@@ -181,7 +181,7 @@
},
// 预览图片
- previewImage: function (e) {
+ previewImage: function(e) {
wx.previewImage({
current: e.currentTarget.dataset.src, // 当前显示图片的http链接
urls: [e.currentTarget.dataset.src] // 需要预览的图片http链接列表
@@ -189,7 +189,7 @@
},
//转换时间戳
- formatDate: function (ts) {
+ formatDate: function(ts) {
var now = new Date(ts);
var year = now.getFullYear();
var month = now.getMonth() + 1;
@@ -201,7 +201,7 @@
},
//转换时间戳
- formatDateday: function (ts) {
+ formatDateday: function(ts) {
var now = new Date(ts);
var year = now.getFullYear();
var month = now.getMonth() + 1;
@@ -213,14 +213,14 @@
},
// 页面正在开发中
- developIng: function () {
+ developIng: function() {
wx.navigateTo({
url: '../developIng/developIng',
})
},
// 判断时间段
- period: function () {
+ period: function() {
var now = new Date(),
hour = now.getHours(),
word = '';;
@@ -245,7 +245,7 @@
},
// 根据身份证获取生日，性别，年龄
- IdCard: function (UUserCard, num) {
+ IdCard: function(UUserCard, num) {
if (num == 1) {
//获取出生日期
var birth = UUserCard.substring(6, 10) + "-" + UUserCard.substring(10, 12) + "-" + UUserCard.substring(12, 14);
@@ -272,6 +272,63 @@
}
return age;
}
+ },
+ getPermission: function(url) {
+ wx.getLocation({
+ success: function(res) {
+ wx.navigateTo({
+ url,
+ })
+ },
+ fail: function() {
+ wx.getSetting({
+ success: function(res) {
+ var statu = res.authSetting;
+ if (!statu['scope.userLocation']) {
+ wx.showModal({
+ title: '是否授权当前位置',
+ content: '需要获取您的地理位置，请确认授权，否则地图功能将无法使用',
+ success: function(tip) {
+ if (tip.confirm) {
+ wx.openSetting({
+ success: function(data) {
+ if (data.authSetting["scope.userLocation"] === true) {
+ wx.showToast({
+ title: '授权成功',
+ icon: 'success',
+ duration: 1000
+ })
+ //授权成功之后，再调用chooseLocation选择地方
+ wx.getLocation({
+ success: function(res) {
+ wx.navigateTo({
+ url,
+ })
+ },
+ })
+ } else {
+ wx.showToast({
+ title: '授权失败',
+ icon: 'success',
+ duration: 1000
+ })
+ }
+ }
+ })
+ }
+ }
+ })
+ }
+ },
+ fail: function(res) {
+ wx.showToast({
+ title: '调用授权窗口失败',
+ icon: 'success',
+ duration: 1000
+ })
+ }
+ })
+ }
+ })
}
-
})
\ No newline at end of file
diff --git a/SunshineLnsMinApp/app.json b/SunshineLnsMinApp/app.json
index 0a82747..f6560f2 100644
--- a/SunshineLnsMinApp/app.json
+++ b/SunshineLnsMinApp/app.json
@@ -94,7 +94,8 @@
"pages/pfyy/pfyy",
"pages/rzcx/rzcx",
"pages/rzcxList/rzcxList",
- "pages/createSub/createSub"
+ "pages/createSub/createSub",
+ "pages/warning/warning"
],
"networkTimeout": {
"request": 60000
diff --git a/SunshineLnsMinApp/app.wxss b/SunshineLnsMinApp/app.wxss
index 59a9402..d055adf 100644
--- a/SunshineLnsMinApp/app.wxss
+++ b/SunshineLnsMinApp/app.wxss
@@ -4,7 +4,6 @@
@import "colorui/icon.wxss";
.container {
- height: 100%;
display: flex;
flex-direction: column;
align-items: center;
diff --git a/SunshineLnsMinApp/pages/activityDetail/activityDetail.js b/SunshineLnsMinApp/pages/activityDetail/activityDetail.js
index 37c5a5d..0bbf3a2 100644
--- a/SunshineLnsMinApp/pages/activityDetail/activityDetail.js
+++ b/SunshineLnsMinApp/pages/activityDetail/activityDetail.js
@@ -181,7 +181,7 @@
}
var that = this;
wx.request({
- url: app.globalData.url + '/api/activityInfo/activityApply',
+ url: app.globalData.url + '/api/activity/activityApply',
data: peopleInfo,
method: 'POST',
header: {
@@ -189,8 +189,8 @@
},
success: function (res) {
if (res.data.code == 0) {
- wx.reLaunch({
- url: '../index/index',
+ wx.navigateBack({
+ delta: 1
}, wx.showToast({
title: '报名成功！',
icon: 'success',
diff --git a/SunshineLnsMinApp/pages/activityList/activityList.json b/SunshineLnsMinApp/pages/activityList/activityList.json
index 95927c3..6f22c57 100644
--- a/SunshineLnsMinApp/pages/activityList/activityList.json
+++ b/SunshineLnsMinApp/pages/activityList/activityList.json
@@ -1,5 +1,5 @@
{
- "navigationBarTitleText": "活动一览",
+ "navigationBarTitleText": "南检活动",
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black"
diff --git a/SunshineLnsMinApp/pages/createSub/createSub.js b/SunshineLnsMinApp/pages/createSub/createSub.js
index 0d1a906..5df15cc 100644
--- a/SunshineLnsMinApp/pages/createSub/createSub.js
+++ b/SunshineLnsMinApp/pages/createSub/createSub.js
@@ -11,7 +11,8 @@
confirm: true,
value1: '',
answer: [],
- id: ''
+ id: '',
+ disabled: false
},
// 去单选页面
toRadio(e) {
@@ -132,6 +133,9 @@
var that = this;
wx.request({
url: app.globalData.url + '/api/question/find/' + id,
+ data: {
+ userId: wx.getStorageSync("user").id
+ },
success: function(res) {
console.log(res)
if (res.data.code == 0) {
@@ -141,52 +145,25 @@
[_m]: {
"paper": {
"title": res.data.data.title,
- "des": res.data.data.content
+ "des": res.data.data.content || ''
},
"psqList": res.data.data.questionDtos
- // "psqList": [{
- // "isMust": 1,
- // "type": 1,
- // "question": "111",
- // "answerslist": [{
- // "answer": "11"
- // }, {
- // "answer": "111"
- // }, {
- // "answer": "11"
- // }, {
- // "answer": "111"
- // }],
- // 'value': []
- // }, {
- // "isMust": 1,
- // "type": 1,
- // "question": "11111",
- // "answerslist": [{
- // "answer": "111"
- // }, {
- // "answer": "111"
- // }],
- // value: []
- // }, {
- // "isMust": 1,
- // "type": 0,
- // "question": "11111"
- // }, {
- // "isMust": 0,
- // "type": 1,
- // "question": "wqwqw",
- // "answerslist": [{
- // "answer": "qw"
- // }, {
- // "answer": "wqw"
- // }, {
- // "answer": "wqw"
- // }]
- // }]
}
});
+ } else if (res.data.code == 3) {
+ that.setData({
+ id: res.data.data.id,
+ [_m]: {
+ "paper": {
+ "title": res.data.data.title,
+ "des": res.data.data.content || ''
+ },
+ "psqList": res.data.data.questionDtos
+ },
+ disabled: true
+
+ });
} else {
wx.showModal({
title: '提示',
diff --git a/SunshineLnsMinApp/pages/createSub/createSub.wxml b/SunshineLnsMinApp/pages/createSub/createSub.wxml
index c7e5aab..68627ab 100644
--- a/SunshineLnsMinApp/pages/createSub/createSub.wxml
+++ b/SunshineLnsMinApp/pages/createSub/createSub.wxml
@@ -32,4 +32,5 @@
</view>
</view>
</view>
-<button class="btn" catchtap='submit'>提交</button>
+<button class="btn" wx:if="{{!disabled}}" catchtap='submit'>提交</button>
+<button class="btn" wx:if="{{disabled}}" disabled catchtap='submit'>已提交</button>
diff --git a/SunshineLnsMinApp/pages/flcx/flcx.js b/SunshineLnsMinApp/pages/flcx/flcx.js
index b8fd8f4..afed36f 100644
--- a/SunshineLnsMinApp/pages/flcx/flcx.js
+++ b/SunshineLnsMinApp/pages/flcx/flcx.js
@@ -1,9 +1,9 @@
// pages/dxal/dxal.js
-import {
- $startWuxRefresher,
- $stopWuxRefresher,
- $stopWuxLoader
-} from '../../templeteDist/wuxDist/index';
+// import {
+// $startWuxRefresher,
+// $stopWuxRefresher,
+// $stopWuxLoader
+// } from '../../templeteDist/wuxDist/index';
var app = getApp();
@@ -27,25 +27,24 @@
/**
* 生命周期函数--监听页面加载
*/
- onLoad: function (options) {
- $startWuxRefresher();
+ onLoad: function(options) {
+ this.showList()
},
- showList: function () {
+ showList: function() {
var that = this;
- // wx.showLoading();
+ 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();
+ 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,
@@ -86,7 +85,7 @@
content: 'Wux Weapp'
})),
- linkFunction: function (event) {
+ linkFunction: function(event) {
var str = event.currentTarget.dataset['str'];
var id = event.currentTarget.dataset['id'];
wx.navigateTo({
@@ -94,25 +93,25 @@
})
},
- 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) {
+ searchIcon(e) {
console.log('onChange', e)
this.setData({
value: e.detail.value,
@@ -122,14 +121,12 @@
console.log('onFocus', e)
},
onBlur(e) {
- console.log('onBlur', e)
- this.setData({
- value: e.detail.value
- })
- this.showList();
+ console.log('onBlur', e);
+ this.showList()
},
onConfirm(e) {
- console.log('onConfirm', e)
+ console.log('onConfirm', e);
+ this.showList()
},
onClear(e) {
console.log('onClear', e)
diff --git a/SunshineLnsMinApp/pages/flcx/flcx.wxml b/SunshineLnsMinApp/pages/flcx/flcx.wxml
index db01533..3338cd5 100644
--- a/SunshineLnsMinApp/pages/flcx/flcx.wxml
+++ b/SunshineLnsMinApp/pages/flcx/flcx.wxml
@@ -1,30 +1,28 @@
-<!-- <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:0px">
<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"/>
+ <input type="text" placeholder="搜索" value="{{ value }}" confirm-type="search" bindblur="onBlur" bindinput="searchIcon" bindconfirm="onConfirm"></input>
</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>
+<!-- <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">
- <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-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="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 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="zhwj-b-head-r">
+ <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>
-</wux-refresher>
\ No newline at end of file
+</view>
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/flcx/flcx.wxss b/SunshineLnsMinApp/pages/flcx/flcx.wxss
index 8aeb93b..e3bfe8b 100644
--- a/SunshineLnsMinApp/pages/flcx/flcx.wxss
+++ b/SunshineLnsMinApp/pages/flcx/flcx.wxss
@@ -8,7 +8,39 @@
height: 100%;
}
-.flex1 {
- flex: 1;
- overflow-y: scroll;
+.zscqdxal-top {
+ top: 0;
+ position: fixed;
+ width: 100%;
+}
+
+.weui-media-box {
+ padding: 0 15px;
+}
+
+.zhwj-b-main {
+ display: flex;
+ /* border-bottom: 1px solid #ebf2fa; */
+}
+
+.zhwj-b-head-l {
+ margin: 6px;
+ padding: 6px;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ width: 100%;
+}
+
+.zhwj-b-head-r {
+ margin: 6px;
+}
+
+.zhwj-b-head-r image {
+ width: 108px;
+ height: 80px;
+}
+
+.zhwj-b {
+ background-color: #fff;
}
diff --git a/SunshineLnsMinApp/pages/fzpx/fzpx.js b/SunshineLnsMinApp/pages/fzpx/fzpx.js
index e8c24da..9b8d5ef 100644
--- a/SunshineLnsMinApp/pages/fzpx/fzpx.js
+++ b/SunshineLnsMinApp/pages/fzpx/fzpx.js
@@ -21,8 +21,9 @@
var id = e.currentTarget.dataset['id'];
var str = e.currentTarget.dataset['str'];
var flag = e.currentTarget.dataset['flag'];
+ var signStatus = e.currentTarget.dataset['signstatus'];
wx.navigateTo({
- url: '../' + str + '/' + str + '?id=' + id + '&flag=' + flag
+ url: '../' + str + '/' + str + '?id=' + id + '&flag=' + flag + '&signStatus=' + signStatus
})
},
diff --git a/SunshineLnsMinApp/pages/fzpx/fzpx.wxml b/SunshineLnsMinApp/pages/fzpx/fzpx.wxml
index a1ac7ac..4a57372 100644
--- a/SunshineLnsMinApp/pages/fzpx/fzpx.wxml
+++ b/SunshineLnsMinApp/pages/fzpx/fzpx.wxml
@@ -2,7 +2,7 @@
<view class="fzpx">
<view class="cu-card dynamic">
- <view class="cu-item shadow" wx:for="{{ items }}" wx:key="{{item.id}}" bindtap='link' data-str="fzpxInfo" data-flag="{{item.flag}}" data-id="{{item.id}}">
+ <view class="cu-item shadow" wx:for="{{ items }}" data-signStatus="{{item.signStatus}}" wx:key="{{item.id}}" bindtap='link' data-str="fzpxInfo" data-flag="{{item.flag}}" data-id="{{item.id}}">
<view class="fzpx-list">
<view class="fzpx-list-img">
<image src="{{item.attList[0].imgPath}}" mode="aspectFit"></image>
@@ -15,9 +15,11 @@
</view>
<!--
<view class="fzpx-list-b-right" data-str="fzpxInfo" data-id="3" bindtap='linkFunction'>我要报名</view> -->
- <button class="cu-btn bg-blue" wx:if="{{ item.flag == true}}">我要报名</button>
+ <button class="cu-btn bg-blue" style="width:98px" wx:if="{{ item.activityStatus==1 && item.flag == true}}">我要报名</button>
- <button class="cu-btn" wx:else>已报名</button>
+ <button class="cu-btn" style="width:98px" wx:if="{{ item.activityStatus ==2 && item.flag == false}}">已报名</button>
+ <span wx:if="{{ item.activityStatus ==2 && item.flag == true}}"></span>
+ <button class="cu-btn" style="width:98px" wx:if="{{ item.activityStatus ==3 }}">已结束</button>
</view>
</view>
</view>
diff --git a/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js b/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js
index 02d8830..ad275eb 100644
--- a/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js
+++ b/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js
@@ -16,17 +16,18 @@
id: "",
topattList: [],
bottomattList: [],
- statequeId: ''
+ statequeId: '',
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
+ console.log('options', options)
var that = this;
that.setData({
id: options.id,
- signStatus: options.signStatus || '',
+ signStatus: options.signStatus || '1',
flag: options.flag || '',
loading: true
});
@@ -130,9 +131,16 @@
//跳转问卷调查
businessSchedule: function(e) {
var id = e.currentTarget.dataset['id'];
- wx.navigateTo({
- url: '/pages/createSub/createSub?id=' + id,
- })
+ var questatus = e.currentTarget.dataset['questatus'];
+ if (questatus == 4) {
+ wx.navigateTo({
+ url: '/pages/warning/warning?msg=1',
+ })
+ } else {
+ wx.navigateTo({
+ url: '/pages/createSub/createSub?id=' + id,
+ })
+ }
},
inputChange: function(e) {
diff --git a/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml b/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml
index 2df5591..d91fb2e 100644
--- a/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml
+++ b/SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml
@@ -46,7 +46,7 @@
</view>
</view>
- <view class="fzpxInfo-main-group" wx:if="{{statequeId}}" data-id="{{statequeId}}" bindtap='businessSchedule'>
+ <view class="fzpxInfo-main-group" wx:if="{{statequeId&&signStatus !=='2'}}" data-id="{{statequeId}}" data-queStatus="{{activity.queStatus}}" bindtap="businessSchedule">
<view class="fzpxInfo-main-group-title">问卷调查</view>
<view style="display: flex; line-height:48rpx;">
<image class="index-pane-icon " src="{{user}} " />
diff --git a/SunshineLnsMinApp/pages/fzxkt/fzxkt.wxml b/SunshineLnsMinApp/pages/fzxkt/fzxkt.wxml
index 411da9d..135c421 100644
--- a/SunshineLnsMinApp/pages/fzxkt/fzxkt.wxml
+++ b/SunshineLnsMinApp/pages/fzxkt/fzxkt.wxml
@@ -22,7 +22,7 @@
<!-- <text class="cuIcon-favorfill lg text-blue"></text> -->
<view class="headLineInfo">
<view class="info-source">{{item.createTime}}</view>
- <view class="info-viewer">{{item.readCount}}人观看</view>
+ <view class="info-viewer">观看次数{{item.readCount}}</view>
</view>
</view>
</view>
diff --git a/SunshineLnsMinApp/pages/fzxktDetail/fzxktDetail.wxml b/SunshineLnsMinApp/pages/fzxktDetail/fzxktDetail.wxml
index 114b57a..f357528 100644
--- a/SunshineLnsMinApp/pages/fzxktDetail/fzxktDetail.wxml
+++ b/SunshineLnsMinApp/pages/fzxktDetail/fzxktDetail.wxml
@@ -1,22 +1,23 @@
<!--lawPublicityDetail.wxml-->
<import src="../wxParse/wxParse.wxml" />
<view class="detail">
- <!-- <template is="wxParse" data="{{wxParseData:article.nodes}}" /> -->
- <!-- <view wx:for="{{attList.attList21}}" wx:key="{{key}}"> -->
- <!-- <video id="myVideo" src="{{item.path}}"
+ <!-- <template is="wxParse" data="{{wxParseData:article.nodes}}" /> -->
+ <!-- <view wx:for="{{attList.attList21}}" wx:key="{{key}}"> -->
+ <!-- <video id="myVideo" src="{{item.path}}"
danmu-list="{{danmuList}}" enable-danmu danmu-btn controls></video> -->
- <view class="video-area">
- <video id="myVideo" src="{{data.attList[0].path}}" danmu-list="{{danmuList}}" enable-danmu danmu-btn controls></video>
- </view>
-
- <view class="content-left">
- <view class="headLineTitle">
- {{data.title}}
- </view>
- <!-- <text class="cuIcon-favorfill lg text-blue"></text> -->
- <view class="headLineInfo">
- <view class="info-source">{{data.createTime}}</view>
- <view class="info-viewer">{{data.readCount}}人观看</view>
- </view>
- </view>
+ <view wx:for="{{data.attList}}" data-index="{{index}}" wx:key="index">
+ <view class="video-area" style="margin:12px 0">
+ <video id="myVideo" src="{{item.path}}" danmu-list="{{danmuList}}" enable-danmu danmu-btn controls></video>
+ </view>
+ </view>
+ <view class="content-left">
+ <view class="headLineTitle">
+ {{data.title}}
+ </view>
+ <!-- <text class="cuIcon-favorfill lg text-blue"></text> -->
+ <view class="headLineInfo">
+ <view class="info-source">{{data.createTime}}</view>
+ <!-- <view class="info-viewer">观看次数{{data.readCount}}</view> -->
+ </view>
+ </view>
</view>
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/index/index.js b/SunshineLnsMinApp/pages/index/index.js
index bccb8eb..fef8357 100644
--- a/SunshineLnsMinApp/pages/index/index.js
+++ b/SunshineLnsMinApp/pages/index/index.js
@@ -14,6 +14,7 @@
sjxf: app.globalData.imgUrl + '/image/sjxf.svg',
user: app.globalData.imgUrl + '/image/user.svg',
gyssp: app.globalData.imgUrl + '/image/suishoupai.svg',
+ boy: '../../utils/boy.svg',
shce: app.globalData.imgUrl + '/image/saoheichue.svg',
userCenter: app.globalData.imgUrl + '/image/icon_geren.svg',
llz: app.globalData.imgUrl + '/image/icon_lianluo.svg',
diff --git a/SunshineLnsMinApp/pages/index/index.wxml b/SunshineLnsMinApp/pages/index/index.wxml
index c95216b..d91c47a 100644
--- a/SunshineLnsMinApp/pages/index/index.wxml
+++ b/SunshineLnsMinApp/pages/index/index.wxml
@@ -53,9 +53,9 @@
<image class="eight-pane-icon " src="{{tsjy}} " />
<div class="eight-pane-title ">信息公开</div>
</div>
- <div class="eight-pane-bottom-item " bindtap="junctionStation">
- <image class="eight-pane-icon " src="{{llz}} " />
- <div class="eight-pane-title ">人大联络站</div>
+ <div class="eight-pane-bottom-item " data-str="zhwj" bindtap='linkFunction'>
+ <image class="eight-pane-icon " src="{{boy}} " />
+ <div class="eight-pane-title ">智慧未检</div>
</div>
<div class="eight-pane-bottom-item " bindtap="dissDetail">
<image class="eight-pane-icon " src="{{gyssp}} " />
@@ -229,7 +229,7 @@
<view class='VerticalNav-flex-t'>
<view class="bg-img" bindtap='activity' style="background-image: url('https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1576727840095&di=c57a0f0d43a2b175981b679f8e328428&imgtype=0&src=http%3A%2F%2Fwx2.sinaimg.cn%2Fcrop.0.0.738.415.1000%2F006ba4mely1fmndnl221jj30m50bjq5i.jpg');margin: 6px;height: 78px;flex: 1; line-height: 78px;">
<view class="bg-shadeTop">
- 活动一览
+ 南检活动
</view>
</view>
<view class="bg-img" style="margin: 6px;height: 78px;flex: 1; line-height: 78px;">
diff --git a/SunshineLnsMinApp/pages/messageNotification/messageNotification.js b/SunshineLnsMinApp/pages/messageNotification/messageNotification.js
index c5a814e..8be7cd8 100644
--- a/SunshineLnsMinApp/pages/messageNotification/messageNotification.js
+++ b/SunshineLnsMinApp/pages/messageNotification/messageNotification.js
@@ -18,7 +18,7 @@
dataSet: []
},
- navbarTap: function (e) {
+ navbarTap: function(e) {
this.setData({
currentTab: e.currentTarget.dataset.idx
})
@@ -26,7 +26,7 @@
},
- showList: function (tab) {
+ showList: function(tab) {
var userinfo = wx.getStorageSync("user");
var that = this;
var id = userinfo.id
@@ -48,7 +48,7 @@
}
wx.request({
url: app.globalData.url + '/api/businessAggr/draftQuery?page=1&size=' + that.data[sizeQty] + '&userId=' + id + '&flag=message' + str,
- success: function (res) {
+ success: function(res) {
if (res.data.code == 0) {
(res.data.data.content).forEach(e => {
(e.createTime) = app.formatDate(e.createTime)
@@ -109,7 +109,7 @@
})
},
- businessSchedule: function (event) {
+ businessSchedule: function(event) {
var id = event.currentTarget.id;
var businessType = this.data.dataSet[id].businessType;
var businessId = this.data.dataSet[id].businessId;
@@ -117,9 +117,8 @@
var flag = this.data.dataSet[id].flag || '';
var picType = this.data.dataSet[id].picType || '';
if (businessType == "公益随手拍") {
- wx.navigateTo({
- url: '../publicSnapshot/publicSnapshot?id=' + businessId + '&type=' + picType,
- })
+ app.getPermission('../publicSnapshot/publicSnapshot?id=' + businessId + '&type=' + picType)
+
} else if (businessType == "扫黑除恶") {
wx.navigateTo({
url: '../scanEvildoing/scanEvildoing?id=' + businessId,
@@ -144,14 +143,14 @@
}
},
- onLoad: function () {
+ onLoad: function() {
this.showList(0)
},
/**
* 页面上拉触底事件的处理函数
*/
- onReachBottom: function () {
+ onReachBottom: function() {
if (this.data.hasMoreData) {
this.showList(this.data.currentTab)
this.setData({
diff --git a/SunshineLnsMinApp/pages/personInfo/personInfo.js b/SunshineLnsMinApp/pages/personInfo/personInfo.js
index 0118cd4..631c322 100644
--- a/SunshineLnsMinApp/pages/personInfo/personInfo.js
+++ b/SunshineLnsMinApp/pages/personInfo/personInfo.js
@@ -69,28 +69,26 @@
//接口
var openId = wx.getStorageSync("openId");
var that = this;
+ wx.showLoading();
wx.request({
url: app.globalData.url + '/api/ma/user/findByOpenId?openId=' + openId,
success: function(res) {
+ wx.hideLoading();
if (res.data.code == '0') {
var data = res.data.data;
- if (data.idcard) {
- if (!data.birthday) {
- data.birthday = app.IdCard(data.idcard, 1);
- }
- if (!data.wxSex) {
- data.wxSex = app.IdCard(data.idcard, 2);
- }
- } else {
- data.birthday = '1985-01-01'
+ if (!data.userType) {
+ data.userType = 0;
+ }
+ if (!data.birthday) {
+ data.birthday = '1985-01-01';
+ }
+ if (!data.wxSex) {
+ data.wxSex = app.IdCard(data.idcard, 2);
}
if (data.nation == "0") {
data.nation = 0;
} else {
data.nation = that.data.nations.findIndex(e => e == data.nation);
- }
- if (!data.userType) {
- data.userType = 0
}
var attList = data.attachments || [];
var evalList1001 = app.where(attList, {
@@ -116,6 +114,7 @@
id
}))
}
+ console.log('data', data)
that.setData({
peopleInfo: data,
evalList,
diff --git a/SunshineLnsMinApp/pages/pfyy/pfyy.js b/SunshineLnsMinApp/pages/pfyy/pfyy.js
index f112963..a6d1c22 100644
--- a/SunshineLnsMinApp/pages/pfyy/pfyy.js
+++ b/SunshineLnsMinApp/pages/pfyy/pfyy.js
@@ -14,13 +14,13 @@
picType: '',
evalList: {},
picturesInfo: {},
- ReplyLogs:[]
+ ReplyLogs: []
},
/**
* 生命周期函数--监听页面加载
*/
- onLoad: function (options) {
+ onLoad: function(options) {
var that = this;
console.log(options)
let id = options.id
@@ -28,7 +28,7 @@
var userinfo = wx.getStorageSync("user");
wx.request({
url: app.globalData.url + '/api/v1/appointment/find?id=' + id,
- success: function (res) {
+ success: function(res) {
console.log(res.data.data.lawAppointment)
if (res.data.code == 0) {
var data1 = res.data.data.ReplyLogs || [];
@@ -36,7 +36,7 @@
picturesInfo: {
...res.data.data.lawAppointment,
createId: userinfo.id,
- activitiesTime: app.formatDateday(res.data.data.lawAppointment.activitiesTime)
+ activitiesTime: app.formatDateday(res.data.data.lawAppointment.activitiesTime || new Date())
},
ReplyLogs: data1,
disabled
@@ -51,7 +51,7 @@
})
},
- inputChange: function (e) {
+ inputChange: function(e) {
var name = e.currentTarget.dataset.name;
this.setData({
picturesInfo: {
@@ -62,7 +62,7 @@
},
- reply: function (e) {
+ reply: function(e) {
var that = this;
var openId = wx.getStorageSync("openId")
var obj = {
@@ -78,14 +78,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.navigateBack({
changed: true
}); //返回上一页
@@ -100,7 +100,7 @@
})
},
- submit: function (e) {
+ submit: function(e) {
var picturesInfo = this.data.picturesInfo;
if (!picturesInfo.schoolName) {
return app.showModal("请填写学校名称！");
@@ -112,7 +112,10 @@
return app.showModal("请填写联系人！");
}
if (!picturesInfo.contactPhone) {
- return app.showModal("请填写联系方式！");
+ return app.showModal("请填写手机号码！");
+ }
+ if (/^[1]([3-9])[0-9]{9}$/.test(picturesInfo.contactPhone) == false) {
+ return app.showModal("手机号码有误！");
}
if (!picturesInfo.activitiesTime) {
return app.showModal("请填写活动时间！");
@@ -137,14 +140,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',
})
diff --git a/SunshineLnsMinApp/pages/pfyy/pfyy.wxml b/SunshineLnsMinApp/pages/pfyy/pfyy.wxml
index 433cdd4..0583f73 100644
--- a/SunshineLnsMinApp/pages/pfyy/pfyy.wxml
+++ b/SunshineLnsMinApp/pages/pfyy/pfyy.wxml
@@ -23,12 +23,12 @@
<div class="publicSnapshot-main">
<span class="red-title">*</span>
<span>联系方式</span>
- <input data-name="contactPhone" bindinput="inputChange" disabled="{{disabled}}" value='{{picturesInfo.contactPhone}}'></input>
+ <input type="number" data-name="contactPhone" bindinput="inputChange" disabled="{{disabled}}" value='{{picturesInfo.contactPhone}}'></input>
</div>
<div class="publicSnapshot-main">
<span class="red-title">*</span>
<span>活动时间</span>
- <picker mode="date" value="{{picturesInfo.activitiesTime}}" data-name="activitiesTime" disabled="{{disabled}}" bindchange="inputChange">
+ <picker mode="date" value="{{picturesInfo.activitiesTime}}" class='picker-margin' data-name="activitiesTime" disabled="{{disabled}}" bindchange="inputChange">
<view class="picker">
{{picturesInfo.activitiesTime}}
</view>
@@ -51,7 +51,7 @@
<div class="publicSnapshot-main">
<span class="red-title">*</span>
<span>活动场地</span>
- <input data-name="activitiesAddress" bindinput="inputChange" disabled="{{disabled}}" value='{{picturesInfo.activitiesAddress}}'></input>
+ <input type="text" data-name="activitiesAddress" bindinput="inputChange" disabled="{{disabled}}" value='{{picturesInfo.activitiesAddress}}'></input>
</div>
<div class="publicSnapshot-main" style='display:block'>
<view class="zhghInfo-center-title">
diff --git a/SunshineLnsMinApp/pages/pfyy/pfyy.wxss b/SunshineLnsMinApp/pages/pfyy/pfyy.wxss
index 2e1d734..c380df1 100644
--- a/SunshineLnsMinApp/pages/pfyy/pfyy.wxss
+++ b/SunshineLnsMinApp/pages/pfyy/pfyy.wxss
@@ -1,8 +1,10 @@
/* pages/pfyy/pfyy.wxss */
+
input {
font-size: 14px;
color: #999;
text-align: right;
+ flex: 1;
}
.border-bottom {
@@ -62,7 +64,7 @@
}
textarea {
- box-sizing: border-box;
+ box-sizing: border-box;
width: 100%;
height: 100px;
display: block;
@@ -90,7 +92,6 @@
.publicSnapshot-main span:nth-child(2) {
font-size: 14px;
color: #333;
- margin-right: auto;
width: 20%;
}
@@ -104,12 +105,17 @@
height: 22px;
}
-.publicSnapshot-main .person_w{
+.publicSnapshot-main .person_w {
display: inline-block;
font-size: 14px;
color: #333;
margin-right: auto;
width: auto;
+}
+
+.picker-margin {
+ text-align: right;
+ flex: 1;
}
.publicSnapshot-main-picker {
@@ -172,20 +178,24 @@
.publicSnapshot-status-time-right {
font-size: 14px;
}
-.contantType-picker{
+
+.contantType-picker {
font-size: 14px;
}
-.contantType-picker-div{
- display:flex;
- width: 31%
+
+.contantType-picker-div {
+ display: flex;
+ width: 31%;
}
+
.publicSnapshot-main-img {
width: 16px;
height: 22px;
}
+
.msg-reply-view-content {
overflow: auto;
- padding:5px 0px 5px 20px;
+ padding: 5px 0px 5px 20px;
}
.msg-reply-view-content::-webkit-scrollbar {
diff --git a/SunshineLnsMinApp/pages/rzcx/rzcx.js b/SunshineLnsMinApp/pages/rzcx/rzcx.js
index d5bb9da..08c2214 100644
--- a/SunshineLnsMinApp/pages/rzcx/rzcx.js
+++ b/SunshineLnsMinApp/pages/rzcx/rzcx.js
@@ -89,6 +89,12 @@
submit: function(e) {
var picturesInfo = this.data.picturesInfo;
+ if (!picturesInfo.createrName) {
+ return app.showModal("请填写申请人姓名！");
+ }
+ if (this.data.evalList.evalList1019.length == 0) {
+ return app.showModal("请上传照片！");
+ }
if (!picturesInfo.reason) {
return app.showModal("请填写申请理由！");
}
diff --git a/SunshineLnsMinApp/pages/warning/warning.js b/SunshineLnsMinApp/pages/warning/warning.js
new file mode 100644
index 0000000..01d4bfc
--- /dev/null
+++ b/SunshineLnsMinApp/pages/warning/warning.js
@@ -0,0 +1,70 @@
+// pages/warning/warning.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ msg: ''
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function(options) {
+ console.log(options.msg)
+
+ this.setData({
+ msg: options.msg == 1 ? '问卷已回收' : '页面警告'
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ 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/warning/warning.json b/SunshineLnsMinApp/pages/warning/warning.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/SunshineLnsMinApp/pages/warning/warning.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/warning/warning.wxml b/SunshineLnsMinApp/pages/warning/warning.wxml
new file mode 100644
index 0000000..6b6a044
--- /dev/null
+++ b/SunshineLnsMinApp/pages/warning/warning.wxml
@@ -0,0 +1,7 @@
+<!--pages/warning/warning.wxml-->
+<div class="developIng">
+ <icon type="info" size="70" style='margin:50px' />
+ <text selectable='true' bindlongtap='copy' style='font-size:16px;width:60%;text-align:center;'>{{msg}}</text>
+ <!-- <text selectable='true' bindlongtap='copy' style='font-size:20px;'>http://www.ajxxgk.jcy.gov.cn</text> -->
+ <!-- <div class='copy' bindtap="copyBtn" style='margin:50px'>一键复制</div> -->
+</div>
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/warning/warning.wxss b/SunshineLnsMinApp/pages/warning/warning.wxss
new file mode 100644
index 0000000..fc8a0b1
--- /dev/null
+++ b/SunshineLnsMinApp/pages/warning/warning.wxss
@@ -0,0 +1,36 @@
+/* pages/warning/warning.wxss */
+
+page {
+ /* width: 100%;
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center; */
+}
+
+.developIng {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+}
+
+image {
+ width: 135rpx;
+ height: 90rpx;
+ margin-bottom: 20rpx;
+}
+
+.copy {
+ font-size: 18px;
+ color: #fff;
+ background: linear-gradient(#33c3ff, #1790ff);
+ width: 335px;
+ height: 50px;
+ line-height: 30px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 2px;
+ box-shadow: 0px 4px 8px 0px rgba(196, 222, 255, 1);
+}
diff --git a/SunshineLnsMinApp/pages/xsjb/xsjb.js b/SunshineLnsMinApp/pages/xsjb/xsjb.js
index 12f1a32..bc818a3 100644
--- a/SunshineLnsMinApp/pages/xsjb/xsjb.js
+++ b/SunshineLnsMinApp/pages/xsjb/xsjb.js
@@ -135,8 +135,11 @@
if (!this.data.thisData.createrMobile) {
return app.showModal("请填写手机号码！");
}
+ if (/^[1]([3-9])[0-9]{9}$/.test(this.data.thisData.createrMobile)==false){
+ return app.showModal("手机号码有误！");
+ }
if (!this.data.thisData.createrAddress) {
- return app.showModal("请填写联系方式！");
+ return app.showModal("请填写联系地址！");
}
}
wx.request({
@@ -151,16 +154,30 @@
wx.showToast({
title: '提交成功！',
icon: 'success',
- duration: 2000
- })
- wx.navigateBack({
- delta: 2
+ duration: 2000,
+ success: function() {
+ setTimeout(function() {
+ //要延时执行的代码
+ wx.navigateBack({
+ delta: 2
+ })
+ }, 1000) //延迟时间
+ },
})
}
}
})
},
+ checkMobile: function() {
+ var sMobile = document.mobileform.mobile.value
+ if (!(/^1[3|4|5|8][0-9]\d{4,8}$/.test(sMobile))) {
+ alert("不是完整的11位手机号或者正确的手机号前七位");
+ document.mobileform.mobile.focus();
+ return false;
+ }
+ },
+
// 选择地理位置
chooseLocation: function(e) {
const that = this;
diff --git a/SunshineLnsMinApp/pages/zhgh/zhgh.wxml b/SunshineLnsMinApp/pages/zhgh/zhgh.wxml
index d36d997..cf8674a 100644
--- a/SunshineLnsMinApp/pages/zhgh/zhgh.wxml
+++ b/SunshineLnsMinApp/pages/zhgh/zhgh.wxml
@@ -20,7 +20,7 @@
<view class="text-grey">{{item.startTime}}~{{item.endTime}}</view>
</view>
<view class="zhgh-list-b-right">
- <view class="round cu-tag margin-tb-sm lg {{item.status=='未开始'?bg-grey:item.status=='进行中'?bg-red:bg-blue}}">{{item.status}}</view>
+ <view class="round cu-tag margin-tb-sm lg {{item.status=='未开始'?'bg-green':item.status=='进行中'?'bg-orange':'bg-grey'}}">{{item.status}}</view>
</view>
</view>
</view>
@@ -38,7 +38,7 @@
<view class="text-grey">{{item.startTime}}~{{item.endTime}}</view>
</view>
<view class="zhgh-list-b-right">
- <view class="round cu-tag margin-tb-sm lg {{item.status=='未开始'?bg-grey:item.status=='进行中'?bg-red:bg-blue}}">{{item.status}}</view>
+ <view class="round cu-tag margin-tb-sm lg {{item.status=='未开始'?'bg-green':item.status=='进行中'?'bg-orange':'bg-grey'}}">{{item.status}}</view>
</view>
</view>
</view>
@@ -56,7 +56,7 @@
<view class="text-grey">{{item.startTime}}~{{item.endTime}}</view>
</view>
<view class="zhgh-list-b-right">
- <view class="round cu-tag margin-tb-sm lg {{item.status=='未开始'?bg-grey:item.status=='进行中'?bg-red:bg-blue}}">{{item.status}}</view>
+ <view class="round cu-tag margin-tb-sm lg {{item.status=='未开始'?'bg-green':item.status=='进行中'?'bg-orange':'bg-grey'}}">{{item.status}}</view>
</view>
</view>
</view>
@@ -74,7 +74,7 @@
<view class="text-grey">{{item.startTime}}~{{item.endTime}}</view>
</view>
<view class="zhgh-list-b-right">
- <view class="round cu-tag margin-tb-sm lg {{item.status=='未开始'?bg-grey:item.status=='进行中'?bg-red:bg-blue}}">{{item.status}}</view>
+ <view class="round cu-tag margin-tb-sm lg {{item.status=='未开始'?'bg-green':item.status=='进行中'?'bg-orange':'bg-grey'}}">{{item.status}}</view>
</view>
</view>
</view>
@@ -92,7 +92,7 @@
<view class="text-grey">{{item.startTime}}~{{item.endTime}}</view>
</view>
<view class="zhgh-list-b-right">
- <view class="round cu-tag margin-tb-sm lg {{item.status=='未开始'?bg-grey:item.status=='进行中'?bg-red:bg-blue}}">{{item.status}}</view>
+ <view class="round cu-tag margin-tb-sm lg {{item.status=='未开始'?'bg-green':item.status=='进行中'?'bg-orange':'bg-grey'}}">{{item.status}}</view>
</view>
</view>
</view>
diff --git a/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.js b/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.js
index da82fe5..e0b32c7 100644
--- a/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.js
+++ b/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.js
@@ -1,9 +1,9 @@
// pages/dxal/dxal.js
-import {
- $startWuxRefresher,
- $stopWuxRefresher,
- $stopWuxLoader
-} from '../../templeteDist/wuxDist/index';
+// import {
+// $startWuxRefresher,
+// $stopWuxRefresher,
+// $stopWuxLoader
+// } from '../../templeteDist/wuxDist/index';
var app = getApp();
@@ -24,28 +24,26 @@
scrollTop: 0,
},
- /**
- * 生命周期函数--监听页面加载
- */
- onLoad: function (options) {
- $startWuxRefresher();
+
+ onShow: function(options) {
+ this.showList()
},
- showList: function () {
+ showList: function() {
var that = this;
- // wx.showLoading();
+ 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();
+ 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)
+ // $stopWuxRefresher()
+ // $stopWuxLoader('#wux-refresher', this, true)
} else {
wx.showToast({
title: res.data.msg,
@@ -86,7 +84,7 @@
content: 'Wux Weapp'
})),
- linkFunction: function (event) {
+ linkFunction: function(event) {
var str = event.currentTarget.dataset['str'];
var id = event.currentTarget.dataset['id'];
wx.navigateTo({
@@ -94,25 +92,25 @@
})
},
- 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) {
+ searchIcon(e) {
console.log('onChange', e)
this.setData({
value: e.detail.value,
@@ -122,14 +120,12 @@
console.log('onFocus', e)
},
onBlur(e) {
- console.log('onBlur', e)
- this.setData({
- value: e.detail.value
- })
- this.showList();
+ console.log('onBlur', e);
+ this.showList()
},
onConfirm(e) {
- console.log('onConfirm', e)
+ console.log('onConfirm', e);
+ this.showList()
},
onClear(e) {
console.log('onClear', e)
@@ -139,5 +135,8 @@
},
onCancel(e) {
console.log('onCancel', e)
+ this.setData({
+ value: '',
+ })
},
})
\ No newline at end of file
diff --git a/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.wxml b/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.wxml
index 770ea7a..eb72cdd 100644
--- a/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.wxml
+++ b/SunshineLnsMinApp/pages/zscqdxal/zscqdxal.wxml
@@ -1,30 +1,27 @@
-<!-- <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:0px">
<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"/>
+ <input type="text" placeholder="搜索" value="{{ value }}" confirm-type="search" bindblur="onBlur" bindinput="searchIcon" bindconfirm="onConfirm"></input>
</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">
- <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>
+<!-- <wux-search-bar class="zscqdxal-top" value="{{ value }}" controlled placeholder="搜索" bind:change="onChange" bind:focus="onFocus" 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="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="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"><rich-text nodes="{{item.title}}"></rich-text></view>
- <view class="text-grey">{{item.case_number}} | 裁决日期{{item.decide_date}}</view>
+ <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">
+ <rich-text nodes="{{item.title}}"></rich-text>
</view>
- <!-- <view class="zhwj-b-head-r">
+ <view class="text-grey">{{item.case_number}} | 裁决日期{{item.decide_date}}</view>
+ </view>
+ <!-- <view class="zhwj-b-head-r">
<image mode='widthFix' src="{{dongtai1_1}}"></image>
</view> -->
- </view>
</view>
</view>
</view>
-</wux-refresher>
\ No newline at end of file
+</view>
\ No newline at end of file
diff --git a/SunshineLnsMinApp/utils/boy.svg b/SunshineLnsMinApp/utils/boy.svg
new file mode 100644
index 0000000..8e02859
--- /dev/null
+++ b/SunshineLnsMinApp/utils/boy.svg
@@ -0,0 +1 @@
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28"><defs><style>.cls-1{fill:#5d9fe9;}.cls-2{fill:#ed9796;}</style></defs><title>未成年</title><path class="cls-1" d="M19.26,24H2.5A2.5,2.5,0,0,1,0,21.5V6.5A2.5,2.5,0,0,1,2.5,4h22A2.5,2.5,0,0,1,27,6.5V18.17a.5.5,0,0,1-1,0V6.5A1.5,1.5,0,0,0,24.5,5H2.5A1.5,1.5,0,0,0,1,6.5v15A1.5,1.5,0,0,0,2.5,23H19.26a.5.5,0,1,1,0,1Z"/><path class="cls-1" d="M23,26a5,5,0,1,1,5-5A5,5,0,0,1,23,26Zm0-9a4,4,0,1,0,4,4A4,4,0,0,0,23,17Z"/><rect class="cls-1" x="22.5" y="18.04" width="1" height="3.46"/><rect class="cls-1" x="22.5" y="22.49" width="1" height="1"/><path class="cls-1" d="M7.5,15.5A3.5,3.5,0,1,1,11,12,3.5,3.5,0,0,1,7.5,15.5Zm0-6A2.5,2.5,0,1,0,10,12,2.5,2.5,0,0,0,7.5,9.5Z"/><path class="cls-1" d="M11.5,19.5h-8A.5.5,0,0,1,3,19a4.5,4.5,0,0,1,9,0A.5.5,0,0,1,11.5,19.5ZM4,18.5H11A3.5,3.5,0,0,0,4,18.5Z"/><rect class="cls-2" x="14" y="8.5" width="9" height="1"/><rect class="cls-2" x="14" y="13.5" width="9" height="1"/><rect class="cls-2" x="14" y="18.5" width="3" height="1"/></svg>
\ No newline at end of file
--
Gitblit v1.8.0