mabaoyi 10 ماه پیش
والد
کامیت
a074edeae6
97فایلهای تغییر یافته به همراه1632 افزوده شده و 348 حذف شده
  1. 6 1
      App.vue
  2. 47 12
      components/kj-tabbar/kj-tabbar.vue
  3. 89 0
      pageC/accountBalance/accountBalance.vue
  4. 3 0
      pageC/index.vue
  5. 48 36
      pages.json
  6. 2 2
      pages/cart/cart.vue
  7. 2 2
      pages/express/express.vue
  8. 30 4
      pages/index/index.vue
  9. 85 0
      pages/mine/component/mallOrderForm.vue
  10. 106 0
      pages/mine/component/mineMoney.vue
  11. 63 0
      pages/mine/component/personalFunction.vue
  12. 84 0
      pages/mine/component/teamFunction.vue
  13. 85 5
      pages/mine/mine.vue
  14. 2 2
      pages/shopping/shopping.vue
  15. BIN
      static/mine/308.png
  16. BIN
      static/mine/309.png
  17. BIN
      static/mine/310.png
  18. BIN
      static/mine/311.png
  19. BIN
      static/mine/312.png
  20. BIN
      static/mine/313.png
  21. BIN
      static/mine/314.png
  22. BIN
      static/mine/315.png
  23. BIN
      static/mine/316.png
  24. BIN
      static/mine/317.png
  25. BIN
      static/mine/318.png
  26. BIN
      static/mine/319.png
  27. BIN
      static/mine/320.png
  28. BIN
      static/mine/321.png
  29. BIN
      static/mine/322.png
  30. BIN
      static/mine/pc.png
  31. BIN
      static/mine/right.png
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-tabbar/kj-tabbar.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pageC/index.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cart/cart.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/express/express.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopping/shopping.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
  45. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map
  46. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map
  47. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map
  48. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
  49. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js.map
  50. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-subsection/u-subsection.js.map
  51. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map
  52. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js.map
  53. 0 1
      unpackage/dist/dev/mp-weixin/App.wxml
  54. 3 16
      unpackage/dist/dev/mp-weixin/app.json
  55. 1 3
      unpackage/dist/dev/mp-weixin/common/main.js
  56. 6 0
      unpackage/dist/dev/mp-weixin/common/main.wxss
  57. 2 2
      unpackage/dist/dev/mp-weixin/common/runtime.js
  58. 404 148
      unpackage/dist/dev/mp-weixin/common/vendor.js
  59. 4 4
      unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.js
  60. 6 6
      unpackage/dist/dev/mp-weixin/pageA/index.js
  61. 6 6
      unpackage/dist/dev/mp-weixin/pageB/index.js
  62. 6 6
      unpackage/dist/dev/mp-weixin/pageC/index.js
  63. 6 6
      unpackage/dist/dev/mp-weixin/pageD/index.js
  64. 6 6
      unpackage/dist/dev/mp-weixin/pages/cart/cart.js
  65. 1 1
      unpackage/dist/dev/mp-weixin/pages/cart/cart.wxml
  66. 6 6
      unpackage/dist/dev/mp-weixin/pages/express/express.js
  67. 1 1
      unpackage/dist/dev/mp-weixin/pages/express/express.wxml
  68. 45 4
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  69. 4 1
      unpackage/dist/dev/mp-weixin/pages/index/index.json
  70. 1 1
      unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  71. 8 0
      unpackage/dist/dev/mp-weixin/pages/index/index.wxss
  72. 7 7
      unpackage/dist/dev/mp-weixin/pages/login/login.js
  73. 10 8
      unpackage/dist/dev/mp-weixin/pages/mine/mine.js
  74. 5 1
      unpackage/dist/dev/mp-weixin/pages/mine/mine.json
  75. 1 1
      unpackage/dist/dev/mp-weixin/pages/mine/mine.wxml
  76. 6 6
      unpackage/dist/dev/mp-weixin/pages/shopping/shopping.js
  77. 1 1
      unpackage/dist/dev/mp-weixin/pages/shopping/shopping.wxml
  78. 0 7
      unpackage/dist/dev/mp-weixin/project.private.config.json
  79. 5 5
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-badge/u-badge.js
  80. 5 5
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js
  81. 5 5
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js
  82. 5 5
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.js
  83. 52 0
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.js
  84. 7 0
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.json
  85. 1 0
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.wxml
  86. 83 0
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.wxss
  87. 5 5
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js
  88. 52 0
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js
  89. 4 0
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.json
  90. 1 0
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.wxml
  91. 30 0
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.wxss
  92. 52 0
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-subsection/u-subsection.js
  93. 4 0
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-subsection/u-subsection.json
  94. 1 0
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-subsection/u-subsection.wxml
  95. 112 0
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-subsection/u-subsection.wxss
  96. 5 5
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js
  97. 5 5
      unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js

+ 6 - 1
App.vue

