From 34add8d2263d3de0e221ddb511def60ad9b55199 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Mon, 10 Feb 2025 10:56:38 +0800
Subject: [PATCH] =?UTF-8?q?feat(signature):=20=E6=B7=BB=E5=8A=A0=E7=AD=BE?=
 =?UTF-8?q?=E5=90=8D=E5=8A=9F=E8=83=BD=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增签名面板页面，用于用户签名
- 新增个人信息页面，用于填写个人相关资料- 新增协议页面，用于展示拍卖规则等协议内容
-优化直播页面竞拍结束提示逻辑
- 修复国家区域选择页面路由问题
- 优化个人主页下拉刷新功能
---
 app/pages/countryRegion/index.vue           |  7 ++-
 app/pages/profile/index.vue                 | 36 +++++++++---
 app/pages/signature/panel/index.vue         | 18 ++++++
 app/pages/signature/personal-Info/index.vue | 64 +++++++++++++++++++++
 app/pages/signature/protocol/index.vue      | 40 +++++++++++++
 app/stores/live/index.js                    | 33 +++++++++++
 6 files changed, 187 insertions(+), 11 deletions(-)
 create mode 100644 app/pages/signature/panel/index.vue
 create mode 100644 app/pages/signature/personal-Info/index.vue
 create mode 100644 app/pages/signature/protocol/index.vue

diff --git a/app/pages/countryRegion/index.vue b/app/pages/countryRegion/index.vue
index cba249c..d6dacf5 100644
--- a/app/pages/countryRegion/index.vue
+++ b/app/pages/countryRegion/index.vue
@@ -9,6 +9,7 @@ definePageMeta({
   i18n: 'countryRegion.title',
 })
 const router = useRouter()
