订单

hdApp/src/admin/home/order.vue

@@ -6,6 +6,7 @@
         <view class="list" v-for="(item, index) in list.data" :key="index" @click="pageTo({ url: '/admin/order/detail', query: { id: item.id } })" >
           <view class="list-top flex-center-between" style="border-bottom:1upx solid #EEEEEE;">
             <view class="app-color-3" style="font-size:28upx;font-weight:bold;color:#333333;">编号 {{ item.sendNum }}</view>
+            <view style="border:1upx solid red;border-radius:18upx;font-size:19upx;color:red;padding:5upx 10upx;" v-if="item.debt == 1">有尾款</view>
             <view style="border:1upx solid red;border-radius:18upx;font-size:19upx;color:red;padding:5upx 10upx;" v-if="item.refund == 1">有退款</view>
             <view style="font-size:28upx;" class='app-price app-green'>{{ item.status | constantfilter('ORDER_STATUS') }}</view>
           </view>

hdApp/src/admin/order/detail.vue

@@ -24,7 +24,7 @@
         </view>
       </view>
 
-      <view class="module-com order-msg" v-if="!$util.isEmpty(orderInfo.receiveMobile)">
+      <view class="module-com order-msg">
         <view class="module-tit">
           收花人信息
           <button class="admin-button-com mini-btn" @click="edit" style="float:right;">编辑</button>
@@ -32,7 +32,7 @@
         <view class="module-det">
           <view class="order-msg-blo">
             <view class="msg-list">
-              <view class="label">收花：</view>
+              <view class="label">名称：</view>
               <view class="value">{{ orderInfo.receiveUserName }}</view>
             </view>
             <view class="msg-list">
@@ -43,15 +43,13 @@
               <view class="label">地址：</view>
               <view class="value">{{ orderInfo.fullAddress }}<text v-if="!$util.isEmpty(orderInfo.showAddress)">（{{orderInfo.showAddress}}）</text></view>
             </view>
-          </view>
-          <view class="order-msg-blo">
             <view class="msg-list" v-if="orderInfo.anonymity && Number(orderInfo.anonymity) == 1">
               <view class="label">要求：</view>
               <view class="value" style="font-weight:bold;color:red;">匿名派送</view>
             </view>
             <view class="msg-list">
-              <view class="label">送达：</view>
-              <view v-if="orderInfo.reachDate == '0000-00-00'" class="value">-</view>
+              <view class="label">时间：</view>
+              <view v-if="orderInfo.reachDate == '0000-00-00'" class="value"></view>
               <view v-else class="value"><span style="margin-right:10upx;">{{orderInfo.reachDate}}</span> <span v-if="orderInfo.reachPeriod == 0">上午</span><span v-else-if="orderInfo.reachPeriod == 1">下午</span><span v-else>晚上</span></view>
             </view>
             <view v-if="orderInfo.reachDate != '0000-00-00'" class="msg-list">
@@ -60,7 +58,7 @@
             </view>
             <view class="msg-list">
               <view class="label">寄语：</view>
-              <view class="value">{{ orderInfo.cardInfo || '-' }}</view>
+              <view class="value">{{ orderInfo.cardInfo || '' }}</view>
             </view>
             <view class="msg-list">
               <view class="label">订花人电话：</view>
@@ -77,6 +75,16 @@
         </view>
         <view class="module-det">
           <view class="order-msg-blo">
+
+            <view class="msg-list" v-if="Number(dj)>0">
+              <view class="label">订金：</view>
+              <view class="value">￥{{dj}}</view>
+            </view>
+            <view class="msg-list" v-if="Number(orderInfo.remainDebtPrice)>0">
+              <view class="label" style="color:red;">尾款：</view>
+              <view class="value" style="color:red;font-weight:bold;">￥{{ orderInfo.remainDebtPrice ? parseFloat(orderInfo.remainDebtPrice) : 0 }}</view>
+            </view>
+
             <view class="msg-list">
               <view class="label">状态：</view>
               <view class="value">{{orderInfo.status == 1?'待付款':orderInfo.status==2?'待配送':orderInfo.status == 3?'配送中':orderInfo.status ==4?'已完成':orderInfo.status == 5?'已取消':'待付款'}}</view>
