Merge branch 'feature_20240927_bug修改拜访任务操作示例图和手机号显示位置错误'

src/views/deviceWithin/addStoreVisit.vue

@@ -445,9 +445,9 @@
                           >{{ childitem.collectionName }}
                           <!-- 操作说明图片和电话 -->
                           <taskTips
-                            v-if="item.contactPhone || item.examplePhoto"
-                            :contactPhone="item.contactPhone"
-                            :examplePhoto="item.examplePhoto">
+                            v-if="childitem.contactPhone || childitem.examplePhoto"
+                            :contactPhone="childitem.contactPhone"
+                            :examplePhoto="childitem.examplePhoto">
                           </taskTips>
                         </template>
                         <template #right-icon>
@@ -496,9 +496,9 @@
                           >{{ childitem.collectionName }}
                           <!-- 操作说明图片和电话 -->
                           <taskTips
-                            v-if="item.contactPhone || item.examplePhoto"
-                            :contactPhone="item.contactPhone"
-                            :examplePhoto="item.examplePhoto">
+                            v-if="childitem.contactPhone || childitem.examplePhoto"
+                            :contactPhone="childitem.contactPhone"
+                            :examplePhoto="childitem.examplePhoto">
                           </taskTips
                         ></template>
                         <template #right-icon>
@@ -542,9 +542,9 @@
                           >{{ childitem.collectionName }}
                           <!-- 操作说明图片和电话 -->
                           <taskTips
-                            v-if="item.contactPhone || item.examplePhoto"
-                            :contactPhone="item.contactPhone"
-                            :examplePhoto="item.examplePhoto">
+                            v-if="childitem.contactPhone || childitem.examplePhoto"
+                            :contactPhone="childitem.contactPhone"
+                            :examplePhoto="childitem.examplePhoto">
                           </taskTips
                         ></template>
                         <template #right-icon>
@@ -589,9 +589,9 @@
                           >{{ childitem.collectionName }}
                           <!-- 操作说明图片和电话 -->
                           <taskTips
-                            v-if="item.contactPhone || item.examplePhoto"
-                            :contactPhone="item.contactPhone"
-                            :examplePhoto="item.examplePhoto">
+                            v-if="childitem.contactPhone || childitem.examplePhoto"
+                            :contactPhone="childitem.contactPhone"
+                            :examplePhoto="childitem.examplePhoto">
                           </taskTips>
                         </template>
                         <template #right-icon>
@@ -635,9 +635,9 @@
                           >{{ childitem.collectionName }}
                           <!-- 操作说明图片和电话 -->
                           <taskTips
-                            v-if="item.contactPhone || item.examplePhoto"
-                            :contactPhone="item.contactPhone"
-                            :examplePhoto="item.examplePhoto">
+                            v-if="childitem.contactPhone || childitem.examplePhoto"
+                            :contactPhone="childitem.contactPhone"
+                            :examplePhoto="childitem.examplePhoto">
                           </taskTips
                         ></template>
                         <template #right-icon>
@@ -661,9 +661,9 @@
                           >{{ childitem.collectionName }}
                           <!-- 操作说明图片和电话 -->
                           <taskTips
-                            v-if="item.contactPhone || item.examplePhoto"
-                            :contactPhone="item.contactPhone"
-                            :examplePhoto="item.examplePhoto">
+                            v-if="childitem.contactPhone || childitem.examplePhoto"
+                            :contactPhone="childitem.contactPhone"
+                            :examplePhoto="childitem.examplePhoto">
                           </taskTips
                         ></template>
                         <template #right-icon>
@@ -699,9 +699,9 @@
                             >{{ childitem.collectionName }}
                             <!-- 操作说明图片和电话 -->
                             <taskTips
