冲突

pageB/recipientinfo.vue

@@ -77,9 +77,9 @@
 			<view class="btn" @click="submit">
 				{{i18n.enter}}
 			</view>
-		</view>
+		</view>  
 		<!-- 选择省市区 -->
-		<u-picker :show="show" :columns="cityList" keyName="name" @confirm="countrycConfirm" @cancel="show = false"
+		<u-picker  :show="show" :columns="cityList" keyName="name" @confirm="countrycConfirm" @cancel="show = false"
 			:closeOnClickOverlay="true" @close="close"></u-picker>
 	</view>
 </template>
@@ -104,7 +104,7 @@
 				companyName: "",
 				is_default: 0
 			};
-		},
+		},  
 		onLoad(options) {
 			if (options.id) {
 				this.addressId = options.id;

unpackage/dist/build/mp-weixin/pageD/paymentOrder/paymentOrder.wxss

@@ -1 +1,5 @@
-.page.data-v-64e4c2b4{padding:20rpx 24rpx;position:relative}.page ._top.data-v-64e4c2b4{padding:48rpx 24rpx 36rpx;background-color:#fff;border-radius:16rpx;position:relative}.page ._top .select.data-v-64e4c2b4{position:absolute;right:14rpx;top:14rpx;width:200rpx;height:50rpx}.page ._top .title.data-v-64e4c2b4{text-align:center;color:rgba(34,34,34,.7);font-size:28rpx}.page ._top .price.data-v-64e4c2b4{font-size:64rpx;font-weight:500;text-align:center;margin-top:20rpx}.page ._top .price ._text-1.data-v-64e4c2b4{font-size:28rpx}.page ._top ._weight.data-v-64e4c2b4{display:flex;justify-content:space-between;margin-top:46rpx;font-size:28rpx;color:#222}.page ._top .type-num.data-v-64e4c2b4{display:flex;justify-content:space-between;font-size:28rpx;color:rgba(34,34,34,.7);margin-top:32rpx}.page .pay.data-v-64e4c2b4{display:flex;align-items:center;background-color:#fff;margin-top:20rpx;height:140rpx;border-radius:16rpx;padding:0 24rpx;justify-content:space-between}.page .pay .balance-icon.data-v-64e4c2b4{width:40rpx;height:40rpx;margin-right:20rpx}.page .pay .select.data-v-64e4c2b4{width:36rpx;height:36rpx}.page .footer.data-v-64e4c2b4{display:flex;justify-content:flex-end;background-color:#fff;position:fixed;bottom:0;left:0;width:100%;height:146rpx;padding-top:20rpx}.page .footer ._view.data-v-64e4c2b4{display:flex;align-items:flex-end;height:76rpx}.page .footer ._view ._text-1.data-v-64e4c2b4{font-size:24rpx;color:rgba(51,51,51,.8);display:inline-block;padding-bottom:10rpx}.page .footer ._view ._text-2.data-v-64e4c2b4{font-size:24rpx;display:inline-block;padding-bottom:10rpx}.page .footer ._view .price.data-v-64e4c2b4{color:#f83224;font-weight:600;font-size:48rpx}.page .footer .btn-2.data-v-64e4c2b4{height:76rpx;padding:0;margin:0;font-size:28rpx;color:#fff;min-width:188rpx;background-color:#f83224;border-radius:38rpx;margin-right:20rpx;margin-left:20rpx}
+<<<<<<< HEAD
+.page.data-v-64e4c2b4{padding:20rpx 24rpx;position:relative}.page ._top.data-v-64e4c2b4{padding:48rpx 24rpx 36rpx;background-color:#fff;border-radius:16rpx;position:relative}.page ._top .select.data-v-64e4c2b4{position:absolute;right:14rpx;top:14rpx;width:200rpx;height:50rpx}.page ._top .title.data-v-64e4c2b4{text-align:center;color:rgba(34,34,34,.7);font-size:28rpx}.page ._top .price.data-v-64e4c2b4{font-size:64rpx;font-weight:500;text-align:center;margin-top:20rpx}.page ._top .price ._text-1.data-v-64e4c2b4{font-size:28rpx}.page ._top ._weight.data-v-64e4c2b4{display:flex;justify-content:space-between;margin-top:46rpx;font-size:28rpx;color:#222}.page ._top .type-num.data-v-64e4c2b4{display:flex;justify-content:space-between;font-size:28rpx;color:rgba(34,34,34,.7);margin-top:32rpx}.page .pay.data-v-64e4c2b4{display:flex;align-items:center;background-color:#fff;margin-top:20rpx;height:140rpx;border-radius:16rpx;padding:0 24rpx;justify-content:space-between}.page .pay .balance-icon.data-v-64e4c2b4{width:40rpx;height:40rpx;margin-right:20rpx}.page .pay .select.data-v-64e4c2b4{width:36rpx;height:36rpx}.page .footer.data-v-64e4c2b4{display:flex;justify-content:flex-end;background-color:#fff;position:fixed;bottom:0;left:0;width:100%;height:146rpx;padding-top:20rpx}.page .footer ._view.data-v-64e4c2b4{display:flex;align-items:flex-end;height:76rpx}.page .footer ._view ._text-1.data-v-64e4c2b4{font-size:24rpx;color:rgba(51,51,51,.8);display:inline-block;padding-bottom:10rpx}.page .footer ._view ._text-2.data-v-64e4c2b4{font-size:24rpx;display:inline-block;padding-bottom:10rpx}.page .footer ._view .price.data-v-64e4c2b4{color:#f83224;font-weight:600;font-size:48rpx}.page .footer .btn-2.data-v-64e4c2b4{height:76rpx;padding:0;margin:0;font-size:28rpx;color:#fff;min-width:188rpx;background-color:#f83224;border-radius:38rpx;margin-right:20rpx;margin-left:20rpx}
+=======
+.page.data-v-15dba3b9{padding:20rpx 24rpx;position:relative}.page ._top.data-v-15dba3b9{padding:48rpx 24rpx 36rpx;background-color:#fff;border-radius:16rpx;position:relative}.page ._top .select.data-v-15dba3b9{position:absolute;right:14rpx;top:14rpx;width:200rpx;height:50rpx}.page ._top .title.data-v-15dba3b9{text-align:center;color:rgba(34,34,34,.7);font-size:28rpx}.page ._top .price.data-v-15dba3b9{font-size:64rpx;font-weight:500;text-align:center;margin-top:20rpx}.page ._top .price ._text-1.data-v-15dba3b9{font-size:28rpx}.page ._top ._weight.data-v-15dba3b9{display:flex;justify-content:space-between;margin-top:46rpx;font-size:28rpx;color:#222}.page ._top .type-num.data-v-15dba3b9{display:flex;justify-content:space-between;font-size:28rpx;color:rgba(34,34,34,.7);margin-top:32rpx}.page .pay.data-v-15dba3b9{display:flex;align-items:center;background-color:#fff;margin-top:20rpx;height:140rpx;border-radius:16rpx;padding:0 24rpx;justify-content:space-between}.page .pay .balance-icon.data-v-15dba3b9{width:40rpx;height:40rpx;margin-right:20rpx}.page .pay .select.data-v-15dba3b9{width:36rpx;height:36rpx}.page .footer.data-v-15dba3b9{display:flex;justify-content:flex-end;background-color:#fff;position:fixed;bottom:0;left:0;width:100%;height:146rpx;padding-top:20rpx}.page .footer ._view.data-v-15dba3b9{display:flex;align-items:flex-end;height:76rpx}.page .footer ._view ._text-1.data-v-15dba3b9{font-size:24rpx;color:rgba(51,51,51,.8);display:inline-block;padding-bottom:10rpx}.page .footer ._view ._text-2.data-v-15dba3b9{font-size:24rpx;display:inline-block;padding-bottom:10rpx}.page .footer ._view .price.data-v-15dba3b9{color:#f83224;font-weight:600;font-size:48rpx}.page .footer .btn-2.data-v-15dba3b9{height:76rpx;padding:0;margin:0;font-size:28rpx;color:#fff;min-width:188rpx;background-color:#f83224;border-radius:38rpx;margin-right:20rpx;margin-left:20rpx}
+>>>>>>> 5aae855693fae559c30563194152a74eb202b289

unpackage/dist/build/mp-weixin/pages/mine/component/mallOrderForm.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/pages/mine/component/mineMoney.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/pages/mine/component/personalFunction.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/pages/mine/component/teamFunction.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/build/mp-weixin/uni_modules/lime-painter/components/l-painter-image/l-painter-image.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }

unpackage/dist/build/mp-weixin/uni_modules/lime-painter/components/l-painter/l-painter.json

@@ -1,4 +1,4 @@
 {
-  "component": true,
-  "usingComponents": {}
+  "usingComponents": {},
+  "component": true
 }