隐私政策弹窗完成/代码优化

src/pages/common/webview/index.vue

@@ -5,14 +5,18 @@
 </template>
 
 <script setup>
+/*----------------------------------依赖引入-----------------------------------*/
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance, toRefs } from "vue";
+/*----------------------------------接口引入-----------------------------------*/
+/*----------------------------------组件引入-----------------------------------*/
+/*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores } from "@/store/modules/index";
-
-const useStore = useStores();
-
+/*----------------------------------公共方法引入-----------------------------------*/
+/*----------------------------------公共变量-----------------------------------*/
 const { proxy } = getCurrentInstance();
-
+const useStore = useStores();
+/*----------------------------------变量声明-----------------------------------*/
 const props = defineProps({
   // 数据
   src: {
@@ -21,7 +25,7 @@ const props = defineProps({
   },
 });
 
-const data = reactive({
+const state = reactive({
   params: {},
   webviewStyles: {
     progress: {
@@ -30,7 +34,7 @@ const data = reactive({
   },
 });
 
-const { params, webviewStyles } = toRefs(data);
+const { params, webviewStyles } = toRefs(state);
 
 onLoad((event) => {
   params.value = event;

src/pages/info.vue

@@ -2,7 +2,7 @@
   <u-navbar :autoBack="false" :placeholder="true" :safeAreaInsetTop="true" :bgColor="proxy.$settingStore.themeColor.color">
     <template #left>
       <view class="u-navbar__content__left__item">
-        <view class="u-navbar__content__left__item__title" style="color: #fff"> 消息 </view>
+        <view class="u-navbar__content__left__item__title" style="color: #fff"> 消息中心 </view>
       </view>
       <view class="u-navbar__content__left__item topBadge">
         <u-badge numberType="overflow" max="99" :value="infoList.total || 0"></u-badge>

src/pages/info/fireBase/fireBase.vue

@@ -27,25 +27,27 @@
 </template>
 
 <script setup>
+/*----------------------------------依赖引入-----------------------------------*/
 import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, getCurrentInstance } from "vue";
-
+/*----------------------------------接口引入-----------------------------------*/
 import { getKnowledgeBaseList } from "@/api/mine/info.js";
-
-const getData = ref([]);
-
+/*----------------------------------组件引入-----------------------------------*/
+/*----------------------------------store引入-----------------------------------*/
+/*----------------------------------公共方法引入-----------------------------------*/
+/*----------------------------------公共变量-----------------------------------*/
 const { proxy } = getCurrentInstance();
+/*----------------------------------变量声明-----------------------------------*/
+const getData = ref([]);
 
 // 列表数据请求
 function getFireBaseList(params = {}) {
   getKnowledgeBaseList(params).then((res) => {
     getData.value = res.data;
-    console.log(getData.value);
   });
 }
 
 // 页面跳转
-
 function goDetail(item) {
   proxy.$tab.navigateTo("/pages/info/fireBashDetail/fireBashDetail?id=" + item.id + "&title=" + item.title);
 }

src/pages/info/fireBashDetail/fireBashDetail.vue

@@ -42,24 +42,28 @@
 </template>
 
 <script setup>
+/*----------------------------------依赖引入-----------------------------------*/
 import { onLoad, onShow, onHide, onLaunch } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, toRefs } from "vue";
-
+/*----------------------------------接口引入-----------------------------------*/
 import { getKnowledgeBaseDetails } from "@/api/mine/info.js";
-
-const data = reactive({
+/*----------------------------------组件引入-----------------------------------*/
+/*----------------------------------store引入-----------------------------------*/
+/*----------------------------------公共方法引入-----------------------------------*/
+/*----------------------------------公共变量-----------------------------------*/
+/*----------------------------------变量声明-----------------------------------*/
+const state = reactive({
   praise: false,
   zan: false,
   getData: {},
 });
 
-const { praise, zan, getData } = toRefs(data);
+const { praise, zan, getData } = toRefs(state);
 
 // 详情页数据请求
 function getFireBaseDetail(params = {}) {
   getKnowledgeBaseDetails(params).then((res) => {
     getData.value = res.data[0];
-    console.log(getDgetData.valueata);
   });
 }
 
@@ -75,8 +79,6 @@ onLoad((option) => {
     company_code: uni.getStorageSync("selectedCode"),
     id: option.id,
   });
-  console.log("option");
-  console.log(option);
   uni.setNavigationBarTitle({
     title: option.title,
   });

src/pages/login.vue

@@ -46,14 +46,12 @@
 
       <!-- #ifdef APP-PLUS || MP-WEIXIN -->
       <view class="middle-agreed text-center">
-        <u-checkbox-group v-model="userChecked">
-          <u-checkbox :name="true" shape="circle" inactiveColor="#0081ff" size="13"></u-checkbox>
-        </u-checkbox-group>
-        <text>登录即已代表阅读并同意</text>
-        <!-- <text>我已阅读并同意</text> -->
+        <u-checkbox shape="circle" inactiveColor="#0081ff" size="13" :usedAlone="true" :checked="uChecked" @change="uCheckedChange"></u-checkbox>
+        <!-- <text>登录即已代表阅读并同意</text> -->
+        <text>我已阅读并同意</text>
         <text @click="handleUserAgrement" class="text-blue">用户协议</text>
         <text>和</text>
-        <text @click="handlePrivacy" class="text-blue">隐私协议</text>
+        <text @click="handlePrivacy" class="text-blue">隐私政策</text>
       </view>
       <!--#endif-->
     </view>
@@ -62,6 +60,28 @@
       <div class="title">{{ useStore.loginBottomTitle }}</div>
     </view>
   </view>
+
+  <u-modal
+    :show="modalShow"
+    title="用户协议及隐私政策"
+    :confirmText="'同意'"
+    :cancelText="'不同意'"
+    :zoom="false"
+    :showCancelButton="true"
+    @confirm="(uChecked = true), (modalShow = false)"
+    @cancel="modalShow = false"
+  >
+    <view class="slot-content">
+      <view>
+        您在使用我们的服务时，我们可能会收集和使用您的相关信息。我们希望通过本
+        <text class="text-blue underline">《用户协议及隐私政策》</text>
+        向您说明，在使用我们的服务时，我们如何收集、使用、 储存和分享这些信息，以及我们为您提供的访问、更新、控制和保护这些信息的方式。本
+        <text @click="handleUserAgrement" class="text-blue underline">《用户协议</text>
+        <text class="text-blue">及</text>
+        <text @click="handlePrivacy" class="text-blue underline">隐私政策》</text>，希望您仔细阅读，充分理解协议中的内容后再点击同意。
+      </view>
+    </view>
+  </u-modal>
 </template>
 
 <script setup>
@@ -91,10 +111,11 @@ const state = reactive({
   /** 服务器配置数据 */
   linkUrl: uni.getStorageSync("serveUrl"),
   /** 用户隐私协议数据 */
-  userChecked: [true],
+  uChecked: false,
+  modalShow: false,
 });
 
-const { phone, verify, switchText, username, password, isPassword, linkUrl, userChecked } = toRefs(state);
+const { phone, verify, switchText, username, password, isPassword, linkUrl, uChecked, modalShow } = toRefs(state);
 
 /**
  * @跳转服务器配置
@@ -174,8 +195,8 @@ function submitRes() {
     return;
   }
 
-  if (!userChecked.value[0]) {
-    proxy.$modal.msg("请在阅读并同意 用户协议和隐私协议后登录");
+  if (!uChecked.value) {
+    modalShow.value = true;
     return;
   }
   //#endif
@@ -237,6 +258,11 @@ function login(data) {
   });
 }
 
+// 复选框chage事件
+function uCheckedChange(e) {
+  uChecked.value = e;
+}
+
 // 用户协议
 function handleUserAgrement() {
   let site = config.appInfo.agreements[0];
@@ -416,6 +442,7 @@ onLoad((options) => {});
       color: #96a6b5;
       margin-top: 30px;
       display: flex;
+      flex-wrap: wrap;
       justify-content: center;
       > uni-view {
         margin: auto 0;

src/static/scss/colorui.css

@@ -3762,4 +3762,8 @@ scroll-view.cu-steps .cu-item {
 .line-white,
 .lines-white {
   color: #ffffff;
+}
+
+.underline {
+  text-decoration: underline
 }