Merge branch 'master' of http://www.sysuimars.cn:3000/feiniao/feiniao-youwei-uniapp

.gitignore

@@ -7,7 +7,16 @@
 *.user
 *.userosscache
 *.sln.docstates
+
+# 通用忽略规则
+node_modules/
+.DS_Store
+dist/
+*.log
+
+# UniApp 特定
 unpackage/
+.hbuilderx/
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

pages.json

@@ -19,7 +19,7 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "飞鸟有味",
-		"navigationBarBackgroundColor": "#ffffff",
+		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#F8F8F8"
 	},
 	"uniIdRouter": {},

pages/tabBar/mine/mine.vue

@@ -10,11 +10,42 @@
 			</view>
 			<view class="user-right">收货地址</view>
 		</view>
-		<view class="grid-">
-			
+		<view class="grid-wrap">
+			<view class="grid-item ">
+				<view class="grid-name">守护兑换</view>
+				<text class="grid-text">积累能量获大礼</text>
+				<image class="image" src="https://birdseye-img.sysuimars.com/youwei-uniapp/img/gift.png"></image>
+			</view>
+			<view class="grid-item coupon">
+				<view class="grid-name">优惠券</view>
+				<text class="grid-text">满100减50</text>
+				<image class="icon" src="https://birdseye-img.sysuimars.com/youwei-uniapp/img/coupon.png"></image>
+			</view>
 		</view>
 		<view class="list-wrap">
-			<view class="list-item"></view>
+			<view class="list-item list-card">
+				<view class="card-head">
+					<text class="name">我的订单</text>
+					<text>></text>
+				</view>
+				<view class="card-cont">
+					<view class="list-item">
+						
+					</view>
+				</view>
+			</view>
+			<view class="list-item list-card">
+				<text class="name">我的守护</text>
+				<text>></text>
+			</view>
+			<view class="list-item">
+				<text class="name">联系客服</text>
+				<text>></text>
+			</view>
+			<view class="list-item">
+				<text class="name">意见反馈</text>
+				<text>></text>
+			</view>
 		</view>
 	</view>
 </template>