-                              v-if="item.contactPhone || item.examplePhoto"
-                              :contactPhone="item.contactPhone"
-                              :examplePhoto="item.examplePhoto">
+                              v-if="childitem.contactPhone || childitem.examplePhoto"
+                              :contactPhone="childitem.contactPhone"
+                              :examplePhoto="childitem.examplePhoto">
                             </taskTips>
                           </p>
                           <p @click="viewSM" style="font-size: 14px; margin: 0">
@@ -751,9 +751,9 @@
                             >{{ childitem.collectionName }}
                             <!-- 操作说明图片和电话 -->
                             <taskTips
-                              v-if="item.contactPhone || item.examplePhoto"
-                              :contactPhone="item.contactPhone"
-                              :examplePhoto="item.examplePhoto">
+                              v-if="childitem.contactPhone || childitem.examplePhoto"
+                              :contactPhone="childitem.contactPhone"
+                              :examplePhoto="childitem.examplePhoto">
                             </taskTips>
                           </template>
                           <template #right-icon>
@@ -795,9 +795,9 @@
                                     >{{ childitem1.collectionName }}
                                     <!-- 操作说明图片和电话 -->
                                     <taskTips
-                                      v-if="item.contactPhone || item.examplePhoto"
-                                      :contactPhone="item.contactPhone"
-                                      :examplePhoto="item.examplePhoto">
+                                      v-if="childitem1.contactPhone || childitem1.examplePhoto"
+                                      :contactPhone="childitem1.contactPhone"
+                                      :examplePhoto="childitem1.examplePhoto">
                                     </taskTips
                                   ></template>
                                   <template #right-icon>
@@ -857,9 +857,9 @@
                                     >{{ childitem1.collectionName }}
                                     <!-- 操作说明图片和电话 -->
                                     <taskTips
-                                      v-if="item.contactPhone || item.examplePhoto"
-                                      :contactPhone="item.contactPhone"
-                                      :examplePhoto="item.examplePhoto">
+                                      v-if="childitem1.contactPhone || childitem1.examplePhoto"
+                                      :contactPhone="childitem1.contactPhone"
+                                      :examplePhoto="childitem1.examplePhoto">
                                     </taskTips
                                   ></template>
                                   <template #right-icon>
@@ -931,9 +931,9 @@
                                       >{{ childitem1.collectionName }}
                                       <!-- 操作说明图片和电话 -->
                                       <taskTips
-                                        v-if="item.contactPhone || item.examplePhoto"
-                                        :contactPhone="item.contactPhone"
-                                        :examplePhoto="item.examplePhoto">
+                                        v-if="childitem1.contactPhone || childitem1.examplePhoto"
+                                        :contactPhone="childitem1.contactPhone"
+                                        :examplePhoto="childitem1.examplePhoto">
                                       </taskTips>
                                     </p>
                                     <p @click="viewSM" style="font-size: 14px; margin: 0">
@@ -989,9 +989,9 @@
                                     >{{ childitem1.collectionName }}
                                     <!-- 操作说明图片和电话 -->
                                     <taskTips
-                                      v-if="item.contactPhone || item.examplePhoto"
-                                      :contactPhone="item.contactPhone"
-                                      :examplePhoto="item.examplePhoto">
+                                      v-if="childitem1.contactPhone || childitem1.examplePhoto"
+                                      :contactPhone="childitem1.contactPhone"
+                                      :examplePhoto="childitem1.examplePhoto">
                                     </taskTips
                                   ></template>
                                   <template #right-icon>
@@ -1040,9 +1040,9 @@
                                       >{{ childitem1.collectionName }}
                                       <!-- 操作说明图片和电话 -->
                                       <taskTips
-                                        v-if="item.contactPhone || item.examplePhoto"
-                                        :contactPhone="item.contactPhone"
-                                        :examplePhoto="item.examplePhoto">
+                                        v-if="childitem1.contactPhone || childitem1.examplePhoto"
+                                        :contactPhone="childitem1.contactPhone"
+                                        :examplePhoto="childitem1.examplePhoto">
                                       </taskTips
                                     ></template>
                                     <template #right-icon>
