打电话

hdApp/src/admin/order/detail.vue

@@ -26,7 +26,7 @@
             </view>
             <view class="msg-list">
               <view class="label">电话：</view>
-              <view class="value">{{ orderInfo.receiveMobile }}</view>
+              <view class="value" @click="callUp(orderInfo.receiveMobile)">{{ orderInfo.receiveMobile }}</view>
             </view>
             <view class="msg-list">
               <view class="label">地址：</view>
@@ -34,6 +34,10 @@
             </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>
@@ -47,6 +51,14 @@
               <view class="label">寄语：</view>
               <view class="value">{{ orderInfo.cardInfo || '-' }}</view>
             </view>
+            <view class="msg-list" v-if="!$util.isEmpty(orderInfo.remark)">
+              <view class="label">备注：</view>
+              <view class="value" style="color:red;">{{orderInfo.remark}}</view>
+            </view>
+            <view class="msg-list">
+              <view class="label">订花人电话：</view>
+              <view class="value" @click="callUp(orderInfo.bookMobile)">{{orderInfo.bookMobile}}</view>
+            </view>
           </view>
         </view>
       </view>
@@ -129,6 +141,9 @@ export default {
   onLoad() {
   },
   methods: {
+		callUp(mobile) {
+			this.$util.callUp(mobile)
+		},
     printOrder(item){
       onlinePrintOrder({id:item.id}).then(res=>{
         if(res.code == 1){

hdApp/src/utils/util.js

@@ -437,6 +437,17 @@ export const noStockRemind = () =>{
 	})
 }
 
+export const callUp = (mobile) =>{
+	//#ifdef MP-WEIXIN
+	uni.makePhoneCall({
+		phoneNumber: mobile
+	});
+	//#endif
+	//#ifdef APP-PLUS
+	plus.device.dial(mobile, true);
+	//#endif
+}
+
 export default {
 	isEmpty,
 	copyObject,
@@ -457,5 +468,6 @@ export default {
 	confirmModal,
 	isScanEnv,
 	hitRemind,
-	noStockRemind
+	noStockRemind,
+	callUp
 };

mallApp/src/pages/order/detail.vue

@@ -41,7 +41,7 @@
             </div>
             <div class="msg-list">
               <div class="label">地址</div>
-              <div class="value">{{ data.fullAddress }}</div>
+              <div class="value">{{ data.fullAddress }}（{{data.showAddress}}）</div>
             </div>
           </div>
           <div class="order-msg-blo">
@@ -62,6 +62,10 @@
               <div class="label">匿名派送</div>
               <div class="value">{{ data.anonymity == 1 ? '是' : '' }}</div>
             </div>
+            <div class="msg-list" v-if="!$util.isEmpty(data.remark)">
+              <div class="label">备注</div>
+              <div class="value">{{ data.remark }}</div>
+            </div>
           </div>
           <div class="order-msg-blo">
             <div class="msg-list">
@@ -76,13 +80,13 @@
               <div class="label">支付方式</div>
               <div class="value">{{ payWayInfo }}</div>
             </div>
-            <div class="msg-list">
+            <div class="msg-list" v-if="Number(data.sendCost)>0">
               <div class="label">运费</div>
-              <div class="value">￥{{ data.sendCost }}</div>
+              <div class="value">￥{{ data.sendCost?parseFloat(data.sendCost):0 }}</div>
             </div>
             <div class="msg-list">
               <div class="label">合计</div>
-              <div class="value">￥{{ data.orderPrice }}</div>
+              <div class="value">￥{{ data.orderPrice?parseFloat(data.orderPrice):0 }}</div>
             </div>
           </div>
         </div>
@@ -96,11 +100,11 @@
         </div>
       </block>
       <block v-else>
-        <div class="module-com coupon-wrap" v-if="data.discountAmount && data.discountAmount != '0.00'" >
+        <div class="module-com coupon-wrap" v-if="data.discountAmount && Number(data.discountAmount) > 0" >
           <div class="module-tit">优惠信息</div>
           <div class="module-det">
             <div class="app-color-3" >{{ data.discountType == 1 ? '优惠券' : data.discountType == 2 ? '会员优惠' : '随机优惠' }}</div>
-            <div class="app-price">-￥{{ data.discountAmount }}</div>
+            <div class="app-price">-￥{{ data.discountAmount?parseFloat(data.discountAmount):0 }}</div>
           </div>
         </div>
       </block>
@@ -111,7 +115,7 @@
         <span v-else>实付款</span>
         <span class="app-price">
           <span>￥</span>
-          <span class="app-size-40">{{ data.actPrice }}</span>
+          <span class="app-size-40">{{ data.actPrice?parseFloat(data.actPrice):0 }}</span>
         </span>
       </div>
       <template v-if="data.status == 1">