From 3c2e376819d020a86a6fd5a0a84872ce73e40b17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=8F=B6?= <yerz@shengshi.com.cn>
Date: Thu, 27 Jan 2022 14:26:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/detail/index2.wxml |   2 +-
 pages/order/edit/index2.wxml   | 171 ++++++++++++++++++++-------------
 2 files changed, 105 insertions(+), 68 deletions(-)

diff --git a/pages/order/detail/index2.wxml b/pages/order/detail/index2.wxml
index 4b26505..1df956c 100644
--- a/pages/order/detail/index2.wxml
+++ b/pages/order/detail/index2.wxml
@@ -32,7 +32,7 @@
           <view class="absolute left-0 box-middle font-28 color-333">车主手机号</view>
           <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.owner_mobile}}</view>
         </view>
-        <view class="relative bbs-1-eb pl140 font-28">
+        <view class="relative bbs-1-eb pl140 font-28" wx:if="{{info.owner_cardid}}">
           <view class="absolute left-0 box-middle font-28 color-333">车主身份证</view>
           <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx">{{info.owner_cardid}}</view>
         </view>
diff --git a/pages/order/edit/index2.wxml b/pages/order/edit/index2.wxml
index 4e3138b..c0484e4 100644
--- a/pages/order/edit/index2.wxml
+++ b/pages/order/edit/index2.wxml
@@ -99,78 +99,115 @@
           <view class="absolute left-0 box-middle color-333">车辆平台售价</view>
           <view class="pt30 pb30 text-right font-28 color-666" style="height:38rpx;"><text class="mr10 color-f9394d">{{priceinfo.price}}</text>元</view>
         </view>
-        <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{priceinfo.deposit_list}}">
-          <view class="absolute left-0 box-middle font-28 color-333">定金<text class="color-f9394d">*</text></view>
-          <view class="pt30 pb30 text-right font-28 color-666">
-            <view class="fn-clear">
-              <block wx:for="{{priceinfo.deposit_list}}" wx:key='index'>
-                <view class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{priceinfo.sdeposit == item?'bg-36afa2 color-fff':'bg-f8'}}" bindtap="fillDeposit" data-deposit="{{item}}">
-                  {{item}}
-                </view>
-              </block>
-              <input class="inline-block ml5 mr5 text-middle bg-fff bds-1-eb text-center font-24 ulib-r10" style="width:100rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="金额" bindinput='inputDeposit' bindblur='inputBlurDeposit' value="{{priceinfo.sdeposit}}" always-embed='{{true}}' />
-            </view>
+        <block wx:if="{{info.price_book_status}}">
+          <view class="relative ml40 bbs-1-eb pl140 font-22 color-666" wx:if="{{priceinfo.sdeposit}}">
+            <view class="absolute left-0 box-middle"><i class="iconfont ml5 mr10 icon-gengduo"></i>定金</view>
+            <view class="pt25 pb25 text-right" style="min-height:30rpx"><text class="mr10 color-f9394d">{{priceinfo.sdeposit}}</text>元</view>
           </view>
-        </view>
-        <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.dis_money}}">
-          <view class="absolute left-0 box-middle font-28 color-333">车身优惠</view>
-          <view class="pt30 pb30 text-right font-28 color-666">
-            <view class="fn-clear">
-              <block wx:for="{{priceinfo.dis_money_list}}" wx:key='index'>
-                <view class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{priceinfo.sdisc_money == item?'bg-36afa2 color-fff':'bg-f8'}}" bindtap="fillDisc_money" data-disc_money="{{item}}">
-                  {{item}}
-                </view>
-              </block>
-              <input class="inline-block ml5 mr5 text-middle bg-fff bds-1-eb text-center font-24 ulib-r10" style="width:100rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="金额" bindinput='inputDisc_money' bindblur='inputBlurDisc_money' value="{{priceinfo.sdisc_money}}" always-embed='{{true}}' />
-            </view>
-          </view>
-        </view>
-        <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.fine_money}}">
-          <view class="absolute left-0 box-middle">精品尊享包<text class="ml10 font-24">{{priceinfo.fine_money}}元</text></view>
-          <view class="relative pt30 pb30 text-right" bindtap="changeFineBag">
-            <checkbox value="{{if_fine}}" checked="{{if_fine}}"/>
-          </view>
-        </view>
-        <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{if_fine&&priceinfo.dis_fine_money}}">
-          <view class="absolute left-0 box-middle font-28 color-333">精品优惠</view>
-          <view class="pt30 pb30 text-right font-28 color-666">
-            <view class="fn-clear">
-              <block wx:for="{{priceinfo.dis_fine_money_list}}" wx:key='index'>
-                <view class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{priceinfo.sdisc_fine_money == item?'bg-36afa2 color-fff':'bg-f8'}}" bindtap="fillDisc_fine_money" data-disc_fine_money="{{item}}">
-                  {{item}}
-                </view>
-              </block>
-              <input class="inline-block ml5 mr5 text-middle bg-fff bds-1-eb text-center font-24 ulib-r10" style="width:100rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="金额" bindinput='inputDisc_fine_money' bindblur='inputBlurDisc_fine_money' value="{{priceinfo.sdisc_fine_money}}" always-embed='{{true}}' />
-            </view>
-          </view>
-        </view>
-        <view class="bbs-1-eb last-b-none">
-          <view class="relative pl190">
-            <view class="absolute left-0 box-middle font-28 color-333">委托代办<text class="color-f9394d" wx:if="{{userInfo.biz_type != 3}}">*</text></view>
+        </block>
+        <block wx:else>
+          <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{priceinfo.deposit_list}}">
+            <view class="absolute left-0 box-middle font-28 color-333">定金<text class="color-f9394d">*</text></view>
             <view class="pt30 pb30 text-right font-28 color-666">