@@ -3,7 +3,6 @@
 	export default {
 		onLaunch: function() {
 			console.log('App Launch')
-			uni.hideTabBar()
 		},
 		onShow: function() {
 			console.log('App Show')
@@ -15,6 +14,12 @@
 </script>
 
 <style lang="scss">
+	page{
+		background-color: #f4f4f4
+	}
+	.uni-bar {
+			background-color: #f4f4f4
+	}
 	/*每个页面公共css */
 	@import "@/uview-ui/index.scss";
 </style>

+ 47 - 12
components/kj-tabbar/kj-tabbar.vue

@@ -18,6 +18,9 @@
 
 	export default {
 		name: "kj-tabbar",
+		props: {
+			value1: Number
+		},
 		data() {
 			return {
 				list: [{
@@ -51,44 +54,76 @@
 						"pagePath": "pages/mine/mine"
 					}
 				],
-				value1: 0,
 			};
 		},
 		created() {
-			if (uni.getStorageSync('tabbar')) {
-				this.value1 = uni.getStorageSync('tabbar')
-			}
+			// if (uni.getStorageSync('tabbar')!=1) {
+			// 	this.value1 = uni.getStorageSync('tabbar')
+			// }
 		},
 		methods: {
+			// click1(e) {
+			// 	this.value1 = e
+			// 	console.log(e);
+			// 	if (this.value1 == 4) {
+			// 		uni.redirectTo({
+			// 			url: '../../pages/mine/mine'
+			// 		})
+			// 	}
+			// 	if (this.value1 == 0) {
+			// 		uni.redirectTo({
+			// 			url: '../../pages/express/express'
+			// 		})
+			// 	}
+			// 	if (this.value1 == 1) {
+			// 		uni.redirectTo({
+			// 			url: '../../pages/index/index'
+			// 		})
+			// 	}
+			// 	if (this.value1 == 2) {
+			// 		uni.redirectTo({
+			// 			url: '../../pages/shopping/shopping'
+			// 		})
+			// 	}
+			// 	if (this.value1 == 3) {
+			// 		uni.redirectTo({
+			// 			url: '../../pages/cart/cart'
+			// 		})
+			// 	}
+			// 	uni.setStorageSync('tabbar', e)
+			// },
 			click1(e) {
-				this.value1 = e
 				console.log(e);
-				if (this.value1 == 4) {
+				if (e == 4) {
 					uni.switchTab({
-						url: '/pages/mine/mine'
+						url: '../../pages/mine/mine'
 					})
 				}
-				if (this.value1 == 0) {
+
+				if (e == 0) {
 					uni.switchTab({
 						url: '../../pages/express/express'
 					})
 				}
-				if (this.value1 == 1) {
+
+				if (e == 1) {
 					uni.switchTab({
 						url: '../../pages/index/index'
 					})
 				}
-				if (this.value1 == 2) {
+
+				if (e == 2) {
 					uni.switchTab({
 						url: '../../pages/shopping/shopping'
 					})
 				}
-				if (this.value1 == 3) {
+
+				if (e == 3) {
 					uni.switchTab({
 						url: '../../pages/cart/cart'
 					})
 				}
-				uni.setStorageSync('tabbar', e)
+				// uni.setStorageSync('tabbar', e)
 			},
 		}
 		// created() {},

+ 89 - 0
pageC/accountBalance/accountBalance.vue

@@ -0,0 +1,89 @@
+<template>
+	<view class="balance">
+		<view class="shadow">
+		</view>
+		<view class="mine-balance">
+			<view class="title">
+				我的余额(元)
+			</view>
+			<view class="money"> 500.00 </view>
+			<view class="btn-list">
+				<button class="withdrawal">提现</button>
+				<button class="recharge">充值</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		created() {
+			uni.setNavigationBarColor({
+				frontColor: '#ffffff',
+				backgroundColor: '#f74639'
+			})
+		}
+	}
+</script>
+
+<style lang="scss">
+	.balance {
+		position: relative;
+		padding-top: 10px;
+		.shadow {
+			position: absolute;
+			top: 0;
+			height: 300px;
+			width: 100%;
+			background: linear-gradient(#f74639, #f4f4f4);
+			z-index: -1;
+		}
+		.mine-balance{
+			width: 96%;
+			margin: 0 auto;
+			background-color: #fff;
+			border-radius: 10px;
+			padding-top: 82rpx;
+			padding-bottom: 62rpx;
+			.title{
+				text-align: center;
+				font-size: 28rpx;
+				color: #222;
+			}
+			.money{
+				font-size: 84rpx;
+				color: #222;
+				font-weight: 600;
+				text-align: center;
+				margin-top: 36rpx;
+			}
+			.btn-list{
+				display: flex;
+				justify-content: space-around;
+				margin-top: 76rpx;
+				.withdrawal{
+					width: 298rpx;
+					height: 88rpx;
+					background-color: rgba(248, 50, 36, 0.1);
+					border-radius: 44px;
+					color: #f83224;
+					font-size: 32rpx;
+				}
+				.recharge{
+					width: 298rpx;
+					height: 88rpx;
+					background-color: #f83224;
+					border-radius: 44px;
+					color: #fff;
+					font-size: 32rpx;
+					box-shadow: 0rpx 12rpx 28rpx -12rpx #f83224;
+				}
+			}
+		}
+	}
+</style>

+ 3 - 0
pageC/index.vue

@@ -10,6 +10,9 @@
 			return {
 				
 			};
+		},
+		created() {
+			
 		}
 	}
 </script>

+ 48 - 36
pages.json

@@ -7,8 +7,8 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "跨境物流"
-
+				"navigationBarTitleText": "商城",
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -56,6 +56,7 @@
 						"enablePullDownRefresh": false
 					}
 				}
+
 			]
 		},
 		{
@@ -78,7 +79,15 @@
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": false
 					}
+				},
+				{
+					"path" : "accountBalance/accountBalance",
+					"style" : 
+					{
+						"navigationBarTitleText" : "账户余额"
+					}
 				}
+
 			]
 		},
 		{
@@ -102,56 +111,59 @@
 	},
 	"uniIdRouter": {},
 	"tabBar": {
-		// "custom":true,
+
 		"color": "#333333",
 		"selectedColor": "#F83224",
-		"list": [
-			{
-				"iconPath": "static/express1.png",
-				"selectedIconPath": "static/express2.png",
-				"text": "跨境速递",
-				"pagePath": "pages/express/express"
-			},
-			{
-				"iconPath": "static/index1.png",
-				"selectedIconPath": "static/index2.png",
-				"text": "商城",
-				"pagePath": "pages/index/index"
-			},
-			{
-				"iconPath": "static/shop.png",
-				"selectedIconPath": "static/shop.png",
-				"text": "购",
-				"pagePath": "pages/shopping/shopping"
-			},
-			{
-				"iconPath": "static/cart1.png",
-				"selectedIconPath": "static/cart2.png",
-				"text": "购物车",
-				"pagePath": "pages/cart/cart"
-			},
-			{
-				"iconPath": "static/mine1.png",
-				"selectedIconPath": "static/mine2.png",
-				"text": "我的",
-				"pagePath": "pages/mine/mine"
-			}
-		]
-		// "list": [{
+		// "list": [
+		// 	{
+		// 		"iconPath": "static/express1.png",
+		// 		"selectedIconPath": "static/express2.png",
+		// 		"text": "跨境速递",
 		// 		"pagePath": "pages/express/express"
 		// 	},
 		// 	{
+		// 		"iconPath": "static/index1.png",
+		// 		"selectedIconPath": "static/index2.png",
+		// 		"text": "商城",
 		// 		"pagePath": "pages/index/index"
 		// 	},
 		// 	{
+		// 		"iconPath": "static/shop.png",
+		// 		"selectedIconPath": "static/shop.png",
+		// 		"text": "购",
 		// 		"pagePath": "pages/shopping/shopping"
 		// 	},
 		// 	{
+		// 		"iconPath": "static/cart1.png",
+		// 		"selectedIconPath": "static/cart2.png",
+		// 		"text": "购物车",
 		// 		"pagePath": "pages/cart/cart"
 		// 	},
 		// 	{
+		// 		"iconPath": "static/mine1.png",
+		// 		"selectedIconPath": "static/mine2.png",
+		// 		"text": "我的",
 		// 		"pagePath": "pages/mine/mine"
 		// 	}
 		// ]
+
+		"custom": true,
+
+		"list": [{
+				"pagePath": "pages/express/express"
+			},
+			{
+				"pagePath": "pages/index/index"
+			},
+			{
+				"pagePath": "pages/shopping/shopping"
+			},
+			{
+				"pagePath": "pages/cart/cart"
+			},
+			{
+				"pagePath": "pages/mine/mine"
+			}
+		]
 	}
 }

+ 2 - 2
pages/cart/cart.vue

@@ -1,8 +1,8 @@
 <template>
 	<!-- 购物车 -->
 	<view>
-		购物车
-		<kj-tabbar></kj-tabbar>
+
+		<kj-tabbar :value1=3></kj-tabbar>
 	</view>
 </template>
 

+ 2 - 2
pages/express/express.vue

@@ -1,8 +1,8 @@
 <template>
 	<!-- 快递 -->
 	<view>
-		快递
-		<kj-tabbar></kj-tabbar>
+
+		<kj-tabbar :value1=0></kj-tabbar>
 	</view>
 </template>
 

+ 30 - 4
pages/index/index.vue

@@ -1,8 +1,26 @@
 <template>
 	<!-- 商城 -->
 	<view class="">
-		商城
-		<kj-tabbar></kj-tabbar>
+
+		<view style="position: relative;">
+			<!-- 自定义导航栏 -->
+			<image src="../../static/images/index/back.png"
+				style="width: 750rpx;height: 780rpx;position: absolute;top: -20rpx;z-index: -1;" mode=""></image>
+			<u-navbar :safeAreaInsetTop="true" style="position: absolute;z-index: 110;background-color: rgba(0,0,0,0);">
+				<view class="u-nav-slot" slot="left" style="display: flex;">
+					<image src="../../static/images/index/xiaoxi.png" mode="" style="width: 40rpx;height: 40rpx;">
+					</image>
+					<image src="../../static/images/index/compile.png" mode=""
+						style="width: 40rpx;height: 40rpx;margin-left: 22rpx;"></image>
+					<image src="../../static/images/index/dianhua.png" mode=""
+						style="width: 40rpx;height: 40rpx;margin-left: 22rpx;"></image>
+				</view>
+				<view class="u-nav-slot" slot="center" style="display: flex;">
+					<u-subsection activeColor='#F83224' inactiveColor='#222'  :list="list" :current="1"></u-subsection>
+				</view>
+			</u-navbar>
+		</view>
+		<kj-tabbar :value1=1></kj-tabbar>
 	</view>
 
 </template>
@@ -11,18 +29,26 @@
 	export default {
 		data() {
 			return {
-
+				//顶部分段器
+				list: ['跨境速递', '商城'],
+				current: 1
 			}
 		},
 		onLoad() {
 
 		},
 		methods: {
-
+			
 		}
 	}
 </script>
 
 <style>
+	::v-deep .u-navbar__content.data-v-1194bf80 {
+		background-color: rgba(0, 0, 0, 0) !important;
+	}
 
+	::v-deep .u-status-bar.data-v-13f16680 {
+		background-color: rgba(0, 0, 0, 0) !important;
+	}
 </style>

+ 85 - 0
pages/mine/component/mallOrderForm.vue

