Merge branch 'redesign‌-260706' of http://git.huaml.com/zhh/front-end into redesign‌-260706

hdApp/src/admin/goods/result.vue

@@ -1,12 +1,12 @@
 <template>
 	<view class="app-content">
 		<view class="billing_box_bg">
-			<view class="top-view"> </view>
+			<view class="top-view"></view>
 			<view class="result-view">
 			<view class="iconfont iconchenggong"></view>
 			<view class="result-title">添加成功</view>
 			<button class="admin-button-com middle blue" style="width:20vw;" @click="goBack">返回</button>
-			<view class="form-container">
+			<view class="form-container" v-if="makeTable == 1">
 				<form>
 					<view class="module-com input-line-wrap">
 
@@ -22,16 +22,18 @@
 
 						<tui-list-cell class="line-cell" :hover="false" :arrow="false" >
 							<view class="tui-title">单价</view>
-							<input type="digit" @focus="goodsPrice=''" style="width:260upx;" v-model="goodsPrice" placeholder-class="tui-placeholder" placeholder="填写金额" />
+							<input type="digit" @focus="goodsPrice=''" style="width:160upx;" v-model="goodsPrice" placeholder-class="tui-placeholder" placeholder="填写金额" />
 							<text style="color:#3385FF;font-weight:bold;">合计 ¥<text>{{orderTotalPrice}}</text></text>
 						</tui-list-cell>
 
-						<tui-list-cell class="line-cell" :hover="false" :arrow="false">
+						<tui-list-cell class="line-cell option-wrap" :hover="false" :arrow="false">
 							<view class="tui-title">收款方式</view>
-                			<button @click="form.hasPay = 4" class="admin-button-com middle" :class="form.hasPay == 4 ? 'blue' : 'default'">余额</button>
-                			<button @click="form.hasPay = 0" class="admin-button-com middle" :class="form.hasPay == 0 ? 'blue' : 'default'" style="margin-left:6upx;">扫码</button>
-							<button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'" style="margin-left:6upx;">线下</button>
-							<button @tap="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'" style="margin-left:6upx;">挂账</button>
+							<view class="option-btns">
+								<button @click="form.hasPay = 4" class="admin-button-com middle" :class="form.hasPay == 4 ? 'blue' : 'default'">余额</button>
+								<button @click="form.hasPay = 0" class="admin-button-com middle" :class="form.hasPay == 0 ? 'blue' : 'default'">扫码</button>
+								<button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">线下</button>
+								<button @tap="form.hasPay = 2" class="admin-button-com middle" :class="form.hasPay == 2 ? 'blue' : 'default'">挂账</button>
+							</view>
 						</tui-list-cell>
 
 						<tui-list-cell class="line-cell" :arrow="true" v-if="form.hasPay == 1">
@@ -42,12 +44,14 @@
 							</picker>
 						</tui-list-cell>
 
-						<tui-list-cell class="line-cell" :hover="false">
+						<tui-list-cell class="line-cell option-wrap" :hover="false">
 							<view class="tui-title">配送方式</view>
-							<button @tap="setSendType(0)" class="admin-button-com middle" :class="form.sendType == 0 ? 'blue' : 'default'">送货</button>
-							<button @tap="setSendType(1)" class="admin-button-com middle" :class="form.sendType == 1 ? 'blue' : 'default'" style="margin-left:6upx;">自取</button>
-							<button @click="setSendType(2)" class="admin-button-com middle" :class="form.sendType == 2 ? 'blue' : 'default'" style="margin-left:6upx;">跑腿</button>
-							<button @click="setSendType(3)" class="admin-button-com middle" :class="form.sendType == 3 ? 'blue' : 'default'" style="margin-left:6upx;">物流</button>
+							<view class="option-btns">
+								<button @tap="setSendType(0)" class="admin-button-com middle" :class="form.sendType == 0 ? 'blue' : 'default'">送货</button>
+								<button @tap="setSendType(1)" class="admin-button-com middle" :class="form.sendType == 1 ? 'blue' : 'default'">自取</button>
+								<button @click="setSendType(2)" class="admin-button-com middle" :class="form.sendType == 2 ? 'blue' : 'default'">跑腿</button>
+								<button @click="setSendType(3)" class="admin-button-com middle" :class="form.sendType == 3 ? 'blue' : 'default'">物流</button>
+							</view>
 						</tui-list-cell>
 
 						<tui-list-cell class="line-cell" :hover="false" :arrow="true">
@@ -172,6 +176,7 @@
 <script>
 import TuiListCell from "@/components/plugin/list-cell";
 import { createOrder } from "@/api/order";
+import { getMyExtInfo } from "@/api/shop/ext";
 import { mapGetters } from "vuex";
 import MxDatePicker from '@/components/mx-datepicker/mx-datepicker.vue';
 
@@ -211,7 +216,8 @@ export default {
 				selectedHour: '12', // 选中的小时
 				selectedMinute: '00', // 选中的分钟
 				reachDatePickerShow: false,
-				reachDatePickerValue: ''
+				reachDatePickerValue: '',
+				makeTable:0,//1:显示操作台 0:不显示操作台
 			};
 		},
 	computed: {
@@ -231,7 +237,11 @@ export default {
 	},
 	methods: {
 		init() {
-
+			getMyExtInfo().then(res => {
+				if(res.code == 1){
+					this.makeTable = res.data.makeTable||0
+				}
+			})
 		},
 		setSendType (type) {
 			this.form.sendType = type
@@ -310,7 +320,7 @@ export default {
 <style lang="scss" scoped>
 .billing_box_bg {
 	position: relative;
-	padding: 30upx 30upx;
+	padding: 30upx 30upx 50upx 30upx;
 	display: flex;
 	background: white;
 	flex-direction: column;
@@ -343,7 +353,19 @@ export default {
 			font-size: 32upx;
 		}
 		.form-container {
-			width: 100%;
+			width: auto;
+			align-self: stretch;
+			margin: 35upx 24upx 0;
+			padding: 8upx 0 24upx;
+			box-sizing: border-box;
+			background: #f8f9fb;
+			border: 1px solid #e8eaef;
+			border-radius: 16upx;
+			overflow: hidden;
+			.module-com {
+				background: transparent;
+				margin-bottom: 0;
+			}
 			.line-cell {
 				.tui-title {
 					width: 210upx;
@@ -357,11 +379,33 @@ export default {
 					color: #ccc;
 				}
 			}
+			/* 收款/配送按钮：固定每行 2 个，共两行，按钮拉长 */
+			.option-wrap {
+				align-items: flex-start !important;
+				.option-btns {
+					flex: 1;
+					display: flex;
+					flex-wrap: wrap;
+					align-items: center;
+					.admin-button-com {
+						width: calc(50% - 10upx);
+						margin: 0 10upx 12upx 0;
+						padding-left: 0;
+						padding-right: 0;
+						box-sizing: border-box;
+						flex-shrink: 0;
+						text-align: center;
+						&:nth-child(2n) {
+							margin-right: 0;
+						}
+					}
+				}
+			}
 			.button-group {
 				display: flex;
 				justify-content: center;
 				align-items: center;
-				margin-top: 40upx;
+				margin-top: 24upx;
 				padding: 0 30upx;
 			}
 		}