冲突

commont/messages.js

@@ -614,7 +614,9 @@ export default {
 	  Photoalbum:'相册',
 	  shoot:'拍摄',
 	  Voice:'语音',
-	  Myorder:'我的订单'
+	  Myorder:'我的订单',
+	  
+	  logisticsmethod:'请选择物流方式'
     },
   },
   //英语
@@ -1240,7 +1242,8 @@ export default {
 	  Photoalbum: 'Photo album',
 	  shoot: 'Take photo',
 	  Voice: 'Voice',
-	  Myorder: 'My Order'
+	  Myorder: 'My Order',
+	  logisticsmethod:'Please select a logistics method'
     },
   },
   // 西班牙
@@ -1882,7 +1885,8 @@ export default {
 	  Photoalbum: 'Álbum de fotos',
 	  shoot: 'Capturar',
 	  Voice: 'Voz',
-	  Myorder: 'Mi pedido'
+	  Myorder: 'Mi pedido',
+	  logisticsmethod:'Por favor seleccione el método logístico'
     },
   },
   //意大利
@@ -2516,7 +2520,8 @@ export default {
 	  Photoalbum: 'Album fotografico',
 	  shoot: 'Scatta',
 	  Voice: 'Voce',
-	  Myorder: 'Il Mio Ordine'
+	  Myorder: 'Il Mio Ordine',
+	  logisticsmethod:'La prego di scegliere la logistica'
     },
   },
 };

components/kj-express/kj-express.vue

@@ -421,6 +421,10 @@
     <u-popup round="28" :show="logshow" @close="close">
       <view class="pop">
         <kj-flow
+		:weight = 'goodinfo.weight'
+		:length = 'goodinfo.length'
+		:width =' goodinfo.width'
+		:height ='goodinfo.height'
           :language="language"
           :goodstype="goodinfo.goodtype"
           ref="child"
@@ -488,7 +492,7 @@ export default {
     // uni.setNavigationBarTitle({
     // 	title: this.i18n.setup
     // })
-    this.express(); //获取包裹数量
+    this.express(); //获取包裹数量  
     // if (uni.getStorageSync("language") != "") {
     //   this.language = uni.getStorageSync("language");
     // }
@@ -673,9 +677,9 @@ export default {
       } else if (JSON.stringify(this.bottomadd) === "{}") {
         this.$u.toast("请填写收件人地址");
       } else if (JSON.stringify(this.goodinfo) === "{}") {
-        this.$u.toast("请填写物品信息");
+        this.$u.toast(this.i18n.select);
       } else if (this.leftname == "") {
-        this.$u.toast("请选择物流方式");
+        this.$u.toast(this.i18n.logisticsMethod);
       } else {
         this.calculate();
       }

components/kj-flow/kj-flow.vue

@@ -56,17 +56,30 @@ color: #666666;">{{item.name_ita}}</view>
 				</view>
 			</scroll-view>
 		</view>
-		<view class="" v-else style="height: 300rpx;text-align: center;line-height: 300rpx;font-size: 24rpx;">{{i18n.nodata}}</view>
+		<view class="" v-else style="height: 300rpx;text-align: center;line-height: 300rpx;font-size: 24rpx;">
+			{{i18n.nodata}}</view>
 		<view class="bottom">
 			<view class="btn" @click="enter">{{i18n.enter}}</view>
 		</view>
-		<view class=""></view>
+		<!-- <view class=""></view> -->
 	</view>
 </template>
 
 <script>
 	export default {
 		props: {
+			weight: {
+				typeof: Number
+			},
+			length: {
+				typeof: Number
+			},
+			width: {
+				typeof: Number
+			},
+			height: {
+				typeof: Number
+			},
 			province_id: {
 				typeof: Number
 			},
@@ -107,7 +120,7 @@ color: #666666;">{{item.name_ita}}</view>
 				dateid: '',
 				unit_price: '',
 				// language: 'zh-CN',
-				typeid: ''
+				typeid: '',
 			};
 		},
 		created() {
@@ -131,9 +144,13 @@ color: #666666;">{{item.name_ita}}</view>
 					params: {
 						is_page: 0,
 						province_id: this.province_id,
-						country_id:this.country_id,
+						country_id: this.country_id,
 						transport_type_id: id,
-						type: this.goodstype
+						type: this.goodstype,
+						weight: this.weight,
+						length: this.length,
+						width: this.width,
+						height: this.height,
 					}
 				}).then((res) => {
 					this.containerList = res
@@ -158,10 +175,10 @@ color: #666666;">{{item.name_ita}}</view>
 				})
 			},
 			transport() {
-				uni.$u.http.get('/api/transport-type',{
-					params:{
-						province_id:this.province_id,
-						country_id:this.country_id
+				uni.$u.http.get('/api/transport-type', {
+					params: {
+						province_id: this.province_id,
+						country_id: this.country_id
 					}
 				}).then((res) => {
 					this.transportList = res
@@ -268,9 +285,9 @@ color: #666666;">{{item.name_ita}}</view>
 
 	.bottom {
 		width: 750rpx;
-		height: 166rpx;
+		// height: 166rpx;
 		background: #FFFFFF;
-		padding: 20rpx 24rpx;
+		padding: 20rpx 24rpx 0;
 		box-sizing: border-box;
 	}
 

pageA/productdetails.vue

@@ -305,7 +305,7 @@
 			<view style="padding: 48rpx 28rpx; box-sizing: border-box; position: relative">
 				<view class="u-flex">
 					<image :src="
-              JSON.stringify(sku_info) == '{}' ? goodinfo.image : sku_info.image
+              sku_info.image==null ? goodinfo.image : sku_info.image
             " style="width: 192rpx; height: 192rpx" mode="">
 					</image>
 					<view class="" style="margin-left: 20rpx">
@@ -931,7 +931,7 @@
 						this.goodinfo.price = this.sku_info.price;
 					}
 				});
-				console.log(this.sku_info);
+				console.log('2222',this.sku_info);
 			},
 			order() {
 				if (JSON.stringify(this.sku_info) != "{}") {

pageB/expresstype.vue

@@ -1,5 +1,8 @@
 <template>
 	<view class="box">
+		<view class="" style="background: #fff;margin-bottom: 20rpx;">
+			<u--input :placeholder="i18n.logisticsmethod" border="surround" v-model="keyword" @change="change"></u--input>
+		</view>
 		<view class="exp">
 			<u-radio-group v-model="radiovalue1" placement="column" @change="groupChange">
 				<view class="item u-flex u-row-between" v-for="(item,idx) in radiolist1" v-if="idx<page" :key="idx">
@@ -24,7 +27,9 @@
 				concant: '',
 				code: '',
 				radiolist1: [],
-				page: 20
+				page: 20,
+				keyword: '',
+				radiolist: []
 			};
 		},
 		computed: {
@@ -44,10 +49,26 @@
 			}
 		},
 		methods: {
+			change(e) {
+				console.log('change', e);
+				this.radiolist = []
+				if (uni.getStorageSync('radiolist1')) {
+					console.log(uni.getStorageSync('radiolist1'));
+					this.radiolist1 = uni.getStorageSync('radiolist1')
+				}
+				this.radiolist1.forEach(item => {
+					if (item.name.indexOf(e)==-1) {
+
+					} else {
+						this.radiolist.push(item)
+					}
+				})
+				this.radiolist1 = this.radiolist
+				console.log(this.radiolist1);
+			},
 			load(index) {
 				console.log(index)
 			},
-
 			toteach() {
 				const eventChannel = this.getOpenerEventChannel();
 				eventChannel.emit('todcp', {
@@ -104,7 +125,7 @@
 		}
 
 		.exp {
-			width: 702rpx;
+			// width: 702rpx;
 			// height: 564rpx;
 			background: #FFFFFF;
 			border-radius: 16rpx;

pageB/orderinfo.vue

@@ -61,7 +61,7 @@
 		methods: {
 			leftClick() {
 				uni.switchTab({
-					url: '/pages/express/express'
+					url: '/pages/index/index'
 				})
 			}
 		}

pageB/search.vue

@@ -81,9 +81,10 @@ import { vShow } from 'vue';
 			},
 			enter() {
 				console.log(this.record);
-				this.record.push(this.keyword)
-				
-				uni.setStorageSync('record',this.record)
+				if(this.record.indexOf(this.keyword)==-1){
+					this.record.push(this.keyword)
+					uni.setStorageSync('record',this.record)
+				}
 				this.getgoods()
 			},
 			search() {

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

@@ -1 +1 @@
-.page.data-v-ebe5eb24{padding:20rpx 24rpx}.page .content.data-v-ebe5eb24{padding:0 20rpx;background-color:#fff;border-radius:16rpx}.page .bottom-1.data-v-ebe5eb24{font-size:20rpx;margin-top:68rpx;color:#555;display:flex;justify-content:flex-start;align-items:center;width:70%}.page .bottom-1 .radio.data-v-ebe5eb24{width:24rpx;height:24rpx}.page .btn.data-v-ebe5eb24{color:#fff;background-color:#f83224;border-radius:44rpx;margin-top:28rpx;height:88rpx;font-size:32rpx}
+.page.data-v-710459b2{padding:20rpx 24rpx}.page .content.data-v-710459b2{padding:0 20rpx;background-color:#fff;border-radius:16rpx}.page .bottom-1.data-v-710459b2{font-size:20rpx;margin-top:68rpx;color:#555;display:flex;justify-content:flex-start;align-items:center;width:70%}.page .bottom-1 .radio.data-v-710459b2{width:24rpx;height:24rpx}.page .btn.data-v-710459b2{color:#fff;background-color:#f83224;border-radius:44rpx;margin-top:28rpx;height:88rpx;font-size:32rpx}

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/.sourcemap/mp-weixin/pageD/Material/Material.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":"mJAAA,MAGA,aACA,aAFAA,EAAGC,kCAAoCC,EAGvCC,EAAWC,a","file":"pageD/Material/Material.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pageD/Material/Material.vue'\ncreatePage(Page)"],"sourceRoot":""}

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

@@ -44,9 +44,8 @@
 }
 .bottom.data-v-1a2939be {
   width: 750rpx;
-  height: 166rpx;
   background: #FFFFFF;
-  padding: 20rpx 24rpx;
+  padding: 20rpx 24rpx 0;
   box-sizing: border-box;
 }
 .btn.data-v-1a2939be {

unpackage/dist/dev/mp-weixin/pageB/Senderinfor.wxml

@@ -1 +1 @@
-<view class="back"><view class="info"><view class="item u-flex u-row-between"><text class="title">{{i18n.senderinfo}}</text><view class="u-flex"><u-icon vue-id="a383861e-1" name="order" color="rgba(0, 0, 0, 0.6)" size="23" bind:__l="__l"></u-icon><text class="wx">{{i18n.wxAddress}}</text></view></view><view class="item u-flex"><text class="left">{{i18n.name}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex"><text class="left">{{i18n.phone}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex"><text class="left">{{i18n.city}}</text><view class="right"><input type="text" placeholder="{{i18n.selection}}" disabled/></view></view><view class="item u-flex"><text class="left">{{i18n.detailed}}</text><view class="right"><input type="area" placeholder="{{i18n.Fill}}" disabled/></view></view><view class="item u-flex"><input type="area" placeholder="{{i18n.company}}"/></view><view class="u-flex u-row-between" style="margin-top:22rpx;"><view class="u-flex"><view><u-checkbox-group vue-id="a383861e-2" placement="row" value="{{checkboxValue1}}" data-event-opts="{{[['^change',[['checkboxChange']]],['^input',[['__set_model',['','checkboxValue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('a383861e-3')+','+('a383861e-2')}}" shape="circle" customStyle="{{({marginRight:'4px'})}}" name="{{name}}" bind:__l="__l"></u-checkbox></u-checkbox-group></view><text class="clear">{{i18n.initial}}</text></view><text class="clear">{{''+i18n.empty+''}}</text></view></view><view class="history">{{i18n.history}}</view><view class="add"><view><text class="name">陈盼盼</text><text class="phone">176****3298</text></view><view class="addinfo">江苏省南京市浦口区浦口大道东方万汇城北区</view></view><view class="bottom"><view class="btn">{{''+i18n.enter+''}}</view></view></view>
+<view class="back"><view class="info"><view class="item u-flex u-row-between"><text class="title">{{i18n.senderinfo}}</text><view class="u-flex"><u-icon vue-id="a383861e-1" name="order" color="rgba(0, 0, 0, 0.6)" size="23" bind:__l="__l"></u-icon><text class="wx">{{i18n.wxAddress}}</text></view></view><view class="item u-flex "><text class="left">{{i18n.name}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex "><text class="left">{{i18n.phone}}</text><view class="right"><input type="text" placeholder="{{i18n.Fill}}"/></view></view><view class="item u-flex "><text class="left">{{i18n.city}}</text><view class="right"><input type="text" placeholder="{{i18n.selection}}" disabled/></view></view><view class="item u-flex "><text class="left">{{i18n.detailed}}</text><view class="right"><input type="area" placeholder="{{i18n.Fill}}" disabled/></view></view><view class="item u-flex "><input type="area" placeholder="{{i18n.company}}"/></view><view class="u-flex u-row-between" style="margin-top:22rpx;"><view class="u-flex"><view><u-checkbox-group vue-id="a383861e-2" placement="row" value="{{checkboxValue1}}" data-event-opts="{{[['^change',[['checkboxChange']]],['^input',[['__set_model',['','checkboxValue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" bind:__l="__l" vue-slots="{{['default']}}"><u-checkbox vue-id="{{('a383861e-3')+','+('a383861e-2')}}" shape="circle" customStyle="{{({marginRight:'4px'})}}" name="{{name}}" bind:__l="__l"></u-checkbox></u-checkbox-group></view><text class="clear">{{i18n.initial}}</text></view><text class="clear">{{''+i18n.empty+''}}</text></view></view><view class="history">{{i18n.history}}</view><view class="add"><view><text class="name">陈盼盼</text><text class="phone">176****3298</text></view><view class="addinfo">江苏省南京市浦口区浦口大道东方万汇城北区</view></view><view class="bottom"><view class="btn">{{''+i18n.enter+''}}</view></view></view>

unpackage/dist/dev/mp-weixin/pageB/expresstype.json

@@ -2,6 +2,7 @@
   "navigationBarTitleText": "快递服务",
   "enablePullDownRefresh": false,
   "usingComponents": {
+    "u--input": "/uview-ui/components/u--input/u--input",
     "u-radio-group": "/uview-ui/components/u-radio-group/u-radio-group",
     "u-radio": "/uview-ui/components/u-radio/u-radio"
   }

unpackage/dist/dev/mp-weixin/pageB/expresstype.wxml

@@ -1 +1 @@
-<view class="box data-v-4b31f8e0"><view class="exp data-v-4b31f8e0"><u-radio-group vue-id="7279ef76-1" placement="column" value="{{radiovalue1}}" data-event-opts="{{[['^change',[['groupChange']]],['^input',[['__set_model',['','radiovalue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-4b31f8e0" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{radiolist1}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><block wx:if="{{idx<page}}"><view class="item u-flex u-row-between data-v-4b31f8e0"><text class="data-v-4b31f8e0">{{item.name}}</text><u-radio vue-id="{{('7279ef76-2-'+idx)+','+('7279ef76-1')}}" name="{{item.name}}" data-event-opts="{{[['^change',[['radioChange',['$0'],[[['radiolist1','',idx]]]]]]]}}" bind:change="__e" class="data-v-4b31f8e0" bind:__l="__l"></u-radio></view></block></block></u-radio-group></view><view class="bottom data-v-4b31f8e0"><view data-event-opts="{{[['tap',[['toteach',['$event']]]]]}}" class="btn data-v-4b31f8e0" bindtap="__e">{{''+i18n.enter+''}}</view></view></view>
+<view class="box data-v-4b31f8e0"><view style="background:#fff;margin-bottom:20rpx;" class="data-v-4b31f8e0"><u--input vue-id="7279ef76-1" placeholder="{{i18n.logisticsmethod}}" border="surround" value="{{keyword}}" data-event-opts="{{[['^change',[['change']]],['^input',[['__set_model',['','keyword','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-4b31f8e0" bind:__l="__l"></u--input></view><view class="exp data-v-4b31f8e0"><u-radio-group vue-id="7279ef76-2" placement="column" value="{{radiovalue1}}" data-event-opts="{{[['^change',[['groupChange']]],['^input',[['__set_model',['','radiovalue1','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-4b31f8e0" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{radiolist1}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><block wx:if="{{idx<page}}"><view class="item u-flex u-row-between data-v-4b31f8e0"><text class="data-v-4b31f8e0">{{item.name}}</text><u-radio vue-id="{{('7279ef76-3-'+idx)+','+('7279ef76-2')}}" name="{{item.name}}" data-event-opts="{{[['^change',[['radioChange',['$0'],[[['radiolist1','',idx]]]]]]]}}" bind:change="__e" class="data-v-4b31f8e0" bind:__l="__l"></u-radio></view></block></block></u-radio-group></view><view class="bottom data-v-4b31f8e0"><view data-event-opts="{{[['tap',[['toteach',['$event']]]]]}}" class="btn data-v-4b31f8e0" bindtap="__e">{{''+i18n.enter+''}}</view></view></view>

unpackage/dist/dev/mp-weixin/pageB/expresstype.wxss

@@ -57,7 +57,6 @@
   border-bottom: 2rpx solid rgba(151, 151, 151, 0.1);
 }
 .box .exp.data-v-4b31f8e0 {
-  width: 702rpx;
   background: #FFFFFF;
   border-radius: 16rpx;
   padding: 0 20rpx;

unpackage/dist/dev/mp-weixin/pageB/search.wxml

@@ -1 +1 @@
-<view class="back data-v-4bad5c32"><view class="u-flex u-row-between data-v-4bad5c32"><view style="width:622rpx;" class="data-v-4bad5c32"><u-search vue-id="29feab14-1" placeholder="{{i18n.Please}}" showAction="{{false}}" value="{{keyword}}" data-event-opts="{{[['^focus',[['focus']]],['^input',[['__set_model',['','keyword','$event',[]]]]]]}}" bind:focus="__e" bind:input="__e" class="data-v-4bad5c32" bind:__l="__l"></u-search></view><block wx:if="{{keyword==''}}"><text data-event-opts="{{[['tap',[['clear',['$event']]]]]}}" bindtap="__e" class="data-v-4bad5c32">{{i18n.Cancel}}</text></block><block wx:else><text data-event-opts="{{[['tap',[['enter',['$event']]]]]}}" bindtap="__e" class="data-v-4bad5c32">{{i18n.enter}}</text></block></view><block wx:if="{{blurshow==false&&keyword==''}}"><view class="title data-v-4bad5c32" style="margin-top:32rpx;">{{''+i18n.Popularshipment+''}}</view></block><block wx:if="{{blurshow==false&&keyword==''}}"><view class="u-flex data-v-4bad5c32" style="column-gap:20rpx;flex-wrap:wrap;"><block wx:for="{{record}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view data-event-opts="{{[['tap',[['select',['$0'],[[['record','',idx]]]]]]]}}" class="tabs data-v-4bad5c32" bindtap="__e">{{''+item+''}}</view></block></view></block><block wx:if="{{blurshow}}"><scroll-view scroll-y="{{true}}" class="data-v-4bad5c32"><block wx:for="{{goods}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['changeitem',['$0'],[[['goods','',index]]]]]]]}}" class="searchitem data-v-4bad5c32" bindtap="__e"><block wx:if="{{language=='zh-CN'}}"><text class="data-v-4bad5c32">{{item.name_cn}}</text></block><block wx:if="{{language=='en-US'}}"><text class="data-v-4bad5c32">{{item.name_en}}</text></block><block wx:if="{{language=='es-ES'}}"><text class="data-v-4bad5c32">{{item.name_es}}</text></block><block wx:if="{{language=='it-IT'}}"><text class="data-v-4bad5c32">{{item.name_ita}}</text></block></view></block></scroll-view></block></view>
+<view class="back data-v-4bad5c32"><view class="u-flex u-row-between data-v-4bad5c32"><view style="width:622rpx;" class="data-v-4bad5c32"><u-search vue-id="29feab14-1" placeholder="{{i18n.Please}}" showAction="{{false}}" value="{{keyword}}" data-event-opts="{{[['^focus',[['focus']]],['^input',[['__set_model',['','keyword','$event',[]]]]]]}}" bind:focus="__e" bind:input="__e" class="data-v-4bad5c32" bind:__l="__l"></u-search></view><block wx:if="{{keyword==''}}"><text data-event-opts="{{[['tap',[['clear',['$event']]]]]}}" bindtap="__e" class="data-v-4bad5c32">{{i18n.Cancel}}</text></block><block wx:else><text data-event-opts="{{[['tap',[['enter',['$event']]]]]}}" bindtap="__e" class="data-v-4bad5c32">{{i18n.enter}}</text></block></view><block wx:if="{{blurshow==false&&keyword==''}}"><view class="title data-v-4bad5c32" style="margin-top:32rpx;">{{''+i18n.Popularshipment+''}}</view></block><block wx:if="{{blurshow==false&&keyword==''}}"><view class="u-flex  data-v-4bad5c32" style="column-gap:20rpx;flex-wrap:wrap;"><block wx:for="{{record}}" wx:for-item="item" wx:for-index="idx" wx:key="idx"><view data-event-opts="{{[['tap',[['select',['$0'],[[['record','',idx]]]]]]]}}" class="tabs data-v-4bad5c32" bindtap="__e">{{''+item+''}}</view></block></view></block><block wx:if="{{blurshow}}"><scroll-view scroll-y="{{true}}" class="data-v-4bad5c32"><block wx:for="{{goods}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['changeitem',['$0'],[[['goods','',index]]]]]]]}}" class="searchitem data-v-4bad5c32" bindtap="__e"><block wx:if="{{language=='zh-CN'}}"><text class="data-v-4bad5c32">{{item.name_cn}}</text></block><block wx:if="{{language=='en-US'}}"><text class="data-v-4bad5c32">{{item.name_en}}</text></block><block wx:if="{{language=='es-ES'}}"><text class="data-v-4bad5c32">{{item.name_es}}</text></block><block wx:if="{{language=='it-IT'}}"><text class="data-v-4bad5c32">{{item.name_ita}}</text></block></view></block></scroll-view></block></view>

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -79,6 +79,13 @@
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pageB/expresstype",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }

unpackage/dist/dev/mp-weixin/uview-ui/components/u-swipe-action-item/u-swipe-action-item.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "u-icon": "/uview-ui/components/u-icon/u-icon"
-  }
+  },
+  "component": true
 }