结账

hdApp/src/admin/order/detail.vue

@@ -76,14 +76,14 @@
         <view class="module-det">
           <view class="order-msg-blo">
 
-            <view class="msg-list" v-if="Number(dj)>0">
+            <view class="msg-list" v-if="Number(dj)>0 && Number(orderInfo.debtPrice)>0">
               <view class="label">订金：</view>
               <view class="value">￥{{dj}}</view>
             </view>
-            <view class="msg-list" v-if="Number(orderInfo.remainDebtPrice)>0">
+            <view class="msg-list" v-if="Number(orderInfo.debtPrice)>0">
               <view class="label" style="color:red;">尾款：</view>
               <view class="value" style="color:red;font-weight:bold;">￥{{ orderInfo.remainDebtPrice ? parseFloat(orderInfo.remainDebtPrice) : 0 }}</view>
-              <button class="admin-button-com mini-btn" @click="clear(orderInfo)" style="position:relative;left:445upx;top:0">结清</button>
+              <button class="admin-button-com mini-btn" v-if="Number(orderInfo.remainDebtPrice)>0" @click="clear(orderInfo)" style="position:relative;left:445upx;top:0">结清</button>
             </view>
 
             <view class="msg-list">

hdApp/src/admin/order/workOrder.vue

@@ -28,7 +28,7 @@
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" >
             <view class="tui-title">单价</view>
             <input type="digit" @focus="goodsPrice=''" style="width:210upx;" :focus="true" v-model="goodsPrice" placeholder-class="tui-placeholder"/>
-            <text style="color:#333333;">合计 ¥<text>{{orderTotalPrice}}</text></text>
+            <text style="color:#3385FF;font-weight:bold;">合计 ¥<text>{{orderTotalPrice}}</text></text>
           </tui-list-cell>
 
           <tui-list-cell class="line-cell" :hover="false" :arrow="false">
@@ -53,7 +53,7 @@
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" >
             <view class="tui-title">订金</view>
             <input type="digit" @focus="dj=''" style="width:210upx;" v-model="dj" placeholder-class="tui-placeholder"/>
-            <text style="color:#333333;" v-if="Number(debtFinalPrice)>0">尾款 ¥<text>{{debtFinalPrice}}</text></text>
+            <text style="color:red;font-weight:bold;" v-if="Number(debtFinalPrice)>0">尾款 ¥<text>{{debtFinalPrice}}</text></text>
           </tui-list-cell>
 
         </view>
@@ -227,10 +227,10 @@ export default {
       modifyPrice = modifyPrice.toFixed(2)
       //这里前后顺序有影响哦
       that.form = {...that.form,...that.$refs.appDelivery.form}
-      if(this.$util.isEmpty(that.form.bookName)){
-        this.$msg('请填写订花人姓名')
-        return false       
-      }
+      // if(this.$util.isEmpty(that.form.bookName)){
+      //   this.$msg('请填写订花人姓名')
+      //   return false       
+      // }
       that.$util.confirmModal({content:'确认提交？'},() => {
           createOrder({...that.form,unitGoodsPrice:this.goodsPrice,modifyPrice:modifyPrice,dj:this.dj}).then((res) => {
             that.pageTo({url: '/admin/order/workOrderResult',type:2,query:{id:res.data.id}})