From aef52631e78727e49f9444f07d4721bec2ea94d6 Mon Sep 17 00:00:00 2001
From: YuanHuakk <1751826683@qq.com>
Date: Fri, 15 Mar 2024 16:06:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(custom):=20=E6=96=B0=E5=A2=9E=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  4 +-
 src/api/user.ts                               |  3 +
 src/app.config.ts                             |  1 +
 .../pending_order_detail/index.config.ts      |  2 +-
 .../pending_order_detail/index.vue            |  7 ++-
 .../pending_order/wx_pay_code/index.vue       |  8 ++-
 src/pages/users/login/index.vue               | 56 ++++++++++++++++++-
 src/pages/users/pending_order/index.vue       |  4 +-
 .../users/user_agreement/index.config.ts      |  1 +
 src/pages/users/user_agreement/index.scss     |  0
 src/pages/users/user_agreement/index.vue      | 37 ++++++++++++
 11 files changed, 113 insertions(+), 10 deletions(-)
 create mode 100644 src/pages/users/user_agreement/index.config.ts
 create mode 100644 src/pages/users/user_agreement/index.scss
 create mode 100644 src/pages/users/user_agreement/index.vue

diff --git a/package.json b/package.json
index a15fc28..6426407 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "jdt-user",
-	"version": "3.0.11",
+	"version": "3.0.12",
 	"private": true,
 	"description": "",
 	"templateInfo": {
@@ -9,7 +9,7 @@
 		"css": "sass"
 	},
 	"taroConfig": {
-		"version": "3.0.11"
+		"version": "3.0.12"
 	},
 	"scripts": {
 		"build:weapp": "taro build --type weapp",
diff --git a/src/api/user.ts b/src/api/user.ts
index 82056d9..07a7bef 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -1,5 +1,8 @@
 import request from "@/utils/request";
 
+// 获取用户协议
+export const getAgreement = () => request("/user/agreement", {}, "POST");
+
 // 登录
 export const login = (data: object) => request("/login", data, "POST");
 export const phoneLogin = (data: object) =>
diff --git a/src/app.config.ts b/src/app.config.ts
index 0fe8ed4..2e2d248 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -10,6 +10,7 @@ export default defineAppConfig({
     {
       root: "pages/users",
       pages: [
+        "user_agreement/index",
         "order_list/index",
         "setting/index",
         "user_setting/index",
diff --git a/src/pages/admin/add_order/pending_order/pending_order_detail/index.config.ts b/src/pages/admin/add_order/pending_order/pending_order_detail/index.config.ts
index 3cea8b7..7343664 100644
--- a/src/pages/admin/add_order/pending_order/pending_order_detail/index.config.ts
+++ b/src/pages/admin/add_order/pending_order/pending_order_detail/index.config.ts
@@ -1,4 +1,4 @@
 export default definePageConfig({
   navigationBarTitleText: "订单详情",
-  navigationStyle: "custom",
+  // navigationStyle: "custom",
 });
diff --git a/src/pages/admin/add_order/pending_order/pending_order_detail/index.vue b/src/pages/admin/add_order/pending_order/pending_order_detail/index.vue
index ab275c7..8870504 100644
--- a/src/pages/admin/add_order/pending_order/pending_order_detail/index.vue
+++ b/src/pages/admin/add_order/pending_order/pending_order_detail/index.vue
@@ -1,7 +1,7 @@
 <template>
   <view>
-    <back-component title="订单详情" />
-    <view class="card" style="margin-top: 115px">
+    <!-- <back-component title="订单详情" /> -->
+    <view class="card" style="margin-top: 15px">
       <view class="header">
         <view>
           <text>台号: {{ data.seat }}</text>
@@ -64,6 +64,7 @@
       <nut-cell title="下单数量" :desc="String(data.count)"></nut-cell>
       <nut-cell title="订单金额" :desc="String(data.payments)"></nut-cell>
       <nut-cell title="应收金额" :desc="String(data.payments)"></nut-cell>
+      <nut-cell title="赠送游戏豆" :desc="String(data.gift_pulse)"></nut-cell>
       <nut-cell
         v-if="data.status !== 0"
         title="实收金额"
@@ -89,7 +90,7 @@ import { ref } from "vue";
 import Taro from "@tarojs/taro";
 import Footer from "../components/Footer.vue";
 import { getAfterOrder } from "@/api/admin";
-import BackComponent from "../../../../../components/Back.vue";
+// import BackComponent from "../../../../../components/Back.vue";
 
 const data = ref<any>({});
 
diff --git a/src/pages/admin/add_order/pending_order/wx_pay_code/index.vue b/src/pages/admin/add_order/pending_order/wx_pay_code/index.vue
index bf43b14..7be740b 100644
--- a/src/pages/admin/add_order/pending_order/wx_pay_code/index.vue
+++ b/src/pages/admin/add_order/pending_order/wx_pay_code/index.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from "vue";
+import { onUnmounted, ref } from "vue";
 import Taro from "@tarojs/taro";
 import { getAfterOrder } from "@/api/admin";
 
@@ -23,6 +23,7 @@ const info = ref<any>({});
 
 Taro.useLoad((e) => {
   info.value = e;
+  console.log(e);
   code.value = Taro.getStorageSync("pay_code");
   time_id.value = setInterval(async () => {
     const { data } = await getAfterOrder({
@@ -36,6 +37,7 @@ Taro.useLoad((e) => {
         icon: "success",
       });
       setTimeout(() => {
+        Taro.removeStorageSync("pay_code");
         Taro.navigateTo({
           url: `/pages/admin/add_order/pending_order/pending_order_detail/index?oid=${info.value.oid}&bid=${info.value.bid}`,
         });
@@ -47,6 +49,10 @@ Taro.useLoad((e) => {
 Taro.useDidHide(() => {
   clearInterval(time_id.value);
 });
+
+onUnmounted(() => {
+  clearInterval(time_id.value);
+});
 </script>
 
 <style lang="scss">
diff --git a/src/pages/users/login/index.vue b/src/pages/users/login/index.vue
index 5d54666..1d7ce8e 100644
--- a/src/pages/users/login/index.vue
+++ b/src/pages/users/login/index.vue
@@ -6,7 +6,14 @@ import logoImg from "../../../static/logo.jpg";
 
 const isShow = ref(false);
 
+const val = ref(false);
+
 const getCode = () => {
+  if (!val.value)
+    return Taro.showToast({
+      title: "请先阅读并同意用户协议&隐私政策&积分使用规则",
+      icon: "none",
+    });
   Taro.showLoading({
     title: "授权中...",
     mask: true,
@@ -24,10 +31,22 @@ const getCode = () => {
 };
 
 const toPage = () => {
+  if (!val.value)
+    return Taro.showToast({
+      title: "请先阅读并同意用户协议&隐私政策&积分使用规则",
+      icon: "none",
+    });
   Taro.navigateTo({
     url: "/pages/users/bindPhone/index?type=1",
   });
 };
+
+const clickText = (type: number, text: string) => {
+  console.log("点击了协议", type);
+  Taro.navigateTo({
+    url: `/pages/users/user_agreement/index?type=${type}&name=${text}`,
+  });
+};
 </script>
 
 <template>
@@ -38,11 +57,28 @@ const toPage = () => {
       <view>捷兑通</view>
     </view>
     <view class="center">
-      <nut-button type="success" @click="getCode">微信登录</nut-button>
+      <nut-button type="primary" @click="getCode">一键微信授权登录</nut-button>
       <nut-button style="margin-top: 15px" @click="toPage"
         >手机号登录</nut-button
       >
     </view>
+    <view class="checkbox"
+      ><nut-checkbox v-model="val"></nut-checkbox>
+      <view class="text">
+        阅读并同意
+        <view style="color: #fa2c1a" @click.stop="clickText(1, '用户协议')">
+          用户协议
+        </view>
+        &<view style="color: #fa2c1a" @click.stop="clickText(2, '隐私政策')">
+          隐私政策 </view
+        >&<view
+          style="color: #fa2c1a"
+          @click.stop="clickText(3, '积分使用规则')"
+        >
+          积分使用规则
+        </view>
+      </view>
+    </view>
     <UserModal v-model:isShow="isShow" @closeEdit="isShow = false" />
   </view>
 </template>
@@ -86,4 +122,22 @@ page {
     padding: 10px 100px;
   }
 }
+
+.checkbox {
+  position: absolute;
+  bottom: -15%;
+  width: 100%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  display: flex;
+  justify-content: center;
+
+  .nut-checkbox__label {
+    margin-left: -60px;
+  }
+
+  .text {
+    display: flex;
+  }
+}
 </style>
diff --git a/src/pages/users/pending_order/index.vue b/src/pages/users/pending_order/index.vue
index 39f7b6e..607d957 100644
--- a/src/pages/users/pending_order/index.vue
+++ b/src/pages/users/pending_order/index.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <view class="topTips">
+    <!-- <view class="topTips">
       <view>
         <view style="font-weight: bold">订单信息</view>
         <view style="font-size: 15px"
@@ -11,7 +11,7 @@
         </view>
       </view>
       <image src="../static/user/order_list_top.png" />
-    </view>
+    </view> -->
     <view class="tabs">
       <view
         class="item"
diff --git a/src/pages/users/user_agreement/index.config.ts b/src/pages/users/user_agreement/index.config.ts
new file mode 100644
index 0000000..645fdfc
--- /dev/null
+++ b/src/pages/users/user_agreement/index.config.ts
@@ -0,0 +1 @@
+export default definePageConfig({});
diff --git a/src/pages/users/user_agreement/index.scss b/src/pages/users/user_agreement/index.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/pages/users/user_agreement/index.vue b/src/pages/users/user_agreement/index.vue
new file mode 100644
index 0000000..1fa272c
--- /dev/null
+++ b/src/pages/users/user_agreement/index.vue
@@ -0,0 +1,37 @@
+<template>
+  <view><rich-text :nodes="nodes"></rich-text> </view>
+</template>
+
+<script setup lang="ts">
+import Taro from "@tarojs/taro";
+import { ref } from "vue";
+import { getAgreement } from "../../../api/user";
+
+const nodes = ref(``);
+
+Taro.useLoad((e) => {
+  Taro.setNavigationBarTitle({
+    title: e.name,
+  });
+  get_data(e.type);
+});
+
+const get_data = async (type: string) => {
+  const res = await getAgreement();
+  switch (type) {
+    case "1":
+      nodes.value = res.data.data.user;
+      break;
+    case "2":
+      nodes.value = res.data.data.policy;
+      break;
+    case "3":
+      nodes.value = res.data.data.integral;
+      break;
+  }
+};
+</script>
+
+<style lang="scss">
+@import "./index.scss";
+</style>