Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghsApp/src/admin/billing/affirm.vue

@@ -51,7 +51,7 @@
         <view class="module-com input-line-wrap">
 									<view class="tab-box flex-space">
 										<view class="flex-center tab" :class="isBilling?'active':''" @tap="isBilling=true">开单</view>
-										<view class="flex-center tab" :class="isBilling?'':'active'" @tap="isBilling=false">损耗登记</view>
+										<view class="flex-center tab" :class="isBilling?'':'active'" @tap="isBilling=false">报损登记</view>
 									</view>
 									<view class="" v-if="isBilling">
           <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="showCustomer = true">
@@ -82,22 +82,22 @@
             </button>
           </tui-list-cell>
 
-									<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
-										<view class="tui-title">总金额</view>
-										<text style="color: #3385FF" v-if="form.sendType == 1">{{	(allPrice + Number(form.sendCost)).toFixed(2) }}</text>
-										<text style="color: #3385FF" v-else >{{ allPrice.toFixed(2) }}</text>
-									</tui-list-cell>
+          <tui-list-cell class="line-cell" :hover="false" :arrow="false" >
+            <view class="tui-title">总金额</view>
+            <text style="color: #3385FF" v-if="form.sendType == 1">{{	(allPrice + Number(form.sendCost)).toFixed(2) }}</text>
+            <text style="color: #3385FF" v-else >{{ allPrice.toFixed(2) }}</text>
+          </tui-list-cell>
 
-									<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="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>
+            <input style="border: 1px solid #eee;color: #3385FF;width: calc(100%);height:70rpx;" 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) - modifyPrice + Number(this.form.sendCost)).toFixed(2) }}</text>
-									</tui-list-cell>
-									</view>
+          <tui-list-cell class="line-cell" :hover="false" :arrow="false" >
+            <view class="tui-title">优惠</view>
+            <text style="color: #3385FF">{{	(allPrice.toFixed(2) - modifyPrice + Number(this.form.sendCost)).toFixed(2) }}</text>
+          </tui-list-cell>
+          </view>
         </view>
       </form>
     </view>
