Просмотр исходного кода

Merge branch '测试' into 国际化适配

# Conflicts:
#	project.private.config.json
xiaohaizhao 1 год назад
Родитель
Сommit
88c55af426
1 измененных файлов с 29 добавлено и 19 удалено
  1. 29 19
      packageA/expenseBreakdown/index.wxml

+ 29 - 19
packageA/expenseBreakdown/index.wxml

@@ -2,24 +2,34 @@
 	<view class="title">
 		跟进记录
 	</view>
-	<view class="row">
-		跟进类型:{{item.type || ' --'}}
-	</view>
-	<view class="row">
-		跟进时间:{{item.createdate ||' --'}}
-	</view>
-	<view class="row">
-		目的:{{item.target ||' --'}}
-	</view>
-	<view class="row">
-		过程:{{item.content ||' --'}}
-	</view>
-	<view class="row">
-		结果:{{item.results ||' --'}}
-	</view>
-	<view class="row">
-		下次跟进计划:{{item.nextplan ||' --'}}
-	</view>
+	<block wx:if="{{content.ownertable}}">
+		<view class="row">
+			跟进类型:{{detail.type || ' --'}}
+		</view>
+		<view class="row">
+			跟进时间:{{detail.createdate ||' --'}}
+		</view>
+		<view class="row">
+			目的:{{detail.target ||' --'}}
+		</view>
+		<view class="row">
+			过程:{{detail.content ||' --'}}
+		</view>
+		<view class="row">
+			结果:{{detail.results ||' --'}}
+		</view>
+		<view class="row">
+			下次跟进计划:{{detail.nextplan ||' --'}}
+		</view>
+	</block>
+	<block wx:else>
+		<view class="row">
+			跟进类型:{{detail.followupmode}}
+		</view>
+		<view class="row" wx:if="{{detail.content}}">
+			{{detail.content}}
+		</view>
+	</block>
 	<view class="amount">营销费用:<text>{{detail.showsalesfeesamount}}</text></view>
 </view>
 <view class="search">
@@ -59,7 +69,7 @@
 				营销费用:<text class="price">{{item.showAmount}}</text>
 			</view>
 			<view wx:if="{{isAdmin}}">
-				<text class="iconfont icon-dibu-bianji" data-item="{{item}}" bind:tap="editItem"  />
+				<text class="iconfont icon-dibu-bianji" data-item="{{item}}" bind:tap="editItem" />
 				<text class="iconfont icon-guanlian-shanchu" data-item="{{item}}" bind:tap="deleteItem" />
 			</view>
 		</view>