界面优化

hdApp/src/admin/billing/affirm.vue

@@ -147,7 +147,7 @@
             <view v-if="form.hasPay == 2" class="tui-title">应收金额</view>
             <view v-else class="tui-title">实收金额</view>
             <input style="border:1upx solid #eee;color:#3385FF;width:150upx;height:70upx;" type="digit" @focus="modifyPrice=''" v-model="modifyPrice" placeholder-class="tui-placeholder"/>
-            <text v-if="modifyPrice > 0 && modifyPrice > finalPrice" style="font-size:25upx;margin-left:20upx;color:red;">人工资材费 ¥{{parseFloat((modifyPrice-finalPrice).toFixed(2))}}</text>
+            <text v-if="modifyPrice > 0 && modifyPrice > finalPrice" style="font-size:25upx;margin-left:20upx;color:red;">人工包装费 ¥{{parseFloat((modifyPrice-finalPrice).toFixed(2))}}</text>
             <text v-if="modifyPrice > 0 && modifyPrice < finalPrice" style="font-size:25upx;margin-left:20upx;color:green;">优惠 ¥{{parseFloat((finalPrice-modifyPrice).toFixed(2))}}</text>
           </tui-list-cell>
 
@@ -396,6 +396,14 @@ export default {
       let currentPrice = parseFloat(finalPrice)
       this.modifyPrice = currentPrice 
       return currentPrice
+    },
+    labourCost(){
+      let cost = 0
+      if(Number(this.modifyPrice)>Number(this.finalPrice)){
+        cost = Number(this.modifyPrice) - Number(this.finalPrice)
+        cost = Number(cost).toFixed(2)
+      }
+      return cost
     }
   },
   methods: {
@@ -523,7 +531,7 @@ export default {
         return false
       }
 
-      let params = {...formData,modifyPrice: this.modifyPrice};
+      let params = {...formData,modifyPrice: this.modifyPrice,labourCost:this.labourCost};
 
       //多颜色
       let xj = uni.getStorageSync("xj"+this.option.customId)

hdApp/src/admin/billing/result.vue

@@ -1,8 +1,8 @@
 <template>
   <view class="app-content">
     <appResult>
-      <button class="admin-button-com blue big" @click="gotoPlace">返回</button>
-      <button class="admin-button-com blue big" @click="gotoDetail">订单详情</button>
+		<button class="admin-button-com blue big" @click="gotoDetail">订单详情</button>
+		<button class="admin-button-com blue big" @click="gotoPlace">返回</button>
     </appResult>
   </view>
 </template>
@@ -40,7 +40,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .admin-button-com {
-	margin-bottom: 40upx;
+	margin-bottom:50upx;
 	width: 100%;
 }
 .zuhe-box{

hdApp/src/admin/goods/plantCgDetail.vue

@@ -68,7 +68,7 @@
             <div class="detail-price_box" style="font-size: 28upx;">¥{{ parseFloat(detailInfo.sendCost)||0 }}</div>
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false" v-if="Number(detailInfo.labourCost)>0">
-            <div class="tui-title">人工资材费</div>
+            <div class="tui-title">人工包装费</div>
             <div class="detail-price_box" style="font-size: 28upx;">¥{{ parseFloat(detailInfo.labourCost)||0 }}</div>
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false" v-if="detailInfo.discountAmount > 0">

hdApp/src/admin/order/addOrderConfirm.vue

@@ -50,7 +50,7 @@
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" >
             <view class="tui-title">实收金额</view>
             <input style="border:1upx solid #eee;color:#3385FF;width:150upx;height:70upx;" type="digit" @focus="modifyPrice=''" v-model="modifyPrice" placeholder-class="tui-placeholder"/>
-            <text v-if="modifyPrice > 0 && modifyPrice > finalPrice" style="font-size:25upx;margin-left:20upx;color:red;">人工资材费 ¥{{parseFloat((modifyPrice-finalPrice).toFixed(2))}}</text>
+            <text v-if="modifyPrice > 0 && modifyPrice > finalPrice" style="font-size:25upx;margin-left:20upx;color:red;">人工包装费 ¥{{parseFloat((modifyPrice-finalPrice).toFixed(2))}}</text>
             <text v-if="modifyPrice > 0 && modifyPrice < finalPrice" style="font-size:25upx;margin-left:20upx;color:green;">优惠 ¥{{parseFloat((finalPrice-modifyPrice).toFixed(2))}}</text>
           </tui-list-cell>