@@ -25,12 +56,6 @@
 
 <style lang="scss" scoped>
 	.base-container {
-		width: 100%;
-		min-height: calc(100vh - 100rpx - 88rpx);
-		background: #f7f7f7;
-		padding: 20rpx 24rpx;
-		box-sizing: border-box;
-
 		.user-info {
 			background: #fff;
 			border-radius: 16rpx;
@@ -64,6 +89,57 @@
 				background: #FFD95E;
 				font-weight: 500;
 			}
+		}
+		.grid-wrap{
+			display: flex;
+			margin-top: 20rpx;
+			.grid-item{
+				padding: 20rpx 28rpx;
+				flex: 1;
+				border-radius: 16rpx;
+				border: 2rpx solid #FFFFFF;
+				background-image: linear-gradient(180deg,#FFECAE,#FFFFFF);
+				line-height: 42rpx;
+				position: relative;
+				&.coupon{
+					margin-left: 18rpx;
+					background-image: linear-gradient(180deg,#FFDFC5,#FFFFFF);
+				}
+				.grid-name{
+					font-family: 'PangMenZhengDao';
+				}
+				.grid-text{
+					font-size: 24rpx;
+				}
+				.image{
+					position: absolute;
+					bottom: 0;
+					right: 0;
+					width: 110rpx;
+					height: 120rpx;
+				}
+				.icon{
+					position: absolute;
+					bottom: 0;
+					right: 0;
+					width: 110rpx;
+					height: 110rpx
+				}
+			}
+		}
+		.list-wrap{
+			.list-item{
+				background: #fff;
+				border-radius: 10rpx;
+				margin-top: 20rpx;
+				padding: 26rpx 20rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				.name{
+					font-weight: 500;
+				}
+			}
 		}
 	}
 </style>

static/style/common.scss

@@ -1,12 +1,18 @@
 
 .base-container {
-	width: 100%;
-	min-height: calc(100vh - 100rpx - 88rpx);
+	width: 100%;
+	min-height: 100vh;
 	background: #f7f7f7;
 	padding: 20rpx 24rpx;
 	box-sizing: border-box;
 }
 
+/* #ifdef H5 */
+.base-container{
+	min-height: calc(100vh - 100rpx - 88rpx);
+}
+/* #endif */
+
 @font-face {
   font-family: "PangMenZhengDao";
   src: url("https://birdseye-img.sysuimars.com/youwei-uniapp/font/PangMenZhengDao.TTF");

unpackage/dist/dev/.sourcemap/mp-weixin/app.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.js","sources":["App.vue","main.js"],"sourcesContent":["<script>\r\n\texport default {\r\n\t\tonLaunch: function() {\r\n\t\t\tconsole.log('App Launch')\r\n\t\t},\r\n\t\tonShow: function() {\r\n\t\t\tconsole.log('App Show')\r\n\t\t},\r\n\t\tonHide: function() {\r\n\t\t\tconsole.log('App Hide')\r\n\t\t}\r\n\t}\r\n</script>\r\n\r\n<style lang=\"scss\">\r\n\t/*每个页面公共css */\r\n\t@import \"@/static/style/common.scss\";\r\n</style>\r\n","import App from './App'\n\n// #ifndef VUE3\nimport Vue from 'vue'\nimport './uni.promisify.adaptor'\nVue.config.productionTip = false\nApp.mpType = 'app'\nconst app = new Vue({\n  ...App\n})\napp.$mount()\n// #endif\n\n// #ifdef VUE3\nimport { createSSRApp } from 'vue'\nexport function createApp() {\n  const app = createSSRApp(App)\n  return {\n    app\n  }\n}\n// #endif"],"names":["uni","createSSRApp","App"],"mappings":";;;;;;;;;;AACC,MAAK,YAAU;AAAA,EACd,UAAU,WAAW;AACpBA,kBAAAA,MAAA,MAAA,OAAA,gBAAY,YAAY;AAAA,EACxB;AAAA,EACD,QAAQ,WAAW;AAClBA,kBAAAA,MAAY,MAAA,OAAA,gBAAA,UAAU;AAAA,EACtB;AAAA,EACD,QAAQ,WAAW;AAClBA,kBAAAA,MAAY,MAAA,OAAA,iBAAA,UAAU;AAAA,EACvB;AACD;ACIM,SAAS,YAAY;AAC1B,QAAM,MAAMC,cAAY,aAACC,SAAG;AAC5B,SAAO;AAAA,IACL;AAAA,EACD;AACH;;;"}
+{"version":3,"file":"app.js","sources":["App.vue","main.js"],"sourcesContent":["<script>\r\n\texport default {\r\n\t\tonLaunch: function() {\r\n\t\t\tconsole.log('App Launch')\r\n\t\t},\r\n\t\tonShow: function() {\r\n\t\t\tconsole.log('App Show')\r\n\t\t},\r\n\t\tonHide: function() {\r\n\t\t\tconsole.log('App Hide')\r\n\t\t}\r\n\t}\r\n</script>\r\n\r\n<style lang=\"scss\">\r\n\t/*每个页面公共css */\r\n\t@import \"@/static/style/common.scss\";\r\n</style>\r\n","import App from './App'\n\n// #ifndef VUE3\nimport Vue from 'vue'\nimport './uni.promisify.adaptor'\nVue.config.productionTip = false\nApp.mpType = 'app'\nconst app = new Vue({\n  ...App\n})\napp.$mount()\n// #endif\n\n// #ifdef VUE3\nimport { createSSRApp } from 'vue'\nexport function createApp() {\n  const app = createSSRApp(App)\n  return {\n    app\n  }\n}\n// #endif"],"names":["uni","createSSRApp","App"],"mappings":";;;;;;;;;;AACC,MAAK,YAAU;AAAA,EACd,UAAU,WAAW;AACpBA,kBAAAA,MAAA,MAAA,OAAA,gBAAY,YAAY;AAAA,EACxB;AAAA,EACD,QAAQ,WAAW;AAClBA,kBAAAA,MAAY,MAAA,OAAA,gBAAA,UAAU;AAAA,EACtB;AAAA,EACD,QAAQ,WAAW;AAClBA,kBAAAA,MAAY,MAAA,OAAA,iBAAA,UAAU;AAAA,EACvB;AACD;ACIM,SAAS,YAAY;AAC1B,QAAM,MAAMC,cAAY,aAACC,SAAG;AAC5B,SAAO;AAAA,IACL;AAAA,EACD;AACH;;;"}

unpackage/dist/dev/.sourcemap/mp-weixin/common/assets.js.map

@@ -1 +1 @@
-{"version":2,"file":"assets.js","sources":["static/logo.png"],"sourcesContent":["export default \"__VITE_ASSET__46719607__\""],"names":[],"mappings":";AAAA,MAAe,aAAA;;"}
+{"version":2,"file":"assets.js","sources":["static/logo.png"],"sourcesContent":["export default \"__VITE_ASSET__46719607__\""],"names":[],"mappings":";AAAA,MAAe,aAAA;;"}

unpackage/dist/dev/.sourcemap/mp-weixin/pages/tabBar/discover/discover.js.map

