订金

hdApp/src/admin/order/workOrder.vue

@@ -217,9 +217,11 @@ export default {
         this.$msg('请填写单价')
         return false
       }
-      if(Number(this.dj) >= Number(this.orderTotalPrice)){
-        this.$msg('订金要小于总金额')
-        return false
+      if(Number(this.dj)>0){
+        if(Number(this.dj) >= Number(this.orderTotalPrice)){
+          this.$msg('订金要小于总金额')
+          return false
+        }
       }
       let modifyPrice = Number(this.goodsPrice)*Number(this.form.num)
       modifyPrice = modifyPrice.toFixed(2)

hdApp/src/components/app-delivery.vue

@@ -75,7 +75,7 @@
 
       <tui-list-cell class="line-cell" v-if="form.needCard == 1" :hover="false">
         <view class="tui-title">贺卡内容</view>
-        <input v-model="form.cardInfo" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="bookName" placeholder="请填写" />
+        <input v-model="form.cardInfo" placeholder-class="phcolor" placeholder-style="color:#ccc" class="tui-input" name="cardInfo" placeholder="请填写" />
       </tui-list-cell>
 
       <template v-if="form.sendType != 1">