@@ -0,0 +1,85 @@
+<template>
+	<view class="mall">
+		<view class="mall-top"> <text class="mall-title">商城订单</text>
+			<view class="all"> <text>全部</text>
+				<image class="right" src='../../../static/mine/right.png' mode=""></image>
+			</view>
+		</view>
+		<view class="order-form">
+			<view class="icon-center">
+				<image class="form-icon" src='../../../static/mine/310.png' mode=""></image>
+				<view class="characters">待付款</view>
+			</view>
+			<view class="icon-center">
+				<image class="form-icon" src='../../../static/mine/311.png' mode=""></image>
+				<view class="characters">拼团中</view>
+			</view>
+			<view class="icon-center">
+				<image class="form-icon" src='../../../static/mine/312.png' mode=""></image>
+				<view class="characters">代发货</view>
+			</view>
+			<view class="icon-center">
+				<image class="form-icon" src='../../../static/mine/313.png' mode=""></image>
+				<view class="characters">待收货</view>
+			</view>
+			<view class="icon-center">
+				<image class="form-icon" src='../../../static/mine/314.png' mode=""></image>
+				<view class="characters">退款/售后</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+</script>
+
+<style lang="scss">
+	.mall{
+		height: 100px;
+		width: 100%;
+		background-color: #fff;
+		border-radius: 10px;
+		padding-top: 14px;
+		margin-top: 10px;
+		.mall-top{
+			display: flex;
+			justify-content: space-between;
+			margin: 0 10px;
+			.mall-title{
+				font-size: 14px;
+				color: #222;
+				font-weight: 600;
+			}
+			.all{
+				color: #333;
+				font-size: 12px;
+				display: flex;
+				align-items: center;
+				.right{
+					width: 10px;
+					height: 10px;
+				}
+			}
+		}
+		.order-form{
+			display: flex;
+			justify-content: space-around;
+			margin-top: 18px;
+			.icon-center{
+				width: 15%;
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: center;
+			}
+			.form-icon{
+				width: 24px;
+				height: 22px;
+			}
+			.characters{
+				color: #202020;
+				font-size: 12px;
+				margin-top: 10px;
+			}
+		}
+	}
+</style>

+ 106 - 0
pages/mine/component/mineMoney.vue