@@ -102,7 +110,7 @@
               <view class="value">-￥{{ orderInfo.discountAmount ? parseFloat(orderInfo.discountAmount) : 0 }}</view>
             </view>
             <view class="msg-list">
-              <view class="label">金额：</view>
+              <view class="label">原价：</view>
               <view class="value">￥{{ orderInfo.orderPrice ? parseFloat(orderInfo.orderPrice) : 0 }}</view>
             </view>
             <view class="msg-list" v-if="Number(orderInfo.tkPrice)>0">
@@ -111,9 +119,10 @@
               <view style="color: #3385ff;margin-left:50upx;" @click="pageTo({url: '/admin/order/refundList',query: {orderSn: orderInfo.orderSn}})">退款记录</view>
             </view>
             <view class="msg-list">
-              <view class="label">实付：</view>
+              <view class="label">实价：</view>
               <view class="value">￥{{ orderInfo.realPrice ? parseFloat(orderInfo.realPrice) : 0 }}</view>
             </view>
+
           </view>
         </view>
       </view>
@@ -142,7 +151,8 @@ export default {
   data() {
     return {
       constant: this.$constant,
-      orderInfo: {}
+      orderInfo: {},
+      dj:0
     };
   },
   onLoad() {
@@ -175,6 +185,8 @@ export default {
       return getDetB({ id: this.option.id }).then(res => {
         this.orderInfo = res.data;
         this.orderInfo.deadline = commonUtil.getFormatDate(this.orderInfo.deadline,'MM-dd hh:mm')
+        this.dj = this.orderInfo.actPrice - this.orderInfo.debtPrice
+        this.dj = parseFloat(this.dj.toFixed(2))
       });
     }
   }

hdApp/src/admin/order/workOrder.vue

@@ -226,7 +226,6 @@ export default {
       let modifyPrice = Number(this.goodsPrice)*Number(this.form.num)
       modifyPrice = modifyPrice.toFixed(2)
       that.form = {...that.$refs.appDelivery.form,...that.form}
-      console.log('that.form',that.form)
       if(this.$util.isEmpty(that.form.bookName)){
         this.$msg('请填写订花人姓名')
         return false       

hdApp/src/components/app-delivery.vue

@@ -133,27 +133,24 @@ export default {
       showRegion: false,
       form: {
         sendType:3,
-        receiveUserName: "", // 收花人姓名；到店自提的姓名
-        receiveMobile: "", // 收花人手机；到店自提的电话；
-        province: "", // 收花人省份
-        city: "", // 收花人城市
-        address: "", // 收花人城市
+        receiveUserName: "",
+        receiveMobile: "",
+        province: "",
+        city: "",
+        address: "",
         showAddress:"",
-        floor: "", // 收花人门楼号和牌号
-        fullAddress: "", // 收花人完整地址，从腾讯地图接口获取
-        bookName: '', // 订花人姓名
-        bookMobile: "", // 订花人手机号
-        reachDate: 0, // 配送时间
-        reachPeriod: "0", // 配送时段，0上午1下午2晚上
-        needCard: "1", // 是否要贺卡 0不要 1要
-        cardInfo: "", // 贺卡信息
-        remark: "",// 备注
+        floor: "",
+        fullAddress: "",
+        bookName: '',
+        bookMobile: "",
+        reachDate: 0,
+        reachPeriod: "0",
+        needCard: "1",
+        cardInfo: "",
+        remark: "",
         anonymity:0
       },
-      region: {
-        latitude: 0,
-        longitude: 0
-      },
+      region: {latitude: 0,longitude: 0},
       regionTree:[],
       cityPickerValueDefault: [0, 0]
     };