fix

virgo.wzfrontend/workark_wx/components/common/goodItem.vue

@@ -0,0 +1,55 @@
+<template>
+	<view class="gl-item" @click="$navigateTo('/subPages/shopPage/good/good?id='+item.id)">
+		<view class="gl-img">
+			<uv-image width="170rpx" height="170rpx" :src="shopImage(item.pic)">
+			</uv-image>
+		</view>
+		<view>
+			<view class="gl-name">{{item.name}}</view>
+			<view class="gl-descript">{{item.descript}}</view>
+			<view class="gl-price">￥{{formatPrice(item.price)}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: ['item'],
+		methods: {
+			formatPrice(price) {
+				if (!price) return 0;
+				return (price / 100).toFixed(2);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+
+	.gl-item {
+		width: 100%;
+		display: flex;
+		align-items: center;
+	}
+
+	.gl-img {
+		width: 170rpx;
+		height: 170rpx;
+		margin-right: 30rpx;
+	}
+
+	.gl-name {
+		font-size: 32rpx;
+		font-weight: bold;
+	}
+
+	.gl-descript {
+		font-size: 24rpx;
+	}
+
+	.gl-price {
+		font-size: 32rpx;
+		color: #FA3534;
+		margin-top: 20rpx;
+	}
+</style>

virgo.wzfrontend/workark_wx/main.js

@@ -23,7 +23,7 @@ Vue.prototype.$toast = msg => {
 };
 
 Vue.prototype.$navigateTo = (url) => {
-	if (!uni.getStorageSync('token') && url != '/pages/login/login') {
+	if ((!uni.getStorageSync('token') || !uni.getStorageSync('shopMobileToken')) && url != '/pages/login/login') {
 		url = '/pages/login/login';
 	}
 	uni.navigateTo({

virgo.wzfrontend/workark_wx/pages.json

@@ -118,6 +118,16 @@
 			"style": {
 				"navigationBarTitleText": "订单物流"
 			}
+		}, {
+			"path": "menu/menu",
+			"style": {
+				"navigationBarTitleText": "商品分类"
+			}
+		}, {
+			"path": "menuShop/menuShop",
+			"style": {
+				"navigationBarTitleText": "商品列表"
+			}
 		}]
 	}, {
 		"root": "subPages/indexPage",

virgo.wzfrontend/workark_wx/pages/shop/shop.vue

@@ -1,24 +1,15 @@
 <template>
 	<view class="shop-index">
-		<uv-sticky bgColor="#fff">
-			<uv-tabs :list="navList" @click="changeNav" :scrollable="false"></uv-tabs>
-		</uv-sticky>
-		<uv-swiper keyName="image" :list="topicList" height="200" radius="0" imgMode="scaleToFill"></uv-swiper>
+		<uv-swiper keyName="image" :list="topicList" height="200" indicator indicatorMode="line" circular radius="0"
+			imgMode="scaleToFill" v-if="topicList.length > 0">
+		</uv-swiper>
 		<view v-if="hotList.length>0">
 			<view class="gl-title">热门推荐</view>
 			<uv-list>
 				<uv-list-item v-for="(item,index) in hotList" :key="item.id" border>
 					<template #body>
-						<view class="gl-item" @click="$navigateTo('/subPages/shopPage/good/good?id='+item.id)">
-							<view class="gl-img">
-								<uv-image width="170rpx" height="170rpx" :src="item.img">
-								</uv-image>
-							</view>
-							<view>
-								<view class="gl-name">{{item.name}}</view>
-								<view class="gl-descript">{{item.descript}}</view>
-								<view class="gl-price">￥{{formatPrice(item.price)}}</view>
-							</view>
+						<view style="width: 100%;">
+							<good-item :item="item"></good-item>
 						</view>
 					</template>
 				</uv-list-item>
@@ -27,19 +18,10 @@
 		<view v-if="newList.length>0">
 			<view class="gl-title">新品推荐</view>
 			<uv-list>
-				<uv-list-item v-for="(item,index) in newList" :key="item.id" border
-					@click="$navigateTo('/subPages/shopPage/good/good?id='+item.id)">
+				<uv-list-item v-for="(item,index) in newList" :key="item.id" border>
 					<template #body>
-						<view class="gl-item">
-							<view class="gl-img">
-								<uv-image width="170rpx" height="170rpx" :src="item.img">
-								</uv-image>
-							</view>
-							<view>
-								<view class="gl-name">{{item.name}}</view>
-								<view class="gl-descript">{{item.descript}}</view>
-								<view class="gl-price">￥{{formatPrice(item.price)}}</view>
-							</view>
+						<view style="width: 100%;">
+							<good-item :item="item"></good-item>
 						</view>
 					</template>
 				</uv-list-item>
@@ -55,21 +37,28 @@
 				<uv-icon name="shopping-cart" size="30"></uv-icon>
 			</view>
 		</view>
+		<view class="shop-cart tab">
+			<view class="cartbox" @click="$navigateTo('/subPages/shopPage/menu/menu')">
+				<text>分类</text>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
 	import {
-		getCategoryList,
 		getTopicList,
 		getSearchHot,
 		getSearchNew,
 		getCartCount
 	} from '@/request/api/shop.js'
+	import goodItem from '@/components/common/goodItem.vue';
 	export default {
+		components: {
+			goodItem
+		},
 		data() {
 			return {
-				navList: [],
 				newList: [],
 				hotList: [],
 				topicList: [],
@@ -77,60 +66,32 @@
 			}
 		},
 		onShow() {
-			this.init()
+			this.init();
 		},
 		methods: {
 			async init() {
 				if (uni.getStorageSync('shopMobileToken')) this.getCartCount();
-				let navData = await getCategoryList();
-				if (navData.state) {
-					let navList = navData.data;
-					navList.splice(0, 0, {
-						name: '推荐',
-						id: '0'
-					})
-					this.navList = navList;
-				}
-				this.queryGoods();
 				this.queryTopic();
+				this.queryGoodsHot();
+				this.queryGoodsHotNew();
+
 			},
 			async getCartCount() {
 				let countData = await getCartCount();
 				if (countData.state) this.cartCount = countData.data;
 			},
-			changeNav(index) {
-
-			},
-			async queryGoods() {
+			async queryGoodsHot() {
 				let hotData = await getSearchHot();
-				if (hotData.state) this.hotList = hotData.data.map(node => {
-					node['img'] = this.shopImage(node.pic);
-					return node;
-				});
+				if (hotData.state) this.hotList = hotData.data;
+			},
+			async queryGoodsHotNew() {
 				let newData = await getSearchNew();
-				if (newData.state) this.newList = newData.data.map(node => {
-					node['img'] = this.shopImage(node.pic);
-					return node;
-				});
+				if (newData.state) this.newList = newData.data;
 			},
 			async queryTopic() {
 				const baseApi = this.baseApi;
 				let topicData = await getTopicList();
-				if (topicData.state) this.topicList = topicData.data.map(node => {
-					node['image'] = this.shopImage(node.article.img);
-					return node;
-				});
-			},
-			toTopic(id) {
-				this.$u.route({
-					url: '/pages/topic/detail',
-					params: {
-						id: id
-					}
-				})
-			},
-			formatPrice(price) {
-				return (price / 100).toFixed(2);
+				if (topicData.state) this.topicList = topicData.data.map(node => this.shopImage(node.article.img));
 			}
 		}
 
@@ -146,6 +107,10 @@
 		}
 	}
 
+	.gl-title {
+		padding: 20rpx;
+	}
+
 	.shop-cart {
 		position: fixed;
 		bottom: 80rpx;
@@ -163,40 +128,9 @@
 			box-shadow: 0px 2px 10px rgba(3, 3, 3, 0.1);
 			background-color: #ffffff;
 		}
-	}
 
-	.gl-body {
-		background: #fff;
-	}
-
-	.gl-title {
-		padding: 20rpx;
-	}
-
-	.gl-item {
-		width: 100%;
-		display: flex;
-		align-items: center;
-	}
-
-	.gl-img {
-		width: 170rpx;
-		height: 170rpx;
-		margin-right: 30rpx;
-	}
-
-	.gl-name {
-		font-size: 32rpx;
-		font-weight: bold;
-	}
-
-	.gl-descript {
-		font-size: 24rpx;
-	}
-
-	.gl-price {
-		font-size: 32rpx;
-		color: #FA3534;
-		margin-top: 20rpx;
+		&.tab {
+			bottom: 200rpx;
+		}
 	}
 </style>

virgo.wzfrontend/workark_wx/request/api/shop.js

@@ -46,6 +46,17 @@ export function getSearchNew() {
 		method: 'get'
 	})
 }
+/* 
+ * 分类获取商品
+ * 
+ * 
+ */
+export function getGoodByQuery(data) {
+	return request({
+		url: `${baseUrl}/goods/queryGoods?page=${data.page}&limit=${data.limit}&idCategory=${data.idCategory}`,
+		method: 'get'
+	})
+}
 /* 
  * 获取商品详情
  * 

virgo.wzfrontend/workark_wx/subPages/shopPage/menu/menu.vue

@@ -0,0 +1,90 @@
+<template>
+	<view class="menu-content">
+		<uv-vtabs :chain="chain" :list="list" :height="height">
+			<template v-for="(item,index) in list">
+				<uv-vtabs-item :index="index" :key="index">
+					<view class="menu-box">
+						<view class="menu-title">{{item.name}}</view>
+						<view class="menu-list">
+							<view class="menu-item" @click="toCategory(item)">
+								<image class="item-menu-image" :src="shopImage(item.icon)" mode="scaleToFill"></image>
+								<view class="item-menu-name">{{item.name}}</view>
+							</view>
+							<view class="menu-item" v-for="(item1, index1) in item.children" :key="index1"
+								@click="toCategory(item1)">
+								<image class="item-menu-image" :src="shopImage(item.icon)" mode=""></image>
+								<view class="item-menu-name">{{item.name}}</view>
+							</view>
+						</view>
+					</view>
+				</uv-vtabs-item>
+			</template>
+		</uv-vtabs>
+	</view>
+</template>
+
+<script>
+	import {
+		getCategoryList
+	} from '@/request/api/shop.js'
+	export default {
+		data() {
+			return {
+				list: [],
+				chain: true
+			}
+		},
+		computed: {
+			height() {
+				return uni.getWindowInfo().windowHeight - uni.upx2px(100);
+			}
+		},
+		onLoad() {
+			this.init();
+		},
+		methods: {
+			async init() {
+				let categoryData = await getCategoryList();
+				if (categoryData.state) this.list = categoryData.data;
+			},
+			toCategory(item) {
+				this.$navigateTo('/subPages/shopPage/menuShop/menuShop?idCategory=' + item.id);
+			}
+		}
+	}
+</script>
+<style scoped lang="scss">
+	.menu-content {
+		padding-top: 30rpx;
+	}
+
+	.menu-box {
+		padding: 20rpx;
+
+		.menu-title {
+			font-size: 36rpx;
+			font-weight: bold;
+			padding-bottom: 20rpx;
+		}
+	}
+
+	.item-menu-image {
+		width: 120rpx;
+		height: 120rpx;
+	}
+
+	.item-menu-name {
+		font-weight: normal;
+		font-size: 24rpx;
+	}
+
+	.menu-list {
+		display: flex;
+		flex-wrap: wrap;
+
+		.menu-item {
+			width: 33.33%;
+			text-align: center;
+		}
+	}
+</style>

virgo.wzfrontend/workark_wx/subPages/shopPage/menuShop/menuShop.vue

@@ -0,0 +1,62 @@
+<template>
+	<view class="order-list">
+		<z-paging ref="paging" v-model="dataList" @query="queryList">
+			<view class="page-box">
+				<uv-list>
+					<uv-list-item v-for="(item,index) in dataList" :key="item.id" border>
+						<template #body>
+							<view style="width: 100%;">
+								<good-item :item="item"></good-item>
+							</view>
+						</template>
+					</uv-list-item>
+				</uv-list>
+			</view>
+		</z-paging>
+	</view>
+</template>
+
+<script>
+	import {
+		getGoodByQuery
+	} from '@/request/api/shop.js'
+	import goodItem from '@/components/common/goodItem.vue';
+	export default {
+		data() {
+			return {
+				idCategory: '',
+				dataList: []
+			};
+		},
+		components: {
+			goodItem
+		},
+		onLoad(body) {
+			this.idCategory = body.idCategory;
+		},
+		computed: {},
+		methods: {
+			async queryList(index, size) {
+				let filterOption = {
+					page: index,
+					limit: size,
+					idCategory: this.idCategory
+				};
+				uni.showLoading()
+				let orderData = await getGoodByQuery(filterOption);
+				if (orderData.state) {
+					uni.hideLoading();
+					this.$refs.paging.complete(orderData.data.records);
+					return
+				}
+				this.$refs.paging.complete(false);
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.page-box {
+		padding-top: 30rpx;
+	}
+</style>

virgo.wzfrontend/workark_wx/subPages/shopPage/orderList/orderList.vue

@@ -62,7 +62,6 @@
 						</view>
 					</view>
 				</view>
-				<uv-loadmore :status="loadStatus[2]" bgColor="#f2f2f2"></uv-loadmore>
 			</view>
 		</z-paging>
 	</view>

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/app.json

@@ -31,7 +31,12 @@
         "payment/payment",
         "good/good",
         "cart/cart",
-        "checkout/checkout"
+        "checkout/checkout",
+        "addressList/addressList",
+        "addressAdd/addressAdd",
+        "orderList/orderList",
+        "orderDetail/orderDetail",
+        "express/express"
       ]
     },
     {
@@ -73,10 +78,10 @@
         "text": "工单"
       },
       {
-        "pagePath": "pages/model/model",
-        "iconPath": "/static/images/tabbar/shop.png",
-        "selectedIconPath": "/static/images/tabbar/shop-active.png",
-        "text": "环境"
+        "pagePath": "pages/message/message",
+        "iconPath": "/static/images/tabbar/chat.png",
+        "selectedIconPath": "/static/images/tabbar/chat-active.png",
+        "text": "消息"
       },
       {
         "pagePath": "pages/workark/workark",
@@ -86,8 +91,8 @@
       },
       {
         "pagePath": "pages/shop/shop",
-        "iconPath": "static/images/tabbar/chat.png",
-        "selectedIconPath": "static/images/tabbar/chat-active.png",
+        "iconPath": "static/images/tabbar/shop.png",
+        "selectedIconPath": "/static/images/tabbar/shop-active.png",
         "text": "商城"
       },
       {

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/pages/shop/shop.json

@@ -6,6 +6,8 @@
     "uv-swiper": "/uni_modules/uv-swiper/components/uv-swiper/uv-swiper",
     "uv-list": "/uni_modules/uv-list/components/uv-list/uv-list",
     "uv-list-item": "/uni_modules/uv-list/components/uv-list-item/uv-list-item",
-    "uv-image": "/uni_modules/uv-image/components/uv-image/uv-image"
+    "uv-image": "/uni_modules/uv-image/components/uv-image/uv-image",
+    "uv-badge": "/uni_modules/uv-badge/components/uv-badge/uv-badge",
+    "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
   }
 }

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/project.config.json

@@ -18,7 +18,7 @@
     }
   },
   "compileType": "miniprogram",
-  "libVersion": "3.8.4",
+  "libVersion": "3.8.7",
   "appid": "wx3c006d364161d240",
   "projectname": "workark_wx",
   "condition": {},

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/myPage/components/uni-mall-head/uni-mall-head.json

@@ -1,6 +1,6 @@
 {
-  "component": true,
   "usingComponents": {
     "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
-  }
+  },
+  "component": true
 }

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/shopPage/addressAdd/addressAdd.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "填写地址",
+  "usingComponents": {
+    "uv-switch": "/uni_modules/uv-switch/components/uv-switch/uv-switch",
+    "uv-button": "/uni_modules/uv-button/components/uv-button/uv-button",
+    "uv-picker": "/uni_modules/uv-picker/components/uv-picker/uv-picker"
+  }
+}

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/shopPage/addressList/addressList.json

@@ -0,0 +1,10 @@
+{
+  "navigationBarTitleText": "收货地址",
+  "usingComponents": {
+    "uv-radio-group": "/uni_modules/uv-radio/components/uv-radio-group/uv-radio-group",
+    "uv-row": "/uni_modules/uv-row/components/uv-row/uv-row",
+    "uv-col": "/uni_modules/uv-row/components/uv-col/uv-col",
+    "uv-radio": "/uni_modules/uv-radio/components/uv-radio/uv-radio",
+    "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
+  }
+}

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/shopPage/express/express.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "订单物流",
+  "usingComponents": {
+    "uv-steps": "/uni_modules/uv-steps/components/uv-steps/uv-steps",
+    "uv-steps-item": "/uni_modules/uv-steps/components/uv-steps-item/uv-steps-item"
+  }
+}

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/shopPage/orderDetail/orderDetail.json

@@ -0,0 +1,11 @@
+{
+  "navigationBarTitleText": "订单详情",
+  "usingComponents": {
+    "uv-cell-group": "/uni_modules/uv-cell/components/uv-cell-group/uv-cell-group",
+    "uv-cell": "/uni_modules/uv-cell/components/uv-cell/uv-cell",
+    "uv-button": "/uni_modules/uv-button/components/uv-button/uv-button",
+    "uv-row": "/uni_modules/uv-row/components/uv-row/uv-row",
+    "uv-col": "/uni_modules/uv-row/components/uv-col/uv-col",
+    "uv-image": "/uni_modules/uv-image/components/uv-image/uv-image"
+  }
+}

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/shopPage/orderList/orderList.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "订单列表",
+  "usingComponents": {
+    "z-paging": "/uni_modules/z-paging/components/z-paging/z-paging",
+    "uv-tabs": "/uni_modules/uv-tabs/components/uv-tabs/uv-tabs",
+    "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
+  }
+}

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/subPages/shopPage/payment/payment.wxss

@@ -1 +1 @@
-.wrap.data-v-2a7a0a03{padding:30rpx 0rpx}.wrap .top.data-v-2a7a0a03{display:flex;align-items:center}.wrap .item.data-v-2a7a0a03{width:100%;padding:20rpx 20rpx}.wrap .label.data-v-2a7a0a03{color:#6cac3e;margin-left:10rpx}.wrap .button.data-v-2a7a0a03{padding:30rpx}
+.wrap.data-v-7220ae38{padding:30rpx 0rpx}.wrap .top.data-v-7220ae38{display:flex;align-items:center}.wrap .item.data-v-7220ae38{width:100%;padding:20rpx 20rpx}.wrap .label.data-v-7220ae38{color:#6cac3e;margin-left:10rpx}.wrap .button.data-v-7220ae38{padding:30rpx}

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/kevy-result-page/components/kevy-result-page/kevy-result-page.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "uv-count-down": "/uni_modules/uv-count-down/components/uv-count-down/uv-count-down"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-badge/components/uv-badge/uv-badge.json

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

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.json

@@ -1,7 +1,7 @@
 {
-  "component": true,
   "usingComponents": {
     "uv-loading-icon": "/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon",
     "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
-  }
+  },
+  "component": true
 }

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-cell/components/uv-cell-group/uv-cell-group.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "uv-line": "/uni_modules/uv-line/components/uv-line/uv-line"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-cell/components/uv-cell/uv-cell.json

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon",
     "uv-line": "/uni_modules/uv-line/components/uv-line/uv-line"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-checkbox/components/uv-checkbox-group/uv-checkbox-group.json

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

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-code/components/uv-code/uv-code.json

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

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-count-down/components/uv-count-down/uv-count-down.json

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

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-divider/components/uv-divider/uv-divider.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "uv-line": "/uni_modules/uv-line/components/uv-line/uv-line"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-line/components/uv-line/uv-line.json

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

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-link/components/uv-link/uv-link.json

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

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon.json

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

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-modal/components/uv-modal/uv-modal.json

@@ -1,8 +1,8 @@
 {
+  "component": true,
   "usingComponents": {
     "uv-popup": "/uni_modules/uv-popup/components/uv-popup/uv-popup",
     "uv-line": "/uni_modules/uv-line/components/uv-line/uv-line",
     "uv-loading-icon": "/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-number-box/components/uv-number-box/uv-number-box.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-overlay/components/uv-overlay/uv-overlay.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "uv-transition": "/uni_modules/uv-transition/components/uv-transition/uv-transition"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-picker/components/uv-picker/uv-picker.json

@@ -0,0 +1,8 @@
+{
+  "component": true,
+  "usingComponents": {
+    "uv-popup": "/uni_modules/uv-popup/components/uv-popup/uv-popup",
+    "uv-toolbar": "/uni_modules/uv-toolbar/components/uv-toolbar/uv-toolbar",
+    "uv-loading-icon": "/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon"
+  }
+}

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-radio/components/uv-radio-group/uv-radio-group.json

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

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-radio/components/uv-radio/uv-radio.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-steps/components/uv-steps-item/uv-steps-item.json

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon",
     "uv-text": "/uni_modules/uv-text/components/uv-text/uv-text"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-steps/components/uv-steps/uv-steps.json

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

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-swiper/components/uv-swiper/uv-swiper.json

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "uv-loading-icon": "/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon",
     "uv-swiper-indicator": "/uni_modules/uv-swiper/components/uv-swiper-indicator/uv-swiper-indicator"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-switch/components/uv-switch/uv-switch.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "uv-loading-icon": "/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-tags/components/uv-tags/uv-tags.json

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "uv-transition": "/uni_modules/uv-transition/components/uv-transition/uv-transition",
     "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-text/components/uv-text/uv-text.json

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "uv-icon": "/uni_modules/uv-icon/components/uv-icon/uv-icon",
     "uv-link": "/uni_modules/uv-link/components/uv-link/uv-link"
-  },
-  "component": true
+  }
 }

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-toolbar/components/uv-toolbar/uv-toolbar.json

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

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-transition/components/uv-transition/uv-transition.json

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

virgo.wzfrontend/workark_wx/unpackage/dist/build/mp-weixin/uni_modules/uv-upload/components/uv-preview-video/uv-preview-video.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "uv-popup": "/uni_modules/uv-popup/components/uv-popup/uv-popup"
-  },
-  "component": true
+  }
 }