From 36a629a3cf1e082a750e9691632d3b3bf28888b8 Mon Sep 17 00:00:00 2001
From: liuwh <liuwh@hugeinfo.com.cn>
Date: Sat, 14 Mar 2020 22:47:52 +0800
Subject: [PATCH] 小程序bug修改
---
SunshineLnsMinApp/pages/myTranslate/myTranslate.wxml | 38 ++++++++++---------
SunshineLnsMinApp/pages/myTranslate/myTranslate.js | 2 +
SunshineLnsMinApp/pages/zhdtInfo/zhdtInfo.wxml | 4 +-
SunshineLnsMinApp/pages/zhdtInfo/zhdtInfo.js | 49 ------------------------
SunshineLnsMinApp/pages/zhghInfo/zhghInfo.wxml | 6 ++-
5 files changed, 28 insertions(+), 71 deletions(-)
diff --git a/SunshineLnsMinApp/pages/myTranslate/myTranslate.js b/SunshineLnsMinApp/pages/myTranslate/myTranslate.js
index d587e72..3afe53d 100644
--- a/SunshineLnsMinApp/pages/myTranslate/myTranslate.js
+++ b/SunshineLnsMinApp/pages/myTranslate/myTranslate.js
@@ -57,6 +57,8 @@
if (res.data.code == 0) {
(res.data.data.content).forEach(e => {
(e.createTime) = app.formatDate(e.createTime)
+ e.startTime ? (e.startTime) = app.formatDate(e.startTime) : ''
+ e.endTime ? (e.endTime) = app.formatDate(e.endTime || '') : ""
switch (e.activityType) {
case 'act_1':
e.activityType = '南检活动';
diff --git a/SunshineLnsMinApp/pages/myTranslate/myTranslate.wxml b/SunshineLnsMinApp/pages/myTranslate/myTranslate.wxml
index db24d31..14d61d3 100644
--- a/SunshineLnsMinApp/pages/myTranslate/myTranslate.wxml
+++ b/SunshineLnsMinApp/pages/myTranslate/myTranslate.wxml
@@ -1,26 +1,28 @@
<!--pages/myTranslate/myTranslate.wxml-->
<!--导航条-->
<view class="navbar">
- <text wx:for="{{navbar}}" data-idx="{{index}}" class="item {{currentTab==index ? 'active' : ''}}" wx:key="unique" bindtap="navbarTap">{{item}}</text>
+ <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' id="{{key}}" wx:for="{{dataSet}}" wx:for-index='key' wx:key="*this">
- <div class="businessSchedule-top">
- <div class="businessSchedule-top-img">
+ <div class="businessSchedule" bindtap='businessSchedule' id="{{key}}" wx:for="{{dataSet}}" wx:for-index='key' wx:key="*this">
+ <div class="businessSchedule-top">
+ <!-- <div class="businessSchedule-top-img">
<image src="{{item.iconSrc}}" class="businessSchedule-top-img"></image>
- </div>
- <div class="businessSchedule-top-title">{{item.activityType}}</div>
- <div class="businessSchedule-top-status backgroundorange-title" wx:if="{{item.signStatus==1}}">未审核</div>
- <div class="businessSchedule-top-status backgroundorange-title" wx:if="{{item.signStatus==2}}">未签到</div>
- <div class="businessSchedule-top-status backgroundorange-title" wx:if="{{item.signStatus==3}}">已签到</div>
- <div class="businessSchedule-top-status backgroundorange-title" wx:if="{{item.signStatus==4}}">不通过</div>
- <div class="businessSchedule-top-status backgroundgreen-title" wx:if="{{item.signStatus==99}}">取消</div>
- </div>
- <div class="businessSchedule-center">{{item.activityDese}}</div>
- <div class="businessSchedule-bottom">于 {{item.createTime}} 提交申请</div>
- </div>
- <div class="businessSchedule-load">------{{content}}------</div>
-</view>
-
+ </div> -->
+ <div class="businessSchedule-top-title">{{item.activityTitle}}</div>
+ <div class="businessSchedule-top-status backgroundorange-title" wx:if="{{item.signStatus==1}}">未审核</div>
+ <div class="businessSchedule-top-status backgroundorange-title" wx:if="{{item.signStatus==2}}">未签到</div>
+ <div class="businessSchedule-top-status backgroundorange-title" wx:if="{{item.signStatus==3}}">已签到</div>
+ <div class="businessSchedule-top-status backgroundorange-title" wx:if="{{item.signStatus==4}}">不通过</div>
+ <div class="businessSchedule-top-status backgroundgreen-title" wx:if="{{item.signStatus==99}}">取消</div>
+ </div>
+ <div class="businessSchedule-center">活动类型：{{item.activityType}}</div>
+ <div class="businessSchedule-center">活动描述：{{item.activityDese}}</div>
+ <div class="businessSchedule-center">开始时间：{{item.startTime}}</div>
+ <div class="businessSchedule-center">结束时间：{{item.endTime}}</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/zhdtInfo/zhdtInfo.js b/SunshineLnsMinApp/pages/zhdtInfo/zhdtInfo.js
index 39ad0a6..dbc0766 100644
--- a/SunshineLnsMinApp/pages/zhdtInfo/zhdtInfo.js
+++ b/SunshineLnsMinApp/pages/zhdtInfo/zhdtInfo.js
@@ -38,53 +38,4 @@
}
})
},
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- 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/zhdtInfo/zhdtInfo.wxml b/SunshineLnsMinApp/pages/zhdtInfo/zhdtInfo.wxml
index 36111c3..24eae90 100644
--- a/SunshineLnsMinApp/pages/zhdtInfo/zhdtInfo.wxml
+++ b/SunshineLnsMinApp/pages/zhdtInfo/zhdtInfo.wxml
@@ -1,8 +1,8 @@
<!--pages/zhdtInfo/zhdtInfo.wxml-->
-<swiper class="screen-swiper square-dot" indicator-dots="true" circular="true" autoplay="true" interval="5000" duration="500">
+<swiper wx:if="{{data.attList.length > 0}}" class="screen-swiper square-dot" indicator-dots="true" circular="true" autoplay="true" interval="5000" duration="500">
<swiper-item wx:for="{{data.attList}}" wx:key>
- <image src="{{item.url}}" mode="aspectFill"></image>
+ <image src="{{item.path}}" 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>
diff --git a/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.wxml b/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.wxml
index 53df3f2..03ec45b 100644
--- a/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.wxml
+++ b/SunshineLnsMinApp/pages/zhghInfo/zhghInfo.wxml
@@ -16,7 +16,9 @@
<view class="zhghInfo-center-title">任务分派时间：
<text>{{data.createTime}}</text>
</view>
- <view class="zhghInfo-center-title">任务描述</view>
+ <view class="zhghInfo-center-title">任务要求</view>
+ <view class="zhghInfo-center-txt">{{data.taskRequire}}</view>
+ <view class="zhghInfo-center-title">任务流程</view>
<view class="zhghInfo-center-txt">{{data.taskRequire}}</view>
</view>
@@ -36,7 +38,7 @@
<view class="zhghInfo-text">
<view class="zhghInfo-center-title">任务汇报</view>
<view class="zhghInfo-center-textarea">
- <textarea data-name="taskReport" bindinput="inputChange" disabled="{{disabled}}" placeholder="学会与老人沟通，耐心积极，心态良好" placeholder-style="color:#9B9B9B;"></textarea>
+ <textarea data-name="taskReport" bindinput="inputChange" disabled="{{disabled}}" placeholder="学会与老人沟通，耐心积极，心态良好" placeholder-style="color:#9B9B9B;"></textarea>
</view>
<view class="button-submit" bindtap='linkFunction'>提交</view>
</view>
--
Gitblit v1.8.0