@@ -70,6 +70,8 @@ export default {
this.fileList = v
} else if (v?.url) {
this.fileList = [v]
+ } else if (v?.length > 0) {
+ this.fileList = v
}
}
},
@@ -128,7 +130,6 @@ export default {
this.$emit('manual', img)
uni.hideLoading()
} else {
- console.log(this.$instance.defaults)
uni.uploadFile({
url: this.$instance.defaults.baseURL + this.action,
filePath: img.path,
diff --git a/src/components/common.scss b/src/components/common.scss
index 3c28608..23b1714 100644
--- a/src/components/common.scss
+++ b/src/components/common.scss
@@ -1,5 +1,21 @@
@import '~uview-ui/theme.scss';
@import "ckeditor";
+
+/**
+常用内外边距样式
+ */
+@each $padMar, $pm in (mar:margin, pad:padding) {
+ @each $pos, $p in (l:left, r:right, t:top, b:bottom) {
+ @each $v in (8, 10, 16, 20, 32, 48, 64) {
+ .#{$padMar}-#{$pos+$v} {
+ #{$pm}-#{$p}: #{$v}px
+ }
+ }
+ }
+}
+.bg-fff{
+ background-color: #fff;
+}
@font-face {
font-family: 'iconfont';
/* project id 1862352 */
@@ -47,9 +63,31 @@ page {
.bg-hover {
background: #eee !important;
}
-
.flex {
display: flex;
+ align-items: center;
+
+ &.spb {
+ justify-content: space-between;
+ }
+
+ &.wrap {
+ flex-wrap: wrap;
+ }
+
+ &.column {
+ flex-direction: column;
+ }
+
+ &.start {
+ align-items: flex-start;
+ }
+}
+
+.fill {
+ flex: 1;
+ min-width: 0;
+ min-height: 0;
}
.flex-align {
@@ -489,263 +527,6 @@ button::after {
background-color: #fff;
}
-/**
- * author: Di (微信小程序开发工程师)
- * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
- * 垂直微信小程序开发交流社区
- *
- * github地址: https://github.com/icindy/wxParse
- *
- * for: 微信小程序富文本解析
- * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
- */
-
-.wxParse {
- width: 100%;
- font-family: Helvetica, sans-serif;
- font-size: 28px;
- color: #666;
- line-height: 1.8;
-}
-
-.wxParse view {
- word-break: hyphenate;
-}
-
-.wxParse .inline {
- display: inline;
- margin: 0;
- padding: 0;
-}
-
-.wxParse .div {
- margin: 0;
- padding: 0;
-}
-
-.wxParse .h1 {
- font-size: 2em;
- margin: 0.67em 0;
-}
-
-.wxParse .h2 {
- font-size: 1.5em;
- margin: 0.83em 0;
-}
-
-.wxParse .h3 {
- font-size: 1.17em;
- margin: 1em 0;
-}
-
-.wxParse .h4 {
- margin: 1.33em 0;
-}
-
-.wxParse .h5 {
- font-size: 0.83em;
- margin: 1.67em 0;
-}
-
-.wxParse .h6 {
- font-size: 0.67em;
- margin: 2.33em 0;
-}
-
-.wxParse .h1,
-.wxParse .h2,
-.wxParse .h3,
-.wxParse .h4,
-.wxParse .h5,
-.wxParse .h6,
-.wxParse .b,
-.wxParse .strong {
- font-weight: bolder;
-}
-
-.wxParse .p {
- margin: 1em 0;
- word-wrap: break-word;
-}
-
-.wxParse .i,
-.wxParse .cite,
-.wxParse .em,
-.wxParse .var,
-.wxParse .address {
- font-style: italic;
-}
-
-.wxParse .pre,
-.wxParse .tt,
-.wxParse .code,
-.wxParse .kbd,
-.wxParse .samp {
- font-family: monospace;
-}
-
-.wxParse .pre {
- overflow: auto;
- background: #f5f5f5;
- padding: 8px;
- white-space: pre;
- margin: 1em 0;
-}
-
-.wxParse .code {
- display: inline;
- background: #f5f5f5;
-}
-
-.wxParse .big {
- font-size: 1.17em;
-}
-
-.wxParse .small,
-.wxParse .sub,
-.wxParse .sup {
- font-size: 0.83em;
-}
-
-.wxParse .sub {
- vertical-align: sub;
-}
-
-.wxParse .sup {
- vertical-align: super;
-}
-
-.wxParse .s,
-.wxParse .strike,
-.wxParse .del {
- text-decoration: line-through;
-}
-
-.wxParse .strong,
-.wxParse .s {
- display: inline;
-}
-
-.wxParse .a {
- color: deepskyblue;
-}
-
-.wxParse .video {
- text-align: center;
- margin: 10px 0;
-}
-
-.wxParse .video-video {
- width: 100%;
-}
-
-.wxParse .img {
- display: inline-block;
- width: 0;
- height: 0;
- max-width: 100% !important;
- overflow: hidden;
-}
-
-.wxParse .blockquote {
- margin: 5px 0;
- padding: 10px 0 10px 10px;
- font-family: Courier, Calibri, "宋体";
- background: #f5f5f5;
- border-left: 3px solid #dbdbdb;
-}
-
-.wxParse .blockquote .p {
- margin: 0;
-}
-
-.wxParse .ul,
-.wxParse .ol {
- display: block;
- margin: 1em 0;
- padding-left: 16px;
-}
-
-.wxParse .ol {
- list-style-type: disc;
-}
-
-.wxParse .ol {
- list-style-type: decimal;
-}
-
-.wxParse .li {
- display: list-item;
- align-items: baseline;
- text-align: match-parent;
-}
-
-.wxParse .ul .ul,
-.wxParse .ol .ul {
- list-style-type: circle;
-}
-
-.wxParse .ol .ol .ul,
-.wxParse .ol .ul .ul,
-.wxParse .ul .ol .ul,
-.wxParse .ul .ul .ul {
- list-style-type: square;
-}
-
-.wxParse .u {
- text-decoration: underline;
-}
-
-.wxParse .hide {
- display: none;
-}
-
-.wxParse .del {
- display: inline;
-}
-
-.wxParse .figure {
- overflow: hidden;
-}
-
-.wxParse .table {
- width: 100%;
- overflow: auto;
-}
-
-.wxParse .thead,
-.wxParse .tfoot,
-.wxParse .tr {
- display: flex;
- flex-direction: row;
-}
-
-.wxParse .tr {
- width: 100%;
- display: flex;
- /*border-right: 1px solid #e0e0e0;*/
- border-bottom: 1px solid #e0e0e0;
-}
-
-.wxParse .th,
-.wxParse .td {
- display: flex;
- width: 260px;
- overflow: auto;
- padding: 5px;
- /*border-left: 1px solid #e0e0e0;*/
- text-align: center;
-}
-
-.wxParse .td:last-child {
- border-top: 1px solid #e0e0e0;
-}
-
-.wxParse .th {
- background: #f0f0f0;
- border-top: 1px solid #e0e0e0;
-}
-
.btn-wrapper {
position: fixed;
left: 50%;
@@ -757,6 +538,18 @@ button::after {
background: #f3f6f9;
}
+.bottomBtn {
+ color: #fff;
+ font-size: 34px;
+ background: #4181FF;
+ border-radius: 16px;
+ height: 88px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin: 8px 24px;
+}
+
.btn-wrapper {
.btn {
width: 686px;
diff --git a/src/components/pages/submitEvaluation.vue b/src/components/pages/submitEvaluation.vue
new file mode 100644
index 0000000..ac6c384
--- /dev/null
+++ b/src/components/pages/submitEvaluation.vue
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/mods/conv/AppPhotoReport/AppPhotoReport.vue b/src/mods/conv/AppPhotoReport/AppPhotoReport.vue
index a2de206..2bf9f80 100644
--- a/src/mods/conv/AppPhotoReport/AppPhotoReport.vue
+++ b/src/mods/conv/AppPhotoReport/AppPhotoReport.vue
@@ -1,27 +1,34 @@
-
-
-
{{ item.content }}
-
-
-
- {{ item.groupName }}
-
-
-
-
{{ item.girdName }}
+
+
+
+
+
{{ item.content }}
+
+
+
+ {{ item.groupName }}
+
+
+
+ {{ item.girdName }}
+
-
-
-
-
-
{{ item.statusName }}
+
+
+
+ {{ item.statusName }}
+
+
+ 去评价
+ 已评价
+
-
删除
-
+
@@ -43,7 +50,10 @@ export default {
pageShow: false,
current: 1,
total: 0,
- isMore: false
+ isMore: false,
+ itemOptions: [
+ {text: '删除', style: {backgroundColor: '#f46'}}
+ ]
}
},
@@ -140,10 +150,11 @@ export default {
.photo-item {
width: 686px;
- margin: 0 auto 24px;
+ margin: 0 32px 24px;
background: #FFFFFF;
box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.02);
border-radius: 16px;
+ overflow: hidden;
.photo-item__top {
padding: 32px;
@@ -198,6 +209,20 @@ export default {
background: #FF883C;
}
+ .itemBtn {
+ border: 1px solid #4181FF;
+ border-radius: 8px;
+ color: #4181FF;
+ padding: 8px 22px;
+
+
+ }
+
+ .finish {
+ color: #42D784;
+ font-size: 28px;
+ }
+
span {
color: #FF883C;
font-size: 28px;
diff --git a/src/mods/conv/AppPhotoReport/PhotoDetail.vue b/src/mods/conv/AppPhotoReport/PhotoDetail.vue
index 765b252..3bb2662 100644
--- a/src/mods/conv/AppPhotoReport/PhotoDetail.vue
+++ b/src/mods/conv/AppPhotoReport/PhotoDetail.vue
@@ -1,64 +1,89 @@
-
{{ info.content }}
-
- {{ $dict.getLabel('clapEventStatus', info.eventStatus) }}
-
-
-
- 事件类型
- {{ info.groupName }}
-
-
- 所属网格
- {{ info.girdName }}
-
-
- 上报时间
- {{ info.createTime }}
-
-
-
照片
-
-
+
+ {{ info.content }}
+
+
+
+
+
+
+
+
+ 暂无照片
+
+
+
+
+
+
+
+ 暂无照片
+
+
+
+
currentTab=v"/>
+
+
+
+
- 暂无照片
-
-
-
-
处理详情
-
-
处理结果
-
{{ result.doExplain || '-' }}
-
-
-
+
+
+
+
+
+
+ 去评价
+