@@ -1106,9 +1106,12 @@
                                               >{{ child33item1.collectionName }}
                                               <!-- 操作说明图片和电话 -->
                                               <taskTips
-                                                v-if="item.contactPhone || item.examplePhoto"
-                                                :contactPhone="item.contactPhone"
-                                                :examplePhoto="item.examplePhoto">
+                                                v-if="
+                                                  child33item1.contactPhone ||
+                                                  child33item1.examplePhoto
+                                                "
+                                                :contactPhone="child33item1.contactPhone"
+                                                :examplePhoto="child33item1.examplePhoto">
                                               </taskTips
                                             ></template>
                                             <template #right-icon>
@@ -1187,9 +1190,12 @@
                                               >{{ child33item1.collectionName }}
                                               <!-- 操作说明图片和电话 -->
                                               <taskTips
-                                                v-if="item.contactPhone || item.examplePhoto"
-                                                :contactPhone="item.contactPhone"
-                                                :examplePhoto="item.examplePhoto">
+                                                v-if="
+                                                  child33item1.contactPhone ||
+                                                  child33item1.examplePhoto
+                                                "
+                                                :contactPhone="child33item1.contactPhone"
+                                                :examplePhoto="child33item1.examplePhoto">
                                               </taskTips
                                             ></template>
                                             <template #right-icon>
@@ -1281,9 +1287,12 @@
                                               >{{ child33item1.collectionName }}
                                               <!-- 操作说明图片和电话 -->
                                               <taskTips
-                                                v-if="item.contactPhone || item.examplePhoto"
-                                                :contactPhone="item.contactPhone"
-                                                :examplePhoto="item.examplePhoto">
+                                                v-if="
+                                                  child33item1.contactPhone ||
+                                                  child33item1.examplePhoto
+                                                "
+                                                :contactPhone="child33item1.contactPhone"
+                                                :examplePhoto="child33item1.examplePhoto">
                                               </taskTips
                                             ></template>
                                             <template #right-icon>
@@ -1342,9 +1351,12 @@
                                               >{{ child33item1.collectionName }}
                                               <!-- 操作说明图片和电话 -->
                                               <taskTips
-                                                v-if="item.contactPhone || item.examplePhoto"
-                                                :contactPhone="item.contactPhone"
-                                                :examplePhoto="item.examplePhoto">
+                                                v-if="
+                                                  child33item1.contactPhone ||
+                                                  child33item1.examplePhoto
+                                                "
+                                                :contactPhone="child33item1.contactPhone"
+                                                :examplePhoto="child33item1.examplePhoto">
                                               </taskTips
                                             ></template>
                                             <template #right-icon>
@@ -1413,9 +1425,12 @@
                                               >{{ child33item1.collectionName }}
                                               <!-- 操作说明图片和电话 -->
                                               <taskTips
-                                                v-if="item.contactPhone || item.examplePhoto"
-                                                :contactPhone="item.contactPhone"
-                                                :examplePhoto="item.examplePhoto">
+                                                v-if="
+                                                  child33item1.contactPhone ||
+                                                  child33item1.examplePhoto
+                                                "
+                                                :contactPhone="child33item1.contactPhone"
+                                                :examplePhoto="child33item1.examplePhoto">
                                               </taskTips
                                             ></template>
                                             <template #right-icon>
@@ -1482,9 +1497,12 @@
                                               >{{ child33item1.collectionName }}
                                               <!-- 操作说明图片和电话 -->
                                               <taskTips
-                                                v-if="item.contactPhone || item.examplePhoto"
-                                                :contactPhone="item.contactPhone"
-                                                :examplePhoto="item.examplePhoto">
+                                                v-if="
+                                                  child33item1.contactPhone ||
+                                                  child33item1.examplePhoto
+                                                "
+                                                :contactPhone="child33item1.contactPhone"
+                                                :examplePhoto="child33item1.examplePhoto">
                                               </taskTips
                                             ></template>
                                             <template #right-icon>
