订单价格

hdApp/src/admin/order/workOrder.vue

@@ -183,9 +183,9 @@ export default {
 
       that.form = {...that.$refs.appDelivery.form,...that.form}
       that.$util.confirmModal({content:'确认提交？'},() => {
-          createOrder({...that.form,lsGoodsPrice:this.modifyPrice}).then((res) => {
+          createOrder({...that.form,lsGoodsPrice:this.modifyPrice,modifyPrice:this.modifyPrice}).then((res) => {
             that.pageTo({url: '/admin/order/addOrderResult',type:2,query:{id:res.data.id}})
-          });
+          })
       })
     }
   },

hdApp/src/admin/work/detail.vue

@@ -20,6 +20,10 @@
 					<view>制单状态：</view>
 					<view>{{ detailInfo.status==0?'待完成':detailInfo.status==1?'已完成':detailInfo.status==2?'已取消':'待完成' }}</view>
 				</view>
+				<view class="order-info_box" v-if="Number(detailInfo.orderPrice)>0">
+					<view>订单金额：</view>
+					<view>{{ detailInfo.orderPrice ? parseFloat(detailInfo.orderPrice) : 0 }}</view>
+				</view>
 			</view>
 			<view class="flex-space title" v-if="!$util.isEmpty(goodsInfo)"> 作品 </view>
 			<view class="module-com content-box" v-if="!$util.isEmpty(goodsInfo)">

hdPad/src/pages/home/components/workInfo.vue

@@ -12,13 +12,21 @@
         <view v-if="orderInfo.hasReachTime == 1"><text class="left">配送</text>
           <text class="right" style="color:red;font-weight:bold;">{{orderInfo.reachDate == today ? '今天' : orderInfo.reachDate.substr(5,9)}} {{orderInfo.reachPeriod == 0 ? '上午':orderInfo.reachPeriod==1?'下午':orderInfo.reachPeriod==2?'晚上':'其它'}}</text>
         </view>
-        <view v-if="!$util.isEmpty(orderInfo.remark)"><text class="left">备注</text><text class="right" style="color:red;font-weight:bold;">{{orderInfo.remark}}</text></view>
-        <view><text class="left">支数</text><text class="right">{{orderInfo.flowerNum}}</text></view>
+        <view v-if="!$util.isEmpty(orderInfo.remark)">
+          <text class="left">备注</text>
+          <text class="right" style="color:red;font-weight:bold;">{{orderInfo.remark}}</text>
+        </view>
+        <view v-if="Number(orderInfo.orderPrice)>0">
+          <text class="left">订单金额</text>
+          <text class="right" style="color:red;font-weight:bold;">
+          ¥{{orderInfo.orderPrice && Number(orderInfo.orderPrice)>0 ? parseFloat(orderInfo.orderPrice) : ''}}
+          </text>
+        </view>
+        <view><text class="left">数量</text><text class="right">{{orderInfo.num}}</text></view>
         <view><text class="left">分类</text><text class="right">{{orderInfo.catName}}</text></view>
         <view><text class="left">名称</text><text class="right">{{orderInfo.name}}</text></view>
-        <view><text class="left">数量</text><text class="right">{{orderInfo.num}}</text></view>
+        <view><text class="left">支数</text><text class="right">{{orderInfo.flowerNum}}</text></view>
         <view><text class="left">商品编号</text><text class="right">{{orderInfo.goodsSn}}</text></view>
-        <view><text class="left">售价</text><text class="right">{{orderInfo.price||''}}</text></view>
         <view><text class="left">制单号</text><text class="right">{{orderInfo.workSn}}</text></view>
         <view><text class="left">订单号</text><text class="right">{{orderInfo.orderSn}}</text></view>
         <view><text class="left">状态</text><text class="right">{{getStatus(orderInfo.status)}}</text></view>

hdPad/src/pages/home/components/workList.vue

@@ -11,7 +11,9 @@
             <view v-for="item in list.data" :key="item.id" class="show-item_box" @click="getOrder(item,1)">
                 <view :class="[selectOrderId==item.id ? 'active' : 'not-active', 'item-body_box']">
                     <view class="flower-name_box">
-                        <view class="current-item-title"><text>{{item.name}}</text></view>
+                        <view class="current-item-title">
+                            <text>{{item.staffName}} {{item.name}}</text>
+                        </view>
                         <image class="flower-image" :src="item.cover"></image>
                         <text style="position:absolute;top:2upx;left:90upx;font-size:11upx;">{{item.sn}}</text>
                     </view>