Bläddra i källkod

修改我的页面

zs 1 år sedan
förälder
incheckning
afb8ede5c5
23 ändrade filer med 2217 tillägg och 1295 borttagningar
  1. 50 24
      common/css/font-icon.css
  2. 7 11
      config.js
  3. 137 123
      pages/home/index.vue
  4. 189 5
      pages/my/index.vue
  5. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  6. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  7. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  8. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map
  9. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map
  10. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map
  11. 1096 1077
      unpackage/dist/dev/mp-weixin/common/main.wxss
  12. 2 2
      unpackage/dist/dev/mp-weixin/common/runtime.js
  13. 7 11
      unpackage/dist/dev/mp-weixin/common/vendor.js
  14. 1 1
      unpackage/dist/dev/mp-weixin/pages/home/index.wxml
  15. 27 18
      unpackage/dist/dev/mp-weixin/pages/home/index.wxss
  16. 189 14
      unpackage/dist/dev/mp-weixin/pages/my/index.js
  17. 3 1
      unpackage/dist/dev/mp-weixin/pages/my/index.json
  18. 1 1
      unpackage/dist/dev/mp-weixin/pages/my/index.wxml
  19. 97 2
      unpackage/dist/dev/mp-weixin/pages/my/index.wxss
  20. 322 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js
  21. 4 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.json
  22. 1 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.wxml
  23. 78 0
      unpackage/dist/dev/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.wxss

+ 50 - 24
common/css/font-icon.css

