添加商品

hdApp/src/admin/billing/components/app-commodity2.vue

@@ -102,7 +102,12 @@ export default {
 	},
 	methods: {
 		addItemFn () {
-			this.$emit("replaceItemFn", this.info,0,'add')
+			//没价格商品并且没有设置userPrice时，不能一个一个添加，只能弹框方式添加
+			if(this.info.priceType == 0 && (this.$util.isEmpty(this.info.userPrice) || Number(this.info.userPrice) == 0)){
+				this.showAddModelFn()
+			}else{
+				this.$emit("replaceItemFn", this.info,0,'add')
+			}			
 		},
 		reduceItemFn() {
 			this.$emit("replaceItemFn", this.info,0,'sub')

hdApp/src/admin/goods/result.vue

@@ -5,10 +5,16 @@
 			<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="goBackHome">返回</button>
 			<view class="form-container">
 				<form>
 					<view class="module-com input-line-wrap">
+
+						<tui-list-cell class="line-cell" :hover="false">
+							<view class="tui-title">名称</view>
+							<view>{{ goodsName }}</view>
+						</tui-list-cell>
+
 						<tui-list-cell class="line-cell" :hover="false">
 							<view class="tui-title required">数量</view>
 							<input v-model="form.num" placeholder-class="phcolor" class="tui-input" name="num" @focus="form.num=''" placeholder="填写数量" maxlength="50" type="number" />
@@ -37,8 +43,8 @@
 						<tui-list-cell class="line-cell" :hover="false">
 							<view class="tui-title required">配送方式</view>
 							<button @tap="form.sendType = 3" class="admin-button-com middle" :class="form.sendType == 3 ? 'blue' : 'default'">骑手送</button>
-							<button @tap="form.sendType = 2" class="admin-button-com middle" style="margin-left:5upx;" :class="form.sendType == 2 ? 'blue' : 'default'">自己送</button>
-							<button @tap="form.sendType = 1" class="admin-button-com middle" style="margin-left:5upx;" :class="form.sendType == 1 ? 'blue' : 'default'">到店自取</button>
+							<button @tap="form.sendType = 2" class="admin-button-com middle" style="margin-left:4upx;" :class="form.sendType == 2 ? 'blue' : 'default'">自己送</button>
+							<button @tap="form.sendType = 1" class="admin-button-com middle" style="margin-left:4upx;" :class="form.sendType == 1 ? 'blue' : 'default'">到店自取</button>
 						</tui-list-cell>
 
 						<tui-list-cell class="line-cell" :hover="false" :arrow="true">
@@ -102,7 +108,8 @@ export default {
 			timeOptions: [
 				['00', '01', '02','03','04','05','06','07','08','09','10','11','12','13', '14','15','16','17','18','19','20','21','22','23'],
 				['00', '05', '10','15','20','25','30','35','40','45','50','55']
-			]
+			],
+			goodsName:''
 		};
 	},
 	computed: {
@@ -116,6 +123,9 @@ export default {
 			return price;
 		}
 	},
+	onLoad(options) {
+		this.goodsName = options.name?options.name:'';
+	},
 	methods: {
 		init() {
 
@@ -173,7 +183,7 @@ export default {
 			color: $mainColor1;
 		}
 		.result-title {
-			margin: 20upx 0 40upx;
+			margin: 10upx 0 10upx;
 			font-size: 32upx;
 		}
 		.form-container {