-              当前代办费用：<text class="mr10 color-f9394d">{{srv_total}}</text>元
+              <view class="fn-clear">
+                <block wx:for="{{priceinfo.deposit_list}}" wx:key='index'>
+                  <view class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{priceinfo.sdeposit == item?'bg-36afa2 color-fff':'bg-f8'}}" bindtap="fillDeposit" data-deposit="{{item}}">
+                    {{item}}
+                  </view>
+                </block>
+                <input class="inline-block ml5 mr5 text-middle bg-fff bds-1-eb text-center font-24 ulib-r10" style="width:100rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="金额" bindinput='inputDeposit' bindblur='inputBlurDeposit' value="{{priceinfo.sdeposit}}" always-embed='{{true}}' />
+              </view>
             </view>
           </view>
-          <view class="pb10">
-            <checkbox-group bindchange="changeAgency">
-              <block wx:for="{{agencyList}}" wx:key='index'>
-                <view class="mb20 block relative height-100 pl220 pr20 bg-f6 font-28 ulib-r10">
-                  <label class="absolute box-middle left-0 ml30">
-                    <text class="text-middle">{{item.title}}</text>
-                    <checkbox class="text-middle ml15" value="{{item.id}}" checked="{{item.checked}}"/>
-                  </label>
-                  <view class="pt25 text-right" wx:if="{{item.checked&&item.price>0}}">
-                    <block wx:for="{{item.price_list}}" wx:for-item='price_list' wx:for-index='i' wx:key='i'>
-                      <text class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{item.sprice == price_list?'bg-36afa2 color-fff':'bg-e4 color-666'}}" bindtap="fillAgency" data-index="{{index}}" data-sprice="{{price_list}}">{{price_list}}</text>
-                    </block>
-                    <input class="inline-block ml5 mr5 text-middle bg-fff bds-1-eb text-center font-24 ulib-r10" style="width:100rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="价格" bindinput='inputAgency' bindblur='inputBlurAgency' data-index="{{index}}" value="{{item.sprice}}" always-embed='{{true}}' />
-                  </view>
-                  <view class="pt30 text-right color-666" wx:elif="{{item.text}}">{{item.text}}</view>
-                </view>
-              </block>
-            </checkbox-group>
+        </block>
+        <block wx:if="{{info.price_last_status}}">
+          <view class="relative ml40 bbs-1-eb pl140 font-22 color-666" wx:if="{{!!priceinfo.sdisc_money&&priceinfo.sdisc_money != ''}}">
+            <view class="absolute left-0 box-middle"><i class="iconfont ml5 mr10 icon-gengduo"></i>车身优惠</view>
+            <view class="pt25 pb25 text-right" style="min-height:30rpx"><text class="mr10 color-f9394d">{{priceinfo.sdisc_money}}</text>元</view>
           </view>
