Merge branch 'master' of http://git.weirui0755.com/liang/samehome

components/transaction/transaction.vue

@@ -147,6 +147,9 @@ export default {
             this.leverageListShow = false;
             console.log(e);
         },
+        btnClick(){
+
+        },
     }
 }
 </script>

pages.json

@@ -89,7 +89,7 @@
 			}
 		},
 		{
-			"path": "pages/me/about",
+			"path": "pages/me/aboutUs",
 			"style": {
 				"navigationStyle": "custom"
 			}

pages/me/aboutUs.vue

@@ -0,0 +1,86 @@
+<template>
+    <view class="main">
+        <!-- nav -->
+        <navigation :bgTransparent="true">{{ i18n.AboutUs }}</navigation>
+        <!-- 列表 -->
+        <view class="content">
+            <view class="card" v-for="(item, index) in 5" :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>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    name: "aboutUs",
+    data() {
+        return {
+        };
+    },
+    computed: {
+        i18n() {
+            return this.$t("me");
+        },
+    },
+    onLoad() {
+    },
+    onShow() { },
+    methods: {
+
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+.main {
+    background-image: url(../../static/me/image.png);
+    background-repeat: no-repeat;
+    background-size: 750rpx 424rpx;
+    overflow: hidden;
+
+    &::after {
+        content: "";
+        position:fixed;
+        bottom: 0px;
+        right: 0px;
+        width: 418rpx;
+        height: 260rpx;
+        background-image: url(../../static/me/tarBg.png);
+        background-repeat: no-repeat;
+        background-size: cover;
+    }
+
+    .content {
+        margin-top: 200rpx;
+        overflow: hidden;
+
+        .card {
+            margin: 32rpx 32rpx 0;
+            border-radius: 40rpx;
+            padding: 20rpx;
+            padding-bottom: 40rpx;
+            background-color: rgba(0, 221, 156, 0.03);
+
+            .title {
+                font-size: 32rpx;
+                line-height: 64rpx;
+                background: linear-gradient(65.75deg, #6BB7A8 13.22%, #631FFD 65.49%, #FF844B 114.4%), #FFFFFF;
+                -webkit-background-clip: text;
+                -webkit-text-fill-color: transparent;
+                background-clip: text;
+                text-fill-color: transparent;
+            }
+
+            .text {
+                line-height: 150%;
+                font-size: 24rpx;
+                color: #80AB9E;
+            }
+        }
+    }
+
+}
+</style>

pages/me/index.vue

@@ -171,7 +171,7 @@
 						url = '/pages/me/language'
 						break;
 					case 'AboutUs':
-					    url = '/pages/me/about'
+					    url = '/pages/me/aboutUs'
 						break;
 					default:
 						break;

utils/language/en_US.js

@@ -382,5 +382,7 @@ export default {
 		Usable: 'Usable ：',
 
 		ALL: 'ALL',
+
+		Consulting:'Consulting',
 	}
 }