@@ -1,24 +1,50 @@
-@font-face {
-	font-family: "iconfont";
-	/* Project id 4241853 */
-	src: url('//at.alicdn.com/t/c/font_4241853_ioosv15fx9t.woff2?t=1694155992349') format('woff2'),
-		url('//at.alicdn.com/t/c/font_4241853_ioosv15fx9t.woff?t=1694155992349') format('woff'),
-		url('//at.alicdn.com/t/c/font_4241853_ioosv15fx9t.ttf?t=1694155992349') format('truetype');
-}
-
-.iconfont {
-	font-family: "iconfont" !important;
-	font-size: 16px;
-	font-style: normal;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-}
-
-.icon-aixin:before {
-	content: "\e83f";
-}
-
-.icon-aixin1:before {
-	content: "\e60f";
-	color: red;
-}
+@font-face {
+  font-family: "iconfont"; /* Project id 4241853 */
+  src: url('//at.alicdn.com/t/c/font_4241853_gtrudh8zn99.woff2?t=1694160999420') format('woff2'),
+       url('//at.alicdn.com/t/c/font_4241853_gtrudh8zn99.woff?t=1694160999420') format('woff'),
+       url('//at.alicdn.com/t/c/font_4241853_gtrudh8zn99.ttf?t=1694160999420') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-weibiaoti2fuzhi04:before {
+  content: "\e621";
+}
+
+.icon-shouhou:before {
+  content: "\e624";
+}
+
+.icon-daipingjia:before {
+  content: "\e63d";
+}
+
+.icon-daishiyong:before {
+  content: "\e611";
+}
+
+.icon-dayuhao:before {
+  content: "\e625";
+}
+
+.icon-icon_set_up:before {
+  content: "\e612";
+}
+
+.icon-yonghu:before {
+  content: "\e69f";
+}
+
+.icon-aixin:before {
+  content: "\e83f";
+}
+
+.icon-aixin1:before {
+  content: "\e60f";
+}

+ 7 - 11
config.js

@@ -15,31 +15,27 @@ export default {
 	system: system,
 	share: {},
 	orderList: [{
-			icon: "icon-shenpi",
+			icon: "icon-weibiaoti2fuzhi04",
 			title: "待付款",
 			status: "0",
-			type: "order",
 			route: "pagesMy/order/index",
 		},
 		{
-			icon: "icon-31daifahuo",
+			icon: "icon-daishiyong",
 			title: "待使用",
-			status: "4",
-			type: "order",
+			status: "1",
 			route: "pagesMy/order/index",
 		},
 		{
-			icon: "icon-daishouhuo",
+			icon: "icon-daipingjia",
 			title: "待评价",
-			status: "5",
-			type: "order",
+			status: "2",
 			route: "pagesMy/order/index",
 		},
 		{
-			icon: "icon-transaction",
+			icon: "icon-shouhou",
 			title: "退款/售后",
-			status: "6",
-			type: "order",
+			status: "5",
 			route: "pagesMy/order/index",
 		}
 	],

+ 137 - 123
pages/home/index.vue

@@ -9,56 +9,60 @@
 				</swiper-item>
 			</swiper>
 		</view>
-		<view class="two">
-			<swiper class="swiper" circular :indicator-dots="true" indicator-color="#F5F5F5"
-				indicator-active-color="#007AFF" :autoplay="false">
-				<swiper-item class="swiper-item" v-for="(item,index) in moduleList" :key="index">
-					<view class="list" v-for="(as,indexs) in item" :key="indexs" @tap="toChange(as)">
-						<image class="image" :src="as.url&&as.url.length>0?as.url[0].url:''" mode="aspectFill">
-						</image>
-						<text class="text">{{ as.name }}</text>
-					</view>
-				</swiper-item>
-			</swiper>
-		</view>
-		<view class="thr">
-			<uni-notice-bar speed='50' showGetMore='true' moreText='更多' @getmore="toMore" show-icon scrollable
-				:text="content" />
-		</view>
-		<view class="four">
-			<tabs :tabs="tabs" @tabsChange="tabsChange">
-				<view class="tabsList">
-					<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
-						<view class="list-scroll-view">
-							<!-- 瀑布流布局列表 -->
-							<view class="pubuBox">
-								<view class="pubuItem">
-									<view class="list" v-for="(item, index) in list" :key="index" @tap="toInfo(item)">
-										<image :src="item.file&&item.file.length>0?item.file[0].url:''" mode="widthFix">
-										</image>
-										<view class="title"> <!-- 这是没有高度的父盒子(下半部分) -->
-											<view class="title_1">{{ item.title }}</view>
-											<view class="title_2">
-												<view class="left">
-													{{item.contact_name||'暂无昵称'}}
-												</view>
-												<view class="right" @tap.stop="toLike(item)">
-													<text v-if="item.is_like" class="iconfont icon-aixin1"></text>
-													<text else class="iconfont icon-aixin"></text>
-													{{item.like_num||'0'}}
+		<view class="bottom">
+			<view class="two">
+				<swiper class="swiper" circular :indicator-dots="true" indicator-color="#F5F5F5"
+					indicator-active-color="#007AFF" :autoplay="false">
+					<swiper-item class="swiper-item" v-for="(item,index) in moduleList" :key="index">
+						<view class="list" v-for="(as,indexs) in item" :key="indexs" @tap="toChange(as)">
+							<image class="image" :src="as.url&&as.url.length>0?as.url[0].url:''" mode="aspectFill">
+							</image>
+							<text class="text">{{ as.name }}</text>
+						</view>
+					</swiper-item>
+				</swiper>
+			</view>
+			<view class="thr">
+				<uni-notice-bar speed='50' showGetMore='true' moreText='更多' @getmore="toMore" show-icon scrollable
+					:text="content" />
+			</view>
+			<view class="four">
+				<tabs :tabs="tabs" @tabsChange="tabsChange">
+					<view class="tabsList">
+						<scroll-view scroll-y="true" class="scroll-view" @scrolltolower="toPage" @scroll="toScroll">
+							<view class="list-scroll-view">
+								<!-- 瀑布流布局列表 -->
+								<view class="pubuBox">
+									<view class="pubuItem">
+										<view class="list" v-for="(item, index) in list" :key="index"
+											@tap="toInfo(item)">
+											<image :src="item.file&&item.file.length>0?item.file[0].url:''"
+												mode="widthFix">
+											</image>
+											<view class="title"> <!-- 这是没有高度的父盒子(下半部分) -->
+												<view class="title_1">{{ item.title }}</view>
+												<view class="title_2">
+													<view class="left">
+														{{item.contact_name||'暂无昵称'}}
+													</view>
+													<view class="right" @tap.stop="toLike(item)">
+														<text v-if="item.is_like" class="iconfont icon-aixin1"></text>
+														<text else class="iconfont icon-aixin"></text>
+														{{item.like_num||'0'}}
+													</view>
 												</view>
 											</view>
 										</view>
 									</view>
 								</view>
+								<view class="is_bottom" v-if="is_bottom">
+									<text>{{config.bottom_title}}</text>
+								</view>
 							</view>
-							<view class="is_bottom" v-if="is_bottom">
-								<text>{{config.bottom_title}}</text>
-							</view>
-						</view>
-					</scroll-view>
-				</view>
-			</tabs>
+						</scroll-view>
+					</view>
+				</tabs>
+			</view>
 		</view>
 	</view>
 </template>
@@ -242,7 +246,7 @@
 			padding: 0 0 2vw 0;
 
 			.swiper {
-				height: 65vw;
+				height: 70vw;
 
 				.list {
 					.image {
@@ -253,107 +257,117 @@
 			}
 		}
 
-		.two {
+		.bottom {
+			position: absolute;
+			top: 65vw;
+			left: 0;
+			right: 0;
+			background-color: var(--mainColor);
+			border-radius: 20px;
+			padding: 2vw 0 0 0;
 
-			.swiper {
-				height: 50vw;
+			.two {
 
-				.swiper-item {
-					display: flex;
-					flex-direction: column;
-					flex-wrap: wrap;
+				.swiper {
+					height: 50vw;
 
-					.list {
+					.swiper-item {
 						display: flex;
 						flex-direction: column;
-						justify-content: space-between;
-						align-items: center;
-						width: 20vw;
-						padding: 1vw 0 0 0;
+						flex-wrap: wrap;
 
-						.image {
-							width: 15vw;
-							height: 15vw;
-							border-radius: 15vw;
-							box-shadow: 0 0 5px var(--f1Color);
-						}
+						.list {
+							display: flex;
+							flex-direction: column;
+							justify-content: space-between;
+							align-items: center;
+							width: 20vw;
+							padding: 1vw 0 0 0;
 
-						.text {
-							font-size: var(--font14Size);
-							margin-top: 5px;
-							color: var(--f85Color);
+							.image {
+								width: 15vw;
+								height: 15vw;
+								border-radius: 15vw;
+								box-shadow: 0 0 5px var(--f1Color);
+							}
+
+							.text {
+								font-size: var(--font14Size);
+								margin-top: 5px;
+								color: var(--f85Color);
+							}
 						}
 					}
 				}
 			}
-		}
 
-		.thr {
-			padding: 0 2vw;
-		}
-
-		.four {
-			background-color: var(--footColor);
-
-			.tabsList {
-				position: relative;
-				width: 100vw;
-				height: 80vh;
+			.thr {
+				padding: 0 2vw;
+			}
 
-				.pubuBox {
-					padding: 2vw;
-				}
+			.four {
+				background-color: var(--footColor);
 
-				.pubuItem {
-					column-count: 2;
-					column-gap: 2vw;
-				}
+				.tabsList {
+					position: relative;
+					width: 100vw;
+					height: 80vh;
 
-				.list {
-					box-sizing: border-box;
-					border-radius: 2vw;
-					overflow: hidden;
-					background-color: var(--mainColor);
-					break-inside: avoid;
-					/*避免在元素内部插入分页符*/
-					box-sizing: border-box;
-					margin-bottom: 2vw;
-				}
-
-				.list image {
-					width: 100%;
-				}
+					.pubuBox {
+						padding: 2vw;
+					}
 
-				.title {
-					padding: 2vw;
+					.pubuItem {
+						column-count: 2;
+						column-gap: 2vw;
+					}
 
-					.title_1 {
-						font-size: var(--font14Size);
-						line-height: 4vw;
-						text-overflow: -o-ellipsis-lastline;
+					.list {
+						box-sizing: border-box;
+						border-radius: 2vw;
 						overflow: hidden;
-						text-overflow: ellipsis;
-						display: -webkit-box;
-						-webkit-line-clamp: 2;
-						line-clamp: 2;
-						-webkit-box-orient: vertical;
-						min-height: 6vw;
-						max-height: 20vw;
+						background-color: var(--mainColor);
+						break-inside: avoid;
+						/*避免在元素内部插入分页符*/
+						box-sizing: border-box;
+						margin-bottom: 2vw;
 					}
 
-					.title_2 {
-						display: flex;
-						justify-content: space-between;
-						font-size: var(--font12Size);
-						color: var(--f69Color);
-						padding: 1vw 0;
+					.list image {
+						width: 100%;
+					}
+
+					.title {
+						padding: 2vw;
 
-						.right {
+						.title_1 {
+							font-size: var(--font14Size);
+							line-height: 4vw;
+							text-overflow: -o-ellipsis-lastline;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							display: -webkit-box;
+							-webkit-line-clamp: 2;
+							line-clamp: 2;
+							-webkit-box-orient: vertical;
+							min-height: 6vw;
+							max-height: 20vw;
+						}
+
+						.title_2 {
 							display: flex;
-							align-items: center;
+							justify-content: space-between;
+							font-size: var(--font12Size);
+							color: var(--f69Color);
+							padding: 1vw 0;
+
+							.right {
+								display: flex;
+								align-items: center;
 
-							text:first-child {
-								padding: 0 1vw 0 0;
+								text:first-child {
+									padding: 0 1vw 0 0;
+								}
 							}
 						}
 					}

+ 189 - 5
pages/my/index.vue

@@ -1,20 +1,204 @@
 <template>
 	<view class="main">
-		我的
+		<view class="one">
+			<view v-if="user._id" class="one_1">
+				<view class="left">
+					<image class="image" :src="user.icon&&item.icon.length>0?item.icon[0].url:'../../static/my.png'"
+						mode="widthFix"></image>
+					<text>{{user.nick_name||'微信用户'}}</text>
+				</view>
+				<view class="right">
+					<text class="text"><text class="iconfont icon-icon_set_up"></text>编辑资料</text>
+				</view>
+			</view>
+			<view v-else class="one_1">
+				<view class="left">
+					<text class="iconfont icon-yonghu"></text>
+					<text>登录/注册</text>
+				</view>
+				<view class="right"></view>
+			</view>
+		</view>
+		<view class="bottom">
+			<view class="two">
+				<view class="two_1">
+					<view class="left">我的订单</view>
+					<view class="right" @tap="toCommon(`pagesMy/order/index`)">查看全部订单 <text
+							class="iconfont icon-dayuhao"></text></view>
+				</view>
+				<view class="two_2">
+					<view class="list" v-for="(item,index) in orderList" :key="index" @tap="toRoute(item)">
+						<uni-badge :text="item.num" absolute="rightTop" size="normal">
+							<view class="icon">
+								<text class="iconfont" :class="[item.icon]"></text>
+							</view>
+							<text class="title">{{item.title}}</text>
+						</uni-badge>
+					</view>
+				</view>
+			</view>
+			<view class="thr">111111111</view>
+		</view>
 	</view>
 </template>
 
 <script>
 	export default {
 		data() {
-			return {}
+			return {
+				user: {},
+				// 订单图标菜单
+				orderList: []
+			}
+		},
+		onLoad: async function() {
+			const that = this;
+			that.searchToken();
+			await that.searchOther();
+			await that.search();
+		},
+		onShow: async function(e) {
+			const that = this;
 		},
 		methods: {
-
+			searchToken() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) that.$set(that, `user`, res);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			// 查询
+			async search() {
+				const that = this;
+			},
+			async searchOther() {
+				const that = this;
+				let config = that.$config;
+				that.$set(that, `orderList`, config.orderList);
+			}
 		}
 	}
 </script>
 
-<style>
-	.main {}
+<style lang="scss">
+	.main {
+		display: flex;
+		flex-direction: column;
+		width: 100vw;
+		height: 100vh;
+		background-color: var(--footColor);
+
+		.one {
+			background-image: linear-gradient(181.2deg, #FEFEFE 10.5%, #87CEFA 86.8%);
+			height: 40vw;
+
+			.one_1 {
+				padding: 5vw;
+
+				.left {
+					display: flex;
+					align-items: center;
+					font-size: var(--font20Szie);
+
+					.image {
+						width: 15vw;
+						height: 15vw;
+						border-radius: 15vw;
+					}
+
+					.iconfont {
+						font-size: 40px;
+						color: var(--f85Color);
+						padding: 2vw;
+					}
+				}
+
+				.right {
+					display: flex;
+					align-items: center;
+					justify-content: flex-end;
+					font-size: var(--font12Szie);
+
+					.text {
+						border: 1px solid var(--f85Color);
+						border-radius: 15px;
+						padding: 1vw 2vw;
+						box-shadow: 3px 3px 10px var(--f85Color);
+
+						text:first-child {
+							padding: 0 1vw 0 0;
+						}
+					}
+				}
+			}
+		}
+
+		.bottom {
+			position: fixed;
+			top: 30vw;
+			left: 0;
+			right: 0;
+
+			.two {
+				display: flex;
+				flex-direction: column;
+				padding: 2vw;
+				margin: 2vw 0;
+				border-radius: 20px;
+				background-color: var(--mainColor);
+
+				.two_1 {
+					display: flex;
+					justify-content: space-between;
+					padding: 2vw;
+					border-bottom: 1px solid var(--f9Color);
+
+					.left {
+						font-weight: 600;
+						font-size: var(--font14Size);
+					}
+
+					.right {
+						display: flex;
+						align-items: center;
+						font-size: var(--font12Size);
+						color: var(--f99Color);
+					}
+				}
+
+				.two_2 {
+					display: flex;
+					justify-content: space-between;
+					padding: 3vw 4vw;
+
+					.list {
+						display: flex;
+						flex-direction: column;
+						align-items: center;
+						justify-content: center;
+						text-align: center;
+
+						.icon {
+							.iconfont {
+								font-size: 25px;
+							}
+						}
+
+						.title {
+							display: inline-block;
+							margin: 1vw 0 0 0;
+							font-size: var(--font12Size);
+						}
+					}
+				}
+			}
+		}
+	}
 </style>

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1096 - 1077
unpackage/dist/dev/mp-weixin/common/main.wxss


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

@@ -105,11 +105,11 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"components/tabs/index":1,"uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar":1,"uni_modules/uni-icons/components/uni-icons/uni-icons":1};
+/******/ 		var cssChunks = {"components/tabs/index":1,"uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar":1,"uni_modules/uni-badge/components/uni-badge/uni-badge":1,"uni_modules/uni-icons/components/uni-icons/uni-icons":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/tabs/index":"components/tabs/index","uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar":"uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar","uni_modules/uni-icons/components/uni-icons/uni-icons":"uni_modules/uni-icons/components/uni-icons/uni-icons"}[chunkId]||chunkId) + ".wxss";
+/******/ 				var href = "" + ({"components/tabs/index":"components/tabs/index","uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar":"uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar","uni_modules/uni-badge/components/uni-badge/uni-badge":"uni_modules/uni-badge/components/uni-badge/uni-badge","uni_modules/uni-icons/components/uni-icons/uni-icons":"uni_modules/uni-icons/components/uni-icons/uni-icons"}[chunkId]||chunkId) + ".wxss";
 /******/ 				var fullhref = __webpack_require__.p + href;
 /******/ 				var existingLinkTags = document.getElementsByTagName("link");
 /******/ 				for(var i = 0; i < existingLinkTags.length; i++) {

+ 7 - 11
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -10184,28 +10184,24 @@ var _default = {
   system: system,
   share: {},
   orderList: [{
-    icon: "icon-shenpi",
+    icon: "icon-weibiaoti2fuzhi04",
     title: "待付款",
     status: "0",
-    type: "order",
     route: "pagesMy/order/index"
   }, {
-    icon: "icon-31daifahuo",
+    icon: "icon-daishiyong",
     title: "待使用",
-    status: "4",
-    type: "order",
+    status: "1",
     route: "pagesMy/order/index"
   }, {
-    icon: "icon-daishouhuo",
+    icon: "icon-daipingjia",
     title: "待评价",
-    status: "5",
-    type: "order",
+    status: "2",
     route: "pagesMy/order/index"
   }, {
-    icon: "icon-transaction",
+    icon: "icon-shouhou",
     title: "退款/售后",
-    status: "6",
-    type: "order",
+    status: "5",
     route: "pagesMy/order/index"
   }],
   menuList: [{

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/home/index.wxml


+ 27 - 18
unpackage/dist/dev/mp-weixin/pages/home/index.wxss

@@ -5,21 +5,30 @@
   padding: 0 0 2vw 0;
 }
 .main .one .swiper {
-  height: 65vw;
+  height: 70vw;
 }
 .main .one .swiper .list .image {
   width: 100%;
   height: 100%;
 }
-.main .two .swiper {
+.main .bottom {
+  position: absolute;
+  top: 65vw;
+  left: 0;
+  right: 0;
+  background-color: var(--mainColor);
+  border-radius: 20px;
+  padding: 2vw 0 0 0;
+}
+.main .bottom .two .swiper {
   height: 50vw;
 }
-.main .two .swiper .swiper-item {
+.main .bottom .two .swiper .swiper-item {
   display: flex;
   flex-direction: column;
   flex-wrap: wrap;
 }
-.main .two .swiper .swiper-item .list {
+.main .bottom .two .swiper .swiper-item .list {
   display: flex;
   flex-direction: column;
   justify-content: space-between;
@@ -27,38 +36,38 @@
   width: 20vw;
   padding: 1vw 0 0 0;
 }
-.main .two .swiper .swiper-item .list .image {
+.main .bottom .two .swiper .swiper-item .list .image {
   width: 15vw;
   height: 15vw;
   border-radius: 15vw;
   box-shadow: 0 0 5px var(--f1Color);
 }
-.main .two .swiper .swiper-item .list .text {
+.main .bottom .two .swiper .swiper-item .list .text {
   font-size: var(--font14Size);
   margin-top: 5px;
   color: var(--f85Color);
 }
-.main .thr {
+.main .bottom .thr {
   padding: 0 2vw;
 }
-.main .four {
+.main .bottom .four {
   background-color: var(--footColor);
 }
-.main .four .tabsList {
+.main .bottom .four .tabsList {
   position: relative;
   width: 100vw;
   height: 80vh;
 }
-.main .four .tabsList .pubuBox {
+.main .bottom .four .tabsList .pubuBox {
   padding: 2vw;
 }
-.main .four .tabsList .pubuItem {
+.main .bottom .four .tabsList .pubuItem {
   -webkit-column-count: 2;
           column-count: 2;
   -webkit-column-gap: 2vw;
           column-gap: 2vw;
 }
-.main .four .tabsList .list {
+.main .bottom .four .tabsList .list {
   box-sizing: border-box;
   border-radius: 2vw;
   overflow: hidden;
@@ -69,13 +78,13 @@
   box-sizing: border-box;
   margin-bottom: 2vw;
 }
-.main .four .tabsList .list image {
+.main .bottom .four .tabsList .list image {
   width: 100%;
 }
-.main .four .tabsList .title {
+.main .bottom .four .tabsList .title {
   padding: 2vw;
 }
-.main .four .tabsList .title .title_1 {
+.main .bottom .four .tabsList .title .title_1 {
   font-size: var(--font14Size);
   line-height: 4vw;
   text-overflow: -o-ellipsis-lastline;
@@ -88,18 +97,18 @@
   min-height: 6vw;
   max-height: 20vw;
 }
-.main .four .tabsList .title .title_2 {
+.main .bottom .four .tabsList .title .title_2 {
   display: flex;
   justify-content: space-between;
   font-size: var(--font12Size);
   color: var(--f69Color);
   padding: 1vw 0;
 }
-.main .four .tabsList .title .title_2 .right {
+.main .bottom .four .tabsList .title .title_2 .right {
   display: flex;
   align-items: center;
 }
-.main .four .tabsList .title .title_2 .right text:first-child {
+.main .bottom .four .tabsList .title .title_2 .right text:first-child {
   padding: 0 1vw 0 0;
 }
 .scroll-view {

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 189 - 14
unpackage/dist/dev/mp-weixin/pages/my/index.js


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

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "我的",
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-badge": "/uni_modules/uni-badge/components/uni-badge/uni-badge"
+  }
 }

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/my/index.wxml


+ 97 - 2
unpackage/dist/dev/mp-weixin/pages/my/index.wxss

@@ -1,3 +1,98 @@
-
-.main {}
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.main {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+  background-color: var(--footColor);
+}
+.main .one {
+  background-image: linear-gradient(181.2deg, #FEFEFE 10.5%, #87CEFA 86.8%);
+  height: 40vw;
+}
+.main .one .one_1 {
+  padding: 5vw;
+}
+.main .one .one_1 .left {
+  display: flex;
+  align-items: center;
+  font-size: var(--font20Szie);
+}
+.main .one .one_1 .left .image {
+  width: 15vw;
+  height: 15vw;
+  border-radius: 15vw;
+}
+.main .one .one_1 .left .iconfont {
+  font-size: 40px;
+  color: var(--f85Color);
+  padding: 2vw;
+}
+.main .one .one_1 .right {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  font-size: var(--font12Szie);
+}
+.main .one .one_1 .right .text {
+  border: 1px solid var(--f85Color);
+  border-radius: 15px;
+  padding: 1vw 2vw;
+  box-shadow: 3px 3px 10px var(--f85Color);
+}
+.main .one .one_1 .right .text text:first-child {
+  padding: 0 1vw 0 0;
+}
+.main .bottom {
+  position: fixed;
+  top: 30vw;
+  left: 0;
+  right: 0;
+}
+.main .bottom .two {
+  display: flex;
+  flex-direction: column;
+  padding: 2vw;
+  margin: 2vw 0;
+  border-radius: 20px;
+  background-color: var(--mainColor);
+}
+.main .bottom .two .two_1 {
+  display: flex;
+  justify-content: space-between;
+  padding: 2vw;
+  border-bottom: 1px solid var(--f9Color);
+}
+.main .bottom .two .two_1 .left {
+  font-weight: 600;
+  font-size: var(--font14Size);
+}
+.main .bottom .two .two_1 .right {
+  display: flex;
+  align-items: center;
+  font-size: var(--font12Size);
+  color: var(--f99Color);
+}
+.main .bottom .two .two_2 {
+  display: flex;
+  justify-content: space-between;
+  padding: 3vw 4vw;
+}
+.main .bottom .two .two_2 .list {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+}
+.main .bottom .two .two_2 .list .icon .iconfont {
+  font-size: 25px;
+}
+.main .bottom .two .two_2 .list .title {
+  display: inline-block;
+  margin: 1vw 0 0 0;
+  font-size: var(--font12Size);
+}
 

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 322 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js


+ 4 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.json

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

+ 1 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.wxml

@@ -0,0 +1 @@
+<view class="uni-badge--x"><slot></slot><block wx:if="{{text}}"><text data-event-opts="{{[['tap',[['onClick']]]]}}" class="{{['uni-badge',classNames]}}" style="{{$root.s0}}" bindtap="__e">{{displayValue}}</text></block></view>

+ 78 - 0
unpackage/dist/dev/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.wxss

@@ -0,0 +1,78 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.uni-badge--x {
+  display: inline-block;
+  position: relative;
+}
+.uni-badge--absolute {
+  position: absolute;
+}
+.uni-badge--small {
+  -webkit-transform: scale(0.8);
+          transform: scale(0.8);
+  -webkit-transform-origin: center center;
+          transform-origin: center center;
+}
+.uni-badge {
+  display: flex;
+  overflow: hidden;
+  box-sizing: border-box;
+  -webkit-font-feature-settings: "tnum";
+          font-feature-settings: "tnum";
+  min-width: 20px;
+  justify-content: center;
+  flex-direction: row;
+  height: 20px;
+  padding: 0 4px;
+  line-height: 18px;
+  color: #fff;
+  border-radius: 100px;
+  background-color: #8f939c;
+  background-color: transparent;
+  border: 1px solid #fff;
+  text-align: center;
+  font-family: 'Helvetica Neue', Helvetica, sans-serif;
+  font-size: 12px;
+}
+.uni-badge--info {
+  color: #fff;
+  background-color: #8f939c;
+}
+.uni-badge--primary {
+  background-color: #2979ff;
+}
+.uni-badge--success {
+  background-color: #18bc37;
+}
+.uni-badge--warning {
+  background-color: #f3a73f;
+}
+.uni-badge--error {
+  background-color: #e43d33;
+}
+.uni-badge--inverted {
+  padding: 0 5px 0 0;
+  color: #8f939c;
+}
+.uni-badge--info-inverted {
+  color: #8f939c;
+  background-color: transparent;
+}
+.uni-badge--primary-inverted {
+  color: #2979ff;
+  background-color: transparent;
+}
+.uni-badge--success-inverted {
+  color: #18bc37;
+  background-color: transparent;
+}
+.uni-badge--warning-inverted {
+  color: #f3a73f;
+  background-color: transparent;
+}
+.uni-badge--error-inverted {
+  color: #e43d33;
+  background-color: transparent;
+}
+