@@ -0,0 +1,106 @@
+<template>
+	<view class="mine-money" id="mine-money" :style="{'height':isTeam?'110px':'66px'}">
+		<view class="top" v-if="isTeam">
+			<view class="content">
+				<image class="money-icon" src='../../../static/mine/308.png' mode=""></image>
+				<text>我的保证金</text>
+			</view>
+			<view class="content">200.00 <text class="right-icon"></text> </view>
+		</view>
+		<view class="bottom">
+			<view class="basis" @click="jumpBalance">
+				<view class="num">0.00</view>
+				<view class="characters">余额</view>
+			</view>
+			<view class="basis">
+				<view class="num">225</view>
+				<view class="characters">我的关注</view>
+			</view>
+			<view class="basis">
+				<view class="num">13</view>
+				<view class="characters">我的包裹</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props:{
+			isTeam:{
+				type:Boolean,
+				default:false
+			}
+		},
+		data(){
+			return{
+			}
+		},
+		methods:{
+			jumpBalance(){
+				uni.navigateTo({
+					url:'/pageC/accountBalance/accountBalance'
+				})
+			}
+		},
+		created() {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.mine-money{
+		height: 110px;
+		width: 100%;
+		background-color: #3B3D55;
+		margin-top: 15px;
+		border-radius: 10px;
+		.top{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			color: #fff;
+			font-size: 14px;
+			height: 44px;
+			.content{
+				display: flex;
+				align-items: center;
+				margin: 0 10px;
+			}
+			.money-icon{
+				width: 18px;
+				height: 18px;
+				margin-right: 6px;
+			}
+			.right-icon{
+				display: inline-block;
+				width: 20px;
+				height: 20px;
+				background-image: url('../../../static/mine/309.png');
+				background-size: 100% 100%;
+				background-repeat: no-repeat;
+			}
+		}
+		.bottom{
+			display: flex;
+			justify-content: space-around;
+			background-color: #fff;
+			border-radius: 10px;
+			height: 66px;
+			align-items: center;
+			.num{
+				font-size: 18px;
+				color: #333;
+				text-align: center;
+				font-weight: 600;
+			}
+			.characters{
+				font-size: 13px;
+				color: #333;
+				text-align: center;
+
+			}
+		}
+	}
+</style>

+ 63 - 0
pages/mine/component/personalFunction.vue

@@ -0,0 +1,63 @@
+<template>
+	<view class="team">
+		<text class="team-title">个人功能</text>
+		<view class="function-team">
+			<view class="icon-center">
+				<image class="form-icon" src="../../../static/mine/322.png" mode=""></image>
+				<view class="characters">成为团长</view>
+			</view>
+			<view class="icon-center">
+				<image class="form-icon" src="../../../static/mine/317.png" mode=""></image>
+				<view class="characters">联系客服</view>
+			</view>
+			<view class="icon-center">
+				<image class="form-icon" src="../../../static/mine/321.png" mode=""></image>
+				<view class="characters">账号设置</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+</script>
+
+<style lang="scss">
+	.team{
+		height: 110px;
+		width: 100%;
+		background-color: #fff;
+		border-radius: 10px;
+		margin-top: 10px;
+		padding-top: 14px;
+		.team-title{
+			color: #222;
+			font-size: 14px;
+			font-weight: 600;
+			display: block;
+			margin-left: 10px;
+		}
+		.function-team{
+			display: flex;
+			flex-wrap: wrap;
+			align-items: center;
+			.icon-center{
+				width: 18%;
+				margin-top: 18px;
+				display: flex;
+				flex-wrap: wrap;
+				padding: 0 10px;
+				justify-content: center;
+			}
+			.form-icon{
+				width: 24px;
+				height: 24px;
+			}
+			
+			.characters{
+				color: #202020;
+				font-size: 12px;
+				margin-top: 10px;
+			}
+		}
+	}
+</style>

+ 84 - 0
pages/mine/component/teamFunction.vue

@@ -0,0 +1,84 @@
+<template>
+	<view class="team">
+		<text class="team-title">团长功能</text>
+		<view class="function-team">
+			<view class="icon-center">
+				<image class="form-icon" src="../../../static/mine/319.png" mode=""></image>
+				<view class="characters">平台商品库</view>
+			</view>
+			<view class="icon-center">
+				<image class="form-icon" src='../../../static/mine/318.png' mode=""></image>
+				<view class="characters">商品管理</view>
+			</view>
+			<view class="icon-center">
+				<image class="form-icon" src="../../../static/mine/315.png" mode=""></image>
+				<view class="characters">订单管理</view>
+			</view>
+			<view class="icon-center">
+				<image class="form-icon" src="../../../static/mine/320.png" mode=""></image>
+				<view class="characters">售后管理</view>
+			</view>
+			<view class="icon-center">
+				<image class="form-icon" src="../../../static/mine/316.png" mode=""></image>
+				<view class="characters">供应链商品</view>
+			</view>
+			<view class="icon-center">
+				<image class="form-icon" style="padding: 0 15px;" src="../../../static/mine/pc.png" mode=""></image>
+				<view class="characters">PC端</view>
+			</view>
+			<view class="icon-center">
+				<image class="form-icon" src="../../../static/mine/317.png" mode=""></image>
+				<view class="characters">联系客服</view>
+			</view>
+			<view class="icon-center">
+				<image class="form-icon" src="../../../static/mine/321.png" mode=""></image>
+				<view class="characters">账号设置</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+</script>
+
+<style lang="scss">
+	.team{
+		height: 170px;
+		width: 100%;
+		background-color: #fff;
+		border-radius: 10px;
+		margin-top: 10px;
+		padding-top: 14px;
+		.team-title{
+			color: #222;
+			font-size: 14px;
+			font-weight: 600;
+			display: block;
+			margin-left: 10px;
+		}
+		.function-team{
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-around;
+			align-items: center;
+			.icon-center{
+				width: 18%;
+				margin-top: 18px;
+				display: flex;
+				flex-wrap: wrap;
+				padding: 0 10px;
+				justify-content: center;
+			}
+			.form-icon{
+				width: 24px;
+				height: 24px;
+			}
+			
+			.characters{
+				color: #202020;
+				font-size: 12px;
+				margin-top: 10px;
+			}
+		}
+	}
+</style>

+ 85 - 5
pages/mine/mine.vue

@@ -1,21 +1,101 @@
 <template>
 	<!-- 我的 -->
-	<view>
-我的
-		<kj-tabbar></kj-tabbar>
+	<view class="mine">
+		<view class="mine-top">
+			<image class="header-img"
+				src="https://c-ssl.dtstatic.com/uploads/blog/202201/23/20220123222213_2899a.thumb.1000_0.jpeg" alt="" />
+			<view class="user-info">
+				<view class="name">姓名:张三</view>
+				<text class="user-id">ID:123455</text>
+			</view>
+			<view class="user-home">主页 <text class="home-right"></text> </view>
+		</view>
+		
+		<MineMoney :isTeam="isTeam" />
+		<MallOrderForm />
+		<TeamFunction v-if="isTeam" />
+		<PersonalFunction v-else />
+
+		<kj-tabbar :value1=4></kj-tabbar>
 	</view>
 </template>
 
 <script>
+	import MineMoney from './component/mineMoney.vue';
+	import MallOrderForm from './component/mallOrderForm.vue';
+	import TeamFunction from './component/teamFunction.vue';
+	import PersonalFunction from './component/personalFunction.vue';
 	export default {
+		components:{
+			MineMoney,
+			MallOrderForm,
+			TeamFunction,
+			PersonalFunction
+		},
 		data() {
 			return {
-				
+				isTeam:true,
 			};
+		},
+		created() {
+			uni.setNavigationBarColor({
+				frontColor: '#ffffff',
+				backgroundColor: '#f4f4f4'
+			})
 		}
 	}
 </script>
 
 <style lang="scss">
+	.mine {
+		padding-left: 10px;
+		background-color: #f4f4f4;
+		padding-right: 10px;
+	}
 
-</style>
+	.mine-top {
+		display: flex;
+		align-items: center;
+		position: relative;
+
+		.header-img {
+			height: 54px;
+			width: 54px;
+			border-radius: 50%;
+			margin-right: 10px;
+		}
+		.user-info{
+			.name{
+				margin-bottom: 4px;
+				color: #222;
+				font-size: 18px;
+				font-weight: 600;
+			}
+			.user-id{
+				font-size: 12px;
+				color: #333;
+			}
+		}
+		.user-home {
+			position: absolute;
+			right: 0;
+			width: 72px;
+			height: 28px;
+			background-color: #eee;
+			text-align: center;
+			font-size: 13px;
+			font-size: #333;
+			line-height: 28px;
+			border-radius: 14px 0 0 14px;
+			.home-right{
+				display: inline-block;
+				width: 10px;
+				height: 10px;
+				background-image: url('../../static/mine/right.png');
+				background-size: 100% 100%;
+				background-repeat: no-repeat;
+				margin-right: 4px;
+			}
+		}
+	}
+</style>

+ 2 - 2
pages/shopping/shopping.vue

@@ -1,8 +1,8 @@
 <template>
 	<!-- 十元购 -->
 	<view>
-		十元购
-		<kj-tabbar></kj-tabbar>
+
+		<kj-tabbar :value1 = 2></kj-tabbar>
 	</view>
 </template>
 

BIN
static/mine/308.png


BIN
static/mine/309.png


BIN
static/mine/310.png


BIN
static/mine/311.png


BIN
static/mine/312.png


BIN
static/mine/313.png


BIN
static/mine/314.png


BIN
static/mine/315.png


BIN
static/mine/316.png


BIN
static/mine/317.png


BIN
static/mine/318.png


BIN
static/mine/319.png


BIN
static/mine/320.png


BIN
static/mine/321.png


BIN
static/mine/322.png


BIN
static/mine/pc.png


BIN
static/mine/right.png


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/kj-tabbar/kj-tabbar.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pageC/index.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cart/cart.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/express/express.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/mine.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shopping/shopping.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-subsection/u-subsection.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js.map


+ 0 - 1
unpackage/dist/dev/mp-weixin/App.wxml

@@ -1 +0,0 @@
-<view><kj-tabbar vue-id="c31923fa-1" bind:__l="__l"></kj-tabbar></view>

+ 3 - 16
unpackage/dist/dev/mp-weixin/app.json

@@ -23,7 +23,8 @@
     {
       "root": "pageC",
       "pages": [
-        "index"
+        "index",
+        "accountBalance/accountBalance"
       ]
     },
     {
@@ -42,35 +43,21 @@
   "tabBar": {
     "color": "#333333",
     "selectedColor": "#F83224",
+    "custom": true,
     "list": [
       {
-        "iconPath": "static/express1.png",
-        "selectedIconPath": "static/express2.png",
-        "text": "跨境速递",
         "pagePath": "pages/express/express"
       },
       {
-        "iconPath": "static/index1.png",
-        "selectedIconPath": "static/index2.png",
-        "text": "商城",
         "pagePath": "pages/index/index"
       },
       {
-        "iconPath": "static/shop.png",
-        "selectedIconPath": "static/shop.png",
-        "text": "购",
         "pagePath": "pages/shopping/shopping"
       },
       {
-        "iconPath": "static/cart1.png",
-        "selectedIconPath": "static/cart2.png",
-        "text": "购物车",
         "pagePath": "pages/cart/cart"
       },
       {
-        "iconPath": "static/mine1.png",
-        "selectedIconPath": "static/mine2.png",
-        "text": "我的",
         "pagePath": "pages/mine/mine"
       }
     ]

+ 1 - 3
unpackage/dist/dev/mp-weixin/common/main.js

@@ -94,7 +94,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {
+
 
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -104,7 +104,6 @@ exports.default = void 0;
 var _default = {
   onLaunch: function onLaunch() {
     console.log('App Launch');
-    uni.hideTabBar();
   },
   onShow: function onShow() {
     console.log('App Show');
@@ -114,7 +113,6 @@ var _default = {
   }
 };
 exports.default = _default;
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
 

+ 6 - 0
unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -24,6 +24,12 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+page {
+  background-color: #f4f4f4;
+}
+.uni-bar {
+  background-color: #f4f4f4;
+}
 /*每个页面公共css */
 .u-line-1 {
   display: -webkit-box !important;

+ 2 - 2
unpackage/dist/dev/mp-weixin/common/runtime.js

@@ -105,11 +105,11 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"uview-ui/components/u-checkbox-group/u-checkbox-group":1,"uview-ui/components/u-checkbox/u-checkbox":1,"uview-ui/components/u-tabbar-item/u-tabbar-item":1,"uview-ui/components/u-tabbar/u-tabbar":1,"uview-ui/components/u-icon/u-icon":1,"uview-ui/components/u-badge/u-badge":1,"uview-ui/components/u-safe-bottom/u-safe-bottom":1};
+/******/ 		var cssChunks = {"uview-ui/components/u-navbar/u-navbar":1,"uview-ui/components/u-subsection/u-subsection":1,"pages/mine/component/mallOrderForm":1,"pages/mine/component/mineMoney":1,"pages/mine/component/personalFunction":1,"pages/mine/component/teamFunction":1,"uview-ui/components/u-checkbox-group/u-checkbox-group":1,"uview-ui/components/u-checkbox/u-checkbox":1,"uview-ui/components/u-tabbar-item/u-tabbar-item":1,"uview-ui/components/u-tabbar/u-tabbar":1,"uview-ui/components/u-icon/u-icon":1,"uview-ui/components/u-status-bar/u-status-bar":1,"uview-ui/components/u-badge/u-badge":1,"uview-ui/components/u-safe-bottom/u-safe-bottom":1};
 /******/ 		if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
 /******/ 		else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
 /******/ 			promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
-/******/ 				var href = "" + ({"components/kj-tabbar/kj-tabbar":"components/kj-tabbar/kj-tabbar","uview-ui/components/u-checkbox-group/u-checkbox-group":"uview-ui/components/u-checkbox-group/u-checkbox-group","uview-ui/components/u-checkbox/u-checkbox":"uview-ui/components/u-checkbox/u-checkbox","uview-ui/components/u-tabbar-item/u-tabbar-item":"uview-ui/components/u-tabbar-item/u-tabbar-item","uview-ui/components/u-tabbar/u-tabbar":"uview-ui/components/u-tabbar/u-tabbar","uview-ui/components/u-icon/u-icon":"uview-ui/components/u-icon/u-icon","uview-ui/components/u-badge/u-badge":"uview-ui/components/u-badge/u-badge","uview-ui/components/u-safe-bottom/u-safe-bottom":"uview-ui/components/u-safe-bottom/u-safe-bottom"}[chunkId]||chunkId) + ".wxss";
+/******/ 				var href = "" + ({"components/kj-tabbar/kj-tabbar":"components/kj-tabbar/kj-tabbar","uview-ui/components/u-navbar/u-navbar":"uview-ui/components/u-navbar/u-navbar","uview-ui/components/u-subsection/u-subsection":"uview-ui/components/u-subsection/u-subsection","pages/mine/component/mallOrderForm":"pages/mine/component/mallOrderForm","pages/mine/component/mineMoney":"pages/mine/component/mineMoney","pages/mine/component/personalFunction":"pages/mine/component/personalFunction","pages/mine/component/teamFunction":"pages/mine/component/teamFunction","uview-ui/components/u-checkbox-group/u-checkbox-group":"uview-ui/components/u-checkbox-group/u-checkbox-group","uview-ui/components/u-checkbox/u-checkbox":"uview-ui/components/u-checkbox/u-checkbox","uview-ui/components/u-tabbar-item/u-tabbar-item":"uview-ui/components/u-tabbar-item/u-tabbar-item","uview-ui/components/u-tabbar/u-tabbar":"uview-ui/components/u-tabbar/u-tabbar","uview-ui/components/u-icon/u-icon":"uview-ui/components/u-icon/u-icon","uview-ui/components/u-status-bar/u-status-bar":"uview-ui/components/u-status-bar/u-status-bar","uview-ui/components/u-badge/u-badge":"uview-ui/components/u-badge/u-badge","uview-ui/components/u-safe-bottom/u-safe-bottom":"uview-ui/components/u-safe-bottom/u-safe-bottom"}[chunkId]||chunkId) + ".wxss";
 /******/ 				var fullhref = __webpack_require__.p + href;
 /******/ 				var existingLinkTags = document.getElementsByTagName("link");
 /******/ 				for(var i = 0; i < existingLinkTags.length; i++) {

+ 404 - 148
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -19293,7 +19293,202 @@ exports.default = _default;
 /* 223 */,
 /* 224 */,
 /* 225 */,
-/* 226 */
+/* 226 */,
+/* 227 */,
+/* 228 */,
+/* 229 */,
+/* 230 */,
+/* 231 */,
+/* 232 */,
+/* 233 */,
+/* 234 */,
+/* 235 */,
+/* 236 */,
+/* 237 */,
+/* 238 */
+/*!**************************************************************************!*\
+  !*** D:/www/uniapp-project/wx-qhb/uview-ui/components/u-navbar/props.js ***!
+  \**************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  props: {
+    // 是否开启顶部安全区适配
+    safeAreaInsetTop: {
+      type: Boolean,
+      default: uni.$u.props.navbar.safeAreaInsetTop
+    },
+    // 固定在顶部时,是否生成一个等高元素,以防止塌陷
+    placeholder: {
+      type: Boolean,
+      default: uni.$u.props.navbar.placeholder
+    },
+    // 是否固定在顶部
+    fixed: {
+      type: Boolean,
+      default: uni.$u.props.navbar.fixed
+    },
+    // 是否显示下边框
+    border: {
+      type: Boolean,
+      default: uni.$u.props.navbar.border
+    },
+    // 左边的图标
+    leftIcon: {
+      type: String,
+      default: uni.$u.props.navbar.leftIcon
+    },
+    // 左边的提示文字
+    leftText: {
+      type: String,
+      default: uni.$u.props.navbar.leftText
+    },
+    // 左右的提示文字
+    rightText: {
+      type: String,
+      default: uni.$u.props.navbar.rightText
+    },
+    // 右边的图标
+    rightIcon: {
+      type: String,
+      default: uni.$u.props.navbar.rightIcon
+    },
+    // 标题
+    title: {
+      type: [String, Number],
+      default: uni.$u.props.navbar.title
+    },
+    // 背景颜色
+    bgColor: {
+      type: String,
+      default: uni.$u.props.navbar.bgColor
+    },
+    // 标题的宽度
+    titleWidth: {
+      type: [String, Number],
+      default: uni.$u.props.navbar.titleWidth
+    },
+    // 导航栏高度
+    height: {
+      type: [String, Number],
+      default: uni.$u.props.navbar.height
+    },
+    // 左侧返回图标的大小
+    leftIconSize: {
+      type: [String, Number],
+      default: uni.$u.props.navbar.leftIconSize
+    },
+    // 左侧返回图标的颜色
+    leftIconColor: {
+      type: String,
+      default: uni.$u.props.navbar.leftIconColor
+    },
+    // 点击左侧区域(返回图标),是否自动返回上一页
+    autoBack: {
+      type: Boolean,
+      default: uni.$u.props.navbar.autoBack
+    },
+    // 标题的样式,对象或字符串
+    titleStyle: {
+      type: [String, Object],
+      default: uni.$u.props.navbar.titleStyle
+    }
+  }
+};
+exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
+
+/***/ }),
+/* 239 */,
+/* 240 */,
+/* 241 */,
+/* 242 */,
+/* 243 */,
+/* 244 */,
+/* 245 */,
+/* 246 */
+/*!******************************************************************************!*\
+  !*** D:/www/uniapp-project/wx-qhb/uview-ui/components/u-subsection/props.js ***!
+  \******************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  props: {
+    // tab的数据
+    list: {
+      type: Array,
+      default: uni.$u.props.subsection.list
+    },
+    // 当前活动的tab的index
+    current: {
+      type: [String, Number],
+      default: uni.$u.props.subsection.current
+    },
+    // 激活的颜色
+    activeColor: {
+      type: String,
+      default: uni.$u.props.subsection.activeColor
+    },
+    // 未激活的颜色
+    inactiveColor: {
+      type: String,
+      default: uni.$u.props.subsection.inactiveColor
+    },
+    // 模式选择,mode=button为按钮形式,mode=subsection时为分段模式
+    mode: {
+      type: String,
+      default: uni.$u.props.subsection.mode
+    },
+    // 字体大小
+    fontSize: {
+      type: [String, Number],
+      default: uni.$u.props.subsection.fontSize
+    },
+    // 激活tab的字体是否加粗
+    bold: {
+      type: Boolean,
+      default: uni.$u.props.subsection.bold
+    },
+    // mode = button时,组件背景颜色
+    bgColor: {
+      type: String,
+      default: uni.$u.props.subsection.bgColor
+    },
+    // 从list元素对象中读取的键名
+    keyName: {
+      type: String,
+      default: uni.$u.props.subsection.keyName
+    }
+  }
+};
+exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
+
+/***/ }),
+/* 247 */,
+/* 248 */,
+/* 249 */,
+/* 250 */,
+/* 251 */,
+/* 252 */,
+/* 253 */,
+/* 254 */
 /*!**************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vuex3/dist/vuex.common.js ***!
   \**************************************************************************************/
@@ -20549,12 +20744,40 @@ module.exports = index_cjs;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../../../../webpack/buildin/global.js */ 3)))
 
 /***/ }),
