Tartarus 2 lat temu
rodzic
commit
9b60d936e6
100 zmienionych plików z 3100 dodań i 1566 usunięć
  1. 99 0
      pages.json
  2. 137 0
      pages/my/Kudos/Kudos.vue
  3. 216 0
      pages/my/integral/integral.vue
  4. 180 0
      pages/my/integral/integralRecord.vue
  5. 9 0
      pages/my/integral/integralRule.vue
  6. 64 11
      pages/my/my.vue
  7. 350 0
      pages/my/myorders/orders.vue
  8. 274 0
      pages/my/prize/prize.vue
  9. 11 0
      pages/my/protocol/PrivacyPolicy.vue
  10. 11 0
      pages/my/protocol/UserAgreement.vue
  11. 135 0
      pages/my/setting/setting.vue
  12. 212 0
      pages/my/verification/orderVerification.vue
  13. 275 0
      pages/my/verification/verification.vue
  14. BIN
      static/icon/Kudos(1).png
  15. BIN
      static/icon/Kudos.png
  16. BIN
      static/icon/Kudosbg.png
  17. BIN
      static/icon/data.png
  18. BIN
      static/icon/integralbg.png
  19. BIN
      static/icon/integralicon.png
  20. BIN
      static/icon/integralrecord.png
  21. BIN
      static/icon/integralrule.png
  22. BIN
      static/icon/lament.png
  23. BIN
      static/icon/scan.png
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/TabBar/tabbar.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-image/u-image.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-input/u-input.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/msg/msg.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/Kudos/Kudos.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/PersonalData/personalData.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integral.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integralRecord.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integralRule.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/my.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/myorders/orders.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/prize/prize.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/protocol/PrivacyPolicy.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/protocol/UserAgreement.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/setting/setting.js.map
  45. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/verification/orderVerification.js.map
  46. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/verification/verification.js.map
  47. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
  48. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map
  49. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map
  50. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  51. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
  52. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.js.map
  53. 12 1
      unpackage/dist/dev/mp-weixin/app.json
  54. 2 2
      unpackage/dist/dev/mp-weixin/common/main.js
  55. 2 2
      unpackage/dist/dev/mp-weixin/common/runtime.js
  56. 1016 795
      unpackage/dist/dev/mp-weixin/common/vendor.js
  57. 13 13
      unpackage/dist/dev/mp-weixin/components/TabBar/tabbar.js
  58. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--form/u--form.js
  59. 0 6
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--form/u--form.json
  60. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--form/u--form.wxml
  61. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--input/u--input.js
  62. 0 6
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--input/u--input.json
  63. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--input/u--input.wxml
  64. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-action-sheet/u-action-sheet.js
  65. 0 10
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-action-sheet/u-action-sheet.json
  66. 0 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-action-sheet/u-action-sheet.wxml
  67. 0 91
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-action-sheet/u-action-sheet.wxss
  68. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-cell-group/u-cell-group.js
  69. 0 6
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-cell-group/u-cell-group.json
  70. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-cell-group/u-cell-group.wxml
  71. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-cell/u-cell.js
  72. 0 7
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-cell/u-cell.json
  73. 0 0
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-cell/u-cell.wxml
  74. 0 117
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-cell/u-cell.wxss
  75. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-form-item/u-form-item.js
  76. 0 7
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-form-item/u-form-item.json
  77. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-form-item/u-form-item.wxml
  78. 0 101
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-form-item/u-form-item.wxss
  79. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-form/u-form.js
  80. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-form/u-form.wxml
  81. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-gap/u-gap.js
  82. 0 4
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-gap/u-gap.json
  83. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-gap/u-gap.wxml
  84. 0 36
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-gap/u-gap.wxss
  85. 14 14
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js
  86. 15 15
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-image/u-image.js
  87. 51 10
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-input/u-input.js
  88. 2 2
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-input/u-input.json
  89. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line/u-line.js
  90. 0 4
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line/u-line.json
  91. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line/u-line.wxml
  92. 0 39
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line/u-line.wxss
  93. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js
  94. 0 4
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.json
  95. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.wxml
  96. 0 193
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.wxss
  97. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.js
  98. 0 6
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.json
  99. 0 1
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.wxml
  100. 0 44
      unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.wxss

+ 99 - 0
pages.json

xqd
@@ -44,6 +44,105 @@
 		        "enablePullDownRefresh": false
 		    }
 		    
+		},
+		{
+		    "path" : "pages/my/setting/setting",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "系统设置",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+		    "path" : "pages/my/myorders/orders",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "我的订单",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+		    "path" : "pages/my/protocol/PrivacyPolicy",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "隐私协议",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+		    "path" : "pages/my/protocol/UserAgreement",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "用户协议",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+		    "path" : "pages/my/verification/verification",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "核销中心",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+		    "path" : "pages/my/verification/orderVerification",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "订单核销",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+		    "path" : "pages/my/integral/integral",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "积分",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+		    "path" : "pages/my/integral/integralRule",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "积分规则",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+		    "path" : "pages/my/integral/integralRecord",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "积分记录",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+		    "path" : "pages/my/prize/prize",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "奖品",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		},
+		{
+		    "path" : "pages/my/Kudos/Kudos",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "点赞",
+		        "enablePullDownRefresh": false
+		    }
+		    
 		}
     ],
 

+ 137 - 0
pages/my/Kudos/Kudos.vue

