From 5df36782df53f55f1379ef56ded3eb9e7c5088e0 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Wed, 12 Jun 2024 14:51:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E4=BA=8E=E6=88=91=E4=BB=AC=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/app-admin/app-admin.vue | 80 +++++++++++++++++++++++-------
 pages/about/about.vue              | 22 +++++---
 2 files changed, 79 insertions(+), 23 deletions(-)

diff --git a/components/app-admin/app-admin.vue b/components/app-admin/app-admin.vue
index 5e4e5e24..f1fbee10 100644
--- a/components/app-admin/app-admin.vue
+++ b/components/app-admin/app-admin.vue
@@ -7,7 +7,7 @@
                 <view class="padding-top-xs padding-left-xl padding-right-xl padding-bottom-xl">
                     <view class="text-size-xl fw-b tc pa name">{{update_data.name}}</view>
                     <view class="text-size tc pa version">v{{update_data.version_new}}</view>
-                    <scroll-view :scroll-y="true" class="content">
+                    <scroll-view :scroll-y="true" class="content tl">
                         <block v-for="(item, index) in update_data.content" :key="index">
                             <view class="margin-bottom-sm text-size-xs">{{item}}</view>
                         </block>
@@ -21,16 +21,28 @@
         </view>
 
         <!-- 评分 -->
-        <view v-if="is_star_status && (star_url || null) != null" class="star-container pf left-0 top-0 wh-auto ht-auto tc">
+        <view v-if="is_star_status && (star_url || null) != null && (star_alert_images || null) != null" class="star-container pf left-0 top-0 wh-auto ht-auto tc">
             <view class="star-content">
-                <image :src="star_alert_images" mode="widthFix" class="star-alert-images wh-auto" @tap="star_event"></image>
+                <image :src="star_alert_images" mode="widthFix" class="star-alert-images wh-auto" @tap="to_star_event"></image>
             </view>
             <view class="padding-sm margin-top-xl">
-                <view class="dis-inline-block" data-value="close" @tap="star_event">
+                <view class="dis-inline-block" @tap="close_star_event">
                     <iconfont name="icon-close-o" size="30rpx" color="#ccc"></iconfont>
                 </view>
             </view>
-        </view>
+        </view>
+
+        <!-- 关于我们中使用 -->
+        <!-- #ifdef APP -->
+        <view v-if="propType == 'about'" class="margin-top">
+            <text class="cr-grey-9">{{app_version_info}}</text>
+            <block v-if="is_loading">
+                <text v-if="(update_data || null) == null" class="cr-grey-c margin-left-lg text-size-xs">已是最新</text>
+                <text v-else class="cr-blue margin-left-lg text-size-xs cp" @tap="update_event">去更新(v{{update_data.version_new}})</text>
+                <text v-if="(star_url || null) != null && (star_alert_images || null) != null" class="cr-blue margin-left-lg text-size-xs cp" @tap="star_event">去评分</text>
+            </block>
+        </view>
+        <!-- #endif -->
     </view>
 </template>
 <script>
@@ -41,6 +53,9 @@
                 theme_view: app.globalData.get_theme_value_view(),
                 update_tips_cache_key: app.globalData.data.cache_app_update_tips_interval_time_key,
                 star_tips_cache_key: app.globalData.data.cache_app_star_tips_interval_time_key,
+                app_version_info: app.globalData.data.app_version_info,
+                is_loading: false,
+                update_data: null,
                 // 更新提示
                 is_update_status: false,
                 update_tips_interval_time: 0,
@@ -54,7 +69,12 @@
             };
         },
         components: {},
-        props: {},
+        props: {
+            propType: {
+            	type: String,
+            	default: ''
+            }
+        },
         // 页面被展示
         created: function () {
             this.init();
@@ -62,7 +82,8 @@
 
         methods: {
             // 初始化、获取数据
-            init(is_init = 0) {
+            init(is_init = 0) {
+                // #ifdef APP
                 uni.request({
                     url: app.globalData.get_request_url('index', 'version', 'appadmin'),
                     method: 'POST',
@@ -72,6 +93,7 @@
                         if(res.data.code == 0) {
                             var data = res.data.data;
                             var upd_data = {
+                                is_loading: true,
                                 update_data: data.update_data || null,
                                 // 更新提示
                                 update_alert_bg_images: data.update_alert_bg_images || null,
@@ -112,6 +134,12 @@
                                 upd_data.is_star_status = false;
                             }
 
+                            // 关于我们页面则不直接展示
+                            if(this.propType == 'about') {
+                                upd_data.is_update_status = false;
+                                upd_data.is_star_status = false;
+                            }
+
                             this.setData(upd_data);
                         }
                     },
@@ -121,7 +149,8 @@
                             this.get_data(1);
                         }
                     }
-                });
+                });
+                // #endif
             },
 
             // 更新关闭