-/* 227 */,
-/* 228 */,
-/* 229 */,
-/* 230 */,
-/* 231 */,
-/* 232 */
+/* 255 */,
+/* 256 */,
+/* 257 */,
+/* 258 */,
+/* 259 */,
+/* 260 */,
+/* 261 */,
+/* 262 */,
+/* 263 */,
+/* 264 */,
+/* 265 */,
+/* 266 */,
+/* 267 */,
+/* 268 */,
+/* 269 */,
+/* 270 */,
+/* 271 */,
+/* 272 */,
+/* 273 */,
+/* 274 */,
+/* 275 */,
+/* 276 */,
+/* 277 */,
+/* 278 */,
+/* 279 */,
+/* 280 */,
+/* 281 */,
+/* 282 */,
+/* 283 */,
+/* 284 */,
+/* 285 */,
+/* 286 */,
+/* 287 */,
+/* 288 */
 /*!**********************************************************************************!*\
   !*** D:/www/uniapp-project/wx-qhb/uview-ui/components/u-checkbox-group/props.js ***!
   \**********************************************************************************/
@@ -20651,14 +20874,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 233 */,
-/* 234 */,
-/* 235 */,
-/* 236 */,
-/* 237 */,
-/* 238 */,
-/* 239 */,
-/* 240 */
+/* 289 */,
+/* 290 */,
+/* 291 */,
+/* 292 */,
+/* 293 */,
+/* 294 */,
+/* 295 */,
+/* 296 */
 /*!****************************************************************************!*\
   !*** D:/www/uniapp-project/wx-qhb/uview-ui/components/u-checkbox/props.js ***!
   \****************************************************************************/
