zhaoxiaohai 2 年 前
コミット
d74867ef2b

+ 15 - 2
packageA/orderForm/detail.js

@@ -3,6 +3,20 @@ const _Http = getApp().globalData.http;
 Page({
     data: {
         sa_orderid: null,
+        tabsActive:0,
+        tabsList: [{
+            label: "产品明细",
+            icon: "icon-tabxiangxixinxi1"
+        }, {
+            label: "附件",
+            icon: "icon-tabgenjinjilu"
+        }, {
+            label: "订单进度",
+            icon: "icon-tabcaozuojilu1"
+        }, {
+            label: "发票",
+            icon: "icon-tabgenjinjilu"
+        }],
     },
     onLoad(options) {
         console.log(options)
@@ -10,7 +24,7 @@ Page({
             sa_orderid: options.id
         });
         this.getDetail();
-    },
+		},
     getDetail() {
         _Http.basic({
             "id": 20221108151302,
@@ -23,7 +37,6 @@ Page({
                 title: res.msg,
                 icon: "none"
             });
-            
             this.setData({
                 detail: res.data
             })

+ 4 - 7
packageA/orderForm/detail.scss

@@ -62,9 +62,8 @@
     .row {
         display: flex;
         justify-content: space-between;
-        height: 60rpx;
+        min-height: 60rpx;
         align-items: center;
-        font-size: 0;
 
         .label {
             font-size: 28rpx;
@@ -135,16 +134,14 @@
 /* 备注 */
 .remarks {
     flex: 1;
-    height: 50rpx;
-    line-height: 50rpx;
-    margin-left: 20rpx;
+    margin-left: 30rpx;
     border: 1rpx solid #ddd;
     box-sizing: border-box;
     padding-left: 15rpx;
     color: #333;
+    font-size: 28rpx;
 }
 
 .placeholder {
-    font-size: 24rpx;
-    line-height: 50rpx;
+    font-size: 24rpx !important;
 }

+ 34 - 6
packageA/orderForm/detail.wxml

@@ -40,19 +40,47 @@
     <view class="iconfont icon-dibu-bianji" />
 </navigator>
 
-<navigator url="#" class="box pay">
+<view class="box pay">
     <view class="title">
         支付信息
     </view>
-</navigator>
+    <navigator url="#" class="row">
+        <view class="label">结算人</view>
+        <view style="font-size: 28rpx;">
+            阿萨德阿萨德阿萨德阿萨德
+            <van-icon name="arrow" />
+        </view>
+    </navigator>
+    <navigator url="#" class="row">
+        <view class="label">支付账户</view>
+        <view style="font-size: 28rpx;">
+            阿萨德阿萨德阿萨德阿萨德
+            <van-icon name="arrow" />
+        </view>
+    </navigator>
+    <navigator url="#" class="row" style="font-size: 0;">
+        <view class="label">是否使用返利金(余额:10000)</view>
+        <checkbox checked="{{true}}" color='var(--assist)' />
+    </navigator>
+    <view class="row">
+        <view class="label">返利金支付(最大比例:20%)</view>
+        <input type="digit" class="remarks" placeholder-class='placeholder' value="{{detail.remarks}}" placeholder="使用金额" />
+    </view>
+</view>
 
 <view class="box" style="padding: 10rpx 30rpx;">
     <view class="row">
-        <view class="label">订单备注</view><!-- value="{{detail.remarks}}" -->
-        <textarea class="remarks" placeholder-class='placeholder' placeholder="订单备注" auto-height />
+        <view class="label">订单备注</view>
+        <textarea class="remarks" placeholder-class='placeholder' value="{{detail.remarks}}" auto-height placeholder="订单备注" />
     </view>
-    <navigator url="#" class="row">
+    <navigator url="#" class="row" style="font-size: 0;">
         <view class="label">是否需要回签单</view>
         <checkbox checked="{{true}}" color='var(--assist)' />
     </navigator>
-</view>
+</view>
+
+<view style="height: 20rpx;" />
+
+<Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
+    站务数据
+</Yl_FunTabs>