@@ -1529,9 +1547,12 @@
                                                 >{{ child33item1.collectionName }}
                                                 <!-- 操作说明图片和电话 -->
                                                 <taskTips
-                                                  v-if="item.contactPhone || item.examplePhoto"
-                                                  :contactPhone="item.contactPhone"
-                                                  :examplePhoto="item.examplePhoto">
+                                                  v-if="
+                                                    child33item1.contactPhone ||
+                                                    child33item1.examplePhoto
+                                                  "
+                                                  :contactPhone="child33item1.contactPhone"
+                                                  :examplePhoto="child33item1.examplePhoto">
                                                 </taskTips>
                                               </p>
                                               <p @click="viewSM" style="font-size: 14px; margin: 0">
@@ -1604,9 +1625,12 @@
                                                 >{{ child33item1.collectionName }}
                                                 <!-- 操作说明图片和电话 -->
                                                 <taskTips
-                                                  v-if="item.contactPhone || item.examplePhoto"
-                                                  :contactPhone="item.contactPhone"
-                                                  :examplePhoto="item.examplePhoto">
+                                                  v-if="
+                                                    child33item1.contactPhone ||
+                                                    child33item1.examplePhoto
+                                                  "
+                                                  :contactPhone="child33item1.contactPhone"
+                                                  :examplePhoto="child33item1.examplePhoto">
                                                 </taskTips
                                               ></template>
                                               <template #right-icon>
@@ -1677,10 +1701,11 @@
                                                         <!-- 操作说明图片和电话 -->
                                                         <taskTips
                                                           v-if="
-                                                            item.contactPhone || item.examplePhoto
+                                                            child44item1.contactPhone ||
+                                                            child44item1.examplePhoto
                                                           "
-                                                          :contactPhone="item.contactPhone"
-                                                          :examplePhoto="item.examplePhoto">
+                                                          :contactPhone="child44item1.contactPhone"
+                                                          :examplePhoto="child44item1.examplePhoto">
                                                         </taskTips
                                                       ></template>
                                                       <template #right-icon>
@@ -1767,10 +1792,11 @@
                                                         <!-- 操作说明图片和电话 -->
                                                         <taskTips
                                                           v-if="
-                                                            item.contactPhone || item.examplePhoto
+                                                            child44item1.contactPhone ||
+                                                            child44item1.examplePhoto
                                                           "
-                                                          :contactPhone="item.contactPhone"
-                                                          :examplePhoto="item.examplePhoto">
+                                                          :contactPhone="child44item1.contactPhone"
+                                                          :examplePhoto="child44item1.examplePhoto">
                                                         </taskTips>
                                                       </template>
                                                       <template #right-icon>
@@ -1872,10 +1898,11 @@
                                                         <!-- 操作说明图片和电话 -->
                                                         <taskTips
                                                           v-if="
-                                                            item.contactPhone || item.examplePhoto
+                                                            child44item1.contactPhone ||
+                                                            child44item1.examplePhoto
                                                           "
-                                                          :contactPhone="item.contactPhone"
-                                                          :examplePhoto="item.examplePhoto">
+                                                          :contactPhone="child44item1.contactPhone"
+                                                          :examplePhoto="child44item1.examplePhoto">
                                                         </taskTips>
                                                       </template>
                                                       <template #right-icon>
@@ -1943,10 +1970,11 @@
                                                         <!-- 操作说明图片和电话 -->
                                                         <taskTips
                                                           v-if="
-                                                            item.contactPhone || item.examplePhoto
+                                                            child44item1.contactPhone ||
+                                                            child44item1.examplePhoto
                                                           "
-                                                          :contactPhone="item.contactPhone"
-                                                          :examplePhoto="item.examplePhoto">
+                                                          :contactPhone="child44item1.contactPhone"
+                                                          :examplePhoto="child44item1.examplePhoto">
                                                         </taskTips>
                                                       </template>
                                                       <template #right-icon>
