shish 5 лет назад
Родитель
Сommit
b45f402d77
2 измененных файлов с 4 добавлено и 22 удалено
  1. 3 3
      hdApp/src/admin/billing/affirm.vue
  2. 1 19
      hdApp/src/admin/billing/result.vue

+ 3 - 3
hdApp/src/admin/billing/affirm.vue

@@ -86,9 +86,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="realMoney='',discountIndex=0" v-model="realMoney" 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>
@@ -158,7 +158,7 @@ export default {
 			packingMoney:'',//包装费
 			freight:'',//运费
 			realMoney:0,//真实金额
-			payType:1,//选中的-支付类型
+			payType:0,//支付类型
 			clientInfo: '',//客户信息
 			showCustomer: false,
 			sendType:1,

+ 1 - 19
hdApp/src/admin/billing/result.vue

@@ -13,13 +13,9 @@
 		font-size: 32rpx;
     font-weight: 700;
     line-height: 88upx;
-    // padding-left: 30upx;
-    // border-bottom: 1px solid #eee;
 	}
 	.zuhe-center{
-		// margin-top: 20rpx;
 		font-size: 28rpx;
-    // margin: 0 30upx;
     height: 90upx;
     box-sizing: border-box;
     .zuhe-title{
@@ -53,20 +49,12 @@
 			}
 		}
 	}
-  .border{
-    // border-bottom: 1px solid #eee;
-  }
 }
 </style>
 <template>
   <view class="app-content">
     <appResult>
-  <!--		<button class="admin-button-com blue big" @click="gotoOrderDetails">发货详情</button>-->
       <button class="admin-button-com blue big" @click="gotoOrderSend">发货</button>
-  <!--		<button class="admin-button-com big" @click="gotoOrderPrint">打印单据</button>-->
-  <!--		<button class="admin-button-com big" @click="gotoOrderDetails">订单详情</button>-->
-  <!--		<button class="admin-button-com big" @click="gotoOrderList">订单列表</button>-->
-      <button class="admin-button-com big" @click="gotoPlace">继续开单</button>
       <button class="admin-button-com big" @click="gotoDetail">订单详情</button>
       <view style="text-align: center;color: #868686;margin-top: 30upx;" v-if="option.type === 'zuhe' && isGroup">
         <view class="iconfont iconchenggong" style="color:#049E2C;margin-bottom:15rpx;font-size:80rpx;" ></view>
@@ -138,13 +126,7 @@ export default {
 			uni.navigateTo({url: `/admin/order/ship?id=${this.option.orderId}&pageStatus=0`});
 		},
 		gotoOrderDetails() {
-			uni.navigateTo({url: `/pagesOrder/detail?id=${this.option.orderId}`});
-			// uni.navigateTo({
-			// 	url: `/admin/order/detail?id=${this.option.orderId}`,
-			// 	success: result => {},
-			// 	fail: () => {},
-			// 	complete: () => {}
-			// });
+			uni.navigateTo({url: `/pagesOrder/detail?id=${this.option.orderId}`})
 		},
 		gotoPlace() {
 			uni.navigateBack({