合并提交

pages/me/about.vue

@@ -1,97 +0,0 @@
-<template>
-    <view class="main">
-        <!-- nav -->
-        <navigation>{{ i18n.AboutUs }}</navigation>
-        <view class="body">
-         
-
-        </view>
-    </view>
-</template>
-
-<script>
-import api from '@/utils/api'
-export default {
-    name: "AboutUs",
-    data() {
-        return {
-         
-        };
-    },
-    computed: {
-        i18n() {
-            return this.$t("me");
-        },
-    },
-    onLoad() {
-		this.about();
-    },
-    onShow() { },
-    methods: {
-        // 关于我们
-        about() {
-         api.aboutus().then(res => {
-			 console.log(res)
-         })
-        },
-    },
-}
-</script>
-
-<style lang="scss" scoped>
-.main {
-
-    .body {
-        overflow: hidden;
-        margin-top: 200rpx;
-        padding: 0 48rpx;
-
-        .shareText {
-            margin-top: 104rpx;
-            font-size: 60rpx;
-            font-weight: 800;
-            text-align: center;
-        }
-
-        .scanText {
-            font-size: 32rpx;
-            text-align: center;
-            color: #A2A0A8;
-        }
-
-        .QRCode {
-            box-sizing: border-box;
-            margin: 66rpx auto;
-            width: 520rpx;
-            height: 520rpx;
-            background-image: url(../../static/me/bg_QR_code.png);
-            background-repeat: no-repeat;
-            background-size: 520rpx;
-            padding: 52rpx;
-
-            .QRCodeImg {
-                margin-left: 8rpx;
-            }
-        }
-
-        .myIdText {
-            font-size: 48rpx;
-            font-weight: 800;
-            text-align: center;
-        }
-
-        .button {
-            height: 112rpx;
-            margin: 72rpx 0;
-            border-radius: 32rpx;
-            color: #15141F !important;
-            font-weight: 700;
-            font-size: 32rpx;
-        }
-
-
-
-    }
-
-}
-</style>

pages/me/aboutUs.vue

@@ -4,7 +4,7 @@
 		<navigation :bgTransparent="true">{{ i18n.AboutUs }}</navigation>
 		<!-- 列表 -->
 		<view class="content">
-            <view class="card" v-for="(item, index) in 5" :key="index">
+			<view class="card" v-for="(item, index) in aboutus" :key="index">
 				<view class="title">{{ i18n.Consulting }}</view>
 				<view class="text">A Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem
 					Ipsum has been the industry's standard dummy text ever since the 1500s, </view>
@@ -14,10 +14,12 @@
 </template>
 
 <script>
+	import api from '@/utils/api'
 	export default {
 		name: "aboutUs",
 		data() {
 			return {
+				aboutus:[],
 			};
 		},
 		computed: {
@@ -26,10 +28,16 @@ export default {
 			},
 		},
 		onLoad() {
+			this.about()
 		},
+
 		onShow() {},
 		methods: {
-
+			about() {
+				api.aboutus().then(res => {
+					this.aboutus = res
+				})
+			},
 		},
 	}
 </script>