From 1bd12a1a3ba7886cd769326ef507ff5acdc3b4a0 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 27 Dec 2023 21:25:58 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E5=85=B3=E4=BA=8E=E6=88=91?=
 =?UTF-8?q?=E4=BB=AC=EF=BC=9A=E6=8E=A5=E5=85=A5=20100%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/public/richtext.vue                     | 33 +++++++++++--------
 pages/public/setting.vue                      | 14 +++-----
 sheep/api/data.js                             | 15 ---------
 sheep/api/promotion/article.js                |  4 +--
 .../components/s-auth-modal/s-auth-modal.vue  | 19 ++++-------
 sheep/store/app.js                            | 10 ++----
 6 files changed, 36 insertions(+), 59 deletions(-)

diff --git a/pages/public/richtext.vue b/pages/public/richtext.vue
index bb280ce9..e4a09211 100644
--- a/pages/public/richtext.vue
+++ b/pages/public/richtext.vue
@@ -1,31 +1,37 @@
+<!-- 文章展示 -->
 <template>
   <s-layout class="set-wrap" :title="state.title" :bgStyle="{ color: '#FFF' }">
-    <view class="ss-p-30"><mp-html class="richtext" :content="state.content"></mp-html></view>
+    <view class="ss-p-30">
+      <mp-html class="richtext" :content="state.content" />
+    </view>
   </s-layout>
 </template>
 
 <script setup>
   import { onLoad } from '@dcloudio/uni-app';
   import { reactive } from 'vue';
-  import sheep from '@/sheep';
+  import ArticleApi from '@/sheep/api/promotion/article';
 
   const state = reactive({
     title: '',
     content: '',
   });
 
-  async function getRichTextContent(id) {
-    const { error, data } = await sheep.$api.data.richtext(id);
-    if (error === 0) {
-      state.content = data.content;
-      if (state.title === '') {
-        state.title = data.title;
-        uni.setNavigationBarTitle({
-          title: state.title,
-        });
-      }
+  async function getRichTextContent(id, title) {
+    const { code, data } = await ArticleApi.getArticle(id, title);
+    if (code !== 0) {
+      return;
+    }
+    state.content = data.content;
+    // 标题不一致时，修改标题
+    if (state.title !== data.title) {
+      state.title = data.title;
+      uni.setNavigationBarTitle({
+        title: state.title,
+      });
     }
   }
+
   onLoad((options) => {
     if (options.title) {
       state.title = options.title;
@@ -33,8 +39,9 @@
         title: state.title,
       });
     }
-    getRichTextContent(options.id);
+    getRichTextContent(options.id, options.title);
   });
+
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/public/setting.vue b/pages/public/setting.vue
index 91722e37..c550c125 100644
--- a/pages/public/setting.vue
+++ b/pages/public/setting.vue
@@ -27,7 +27,6 @@
           :border="false"
           class="list-border"
         />
-        <!-- TODO 芋艿：统一的配置界面 -->
         <uni-list-item
           title="关于我们"
           showArrow
@@ -36,8 +35,7 @@
           class="list-border"
           @tap="
             sheep.$router.go('/pages/public/richtext', {
-              id: appInfo.about_us.id,
-              title: appInfo.about_us.title,
+              title: '关于我们'
             })
           "
         />
@@ -62,24 +60,22 @@
             class="tcp-text"
             @tap="
               sheep.$router.go('/pages/public/richtext', {
-                id: appInfo.user_protocol.id,
-                title: appInfo.user_protocol.title,
+                title: '用户协议'
               })
             "
           >
-            《{{ appInfo.user_protocol.title }}》
+            《用户协议》
           </view>
           <view class="agreement-text">与</view>
           <view
             class="tcp-text"
             @tap="
               sheep.$router.go('/pages/public/richtext', {
-                id: appInfo.privacy_protocol.id,
-                title: appInfo.privacy_protocol.title,
+                title: '隐私协议'
               })
             "
           >
