优化购物车UI

src/utils/request.js

@@ -77,7 +77,6 @@ service.interceptors.request.use(
 // response interceptor
 service.interceptors.response.use(
   response => {
-    console.log('response', response)
     const responseData = response.data
     const data = responseData.data
     if (responseData.success === false) {

src/views/shop/car-fund-products.vue

@@ -83,24 +83,25 @@
 
 					<div class="white-box-footer">
 						<!-- 订单合计 -->
-						<div class="box address_box" style="margin: 15px 0;">
+						<div class="" style="margin: 15px 0;">
 							<el-row :gutter="20">
-								<el-col :xs="24" :sm="24" :md="10" :lg="10" :xl="10">
+								<el-col :xs="24" :sm="24" :lg="3">
 									<span style="font-weight: bold; word-break: normal; white-space: normal; line-height: 28px;">{{ $t('shop.totalOrders') }}：</span>
 								</el-col>
-								<el-col :xs="24" :sm="24" :md="14" :lg="14" :xl="14" style="word-break: normal; white-space: nowrap; line-height: 28px;">
+								<el-col :xs="24" :sm="24" :lg="21" style="word-break: normal; white-space: nowrap; line-height: 28px;">
 									<span>{{ $t('shop.total') }}：{{ parseFloat(pointsSum) | toThousandFilter }}</span>
-									<span style="margin-left: 15px;">{{ $t('shop.freight') }}：{{ pointFreight }}</span>
+									<span>{{ $t('shop.freight') }}：{{ pointFreight }}</span>
 								</el-col>
 							</el-row>
 						</div>
+						<el-divider></el-divider>
 						<!-- 支付方式/账户余额 {{ cashCurrency }}:  -->
-						<div class="box address_box" style="margin: 15px 0;">
+						<div class="" style="margin: 15px 0;">
 							<el-row :gutter="20" type="flex" style="flex-wrap: wrap;">
-								<el-col :xs="24" :sm="24" :md="10" :lg="810" :xl="10">
+								<el-col :xs="24" :sm="24" :lg="3">
 									<span style="font-weight: bold; word-break: normal; white-space: normal; line-height: 28px;">{{ $t('shop.selectPayment') }}：</span>
 								</el-col>
-								<el-col :xs="24" :sm="24" :md="14" :lg="14" :xl="14" style="word-break: normal; white-space: nowrap;">
+								<el-col :xs="24" :sm="24" :lg="21" style="word-break: normal; white-space: nowrap;">
 									<el-radio-group v-model="payType" @change='chosePayType'>
 										<div v-for="(item, index) in payList" :key='index' class="address">
 											<el-radio :label="item.label" border>
@@ -111,14 +112,14 @@
 								</el-col>
 							</el-row>
 						</div>
-
+						<el-divider></el-divider>
 						<!-- 收货地址 -->
-						<div class="box address_box" style="margin: 15px 0;">
-							<el-row :gutter="20" type="flex" style="flex-wrap: wrap;">
-								<el-col :xs="24" :sm="24" :md="4" :lg="4" :xl="4">
+						<div class="" style="margin: 15px 0;">
+							<el-row :gutter="10" type="flex" style="flex-wrap: wrap;">
+								<el-col :xs="24" :sm="24" :lg="3">
 									<span style="font-weight: bold; word-break: normal; white-space: normal; line-height: 28px;">{{ $t('shop.selectAddress') }}：</span>
 								</el-col>
-								<el-col :xs="24" :sm="24" :md="20" :lg="20" :xl="20" style="word-break: normal; white-space: nowrap;">
+								<el-col :xs="24" :sm="24" :lg="21" style="word-break: normal; white-space: nowrap;">
 									<el-radio-group v-model="addressId" @change='choseAddress'>
 										<div class="address">
 											<el-radio :label="selfPickUpAddressId">{{ $t('shop.selfPickUp') }}</el-radio>

src/views/shop/standard-products.vue

@@ -88,24 +88,25 @@
 
 				<div class="white-box-footer">
 					<!-- 订单合计 -->
-					<div class="box address_box" style="margin: 15px 0;">
+					<div class="" style="margin: 15px 0;">
 						<el-row :gutter="20">
-							<el-col :xs="24" :sm="8" :md="10" :lg="10" :xl="10">
+							<el-col :xs="24" :sm="24" :lg="3">
 								<span style="font-weight: bold; word-break: normal; white-space: normal; line-height: 28px;">{{ $t('shop.totalOrders') }}：</span>
 							</el-col>
-							<el-col :xs="24" :sm="16" :md="14" :lg="14" :xl="14" style="word-break: normal; white-space: nowrap; line-height: 28px;">
-								<span>{{ $t('shop.total') }}：{{ $t('currency.sign') }} {{ parseFloat(cashSum) | toThousandFilter }}</span>
-								<span style="margin-left: 15px;">{{ $t('shop.freight') }}：{{ $t('currency.sign') }} {{ pointFreight }}</span>
+							<el-col :xs="24" :sm="24" :lg="21" style="word-break: normal; white-space: nowrap; line-height: 28px;">
+								<span>{{ $t('shop.total') }}：{{ $t('currency.sign') }} {{ parseFloat(cashSum) | toThousandFilter }}</span><br />
+								<span>{{ $t('shop.freight') }}：{{ $t('currency.sign') }} {{ pointFreight }}</span>
 							</el-col>
 						</el-row>
 					</div>
+					<el-divider></el-divider>
 					<!-- 支付方式/账户余额 {{ cashCurrency }}:  -->
-					<div class="box address_box" style="margin: 15px 0;">
+					<div class="" style="margin: 15px 0;">
 						<el-row :gutter="20" type="flex" style="flex-wrap: wrap;">
-							<el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
+							<el-col :xs="24" :sm="24" :lg="3">
 								<span style="font-weight: bold; word-break: normal; white-space: normal; line-height: 28px;">{{ $t('shop.selectPayment') }}：</span>
 							</el-col>
-							<el-col :xs="24" :sm="24" :md="16" :lg="16" :xl="16" style="word-break: normal; white-space: nowrap;">
+							<el-col :xs="24" :sm="24" :lg="21" style="word-break: normal; white-space: nowrap;">
 								<el-radio-group v-model="payType" @change='chosePayType'>
 									<div v-for="(item, index) in payList" :key='index' class="address">
 										<el-radio :label="item.label" border>
@@ -116,14 +117,14 @@
 							</el-col>
 						</el-row>
 					</div>
-
+					<el-divider></el-divider>
 					<!-- 收货地址 -->
-					<div class="box address_box" style="margin: 15px 0;">
-						<el-row :gutter="20" type="flex" style="flex-wrap: wrap;">
-							<el-col :xs="24" :sm="24" :md="16" :lg="16" :xl="16">
+					<div class="" style="margin: 15px 0;">
+						<el-row :gutter="10" type="flex" style="flex-wrap: wrap;">
+							<el-col :xs="24" :sm="24" :lg="3">
 								<span style="font-weight: bold; word-break: normal; white-space: normal; line-height: 28px;">{{ $t('shop.selectAddress') }}：</span>
 							</el-col>
-							<el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8" style="word-break: normal; white-space: nowrap;">
+							<el-col :xs="24" :sm="24" :lg="21" style="word-break: normal; white-space: nowrap;">
 								<el-radio-group v-model="addressId" @change='choseAddress'>
 									<div class="address">
 										<el-radio :label="selfPickUpAddressId">{{ $t('shop.selfPickUp') }}</el-radio>

src/views/shop/villa-fund-products.vue

@@ -83,24 +83,25 @@
 
 					<div class="white-box-footer">
 						<!-- 订单合计 -->
-						<div class="box address_box" style="margin: 15px 0;">
+						<div class="" style="margin: 15px 0;">
 							<el-row :gutter="20">
-								<el-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8">
-									<span style="font-weight: bold; word-break: normal; white-space: nowrap; line-height: 28px;">{{ $t('shop.totalOrders') }}：</span>
+								<el-col :xs="24" :sm="24" :lg="3">
+									<span style="font-weight: bold; word-break: normal; white-space: normal; line-height: 28px;">{{ $t('shop.totalOrders') }}：</span>
 								</el-col>
-								<el-col :xs="24" :sm="16" :md="16" :lg="16" :xl="16" style="word-break: normal; white-space: nowrap; line-height: 28px;">
+								<el-col :xs="24" :sm="24" :lg="21" style="word-break: normal; white-space: nowrap; line-height: 28px;">
 									<span>{{ $t('shop.total') }}：{{ parseFloat(pointsSum) | toThousandFilter }}</span>
-									<span style="margin-left: 15px;">{{ $t('shop.freight') }}：{{ pointFreight }}</span>
+									<span>{{ $t('shop.freight') }}：{{ pointFreight }}</span>
 								</el-col>
 							</el-row>
 						</div>
+						<el-divider></el-divider>
 						<!-- 支付方式/账户余额 {{ cashCurrency }}:  -->
-						<div class="box address_box" style="margin: 15px 0;">
+						<div class="" style="margin: 15px 0;">
 							<el-row :gutter="20" type="flex" style="flex-wrap: wrap;">
-								<el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
-									<span style="font-weight: bold; word-break: normal; white-space: nowrap; line-height: 28px;">{{ $t('shop.selectPayment') }}：</span>
+								<el-col :xs="24" :sm="24" :lg="3">
+									<span style="font-weight: bold; word-break: normal; white-space: normal; line-height: 28px;">{{ $t('shop.selectPayment') }}：</span>
 								</el-col>
-								<el-col :xs="24" :sm="24" :md="16" :lg="16" :xl="16" style="word-break: normal; white-space: nowrap;">
+								<el-col :xs="24" :sm="24" :lg="21" style="word-break: normal; white-space: nowrap;">
 									<el-radio-group v-model="payType" @change='chosePayType'>
 										<div v-for="(item, index) in payList" :key='index' class="address">
 											<el-radio :label="item.label" border>
@@ -111,14 +112,14 @@
 								</el-col>
 							</el-row>
 						</div>
-
+						<el-divider></el-divider>
 						<!-- 收货地址 -->
-						<div class="box address_box" style="margin: 15px 0;">
-							<el-row :gutter="20" type="flex" style="flex-wrap: wrap;">
-								<el-col :xs="24" :sm="24" :md="3" :lg="3" :xl="3">
-									<span style="font-weight: bold; word-break: normal; white-space: nowrap; line-height: 28px;">{{ $t('shop.selectAddress') }}：</span>
+						<div class="" style="margin: 15px 0;">
+							<el-row :gutter="10" type="flex" style="flex-wrap: wrap;">
+								<el-col :xs="24" :sm="24" :lg="3">
+									<span style="font-weight: bold; word-break: normal; white-space: normal; line-height: 28px;">{{ $t('shop.selectAddress') }}：</span>
 								</el-col>
-								<el-col :xs="24" :sm="24" :md="21" :lg="21" :xl="21" style="word-break: normal; white-space: nowrap;">
+								<el-col :xs="24" :sm="24" :lg="21" style="word-break: normal; white-space: nowrap;">
 									<el-radio-group v-model="addressId" @change='choseAddress'>
 										<div class="address">
 											<el-radio :label="selfPickUpAddressId">{{ $t('shop.selfPickUp') }}</el-radio>

src/views/user/welcome-pack.vue

@@ -82,7 +82,7 @@
 							<el-input v-model.trim="form.conUserName" @change="handleChkConUser"></el-input>
 						</el-form-item>
 						<el-form-item>
-							<el-input v-model="conRealName" :disabled="true"></el-input>
+							<el-input type="textarea" :rows="2" v-model="conRealName" :disabled="true"></el-input>
 						</el-form-item>
 						<el-form-item :label="$t('atlas.placementTree')">
 							<el-radio-group border v-model="form.location">