libo
/
ztb-saas-mini
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

no message

feature/v1.6
xpz2018 4 years ago
parent
c08da91d54
commit
719b2841c1
3 changed files with 52 additions and 13 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      pages/agent/order-detail/item-money-info/index.json
  2. 41
      pages/agent/order-detail/item-money-info/index.wxml
  3. 19
      pages/home/user-info/index.wxml

5
pages/agent/order-detail/item-money-info/index.json
View File

@ -1,4 +1,7 @@
{ {
"component": true, "component": true,
"usingComponents": {}
"usingComponents": {
"van-popover": "/components/popover/index",
"van-icon": "/components/icon/index"
}
} }

41
pages/agent/order-detail/item-money-info/index.wxml
View File

@ -2,7 +2,8 @@
<wxs module="agent" src="../../../agent/index.wxs"></wxs> <wxs module="agent" src="../../../agent/index.wxs"></wxs>
<wxs module="formate" src="../../../../pages/formate.wxs"></wxs> <wxs module="formate" src="../../../../pages/formate.wxs"></wxs>
<!-- 预付款 --> <!-- 预付款 -->
<view class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx" wx:if="{{item.activityOrderAuditPassNum!=null&&item.activityOrderAuditPassNum >= 1}}">
<view class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx"
wx:if="{{item.activityOrderAuditPassNum!=null&&item.activityOrderAuditPassNum >= 1}}">
<view class="text-df text-gray" style="solid #f3f3f3;padding-bottom:24rpx">首款信息</view> <view class="text-df text-gray" style="solid #f3f3f3;padding-bottom:24rpx">首款信息</view>
<view class="flex flex-justify text-sg"> <view class="flex flex-justify text-sg">
<text class="text-black">预计总金额</text> <text class="text-black">预计总金额</text>
@ -10,7 +11,8 @@
</view> </view>
<view class="flex flex-justify text-sm" style="margin-top:2rpx"> <view class="flex flex-justify text-sm" style="margin-top:2rpx">
<text class="text-gray">结算单价 x 净重</text> <text class="text-gray">结算单价 x 净重</text>
<view class="text-gray">{{formate.formatePrice(item.unitPrice)}}元/吨 x {{formate.formateWeight(item.weightnoteInfo.netWeight)}}吨</view>
<view class="text-gray">{{formate.formatePrice(item.unitPrice)}}元/吨 x
{{formate.formateWeight(item.weightnoteInfo.netWeight)}}吨</view>
</view> </view>
<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx"> <view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx">
<text class="text-black">首笔应收金额</text> <text class="text-black">首笔应收金额</text>
@ -25,7 +27,7 @@
<text class="text-black">代卖费</text> <text class="text-black">代卖费</text>
<text style="color:#F5222D">{{formate.formateAmount(item.proxyAmount) || 0}}元</text> <text style="color:#F5222D">{{formate.formateAmount(item.proxyAmount) || 0}}元</text>
</view> </view>
<view class="flex flex-justify text-sm" style="margin-top:2rpx" wx:if="{{item.proxySellerSettleType==0}}" >
<view class="flex flex-justify text-sm" style="margin-top:2rpx" wx:if="{{item.proxySellerSettleType==0}}">
<text class="text-gray">代卖费单价 x 净重</text> <text class="text-gray">代卖费单价 x 净重</text>
<view class="text-gray">{{formate.formatePrice(item.unitSurcharge)}}元/吨 x <view class="text-gray">{{formate.formatePrice(item.unitSurcharge)}}元/吨 x
{{formate.formateWeight(item.weightnoteInfo.netWeight)}}吨</view> {{formate.formateWeight(item.weightnoteInfo.netWeight)}}吨</view>
@ -39,7 +41,7 @@
<!-- 尾款 只有活动订单才会有这个字段,并且这个字段=2表示第二次审核了 --> <!-- 尾款 只有活动订单才会有这个字段,并且这个字段=2表示第二次审核了 -->
<view wx:if="{{item.activityOrderAuditPassNum!=null&&item.activityOrderAuditPassNum >= 2}}"> <view wx:if="{{item.activityOrderAuditPassNum!=null&&item.activityOrderAuditPassNum >= 2}}">
<view class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx"> <view class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx">
<view class="text-df text-gray" style="solid #f3f3f3;padding-bottom:24rpx">尾款信息</view>
<view class="text-df text-gray" style="solid #f3f3f3;padding-bottom:24rpx">尾款信息</view>
<view class="flex flex-justify text-sg"> <view class="flex flex-justify text-sg">
<text class="text-black">未结算金额</text> <text class="text-black">未结算金额</text>
<text style="color:#F5222D">{{formate.formateAmount(item.unSettleMoney)}}元</text> <text style="color:#F5222D">{{formate.formateAmount(item.unSettleMoney)}}元</text>
@ -71,13 +73,24 @@
</view> </view>
<view class="flex flex-justify text-sg" style=";margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx"> <view class="flex flex-justify text-sg" style=";margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx">
<text class="text-black text-bold">总收款金额：</text> <text class="text-black text-bold">总收款金额：</text>
<text style="color:#F5222D">{{formate.formateAmount(item.finalSettlePrice)}}元</text>
<view class="flex">
<text style="color:#F5222D">{{formate.formateAmount(item.finalSettlePrice)}}元</text>
<van-popover placement="topRight" mask="{{true}}">
<view style="padding-right:18rpx">
<van-icon name="question-o" size="30px" />
</view>
<view slot="content" style="max-width:640rpx;padding:24rpx">
<text
style="word-wrap: break-word;word-break: break-all;white-space: pre-line">ContentContentContentContentContentConteContentContentContentContentContentConteContentContentCon</text>
</view>
</van-popover>
</view>
</view> </view>
</view> </view>
</view> </view>
<!-- 全款 非活动订单,或者一次性付款的活动订单 , 在待审核和待结算,已完成下 , 显示全款信息, --> <!-- 全款 非活动订单,或者一次性付款的活动订单 , 在待审核和待结算,已完成下 , 显示全款信息, -->
<view wx:if="{{(item.paymentType == 3||orderInfo.activityId==null)&&(item.status>52&&item.status!=55)}}" class="bg-white"
style="padding: 24rpx 30rpx;margin-top:16rpx">
<view wx:if="{{(item.paymentType == 3||orderInfo.activityId==null)&&(item.status>52&&item.status!=55)}}"
class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx">
<view class="flex flex-justify text-sg"> <view class="flex flex-justify text-sg">
<text class="text-black">总金额</text> <text class="text-black">总金额</text>
<text style="color:#F5222D">{{formate.formateAmount(item.sumAmount)}}元</text> <text style="color:#F5222D">{{formate.formateAmount(item.sumAmount)}}元</text>
@ -91,7 +104,7 @@
<text class="text-black">代卖费</text> <text class="text-black">代卖费</text>
<text style="color:#F5222D">{{formate.formateAmount(item.surcharge) || 0}}元</text> <text style="color:#F5222D">{{formate.formateAmount(item.surcharge) || 0}}元</text>
</view> </view>
<view class="flex flex-justify text-xs" style="margin-top:2rpx" wx:if="{{item.proxySellerSettleType==1}}">
<view class="flex flex-justify text-xs" style="margin-top:2rpx" wx:if="{{item.proxySellerSettleType==1}}">
<text class="text-gray">代卖费单价 x 结算重量</text> <text class="text-gray">代卖费单价 x 结算重量</text>
<view class="text-gray">{{formate.formatePrice(item.unitSurcharge==null?0:item.unitSurcharge)}}元/吨 x <view class="text-gray">{{formate.formatePrice(item.unitSurcharge==null?0:item.unitSurcharge)}}元/吨 x
{{formate.formateWeight(item.weightnoteInfo.settleWeight)}}吨</view> {{formate.formateWeight(item.weightnoteInfo.settleWeight)}}吨</view>
@ -113,6 +126,16 @@
</view> </view>
<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:20rpx"> <view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:20rpx">
<text class="text-black text-bold">总收款金额：</text> <text class="text-black text-bold">总收款金额：</text>
<text style="color:#F5222D">{{formate.formateAmount(item.weightnoteInfo.settlePrice)}}元</text>
<view class="flex">
<text style="color:#F5222D">{{formate.formateAmount(item.weightnoteInfo.settlePrice)}}元</text>
<van-popover placement="topRight" mask="{{true}}">
<view style="margin-left:12rpx">
<van-icon name="question-o" size="40rpx" />
</view>
<view slot="content" style="max-width:640rpx;padding:24rpx">
<text style="word-wrap: break-word;word-break: break-all;white-space: pre-line">ContentContentContentContentContentConteContentContentContentContentContentConteContentContentCon</text>
</view>
</van-popover>
</view>
</view> </view>
</view> </view>