-        </view>
+        </block>
+        <block wx:else>
+          <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.dis_money}}">
+            <view class="absolute left-0 box-middle font-28 color-333">车身优惠</view>
+            <view class="pt30 pb30 text-right font-28 color-666">
+              <view class="fn-clear">
+                <block wx:for="{{priceinfo.dis_money_list}}" wx:key='index'>
+                  <view class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{priceinfo.sdisc_money == item?'bg-36afa2 color-fff':'bg-f8'}}" bindtap="fillDisc_money" data-disc_money="{{item}}">
+                    {{item}}
+                  </view>
+                </block>
+                <input class="inline-block ml5 mr5 text-middle bg-fff bds-1-eb text-center font-24 ulib-r10" style="width:100rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="金额" bindinput='inputDisc_money' bindblur='inputBlurDisc_money' value="{{priceinfo.sdisc_money}}" always-embed='{{true}}' />
+              </view>
+            </view>
+          </view>
+        </block>
+        <block wx:if="{{info.price_srv_status}}">
+          <view class="relative bbs-1-eb pl190 last-b-none" wx:if="{{if_fine}}">
+            <view class="absolute left-0 box-middle font-28 color-333">精品尊享包</view>
+            <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;"><text class="mr10 color-f9394d">{{priceinfo.fine_money}}</text>元</view>
+          </view>
+          <view class="relative ml40 bbs-1-eb pl140 font-22 color-666" wx:if="{{!!priceinfo.sdisc_fine_money&&priceinfo.sdisc_fine_money != ''}}">
+            <view class="absolute left-0 box-middle"><i class="iconfont ml5 mr10 icon-gengduo"></i>精品优惠</view>
+            <view class="pt25 pb25 text-right" style="min-height:30rpx"><text class="mr10 color-f9394d">{{priceinfo.sdisc_fine_money}}</text>元</view>
+          </view>
+          <view class="relative bbs-1-eb pt30 pb30 last-b-none">
+            <view class="font-28 color-333">委托代办</view>
+          </view>
+          <block wx:for="{{agencyList}}" wx:key='index'>
+            <view class="relative ml40 bbs-1-eb pl140 font-22 color-666" wx:if="{{item.checked}}">
+              <view class="absolute left-0 box-middle"><i class="iconfont ml5 mr10 icon-gengduo"></i>{{item.title}}</view>
+              <view class="pt25 pb25 text-right" style="min-height:30rpx"><text class="mr10 color-f9394d">{{item.sprice}}</text>元</view>
+            </view>
+          </block>
+        </block>
+        <block wx:else>
+          <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.fine_money}}">
+            <view class="absolute left-0 box-middle">精品尊享包<text class="ml10 font-24">{{priceinfo.fine_money}}元</text></view>
+            <view class="relative pt30 pb30 text-right" bindtap="changeFineBag">
+              <checkbox value="{{if_fine}}" checked="{{if_fine}}"/>
+            </view>
+          </view>
+          <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{if_fine&&priceinfo.dis_fine_money}}">
+            <view class="absolute left-0 box-middle font-28 color-333">精品优惠</view>
+            <view class="pt30 pb30 text-right font-28 color-666">
+              <view class="fn-clear">
+                <block wx:for="{{priceinfo.dis_fine_money_list}}" wx:key='index'>
+                  <view class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{priceinfo.sdisc_fine_money == item?'bg-36afa2 color-fff':'bg-f8'}}" bindtap="fillDisc_fine_money" data-disc_fine_money="{{item}}">
+                    {{item}}
+                  </view>
+                </block>
+                <input class="inline-block ml5 mr5 text-middle bg-fff bds-1-eb text-center font-24 ulib-r10" style="width:100rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="金额" bindinput='inputDisc_fine_money' bindblur='inputBlurDisc_fine_money' value="{{priceinfo.sdisc_fine_money}}" always-embed='{{true}}' />
+              </view>
+            </view>
+          </view>
+          <view class="bbs-1-eb last-b-none">
+            <view class="relative pl190">
+              <view class="absolute left-0 box-middle font-28 color-333">委托代办<text class="color-f9394d" wx:if="{{userInfo.biz_type != 3}}">*</text></view>
+              <view class="pt30 pb30 text-right font-28 color-666">
+                当前代办费用：<text class="mr10 color-f9394d">{{srv_total}}</text>元
+              </view>
+            </view>
+            <view class="pb10">
+              <checkbox-group bindchange="changeAgency">
+                <block wx:for="{{agencyList}}" wx:key='index'>
+                  <view class="mb20 block relative height-100 pl220 pr20 bg-f6 font-28 ulib-r10">
+                    <label class="absolute box-middle left-0 ml30">
+                      <text class="text-middle">{{item.title}}</text>
+                      <checkbox class="text-middle ml15" value="{{item.id}}" checked="{{item.checked}}"/>
+                    </label>
+                    <view class="pt25 text-right" wx:if="{{item.checked&&item.price>0}}">
+                      <block wx:for="{{item.price_list}}" wx:for-item='price_list' wx:for-index='i' wx:key='i'>
+                        <text class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{item.sprice == price_list?'bg-36afa2 color-fff':'bg-e4 color-666'}}" bindtap="fillAgency" data-index="{{index}}" data-sprice="{{price_list}}">{{price_list}}</text>
+                      </block>
+                      <input class="inline-block ml5 mr5 text-middle bg-fff bds-1-eb text-center font-24 ulib-r10" style="width:100rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="价格" bindinput='inputAgency' bindblur='inputBlurAgency' data-index="{{index}}" value="{{item.sprice}}" always-embed='{{true}}' />
+                    </view>
+                    <view class="pt30 text-right color-666" wx:elif="{{item.text}}">{{item.text}}</view>
+                  </view>
+                </block>
+              </checkbox-group>
+            </view>
+          </view>
+        </block>
         <view class="bbs-1-eb last-b-none">
           <view class="relative pl190">
             <view class="absolute left-0 box-middle font-28 color-333">精品选装</view>