@@ -1 +1 @@
-{"version":3,"file":"discover.js","sources":["../../a-software/HBuilderX/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvdGFiQmFyL2Rpc2NvdmVyL2Rpc2NvdmVyLnZ1ZQ"],"sourcesContent":["import MiniProgramPage from 'D:/a-project/feiniao-youwei-uniapp/pages/tabBar/discover/discover.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;AACA,GAAG,WAAW,eAAe;"}
+{"version":3,"file":"discover.js","sources":["../../a-software/HBuilderX/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvdGFiQmFyL2Rpc2NvdmVyL2Rpc2NvdmVyLnZ1ZQ"],"sourcesContent":["import MiniProgramPage from 'D:/a-project/feiniao-youwei-uniapp/pages/tabBar/discover/discover.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;AACA,GAAG,WAAW,eAAe;"}

unpackage/dist/dev/.sourcemap/mp-weixin/pages/tabBar/mine/mine.js.map

@@ -1 +1 @@
-{"version":3,"file":"mine.js","sources":["../../a-software/HBuilderX/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvdGFiQmFyL21pbmUvbWluZS52dWU"],"sourcesContent":["import MiniProgramPage from 'D:/a-project/feiniao-youwei-uniapp/pages/tabBar/mine/mine.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;AACA,GAAG,WAAW,eAAe;"}
+{"version":3,"file":"mine.js","sources":["../../a-software/HBuilderX/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvdGFiQmFyL21pbmUvbWluZS52dWU"],"sourcesContent":["import MiniProgramPage from 'D:/a-project/feiniao-youwei-uniapp/pages/tabBar/mine/mine.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;AACA,GAAG,WAAW,eAAe;"}

unpackage/dist/dev/.sourcemap/mp-weixin/pages/tabBar/shopping/shopping.js.map

@@ -1 +1 @@
-{"version":3,"file":"shopping.js","sources":["../../a-software/HBuilderX/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvdGFiQmFyL3Nob3BwaW5nL3Nob3BwaW5nLnZ1ZQ"],"sourcesContent":["import MiniProgramPage from 'D:/a-project/feiniao-youwei-uniapp/pages/tabBar/shopping/shopping.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;AACA,GAAG,WAAW,eAAe;"}
+{"version":3,"file":"shopping.js","sources":["../../a-software/HBuilderX/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvdGFiQmFyL3Nob3BwaW5nL3Nob3BwaW5nLnZ1ZQ"],"sourcesContent":["import MiniProgramPage from 'D:/a-project/feiniao-youwei-uniapp/pages/tabBar/shopping/shopping.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;AACA,GAAG,WAAW,eAAe;"}

unpackage/dist/dev/.sourcemap/mp-weixin/pages/tabBar/tree/tree.js.map

@@ -1 +1 @@
-{"version":3,"file":"tree.js","sources":["../../a-software/HBuilderX/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvdGFiQmFyL3RyZWUvdHJlZS52dWU"],"sourcesContent":["import MiniProgramPage from 'D:/a-project/feiniao-youwei-uniapp/pages/tabBar/tree/tree.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;AACA,GAAG,WAAW,eAAe;"}
+{"version":3,"file":"tree.js","sources":["../../a-software/HBuilderX/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvdGFiQmFyL3RyZWUvdHJlZS52dWU"],"sourcesContent":["import MiniProgramPage from 'D:/a-project/feiniao-youwei-uniapp/pages/tabBar/tree/tree.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;AACA,GAAG,WAAW,eAAe;"}

unpackage/dist/dev/mp-weixin/app.json

@@ -9,7 +9,7 @@
   "window": {
     "navigationBarTextStyle": "black",
     "navigationBarTitleText": "飞鸟有味",
-    "navigationBarBackgroundColor": "#ffffff",
+    "navigationBarBackgroundColor": "#FFFFFF",
     "backgroundColor": "#F8F8F8"
   },
   "tabBar": {

unpackage/dist/dev/mp-weixin/app.wxss

@@ -26,7 +26,7 @@
 /*每个页面公共css */
 .base-container {
   width: 100%;
-  min-height: calc(100vh - 100rpx - 88rpx);
+  min-height: 100vh;
   background: #f7f7f7;
   padding: 20rpx 24rpx;
   box-sizing: border-box;

unpackage/dist/dev/mp-weixin/pages/tabBar/mine/mine.wxml

@@ -1 +1 @@
-<view class="base-container data-v-ca643e16"><view class="user-info data-v-ca643e16"><view class="user-left data-v-ca643e16"><image class="avatar data-v-ca643e16" src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png"></image><view class="info data-v-ca643e16"><text class="name data-v-ca643e16">听妈妈的话</text><view class="text data-v-ca643e16">这是您使用飞鸟有味的第15天</view></view></view><view class="user-right data-v-ca643e16">收货地址</view></view><view class="grid- data-v-ca643e16"></view><view class="list-wrap data-v-ca643e16"><view class="list-item data-v-ca643e16"></view></view></view>
+<view class="base-container data-v-ca643e16"><view class="user-info data-v-ca643e16"><view class="user-left data-v-ca643e16"><image class="avatar data-v-ca643e16" src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png"></image><view class="info data-v-ca643e16"><text class="name data-v-ca643e16">听妈妈的话</text><view class="text data-v-ca643e16">这是您使用飞鸟有味的第15天</view></view></view><view class="user-right data-v-ca643e16">收货地址</view></view><view class="grid-wrap data-v-ca643e16"><view class="grid-item data-v-ca643e16"><view class="grid-name data-v-ca643e16">守护兑换</view><text class="grid-text data-v-ca643e16">积累能量获大礼</text><image class="image data-v-ca643e16" src="https://birdseye-img.sysuimars.com/youwei-uniapp/img/gift.png"></image></view><view class="grid-item coupon data-v-ca643e16"><view class="grid-name data-v-ca643e16">优惠券</view><text class="grid-text data-v-ca643e16">满100减50</text><image class="icon data-v-ca643e16" src="https://birdseye-img.sysuimars.com/youwei-uniapp/img/coupon.png"></image></view></view><view class="list-wrap data-v-ca643e16"><view class="list-item list-card data-v-ca643e16"><view class="card-head data-v-ca643e16"><text class="name data-v-ca643e16">我的订单</text><text class="data-v-ca643e16">></text></view><view class="card-cont data-v-ca643e16"><view class="list-item data-v-ca643e16"></view></view></view><view class="list-item list-card data-v-ca643e16"><text class="name data-v-ca643e16">我的守护</text><text class="data-v-ca643e16">></text></view><view class="list-item data-v-ca643e16"><text class="name data-v-ca643e16">联系客服</text><text class="data-v-ca643e16">></text></view><view class="list-item data-v-ca643e16"><text class="name data-v-ca643e16">意见反馈</text><text class="data-v-ca643e16">></text></view></view></view>

unpackage/dist/dev/mp-weixin/pages/tabBar/mine/mine.wxss

@@ -23,13 +23,6 @@
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
-.base-container.data-v-ca643e16 {
-  width: 100%;
-  min-height: calc(100vh - 100rpx - 88rpx);
-  background: #f7f7f7;
-  padding: 20rpx 24rpx;
-  box-sizing: border-box;
-}
 .base-container .user-info.data-v-ca643e16 {
   background: #fff;
   border-radius: 16rpx;
@@ -61,4 +54,53 @@
   color: #000;
   background: #FFD95E;
   font-weight: 500;
+}
+.base-container .grid-wrap.data-v-ca643e16 {
+  display: flex;
+  margin-top: 20rpx;
+}
+.base-container .grid-wrap .grid-item.data-v-ca643e16 {
+  padding: 20rpx 28rpx;
+  flex: 1;
+  border-radius: 16rpx;
+  border: 2rpx solid #FFFFFF;
+  background-image: linear-gradient(180deg, #FFECAE, #FFFFFF);
+  line-height: 42rpx;
+  position: relative;
+}
+.base-container .grid-wrap .grid-item.coupon.data-v-ca643e16 {
+  margin-left: 18rpx;
+  background-image: linear-gradient(180deg, #FFDFC5, #FFFFFF);
+}
+.base-container .grid-wrap .grid-item .grid-name.data-v-ca643e16 {
+  font-family: "PangMenZhengDao";
+}
+.base-container .grid-wrap .grid-item .grid-text.data-v-ca643e16 {
+  font-size: 24rpx;
+}
+.base-container .grid-wrap .grid-item .image.data-v-ca643e16 {
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  width: 110rpx;
+  height: 120rpx;
+}
+.base-container .grid-wrap .grid-item .icon.data-v-ca643e16 {
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  width: 110rpx;
+  height: 110rpx;
+}
+.base-container .list-wrap .list-item.data-v-ca643e16 {
+  background: #fff;
+  border-radius: 10rpx;
+  margin-top: 20rpx;
+  padding: 26rpx 20rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.base-container .list-wrap .list-item .name.data-v-ca643e16 {
+  font-weight: 500;
 }

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

@@ -1,7 +1,8 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": []
+    "ignore": [],
+    "include": []
   },
   "setting": {
     "urlCheck": false,
@@ -9,28 +10,20 @@
     "postcss": false,
     "minified": false,
     "newFeature": true,
-    "bigPackageSizeSupport": true
+    "bigPackageSizeSupport": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
   },
   "compileType": "miniprogram",
-  "libVersion": "",
+  "libVersion": "3.8.12",
   "appid": "wx628f62793fdf5251",
   "projectname": "feiniao-youwei-uniapp",
-  "condition": {
-    "search": {
-      "current": -1,
-      "list": []
-    },
-    "conversation": {
-      "current": -1,
-      "list": []
-    },
-    "game": {
-      "current": -1,
-      "list": []
-    },
-    "miniprogram": {
-      "current": -1,
-      "list": []
-    }
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
   }
 }