+console.log('router',router)
 const { t, locale } = useI18n()
 const value = ref('');
 const alphabet = [
@@ -90,10 +91,10 @@ const searchCountry = computed(() => {
 });
 
 const showIndexBar = computed(() => locale.value !== 'ja-JP')
-
+const route = useRoute()
 const handleCountrySelect = (country) => {
-  router.push({
-    path: '/login',
+  router.replace({
+    path: window.history.state.back,
     query: {
       zone: country.zone,
       countryName: country.displayName
diff --git a/app/pages/profile/index.vue b/app/pages/profile/index.vue
index 9a70b14..47c440e 100644
--- a/app/pages/profile/index.vue
+++ b/app/pages/profile/index.vue
@@ -3,6 +3,7 @@ import {userArtworks} from "@/api/goods/index.js";
 import {authStore} from "@/stores/auth/index.js";
 import xImage from '@/components/x-image/index.vue'
 import {goodStore} from "~/stores/goods/index.js";
+import {ref} from "vue";
 definePageMeta({
   layout: 'default',
   title: '我的',
@@ -21,12 +22,11 @@ const groupAndSortByDate=(data)=> {
       acc[curr.userCreatedAt] = {
         userCreatedAt: curr.userCreatedAt,
         list: []
-      };
+      }
     }
-    acc[curr.userCreatedAt].list.push(curr);
+    acc[curr.userCreatedAt].list.push(curr)
     return acc;
-  }, {}))
-      .sort((a, b) => new Date(b.userCreatedAt) - new Date(a.userCreatedAt));
+  }, {})).sort((a, b) => new Date(b.userCreatedAt) - new Date(a.userCreatedAt));
 }
 const initData=async ()=>{
  const res=await userArtworks({})
@@ -36,10 +36,17 @@ const initData=async ()=>{
   }
 }
 const router = useRouter()
-
+const localState = ref({
+  finished: false,
+  refreshing: false,
+  showDetail: false,
+  showHeight: ''
+})
 initData()
 const goPay=()=>{
-
+  router.push({
+    path:'/signature/personal-Info'
+  })
 }
 const goDetail=(item)=>{
   router.push({
@@ -49,6 +56,16 @@ const goDetail=(item)=>{
     }
   })
 }
+const onRefresh = async () => {
+  try {
+    localState.value.refreshing = true
+    localState.value.finished = false
+    const { finished } = await getArtworkList(true)
+    localState.value.finished = finished
+  } finally {
+    localState.value.refreshing = false
+  }
+}
 </script>
 
 <template>
@@ -66,7 +83,10 @@ const goDetail=(item)=>{
       <div class="border-b-1px border-b-#D3D3D3  px-16px flex">
         <div class="text-#000 text-16px border-b-3 border-b-#2B53AC h-36px">我的拍品</div>
       </div>
-      <van-pull-refresh     @refresh="initData">
+      <van-pull-refresh       v-model="localState.refreshing"
+                              success-text="刷新成功"
+                              :success-duration="700"
+                              @refresh="onRefresh">
         <van-list
             finished-text="没有更多了"
         >
@@ -83,7 +103,7 @@ const goDetail=(item)=>{
                     <div class="text-#575757 text-14px line-height-none mb-5px">起拍价：RMB 1,000</div>
                     <div class="text-#B58047 text-14px line-height-none">成交价：RMB 10,000</div>
                   </div>
-                  <div v-if="[1,3,4].includes(item1.status)" @click="goPay">
+                  <div v-if="[1,3,4].includes(item1.status)" @click.stop="goPay">
                     <van-button class="w-73px !h-30px" type="primary"><span class="text-12px">去支付</span></van-button>
                   </div>
                 </div>
diff --git a/app/pages/signature/panel/index.vue b/app/pages/signature/panel/index.vue
new file mode 100644
index 0000000..c3f7297
--- /dev/null
+++ b/app/pages/signature/panel/index.vue
@@ -0,0 +1,18 @@
+<script setup>
+const image = ref('');
+import { showToast } from 'vant';
+
+const onSubmit = (data) => {
+  image.value = data.image;
+};
+const onClear = () => showToast('clear');
+</script>
+
+<template>
+  <van-signature @submit="onSubmit" @clear="onClear" />
+  <van-image v-if="image" :src="image" />
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/app/pages/signature/personal-Info/index.vue b/app/pages/signature/personal-Info/index.vue
new file mode 100644
index 0000000..29c848e
--- /dev/null
+++ b/app/pages/signature/personal-Info/index.vue
@@ -0,0 +1,64 @@
+<script setup>
+import {useI18n} from "vue-i18n";
+import XVanSelect from '@/components/x-van-select/index.vue'
+import XVanDate from '@/components/x-van-date/index.vue'
+definePageMeta({
+  name: 'personal-info',
+
+})
+const {t} = useI18n()
+const showPicker = ref(false)
+const showPicker1 = ref(false)
+const onConfirm = () => {
+
+}
+const router = useRouter()
+const columns = ref([
+  {text: t('realAuth.male'), value: 1},
+  {text: t('realAuth.female'), value: 2},
+])
+const goCountryRegion=()=>{
+  router.push({
+    path:'/countryRegion'
+  })
+}
+const adress=ref('')
+</script>
+
+<template>
+  <div
+      class="w-[100vw] bg-[url('@/static/images/asdfsdd.png')] h-screen-nav bg-cover pt-77px flex-grow-1 flex flex-col ">
+    <div class="text-16px text-#191919 font-bold mb-40px px-34px">
+      请填写个人相关信息
+    </div>
+    <div class="grow-1 px-34px">
+      <van-field type="tel" :label-width="161" label="文本" class="mb-10px" placeholder="请输入手机号">
+        <template #label>
+          <div class="flex">
+            <div class="mr-41px whitespace-nowrap">手机号</div>
+            <div @click="goCountryRegion">
+              <span class="mr-13px">+ 86</span>
+              <van-icon name="arrow-down" class="text-#777777"/>
+            </div>
+          </div>
+        </template>
+      </van-field>
+      <van-field label="姓名" class="mb-10px" placeholder="请输入姓名"/>
+      <x-van-select label="性别" :columns="columns"/>
+      <x-van-date label="出生日期"/>
+      <van-field v-model="adress" label="家庭住址" class="mb-10px" placeholder="请输入家庭住址"/>
+      <van-field label="所属银行" class="mb-10px" placeholder="请输入所属银行"/>
+      <van-field label="银行卡号码" class="mb-10px" placeholder="请输入银行卡号码"/>
+    </div>
+    <div class="h-81px bg-#fff flex justify-center pt-7px border-t">
+      <van-button color="#2B53AC" class="w-213px van-btn-h-38px">下一步</van-button>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="scss">
+:deep(.van-cell.van-field){
+  padding-left: 0;
+}
+
+</style>
\ No newline at end of file
diff --git a/app/pages/signature/protocol/index.vue b/app/pages/signature/protocol/index.vue
new file mode 100644
index 0000000..3573d12
--- /dev/null
+++ b/app/pages/signature/protocol/index.vue
@@ -0,0 +1,40 @@
+<script setup>
+const activeNames = ref(['1']);
+
+</script>
+
+<template>
+<div class="bg-#EBEBEB h-screen-nav flex flex-col">
+  <div class="h-50px text-14px text-#191919 bg-#fff flex items-center px-21px mb-6px">支付前需同意以下内容并签字</div>
+  <van-collapse v-model="activeNames" class="grow-1">
+    <van-collapse-item  name="1" class="mb-6px">
+      <template #title>
+        <div class="text-#2B53AC text-14px">《拍卖规则》</div>
+      </template>
+      代码是写出来给人看的，附带能在机器上运行。
+    </van-collapse-item>
+    <van-collapse-item  name="2" class="mb-6px">
+      <template #title>
+        <div class="text-#2B53AC text-14px">《拍卖规则》</div>
+      </template>
+      代码是写出来给人看的，附带能在机器上运行。
+    </van-collapse-item>
+    <van-collapse-item  name="3" class="mb-6px">
+      <template #title>
+        <div class="text-#2B53AC text-14px">《拍卖规则》</div>
+      </template>
+      代码是写出来给人看的，附带能在机器上运行。
+    </van-collapse-item>
+  </van-collapse>
+  <div class="h-81px bg-#fff flex justify-center pt-7px border-t">
+    <van-button color="#2B53AC" class="w-213px van-btn-h-38px">同意并签字</van-button>
+  </div>
+</div>
+</template>
+
+<style scoped>
+:deep(.van-cell__right-icon){
+  color: #ACACAC;
+  font-size: 12px;
+}
+</style>
\ No newline at end of file
diff --git a/app/stores/live/index.js b/app/stores/live/index.js
index 5c2a91a..5be84d0 100644
--- a/app/stores/live/index.js
+++ b/app/stores/live/index.js
@@ -100,10 +100,43 @@ export const liveStore = createGlobalState(() => {
                             bottom: '230px'
                         },
                     })
+                }else if (data.data?.tip?.tipType === 'failBid'){
+                    message.error({
+                        title: {
+                            text: '很遗憾，竞拍失败',
+                            color: '#CF3050',
+                            align: 'center',
+                        },
+                        icon:false,
+                        subTitle:{
+                            text:'竞拍结束',
+                            color: '#939393',
+                            align: 'center',
+                        },
+                        style: {
+                            width: '186px',
+                            bottom: '230px'
+                        },
+                    })
                 }
 
             }else if (data.data?.wsType==='stopArtwor'){
                 quoteStatus.value=false
+            }else if (data.data?.wsType==='over'){
+                message.success({
+                    title: {
+                        text: '竞拍结束，谢谢参与',
+                        color: '#575757',
+                        align: 'center',
+                        backgroundColor: '#fff',
+                        borderColor:'#fff'
+                    },
+                    icon:false,
+                    style: {
+                        width: '195px',
+                        bottom: '230px'
+                    },
+                })
             }
 
             console.log('onmessage', data)