客户页面

pages/admin/Hetong/HetongInfo.vue

@@ -4,51 +4,21 @@
 			<view @click="goUpPage" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">合同</text>
 		</view>
-
-<<<<<<< HEAD
-      <template v-if="tId">
-		  <view class="pdf-box">
-			<img v-for="item in imgList" mode="aspectFit" :src="`data:image/png;base64,${item}`" 
-			@click="previewBase64Image(`data:image/png;base64,${item}`)"  class="pdf-img"/>
-			<!-- 加载提示 -->
-			<view class="pdf-tip" v-if="isLoading">
-				加载中...
-			</view>
-		  </view>
-      </template>
-	  
-	  <view class="hetong-tip-box" v-if="tId && info.status == 0">
-		  请务必仔细阅读上述内容，确认已完全理解所有条款后，点击【我已阅读】按钮完成签字确认。
-	  </view>
-	  <button @click="handleQianming" v-if="tId && info.status == 0"
-	  class="phone-green-btn ht-btn"  type="default">我已阅读</button>
-	  
-	  <uni-popup ref="popupRef" type="bottom" background-color="#fff" :is-mask-click="false" :mask-click="false">
-	  	<view class="ht-qm-popup">
-	  			<view class="icon-title-navBar-box">
-	  				<view @click="goback2" class="nav-bar-icon"></view>
-	  				<text class="nav-bar-title">签名</text>
-	  			</view>
-	  			<writeSign @getBase64="getBase64"></writeSign>
-	  	</view>
-	  </uni-popup>
-	  
-	  
-    </view>
-=======
 		<template v-if="tId">
 			<view class="pdf-box">
-				<view class="pdf-box">
-					<image v-for="item in imgList" mode="aspectFit" :src="`data:image/png;base64,${item}`"
-						@click="previewBase64Image(`data:image/png;base64,${item}`)"></image>
+				<img v-for="item in imgList" mode="aspectFit" :src="`data:image/png;base64,${item}`"
+					@click="previewBase64Image(`data:image/png;base64,${item}`)" class="pdf-img" />
+				<!-- 加载提示 -->
+				<view class="pdf-tip" v-if="isLoading">
+					加载中...
 				</view>
 			</view>
 		</template>
 
-		<view class="hetong-tip-box" v-if="info.status == 0">
+		<view class="hetong-tip-box" v-if="tId && info.status == 0">
 			请务必仔细阅读上述内容，确认已完全理解所有条款后，点击【我已阅读】按钮完成签字确认。
 		</view>
-		<button @click="handleQianming" v-if="info.status == 0" class="phone-green-btn ht-btn"
+		<button @click="handleQianming" v-if="tId && info.status == 0" class="phone-green-btn ht-btn"
 			type="default">我已阅读</button>
 
 		<uni-popup ref="popupRef" type="bottom" background-color="#fff" :is-mask-click="false" :mask-click="false">
@@ -60,14 +30,7 @@
 				<writeSign @getBase64="getBase64"></writeSign>
 			</view>
 		</uni-popup>
-
-		<!-- 加载提示 -->
-		<view class="loading-overlay" v-if="isLoading">
-			<view class="loading-spinner"></view>
-			<text class="loading-text">加载中...</text>
-		</view>
 	</view>
->>>>>>> e3e8c285562878f43ea9ee7922f22069748c83fd
 </template>
 
 <script setup>
@@ -171,7 +134,6 @@
 			})
 			return;
 		}
-		console.log(22222)
 		handleQM(img)
 
 	}