diff --git a/App.vue b/App.vue index 0681bb43..4699ac56 100644 --- a/App.vue +++ b/App.vue @@ -22,9 +22,12 @@ // 默认logo、如 /static/images/common/logo.png application_logo: '', - // 版本号 + // 版本号、如: v1.0.0 version: 'v6.1', + // app版本信息、如: v1.0.0 20180118 + app_version_info: 'v6.1 20240516', + // 货币价格符号 currency_symbol: '¥', @@ -1884,6 +1887,10 @@ if (type !== null) { value = this.get_config('config.common_app_mini_' + type + '_describe') || null; } + // 商店介绍 + if (type !== null) { + value = this.get_config('config.common_customer_store_describe') || null; + } // 获取公共数据 if (value === null) { value = this.data.application_describe; diff --git a/lang/en.json b/lang/en.json index 077c2492..573c1614 100644 --- a/lang/en.json +++ b/lang/en.json @@ -80,6 +80,7 @@ "password": "password modify", "personal": "personal data", "logout": "Account cancellation", + "about": "About Us", "plugins-seckill-index": "Limited time flash sale", "plugins-coupon-index": "Coupon Collection Center", "plugins-coupon-shop": "Shop Coupon Collection Center", @@ -348,6 +349,7 @@ "f25wcx": "Click to call", "11k15d": "Account cancel", "48r261": "Logout and can't recover.", + "tghrf2": "About Us", "07o10b": "Please bind your phone first", "nwt4o1": "Please log in first", "utnr7g": "Service phone", diff --git a/lang/zh.json b/lang/zh.json index e731d1c3..aaa9b4a0 100644 --- a/lang/zh.json +++ b/lang/zh.json @@ -83,6 +83,7 @@ "personal": "个人资料", "password": "密码修改", "logout": "账号注销", + "about": "关于我们", "plugins-seckill-index": "限时秒杀", "plugins-coupon-index": "领券中心", "plugins-coupon-shop": "店铺领券中心", @@ -339,6 +340,7 @@ "f25wcx": "点击拨打", "11k15d": "账号注销", "48r261": "注销后无法恢复", + "tghrf2": "关于我们", "07o10b": "请先绑定手机", "nwt4o1": "请先登录", "utnr7g": "客服电话有误", diff --git a/pages.json b/pages.json index e000f47f..bc128df2 100644 --- a/pages.json +++ b/pages.json @@ -481,6 +481,18 @@ } ] }, + { + "root": "pages/about", + "pages": [ + { + "path": "about", + "style": { + "enablePullDownRefresh": false, + "navigationBarTitleText": "" + } + } + ] + }, { "root": "pages/plugins/seckill", "pages": [ diff --git a/pages/about/about.css b/pages/about/about.css new file mode 100644 index 00000000..63851b74 --- /dev/null +++ b/pages/about/about.css @@ -0,0 +1,4 @@ +.logo { + width: 160rpx; + height: 160rpx; +} \ No newline at end of file diff --git a/pages/about/about.vue b/pages/about/about.vue new file mode 100644 index 00000000..2f599107 --- /dev/null +++ b/pages/about/about.vue @@ -0,0 +1,68 @@ + + + \ No newline at end of file diff --git a/pages/setup/setup.css b/pages/setup/setup.css index ed4000b2..41557f07 100644 --- a/pages/setup/setup.css +++ b/pages/setup/setup.css @@ -1,3 +1,6 @@ +.panel-item .item:not(:first-child) { + border-top: 1px solid #f5f5f5 !important; +} .user-avatar { width: 80rpx; height: 80rpx !important; diff --git a/pages/setup/setup.vue b/pages/setup/setup.vue index 9796d37d..eae806d3 100644 --- a/pages/setup/setup.vue +++ b/pages/setup/setup.vue @@ -2,8 +2,8 @@ - - + + {{ user.user_name_view || $t('login.login.6yfr9g') }} @@ -11,15 +11,15 @@ - + {{ $t('setup.setup.x81v6d') }} {{ user.mobile_security || '' }} {{ (user.mobile_security || null) == null ? $t('setup.setup.dfg4wf') : $t('setup.setup.j6skqh') }} - + {{$t('setup.setup.5u59b1')}} {{ user.email_security || '' }} {{ (user.email_security || null) == null ? $t('setup.setup.dfg4wf') : $t('setup.setup.j6skqh') }} - + {{$t('setup.setup.v8438r')}} {{ $t('setup.setup.j6skqh') }} @@ -27,15 +27,15 @@ - + - + {{item.name}} {{ $t('setup.setup.dfg4wf') }} - + {{item.name}} {{item.bind_nickname}} @@ -43,22 +43,22 @@ - + - + {{ $t('setup.setup.r7jz13') }} {{ language }} - - + + {{ $t('setup.setup.42mba7') }} {{ $t('setup.setup.5eltza') }} - + {{ $t('setup.setup.t60222') }} {{ $t('setup.setup.izg78g') }} @@ -66,25 +66,30 @@ - + - + {{ $t('setup.setup.377uwg') }} {{ $t('setup.setup.5eltza') }} - + {{ $t('setup.setup.5493ui') }} {{ $t('setup.setup.f53166') }} - + {{ $t('setup.setup.656fv1') }} {{ common_app_customer_service_tel || '' }} {{ $t('setup.setup.f25wcx') }} - + {{ $t('setup.setup.11k15d') }} {{ $t('setup.setup.48r261') }} + + + {{ $t('setup.setup.tghrf2') }} + +