@@ -130,26 +159,43 @@
                     is_update_status: false
                 });
                 uni.setStorageSync(this.update_tips_cache_key, Date.parse(new Date()) / 1000);
+            },
+
+            // 打开更新事件
+            update_event(e) {
+                this.setData({
+                    is_update_status: true
+                });
             },
 
-            // 更新事件
+            // 去更新事件
             to_update_event(e) {
                 plus.runtime.openURL(this.update_data.update_url);
             },
-
-            // 打分事件
+            
+            // 打开评分事件
             star_event(e) {
+                this.setData({
+                    is_star_status: true
+                });
+            },
+
+            // 去打分事件
+            to_star_event(e) {
+                // 先关闭评分
+                this.close_star_event();
+
+                // 打开地址
+                plus.runtime.openURL(this.star_url);
+            },
+
+            // 关闭评分事件
+            close_star_event(e) {
                 this.setData({
                     is_star_status: false
                 });
                 // 增加间隔时间，到时间后才会再提示
                 uni.setStorageSync(this.star_tips_cache_key, (Date.parse(new Date()) / 1000)+this.star_tips_interval_time);
-
-                // 打开地址
-                var value = e.currentTarget.dataset.value || null;
-                if(value == null) {
-                    plus.runtime.openURL(this.star_url);
-                }
             }
         }
     };
diff --git a/pages/about/about.vue b/pages/about/about.vue
index 6f2238e9..d262df2c 100644
--- a/pages/about/about.vue
+++ b/pages/about/about.vue
@@ -3,12 +3,15 @@
         <view class="padding-main tc">
             <view class="bg-white border-radius-main padding-main">
                 <view class="padding-vertical-xxl">
+                    <!-- logo -->
                     <image class="logo circle br-f5 padding-sm dis-block auto margin-top-xl" :src="logo" mode="aspectFill"></image>
+                    <!-- 名称 -->
                     <view class="margin-top-sm text-size">{{title}}</view>
-                    <!-- #ifdef APP -->
-                    <view class="margin-top-sm cr-grey-9">{{app_version_info}}</view>
-                    <!-- #endif -->
-                    <view class="margin-top-xxl cr-base text-size-sm">{{describe}}</view>
+                    <!-- app管理 -->
+                    <component-app-admin ref="app_admin" propType="about"></component-app-admin>
+                    <!-- 简介 -->
+                    <view class="margin-top-xxxxl cr-base text-size-sm">{{describe}}</view>
+                    <!-- 协议 -->
                     <view class="margin-top-xxxxl padding-vertical-xxxxl">
                         <text class="cp cr-blue margin-right" data-value="userregister" @tap="agreement_event">{{ $t('login.login.2v11we') }}</text>
                         <text class="cp cr-blue margin-left" data-value="userprivacy" @tap="agreement_event">{{ $t('login.login.myno2x') }}</text>
@@ -21,6 +24,7 @@
 </template>
 <script>
     const app = getApp();
+    import componentAppAdmin from '@/components/app-admin/app-admin';
     export default {
         data() {
             return {
@@ -28,12 +32,13 @@
                 logo: app.globalData.get_application_logo_square(),
                 title: app.globalData.get_application_title(),
                 describe: app.globalData.get_application_describe(),
-                app_version_info: app.globalData.data.app_version_info,
                 year: (new Date()).getFullYear(),
             };
         },
 
-        components: {},
+        components: {
+            componentAppAdmin
+        },
         onLoad(params) {
             // 调用公共事件方法
             app.globalData.page_event_onload_handle(params);
@@ -42,6 +47,11 @@
         onShow() {
             // 调用公共事件方法
             app.globalData.page_event_onshow_handle();
+
+            // app管理
+            if ((this.$refs.app_admin || null) != null) {
+                this.$refs.app_admin.init();
+            }
         },
 
         methods: {