工时

ghsApp/src/admin/billing/affirm.vue

@@ -97,12 +97,12 @@
 
 									<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 										<view class="tui-title">实收金额</view>
-										<input style="border: 1px solid #eee;color: #3385FF;width: calc(100%);" type="number" @focus="realMoney=''" v-model="realMoney" placeholder-class="tui-placeholder"/>
+										<input style="border: 1px solid #eee;color: #3385FF;width: calc(100%);" type="number" @focus="modifyPrice=''" v-model="modifyPrice" placeholder-class="tui-placeholder"/>
 									</tui-list-cell>
 
 									<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 										<view class="tui-title">优惠</view>
-										<text style="color: #3385FF">{{	(allPrice.toFixed(2) - realMoney + Number(this.form.sendCost)).toFixed(2) }}</text>
+										<text style="color: #3385FF">{{	(allPrice.toFixed(2) - modifyPrice + Number(this.form.sendCost)).toFixed(2) }}</text>
 									</tui-list-cell>
 
         </view>
@@ -115,7 +115,7 @@
           ¥
           <!--<text class="large" v-if="form.sendType == 1">{{	(allPrice + Number(form.sendCost)).toFixed(2) }}</text>-->
           <!--<text class="large" v-else >{{ allPrice.toFixed(2) }}</text>-->
-          <text class="large" >{{ realMoney?realMoney:0 }}</text>
+          <text class="large" >{{ modifyPrice?modifyPrice:0 }}</text>
         </text>
       </view>
       <button class="admin-button-com blue middle" @click="affirmFormSubmit">
@@ -177,7 +177,7 @@ export default {
         product: "",
       },
       money: "",
-						realMoney: 0,
+			modifyPrice: 0,
       showCustomer: false
     };
   },
@@ -193,7 +193,7 @@ export default {
         title: this.getMerchantInfo.name,
       });
     }
-    this.realMoney = this.allPrice.toFixed(2);
+    this.modifyPrice = this.allPrice.toFixed(2);
   },
 	onShow(){
 		if(!this.$util.isEmpty(uni.getStorageSync("newClient"))){
@@ -214,7 +214,7 @@ export default {
     countAllPrices (e) {
       this.allPrices = this.allPrices + Number(this.form.sendCost);
       let allPrices = this.allPrice.toFixed(2)
-      this.realMoney = (Number(allPrices) + Number(this.form.sendCost)).toFixed(2);
+      this.modifyPrice = (Number(allPrices) + Number(this.form.sendCost)).toFixed(2);
 
     },
     courier (type) {
@@ -270,7 +270,7 @@ export default {
         options.sendCost = "";
       }
 
-      createOrder({...options,realPrice: this.realMoney,}).then((res) => {
+      createOrder({...options,modifyPrice: this.modifyPrice,}).then((res) => {
         this.resetSelectInfoByType(this.pageType);
         const {
           data: { id, orderSn },

ghsApp/src/components/app-customer-sel.vue

@@ -32,7 +32,7 @@
 						<view class="item-avatar">
 							<image :src="item.smallAvatar" alt="商品图" />
 						</view>
-						<view class="item-name"> {{ item.name || "" }} <text v-if="newClientId==item.id">新客户</text></view>
+						<view class="item-name"> {{ item.name || "" }} <text v-if="newClientId==item.id">新增</text></view>
 						<view class="item-level">{{ getCustomerLevelName(item) }}</view>
 						<!-- <view class="item-tag">NEW</view> -->
 					</view>

ghsApp/src/components/app-supplier-sel.vue

@@ -37,13 +37,13 @@
 						<view class="item-avatar">
 							<image :src="item.smallAvatar" alt="商品图" />
 						</view>
-						<view class="item-name"> {{ item.name || "" }} <text v-if="newGhsId==item.id">新供货商</text></view>
+						<view class="item-name"> {{ item.name || "" }} <text v-if="newGhsId==item.id">新增</text></view>
 						<view class="item-level">{{ getCustomerLevelName(item) }}</view>
 						<!-- <view class="item-tag">NEW</view> -->
 					</view>
 				</scroll-view>
 				<view class="add-customer-bar" @click="gotoAddCustomer">
-					没有找到供货商？新增
+					没有找到供应商？新增
 				</view>
 			</div>
 		</bottom-popup>

ghsApp/src/pagesOrder/detail.vue

@@ -111,11 +111,19 @@
 				<div class="module-com input-line-wrap">
 					<tui-list-cell class="line-cell" :hover="false">
 						<div class="tui-title">运费</div>
-						<div class="detail-price_box" style="font-size: 35rpx">¥{{ detailInfo.sendCost }}</div>
+						<div class="detail-price_box" style="font-size: 28rpx">¥{{ detailInfo.sendCost }}</div>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 						<div class="tui-title">总金额</div>
-						<div class="detail-price_box red" style="font-size: 36rpx;font-weight:bold;">¥{{ detailInfo.actPrice}}</div>
+						<div class="detail-price_box" style="font-size: 28rpx;">¥{{ detailInfo.prePrice}}</div>
+					</tui-list-cell>
+					<tui-list-cell if="detailInfo.discountAmount > 0" class="line-cell" :hover="false">
+						<div class="tui-title">优惠</div>
+						<div class="detail-price_box" style="font-size: 28rpx">¥{{ detailInfo.discountAmount }}</div>
+					</tui-list-cell>
+					<tui-list-cell class="line-cell" :hover="false">
+						<div class="tui-title">实付金额</div>
+						<div class="detail-price_box red" style="font-size: 32rpx;font-weight:bold;">¥{{ detailInfo.realPrice}}</div>
 					</tui-list-cell>
 				</div>
 			</view>