19
pages/home/user-info/index.wxml
View File

@ -15,7 +15,8 @@
<view slot="title" class="flex flex-justify"> <view slot="title" class="flex flex-justify">
<view class="text-black">实名制认证</view> <view class="text-black">实名制认证</view>
<view class="flex flex-center"> <view class="flex flex-center">
<text class="{{userInfo.isAuth == 1 ? 'text-blue' : 'text-gray'}}">{{userInfo.isAuth == 1 ? '已认证' : '未实名认证'}}</text>
<text class="{{userInfo.isAuth == 1 ? 'text-blue' : 'text-gray'}}">{{userInfo.isAuth == 1 ? '已认证' :
'未实名认证'}}</text>
<text class="text-sg" wx:if="{{userInfo.isAuth != 1 && userInfo.userType == 1}}">去认证</text> <text class="text-sg" wx:if="{{userInfo.isAuth != 1 && userInfo.userType == 1}}">去认证</text>
</view> </view>
</view> </view>
@ -49,14 +50,26 @@
</van-cell> </van-cell>
<van-cell is-link clickable bind:click="makeCall"> <van-cell is-link clickable bind:click="makeCall">
<view class="flex" slot="title" style="align-items: center"> <view class="flex" slot="title" style="align-items: center">
<van-icon name="service-o" size="36rpx"/>
<van-icon name="service-o" size="36rpx" />
<text class="text-sg" style="margin-left:12rpx">联系客服(020-82516486)</text> <text class="text-sg" style="margin-left:12rpx">联系客服(020-82516486)</text>
</view> </view>
</van-cell> </van-cell>
</van-cell-group> </van-cell-group>
<view style="margin-top:48rpx;padding:40rpx 80rpx"> <view style="margin-top:48rpx;padding:40rpx 80rpx">
<van-button block type="danger" bind:click="loginOut">退出当前账号</van-button>
<van-button block type="danger" bind:click="loginOut">退出当前账号</van-button>
</view>
<view class="flex" style="justify-content: flex-end;padding:24rpx 32rpx">
<van-popover placement="topRight" mask="{{true}}">
<view style="padding-right:18rpx">
<van-icon name="question-o" size="30px" />
</view>
<view slot="content" style="max-width:640rpx;padding:24rpx">
<text
style="word-wrap: break-word;word-break: break-all;white-space: pre-line">ContentContentContentContentContentConteContentContentContentContentContentConteContentContentCon</text>
</view>
</van-popover>
</view> </view>
<view class="cu-bar foot" style="display:block;width:100%;min-height: 180rpx;padding: 0rpx 120rpx"> <view class="cu-bar foot" style="display:block;width:100%;min-height: 180rpx;padding: 0rpx 120rpx">

Write Preview
Loading…
Cancel
Save