guhongwei 2 vuotta sitten
vanhempi
commit
c8f1f74cee

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "益智游戏",
     "appid" : "__UNI__2080341",
     "description" : "",
-    "versionName" : "1.1.0",
-    "versionCode" : 110,
+    "versionName" : "1.1.1",
+    "versionCode" : 111,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 1 - 1
pages/index/index.vue

@@ -37,7 +37,7 @@
 		methods: {
 			async search() {
 				const that = this;
-				let url = '/pagesHome/find/index';
+				let url = '/pagesHome/home/index';
 				// 不可返回
 				// uni.redirectTo({
 				// 	url

+ 182 - 4
pagesHome/account/index.vue

@@ -1,6 +1,33 @@
 <template>
 	<home-frame @toPath="toPath">
-		账户
+		<view class="main">
+			<view class="one">
+				<view class="one_1">
+					<!-- <image src="../../static/logo.jpg" mode=""></image> -->
+					<image class="image" :src="logo_url" mode="">
+					</image>
+				</view>
+				<view class="one_2">
+					<view class="name">
+						{{userInfo.name}}
+					</view>
+					<view class="id">
+						ID:{{userInfo.account_id}}
+					</view>
+				</view>
+				<view class="one_3" v-if="!userInfo._id">
+					<button size="mini">注册/登录</button>
+				</view>
+			</view>
+			<view class="two">
+				<view class="list" v-for="(item,index) in btnList" :key="index">
+					<image class="image" src="../../static/logo.jpg" mode=""></image>
+					<view class="name">
+						{{item.name}}
+					</view>
+				</view>
+			</view>
+		</view>
 	</home-frame>
 </template>
 
@@ -12,16 +39,77 @@
 		},
 		data() {
 			return {
-
+				// 基本信息
+				basicInfo: {},
+				// 用户信息
+				userInfo: {},
+				// 头像
+				logo_url: '',
+				// 功能按钮
+				btnList: [ //
+					{
+						name: '我的喜欢'
+					}, {
+						name: '我的收藏'
+					}, {
+						name: '推广分享'
+					}, {
+						name: '应用中心'
+					}, {
+						name: '账号信息'
+					}, {
+						name: '退出登录'
+					}
+				]
 			};
 		},
 		onLoad() {
 
 		},
 		onShow() {
-
+			const that = this;
+			that.searchBasic();
+			that.search()
 		},
 		methods: {
+			searchBasic() {
+				const that = this;
+				uni.getStorage({
+					key: 'basicInfo',
+					success: (res) => {
+						let data = res.data
+						that.$set(that, `basicInfo`, data);
+					}
+				})
+			},
+			search() {
+				const that = this;
+				let user = {
+					_id: '',
+					name: '自由天空',
+					account_id: '123456',
+					logo_url: [ //
+						{
+							id: "20230216100918",
+							name: "头像.jpg",
+							status: "success",
+							uid: 1676513358695,
+							uri: "/files/projectadmin/imgurl/20230216100918.jpg",
+							url: "http://47.93.34.200/files/projectadmin/imgurl/20230216100918.jpg"
+						}
+					]
+				}
+				that.$set(that, `userInfo`, user);
+				// 判断logo
+				let logo_url = '';
+				if (user.logo_url && user.logo_url.length > 0) {
+					logo_url = user.logo_url[0].url
+				} else {
+					logo_url = that.basicInfo.logo_url[0].url
+				}
+				that.$set(that, `logo_url`, logo_url)
+
+			},
 			// 跳转页面
 			toPath(e) {
 				let url = `/${e.route}`;
@@ -43,5 +131,95 @@
 </script>
 
 <style lang="scss">
-	.content {}
+	.main {
+		background-color: var(--rgb000);
+		display: flex;
+		flex-direction: column;
+		width: 100vw;
+		height: 92vh;
+		overflow-y: auto;
+
+		.one {
+			display: flex;
+			padding: 2vw;
+			margin: 0 0 10px 0;
+
+			.one_1 {
+				width: 80px;
+				height: 80px;
+				overflow: hidden;
+				margin: 0 2vw 0 0;
+
+				.image {
+					width: 100%;
+					height: 80px;
+					overflow: hidden;
+					border-radius: 90%;
+				}
+			}
+
+			.one_2 {
+				flex-grow: 1;
+				color: var(--rgbfff);
+				font-size: 16px;
+				font-weight: bold;
+				padding: 2vw 0;
+				overflow: hidden;
+
+				.name {
+
+					font-size: 18px;
+					margin: 0 0 1vw 0;
+					background: linear-gradient(to bottom right, var(--rgbfa4), var(--rgbfff));
+					color: transparent;
+					background-clip: text;
+					-webkit-background-clip: text;
+
+				}
+
+			}
+
+			.one_3 {
+				padding: 4vw 0;
+				overflow: hidden;
+
+				button {
+					background-color: var(--rgbfa4);
+					color: var(--rgbfff);
+				}
+			}
+		}
+
+		.two {
+			display: flex;
+			// justify-content: space-around;
+			flex-wrap: wrap;
+			padding: 0 2vw;
+
+			.list {
+				width: 22%;
+				height: 74px;
+				margin: 0 10px 10px 0;
+				text-align: center;
+				background: linear-gradient(to bottom right, var(--rgb000), var(--rgbfa4));
+				border: 1px solid var(--rgb111);
+				border-radius: 5px;
+
+				.image {
+					width: 20px;
+					height: 20px;
+					margin: 3vw 0 2vw 0;
+				}
+
+				.name {
+					color: var(--rgbfff);
+					font-size: 14px;
+				}
+			}
+
+			.list:nth-child(4n) {
+				margin: 0 0 10px 0;
+			}
+		}
+	}
 </style>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
unpackage/dist/build/app-plus/app-service.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
unpackage/dist/build/app-plus/app-view.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
unpackage/dist/build/app-plus/manifest.json


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
unpackage/dist/build/app-plus/pagesHome/app-sub-service.js


BIN
unpackage/dist/build/app-plus/static/error.jpg


BIN
unpackage/dist/build/app-plus/static/loading.jpg


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/account/index.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 12 - 2
unpackage/dist/dev/app-plus/app-service.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 92 - 2
unpackage/dist/dev/app-plus/app-view.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
unpackage/dist/dev/app-plus/manifest.json


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 77 - 2
unpackage/dist/dev/app-plus/pagesHome/app-sub-service.js


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

@@ -198,7 +198,7 @@ var _default = {
             switch (_context.prev = _context.next) {
               case 0:
                 that = _this;
-                url = '/pagesHome/find/index'; // 不可返回
+                url = '/pagesHome/home/index'; // 不可返回
                 // uni.redirectTo({
                 // 	url
                 // })

+ 66 - 2
unpackage/dist/dev/mp-weixin/pagesHome/account/index.js

@@ -151,11 +151,75 @@ var _default = {
     homeFrame: homeFrame
   },
   data: function data() {
-    return {};
+    return {
+      // 基本信息
+      basicInfo: {},
+      // 用户信息
+      userInfo: {},
+      // 头像
+      logo_url: '',
+      // 功能按钮
+      btnList: [
+      //
+      {
+        name: '我的喜欢'
+      }, {
+        name: '我的收藏'
+      }, {
+        name: '推广分享'
+      }, {
+        name: '应用中心'
+      }, {
+        name: '账号信息'
+      }, {
+        name: '退出登录'
+      }]
+    };
   },
   onLoad: function onLoad() {},
-  onShow: function onShow() {},
+  onShow: function onShow() {
+    var that = this;
+    that.searchBasic();
+    that.search();
+  },
   methods: {
+    searchBasic: function searchBasic() {
+      var that = this;
+      uni.getStorage({
+        key: 'basicInfo',
+        success: function success(res) {
+          var data = res.data;
+          that.$set(that, "basicInfo", data);
+        }
+      });
+    },
+    search: function search() {
+      var that = this;
+      var user = {
+        _id: '',
+        name: '自由天空',
+        account_id: '123456',
+        logo_url: [
+        //
+        {
+          id: "20230216100918",
+          name: "头像.jpg",
+          status: "success",
+          uid: 1676513358695,
+          uri: "/files/projectadmin/imgurl/20230216100918.jpg",
+          url: "http://47.93.34.200/files/projectadmin/imgurl/20230216100918.jpg"
+        }]
+      };
+      that.$set(that, "userInfo", user);
+      // 判断logo
+      var logo_url = '';
+      if (user.logo_url && user.logo_url.length > 0) {
+        logo_url = user.logo_url[0].url;
+      } else {
+        logo_url = that.basicInfo.logo_url[0].url;
+      }
+      that.$set(that, "logo_url", logo_url);
+    },
     // 跳转页面
     toPath: function toPath(e) {
       var url = "/".concat(e.route);

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesHome/account/index.wxml


+ 75 - 0
unpackage/dist/dev/mp-weixin/pagesHome/account/index.wxss

@@ -5,4 +5,79 @@
   width: 100vw;
   height: 100vh;
 }
+.main {
+  background-color: var(--rgb000);
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 92vh;
+  overflow-y: auto;
+}
+.main .one {
+  display: flex;
+  padding: 2vw;
+  margin: 0 0 10px 0;
+}
+.main .one .one_1 {
+  width: 80px;
+  height: 80px;
+  overflow: hidden;
+  margin: 0 2vw 0 0;
+}
+.main .one .one_1 .image {
+  width: 100%;
+  height: 80px;
+  overflow: hidden;
+  border-radius: 90%;
+}
+.main .one .one_2 {
+  flex-grow: 1;
+  color: var(--rgbfff);
+  font-size: 16px;
+  font-weight: bold;
+  padding: 2vw 0;
+  overflow: hidden;
+}
+.main .one .one_2 .name {
+  font-size: 18px;
+  margin: 0 0 1vw 0;
+  background: linear-gradient(to bottom right, var(--rgbfa4), var(--rgbfff));
+  color: transparent;
+  background-clip: text;
+  -webkit-background-clip: text;
+}
+.main .one .one_3 {
+  padding: 4vw 0;
+  overflow: hidden;
+}
+.main .one .one_3 button {
+  background-color: var(--rgbfa4);
+  color: var(--rgbfff);
+}
+.main .two {
+  display: flex;
+  flex-wrap: wrap;
+  padding: 0 2vw;
+}
+.main .two .list {
+  width: 22%;
+  height: 74px;
+  margin: 0 10px 10px 0;
+  text-align: center;
+  background: linear-gradient(to bottom right, var(--rgb000), var(--rgbfa4));
+  border: 1px solid var(--rgb111);
+  border-radius: 5px;
+}
+.main .two .list .image {
+  width: 20px;
+  height: 20px;
+  margin: 3vw 0 2vw 0;
+}
+.main .two .list .name {
+  color: var(--rgbfff);
+  font-size: 14px;
+}
+.main .two .list:nth-child(4n) {
+  margin: 0 0 10px 0;
+}