Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

yvan.ni
2 parents f2857d1c 523397b4
Showing 2 changed files with 2 additions and 1 deletions
app.json
packageD/pages/user/deposit/query/index.wxml
@@ -195,6 +195,7 @@
                 "pages/user/deposit/deposit",
                 "pages/user/deposit/prepaid/msg/msg",
                 "pages/user/deposit/prepaid/prepaid",
+                "pages/user/deposit/query/index",
                 "pages/user/member/menber",
                 "pages/user/member/bring/bring",
                 "pages/user/member/bring/msg/msg",
@@ -47,7 +47,7 @@
           </view>
         </view>
         <view class="val" style='color:{{(details.InSum>0)?"green":""}}'>
-           {{(details.InSum>0)?"+"+filter.getNum(details.InSum):"-"+filter.getNum(details.OutSum)}}元             
+           {{(details.InSum>0)?"+"+details.InSum:(details.OutSum>0)?"-"+details.OutSum:0}}元             
            </view>
       </view>
   </block>