diff --git a/components/ImageInfo/index.js b/components/ImageInfo/index.js
index 22daa33..154d33f 100644
--- a/components/ImageInfo/index.js
+++ b/components/ImageInfo/index.js
@@ -17,11 +17,8 @@ Component({
let arr = []
if(list.length > 0) {
list.forEach(item=> {
- if(item.healthUrl) {
- arr.push(item.healthUrl)
- }
- if(item.passingUrl) {
- arr.push(item.passingUrl)
+ if(item.imageUrl) {
+ arr.push(item.imageUrl)
}
})
}
diff --git a/desktop.ini b/desktop.ini
new file mode 100644
index 0000000..d957fd1
--- /dev/null
+++ b/desktop.ini
@@ -0,0 +1,4 @@
+[ViewState]
+Mode=
+Vid=
+FolderType=Generic
diff --git a/package_A/page/alltask/index.wxml b/package_A/page/alltask/index.wxml
index 731f371..c2250c7 100644
--- a/package_A/page/alltask/index.wxml
+++ b/package_A/page/alltask/index.wxml
@@ -2,13 +2,20 @@
-
- {{startTime}}
- 开始日期
+
+
+ {{startTime}}
+ 开始日期
+
+
-
- {{endTime}}
- 结束日期
+ ~
+
+
+ {{endTime}}
+ 结束日期
+
+
diff --git a/package_A/page/alltask/index.wxss b/package_A/page/alltask/index.wxss
index adb7ddf..0072d71 100644
--- a/package_A/page/alltask/index.wxss
+++ b/package_A/page/alltask/index.wxss
@@ -16,6 +16,7 @@
width: 100%;
height: 90rpx;
background-color: #fff;
+ border-bottom: 1rpx solid rgba(192, 188, 188, 0.35);
display: flex;
justify-content: space-evenly;
align-items: center;
@@ -25,6 +26,13 @@
z-index: 99;
font-size: 30rpx;
}
+ .picker_box {
+ width: 220rpx;
+ padding-right: 20rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
/* 列表样式 */
.task_list {
diff --git a/package_A/page/upload/index.js b/package_A/page/upload/index.js
index 1a3497b..755ad90 100644
--- a/package_A/page/upload/index.js
+++ b/package_A/page/upload/index.js
@@ -37,11 +37,8 @@ Page({
let arr = []
if(list.length > 0) {
list.forEach(item=> {
- if(item.healthUrl) {
- arr.push(item.healthUrl)
- }
- if(item.passingUrl) {
- arr.push(item.passingUrl)
+ if(item.imageUrl) {
+ arr.push(item.imageUrl)
}
})
}
@@ -52,12 +49,7 @@ Page({
this.getOssAuthForm()
}
},
- /**
- * 生命周期函数--监听页面显示
- */
- onShow() {
-
- },
+
// 图片预览
previewImage(e) {
let type = e.currentTarget.dataset.type
@@ -155,7 +147,7 @@ Page({
this.validate(type+'List')
},
fail: (e) => {
- console.log(e);
+ console.log('取消选择');
}
})
},
@@ -215,18 +207,14 @@ Page({
'x-oss-security-token': ossForm.SecurityToken
},
success: (res)=> {
+ console.log(res, '=+++++++++=');
if(res.statusCode === 204) {
// 上传成功，将图片路径resolve出去
resolve(key)
- } else {
- wx.showToast({
- title: '图片上传失败',
- })
- reject('图片上传失败')
- }
+ }
},
fail: (e)=> {
- console.log(e);
+ console.log(e, '+++++++++++++++++++++++++');
reject('图片上传失败')
}
})
@@ -244,13 +232,19 @@ Page({
url: '/pages/task/task',
})
}
+ }).catch(e=> {
+ console.log(e);
}).finally(()=>{
wx.hideLoading();
})
- }).catch(()=> {
+ }).catch((e)=> {
wx.hideLoading()
+ console.log(e, 'promise.all失败');
+ wx.showToast({
+ title: '图片上传失败',
+ })
})
}
}
diff --git a/package_A/page/upload/index.wxml b/package_A/page/upload/index.wxml
index f7c85a4..28ef271 100644
--- a/package_A/page/upload/index.wxml
+++ b/package_A/page/upload/index.wxml
@@ -10,6 +10,7 @@
+ 拍照上传
请上传车牌号照片
@@ -24,6 +25,7 @@
+ 拍照上传
请上传健康码、行程卡图片
diff --git a/package_A/page/upload/index.wxss b/package_A/page/upload/index.wxss
index ef20299..8eba803 100644
--- a/package_A/page/upload/index.wxss
+++ b/package_A/page/upload/index.wxss
@@ -16,7 +16,7 @@
flex-direction: column;
justify-content: space-between;
align-items: flex-start;
- font-size: 28rpx;
+ font-size: 34rpx;
color: #666666;
position: relative;
}
@@ -56,7 +56,7 @@
display: block;
position: absolute;
width: 60%;
- height: 6rpx;
+ height: 10rpx;
top:50%;
left:50%;
background:rgb(124, 124, 124);
@@ -69,7 +69,7 @@
display: block;
position: absolute;
width: 60%;
- height: 6rpx;
+ height: 10rpx;
top:50%;
left:50%;
background:rgb(124, 124, 124);
@@ -81,6 +81,7 @@
width: 200rpx;
height: 200rpx;
display: flex;
+ flex-direction: column;
align-items: center;
justify-content: center;
border: 1rpx dashed #A6A6A6;
@@ -129,13 +130,7 @@
border-radius: 40rpx;
line-height: 80rpx;
text-align: center;
- font-size: 30rpx;
-}
-.cancel_btn {
- color: #333333;
- border: 1rpx solid #E6E6E6;
-}
-.submit_btn {
+ font-size: 32rpx;
color: #ffffff;
background-color: #477DF3;
-}
\ No newline at end of file
+}
diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml
index 5fb8f99..131ec7c 100644
--- a/pages/mine/mine.wxml
+++ b/pages/mine/mine.wxml
@@ -3,10 +3,9 @@
-
- {{userInfo.name}}
- 防疫负责人：{{userInfo.contactsName}}
+ {{userInfo.name}}
+ 防疫负责人：{{userInfo.contactsName}}
联系方式：{{userInfo.contactsPhone}}
diff --git a/pages/mine/mine.wxss b/pages/mine/mine.wxss
index 5749624..d7f262d 100644
--- a/pages/mine/mine.wxss
+++ b/pages/mine/mine.wxss
@@ -28,23 +28,19 @@
.user_box {
box-sizing: border-box;
width: 100%;
- padding: 30rpx;
+ padding: 40rpx;
display: flex;
justify-content: flex-start;
align-items: flex-start;
}
-.user_avatar {
- width: 120rpx;
- height: 120rpx;
- margin-right: 30rpx;
-}
.company_box {
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: flex-start;
- font-size: 30rpx;
+ font-size: 32rpx;
+ color: #ffffff;
}
.label_list {
width: 100%;
diff --git a/pages/task/task.js b/pages/task/task.js
index 5a95220..a6d2f89 100644
--- a/pages/task/task.js
+++ b/pages/task/task.js
@@ -7,18 +7,7 @@ Page({
*/
data: {
userInfo: {},
- dataList: [
- // {
- // createTime: '2020-2-10 14:44:21',
- // carUrl: 'http://www.baidu.com/img/bdlogo.png',
- // registerFlowmanVoList: [{healthUrl: 'http://rongcloud-web.qiniudn.com/docs_demo_rongcloud_logo.png',passingUrl: 'http://rongcloud-web.qiniudn.com/docs_demo_rongcloud_logo.png'}]
- // },
- // {
- // createTime: '2020-2-10 14:44:21',
- // carUrl: 'http://www.baidu.com/img/bdlogo.png',
- // registerFlowmanVoList: [{healthUrl: 'http://rongcloud-web.qiniudn.com/docs_demo_rongcloud_logo.png',passingUrl: 'http://rongcloud-web.qiniudn.com/docs_demo_rongcloud_logo.png'}]
- // }
- ]
+ dataList: []
},
onLoad() {
@@ -34,7 +23,7 @@ Page({
},
// 获取近期记录
getRecodesList() {
- getAllTask({page: 1, limit:5}).then(res=> {
+ getAllTask({page: 1, limit:3}).then(res=> {
if(res?.code === 0) {
this.setData({dataList: res.data?.records})
}
diff --git a/pages/task/task.wxml b/pages/task/task.wxml
index 75e35b9..7aa3f5e 100644
--- a/pages/task/task.wxml
+++ b/pages/task/task.wxml
@@ -3,8 +3,7 @@
-
- {{userInfo.name}}
+ {{userInfo.name}}
diff --git a/pages/task/task.wxss b/pages/task/task.wxss
index 568892b..53ba685 100644
--- a/pages/task/task.wxss
+++ b/pages/task/task.wxss
@@ -12,6 +12,7 @@
box-sizing: border-box;
width: 100%;
height: 420rpx;
+ flex-shrink: 0;
padding: 30rpx;
display: flex;
flex-direction: column;
@@ -24,8 +25,11 @@
width: 100%;
margin-bottom: 20rpx;
display: flex;
- justify-content: flex-start;
+ justify-content: center;
align-items: center;
+ font-size: 36rpx;
+ font-weight: bolder;
+ color: #ffffff;
}
.to_upload {
width: 600rpx;
diff --git a/project.private.config.json b/project.private.config.json
index 23b844a..c4ca77d 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -51,5 +51,6 @@
"setting": {
"urlCheck": false,
"compileHotReLoad": true
- }
+ },
+ "libVersion": "2.27.0"
}
\ No newline at end of file