@@ -20745,86 +20968,17 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 241 */,
-/* 242 */,
-/* 243 */,
-/* 244 */,
-/* 245 */,
-/* 246 */,
-/* 247 */,
-/* 248 */
-/*!**************************************************************************!*\
-  !*** D:/www/uniapp-project/wx-qhb/uview-ui/components/u-tabbar/props.js ***!
-  \**************************************************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _default = {
-  props: {
-    // 当前匹配项的name
-    value: {
-      type: [String, Number, null],
-      default: uni.$u.props.tabbar.value
-    },
-    // 是否为iPhoneX留出底部安全距离
-    safeAreaInsetBottom: {
-      type: Boolean,
-      default: uni.$u.props.tabbar.safeAreaInsetBottom
-    },
-    // 是否显示上方边框
-    border: {
-      type: Boolean,
-      default: uni.$u.props.tabbar.border
-    },
-    // 元素层级z-index
-    zIndex: {
-      type: [String, Number],
-      default: uni.$u.props.tabbar.zIndex
-    },
-    // 选中标签的颜色
-    activeColor: {
-      type: String,
-      default: uni.$u.props.tabbar.activeColor
-    },
-    // 未选中标签的颜色
-    inactiveColor: {
-      type: String,
-      default: uni.$u.props.tabbar.inactiveColor
-    },
-    // 是否固定在底部
-    fixed: {
-      type: Boolean,
-      default: uni.$u.props.tabbar.fixed
-    },
-    // fixed定位固定在底部时,是否生成一个等高元素防止塌陷
-    placeholder: {
-      type: Boolean,
-      default: uni.$u.props.tabbar.placeholder
-    }
-  }
-};
-exports.default = _default;
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
-
-/***/ }),
-/* 249 */,
-/* 250 */,
-/* 251 */,
-/* 252 */,
-/* 253 */,
-/* 254 */,
-/* 255 */,
-/* 256 */
-/*!*******************************************************************************!*\
-  !*** D:/www/uniapp-project/wx-qhb/uview-ui/components/u-tabbar-item/props.js ***!
-  \*******************************************************************************/
+/* 297 */,
+/* 298 */,
+/* 299 */,
+/* 300 */,
+/* 301 */,
+/* 302 */,
+/* 303 */,
+/* 304 */
+/*!******************************************************************************!*\
+  !*** D:/www/uniapp-project/wx-qhb/uview-ui/components/u-status-bar/props.js ***!
+  \******************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -20837,35 +20991,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _default = {
   props: {
-    // item标签的名称,作为与u-tabbar的value参数匹配的标识符
-    name: {
-      type: [String, Number, null],
-      default: uni.$u.props.tabbarItem.name
-    },
-    // uView内置图标或者绝对路径的图片
-    icon: {
-      icon: String,
-      default: uni.$u.props.tabbarItem.icon
-    },
-    // 右上角的角标提示信息
-    badge: {
-      type: [String, Number, null],
-      default: uni.$u.props.tabbarItem.badge
-    },
-    // 是否显示圆点,将会覆盖badge参数
-    dot: {
-      type: Boolean,
-      default: uni.$u.props.tabbarItem.dot
-    },
-    // 描述文本
-    text: {
+    bgColor: {
       type: String,
-      default: uni.$u.props.tabbarItem.text
-    },
-    // 控制徽标的位置,对象或者字符串形式,可以设置top和right属性
-    badgeStyle: {
-      type: [Object, String],
-      default: uni.$u.props.tabbarItem.badgeStyle
+      default: uni.$u.props.statusBar.bgColor
     }
   }
 };
@@ -20873,14 +21001,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 257 */,
-/* 258 */,
-/* 259 */,
-/* 260 */,
-/* 261 */,
-/* 262 */,
-/* 263 */,
-/* 264 */
+/* 305 */,
+/* 306 */,
+/* 307 */,
+/* 308 */,
+/* 309 */,
+/* 310 */,
+/* 311 */,
+/* 312 */
 /*!************************************************************************!*\
   !*** D:/www/uniapp-project/wx-qhb/uview-ui/components/u-icon/icons.js ***!
   \************************************************************************/
@@ -21111,7 +21239,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 265 */
+/* 313 */
 /*!************************************************************************!*\
   !*** D:/www/uniapp-project/wx-qhb/uview-ui/components/u-icon/props.js ***!
   \************************************************************************/
@@ -21218,14 +21346,142 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 266 */,
-/* 267 */,
-/* 268 */,
-/* 269 */,
-/* 270 */,
-/* 271 */,
-/* 272 */,
-/* 273 */
+/* 314 */,
+/* 315 */,
+/* 316 */,
+/* 317 */,
+/* 318 */,
+/* 319 */,
+/* 320 */,
+/* 321 */
+/*!**************************************************************************!*\
+  !*** D:/www/uniapp-project/wx-qhb/uview-ui/components/u-tabbar/props.js ***!
+  \**************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  props: {
+    // 当前匹配项的name
+    value: {
+      type: [String, Number, null],
+      default: uni.$u.props.tabbar.value
+    },
+    // 是否为iPhoneX留出底部安全距离
+    safeAreaInsetBottom: {
+      type: Boolean,
+      default: uni.$u.props.tabbar.safeAreaInsetBottom
+    },
+    // 是否显示上方边框
+    border: {
+      type: Boolean,
+      default: uni.$u.props.tabbar.border
+    },
+    // 元素层级z-index
+    zIndex: {
+      type: [String, Number],
+      default: uni.$u.props.tabbar.zIndex
+    },
+    // 选中标签的颜色
+    activeColor: {
+      type: String,
+      default: uni.$u.props.tabbar.activeColor
+    },
+    // 未选中标签的颜色
+    inactiveColor: {
+      type: String,
+      default: uni.$u.props.tabbar.inactiveColor
+    },
+    // 是否固定在底部
+    fixed: {
+      type: Boolean,
+      default: uni.$u.props.tabbar.fixed
+    },
+    // fixed定位固定在底部时,是否生成一个等高元素防止塌陷
+    placeholder: {
+      type: Boolean,
+      default: uni.$u.props.tabbar.placeholder
+    }
+  }
+};
+exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
+
+/***/ }),
+/* 322 */,
+/* 323 */,
+/* 324 */,
+/* 325 */,
+/* 326 */,
+/* 327 */,
+/* 328 */,
+/* 329 */
+/*!*******************************************************************************!*\
+  !*** D:/www/uniapp-project/wx-qhb/uview-ui/components/u-tabbar-item/props.js ***!
+  \*******************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  props: {
+    // item标签的名称,作为与u-tabbar的value参数匹配的标识符
+    name: {
+      type: [String, Number, null],
+      default: uni.$u.props.tabbarItem.name
+    },
+    // uView内置图标或者绝对路径的图片
+    icon: {
+      icon: String,
+      default: uni.$u.props.tabbarItem.icon
+    },
+    // 右上角的角标提示信息
+    badge: {
+      type: [String, Number, null],
+      default: uni.$u.props.tabbarItem.badge
+    },
+    // 是否显示圆点,将会覆盖badge参数
+    dot: {
+      type: Boolean,
+      default: uni.$u.props.tabbarItem.dot
+    },
+    // 描述文本
+    text: {
+      type: String,
+      default: uni.$u.props.tabbarItem.text
+    },
+    // 控制徽标的位置,对象或者字符串形式,可以设置top和right属性
+    badgeStyle: {
+      type: [Object, String],
+      default: uni.$u.props.tabbarItem.badgeStyle
+    }
+  }
+};
+exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
+
+/***/ }),
+/* 330 */,
+/* 331 */,
+/* 332 */,
+/* 333 */,
+/* 334 */,
+/* 335 */,
+/* 336 */,
+/* 337 */
 /*!*******************************************************************************!*\
   !*** D:/www/uniapp-project/wx-qhb/uview-ui/components/u-safe-bottom/props.js ***!
   \*******************************************************************************/
