Merge branch 'feature_20260108_陈列奖励案任务合并' into release

src/components/deleteUploadImgTaskPhoto.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="deleteUploadImgTaskPhoto">
     <van-row gutter="10">
-      <van-col span="6" style="background: #f5f5f5" v-if="insert == '1'">
+      <van-col span="6" style="" v-if="insert == '1'">
         <div class="addImg">
           <uploadVNormalTaskPhoto
             :imgArr="imgs"
@@ -155,17 +155,18 @@ export default {
 
 <style lang="scss" scoped>
 .deleteUploadImgTaskPhoto {
+  margin-left: 20px;
 }
 .addImg {
-  width: 100%;
-  height: 72px;
+  height: 88px;
   display: flex;
   align-items: center;
   justify-content: center;
+  background: #f5f5f5;
 }
 .imgview {
   width: 100%;
-  height: 72px;
+  height: 88px;
   position: relative;
   display: inline-block;
   i {

src/components/uploadVNormalTaskPhoto.vue

@@ -4,6 +4,7 @@
     <!-- 企业微信拍照 -->
     <div class="cameraDiv" @click="uploadImg" v-if="userInfo.photoMethod == '0'">
       <van-icon class="photo photos" name="plus" size="22px" color="#969696" />
+      <span style="font-size: 10px">添加图片</span>
     </div>
     <!-- 原生自带拍照 -->
     <H5Camera
@@ -244,7 +245,7 @@ export default {
                     },
                     function (err) {
                       that.addressesRemark = '';
-                    }
+                    },
                   );
                 },
                 fail: function () {
@@ -506,13 +507,15 @@ export default {
   font-size: 16px;
   color: #484848;
   // line-height: 40px;
-  padding: 0 15px;
+  // padding: 0 15px;
   box-sizing: border-box;
   position: relative;
+  width: 100%;
 
-  .cameraDivp {
+  .cameraDiv {
     flex: 1;
     display: flex;
+    flex-direction: column;
     align-items: center;
     justify-content: center;
     .photo {

src/views/deviceWithin/taskPhotoTaking.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="taskPhotoTaking">
-    <van-nav-bar class="navBar" left-arrow title="拜访任务" @click-left="onClickLeft">
+    <van-nav-bar class="navBar" left-arrow title="生动化陈列" @click-left="onClickLeft">
       <template #right>
         <span
           v-if="isEdit && insert == '1'"
@@ -23,9 +23,11 @@
             <div v-if="item.answerType == 'zp'" class="formLabel z-cell">
               <van-cell>
                 <template #title>
-                  <span v-if="item.isMust == 0" class="van-f-red">*</span>
-                  <span>1.</span>
-                  {{ item.collectionName }}
+                  <!-- <span v-if="item.isMust == 0" class="van-f-red">*</span> -->
+                  <div class="headline">
+                    <span class="headlineIcon"></span>
+                    <span class="headlineTitle">上传照片</span>
+                  </div>
                   <!-- 操作说明图片和电话 -->
                   <taskTips
                     v-if="item.contactPhone || item.examplePhoto"
@@ -34,7 +36,7 @@
                   </taskTips>
                 </template>
               </van-cell>
-              <delete-upload-img
+              <deleteUploadImg
                 :imgs="item.fileInfoList"
                 :storeGroupId="storeGroupId"
                 :taskIds="taskIds"
@@ -46,18 +48,22 @@
                 :pictureSource="item.pictureSource"
                 :continuousShoot="item.continuousShoot"
                 :insert="insert"
-                :objectType="objectType"></delete-upload-img>
+                :objectType="objectType"></deleteUploadImg>
             </div>
           </div>
         </van-form>
       </div>
       <div class="dataList" v-if="dataList">
+        <div class="headline" style="margin-top: 10px">
+          <span class="headlineIcon"></span>
+          <span class="headlineTitle">门店参与的陈列任务要求</span>
+        </div>
         <div class="dataItem" v-for="(item, index) in dataList">
           <div class="itemTop">
             <div class="itemIndex">
               <p>{{ index + 1 }}、</p>
             </div>
-            <div v-html="item.displayInstructions"></div>
+            <div class="itemHtml" v-html="item.displayInstructions"></div>
           </div>
           <div class="itemBottom" v-if="insert == '0'">
             <img
@@ -67,9 +73,6 @@
                   ? require('@/assets/taskPhotoSu.png')
                   : require('@/assets/taskPhotoErr.png')
               " />
-            <!-- <img
-              v-if="item.taskPhotoConditionPassed == 0"
-              :src="require('@/assets/taskPhotoErr.png')" /> -->
           </div>
         </div>
       </div>
@@ -224,11 +227,12 @@ export default {
       background: #fff;
       width: 100%;
       border-radius: 6px;
-      padding: 10px;
+      // padding: 10px;
+      padding: 0 10px 10px 0px;
     }
     .formLabel {
-      margin-left: 20px;
-      border-bottom: 1px solid #f1f1f1;
+      // margin-left: 20px;
+      // border-bottom: 1px solid #f1f1f1;
     }
     .formLabel .van-cell {
       padding: 10px 0;
@@ -259,24 +263,53 @@ export default {
       display: inline-block;
       line-height: 26px;
     }
+    .headline {
+      font-weight: 600;
+      font-size: 16px;
+      position: relative;
+      display: flex;
+      align-items: center;
+      .headlineIcon {
+        display: inline-block;
+        position: absolute;
+        width: 3px;
+        height: 60%;
+        background: #3875c6;
+        border-radius: 5px;
+      }
+      .headlineTitle {
+        display: inline-block;
+        padding: 0px 20px;
+        background: #eef5ff;
+        border-radius: 0 18px 18px 0;
+        height: 36px;
+        line-height: 36px;
+      }
+    }
   }
   .dataList {
     width: 100%;
     margin-top: 10px;
     overflow-y: auto;
+    background: #fff;
     .dataItem {
       display: flex;
-      background: #fff;
-      border-radius: 6px;
-      flex-direction: column;
+      // border-radius: 6px;
+      flex-direction: row;
       margin-bottom: 10px;
-      padding: 10px;
+      // padding: 10px;
       font-size: 16px;
-      padding-left: 20px;
+      margin-left: 20px;
+      border-bottom: 1px solid #e2e1e1;
       .itemIndex {
       }
       .itemTop {
         flex: 1;
+        overflow: hidden;
+        padding-bottom: 10px;
+        .itemHtml {
+          overflow-x: auto;
+        }
       }
       .itemTop,
       .itemBottom {
@@ -284,13 +317,27 @@ export default {
         flex-direction: row;
       }
       .itemBottom {
-        justify-content: end;
+        align-items: center;
+        width: 35px;
+        margin-left: 5px;
+        img {
+          width: 100%;
+          height: 30px;
+        }
       }
     }
   }
 }
 </style>
 <style lang="scss">
+// .taskPhotoTaking {
+//   .itenHtml {
+//     overflow: hidden;
+//     img {
+//       width: 100%;
+//     }
+//   }
+// }
 .identifyResultdialog {
   width: vw(690) !important;
   margin-top: 1vh !important;