添加订单金额显示

packageA/account/detail.js

@@ -46,6 +46,7 @@ Page({
         v.showRewardamount = CNY(v.rewardamount) //已提成金额
         v.showPayapplyamount = CNY(v.payapplyamount) //已发放金额
         v.showUnpayapplyamount = CNY(v.unpayapplyamount) //未发放金额
+        v.showOrderamount = CNY(v.orderamount)
         return v
       })
       this.setData({

packageA/account/detail.scss

@@ -67,8 +67,10 @@
 	background-color: #fff;
 	padding: 30rpx;
 	box-sizing: border-box;
+	margin-bottom: 20rpx;
 
-	.row {
+	.row,
+	.col {
 		line-height: 34rpx;
 		font-family: PingFang SC, PingFang SC;
 		font-size: 24rpx;
@@ -80,16 +82,14 @@
 		margin-top: 0;
 	}
 
-	.two-lines {
+	.two-box {
+		width: 100%;
 		display: flex;
+		flex-wrap: wrap;
 
-		>view {
-			width: 50%;
-		}
-
-		.left {
-			padding-right: 6rpx;
-			box-sizing: border-box;
+		.col {
+			width: 50% !important;
+			flex-shrink: 0;
 		}
 	}
 

packageA/account/detail.wxml

@@ -28,73 +28,58 @@
 		<view class="row">
 			产品名称：{{item.itemname || '--'}}
 		</view>
-		<view class="row two-lines">
-			<view class="left">
+		<view class="two-box">
+			<view class="col">
 				行号：{{item.rowindex}}
 			</view>
-			<view>
+			<view class="col">
 				产品编码：{{item.itemno}}
 			</view>
-		</view>
-
-		<view class="row two-lines">
-			<view class="left">
+			<view class="col">
 				型号：{{item.model}}
 			</view>
-			<view>
+			<view class="col">
 				规格：{{item.spec}}
 			</view>
-		</view>
-
-		<view class="row two-lines">
-			<view class="left">
+			<view class="col">
 				订单单价：{{item.showOrderprice}}
 			</view>
-			<view>
+			<view class="col">
+				订单金额：{{item.showOrderamount}}
+			</view>
+			<view class="col">
 				提成单价：{{item.showPrice}}
 			</view>
-		</view>
-
-		<view class="row two-lines">
-			<view class="left">
+			<view class="col">
 				提成比例：{{item.rate * 100}}%
 			</view>
-			<view>
+			<view class="col">
 				分配比例：{{item.allocation_rate * 100}}%
 			</view>
-		</view>
-
-		<view class="row two-lines">
-			<view class="left">
+			<view class="col">
 				提成金额：{{detail.type==0 ? item.showCashbilldetailamount : item.showAmount}}
 			</view>
-			<view>
+			<view class="col">
 				预计提成金额：{{item.showOrderExpectedamount}}
 			</view>
-		</view>
-
-		<view class="row two-lines">
-			<view class="left">
+			<view class="col">
 				已提成金额：{{item.showRewardamount }}
 			</view>
-			<view>
+			<view class="col">
 				已发放金额：{{item.showPayapplyamount}}
 			</view>
-		</view>
-
-		<view wx:if="{{detail.type==0}}" class="row two-lines">
-			<view class="left">
+			<block wx:if="{{detail.type==0}}">
+				<view class="col">
+					未发放金额：{{item.showUnpayapplyamount}}
+				</view>
+				<view class="col">
+					本次调整金额：<text class="price">{{item.showAmount}}</text>
+				</view>
+			</block>
+			<view wx:else class="col">
 				未发放金额：{{item.showUnpayapplyamount}}
 			</view>
-			<view>
-				本次调整金额：<text class="price">{{item.showAmount}}</text>
-			</view>
-		</view>
-
-		<view wx:else class="row">
-			未发放金额：{{item.showUnpayapplyamount}}
 		</view>
-
 	</view>
 	<Yl_Empty wx:if="{{list.length === 0}}" />
 </Yl_ListBox>

project.private.config.json

@@ -9,6 +9,20 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "账户",
+          "pathName": "packageA/account/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "packageA/account/detail",
+          "pathName": "packageA/account/detail",
+          "query": "item=%7B%22checkby%22%3A%22%E5%91%A8%E4%BD%B3%E5%8F%8B%22%2C%22sourcenote%22%3A%22%E7%94%B1%E5%BC%80%E7%A5%A8%E5%8D%95%E3%80%90HY-202407010001%E3%80%91%E7%BA%A2%E5%86%B2%E7%94%9F%E6%88%90%22%2C%22amount%22%3A%22-%EF%BF%A57%2C437.06%22%2C%22sa_hraccountclassid%22%3A1%2C%22sa_hrcashbillid%22%3A7543%2C%22departmentid%22%3A54%2C%22source%22%3A%22%E5%BC%80%E7%A5%A8%E5%8D%95%E7%BA%A2%E5%86%B2%22%2C%22type%22%3A1%2C%22hraccountname%22%3A%22%E6%8F%90%E6%88%90%E8%B4%A6%E6%88%B7%22%2C%22allremarks%22%3A%22%E7%B3%BB%E7%BB%9F%E5%A4%87%E6%B3%A8%EF%BC%9A%E7%94%B1%E5%BC%80%E7%A5%A8%E5%8D%95%E3%80%90HY-202407010001%E3%80%91%E7%BA%A2%E5%86%B2%E7%94%9F%E6%88%90%22%2C%22hraccountno%22%3A%2201%22%2C%22hrid%22%3A698%2C%22billdate%22%3A%222024-07-09%22%2C%22name%22%3A%22%E5%91%A8%E4%BD%B3%E5%8F%8B%22%2C%22depname%22%3A%22%E7%8F%AD%E5%B0%BC%E6%88%88%E6%B5%B7%E7%9B%90%22%2C%22billno%22%3A%22HRC202407090001%22%2C%22rowindex%22%3A1%2C%22remarks%22%3A%22%22%2C%22checkdate%22%3A%222024-07-09%2008%3A48%3A12%22%2C%22status%22%3A%22%E5%AE%A1%E6%A0%B8%22%2C%22showBalance%22%3A%22%EF%BF%A50.00%22%2C%22showRemarks%22%3A%22%E7%B3%BB%E7%BB%9F%E5%A4%87%E6%B3%A8%EF%BC%9A%E7%94%B1%E5%BC%80%E7%A5%A8%E5%8D%95%E3%80%90HY-202407010001%E3%80%91%E7%BA%A2%E5%86%B2%E7%94%9F%E6%88%90%22%2C%22enddate%22%3A%22%22%2C%22begindate%22%3A%22%22%7D",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "账户",
           "pathName": "packageA/account/index",