@@ -21245,14 +21501,14 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 274 */,
-/* 275 */,
-/* 276 */,
-/* 277 */,
-/* 278 */,
-/* 279 */,
-/* 280 */,
-/* 281 */
+/* 338 */,
+/* 339 */,
+/* 340 */,
+/* 341 */,
+/* 342 */,
+/* 343 */,
+/* 344 */,
+/* 345 */
 /*!*************************************************************************!*\
   !*** D:/www/uniapp-project/wx-qhb/uview-ui/components/u-badge/props.js ***!
   \*************************************************************************/

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 4 - 4
unpackage/dist/dev/mp-weixin/components/kj-tabbar/kj-tabbar.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 6 - 6
unpackage/dist/dev/mp-weixin/pageA/index.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 6 - 6
unpackage/dist/dev/mp-weixin/pageB/index.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 6 - 6
unpackage/dist/dev/mp-weixin/pageC/index.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 6 - 6
unpackage/dist/dev/mp-weixin/pageD/index.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 6 - 6
unpackage/dist/dev/mp-weixin/pages/cart/cart.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/cart/cart.wxml

@@ -1 +1 @@
-<view>购物车<kj-tabbar vue-id="1775f8c0-1" bind:__l="__l"></kj-tabbar></view>
+<view><kj-tabbar vue-id="1775f8c0-1" value1="{{3}}" bind:__l="__l"></kj-tabbar></view>

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 6 - 6
unpackage/dist/dev/mp-weixin/pages/express/express.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/express/express.wxml

@@ -1 +1 @@
-<view>快递<kj-tabbar vue-id="5bfb8bc4-1" bind:__l="__l"></kj-tabbar></view>
+<view><kj-tabbar vue-id="5bfb8bc4-1" value1="{{0}}" bind:__l="__l"></kj-tabbar></view>

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 45 - 4
unpackage/dist/dev/mp-weixin/pages/index/index.js


+ 4 - 1
unpackage/dist/dev/mp-weixin/pages/index/index.json

@@ -1,6 +1,9 @@
 {
-  "navigationBarTitleText": "跨境物流",
+  "navigationBarTitleText": "商城",
+  "navigationStyle": "custom",
   "usingComponents": {
+    "u-navbar": "/uview-ui/components/u-navbar/u-navbar",
+    "u-subsection": "/uview-ui/components/u-subsection/u-subsection",
     "kj-tabbar": "/components/kj-tabbar/kj-tabbar"
   }
 }

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/index/index.wxml

@@ -1 +1 @@
-<view>商城<kj-tabbar vue-id="8dd740cc-1" bind:__l="__l"></kj-tabbar></view>
+<view><view style="position:relative;"><image style="width:750rpx;height:780rpx;position:absolute;top:-20rpx;z-index:-1;" src="../../static/images/index/back.png" mode></image><u-navbar style="position:absolute;z-index:110;background-color:rgba(0,0,0,0);" vue-id="8dd740cc-1" safeAreaInsetTop="{{true}}" bind:__l="__l" vue-slots="{{['left','center']}}"><view class="u-nav-slot" style="display:flex;" slot="left"><image style="width:40rpx;height:40rpx;" src="../../static/images/index/xiaoxi.png" mode></image><image style="width:40rpx;height:40rpx;margin-left:22rpx;" src="../../static/images/index/compile.png" mode></image><image style="width:40rpx;height:40rpx;margin-left:22rpx;" src="../../static/images/index/dianhua.png" mode></image></view><view class="u-nav-slot" style="display:flex;" slot="center"><u-subsection vue-id="{{('8dd740cc-2')+','+('8dd740cc-1')}}" activeColor="#F83224" inactiveColor="#222" list="{{list}}" current="{{1}}" bind:__l="__l"></u-subsection></view></u-navbar></view><kj-tabbar vue-id="8dd740cc-3" value1="{{1}}" bind:__l="__l"></kj-tabbar></view>

+ 8 - 0
unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -0,0 +1,8 @@
+
+ .u-navbar__content.data-v-1194bf80 {
+	background-color: rgba(0, 0, 0, 0) !important;
+}
+ .u-status-bar.data-v-13f16680 {
+	background-color: rgba(0, 0, 0, 0) !important;
+}
+

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 7 - 7
unpackage/dist/dev/mp-weixin/pages/login/login.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 10 - 8
unpackage/dist/dev/mp-weixin/pages/mine/mine.js


+ 5 - 1
unpackage/dist/dev/mp-weixin/pages/mine/mine.json

@@ -2,6 +2,10 @@
   "navigationBarTitleText": "",
   "enablePullDownRefresh": false,
   "usingComponents": {
-    "kj-tabbar": "/components/kj-tabbar/kj-tabbar"
+    "kj-tabbar": "/components/kj-tabbar/kj-tabbar",
+    "mine-money": "/pages/mine/component/mineMoney",
+    "mall-order-form": "/pages/mine/component/mallOrderForm",
+    "team-function": "/pages/mine/component/teamFunction",
+    "personal-function": "/pages/mine/component/personalFunction"
   }
 }

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/mine/mine.wxml

@@ -1 +1 @@
-<view>我的<kj-tabbar vue-id="bae1c640-1" bind:__l="__l"></kj-tabbar></view>
+<view class="mine"><view class="mine-top"><image class="header-img" src="https://c-ssl.dtstatic.com/uploads/blog/202201/23/20220123222213_2899a.thumb.1000_0.jpeg" alt></image><view class="user-info"><view class="name">姓名:张三</view><text class="user-id">ID:123455</text></view><view class="user-home">主页<text class="home-right"></text></view></view><mine-money vue-id="bae1c640-1" isTeam="{{isTeam}}" bind:__l="__l"></mine-money><mall-order-form vue-id="bae1c640-2" bind:__l="__l"></mall-order-form><block wx:if="{{isTeam}}"><team-function vue-id="bae1c640-3" bind:__l="__l"></team-function></block><block wx:else><personal-function vue-id="bae1c640-4" bind:__l="__l"></personal-function></block><kj-tabbar vue-id="bae1c640-5" value1="{{4}}" bind:__l="__l"></kj-tabbar></view>

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 6 - 6
unpackage/dist/dev/mp-weixin/pages/shopping/shopping.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/shopping/shopping.wxml

@@ -1 +1 @@
-<view>十元购<kj-tabbar vue-id="791d8640-1" bind:__l="__l"></kj-tabbar></view>
+<view><kj-tabbar vue-id="791d8640-1" value1="{{2}}" bind:__l="__l"></kj-tabbar></view>

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

@@ -1,7 +0,0 @@
-{
-  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "wx",
-  "setting": {
-    "compileHotReLoad": true
-  }
-}

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 5 - 5
unpackage/dist/dev/mp-weixin/uview-ui/components/u-badge/u-badge.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 5 - 5
unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 5 - 5
unpackage/dist/dev/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 5 - 5
unpackage/dist/dev/mp-weixin/uview-ui/components/u-icon/u-icon.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 52 - 0
unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.js


+ 7 - 0
unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.json

@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "u-status-bar": "/uview-ui/components/u-status-bar/u-status-bar",
+    "u-icon": "/uview-ui/components/u-icon/u-icon"
+  }
+}

+ 1 - 0
unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.wxml

