From 26e4df8dae16b6b15c4f70d682f282abeff542a4 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Tue, 19 Mar 2024 17:29:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 7 +- components/no-data/no-data.vue | 76 +++++++++++++++++--- components/user-base/user-base.vue | 11 +-- lang/en.json | 4 +- lang/zh.json | 6 +- pages/goods-category/goods-category.css | 3 - pages/plugins/distribution/poster/poster.css | 5 +- pages/plugins/distribution/poster/poster.vue | 30 ++++++-- pages/user/user.vue | 16 ++++- 9 files changed, 122 insertions(+), 36 deletions(-) diff --git a/App.vue b/App.vue index fa1e1877..6daec424 100644 --- a/App.vue +++ b/App.vue @@ -7,11 +7,11 @@ data: { // 基础配置 // 数据接口请求地址 - request_url: 'http://shopxo.com/', + request_url: 'https://d1.shopxo.vip/', // request_url: 'https://new.shopxo.vip/', // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/） - static_url: 'http://shopxo.com/', + static_url: 'https://d1.shopxo.vip/', // static_url: 'https://new.shopxo.vip/', // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立） @@ -112,6 +112,9 @@ // 钱包插件货币符号使用当前 currency_symbol 数据的固定值（0否, 1是） is_wallet_use_fixed_currency_symbol: 0, + // 加载动画类型（0logo, 1名称） + loading_content_type: 0, + // 数据缓存key // 场景值 cache_scene_key: 'cache_scene_key', diff --git a/components/no-data/no-data.vue b/components/no-data/no-data.vue index 6c5f4e10..ef61bc77 100644 --- a/components/no-data/no-data.vue +++ b/components/no-data/no-data.vue @@ -6,9 +6,15 @@ {{$t('no-data.no-data.imw8f1')}}{{title}}{{$t('no-data.no-data.q87572')}} - - - {{title}} + + + + {{title}} + + + + + @@ -34,7 +40,10 @@ data() { return { theme_view: app.globalData.get_theme_value_view(), - static_dir: '/static/images/common/', + static_dir: '/static/images/common/', + loading_logo_border: app.globalData.data.static_url+'static/common/svg/loading-border.svg', + loading_logo: app.globalData.data.static_url+'favicon.ico', + loading_content_type: app.globalData.data.loading_content_type, title: app.globalData.get_application_title(), network_type_value: '', not_network_await_status: 0, @@ -146,22 +155,26 @@ } .no-data-loading text { color: #999; - } - .loading-animation, + } + + /** + * 名称加载 + */ + .loading-title-animation, .network-type-tips { padding-top: 25%; } - .loading-animation { + .loading-title-animation { background: #e7e7e7 -webkit-linear-gradient(left, #c6c6c6 0%, #c6c6c6 90%) no-repeat 0 0; background-size: 20% 100%; -webkit-background-clip: text; -webkit-text-fill-color: transparent; font-size: 60rpx; font-weight: bold; - -webkit-animation: loading-animation 2s linear infinite; - animation: loading-animation 2s linear infinite; + -webkit-animation: loading-text-animation 2s linear infinite; + animation: loading-text-animation 2s linear infinite; } - @-webkit-keyframes loading-animation { + @-webkit-keyframes loading-text-animation { 0% { background-position: 0 0; } @@ -169,12 +182,53 @@ background-position: 100% 100%; } } - @keyframes loading-animation { + @keyframes loading-text-animation { 0% { background-position: 0 0; } 100% { background-position: 100% 100%; } + } + + /** + * logo加载 + */ + .loading-logo-content { + position: absolute; + width: 4rem; + height: 4rem; + left: calc(50% - 2rem); + top: 0; + border-radius: 50%; + overflow: hidden; + background: #fff; + margin-top: 50%; + } + .loading-logo-content .loading-logo { + content: ''; + display: block; + position: absolute; + left: 0.7rem; + top: 0.7rem; + width: 2.5rem; + height: 2.5rem; + opacity: 0.8; + background-size: contain; + background-position: center center; + background-repeat: no-repeat; + } + .loading-logo-content .loading-border { + content: ''; + display: block; + position: absolute; + width: 4.8rem; + height: 4.8rem; + left: -0.4rem; + top: -0.4rem; + opacity: 0.8; + background-size: contain; + background-position: center center; + background-repeat: no-repeat; } diff --git a/components/user-base/user-base.vue b/components/user-base/user-base.vue index a4d73266..2f58d127 100644 --- a/components/user-base/user-base.vue +++ b/components/user-base/user-base.vue @@ -11,14 +11,14 @@ {{$t('user-base.user-base.g5663y')}} {{$t('user-base.user-base.913g4e')}} - + {{$t('personal.personal.cw1d8p')}}* - + {{$t('personal.personal.gw8br3')}}* @@ -177,12 +177,13 @@ form_submit(e) { // 表单数据 var form_data = e.detail.value; + var user = this.user || {}; // 头像 form_data['avatar'] = this.user_avatar || ''; // 验证数据项 var validation = []; - if ((this.user.avatar || null) == null) { + if ((user.avatar || null) == null) { validation.push({ fields: 'avatar', msg: this.$t('user-base.user-base.gzc3y4'), @@ -190,7 +191,7 @@ } else { delete form_data['avatar']; } - if ((this.user.nickname || null) == null) { + if ((user.nickname || null) == null) { validation.push({ fields: 'nickname', msg: this.$t('user-base.user-base.lro9u7'), @@ -236,7 +237,7 @@ if (event.detail.value != '') { this.setData({ nickname: event.detail.value, - form_submit_disabled_status: ((this.user.avatar || null) == null && (this.user_avatar || null) == null) + form_submit_disabled_status: (((this.user || null) == null || (this.user.avatar || null) == null) && (this.user_avatar || null) == null) }); } else { this.setData({ diff --git a/lang/en.json b/lang/en.json index d03a98e3..efa9bff1 100644 --- a/lang/en.json +++ b/lang/en.json @@ -101,7 +101,7 @@ "plugins-distribution-recommend-list": "My Recommended Treasure", "plugins-distribution-recommend-detail": "Recommended Treasure Details", "plugins-distribution-recommend-form": "Recommended Treasure Add/Edit", - "plugins-distribution-poster-poster": "Promotion rebate", + "plugins-distribution-poster": "Promotion rebate", "plugins-distribution-extraction": "Pickup point", "plugins-distribution-extraction-apply": "Pickup point information", "plugins-distribution-extraction-order": "Pickup order", @@ -750,7 +750,7 @@ "29f6n5": "Transfer", "8752a4": "Withdrawal", "91h03v": "Payment code", - "ki1nor": "Service", + "ki1nor": "Tel Service", "2k0227": "Exit", "3q4p8k": "Collection", "57xw84": "Tracks", diff --git a/lang/zh.json b/lang/zh.json index 5d2f2d4a..112cba3b 100644 --- a/lang/zh.json +++ b/lang/zh.json @@ -104,7 +104,7 @@ "plugins-distribution-recommend-list": "我的推荐宝", "plugins-distribution-recommend-detail": "推荐宝详情", "plugins-distribution-recommend-form": "推荐宝添加/编辑", - "plugins-distribution-poster-poster": "推广返利", + "plugins-distribution-poster": "推广返利", "plugins-distribution-extraction": "取货点", "plugins-distribution-extraction-apply": "取货点信息", "plugins-distribution-extraction-order": "取货订单", @@ -746,7 +746,7 @@ "29f6n5": "转账", "8752a4": "提现", "91h03v": "付款码", - "ki1nor": "联系客服", + "ki1nor": "电话客服", "2k0227": "退出账号", "3q4p8k": "商品收藏", "57xw84": "我的足迹", @@ -920,7 +920,7 @@ "rbdj4b": "海报分享", "m54q3e": "保存海报后，发送给微信好友/群、QQ好友/群，分享到分朋友圈，微博等进行推广，轻轻松松赚返利！", "b5i123": "查看长按保存", - "hk8c9p": "重新生成", + "hk8c9p": "生成", "9y4bwq": "二维码分享", "h212v8": "保存二维码后，发送给微信好友/群、QQ好友/群，分享到分朋友圈，微博等进行推广，轻轻松松赚返利！", "j3qv45": "查看二维码长按保存", diff --git a/pages/goods-category/goods-category.css b/pages/goods-category/goods-category.css index c2dd7bbd..f6daf3e1 100644 --- a/pages/goods-category/goods-category.css +++ b/pages/goods-category/goods-category.css @@ -40,9 +40,6 @@ /** * 左侧导航 */ -.left-content-actual { - padding-right: 12rpx; -} .left-content-actual-list { padding-bottom: 120rpx; background-color: #f5f5f5; diff --git a/pages/plugins/distribution/poster/poster.css b/pages/plugins/distribution/poster/poster.css index f408acce..0c0b80cd 100644 --- a/pages/plugins/distribution/poster/poster.css +++ b/pages/plugins/distribution/poster/poster.css @@ -2,6 +2,9 @@ border-style: solid; border-width: 0 0 0 3px; } -.submit-double button { +.submit-double .item { width: 48%; +} +.submit-double .item button { + width: 46%; } \ No newline at end of file diff --git a/pages/plugins/distribution/poster/poster.vue b/pages/plugins/distribution/poster/poster.vue index 57d48df0..cd2c4ee9 100644 --- a/pages/plugins/distribution/poster/poster.vue +++ b/pages/plugins/distribution/poster/poster.vue @@ -9,8 +9,11 @@ - - + + + + + @@ -37,7 +40,10 @@ - + + + + @@ -48,7 +54,8 @@ diff --git a/pages/user/user.vue b/pages/user/user.vue index 247e80c6..5123fb4f 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -246,6 +246,7 @@ methods: { // 资源设置 set_resources_data() { + // 导航名称处理 var old_nav = this.head_nav_list; var head_nav_list = [ { @@ -273,11 +274,17 @@ name: client_value == 'mp' ? this.$t('setup.setup.5493ui') : this.$t('user.user.2k0227'), icon: client_value == 'mp' ? 'cache' : 'logout', }; - var nickname = this.$t('login.login.6yfr9g'); + // #ifdef APP || H5 + // app和h5模式下未登录则不展示退出 + if(app.globalData.get_user_cache_info() == null) { + nav_logout_data = null; + } + // #endif + this.setData({ head_nav_list: head_nav_list, nav_logout_data: nav_logout_data, - nickname: nickname, + nickname: this.$t('login.login.6yfr9g'), }); }, @@ -498,7 +505,10 @@ main_navigation_data: [], user: null, avatar: app.globalData.data.default_user_head_src, - nickname: this.$t('login.login.6yfr9g') + nickname: this.$t('login.login.6yfr9g'), + // #ifdef APP || H5 + nav_logout_data: null, + // #endif }); // 调用公共方法处理