冲突

components/kj-flow/kj-flow.vue

@@ -26,7 +26,7 @@
 					</view>
 					<view class="itime" v-if="idx==leftchange&&containerList.length>0">{{estimated_arrived_date}}</view>
 				</view>
-			</scroll-view>
+			</scroll-view> 
 			<scroll-view scroll-y="true" class="right" style="margin-left: 36rpx;">
 				<view v-for="(item,idx) in containerList" :key="idx" @click="change(item,idx)"
 					style="display: flex;flex-direction: column;align-items: center;justify-content: center;padding: 20rpx 0 16rpx;"

unpackage/dist/build/mp-weixin/components/kj-flow/kj-flow.wxss

@@ -1 +1 @@
-.iitem.data-v-ef0f51e0{border-bottom:2rpx solid hsla(0,0%,59.2%,.1);box-sizing:border-box}.price.data-v-ef0f51e0{font-family:SFPro;font-weight:500;font-size:24rpx;color:#f83224;line-height:28rpx;text-align:left;font-style:normal}.right.data-v-ef0f51e0{flex:1;width:474rpx;height:642rpx}.bottom.data-v-ef0f51e0{width:750rpx;background:#fff;padding:20rpx 24rpx 0;box-sizing:border-box}.btn.data-v-ef0f51e0{width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.title.data-v-ef0f51e0{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:36rpx;color:#333;line-height:50rpx;text-align:left;font-style:normal}.left.data-v-ef0f51e0{width:212rpx;height:642rpx}.ititle.data-v-ef0f51e0{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.itime.data-v-ef0f51e0{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#333;line-height:28rpx;text-align:center;font-style:normal}
+.iitem.data-v-4603d296{border-bottom:2rpx solid hsla(0,0%,59.2%,.1);box-sizing:border-box}.price.data-v-4603d296{font-family:SFPro;font-weight:500;font-size:24rpx;color:#f83224;line-height:28rpx;text-align:left;font-style:normal}.right.data-v-4603d296{flex:1;width:474rpx;height:642rpx}.bottom.data-v-4603d296{width:750rpx;background:#fff;padding:20rpx 24rpx 0;box-sizing:border-box}.btn.data-v-4603d296{width:702rpx;height:84rpx;background:#f83224;border-radius:44rpx;font-family:PingFangSC,PingFang SC;font-weight:500;font-size:32rpx;color:#fff;line-height:84rpx;text-align:center;font-style:normal}.title.data-v-4603d296{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:36rpx;color:#333;line-height:50rpx;text-align:left;font-style:normal}.left.data-v-4603d296{width:212rpx;height:642rpx}.ititle.data-v-4603d296{font-family:PingFangSC,PingFang SC;font-weight:500;font-size:28rpx;color:#222;line-height:40rpx;text-align:left;font-style:normal}.itime.data-v-4603d296{font-family:PingFangSC,PingFang SC;font-weight:400;font-size:20rpx;color:#333;line-height:28rpx;text-align:center;font-style:normal}

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
 }

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

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

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

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

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

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

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

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

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

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