From 217394e525f7025fafbf17ce06cefed9f6f94896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=8F=B6?= <yerz@shengshi.com.cn>
Date: Mon, 9 May 2022 16:32:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E5=8A=9E=E4=B8=8D=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/edit/index2.js      | 16 ++++++++++++++--
 pages/order/edit/index2.wxml    |  2 +-
 pages/order/register/index.js   |  9 +++++++--
 pages/order/register/index.wxml |  2 +-
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/pages/order/edit/index2.js b/pages/order/edit/index2.js
index dc914c3..642d78f 100644
--- a/pages/order/edit/index2.js
+++ b/pages/order/edit/index2.js
@@ -225,6 +225,7 @@ Page({
                                     priceparams['v_id'] = res.data.v_id;
                                     priceparams['color_id'] = res.data.color_id;
                                     priceparams['incolor_id'] = res.data.incolor_id;
+                                    priceparams['oid'] = this.data.id;
                                     _.apiQuery.getAppBusiness(priceparams).then(res10 => {
                                       this.setData({
                                         business_type:2,
@@ -682,8 +683,6 @@ Page({
         business_type:0,
       })
       this.getAppSeriesAttrscolor()
-      //代办列表
-      this.getAppServices()
     }
   },
 
@@ -745,6 +744,7 @@ Page({
       params['v_id'] = this.data.v_id;
       params['color_id'] = this.data.color_id;
       params['incolor_id'] = this.data.incolor_id;
+      params['oid'] = this.data.id;
       _.apiQuery.getAppBusiness(params).then(res => {
         this.setData({
           business_type:2,
@@ -775,13 +775,25 @@ Page({
       params['size'] = 100;
       params['id'] = this.data.id;
       _.apiQuery.getAppServices(params).then(res => {
+
         let agencyList = res.data.list
+        let srv_total = 0
         agencyList.forEach(item => {
           item.sprice = item.price
+          if(this.data.userInfo.biz_type==1){
+            if(item.id==1||item.id==2){
+              item.checked = true
+              if(parseFloat(item.price)>0){
+                srv_total = srv_total +  parseFloat(item.price)
+              }
+            }
+          }
         })
         this.setData({
           agencyList,
+          srv_total,
         })
+
       });
     }
   },
diff --git a/pages/order/edit/index2.wxml b/pages/order/edit/index2.wxml
index a552cbd..10c6e3a 100644
--- a/pages/order/edit/index2.wxml
+++ b/pages/order/edit/index2.wxml
@@ -200,7 +200,7 @@
                 </view>
               </view>
             </view> -->
-            <view class="bbs-1-eb last-b-none">
+            <view class="bbs-1-eb last-b-none" wx:if="{{agencyList.length>0}}">
               <view class="relative pl190">
                 <view class="absolute left-0 box-middle font-28 color-333">委托代办</view>
                 <view class="pt30 pb30 text-right font-28 color-666">
diff --git a/pages/order/register/index.js b/pages/order/register/index.js
index 4e0b743..553bd60 100644
--- a/pages/order/register/index.js
+++ b/pages/order/register/index.js
@@ -464,8 +464,6 @@ Page({
         business_type:0,
       })
       this.getAppSeriesAttrscolor()
-      //代办列表
-      this.getAppServices()
     }
   },
 
@@ -557,18 +555,25 @@ Page({
       params['page'] = 1;
       params['size'] = 100;
       _.apiQuery.getAppServices(params).then(res => {
+
         let agencyList = res.data.list
+        let srv_total = 0
         agencyList.forEach(item => {
           item.sprice = item.price
           if(this.data.userInfo.biz_type==1){
             if(item.id==1||item.id==2){
               item.checked = true
+              if(parseFloat(item.price)>0){
+                srv_total = srv_total +  parseFloat(item.price)
+              }
             }
           }
         })
         this.setData({
           agencyList,
+          srv_total,
         })
+
       });
     }
   },
diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml
index 3886929..60574f8 100644
--- a/pages/order/register/index.wxml
+++ b/pages/order/register/index.wxml
@@ -259,7 +259,7 @@
           </view>
         </view> -->
         <block wx:if="{{userInfo.biz_type == 1}}">
-          <view class="bbs-1-eb last-b-none">
+          <view class="bbs-1-eb last-b-none" wx:if="{{agencyList.length>0}}">
             <view class="relative pl190">
               <view class="absolute left-0 box-middle font-28 color-333">委托代办</view>
               <view class="pt30 pb30 text-right font-28 color-666">