xqd
@@ -0,0 +1,137 @@
+<template>
+	<view class="kudos">
+		<view class="List">
+			<view class="ListItem" v-for="item in 6">
+				<image src="/static/icon/Kudosbg.png" style="width: 640rpx;height:420rpx;"></image>
+				<view class="kudosicon">
+					<image src="/static/icon/Kudos.png" v-if="false"></image>
+					<image src="/static/icon/Kudos(1).png" ></image>
+				</view>
+				<view class="nav">
+					<view class="events">
+						<text>IHG最受欢迎的酒店</text>
+					</view>
+					<view class="voteStatus">
+						<text v-if="false">未开始</text>
+						<text style="color:#FF6503 ;">投票中</text>
+					</view>
+				</view>
+				<view class="foot">
+					<image src="/static/icon/data.png"></image>
+					<text>2021-12-20 18:00 结束</text>
+				</view>
+			</view>
+		</view>
+		<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText"/>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				status: 'noMore',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '——  已经到底啦  ——'
+				},
+			}
+		},
+		methods:{
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$pageColor:#F9F9F9;
+	$bgColor:#FFFFFF;
+
+	@mixin flexlayout {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.kudos {
+		height: 100%;
+		background: $pageColor;
+	}
+
+	.List {
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		padding-top: 24rpx;
+
+		.ListItem {
+			position: relative;
+			margin-bottom: 24rpx;
+			width: 690rpx;
+			height: 562rpx;
+			background: $bgColor;
+			box-shadow: 0rpx 12rpx 40rpx 0rpx rgba(220, 222, 229, 0.4);
+			border-radius: 24rpx;
+			padding: 20rpx 26rpx 26rpx 24rpx;
+
+			.kudosicon {
+				width: 48rpx;
+				position: absolute;
+				top: 52rpx;
+				right: 58rpx;
+				border-radius: 50%;
+				height: 48rpx;
+				background: #FFFFFF;
+				opacity: 0.84;
+				@include flexlayout()
+				image{
+					width: 29rpx;
+					height: 26rpx;
+				}
+			}
+
+			.nav {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+
+				.events {
+					text {
+						font-size: 30rpx;
+						font-family: PingFang-SC-Bold, PingFang-SC;
+						font-weight: bold;
+						color: #333333;
+					}
+				}
+
+				.voteStatus {
+					font-size: 30rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #999999;
+				}
+			}
+
+			.foot {
+				margin-top: 10rpx;
+				display: flex;
+				align-items: center;
+
+				image {
+					width: 28rpx;
+					height: 28rpx;
+					margin-right: 8rpx;
+				}
+
+				text {
+					font-size: 24rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #999999;
+					display: block;
+				}
+			}
+
+		}
+	}
+</style>

+ 216 - 0
pages/my/integral/integral.vue

xqd
@@ -0,0 +1,216 @@
+<template>
+	<view class="integral">
+		<view class="nav">
+			<image src="/static/icon/integralbg.png" style="width: 100%; height: 100%;"></image>
+			<view class="PointsColumn">
+				<image src="/static/icon/integralicon.png"></image>
+				<text>1000</text>
+			</view>
+			<view class="titletext">
+				<view class="textitem" @click="gointegralRecord">
+					<image src="/static/icon/integralrecord.png"></image>
+					<text>积分记录</text>
+				</view>
+				<view class="textitem">
+					<image src="/static/icon/lament.png"></image>
+					<text>我的兑换</text>
+				</view>
+				<view class="textitem" @click="gointegralRule">
+					<image src="/static/icon/integralrule.png"></image>
+					<text>积分规则</text>
+				</view>
+			</view>
+		</view>
+		
+		<view class="shopList">
+			<view class="listTop">
+				<text>积分兑换</text>
+			</view>
+			<view class="ListContent">
+				<view class="contentItem" v-for="item in 4">
+					<image src="/static/icon/Kudosbg.png"></image>
+					<view class="itemName">中秋佳节五仁月饼,惊喜特供,限时抢购</view>
+					<view class="itemPrice">6000积分</view>
+				</view>
+			</view>
+			
+			<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText"/>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				status: 'noMore',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '——  已经到底啦  ——'
+				},
+			}
+		},
+		methods:{
+			// 跳转积分规则
+			gointegralRule(){
+				uni.navigateTo({
+					url:'/pages/my/integral/integralRule'
+				})
+			},
+			// 跳转积分记录
+			gointegralRecord(){
+				uni.navigateTo({
+					url:'/pages/my/integral/integralRecord'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$pageColor:#F9F9F9;
+	$bgColor:#FFFFFF;
+	// flex布局居中对齐
+	@mixin flexlayout {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.integral{
+		height: 100%;
+		background:$pageColor ;
+	}
+	.nav{
+		width: 750rpx;
+		height: 238rpx;
+		position: relative;
+		.PointsColumn{
+			position: absolute;
+			width: 690rpx;
+			height: 74rpx;
+			background: #FFFFFF;
+			border-radius: $bgColor;
+			left:30rpx;
+			top:32rpx;
+			display: flex;
+			align-items: center;
+			image{
+				margin-left: 30rpx;
+				width: 46rpx;
+				height: 46rpx;
+			}
+			text{
+				margin-left: 16rpx;
+				font-size: 48rpx;
+				font-family: DINAlternate-Bold, DINAlternate;
+				font-weight: bold;
+				color: #333333;
+			}
+		}
+		.titletext{
+			position: absolute;
+			bottom:40rpx;
+			left: 30rpx;
+			width: 690rpx;
+			height: 74rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.textitem{
+				display: flex;
+				align-items: center;
+				image{
+					width: 44rpx;
+					height: 44rpx;
+				}
+				text{
+					margin-left: 8rpx;
+					font-size: 30rpx;
+					font-family: PingFang-SC-Bold, PingFang-SC;
+					font-weight: bold;
+					color: $bgColor;
+				}
+			}
+		}
+	}
+	.shopList{
+		margin-top: 24rpx;
+		width: 750rpx;
+		background: $bgColor;
+		border-radius: 16rpx 16rpx 0px 0px;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		padding-top: 32rpx;
+		.listTop{
+			@include flexlayout;
+			margin-bottom: 40rpx;
+			text{
+				font-size: 36rpx;
+				font-family: PingFang-SC-Bold, PingFang-SC;
+				font-weight: bold;
+				color: #333333;
+			}
+		}
+		.ListContent{
+			display: flex;
+			flex-wrap: wrap;
+			box-sizing: border-box;
+			.contentItem:nth-child(2n+1){
+				width: 332rpx;
+				height: 578rpx;
+				margin-right: 26rpx;
+				background: $bgColor;
+				box-sizing: border-box;
+				box-shadow: 0px 4rpx 8rpx 0px rgba(0,0,0,0.04);
+				border-radius: 12rpx;
+				margin-bottom: 24rpx;
+				image{
+					width: 332rpx;
+					height: 400rpx;
+				}
+				.itemName{
+					margin:0 18rpx 20rpx 22rpx ;
+					font-size: 28rpx;
+					font-family: PingFang-SC-Bold, PingFang-SC;
+					font-weight: bold;
+					color: #333333;
+				}
+				.itemPrice{
+					margin-left: 22rpx;
+					font-size: 28rpx;
+					font-family: PingFang-SC-Bold, PingFang-SC;
+					font-weight: bold;
+					color: #FF6200;
+				}
+			}
+			.contentItem:nth-child(2n){
+				width: 332rpx;
+				height: 510rpx;
+				box-sizing: border-box;
+				background: $bgColor;
+				box-shadow: 0px 4rpx 8rpx 0px rgba(0,0,0,0.04);
+				border-radius: 12rpx;
+				image{
+					width: 332rpx;
+					height: 332rpx;
+				}
+				.itemName{
+					margin:0 18rpx 20rpx 22rpx ;
+					font-size: 28rpx;
+					font-family: PingFang-SC-Bold, PingFang-SC;
+					font-weight: bold;
+					color: #333333;
+				}
+				.itemPrice{
+					margin-left: 22rpx;
+					font-size: 28rpx;
+					font-family: PingFang-SC-Bold, PingFang-SC;
+					font-weight: bold;
+					color: #FF6200;
+				}
+			}
+			
+		}
+	}
+</style>

+ 180 - 0
pages/my/integral/integralRecord.vue

xqd
@@ -0,0 +1,180 @@
+<template>
+	<view class="integralRecord">
+		<!-- 分段器 -->
+		<view class="segmented">
+			<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="text"
+				activeColor="#DDB15B"></uni-segmented-control>
+		</view>
+		
+		<view class="List" :style="{'--height':ListHeight+'rpx'}" v-if="current == 0">
+			<view class="ListItem" v-for="item in 5">
+				<view style="display: flex; justify-content: space-between;">
+					<view class="title"><text>500积分</text> </view>
+					<view class='data'><text>2022-02-10</text></view>
+				</view>
+				<view class="content"><text>投票活动奖励</text></view>
+			</view>
+		</view>
+		<view class="List" :style="{'--height':ListHeight+'rpx'}" v-if="current == 1">
+			<view class="ListItem" v-for="item in 5">
+				<view style="display: flex; justify-content: space-between;">
+					<view class="title"><text>500积分</text> </view>
+					<view class='data'><text>2022-02-10</text></view>
+				</view>
+				<view class="content"><text>积分兑换商品</text></view>
+			</view>
+		</view>
+		
+		<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText"/>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				// 分段器
+				items: ['收入', '支出',],
+				current: 0,
+				// list高度
+				ListHeight: 800,
+				// 加载
+				status: 'noMore',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '——  已经到底啦  ——'
+				}
+			}
+		},
+		methods:{
+			onClickItem(e) {
+				if (this.current != e.currentIndex) {
+					this.current = e.currentIndex;
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$pageColor:#F9F9F9;
+	$bgColor:#FFFFFF;
+	// flex布局居中对齐
+	@mixin flexlayout {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.integralRecord{
+		height: 100%;
+		background: $pageColor;
+	}
+	.segmented{
+		height: 112rpx;
+		width: 750rpx;
+		background: $bgColor;
+		box-shadow: 0px 4rpx 8rpx 0px rgba(0,0,0,0.04);
+		border-radius: 0px 0px 16rpx 16rpx;
+	}
+	::v-deep .segmented-control__text {
+		font-size: 32rpx !important;
+		font-family: PingFang-SC-Heavy, PingFang-SC;
+		font-weight: 500 !important;
+		color: #666666 !important;
+	}
+	
+	::v-deep .segmented-control__item--text {
+		font-size: 32rpx;
+		font-family: PingFang-SC-Heavy, PingFang-SC;
+		font-weight: 800 !important;
+		padding: 10rpx 0 !important;
+		border-radius: 4rpx !important;
+		color: #D9A94D !important;
+	}
+	.List {
+		width: 750rpx;
+		height: var(--height);
+		background: $bgColor;
+		box-shadow: 0px 4rpx 24rpx -10rpx rgba(101, 95, 90, 0.3);
+		border-radius: 12rpx;
+		margin-top: 24rpx;
+		padding: 8rpx 28rpx 0 32rpx;
+		box-sizing: border-box;
+	
+		.ListItem {
+			width: 690rpx;
+			height: 160rpx;
+			border-bottom: #F0F0F0 solid 0.5rpx;
+			position: relative;
+			padding-top: 35rpx;
+			box-sizing: border-box;
+	
+			.title {
+				margin-bottom: 10rpx;
+				text {
+					font-size: 32rpx;
+					font-family: PingFang-SC-Bold, PingFang-SC;
+					font-weight: bold;
+					color: #333333;
+				}
+			}
+	
+			.data {
+				text {
+					font-size: 26rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #999999;
+				}
+			}
+			.content {
+				text {
+					font-size: 28rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #333333;
+				}
+			}
+			
+		}
+		// 消除最后一个下划线
+		.ListItem:last-child {
+			width: 690rpx;
+			height: 160rpx;
+			border-bottom: #F0F0F0 solid 0rpx;
+			position: relative;
+			padding-top: 35rpx;
+			box-sizing: border-box;
+			
+			.title {
+				margin-bottom: 10rpx;
+				text {
+					font-size: 32rpx;
+					font-family: PingFang-SC-Bold, PingFang-SC;
+					font-weight: bold;
+					color: #333333;
+				}
+			}
+			
+			.data {
+				text {
+					font-size: 26rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #999999;
+				}
+			}
+			.content {
+				text {
+					font-size: 28rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #333333;
+				}
+			}
+			
+		}
+	}
+	
+</style>

+ 9 - 0
pages/my/integral/integralRule.vue

xqd
@@ -0,0 +1,9 @@
+<template>
+	<view>积分规则</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

+ 64 - 11
pages/my/my.vue

xqd xqd xqd xqd xqd
@@ -5,11 +5,11 @@
 			<view class="user">
 				<image src="/static/icon/avatar.png" style="height: 176rpx;width: 176rpx;"></image>
 				<view class="userinfo">
-					<text class="unlogin">请点击登录</text>
-					<text class="username" v-if="islogin">用户oo1</text>
-					<text class="userId" v-if="islogin">ID23923</text>
+					<text class="unlogin" v-if="!islogin">请点击登录</text>
+					<text class="username" v-if="islogin" @click="goPersonData">用户oo1</text>
+					<text class="userId" v-if="islogin" @click="goPersonData">ID23923</text>
 				</view>
-				<image src="/static/icon/setting.png"	@click="goPersonData"
+				<image src="/static/icon/setting.png"	@click="goSetting"
 					style="width: 41rpx;height: 44rpx; position: absolute;top:0rpx;right: 24rpx;"></image>
 			</view>
 
@@ -31,25 +31,25 @@
 				<view class="nav">
 					<view class="myorder">我的订单</view>
 					<view class="more">
-						<text style="margin-right: 8rpx;">查看更多</text>
+						<text style="margin-right: 8rpx;" @click="goMyorders(0)">查看更多</text>
 						<image style="width: 12rpx ;height: 20rpx;" src="../../static/icon/right.png"></image>
 					</view>
 				</view>
 				
 				<view class="content">
-					<view class="flexbox">
+					<view class="flexbox" @click="goMyorders(1)">
 						<image style="width: 56rpx ;height: 52rpx;" src="../../static/icon/exchange.png"></image>
 						<text>待兑换</text>
 					</view>
-					<view class="flexbox">
+					<view class="flexbox" @click="goMyorders(2)">
 						<image style="width: 54rpx ;height: 52rpx;" src="../../static/icon/shipments.png"></image>
 						<text>待发货</text>
 					</view>
-					<view class="flexbox">
+					<view class="flexbox" @click="goMyorders(3)">
 						<image style="width: 56rpx ;height: 52rpx;" src="../../static/icon/Receipt.png"></image>
 						<text>待收货</text>
 					</view>
-					<view class="flexbox">
+					<view class="flexbox" @click="goMyorders(4)">
 						<image style="width: 54rpx ;height: 52rpx;" src="../../static/icon/finish.png"></image>
 						<text>已完成</text>
 					</view>
@@ -59,7 +59,7 @@
 		
 		<!-- 列表 -->
 		<view style="padding: 0 30rpx;">
-			<view class="list" v-for="item in list">
+			<view class="list" v-for="(item,index) in list" @click="goDetail(index)">
 				<view class="title">{{item.title}}</view>
 				<view class="container">{{item.content}}</view>
 				<image  src="../../static/icon/right.png"></image>
@@ -82,7 +82,7 @@
 		},
 		data() {
 			return {
-				islogin: false,
+				islogin: true,
 				list:[{
 					title:'积分',
 					content:'积分兑换奖品'
@@ -102,6 +102,59 @@
 					url:'/pages/my/PersonalData/personalData'
 				})
 			},
+			// 跳转设置页面
+			goSetting(){
+				uni.navigateTo({
+					url:'/pages/my/setting/setting'
+				})
+			},
+			// 跳转积分页
+			goDetail(index){
+				if(index==0){
+					uni.navigateTo({
+						url:'/pages/my/integral/integral'
+					})
+				}else if(index==1){
+					uni.navigateTo({
+						url:'/pages/my/prize/prize'
+					})
+				}else{
+					uni.navigateTo({
+						url:'/pages/my/Kudos/Kudos'
+					})
+				}
+			},
+			// 跳转订单页
+			goMyorders(index){
+				switch(index){
+					case 0:
+						uni.navigateTo({
+							url:'/pages/my/myorders/orders'
+						})
+						break;
+					case 1:
+						uni.navigateTo({
+							url:'/pages/my/myorders/orders?current='+1
+						})
+					break;
+					case 2:
+						uni.navigateTo({
+							url:'/pages/my/myorders/orders?current='+2
+						})
+					break;
+					case 3:
+						uni.navigateTo({
+							url:'/pages/my/myorders/orders?current='+3
+						})
+					break;
+					case 4:
+						uni.navigateTo({
+							url:'/pages/my/myorders/orders?current='+4
+						})
+					break;
+				}
+				
+			}
 		}
 	}
 </script>

+ 350 - 0
pages/my/myorders/orders.vue

xqd
@@ -0,0 +1,350 @@
+<template>
+	<view class="orders">
+		<view class="nav">
+			<!-- 搜索栏 -->
+			<view class="navbox">
+				<view class="search">
+					<u-input placeholder="搜索" border='none'>
+						<template slot="suffix" style='margin-right:40rpx;'>
+							<u-image :showLoading="true" :showError='true' src="/static/icon/search.png" width="40rpx"
+								height="32rpx"></u-image>
+						</template>
+					</u-input>
+				</view>
+			</view>
+			<!-- 分段器 -->
+			<view class="segmented">
+				<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="text"
+					activeColor="#DDB15B"></uni-segmented-control>
+			</view>
+		</view>
+		<!-- 全部 -->
+		<view v-if="current === 0">
+			<view class="card" v-for="item in 2">
+				<view class="toptitle">
+					<view>订单号:62aae0eb9c6fd622</view>
+					<view>未核销</view>
+				</view>
+				<view class="shopCard">
+					<image  src="/static/icon/Kudosbg.png"></image>
+					<view style="margin-left: 24rpx;">
+						<text class="name">端午佳节五香肉粽子,仅限前</text>
+						<text class="tag">礼盒装 2000积分</text>
+					</view>
+				</view>
+				<view class="points">
+					<text class="totalName" style="margin-right: 50rpx;">共一项</text>
+					<text class="totalName">共计:</text>
+					<text class="totalContent">2000积分</text>
+				</view>
+				<view class="btn">
+					<view class="btnitem" >
+						<text>核销码</text>
+					</view>
+					<view class="btnitem" v-if="false">
+						<text>取消</text>
+					</view>
+					<view class="btnitem" v-if="false">
+						<text>兑换</text>
+					</view>
+					<view class="btnitem" v-if="false">
+						<text>确认收货</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 待兑换 -->
+		<view v-if="current == 1">
+			<view class="card" v-for="item in 2">
+				<view class="toptitle">
+					<view>订单号:62aae0eb9c6fd622</view>
+					<view>未核销</view>
+				</view>
+				<view class="shopCard">
+					<image  src="/static/icon/Kudosbg.png"></image>
+					<view style="margin-left: 24rpx;">
+						<text class="name">端午佳节五香肉粽子,仅限前</text>
+						<text class="tag">礼盒装 2000积分</text>
+					</view>
+				</view>
+				<view class="points">
+					<text class="totalName" style="margin-right: 50rpx;">共一项</text>
+					<text class="totalName">共计:</text>
+					<text class="totalContent">2000积分</text>
+				</view>
+				<view class="btn">
+					
+					<view class="btnitem" >
+						<text>取消</text>
+					</view>
+					<view class="btnitem" >
+						<text>兑换</text>
+					</view>
+					
+				</view>
+			</view>
+		</view>
+		<!-- 待发货 -->
+		<view v-if="current ==2">
+			<view class="card" v-for="item in 2">
+				<view class="toptitle">
+					<view>订单号:62aae0eb9c6fd622</view>
+					<view>未核销</view>
+				</view>
+				<view class="shopCard">
+					<image  src="/static/icon/Kudosbg.png"></image>
+					<view style="margin-left: 24rpx;">
+						<text class="name">端午佳节五香肉粽子,仅限前</text>
+						<text class="tag">礼盒装 2000积分</text>
+					</view>
+				</view>
+				<view class="points">
+					<text class="totalName" style="margin-right: 50rpx;">共一项</text>
+					<text class="totalName">共计:</text>
+					<text class="totalContent">2000积分</text>
+				</view>
+				<view class="btn">
+					
+					<view class="btnitem" v-if="false">
+						<text>取消</text>
+					</view>
+					<view class="btnitem" v-if="false">
+						<text>兑换</text>
+					</view>
+					
+				</view>
+			</view>
+		</view>
+		<!-- 待收货 -->
+		<view v-if="current == 3">
+			<view class="card" v-for="item in 2">
+				<view class="toptitle">
+					<view>订单号:62aae0eb9c6fd622</view>
+					<view>未核销</view>
+				</view>
+				<view class="shopCard">
+					<image  src="/static/icon/Kudosbg.png"></image>
+					<view style="margin-left: 24rpx;">
+						<text class="name">端午佳节五香肉粽子,仅限前</text>
+						<text class="tag">礼盒装 2000积分</text>
+					</view>
+				</view>
+				<view class="points">
+					<text class="totalName" style="margin-right: 50rpx;">共一项</text>
+					<text class="totalName">共计:</text>
+					<text class="totalContent">2000积分</text>
+				</view>
+				<view class="btn">
+					<view class="btnitem" >
+						<text>确认收货</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 已完成 -->
+		<view v-if="current == 4">
+			<view class="card" v-for="item in 2">
+				<view class="toptitle">
+					<view>订单号:62aae0eb9c6fd622</view>
+					<view>未核销</view>
+				</view>
+				<view class="shopCard">
+					<image  src="/static/icon/Kudosbg.png"></image>
+					<view style="margin-left: 24rpx;">
+						<text class="name">端午佳节五香肉粽子,仅限前</text>
+						<text class="tag">礼盒装 2000积分</text>
+					</view>
+				</view>
+				<view class="points">
+					<text class="totalName" style="margin-right: 50rpx;">共一项</text>
+					<text class="totalName">共计:</text>
+					<text class="totalContent">2000积分</text>
+				</view>
+				<view class="btn">
+					
+				</view>
+			</view>
+		</view>
+		
+		<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText"/>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				items: ['全部', '待兑换', '待发货','待收货','已完成'],
+				current: 0,
+				status: 'noMore',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '——  已经到底啦  ——'
+				},
+			}
+		},
+		onLoad(o) {
+			if(o.current){
+				this.current=o.current
+			}
+		},
+		methods:{
+			onClickItem(e) {
+				if (this.current != e.currentIndex) {
+					this.current = e.currentIndex;
+				}
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	$pageColor:#F9F9F9;
+	$bgColor:#FFFFFF;
+	
+	// flex布局居中对齐
+	@mixin flexlayout {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.orders{
+		height: 100%;
+		background:$pageColor ;
+	}
+	::v-deep .segmented-control__text {
+		font-size: 32rpx !important;
+		font-family: PingFang-SC-Heavy, PingFang-SC;
+		font-weight: 500 !important;
+		color: #666666 !important;
+		
+	}
+	
+	::v-deep .segmented-control__item--text {
+		font-size: 32rpx !important;
+		font-family: PingFang-SC-Heavy, PingFang-SC;
+		font-weight: 800 !important;
+		padding: 10rpx 0 !important;
+		color: #D9A94D !important;
+		border-radius: 4rpx !important;
+		
+	}
+	.nav {
+		height: 216rpx;
+		width: 750rpx;
+		background: $bgColor;
+	
+		.navbox {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 0 30rpx;
+			box-sizing: border-box;
+			// 搜索
+			.search {
+				height: 124rpx;
+				width: 690px;
+				background-color: $bgColor;
+				@include flexlayout;
+			
+				::v-deep .u-input {
+					width: 690rpx !important;
+					height: 68rpx !important;
+					background: #F1F1F1;
+					border-radius: 74rpx;
+				}
+			
+				::v-deep .u-input__content__field-wrapper {
+					padding-left: 36rpx;
+				}
+			}
+		}
+	}
+	.card{
+		margin-top: 24rpx;
+		// width: 750rpx;
+		// height: 426rpx;
+		background: $bgColor;
+		border-radius: 16rpx;
+		padding:32rpx 28rpx 24rpx 28rpx;
+		box-sizing: border-box;
+		.toptitle{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 28rpx;
+			font-family: PingFang-SC-Bold, PingFang-SC;
+			font-weight: bold;
+			color: #080F18;
+		}
+		.shopCard{
+			margin-top: 28rpx;
+			width: 694rpx;
+			height: 164rpx;
+			background: #F4F5F6;
+			border-radius: 10rpx;
+			display: flex;
+			align-items: center;
+			image{
+				width: 132rpx;
+				height: 132rpx; 
+				margin-left: 16rpx;
+				display: inline-block;
+			}
+			.name{
+				font-size: 28rpx;
+				font-family: PingFangSC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #080F18;
+				display: block;
+			}
+			.tag{
+				font-size: 24rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #666666;
+			}
+		}
+		.points{
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+			margin-top: 30rpx;
+			.totalName{
+				font-size: 22rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #080F18;
+				margin-right: 10rpx;
+			}
+			.totalContent{
+				font-size: 30rpx;
+				font-family: PingFang-SC-Heavy, PingFang-SC;
+				font-weight: 800;
+				color: #080F18;
+			}
+		}
+		.btn{
+			margin-top: 15rpx;
+			display: flex;
+			justify-content: flex-end;
+			.btnitem{
+				margin-left: 16rpx;
+				width: 170rpx;
+				height: 60rpx;
+				background: #FFFFFF;
+				border-radius: 30rpx;
+				border: 2rpx solid #D0D0D0;
+				@include flexlayout()
+				text{
+					font-size: 26rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #080F18;
+				}
+			}
+		}
+		
+	}
+</style>

+ 274 - 0
pages/my/prize/prize.vue

xqd
@@ -0,0 +1,274 @@
+<template>
+	<view class="prize">
+		<!-- 分段器 -->
+		<view class="segmented">
+			<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="text"
+				activeColor="#DDB15B"></uni-segmented-control>
+		</view>
+
+		<view style="margin-bottom: 60rpx; ">
+			<view class="prizeList" :style="{'--height':ListHeight+'rpx'}" v-if="current === 0">
+				<view class="ListItem" v-for="item in 5">
+					<view class="title"><text>HUAWEI MateBook X Pro</text></view>
+					<view class='data'><text>2022-02-10</text></view>
+					<view class="alreadyBtn">
+						<text>已兑换</text>
+					</view>
+					<view class="instantBtn" v-if="false">
+						<text>立即兑换</text>
+					</view>
+				</view>
+			</view>
+			<view class="prizeList" :style="{'--height':ListHeight+'rpx'}" v-if="current === 1">
+				<view class="ListItem" v-for="item in 5">
+					<view class="title"><text>HUAWEI MateBook X Pro</text></view>
+					<view class='data'><text>2022-02-10</text></view>
+					<view class="alreadyBtn" v-if="false">
+						<text>已兑换</text>
+					</view>
+					<view class="instantBtn">
+						<text>立即兑换</text>
+					</view>
+				</view>
+			</view>
+			<view class="prizeList" :style="{'--height':ListHeight+'rpx'}" v-if="current === 2">
+				<view class="ListItem" v-for="item in 5">
+					<view style="display: flex; justify-content: space-between;">
+						<view class="title"><text>活动奖品</text> </view>
+						<view class='data'><text>2022-02-10</text></view>
+					</view>
+					<view class="content"><text>点赞“IHG最受欢迎酒店”获得奖品“xxx”</text></view>
+				</view>
+			</view>
+		</view>
+
+		<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText"/>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				items: ['实物奖品', '线下奖品', '中奖记录'],
+				current: 0,
+				ListHeight: 800,
+				status: 'noMore',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '——  已经到底啦  ——'
+				}
+			}
+		},
+		methods: {
+			onClickItem(e) {
+				if (this.current != e.currentIndex) {
+					this.current = e.currentIndex;
+				}
+			}
+		},
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	$pageColor:#F9F9F9;
+	$bgColor:#FFFFFF;
+
+	@mixin flexlayout {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.prize {
+		height: 100%;
+		background: $pageColor;
+	}
+
+	.segmented {
+		width: 100%;
+		height: 112rpx;
+		background: $bgColor;
+		box-shadow: 0px 4rpx 8rpx 0rpx rgba(0, 0, 0, 0.04);
+		border-radius: 0rpx 0rpx 16rpx 16rpx;
+		margin-bottom: 24rpx;
+	}
+
+	::v-deep .segmented-control__text {
+		font-size: 32rpx !important;
+		font-family: PingFang-SC-Heavy, PingFang-SC;
+		font-weight: 500 !important;
+	}
+
+	::v-deep .segmented-control__item--text {
+		font-size: 32rpx;
+		font-family: PingFang-SC-Heavy, PingFang-SC;
+		font-weight: 800 !important;
+		padding: 10rpx 0 !important;
+		border-radius: 4rpx !important;
+	}
+
+	.prizeList {
+		width: 750rpx;
+		height: var(--height);
+		background: $bgColor;
+		box-shadow: 0px 4rpx 24rpx -10rpx rgba(101, 95, 90, 0.3);
+		border-radius: 12rpx;
+		padding: 8rpx 28rpx 0 32rpx;
+		box-sizing: border-box;
+
+		.ListItem {
+			width: 690rpx;
+			height: 160rpx;
+			border-bottom: #F0F0F0 solid 0.5rpx;
+			position: relative;
+			padding-top: 35rpx;
+			box-sizing: border-box;
+
+			.title {
+				margin-bottom: 10rpx;
+
+				text {
+					font-size: 32rpx;
+					font-family: PingFang-SC-Bold, PingFang-SC;
+					font-weight: bold;
+					color: #333333;
+				}
+			}
+
+			.data {
+				text {
+					font-size: 26rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #999999;
+				}
+			}
+
+			.alreadyBtn {
+				position: absolute;
+				top: 50rpx;
+				right: 0rpx;
+				width: 148rpx;
+				height: 60rpx;
+				background: $bgColor;
+				border-radius: 30rpx;
+				border: 2rpx solid #D0D0D0;
+				@include flexlayout();
+
+				text {
+					font-size: 26rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #D0D0D0;
+				}
+			}
+
+			.instantBtn {
+				position: absolute;
+				top: 50rpx;
+				right: 0rpx;
+				width: 148rpx;
+				height: 60rpx;
+				background: $bgColor;
+				border-radius: 30rpx;
+				border: 2rpx solid #FF6200;
+				@include flexlayout();
+
+				text {
+					font-size: 26rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #FF6200;
+				}
+			}
+
+			.content {
+				text {
+					font-size: 28rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #333333;
+				}
+			}
+		}
+		.ListItem:last-child{
+			width: 690rpx;
+			height: 160rpx;
+			border-bottom: #F0F0F0 solid 0rpx;
+			position: relative;
+			padding-top: 35rpx;
+			box-sizing: border-box;
+		
+			.title {
+				margin-bottom: 10rpx;
+		
+				text {
+					font-size: 32rpx;
+					font-family: PingFang-SC-Bold, PingFang-SC;
+					font-weight: bold;
+					color: #333333;
+				}
+			}
+		
+			.data {
+				text {
+					font-size: 26rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #999999;
+				}
+			}
+		
+			.alreadyBtn {
+				position: absolute;
+				top: 50rpx;
+				right: 0rpx;
+				width: 148rpx;
+				height: 60rpx;
+				background: $bgColor;
+				border-radius: 30rpx;
+				border: 2rpx solid #D0D0D0;
+				@include flexlayout();
+		
+				text {
+					font-size: 26rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #D0D0D0;
+				}
+			}
+		
+			.instantBtn {
+				position: absolute;
+				top: 50rpx;
+				right: 0rpx;
+				width: 148rpx;
+				height: 60rpx;
+				background: $bgColor;
+				border-radius: 30rpx;
+				border: 2rpx solid #FF6200;
+				@include flexlayout();
+		
+				text {
+					font-size: 26rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #FF6200;
+				}
+			}
+		
+			.content {
+				text {
+					font-size: 28rpx;
+					font-family: PingFang-SC-Medium, PingFang-SC;
+					font-weight: 500;
+					color: #333333;
+				}
+			}
+		}
+	}
+</style>

+ 11 - 0
pages/my/protocol/PrivacyPolicy.vue

xqd
@@ -0,0 +1,11 @@
+<template>
+	<view>
+		隐私政策
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

+ 11 - 0
pages/my/protocol/UserAgreement.vue

xqd
@@ -0,0 +1,11 @@
+<template>
+	<view>
+		用户协议
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

+ 135 - 0
pages/my/setting/setting.vue

xqd
@@ -0,0 +1,135 @@
+<template>
+	<view class="setting">
+		<view style="height: 24rpx;"></view>
+		<!-- 列表 -->
+		<view class="cell">
+			<view class="cell_item" @click="goPrivacy">
+				<text>隐私政策</text>
+				<image src="/static/icon/right.png"></image>
+			</view>
+			<view class="cell_item" @click="goUser">
+				<text>用户协议</text>
+				<image src="/static/icon/right.png"></image>
+			</view>
+			<view class="cell_item" @click="goVerfication">
+				<text>核销中心</text>
+				<image src="/static/icon/right.png"></image>
+			</view>
+		</view>
+		<!-- 按钮 -->
+		<view class="btn">
+			<text>退出登录</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				
+			}
+		},
+		methods:{
+			// 跳转隐私政策
+			goPrivacy(){
+				uni.navigateTo({
+					url:'/pages/my/protocol/PrivacyPolicy'
+				})
+			},
+			// 跳转用户协议
+			goUser(){
+				uni.navigateTo({
+					url:'/pages/my/protocol/UserAgreement'
+				})
+			},
+			// 跳转核销中心
+			goVerfication(){
+				uni.navigateTo({
+					url:'/pages/my/verification/verification'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$pageColor:#F9F9F9;
+	$bgColor:#FFFFFF;
+	@mixin flexlayout{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.setting{
+		height: 100%;
+		background: $pageColor;
+	}
+	.cell{
+		width: 750rpx;
+		height: 336rpx;
+		border-radius: 16rpx;
+		padding:0 30rpx;
+		background:$bgColor ;
+		margin-bottom: 48rpx;
+		.cell_item{
+			box-sizing: border-box;
+			height: 110rpx;
+			width: 690rpx;
+			border-bottom:solid  2rpx #F0F0F0;
+			display: flex;
+			align-items: center;
+			position: relative;
+			text{
+				font-size: 30rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #000000;
+			}
+			image{
+				width: 12rpx ;
+				height: 20rpx;
+				position: absolute;
+				right: 0rpx;
+				top:46rpx;
+			}
+		}
+		.cell_item:nth-last-child(1){
+			box-sizing: border-box;
+			height: 110rpx;
+			width: 690rpx;
+			border-bottom:solid  0rpx #F0F0F0;
+			display: flex;
+			align-items: center;
+			position: relative;
+			text{
+				font-size: 30rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #000000;
+			}
+			image{
+				width: 12rpx ;
+				height: 20rpx;
+				position: absolute;
+				right: 0rpx;
+				top:46rpx;
+			}
+		}
+		
+	}
+	.btn{
+		width: 690rpx;
+		height: 92rpx;
+		background: $bgColor;
+		border-radius: 16rpx;
+		margin-left: 30rpx;
+		@include flexlayout()
+		text{
+			font-size: 28rpx;
+			font-family: PingFang-SC-Medium, PingFang-SC;
+			font-weight: 500;
+			color: #333333;
+		}
+	}
+</style>

+ 212 - 0
pages/my/verification/orderVerification.vue

xqd
@@ -0,0 +1,212 @@
+<template>
+	<view class="ordersVerification">
+		<view style="height: 24rpx;width: 100%;background:#F9F9F9 ;"></view>
+		<!-- 表单 -->
+		<view class="form">
+			<uni-forms ref="baseForm" :modelValue="FormData">
+				<uni-forms-item label="收货人" labelWidth="150rpx">
+					<uni-easyinput v-model="FormData.name" placeholder="请输入收货人" />
+				</uni-forms-item>
+				<uni-forms-item label="联系方式" labelWidth="150rpx">
+					<uni-easyinput v-model="FormData.contact" placeholder="请输入联系方式" />
+				</uni-forms-item>
+				<uni-forms-item label="兑换时间" labelWidth="150rpx">
+					<uni-easyinput v-model="FormData.date" placeholder="请输入兑换时间" />
+				</uni-forms-item>
+			</uni-forms>
+		</view>
+		
+		<view class="card" >
+			<view class="toptitle">
+				<view>洲际天堂大饭店</view>
+				<view>未核销</view>
+			</view>
+			<view class="shopCard">
+				<image  src="/static/icon/Kudosbg.png"></image>
+				<view style="margin-left: 24rpx;">
+					<text class="name">端午佳节五香肉粽子,仅限前</text>
+					<text class="tag">礼盒装 2000积分</text>
+				</view>
+			</view>
+			<view class="points">
+				<text class="totalName">共计:</text>
+				<text class="totalContent">2000积分</text>
+			</view>
+			<view class="btn" >
+				<text>核销</text>
+			</view>
+		</view>
+		
+		<view class="bottombtn">
+			<view class="btnitem" @click="verificationOrder">
+				<text>核销订单</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				FormData:{
+					name:'',
+					contact:'',
+					date:'',
+				},
+			}
+		},
+		methods:{
+			// 核销订单
+			verificationOrder(){
+				uni.showModal({
+					title: '提示',
+					content: '是否核销订单',
+					cancelColor:'#333333',
+					confirmColor:'#FF6200',
+					success: function (res) {
+						if (res.confirm) {
+							console.log('用户点击确定');
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$pageColor:#F9F9F9;
+	$bgColor:#FFFFFF;
+
+	// flex布局居中对齐
+	@mixin flexlayout {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.ordersVerification {
+		height: 100%;
+		background: $pageColor;
+	}
+	::v-deep .uni-forms-item.is-direction-left{
+		border-bottom: 2rpx solid #F0F0F0;
+	}
+	::v-deep .uni-forms-item.is-direction-left:last-child{
+		border-bottom: 0rpx solid #F0F0F0;
+	}
+	::v-deep .is-input-border {
+		border: none;
+	}
+	.form {
+		width: 750rpx;
+		height: 328rpx;
+		background: $bgColor;
+		border-radius: 16rpx;
+		padding:10rpx 30rpx;
+		box-sizing: border-box;
+	}
+	.card{
+		margin-top: 24rpx;
+		// width: 750rpx;
+		// height: 426rpx;
+		background: $bgColor;
+		border-radius: 16rpx;
+		padding:32rpx 28rpx 24rpx 28rpx;
+		box-sizing: border-box;
+		.toptitle{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 28rpx;
+			font-family: PingFang-SC-Bold, PingFang-SC;
+			font-weight: bold;
+			color: #080F18;
+		}
+		.shopCard{
+			margin-top: 28rpx;
+			width: 694rpx;
+			height: 164rpx;
+			background: #F4F5F6;
+			border-radius: 10rpx;
+			display: flex;
+			align-items: center;
+			image{
+				width: 132rpx;
+				height: 132rpx; 
+				margin-left: 16rpx;
+				display: inline-block;
+			}
+			.name{
+				font-size: 28rpx;
+				font-family: PingFangSC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #080F18;
+				display: block;
+			}
+			.tag{
+				font-size: 24rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #666666;
+			}
+		}
+		.points{
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+			margin-top: 30rpx;
+			.totalName{
+				font-size: 22rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #080F18;
+				margin-right: 10rpx;
+			}
+			.totalContent{
+				font-size: 30rpx;
+				font-family: PingFang-SC-Heavy, PingFang-SC;
+				font-weight: 800;
+				color: #080F18;
+			}
+		}
+		.btn{
+			width: 170rpx;
+			height: 60rpx;
+			background: #FFFFFF;
+			border-radius: 30rpx;
+			border: 2rpx solid #D0D0D0;
+			margin-left: 524rpx;
+			margin-top: 15rpx;
+			@include flexlayout()
+			text{
+				font-size: 26rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #080F18;
+			}
+		}
+	}
+	.bottombtn{
+		width: 690rpx;
+		height: 92rpx;
+		background: linear-gradient(270deg, #FF6200 0%, #FF9342 100%);	
+		border-radius: 12rpx;
+		margin-left: 30rpx;
+		position: fixed;
+		bottom: 72rpx;
+		@include flexlayout()
+		.btnitem{
+			@include flexlayout()
+			text{
+				font-size: 30rpx;
+				font-family: PingFang-SC-Bold, PingFang-SC;
+				font-weight: bold;
+				color: $bgColor;
+			}
+		}
+	}
+</style>

+ 275 - 0
pages/my/verification/verification.vue

xqd
@@ -0,0 +1,275 @@
+<template>
+	<view class="verification">
+		<view class="nav">
+			<!-- 搜索栏 -->
+			<view class="navbox">
+				<view class="search">
+					<u-input placeholder="搜索" border='none'>
+						<template slot="suffix" style='margin-right:40rpx;'>
+							<u-image :showLoading="true" :showError='true' src="/static/icon/search.png" width="40rpx"
+								height="32rpx"></u-image>
+						</template>
+					</u-input>
+				</view>
+				<view>
+					<image src="/static/icon/scan.png" style="width: 48rpx ;height: 48rpx;"></image>
+				</view>
+			</view>
+			<!-- 分段器 -->
+			<view class="segmented">
+				<uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" styleType="text"
+					activeColor="#DDB15B"></uni-segmented-control>
+			</view>
+		</view>
+		
+		<!-- 未核销列表 -->
+		<view v-if="current === 0">
+			<view class="card" v-for="item in 2">
+				<view class="toptitle">
+					<view>洲际天堂大饭店</view>
+					<view>未核销</view>
+				</view>
+				<view class="shopCard">
+					<image  src="/static/icon/Kudosbg.png"></image>
+					<view style="margin-left: 24rpx;">
+						<text class="name">端午佳节五香肉粽子,仅限前</text>
+						<text class="tag">礼盒装 2000积分</text>
+					</view>
+				</view>
+				<view class="points">
+					<text class="totalName">共计:</text>
+					<text class="totalContent">2000积分</text>
+				</view>
+				<view class="btn" @click="goOrderVF">
+					<text>核销</text>
+				</view>
+			</view>
+		</view>
+		<!-- 已核销列表 -->
+		<view v-if="current === 1">
+			<view class="card" v-for="item in 2">
+				<view class="toptitle">
+					<view>洲际天堂大饭店</view>
+					<view>未核销</view>
+				</view>
+				<view class="shopCard">
+					<image  src="/static/icon/Kudosbg.png"></image>
+					<view style="margin-left: 24rpx;">
+						<text class="name">端午佳节五香肉粽子,仅限前</text>
+						<text class="tag">礼盒装 2000积分</text>
+					</view>
+				</view>
+				<view class="points">
+					<text class="totalName">共计:</text>
+					<text class="totalContent">2000积分</text>
+				</view>
+				<view class="btn" v-if="false">
+					<text>核销</text>
+				</view>
+			</view>
+		</view>
+		<!-- 我的列表 -->
+		<view v-if="current === 2">
+			<view class="card" v-for="item in 2">
+				<view class="toptitle">
+					<view>洲际天堂大饭店</view>
+					<view>未核销</view>
+				</view>
+				<view class="shopCard">
+					<image  src="/static/icon/Kudosbg.png"></image>
+					<view style="margin-left: 24rpx;">
+						<text class="name">端午佳节五香肉粽子,仅限前</text>
+						<text class="tag">礼盒装 2000积分</text>
+					</view>
+				</view>
+				<view class="points">
+					<text class="totalName">共计:</text>
+					<text class="totalContent">2000积分</text>
+				</view>
+				<view class="btn" v-if="false">
+					<text>核销</text>
+				</view>
+			</view>
+		</view>
+		<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText"/>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				items: ['未核销', '已核销', '我的'],
+				current: 0,
+				status: 'noMore',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '——  已经到底啦  ——'
+				},
+			}
+		},
+		methods:{
+			onClickItem(e) {
+				if (this.current != e.currentIndex) {
+					this.current = e.currentIndex;
+				}
+			},
+			// 跳转核销订单
+			goOrderVF(){
+				uni.navigateTo({
+					url:'/pages/my/verification/orderVerification'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	$pageColor:#F9F9F9;
+	$bgColor:#FFFFFF;
+	
+	// flex布局居中对齐
+	@mixin flexlayout {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.verification {
+		height: 100%;
+		background: $pageColor;
+	}
+	// ::v-deep .segmented-control__item{
+	// 	justify-content: center !important;
+	// 	margin: 0 30rpx;
+	// }
+	::v-deep .segmented-control__text {
+		font-size: 32rpx !important;
+		font-family: PingFang-SC-Heavy, PingFang-SC;
+		font-weight: 500 !important;
+		color: #666666;
+		
+	}
+	
+	::v-deep .segmented-control__item--text {
+		font-size: 32rpx;
+		font-family: PingFang-SC-Heavy, PingFang-SC;
+		font-weight: 800 !important;
+		padding: 10rpx 0 !important;
+		border-radius: 4rpx !important;
+		
+	}
+	.nav {
+		height: 216rpx;
+		width: 750rpx;
+		background: $bgColor;
+
+		.navbox {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 0 30rpx;
+			box-sizing: border-box;
+			// 搜索
+			.search {
+				height: 124rpx;
+				width: 614rpx;
+				background-color: $bgColor;
+				@include flexlayout;
+			
+				::v-deep .u-input {
+					width: 690rpx !important;
+					height: 68rpx !important;
+					background: #F1F1F1;
+					border-radius: 74rpx;
+				}
+			
+				::v-deep .u-input__content__field-wrapper {
+					padding-left: 36rpx;
+				}
+			}
+		}
+	}
+	.card{
+		margin-top: 24rpx;
+		// width: 750rpx;
+		// height: 426rpx;
+		background: $bgColor;
+		border-radius: 16rpx;
+		padding:32rpx 28rpx 24rpx 28rpx;
+		box-sizing: border-box;
+		.toptitle{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 28rpx;
+			font-family: PingFang-SC-Bold, PingFang-SC;
+			font-weight: bold;
+			color: #080F18;
+		}
+		.shopCard{
+			margin-top: 28rpx;
+			width: 694rpx;
+			height: 164rpx;
+			background: #F4F5F6;
+			border-radius: 10rpx;
+			display: flex;
+			align-items: center;
+			image{
+				width: 132rpx;
+				height: 132rpx; 
+				margin-left: 16rpx;
+				display: inline-block;
+			}
+			.name{
+				font-size: 28rpx;
+				font-family: PingFangSC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #080F18;
+				display: block;
+			}
+			.tag{
+				font-size: 24rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #666666;
+			}
+		}
+		.points{
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+			margin-top: 30rpx;
+			.totalName{
+				font-size: 22rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #080F18;
+				margin-right: 10rpx;
+			}
+			.totalContent{
+				font-size: 30rpx;
+				font-family: PingFang-SC-Heavy, PingFang-SC;
+				font-weight: 800;
+				color: #080F18;
+			}
+		}
+		.btn{
+			width: 170rpx;
+			height: 60rpx;
+			background: #FFFFFF;
+			border-radius: 30rpx;
+			border: 2rpx solid #D0D0D0;
+			margin-left: 524rpx;
+			margin-top: 15rpx;
+			@include flexlayout()
+			text{
+				font-size: 26rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #080F18;
+			}
+		}
+	}
+</style>

BIN
static/icon/Kudos(1).png


BIN
static/icon/Kudos.png


BIN
static/icon/Kudosbg.png


BIN
static/icon/data.png


BIN
static/icon/integralbg.png


BIN
static/icon/integralicon.png


BIN
static/icon/integralrecord.png


BIN
static/icon/integralrule.png


BIN
static/icon/lament.png


BIN
static/icon/scan.png


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/TabBar/tabbar.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-image/u-image.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-input/u-input.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/msg/msg.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/Kudos/Kudos.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/PersonalData/personalData.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integral.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integralRecord.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/integral/integralRule.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/my.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/myorders/orders.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/prize/prize.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/protocol/PrivacyPolicy.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/protocol/UserAgreement.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/setting/setting.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/verification/orderVerification.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/verification/verification.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map


Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.js.map


+ 12 - 1
unpackage/dist/dev/mp-weixin/app.json

xqd
@@ -4,7 +4,18 @@
     "pages/map/map",
     "pages/msg/msg",
     "pages/my/my",
-    "pages/my/PersonalData/personalData"
+    "pages/my/PersonalData/personalData",
+    "pages/my/setting/setting",
+    "pages/my/myorders/orders",
+    "pages/my/protocol/PrivacyPolicy",
+    "pages/my/protocol/UserAgreement",
+    "pages/my/verification/verification",
+    "pages/my/verification/orderVerification",
+    "pages/my/integral/integral",
+    "pages/my/integral/integralRule",
+    "pages/my/integral/integralRecord",
+    "pages/my/prize/prize",
+    "pages/my/Kudos/Kudos"
   ],
   "subPackages": [],
   "window": {

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

xqd
@@ -15,8 +15,8 @@ var _App = _interopRequireDefault(__webpack_require__(/*! ./App */ 6));
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 4));
 var _uviewUi = _interopRequireDefault(__webpack_require__(/*! uview-ui */ 12));
 
-var _store = _interopRequireDefault(__webpack_require__(/*! ./store */ 246));
-var _mixin = _interopRequireDefault(__webpack_require__(/*! ./utils/mixin */ 254));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;} // @ts-ignore
+var _store = _interopRequireDefault(__webpack_require__(/*! ./store */ 136));
+var _mixin = _interopRequireDefault(__webpack_require__(/*! ./utils/mixin */ 144));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function ownKeys(object, enumerableOnly) {var keys = Object.keys(object);if (Object.getOwnPropertySymbols) {var symbols = Object.getOwnPropertySymbols(object);if (enumerableOnly) symbols = symbols.filter(function (sym) {return Object.getOwnPropertyDescriptor(object, sym).enumerable;});keys.push.apply(keys, symbols);}return keys;}function _objectSpread(target) {for (var i = 1; i < arguments.length; i++) {var source = arguments[i] != null ? arguments[i] : {};if (i % 2) {ownKeys(Object(source), true).forEach(function (key) {_defineProperty(target, key, source[key]);});} else if (Object.getOwnPropertyDescriptors) {Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));} else {ownKeys(Object(source)).forEach(function (key) {Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));});}}return target;}function _defineProperty(obj, key, value) {if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;} // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 _vue.default.prototype.$store = _store.default;
 _vue.default.use(_uviewUi.default);

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

xqd
@@ -105,11 +105,11 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"components/TabBar/tabbar":1,"node-modules/uview-ui/components/u-image/u-image":1,"node-modules/uview-ui/components/u-input/u-input":1,"uni_modules/uni-forms/components/uni-forms-item/uni-forms-item":1,"uni_modules/uni-forms/components/uni-forms/uni-forms":1,"uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput":1,"node-modules/uview-ui/components/u-icon/u-icon":1,"node-modules/uview-ui/components/u-transition/u-transition":1,"uni_modules/uni-icons/components/uni-icons/uni-icons":1};
+/******/ 		var cssChunks = {"components/TabBar/tabbar":1,"node-modules/uview-ui/components/u-image/u-image":1,"node-modules/uview-ui/components/u-input/u-input":1,"uni_modules/uni-forms/components/uni-forms-item/uni-forms-item":1,"uni_modules/uni-forms/components/uni-forms/uni-forms":1,"uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput":1,"uni_modules/uni-load-more/components/uni-load-more/uni-load-more":1,"uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control":1,"node-modules/uview-ui/components/u-icon/u-icon":1,"node-modules/uview-ui/components/u-transition/u-transition":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/TabBar/tabbar":"components/TabBar/tabbar","node-modules/uview-ui/components/u-image/u-image":"node-modules/uview-ui/components/u-image/u-image","node-modules/uview-ui/components/u-input/u-input":"node-modules/uview-ui/components/u-input/u-input","uni_modules/uni-forms/components/uni-forms-item/uni-forms-item":"uni_modules/uni-forms/components/uni-forms-item/uni-forms-item","uni_modules/uni-forms/components/uni-forms/uni-forms":"uni_modules/uni-forms/components/uni-forms/uni-forms","uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput":"uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput","node-modules/uview-ui/components/u-icon/u-icon":"node-modules/uview-ui/components/u-icon/u-icon","node-modules/uview-ui/components/u-transition/u-transition":"node-modules/uview-ui/components/u-transition/u-transition","uni_modules/uni-icons/components/uni-icons/uni-icons":"uni_modules/uni-icons/components/uni-icons/uni-icons"}[chunkId]||chunkId) + ".wxss";
+/******/ 				var href = "" + ({"components/TabBar/tabbar":"components/TabBar/tabbar","node-modules/uview-ui/components/u-image/u-image":"node-modules/uview-ui/components/u-image/u-image","node-modules/uview-ui/components/u-input/u-input":"node-modules/uview-ui/components/u-input/u-input","uni_modules/uni-forms/components/uni-forms-item/uni-forms-item":"uni_modules/uni-forms/components/uni-forms-item/uni-forms-item","uni_modules/uni-forms/components/uni-forms/uni-forms":"uni_modules/uni-forms/components/uni-forms/uni-forms","uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput":"uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput","uni_modules/uni-load-more/components/uni-load-more/uni-load-more":"uni_modules/uni-load-more/components/uni-load-more/uni-load-more","uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control":"uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control","node-modules/uview-ui/components/u-icon/u-icon":"node-modules/uview-ui/components/u-icon/u-icon","node-modules/uview-ui/components/u-transition/u-transition":"node-modules/uview-ui/components/u-transition/u-transition","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++) {

Plik diff jest za duży
+ 1016 - 795
unpackage/dist/dev/mp-weixin/common/vendor.js


Plik diff jest za duży
+ 13 - 13
unpackage/dist/dev/mp-weixin/components/TabBar/tabbar.js


+ 0 - 1
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--form/u--form.js

xqd
@@ -1 +0,0 @@
-Component({})

+ 0 - 6
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--form/u--form.json

xqd
@@ -1,6 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "uv-form": "/node-modules/uview-ui/components/u-form/u-form"
-  }
-}

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

xqd
@@ -1 +0,0 @@
-<uv-form class="vue-ref" vue-id="10afe8d9-1" model="{{model}}" rules="{{rules}}" errorType="{{errorType}}" borderBottom="{{borderBottom}}" labelPosition="{{labelPosition}}" labelWidth="{{labelWidth}}" labelAlign="{{labelAlign}}" labelStyle="{{labelStyle}}" customStyle="{{customStyle}}" data-ref="uForm" bind:__l="__l" vue-slots="{{['default']}}"><slot></slot></uv-form>

+ 0 - 1
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--input/u--input.js

xqd
@@ -1 +0,0 @@
-Component({})

+ 0 - 6
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u--input/u--input.json

xqd
@@ -1,6 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "uv-input": "/node-modules/uview-ui/components/u-input/u-input"
-  }
-}

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

xqd
@@ -1 +0,0 @@
-<uv-input vue-id="3215cba6-1" value="{{value}}" type="{{type}}" fixed="{{fixed}}" disabled="{{disabled}}" disabledColor="{{disabledColor}}" clearable="{{clearable}}" password="{{password}}" maxlength="{{maxlength}}" placeholder="{{placeholder}}" placeholderClass="{{placeholderClass}}" placeholderStyle="{{placeholderStyle}}" showWordLimit="{{showWordLimit}}" confirmType="{{confirmType}}" confirmHold="{{confirmHold}}" holdKeyboard="{{holdKeyboard}}" focus="{{focus}}" autoBlur="{{autoBlur}}" disableDefaultPadding="{{disableDefaultPadding}}" cursor="{{cursor}}" cursorSpacing="{{cursorSpacing}}" selectionStart="{{selectionStart}}" selectionEnd="{{selectionEnd}}" adjustPosition="{{adjustPosition}}" inputAlign="{{inputAlign}}" fontSize="{{fontSize}}" color="{{color}}" prefixIcon="{{prefixIcon}}" suffixIcon="{{suffixIcon}}" suffixIconStyle="{{suffixIconStyle}}" prefixIconStyle="{{prefixIconStyle}}" border="{{border}}" readonly="{{readonly}}" shape="{{shape}}" customStyle="{{customStyle}}" formatter="{{formatter}}" data-event-opts="{{[['^focus',[['$emit',['focus']]]],['^blur',[['$emit',['blur']]]],['^keyboardheightchange',[['$emit',['keyboardheightchange']]]],['^change',[['e0']]],['^input',[['e1']]],['^confirm',[['e2']]],['^clear',[['$emit',['clear']]]],['^click',[['$emit',['click']]]]]}}" bind:focus="__e" bind:blur="__e" bind:keyboardheightchange="__e" bind:change="__e" bind:input="__e" bind:confirm="__e" bind:clear="__e" bind:click="__e" bind:__l="__l" vue-slots="{{['default']}}"><slot name="prefix"></slot><slot name="suffix"></slot></uv-input>

+ 0 - 1
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-action-sheet/u-action-sheet.js

xqd
@@ -1 +0,0 @@
-Component({})

+ 0 - 10
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-action-sheet/u-action-sheet.json

xqd
@@ -1,10 +0,0 @@
-{
-  "usingComponents": {
-    "u-popup": "/node-modules/uview-ui/components/u-popup/u-popup",
-    "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon",
-    "u-line": "/node-modules/uview-ui/components/u-line/u-line",
-    "u-loading-icon": "/node-modules/uview-ui/components/u-loading-icon/u-loading-icon",
-    "u-gap": "/node-modules/uview-ui/components/u-gap/u-gap"
-  },
-  "component": true
-}

Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-action-sheet/u-action-sheet.wxml


+ 0 - 91
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-action-sheet/u-action-sheet.wxss

xqd
@@ -1,91 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-view.data-v-6766c527, scroll-view.data-v-6766c527, swiper-item.data-v-6766c527 {
-  display: flex;
-  flex-direction: column;
-  flex-shrink: 0;
-  flex-grow: 0;
-  flex-basis: auto;
-  align-items: stretch;
-  align-content: flex-start;
-}
-.u-reset-button.data-v-6766c527 {
-  width: 100%;
-}
-.u-action-sheet.data-v-6766c527 {
-  text-align: center;
-}
-.u-action-sheet__header.data-v-6766c527 {
-  position: relative;
-  padding: 12px 30px;
-}
-.u-action-sheet__header__title.data-v-6766c527 {
-  font-size: 16px;
-  color: #303133;
-  font-weight: bold;
-  text-align: center;
-}
-.u-action-sheet__header__icon-wrap.data-v-6766c527 {
-  position: absolute;
-  right: 15px;
-  top: 15px;
-}
-.u-action-sheet__description.data-v-6766c527 {
-  font-size: 13px;
-  color: #909193;
-  margin: 18px 15px;
-  text-align: center;
-}
-.u-action-sheet__item-wrap__item.data-v-6766c527 {
-  padding: 15px;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  flex-direction: column;
-}
-.u-action-sheet__item-wrap__item__name.data-v-6766c527 {
-  font-size: 16px;
-  color: #303133;
-  text-align: center;
-}
-.u-action-sheet__item-wrap__item__subname.data-v-6766c527 {
-  font-size: 13px;
-  color: #c0c4cc;
-  margin-top: 10px;
-  text-align: center;
-}
-.u-action-sheet__cancel-text.data-v-6766c527 {
-  font-size: 16px;
-  color: #606266;
-  text-align: center;
-  padding: 16px;
-}
-.u-action-sheet--hover.data-v-6766c527 {
-  background-color: #f2f3f5;
-}
-

+ 0 - 1
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-cell-group/u-cell-group.js

xqd
@@ -1 +0,0 @@
-Component({})

+ 0 - 6
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-cell-group/u-cell-group.json

xqd
@@ -1,6 +0,0 @@
-{
-  "usingComponents": {
-    "u-line": "/node-modules/uview-ui/components/u-line/u-line"
-  },
-  "component": true
-}

+ 0 - 1
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-cell-group/u-cell-group.wxml

xqd
@@ -1 +0,0 @@
-<view class="{{['u-cell-group','data-v-c4aeef32',customClass]}}" style="{{$root.s0}}"><block wx:if="{{title}}"><view class="u-cell-group__title data-v-c4aeef32"><block wx:if="{{$slots.title}}"><slot name="title"></slot></block><block wx:else><text class="u-cell-group__title__text data-v-c4aeef32">{{title}}</text></block></view></block><view class="u-cell-group__wrapper data-v-c4aeef32"><block wx:if="{{border}}"><u-line vue-id="5831f066-1" class="data-v-c4aeef32" bind:__l="__l"></u-line></block><slot></slot></view></view>

+ 0 - 1
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-cell/u-cell.js

xqd
@@ -1 +0,0 @@
-Component({})

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

xqd
@@ -1,7 +0,0 @@
-{
-  "usingComponents": {
-    "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon",
-    "u-line": "/node-modules/uview-ui/components/u-line/u-line"
-  },
-  "component": true
-}

Plik diff jest za duży
+ 0 - 0
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-cell/u-cell.wxml


+ 0 - 117
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-cell/u-cell.wxss

xqd
@@ -1,117 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-view.data-v-913eaa32, scroll-view.data-v-913eaa32, swiper-item.data-v-913eaa32 {
-  display: flex;
-  flex-direction: column;
-  flex-shrink: 0;
-  flex-grow: 0;
-  flex-basis: auto;
-  align-items: stretch;
-  align-content: flex-start;
-}
-.u-cell__body.data-v-913eaa32 {
-  display: flex;
-  flex-direction: row;
-  box-sizing: border-box;
-  padding: 10px 15px;
-  font-size: 15px;
-  color: #303133;
-  align-items: center;
-}
-.u-cell__body__content.data-v-913eaa32 {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  flex: 1;
-}
-.u-cell__body--large.data-v-913eaa32 {
-  padding-top: 13px;
-  padding-bottom: 13px;
-}
-.u-cell__left-icon-wrap.data-v-913eaa32, .u-cell__right-icon-wrap.data-v-913eaa32 {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  font-size: 16px;
-}
-.u-cell__left-icon-wrap.data-v-913eaa32 {
-  margin-right: 4px;
-}
-.u-cell__right-icon-wrap.data-v-913eaa32 {
-  margin-left: 4px;
-  transition: -webkit-transform 0.3s;
-  transition: transform 0.3s;
-  transition: transform 0.3s, -webkit-transform 0.3s;
-}
-.u-cell__right-icon-wrap--up.data-v-913eaa32 {
-  -webkit-transform: rotate(-90deg);
-          transform: rotate(-90deg);
-}
-.u-cell__right-icon-wrap--down.data-v-913eaa32 {
-  -webkit-transform: rotate(90deg);
-          transform: rotate(90deg);
-}
-.u-cell__title.data-v-913eaa32 {
-  flex: 1;
-}
-.u-cell__title-text.data-v-913eaa32 {
-  font-size: 15px;
-  line-height: 22px;
-  color: #303133;
-}
-.u-cell__title-text--large.data-v-913eaa32 {
-  font-size: 16px;
-}
-.u-cell__label.data-v-913eaa32 {
-  margin-top: 5px;
-  font-size: 12px;
-  color: #909193;
-  line-height: 18px;
-}
-.u-cell__label--large.data-v-913eaa32 {
-  font-size: 14px;
-}
-.u-cell__value.data-v-913eaa32 {
-  text-align: right;
-  font-size: 14px;
-  line-height: 24px;
-  color: #606266;
-}
-.u-cell__value--large.data-v-913eaa32 {
-  font-size: 15px;
-}
-.u-cell--clickable.data-v-913eaa32 {
-  background-color: #f3f4f6;
-}
-.u-cell--disabled.data-v-913eaa32 {
-  color: #c8c9cc;
-  cursor: not-allowed;
-}
-.u-cell--center.data-v-913eaa32 {
-  align-items: center;
-}
-

+ 0 - 1
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-form-item/u-form-item.js

xqd
@@ -1 +0,0 @@
-Component({})

+ 0 - 7
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-form-item/u-form-item.json

xqd
@@ -1,7 +0,0 @@
-{
-  "usingComponents": {
-    "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon",
-    "u-line": "/node-modules/uview-ui/components/u-line/u-line"
-  },
-  "component": true
-}

+ 0 - 1
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-form-item/u-form-item.wxml

xqd
@@ -1 +0,0 @@
-<view class="u-form-item data-v-5e7216f1"><view data-event-opts="{{[['tap',[['clickHandler',['$event']]]]]}}" class="u-form-item__body data-v-5e7216f1" style="{{$root.s0}}" bindtap="__e"><block wx:if="{{$slots.label}}"><slot name="label"></slot></block><block wx:else><block wx:if="{{required||leftIcon||label}}"><view class="u-form-item__body__left data-v-5e7216f1" style="{{'width:'+($root.g0)+';'+('margin-bottom:'+(parentData.labelPosition==='left'?0:'5px')+';')}}"><view class="u-form-item__body__left__content data-v-5e7216f1"><block wx:if="{{required}}"><text class="u-form-item__body__left__content__required data-v-5e7216f1">*</text></block><block wx:if="{{leftIcon}}"><view class="u-form-item__body__left__content__icon data-v-5e7216f1"><u-icon vue-id="18e78603-1" name="{{leftIcon}}" custom-style="{{leftIconStyle}}" class="data-v-5e7216f1" bind:__l="__l"></u-icon></view></block><text class="u-form-item__body__left__content__label data-v-5e7216f1" style="{{$root.s1}}">{{label}}</text></view></view></block></block><view class="u-form-item__body__right data-v-5e7216f1"><view class="u-form-item__body__right__content data-v-5e7216f1"><view class="u-form-item__body__right__content__slot data-v-5e7216f1"><slot></slot></view><block wx:if="{{$slots.right}}"><view class="item__body__right__content__icon data-v-5e7216f1"><slot name="right"></slot></view></block></view></view></view><block wx:if="{{$slots.error}}"><slot name="error"></slot></block><block wx:else><block wx:if="{{!!message&&parentData.errorType==='message'}}"><text class="u-form-item__body__right__message data-v-5e7216f1" style="{{'margin-left:'+($root.g1)+';'}}">{{message}}</text></block></block><block wx:if="{{borderBottom}}"><u-line vue-id="18e78603-2" color="{{message&&parentData.errorType==='border-bottom'?$u.color.error:propsLine.color}}" customStyle="{{'margin-top: '+(message&&parentData.errorType==='message'?'5px':0)}}" class="data-v-5e7216f1" bind:__l="__l"></u-line></block></view>

+ 0 - 101
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-form-item/u-form-item.wxss

xqd
@@ -1,101 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-view.data-v-5e7216f1, scroll-view.data-v-5e7216f1, swiper-item.data-v-5e7216f1 {
-  display: flex;
-  flex-direction: column;
-  flex-shrink: 0;
-  flex-grow: 0;
-  flex-basis: auto;
-  align-items: stretch;
-  align-content: flex-start;
-}
-.u-form-item.data-v-5e7216f1 {
-  display: flex;
-  flex-direction: column;
-  font-size: 14px;
-  color: #303133;
-}
-.u-form-item__body.data-v-5e7216f1 {
-  display: flex;
-  flex-direction: row;
-  padding: 10px 0;
-}
-.u-form-item__body__left.data-v-5e7216f1 {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-}
-.u-form-item__body__left__content.data-v-5e7216f1 {
-  position: relative;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  padding-right: 10rpx;
-  flex: 1;
-}
-.u-form-item__body__left__content__icon.data-v-5e7216f1 {
-  margin-right: 8rpx;
-}
-.u-form-item__body__left__content__required.data-v-5e7216f1 {
-  position: absolute;
-  left: -9px;
-  color: #f56c6c;
-  line-height: 20px;
-  font-size: 20px;
-  top: 3px;
-}
-.u-form-item__body__left__content__label.data-v-5e7216f1 {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  flex: 1;
-  color: #303133;
-  font-size: 15px;
-}
-.u-form-item__body__right.data-v-5e7216f1 {
-  flex: 1;
-}
-.u-form-item__body__right__content.data-v-5e7216f1 {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  flex: 1;
-}
-.u-form-item__body__right__content__slot.data-v-5e7216f1 {
-  flex: 1;
-}
-.u-form-item__body__right__content__icon.data-v-5e7216f1 {
-  margin-left: 10rpx;
-  color: #c0c4cc;
-  font-size: 30rpx;
-}
-.u-form-item__body__right__message.data-v-5e7216f1 {
-  font-size: 12px;
-  line-height: 12px;
-  color: #f56c6c;
-}
-

+ 0 - 1
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-form/u-form.js

xqd
@@ -1 +0,0 @@
-Component({})

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

xqd
@@ -1 +0,0 @@
-<view class="u-form data-v-ed64ceb2"><slot></slot></view>

+ 0 - 1
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-gap/u-gap.js

xqd
@@ -1 +0,0 @@
-Component({})

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

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

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

xqd
@@ -1 +0,0 @@
-<view class="u-gap data-v-f69acc36" style="{{$root.s0}}"></view>

+ 0 - 36
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-gap/u-gap.wxss

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

Plik diff jest za duży
+ 14 - 14
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-icon/u-icon.js


Plik diff jest za duży
+ 15 - 15
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-image/u-image.js


Plik diff jest za duży
+ 51 - 10
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-input/u-input.js


+ 2 - 2
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-input/u-input.json

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

+ 0 - 1
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line/u-line.js

xqd
@@ -1 +0,0 @@
-Component({})

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

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

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

xqd
@@ -1 +0,0 @@
-<view class="u-line data-v-e778bab2" style="{{$root.s0}}"></view>

+ 0 - 39
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-line/u-line.wxss

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

+ 0 - 1
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.js

xqd
@@ -1 +0,0 @@
-Component({})

+ 0 - 4
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.json

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

+ 0 - 1
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.wxml

xqd
@@ -1 +0,0 @@
-<block wx:if="{{show}}"><view class="{{['u-loading-icon','data-v-8ae91632',vertical&&'u-loading-icon--vertical']}}" style="{{$root.s0}}"><block wx:if="{{!webviewHide}}"><view data-ref="ani" class="{{['u-loading-icon__spinner','data-v-8ae91632','vue-ref','u-loading-icon__spinner--'+mode]}}" style="{{'color:'+(color)+';'+('width:'+($root.g0)+';')+('height:'+($root.g1)+';')+('border-top-color:'+(color)+';')+('border-bottom-color:'+(otherBorderColor)+';')+('border-left-color:'+(otherBorderColor)+';')+('border-right-color:'+(otherBorderColor)+';')+('animation-duration:'+(duration+'ms')+';')+('animation-timing-function:'+(mode==='semicircle'||mode==='circle'?timingFunction:'')+';')}}"><block wx:if="{{mode==='spinner'}}"><block class="data-v-8ae91632"><block wx:for="{{array12}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="u-loading-icon__dot data-v-8ae91632"></view></block></block></block></view></block><block wx:if="{{text}}"><text class="u-loading-icon__text data-v-8ae91632" style="{{'font-size:'+($root.g2)+';'+('color:'+(textColor)+';')}}">{{text}}</text></block></view></block>

+ 0 - 193
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.wxss

xqd
@@ -1,193 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-view.data-v-8ae91632, scroll-view.data-v-8ae91632, swiper-item.data-v-8ae91632 {
-  display: flex;
-  flex-direction: column;
-  flex-shrink: 0;
-  flex-grow: 0;
-  flex-basis: auto;
-  align-items: stretch;
-  align-content: flex-start;
-}
-.u-loading-icon.data-v-8ae91632 {
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  color: #c8c9cc;
-}
-.u-loading-icon__text.data-v-8ae91632 {
-  margin-left: 4px;
-  color: #606266;
-  font-size: 14px;
-  line-height: 20px;
-}
-.u-loading-icon__spinner.data-v-8ae91632 {
-  width: 30px;
-  height: 30px;
-  position: relative;
-  box-sizing: border-box;
-  max-width: 100%;
-  max-height: 100%;
-  -webkit-animation: u-rotate-data-v-8ae91632 1s linear infinite;
-          animation: u-rotate-data-v-8ae91632 1s linear infinite;
-}
-.u-loading-icon__spinner--semicircle.data-v-8ae91632 {
-  border-width: 2px;
-  border-color: transparent;
-  border-top-right-radius: 100px;
-  border-top-left-radius: 100px;
-  border-bottom-left-radius: 100px;
-  border-bottom-right-radius: 100px;
-  border-style: solid;
-}
-.u-loading-icon__spinner--circle.data-v-8ae91632 {
-  border-top-right-radius: 100px;
-  border-top-left-radius: 100px;
-  border-bottom-left-radius: 100px;
-  border-bottom-right-radius: 100px;
-  border-width: 2px;
-  border-top-color: #e5e5e5;
-  border-right-color: #e5e5e5;
-  border-bottom-color: #e5e5e5;
-  border-left-color: #e5e5e5;
-  border-style: solid;
-}
-.u-loading-icon--vertical.data-v-8ae91632 {
-  flex-direction: column;
-}
-.data-v-8ae91632:host {
-  font-size: 0px;
-  line-height: 1;
-}
-.u-loading-icon__spinner--spinner.data-v-8ae91632 {
-  -webkit-animation-timing-function: steps(12);
-          animation-timing-function: steps(12);
-}
-.u-loading-icon__text.data-v-8ae91632:empty {
-  display: none;
-}
-.u-loading-icon--vertical .u-loading-icon__text.data-v-8ae91632 {
-  margin: 6px 0 0;
-  color: #606266;
-}
-.u-loading-icon__dot.data-v-8ae91632 {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-}
-.u-loading-icon__dot.data-v-8ae91632:before {
-  display: block;
-  width: 2px;
-  height: 25%;
-  margin: 0 auto;
-  background-color: currentColor;
-  border-radius: 40%;
-  content: " ";
-}
-.u-loading-icon__dot.data-v-8ae91632:nth-of-type(1) {
-  -webkit-transform: rotate(30deg);
-          transform: rotate(30deg);
-  opacity: 1;
-}
-.u-loading-icon__dot.data-v-8ae91632:nth-of-type(2) {
-  -webkit-transform: rotate(60deg);
-          transform: rotate(60deg);
-  opacity: 0.9375;
-}
-.u-loading-icon__dot.data-v-8ae91632:nth-of-type(3) {
-  -webkit-transform: rotate(90deg);
-          transform: rotate(90deg);
-  opacity: 0.875;
-}
-.u-loading-icon__dot.data-v-8ae91632:nth-of-type(4) {
-  -webkit-transform: rotate(120deg);
-          transform: rotate(120deg);
-  opacity: 0.8125;
-}
-.u-loading-icon__dot.data-v-8ae91632:nth-of-type(5) {
-  -webkit-transform: rotate(150deg);
-          transform: rotate(150deg);
-  opacity: 0.75;
-}
-.u-loading-icon__dot.data-v-8ae91632:nth-of-type(6) {
-  -webkit-transform: rotate(180deg);
-          transform: rotate(180deg);
-  opacity: 0.6875;
-}
-.u-loading-icon__dot.data-v-8ae91632:nth-of-type(7) {
-  -webkit-transform: rotate(210deg);
-          transform: rotate(210deg);
-  opacity: 0.625;
-}
-.u-loading-icon__dot.data-v-8ae91632:nth-of-type(8) {
-  -webkit-transform: rotate(240deg);
-          transform: rotate(240deg);
-  opacity: 0.5625;
-}
-.u-loading-icon__dot.data-v-8ae91632:nth-of-type(9) {
-  -webkit-transform: rotate(270deg);
-          transform: rotate(270deg);
-  opacity: 0.5;
-}
-.u-loading-icon__dot.data-v-8ae91632:nth-of-type(10) {
-  -webkit-transform: rotate(300deg);
-          transform: rotate(300deg);
-  opacity: 0.4375;
-}
-.u-loading-icon__dot.data-v-8ae91632:nth-of-type(11) {
-  -webkit-transform: rotate(330deg);
-          transform: rotate(330deg);
-  opacity: 0.375;
-}
-.u-loading-icon__dot.data-v-8ae91632:nth-of-type(12) {
-  -webkit-transform: rotate(360deg);
-          transform: rotate(360deg);
-  opacity: 0.3125;
-}
-@-webkit-keyframes u-rotate-data-v-8ae91632 {
-0% {
-    -webkit-transform: rotate(0deg);
-            transform: rotate(0deg);
-}
-to {
-    -webkit-transform: rotate(1turn);
-            transform: rotate(1turn);
-}
-}
-@keyframes u-rotate-data-v-8ae91632 {
-0% {
-    -webkit-transform: rotate(0deg);
-            transform: rotate(0deg);
-}
-to {
-    -webkit-transform: rotate(1turn);
-            transform: rotate(1turn);
-}
-}
-

+ 0 - 1
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.js

xqd
@@ -1 +0,0 @@
-Component({})

+ 0 - 6
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.json

xqd
@@ -1,6 +0,0 @@
-{
-  "usingComponents": {
-    "u-transition": "/node-modules/uview-ui/components/u-transition/u-transition"
-  },
-  "component": true
-}

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

xqd
@@ -1 +0,0 @@
-<u-transition vue-id="255863ca-1" show="{{show}}" custom-class="u-overlay" duration="{{duration}}" custom-style="{{overlayStyle}}" data-event-opts="{{[['^click',[['clickHandler']]]]}}" bind:click="__e" class="data-v-2d8262d9" bind:__l="__l" vue-slots="{{['default']}}"><slot></slot></u-transition>

+ 0 - 44
unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.wxss

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

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików