修复bug

salesPanel/salesHourglass/index.js

@@ -184,7 +184,7 @@ Page({
                 'content.dataid': dataid,
                 'content.type': type,
                 'content.where.tradefield': detail.tradefield,
-                'content.where.isleave': isleave || 1,
+                'content.where.isleave': isleave,
                 username: active.name,
             })
         }
@@ -425,8 +425,8 @@ Page({
                 pageMsg.pageSize = res.pageSize
                 pageMsg.pageTotal = res.pageTotal
                 pageMsg.total = res.total
-                pageMsg.sumsignamount_due = CNY(res.data[0].extradata.sumsignamount_due, "￥")
-                pageMsg.sumdealamount_due = CNY(res.data[0].extradata.sumdealamount_due, "￥")
+                pageMsg.sumsignamount_due = CNY(res.data[0].extradata.sumsignamount_due / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000).toFixed(2), "￥")
+                pageMsg.sumdealamount_due = CNY(res.data[0].extradata.sumdealamount_due / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000).toFixed(2), "￥")
                 this.setData({
                     pageMsg,
                     list: res.data

salesPanel/salesHourglass/index.wxml

@@ -1,7 +1,7 @@
 <view class="head" hover-class="navigator-hover" bindtap="openFiltrate">
 	<view class="filter">
 		<text class="iconfont icon-shaixuan" />
-		{{language[username]||username}}_{{language[content.where.isleave==1?'在职':content.where.isleave?'离职':'全部']||content.where.isleave==1?'在职':content.where.isleave?'离职':'全部'}}
+		{{language[username]||username}}_{{language[content.where.isleave===1?'在职':content.where.isleave?'离职':'全部']||content.where.isleave===1?'在职':content.where.isleave?'离职':'全部'}}
 	</view>
 	<view class="filter">
 		<text class="iconfont icon-lingyu" />
@@ -45,21 +45,11 @@
 		<view class="box">
 			<view class="row">
 				<view class="label">{{language['预计成交正偏差']||'预计成交正偏差'}}：</view>
-				<view class="value">
-					<text class="count">
-						{{firstTwelveMonths.positiveCount}}{{language['个']||'个'}}
-					</text>
-					{{firstTwelveMonths.positiveOffsetAmount}}{{language['万']||'万'}}
-				</view>
+				<view class="value"><text class="count">{{firstTwelveMonths.positiveCount}}{{language['个']||'个'}}</text>{{firstTwelveMonths.positiveOffsetAmount}}{{language['万']||'万'}}</view>
 			</view>
 			<view class="row">
 				<view class="label">{{language['预计成交负偏差']||'预计成交负偏差'}}：</view>
-				<view class="value">
-					<text class="count">
-						{{firstTwelveMonths.negativeCount}}{{language['个']||'个'}}
-					</text>
-					{{firstTwelveMonths.negativeOffsetAmount}}{{language['万']||'万'}}
-				</view>
+				<view class="value"><text class="count">{{firstTwelveMonths.negativeCount}}{{language['个']||'个'}}</text>{{firstTwelveMonths.negativeOffsetAmount}}{{language['万']||'万'}}</view>
 			</view>
 			<view class="row">
 				<view class="label">{{language['预计成交准确率']||'预计成交准确率'}}：</view>