Merge remote-tracking branch 'origin/dev_cd' into dev_cd

pages/home.vue

 <template>
-<view class="appCotent" v-if="show">
+	<view class="appCotent" v-if="show">
 		<view class="index-content">
-        <u-swiper radius="0 0 0 30px" :height="210" :list="list5" circular @change="e => current = e.current" :autoplay="true" keyName="imageUrl" @click="goOtherLink">
+			<u-swiper radius="0 0 0 30px" :height="210" :list="list5" circular @change="e => current = e.current"
+				:autoplay="true" keyName="imageUrl" @click="goOtherLink">
 				<view slot="indicator" class="indicator">
-                <view class="indicator__dot" v-for="(item, index) in list5" :key="index" :class="[index === current && 'indicator__dot--active']">
+					<view class="indicator__dot" v-for="(item, index) in list5" :key="index"
+						:class="[index === current && 'indicator__dot--active']">
 					</view>
 				</view>
 			</u-swiper>
@@ -51,11 +53,11 @@
 			</div>
 			<u-gap bgColor="transparent" height="60"></u-gap>
 		</view>
-</view>
+	</view>
 </template>
 
 <script>
-export default {
+	export default {
 		data() {
 			return {
 				show: false,
@@ -126,7 +128,7 @@ export default {
 				})
 			},
 			// 轮播跳转其他页面
-		goOtherLink(index){
+			goOtherLink(index) {
 				let item = this.list5[index]
 				let link = item.link;
 				var newStr = link.indexOf("http");
@@ -151,16 +153,16 @@ export default {
 				this.show = true
 			}, 100);
 		},
-    onReady: function () {
+		onReady: function() {
 			uni.setNavigationBarTitle({
 				title: '友众挪车牌'
 			});
 		}
-};
+	};
 </script>
 
 <style lang="scss">
-.index-content {
+	.index-content {
 		/deep/ .u-swiper__indicator {
 			position: absolute;
 			right: 30rpx !important;
@@ -231,7 +233,7 @@ export default {
 			}
 
 			.code__money {
-			width:360rpx;
+				width: 390rpx;
 				margin: 0 20rpx;
 
 				.money__title {
@@ -242,13 +244,14 @@ export default {
 					line-height: 42rpx;
 
 				}
+
 				.code__tips {
 					font-size: 30rpx;
 					font-family: PingFang SC;
 					font-weight: 500;
 					color: #666666;
 					line-height: 42rpx;
-				margin-bottom:20rpx;
+					margin-bottom: 20rpx;
 				}
 
 				.money__num {
@@ -334,5 +337,5 @@ export default {
 				font-size: 24rpx;
 			}
 		}
-}
+	}
 </style>

pagesC/pages/shop/pay.vue

@@ -378,6 +378,9 @@ export default {
         }
 
         .address__right {
+			  width:60rpx;
+			  display: flex;
+			  justify-content: flex-end;
             image {
                 width: 14rpx;
                 height: 24rpx;