Merge branch 'fix/goods-0525' into msb_test

pages/order/submit/index.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-04 17:30:58
  * @LastEditors: ch
- * @LastEditTime: 2022-05-26 18:00:33
+ * @LastEditTime: 2022-05-26 20:00:22
  * @Description: file content
 -->
 
@@ -20,7 +20,7 @@
 		<h3 class="title">确认商品信息</h3>
 		<OrderInfo :products="orderInfo.products" />
 		<Message :orderInfo="orderInfo" :message.sync="userMessage"/>
-		<Amount :amount="orderInfo.productAmount" :address="address"/>
+		<Amount :amount="orderInfo.productAmount" :address="address" :productType="productType" />
 		<div class="pay">
 			<UiButton radius type="red_panel" @click="submit">立即支付</UiButton>
 		</div>

pages/order/submit/module/Amount.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-08 16:12:18
  * @LastEditors: ch
- * @LastEditTime: 2022-05-16 15:41:08
+ * @LastEditTime: 2022-05-26 20:03:02
  * @Description: file content
 -->
 <template>
@@ -11,8 +11,10 @@
 			<span>应付款</span>
 			<UiMoney class="money" size="20px" preSize="14px" sufSize="14px" :money="amount" float prefix suffix/>
 		</div>
+		<template v-if="productType == 1">
 			<p>{{address.province + address.city + address.area + address.detailAddress}}</p>
 			<p>{{address.name}} {{address.phone}}</p>
+		</template>
 	</div>
 </template>
 <script>
@@ -20,6 +22,10 @@ import UiMoney from '../../../../components/UiMoney.vue'
 export default {
 	components: { UiMoney },
 	props : {
+		productType : {
+			type : String | Number
+			
+		},
 		amount : {
 			type : Number,
 			default : 0
@@ -34,7 +40,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .amount{
-	height: 133px;
+	max-height: 133px;
 	background: #f8f8f8;
 	text-align: right;
 	padding: 20px 40px;