-            《{{ appInfo.privacy_protocol.title }}》
+            《隐私协议》
           </view>
         </view>
       </view>
diff --git a/sheep/api/data.js b/sheep/api/data.js
index 6a5b08b1..2d55ed29 100644
--- a/sheep/api/data.js
+++ b/sheep/api/data.js
@@ -2,24 +2,9 @@ import request from '@/sheep/request';
 import request2 from '@/sheep/request2';
 
 export default {
-  area: () =>
-    request2({
-      url: 'system/area/tree',
-      method: 'GET',
-    }),
-  // area: () =>
-  //   request({
-  //     url: 'data/area',
-  //     method: 'GET',
-  //   }),
   faq: () =>
     request({
       url: 'data/faq',
       method: 'GET',
     }),
-  richtext: (id) =>
-    request({
-      url: 'data/richtext/' + id,
-      method: 'GET',
-    }),
 };
diff --git a/sheep/api/promotion/article.js b/sheep/api/promotion/article.js
index 36b037d0..2e061d46 100644
--- a/sheep/api/promotion/article.js
+++ b/sheep/api/promotion/article.js
@@ -2,11 +2,11 @@ import request from '@/sheep/request';
 
 export default {
     // 获得文章详情
-    getArticle: (id) => {
+    getArticle: (id, title) => {
         return request({
             url: '/app-api/promotion/article/get',
             method: 'GET',
-            params: { id }
+            params: { id, title }
         });
     }
 }
diff --git a/sheep/components/s-auth-modal/s-auth-modal.vue b/sheep/components/s-auth-modal/s-auth-modal.vue
index eec97e50..cf6a6ff9 100644
--- a/sheep/components/s-auth-modal/s-auth-modal.vue
+++ b/sheep/components/s-auth-modal/s-auth-modal.vue
@@ -81,18 +81,12 @@
           />
           <view class="agreement-text ss-flex ss-col-center ss-m-l-8">
             我已阅读并遵守
-            <view
-              class="tcp-text"
-              @tap.stop="onProtocol(appInfo.user_protocol.id, appInfo.user_protocol.title)"
-            >
-              《{{ appInfo.user_protocol.title }}》
+            <view class="tcp-text" @tap.stop="onProtocol('用户协议')">
+              《用户协议》
             </view>
             <view class="agreement-text">与</view>
-            <view
-              class="tcp-text"
-              @tap.stop="onProtocol(appInfo.privacy_protocol.id, appInfo.privacy_protocol.title)"
-            >
-              《{{ appInfo.privacy_protocol.title }}》
+            <view class="tcp-text" @tap.stop="onProtocol('隐私协议')">
+              《隐私协议》
             </view>
           </view>
         </label>
@@ -130,11 +124,10 @@
     state.protocol = !state.protocol;
   }
 
-  // 查看协议 TODO 芋艿：协议
-  function onProtocol(id, title) {
+  // 查看协议
+  function onProtocol(title) {
     closeAuthModal();
     sheep.$router.go('/pages/public/richtext', {
-      id,
       title,
     });
   }
diff --git a/sheep/store/app.js b/sheep/store/app.js
index 6e874a74..577204ed 100644
--- a/sheep/store/app.js
+++ b/sheep/store/app.js
@@ -14,17 +14,13 @@ const app = defineStore({
       name: '', // 商城名称
       logo: '', // logo
       version: '', // 版本号
-      cdnurl: '', // 云存储域名
-      filesystem: '', // 云存储平台
-      user_protocol: {}, // 用户协议
-      privacy_protocol: {}, // 隐私协议
-      about_us: {}, // 关于我们
       copyright: '', // 版权信息 I
       copytime: '', // 版权信息 II
+
+      cdnurl: '', // 云存储域名
+      filesystem: '', // 云存储平台
     },
     platform: {
-      payment: [], // 支持的支付方式
-      recharge_payment: [], // 支持的充值支付方式
       share: {
         methods: [], // 支持的分享方式
         forwardInfo: {}, // 默认转发信息