@@ -2023,10 +2051,11 @@
                                                         <!-- 操作说明图片和电话 -->
                                                         <taskTips
                                                           v-if="
-                                                            item.contactPhone || item.examplePhoto
+                                                            child44item1.contactPhone ||
+                                                            child44item1.examplePhoto
                                                           "
-                                                          :contactPhone="item.contactPhone"
-                                                          :examplePhoto="item.examplePhoto">
+                                                          :contactPhone="child44item1.contactPhone"
+                                                          :examplePhoto="child44item1.examplePhoto">
                                                         </taskTips>
                                                       </template>
                                                       <template #right-icon>
@@ -2156,10 +2185,15 @@
                                                           <!-- 操作说明图片和电话 -->
                                                           <taskTips
                                                             v-if="
-                                                              item.contactPhone || item.examplePhoto
+                                                              child44item1.contactPhone ||
+                                                              child44item1.examplePhoto
                                                             "
-                                                            :contactPhone="item.contactPhone"
-                                                            :examplePhoto="item.examplePhoto">
+                                                            :contactPhone="
+                                                              child44item1.contactPhone
+                                                            "
+                                                            :examplePhoto="
+                                                              child44item1.examplePhoto
+                                                            ">
                                                           </taskTips>
                                                         </p>
                                                         <p
@@ -2248,10 +2282,15 @@
                                                           <!-- 操作说明图片和电话 -->
                                                           <taskTips
                                                             v-if="
-                                                              item.contactPhone || item.examplePhoto
+                                                              child44item1.contactPhone ||
+                                                              child44item1.examplePhoto
+                                                            "
+                                                            :contactPhone="
+                                                              child44item1.contactPhone
                                                             "
-                                                            :contactPhone="item.contactPhone"
-                                                            :examplePhoto="item.examplePhoto">
+                                                            :examplePhoto="
+                                                              child44item1.examplePhoto
+                                                            ">
                                                           </taskTips
                                                         ></template>
                                                         <template #right-icon>
@@ -2327,9 +2366,9 @@
                                     >{{ childitem1.collectionName }}
                                     <!-- 操作说明图片和电话 -->
                                     <taskTips
-                                      v-if="item.contactPhone || item.examplePhoto"
-                                      :contactPhone="item.contactPhone"
-                                      :examplePhoto="item.examplePhoto">
+                                      v-if="childitem1.contactPhone || childitem1.examplePhoto"
+                                      :contactPhone="childitem1.contactPhone"
+                                      :examplePhoto="childitem1.examplePhoto">
                                     </taskTips>
                                   </template>
                                   <template #right-icon>
@@ -2384,9 +2423,9 @@
                                     >{{ childitem1.collectionName }}
                                     <!-- 操作说明图片和电话 -->
                                     <taskTips
-                                      v-if="item.contactPhone || item.examplePhoto"
-                                      :contactPhone="item.contactPhone"
-                                      :examplePhoto="item.examplePhoto">
+                                      v-if="childitem1.contactPhone || childitem1.examplePhoto"
+                                      :contactPhone="childitem1.contactPhone"
+                                      :examplePhoto="childitem1.examplePhoto">
                                     </taskTips>
                                   </template>
                                   <template #right-icon>
@@ -2441,9 +2480,9 @@
                                     >{{ childitem1.collectionName }}
                                     <!-- 操作说明图片和电话 -->
                                     <taskTips
-                                      v-if="item.contactPhone || item.examplePhoto"
-                                      :contactPhone="item.contactPhone"
-                                      :examplePhoto="item.examplePhoto">
+                                      v-if="childitem1.contactPhone || childitem1.examplePhoto"
+                                      :contactPhone="childitem1.contactPhone"
+                                      :examplePhoto="childitem1.examplePhoto">
                                     </taskTips>
                                   </template>
                                   <template #right-icon>