@@ -0,0 +1 @@
+<view class="u-navbar data-v-1194bf80"><block wx:if="{{fixed&&placeholder}}"><view class="u-navbar__placeholder data-v-1194bf80" style="{{'height:'+($root.g0)+';'}}"></view></block><view class="{{['data-v-1194bf80',fixed&&'u-navbar--fixed']}}"><block wx:if="{{safeAreaInsetTop}}"><u-status-bar vue-id="21022e74-1" bgColor="{{bgColor}}" class="data-v-1194bf80" bind:__l="__l"></u-status-bar></block><view class="{{['u-navbar__content','data-v-1194bf80',border&&'u-border-bottom']}}" style="{{'height:'+($root.g1)+';'+('background-color:'+(bgColor)+';')}}"><view class="u-navbar__content__left data-v-1194bf80" hover-class="u-navbar__content__left--hover" hover-start-time="150" data-event-opts="{{[['tap',[['leftClick',['$event']]]]]}}" bindtap="__e"><block wx:if="{{$slots.left}}"><slot name="left"></slot></block><block wx:else><block wx:if="{{leftIcon}}"><u-icon vue-id="21022e74-2" name="{{leftIcon}}" size="{{leftIconSize}}" color="{{leftIconColor}}" class="data-v-1194bf80" bind:__l="__l"></u-icon></block><block wx:if="{{leftText}}"><text class="u-navbar__content__left__text data-v-1194bf80" style="{{'color:'+(leftIconColor)+';'}}">{{leftText}}</text></block></block></view><block wx:if="{{$slots.center}}"><slot name="center"></slot></block><block wx:else><text class="u-line-1 u-navbar__content__title data-v-1194bf80" style="{{$root.s0}}">{{title}}</text></block><block wx:if="{{$slots.right||rightIcon||rightText}}"><view data-event-opts="{{[['tap',[['rightClick',['$event']]]]]}}" class="u-navbar__content__right data-v-1194bf80" bindtap="__e"><block wx:if="{{$slots.right}}"><slot name="right"></slot></block><block wx:else><block wx:if="{{rightIcon}}"><u-icon vue-id="21022e74-3" name="{{rightIcon}}" size="20" class="data-v-1194bf80" bind:__l="__l"></u-icon></block><block wx:if="{{rightText}}"><text class="u-navbar__content__right__text data-v-1194bf80">{{rightText}}</text></block></block></view></block></view></view></view>

+ 83 - 0
unpackage/dist/dev/mp-weixin/uview-ui/components/u-navbar/u-navbar.wxss

@@ -0,0 +1,83 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+view.data-v-1194bf80, scroll-view.data-v-1194bf80, swiper-item.data-v-1194bf80 {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-navbar--fixed.data-v-1194bf80 {
+  position: fixed;
+  left: 0;
+  right: 0;
+  top: 0;
+  z-index: 11;
+}
+.u-navbar__content.data-v-1194bf80 {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  height: 44px;
+  background-color: #9acafc;
+  position: relative;
+  justify-content: center;
+}
+.u-navbar__content__left.data-v-1194bf80, .u-navbar__content__right.data-v-1194bf80 {
+  padding: 0 13px;
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+.u-navbar__content__left.data-v-1194bf80 {
+  left: 0;
+}
+.u-navbar__content__left--hover.data-v-1194bf80 {
+  opacity: 0.7;
+}
+.u-navbar__content__left__text.data-v-1194bf80 {
+  font-size: 15px;
+  margin-left: 3px;
+}
+.u-navbar__content__title.data-v-1194bf80 {
+  text-align: center;
+  font-size: 16px;
+  color: #303133;
+}
+.u-navbar__content__right.data-v-1194bf80 {
+  right: 0;
+}
+.u-navbar__content__right__text.data-v-1194bf80 {
+  font-size: 15px;
+  margin-left: 3px;
+}
+

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 5 - 5
unpackage/dist/dev/mp-weixin/uview-ui/components/u-safe-bottom/u-safe-bottom.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 52 - 0
unpackage/dist/dev/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.js


+ 4 - 0
unpackage/dist/dev/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.json

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

+ 1 - 0
unpackage/dist/dev/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.wxml

@@ -0,0 +1 @@
+<view class="u-status-bar data-v-13f16680" style="{{$root.s0}}"><slot></slot></view>

+ 30 - 0
unpackage/dist/dev/mp-weixin/uview-ui/components/u-status-bar/u-status-bar.wxss

@@ -0,0 +1,30 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.u-status-bar.data-v-13f16680 {
+  width: 100%;
+}
+

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 52 - 0
unpackage/dist/dev/mp-weixin/uview-ui/components/u-subsection/u-subsection.js


+ 4 - 0
unpackage/dist/dev/mp-weixin/uview-ui/components/u-subsection/u-subsection.json

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

+ 1 - 0
unpackage/dist/dev/mp-weixin/uview-ui/components/u-subsection/u-subsection.wxml

@@ -0,0 +1 @@
+<view data-ref="u-subsection" class="{{['u-subsection','data-v-b14d3440','vue-ref','u-subsection--'+mode]}}" style="{{$root.s0}}"><view data-ref="u-subsection__bar" class="{{['u-subsection__bar','data-v-b14d3440','vue-ref',mode==='button'&&'u-subsection--button__bar',current===0&&mode==='subsection'&&'u-subsection__bar--first',$root.g0,$root.g1]}}" style="{{$root.s1}}"></view><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-ref="{{'u-subsection__item--'+index}}" data-event-opts="{{[['tap',[['clickHandler',[index]]]]]}}" class="{{['u-subsection__item','data-v-b14d3440','vue-ref-in-for','u-subsection__item--'+index,item.g2,index===0&&'u-subsection__item--first',item.g3]}}" style="{{item.s2}}" bindtap="__e"><text class="u-subsection__item__text data-v-b14d3440" style="{{item.s3}}">{{item.m0}}</text></view></block></view>

+ 112 - 0
unpackage/dist/dev/mp-weixin/uview-ui/components/u-subsection/u-subsection.wxss

@@ -0,0 +1,112 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+view.data-v-b14d3440, scroll-view.data-v-b14d3440, swiper-item.data-v-b14d3440 {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-subsection.data-v-b14d3440 {
+  display: flex;
+  flex-direction: row;
+  position: relative;
+  overflow: hidden;
+  width: 100%;
+  box-sizing: border-box;
+}
+.u-subsection--button.data-v-b14d3440 {
+  height: 32px;
+  background-color: #eeeeef;
+  padding: 3px;
+  border-radius: 3px;
+  align-items: stretch;
+}
+.u-subsection--button__bar.data-v-b14d3440 {
+  background-color: #ffffff;
+  border-radius: 3px !important;
+}
+.u-subsection--subsection.data-v-b14d3440 {
+  height: 30px;
+}
+.u-subsection__bar.data-v-b14d3440 {
+  position: absolute;
+  transition-property: color, -webkit-transform;
+  transition-property: transform, color;
+  transition-property: transform, color, -webkit-transform;
+  transition-duration: 0.3s;
+  transition-timing-function: ease-in-out;
+}
+.u-subsection__bar--first.data-v-b14d3440 {
+  border-top-left-radius: 3px;
+  border-bottom-left-radius: 3px;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+.u-subsection__bar--center.data-v-b14d3440 {
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+.u-subsection__bar--last.data-v-b14d3440 {
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
+}
+.u-subsection__item.data-v-b14d3440 {
+  display: flex;
+  flex-direction: row;
+  flex: 1;
+  justify-content: center;
+  align-items: center;
+  position: relative;
+}
+.u-subsection__item--no-border-right.data-v-b14d3440 {
+  border-right-width: 0 !important;
+}
+.u-subsection__item--first.data-v-b14d3440 {
+  border-top-left-radius: 3px;
+  border-bottom-left-radius: 3px;
+}
+.u-subsection__item--last.data-v-b14d3440 {
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
+}
+.u-subsection__item__text.data-v-b14d3440 {
+  font-size: 12px;
+  line-height: 12px;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  transition-property: color;
+  transition-duration: 0.3s;
+}
+

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 5 - 5
unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar-item/u-tabbar-item.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 5 - 5
unpackage/dist/dev/mp-weixin/uview-ui/components/u-tabbar/u-tabbar.js


برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است