@@ -316,7 +316,7 @@ export default {
 						// formData.product = JSON.stringify(product);
 						uni.showModal({
 							title: "提示",
-							content: "损耗登记？",
+							content: "确认报损？",
 							success: function (res) {
 								if (res.confirm) {
 									wastage({product:JSON.stringify(product)}).then((res) => {
@@ -472,14 +472,13 @@ export default {
     .module-com {
       background-color: #fff;
       margin-bottom: 20px;
-
       border-radius: 10px;
       overflow: hidden;
 					.tab-box{
 						padding: 10rpx 30rpx 30rpx;
 						.tab{
-							width: 45%;
-							height: 80rpx;
+							width: 49%;
+							height: 70rpx;
 							color: #a2a2a2;
 							border: 1px solid #dcdcdc;
 							border-radius: 10rpx;

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

@@ -159,7 +159,7 @@ export default {
 }
 .map-wrap {
 	.map-top-tit-wrap {
-		padding: 30px 0;
+		padding: 34px 0;
 		text-align: center;
 		font-size: 34px;
 	}

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

@@ -35,7 +35,7 @@
 						class="customer-item"
 					>
 						<view class="item-avatar">
-							<image :src="item.smallAvatar" alt="商品图" />
+							<image :src="item.avatar" alt="" />
 						</view>
 						<view class="item-name"> {{ item.name || "" }} <text v-if="newGhsId==item.id">新增</text></view>
 						<view class="item-level">{{ getCustomerLevelName(item) }}</view>
@@ -170,7 +170,7 @@ export default {
 }
 .map-wrap {
 	.map-top-tit-wrap {
-		padding: 30px 0;
+		padding: 34px 0;
 		text-align: center;
 		font-size: 34px;
 	}

ghsApp/src/pagesOrder/detail.vue

@@ -122,7 +122,7 @@
 						<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="tui-title">实收金额</div>
 						<div class="detail-price_box red" style="font-size: 32rpx;font-weight:bold;">¥{{ detailInfo.realPrice}}</div>
 					</tui-list-cell>
 				</div>

hdApp/src/admin/billing/affirmGoods.vue

@@ -81,9 +81,9 @@
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 						<view class="tui-title">实收金额</view>
 						<view class="flex-space" style="width: 100%;">
-							<input style="border: 1px solid #eee;color: #3385FF;width: 60%;" type="number" @focus="realMoney='',discountIndex=0" v-model="realMoney" placeholder-class="tui-placeholder"/>
+							<input style="border: 1px solid #eee;color: #3385FF;width: 60%;height:70rpx;" type="number" @focus="modifyPrice='',discountIndex=0" v-model="modifyPrice" placeholder-class="tui-placeholder"/>
 							<picker style="border: 1px solid #eee;width: 30%;" @change="discountChange" :value="discountIndex" :range="discount">
-								<view class="flex-space">
+								<view class="flex-space" style="height:70rpx;">
 									<view class="uni-input">{{discount[discountIndex]}}</view>
 									<i class="iconfont iconxiangyou"></i>
 								</view>
@@ -93,7 +93,7 @@
 
 					<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 						<view class="tui-title">优惠</view>
-						<text style="color: #3385FF">{{	((Number(freight)+Number(allGoodsPrice)).toFixed(2) - realMoney).toFixed(2) }}</text>
+						<text style="color: #3385FF">{{	((Number(freight)+Number(allGoodsPrice)).toFixed(2) - modifyPrice).toFixed(2) }}</text>
 					</tui-list-cell>
 
 
@@ -105,7 +105,7 @@
 			<view class="price-view">
 				<text class="price-title">收款</text>
 				<text class="price-number">
-					¥ <text class="large">{{	realMoney  }}</text>
+					¥ <text class="large">{{	modifyPrice  }}</text>
 				</text>
 			</view>
 			<button class="admin-button-com blue middle" @click="affirmFormSubmit">开单</button>
@@ -154,7 +154,7 @@ export default {
 			payType:1,//选中的-支付类型
 			clientInfo: '',//客户信息
 			showCustomer: false,
-			realMoney: 0,
+			modifyPrice: 0,
 			sendType:1,
 			discountIndex:0,
 			discount:['未打折','95折','9折','85折','8折','75折','7折','65折','6折']
@@ -172,7 +172,7 @@ export default {
 				title: this.getMerchantInfo.name
 			});
 		}
-		this.realMoney = this.allGoodsPrice.toFixed(2);
+		this.modifyPrice = this.allGoodsPrice.toFixed(2);
 		setTimeout(()=>{
 			this.payType = this.getDictionariesInfo.htPayWayOption[0].id;
 		},100)
@@ -216,11 +216,11 @@ export default {
 					discount = (allPrices - (allPrices * 0.6)).toFixed(2);
 					break;
 			}
-			this.realMoney = (allPrices - discount).toFixed(2);
+			this.modifyPrice = (allPrices - discount).toFixed(2);
 		},
 		countAllPrices(){
 			let allPrices = this.allGoodsPrice.toFixed(2)
-			this.realMoney = (Number(allPrices) + Number(this.freight)).toFixed(2);
+			this.modifyPrice = (Number(allPrices) + Number(this.freight)).toFixed(2);
 		},
 		// 选取客户
 		changeCustomerFn(info) {
@@ -248,7 +248,7 @@ export default {
 				customId:this.clientInfo.id,// 客户
 				payWay:this.payType,//付款方式
 				sendType:this.sendType,//配送方式 0未知 1自取
-				realPrice: this.realMoney,
+				modifyPrice: this.modifyPrice,
 				goodsInfo:JSON.stringify(product),//下单商品
 			};
 			let self = this;

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

@@ -166,7 +166,7 @@ export default {
 }
 .map-wrap {
 	.map-top-tit-wrap {
-		padding: 30px 0;
+		padding: 34px 0;
 		text-align: center;
 		font-size: 34px;
 	}