diff --git a/pages/order/edit/index2.js b/pages/order/edit/index2.js
index 8f78ca6..2b4308b 100644
--- a/pages/order/edit/index2.js
+++ b/pages/order/edit/index2.js
@@ -60,16 +60,11 @@ Page({
     checkCount: 2,
     checktext: '3s',
     isShowRemarks:false,//意向金备注
-
-    disc_money:'',//车身优惠金额
     srv_total:0,//代办费用
     agencyList:[],//代办数组
     fine_total:0,//精品费用
 
     if_fine:false,//精品尊享包
-    disc_fine_money:'',//精品优惠金额
-
-    deposit:'',//定金
 
     fines:[
       {
@@ -102,10 +97,7 @@ Page({
       this.setData({
         info:res.data,
         delry_time:res.data.delry_time?res.data.delry_time:'',
-        disc_money:res.data.disc_money?res.data.disc_money:'',
         if_fine:res.data.if_fine==1?true:false,
-        disc_fine_money:res.data.disc_fine_money?res.data.disc_fine_money:'',
-        deposit:res.data.deposit?res.data.deposit:'',
       })
       
       /*匹配车辆信息*/
@@ -224,9 +216,12 @@ Page({
                                     priceparams['v_id'] = res.data.v_id;
                                     priceparams['color_id'] = res.data.color_id;
                                     priceparams['incolor_id'] = res.data.incolor_id;
-                                    _.apiQuery.getAppSeriesInfo(priceparams).then(res => {
+                                    _.apiQuery.getAppSeriesInfo(priceparams).then(res10 => {
                                       this.setData({
-                                        priceinfo:res.data,
+                                        priceinfo:res10.data,
+                                        'priceinfo.sdeposit':res.data.deposit?res.data.deposit:'',
+                                        'priceinfo.sdisc_money':res.data.disc_money?res.data.disc_money:'',
+                                        'priceinfo.sdisc_fine_money':res.data.disc_fine_money?res.data.disc_fine_money:'',
                                       })
                                     });
                                   }
@@ -475,7 +470,7 @@ Page({
             title: '请输入期望交付时间',
             icon: 'none'
           })
-        }else if(this.data.deposit == '' ){
+        }else if(!this.data.priceinfo.sdeposit){
           wx.showToast({
             title: '请选择定金',
             icon: 'none'
@@ -780,7 +775,6 @@ Page({
       _.apiQuery.getAppSeriesInfo(params).then(res => {
         this.setData({
           priceinfo:res.data,
-          disc_money:'',
         })
       });
     }
@@ -858,14 +852,14 @@ Page({
     params['color_id'] = that.data.color_id;
     params['incolor_id'] = that.data.incolor_id;
     params['price'] = that.data.priceinfo.price;
-    params['deposit'] = that.data.deposit;
+    params['deposit'] = that.data.priceinfo.sdeposit;
     params['payway'] = that.data.paymentIndex==0?'1':'0';
     params['delry_time'] = that.data.delry_time;
     if(that.data.finance_id!= ''){
       params['finance_id'] = that.data.finance_id;
     }
-    if(!!that.data.disc_money && that.data.disc_money != '' ){
-      params['disc_money'] = that.data.disc_money;
+    if(!!that.data.priceinfo.sdisc_money && that.data.priceinfo.sdisc_money != '' ){
+      params['disc_money'] = that.data.priceinfo.sdisc_money;
     }
     let srv_arr = []
     that.data.agencyList.forEach(item => {
@@ -885,8 +879,8 @@ Page({
     }
     if(that.data.priceinfo.fine_money){
       params['if_fine'] = that.data.if_fine?'1':'0';
-      if(that.data.if_fine&&that.data.disc_fine_money!= ''){
-        params['disc_fine_money'] = that.data.disc_fine_money;
+      if(that.data.if_fine&&!!that.data.priceinfo.sdisc_fine_money&&that.data.priceinfo.sdisc_fine_money!= ''){
+        params['disc_fine_money'] = that.data.priceinfo.sdisc_fine_money;
       }
     }
     _.apiQuery.putAppCusorderV2(params).then(res => {
@@ -951,15 +945,6 @@ Page({
     })
   },
 
-  //选择定金
-  depositPicker(e){
-    if(e.currentTarget.dataset.deposit != this.data.deposit){
-      this.setData({
-        deposit:e.currentTarget.dataset.deposit,
-      })
-    }
-  },
-
   //选择客户
   radioPicker(e){
     if(e.currentTarget.dataset.index != this.data.customerIndex){
@@ -1011,7 +996,7 @@ Page({
   changeFineBag(){
     this.setData({
       if_fine:!this.data.if_fine,
-      disc_fine_money:'',
+      'priceinfo.sdisc_fine_money':'',
     })
   },
 
@@ -1137,6 +1122,97 @@ Page({
     }
   },
 
+  //选择定金
+  fillDeposit(e){
+    this.setData({
+      'priceinfo.sdeposit':parseFloat(e.currentTarget.dataset.deposit),
+    })
+  },
+
+  //修改定金
+  inputDeposit(e){
+    this.setData({
+      'priceinfo.sdeposit':parseFloat(e.detail.value),
+    })
+  },
+
+  //判断修改定金是否小于限制
+  inputBlurDeposit(e){
+    if(!this.data.priceinfo.sdeposit||this.data.priceinfo.deposit>parseFloat(this.data.priceinfo.sdeposit)){
+      wx.showToast({
+        title: '定金设置过低',
+        icon: 'none'
+      })
+      this.setData({
+        'priceinfo.sdeposit':this.data.priceinfo.deposit,
+      })
+    }
+  },
+
+  //选择车身优惠
+  fillDisc_money(e){
+    this.setData({
+      'priceinfo.sdisc_money':parseFloat(e.currentTarget.dataset.disc_money),
+    })
+  },
+
+  //修改车身优惠
+  inputDisc_money(e){
+    this.setData({
+      'priceinfo.sdisc_money':parseFloat(e.detail.value),
+    })
+  },
+
+  //判断修改车身优惠是否小于限制
+  inputBlurDisc_money(e){
+    if(this.data.priceinfo.dis_money<parseFloat(this.data.priceinfo.sdisc_money)){
+      wx.showToast({
+        title: '车身优惠设置过高',
+        icon: 'none'
+      })
+      this.setData({
+        'priceinfo.sdisc_money':this.data.priceinfo.dis_money,
+      })
+    }
+    else if(!this.data.priceinfo.sdisc_money){
+      this.setData({
+        'priceinfo.sdisc_money':'',
+      })
+    }
+  },
+
+  //选择精品优惠
+  fillDisc_fine_money(e){
+    this.setData({
+      'priceinfo.sdisc_fine_money':parseFloat(e.currentTarget.dataset.disc_fine_money),
+    })
+  },
+
+  //修改精品优惠
+  inputDisc_fine_money(e){
+    this.setData({
+      'priceinfo.sdisc_fine_money':parseFloat(e.detail.value),
+    })
+  },
+
+  //判断修改精品优惠是否小于限制
+  inputBlurDisc_fine_money(e){
+    if(this.data.priceinfo.dis_fine_money<parseFloat(this.data.priceinfo.sdisc_fine_money)){
+      wx.showToast({
+        title: '精品优惠设置过高',
+        icon: 'none'
+      })
+      this.setData({
+        'priceinfo.sdisc_fine_money':this.data.priceinfo.dis_fine_money,
+      })
+    }
+    else if(!this.data.priceinfo.sdisc_fine_money){
+      this.setData({
+        'priceinfo.sdisc_fine_money':'',
+      })
+    }
+  },
+
   //页面相关事件处理函数--监听用户下拉动作
   onPullDownRefresh(){
     this.getAppCusorderV2()
diff --git a/pages/order/edit/index2.wxml b/pages/order/edit/index2.wxml
index 7d0d582..55f8de2 100644
--- a/pages/order/edit/index2.wxml
+++ b/pages/order/edit/index2.wxml
@@ -104,18 +104,25 @@
           <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 radio-btn mr20 pt15 pb15 pl25 pr25 ulib-r10 font-28 {{deposit == item?'bg-36afa2 color-fff':'bg-f8'}}" bindtap="depositPicker" data-deposit="{{item}}">
+                <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:90rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="金额" bindinput='inputDeposit' bindblur='inputBlurDeposit' value="{{priceinfo.sdeposit}}" />
             </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">车身优惠</view>
-          <view class="relative pr40">
-            <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入车身优惠金额" bindinput='inputDisc' data-key="disc_money" name='disc_money' value="{{disc_money}}" />
-            <view class="absolute right-0 box-middle font-28 color-666">元</view>
+          <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:90rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="金额" bindinput='inputDisc_money' bindblur='inputBlurDisc_money' value="{{priceinfo.sdisc_money}}" />
+            </view>
           </view>
         </view>
         <view class="relative bbs-1-eb last-b-none pl180 font-28" wx:if="{{priceinfo.fine_money}}">
@@ -125,10 +132,16 @@
           </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">精品优惠</view>
-          <view class="relative pr40">
-            <input class="wp100 height-100 text-right font-28" placeholder-class="color-ccc" type="text" placeholder="请输入精品优惠金额" bindinput='inputDiscFine' data-key="disc_fine_money" name='disc_fine_money' value="{{disc_fine_money}}" />
-            <view class="absolute right-0 box-middle font-28 color-666">元</view>
+          <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:90rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="金额" bindinput='inputDisc_fine_money' bindblur='inputBlurDisc_fine_money' value="{{priceinfo.sdisc_fine_money}}" />
+            </view>
           </view>
         </view>
         <view class="bbs-1-eb last-b-none">
@@ -147,11 +160,12 @@
                     <checkbox class="text-middle ml15" value="{{item.id}}" checked="{{item.checked}}"/>
                   </label>
                   <view class="pt25 text-right" wx:if="{{item.checked&&item.price>0}}">
-                    <text class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{item.sprice == item.price?'bg-36afa2 color-fff':'bg-e4 color-666'}}" bindtap="fillAgency" data-index="{{index}}" data-sprice="{{item.price}}">{{item.price}}</text>
-                    <text class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{item.sprice == item.price+200?'bg-36afa2 color-fff':'bg-e4 color-666'}}" bindtap="fillAgency" data-index="{{index}}" data-sprice="{{item.price+200}}">{{item.price+200}}</text>
-                    <text class="inline-block ml5 mr5 pt10 pb10 pl15 pr15 text-middle font-24 ulib-r10 {{item.sprice == item.price+400?'bg-36afa2 color-fff':'bg-e4 color-666'}}" bindtap="fillAgency" data-index="{{index}}" data-sprice="{{item.price+400}}">{{item.price+400}}</text>
-                    <input class="inline-block ml5 mr5 text-middle bg-fff bds-1-eb text-center font-28 ulib-r10" style="width:90rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="价格" bindinput='inputAgency' bindblur='inputBlurAgency' data-index="{{index}}" value="{{item.sprice}}" />
+                    <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:90rpx;height:52rpx;" placeholder-class="color-ccc" type="digit" placeholder="价格" bindinput='inputAgency' bindblur='inputBlurAgency' data-index="{{index}}" value="{{item.sprice}}" />
                   </view>
+                  <view class="pt30 text-right color-666" wx:elif="{{item.text}}">{{item.text}}</view>
                 </view>
               </block>
             </checkbox-group>
@@ -229,21 +243,21 @@
       <view class="absolute left-0 box-middle color-333">车辆平台售价</view>
       <view class="pt30 pb30 text-right font-28 color-666" style="min-height:38rpx;"><text class="mr10 color-f9394d">{{priceinfo.price}}</text>元</view>
     </view>
-    <view class="relative ml40 bbs-1-eb pl140 font-22 color-666" wx:if="{{deposit}}">
+    <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">{{deposit}}</text>元</view>
+      <view class="pt25 pb25 text-right" style="min-height:30rpx"><text class="mr10 color-f9394d">{{priceinfo.sdeposit}}</text>元</view>
     </view>
-    <view class="relative ml40 bbs-1-eb pl140 font-22 color-666" wx:if="{{disc_money != ''}}">
+    <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">{{disc_money}}</text>元</view>
+      <view class="pt25 pb25 text-right" style="min-height:30rpx"><text class="mr10 color-f9394d">{{priceinfo.sdisc_money}}</text>元</view>
     </view>
     <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="{{disc_fine_money != ''}}">
+    <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">{{disc_fine_money}}</text>元</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>