From e009cc043203df7f177d8b76081a3e95a38eb116 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E5=B3=B0=E2=80=9C?= <3512137118@qq.com>
Date: Thu, 14 Mar 2024 14:38:40 +0800
Subject: [PATCH] llf

---
 vite-project/components.d.ts                  |   2 +
 vite-project/src/router/index.ts              |   7 +
 vite-project/src/views/Home/HomeAccompany.vue |  26 +++-
 vite-project/src/views/Home/HomeView.vue      |   8 +-
 vite-project/src/views/Home/Homepay.vue       |  47 ++++--
 .../src/views/Home/Homepostpartum.vue         |  12 +-
 vite-project/src/views/Home/SelectView1.vue   |   2 +-
 vite-project/src/views/Home/homepay1.vue      | 139 ++++++++++++++++++
 8 files changed, 220 insertions(+), 23 deletions(-)
 create mode 100644 vite-project/src/views/Home/homepay1.vue

diff --git a/vite-project/components.d.ts b/vite-project/components.d.ts
index 6ada770..05140e5 100644
--- a/vite-project/components.d.ts
+++ b/vite-project/components.d.ts
@@ -20,6 +20,8 @@ declare module 'vue' {
     VanIcon: typeof import('vant/es')['Icon']
     VanNavBar: typeof import('vant/es')['NavBar']
     VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
     VanSearch: typeof import('vant/es')['Search']
     VanSticky: typeof import('vant/es')['Sticky']
     VanSwipe: typeof import('vant/es')['Swipe']
diff --git a/vite-project/src/router/index.ts b/vite-project/src/router/index.ts
index cf98566..fcbac01 100644
--- a/vite-project/src/router/index.ts
+++ b/vite-project/src/router/index.ts
@@ -5,6 +5,8 @@ const Home = () => import("views/Home/HomeView.vue");
 const HomeServer = () => import("views/Home/HomeServerView.vue");
 const HomeDetail = () => import("views/Home/HomeDetail.vue");
 const HomePay = () => import("views/Home/Homepay.vue");
+const HomePay1 = () => import("views/Home/homepay1.vue");
+
 const HomePostpartum=import("views/Home/Homepostpartum.vue");
 const Circle = () => import("views/Hjc/CircleView.vue");
 const StoreView = () => import("views/StoreView.vue");
@@ -118,6 +120,11 @@ const router = createRouter({
       name: "homepay",
       component: HomePay,
     },
+    {
+      path: "/homepay1",
+      name: "homepay1",
+      component: HomePay1,
+    },
     {
       path: "/homeAccompany",
       name: "homeAccompany",
diff --git a/vite-project/src/views/Home/HomeAccompany.vue b/vite-project/src/views/Home/HomeAccompany.vue
index 7eb1398..419afd2 100644
--- a/vite-project/src/views/Home/HomeAccompany.vue
+++ b/vite-project/src/views/Home/HomeAccompany.vue
@@ -52,9 +52,10 @@
     <div class="footer">
         <van-grid>
             <van-grid-item icon="service" text="联系客服" />
+        <van-grid><button
+                style="border: none;color: white;border-radius: 10px;width: 240px;background-color: rgb(48, 145, 96); height: 50px; margin-top: 20px; margin-left: 30px;"
+                @click="routerpay">立即预约</button></van-grid>
         </van-grid>
-        <button
-            style="float: right;margin-top: -70px;margin-right: 10px;border: none;color: white;border-radius: 10px;width: 240px;background-color: rgb(48, 145, 96);line-height: 50px;">立即预约</button>
     </div>
     <van-popup v-model:show="show" closeable position="bottom" :style="{ height: '50%' }">
         <div class="show_box">
@@ -109,6 +110,16 @@ const handelShowItem = (item) => {
     show.value = false;
 }
 
+const routerpay = () => {
+    router.push({
+        path: '/homepay',
+        query: {
+            id: '155424265542',
+            title: showlist.value.title,
+            price: showlist.value.price
+        }
+    })
+}
 </script>
 
 
@@ -163,15 +174,18 @@ const handelShowItem = (item) => {
     border-bottom: 1px solid #ccc;
 
 }
-.tab_img{
+
+.tab_img {
     width: 100%;
     height: 300px;
     margin-bottom: 80px;
 }
-.tab_img img{
+
+.tab_img img {
     width: 100%;
     height: 100%;
 }
+
 .personner_img {
     width: 30%;
     height: 100%;
@@ -257,6 +271,6 @@ const handelShowItem = (item) => {
     background-color: white;
     position: fixed;
     width: 100%;
+    align-items: center;
     bottom: 0;
-}
-</style>
\ No newline at end of file
+}</style>
\ No newline at end of file
diff --git a/vite-project/src/views/Home/HomeView.vue b/vite-project/src/views/Home/HomeView.vue
index 2605c9c..283df20 100644
--- a/vite-project/src/views/Home/HomeView.vue
+++ b/vite-project/src/views/Home/HomeView.vue
@@ -23,7 +23,7 @@
           <van-icon size="2rem" class='iconfont icon-banshou' @click="handelRouterHomeServer" />
           <p>甲醛检测</p>
         </li>
-        <li>
+        <li @click="handleRouterJiadian">
           <van-icon size="2rem" class='iconfont icon-banshou' />
           <p>家电维修</p>
         </li>
@@ -177,6 +177,12 @@ const handelRouterHomeServer = () => {
   })
 }
 
+const handleRouterJiadian=()=>{
+  router.push({
+    path:'/jia',
+  })
+}
+
 </script>
 
 <style scoped>
diff --git a/vite-project/src/views/Home/Homepay.vue b/vite-project/src/views/Home/Homepay.vue
index ff18da1..d1e62aa 100644
--- a/vite-project/src/views/Home/Homepay.vue
+++ b/vite-project/src/views/Home/Homepay.vue
@@ -3,10 +3,10 @@
         <CommonNavBar title="支付界面" />
         <div class="pay_text">
             <div class="pay_order">
-                <p>订单编号：cx122222231222</p>
+                <p>订单编号：{{ payinfo.id }}</p>
             </div>
             <div class="pay_order1">
-                <p>待支付：cx122222231222</p>
+                <p>待支付：{{ payinfo.price }}</p>
             </div>
             <div class="pay_p">
                 <p>为了不影响您的服务，请尽快支付</p>
@@ -15,20 +15,25 @@
         <div class="pay_post">
             <ul>
                 <li>
-                    <van-icon size="1.5rem" style="width: 10%;" class='iconfont icon-kefu' /><span>微信支付</span>
+                    <van-icon size="1.5rem" style="width: 10%;" class='iconfont icon-weixinzhifu' /><span>微信支付</span>
 
-                        <van-checkbox v-model="checked"></van-checkbox>
+                    <van-radio-group v-model="checked">
+                        <van-radio name="1"></van-radio>
+                    </van-radio-group>
 
                 </li>
                 <li>
-                    <van-icon size="1.5rem"  style="width: 10%;" class='iconfont icon-kefu' />
+                    <van-icon size="1.5rem" style="width: 10%;" class='iconfont icon-kefu' />
                     <span>支付宝支付</span>
-                        <van-checkbox v-model="checked"></van-checkbox>
+                    <van-radio-group v-model="checked">
+                        <van-radio name="2"></van-radio>
+                    </van-radio-group>
+
                 </li>
             </ul>
         </div>
         <div class="pay_button">
-            <van-button type="primary" size="large">立即支付</van-button>
+            <van-button type="primary" size="large" @click="hanldepay1">立即支付</van-button>
         </div>
     </div>
 </template>
@@ -36,7 +41,28 @@
 
 <script setup>
 import CommonNavBar from '../../component/CommonNavBar.vue'
-import { ref } from 'vue';
+import { useRouter, useRoute } from 'vue-router'
+import { ref, onMounted } from 'vue';
+
+const router = useRouter();
+const route = useRoute();
+const payinfo = ref({})
+const checked = ref('1');
+onMounted(() => {
+    console.log(route.query);
+    payinfo.value = route.query
+})
+
+const hanldepay1 = () => {
+    console.log(payinfo.value);
+    router.push({
+        path: '/homepay1',
+        query: {
+            id: payinfo.value.id,
+            price: payinfo.value.price
+        }
+    })
+}
 
 
 </script>
@@ -93,7 +119,7 @@ import { ref } from 'vue';
     display: flex;
     align-items: center;
     height: 70px;
-    padding: 10px;
+    padding: 5px;
     border-bottom: 1px solid rgb(220, 221, 222);
 }
 
@@ -102,7 +128,8 @@ import { ref } from 'vue';
 .pay_post ul li span {
     width: 80%;
 }
-.pay_button{
+
+.pay_button {
     margin-top: 70px;
     height: 200px;
     padding: 20px;
diff --git a/vite-project/src/views/Home/Homepostpartum.vue b/vite-project/src/views/Home/Homepostpartum.vue
index dfa4d21..9f8a347 100644
--- a/vite-project/src/views/Home/Homepostpartum.vue
+++ b/vite-project/src/views/Home/Homepostpartum.vue
@@ -4,8 +4,11 @@
         <div class="postpartum_content">
             <div class="postpartum_content_item" v-for="(item, index) in StewartList" :key="index">
                 <div class="item_checkbox">
-                    <van-checkbox :name="item._id" v-model="checked"></van-checkbox>
-                </div> 
+                    <van-radio-group v-model="checked">
+                        <van-radio :name='item._id'></van-radio>
+                    </van-radio-group>
+
+                </div>
                 <div class="personner_img">
                     <img :src="item.Stewardimg" alt="">
                 </div>
@@ -26,7 +29,7 @@
                 </div>
             </div>
         </div>
-        
+
     </div>
 </template>
 
@@ -36,7 +39,7 @@ import axiosInstance from '../../axios/index.ts'
 import { useRouter } from 'vue-router';
 import { ref, onMounted } from 'vue';
 const router = useRouter();
-const checked = ref(true);
+const checked = ref('65f147697cbcfdb5076253e8');
 
 const StewartList = ref([])
 
@@ -119,5 +122,4 @@ const getlist = async () => {
     border: none;
     border-radius: 10px;
 }
-
 </style>
\ No newline at end of file
diff --git a/vite-project/src/views/Home/SelectView1.vue b/vite-project/src/views/Home/SelectView1.vue
index ed20b5b..8d07518 100644
--- a/vite-project/src/views/Home/SelectView1.vue
+++ b/vite-project/src/views/Home/SelectView1.vue
@@ -116,7 +116,7 @@ const submitOrder = async () => {
     // 提交订单
     const { data } = await axiosInstance.post('/axlAPi/order',params, { headers: { 'Authorization': `Bearer ${accessToken}` } })
     
-    router.push('/homepay')
+    router.push({ path: '/homepay', query: { id: userId.value, price: selectedOption.value.price}})
     
 }
 
diff --git a/vite-project/src/views/Home/homepay1.vue b/vite-project/src/views/Home/homepay1.vue
new file mode 100644
index 0000000..3cdf580
--- /dev/null
+++ b/vite-project/src/views/Home/homepay1.vue
@@ -0,0 +1,139 @@
+<template>
+  <div class="pay_box">
+    <CommonNavBar title="支付成功"></CommonNavBar>
+    <div class="pay_success">
+        <van-icon size="2.5rem" style="width: 10%;" class='iconfont icon-weixinzhifu' />
+        <span>支付成功</span>
+    </div>
+    <div class="pay_text">
+        <div class="text_price">
+            <p>￥{{ paylist.price }}</p>
+        </div>
+        <div class="text_list">
+            <p>订单编号：{{ paylist.id }}</p>
+            <p>交易时间：{{ getTimer1() }}</p>
+            <p>服务时间：2024/4/20</p>
+        </div>
+        
+    </div>
+    <div class="pay_hint">
+        <p>您的订单支付成功，管家上门前将会与您联系，请保持手机通畅，祝您生活愉快</p>
+    </div>
+    <div class="pay_button">
+        <div class="button1">
+            <van-button  size="large">返回首页</van-button>
+        </div>
+        <div class="button1">
+            <van-button type="primary" size="large" style="background-color: green;">查看订单</van-button>
+        </div>
+    </div>
+  </div>
+</template>
+
+
+<script setup>
+import CommonNavBar from '../../component/CommonNavBar.vue'
+import { useRouter,useRoute } from 'vue-router';
+import { ref,onMounted } from 'vue';
+const craetime=ref(new Date().getTime());
+const router = useRouter();
+const route = useRoute();
+const paylist = ref({});
+onMounted(()=>{
+    paylist.value = route.query;
+    console.log(paylist.value);
+})
+
+//获取年月日时分秒
+function getTimer1() {
+    let time = new Date()
+    let y = time.getFullYear()
+    let m = time.getMonth() + 1
+    let d = time.getDate()
+    let h = time.getHours()
+    h = h < 10 ? '0' + h : h
+    let min = time.getMinutes()
+    min = min < 10 ? '0' + min : min
+    let s = time.getSeconds()
+    s = s < 10 ? '0' + s : s
+    return y + '/' + m + '/' + d + ' ' + h + ':' + min + ':' + s
+}
+//
+
+
+
+</script>
+
+
+
+<style scoped>
+.pay_box{
+    width: 100%;
+    height: 100%;
+    background: #f5f5f5;
+}
+.pay_success{
+    width: 100%;
+    height: 12rem;
+    background: green;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-bottom: .2rem;  
+    display: flex; 
+    font-size: 25px;
+}
+.pay_text{
+    background: #fff;
+    margin-bottom: .2rem;  
+    position: relative;
+    top: -50px;
+    border-radius: 20px;
+    margin: 0 10px;
+}
+.text_price{
+    width: 100%;
+    height: 5rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 30px;
+    color: orange;
+    font-weight: 600;
+}
+.text_list{
+    width: 100%;
+    padding:0px 10px;
+    font-size: 18px;
+}
+.text_list p{
+    height: 3rem;
+    line-height: 3rem;
+}
+.pay_hint{
+    width: 100%;
+    height: 3rem;
+    align-items: center;
+    font-size: 18px;
+    color: #666;
+}
+.button1{
+    width: 100%;
+    height: 5rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+.pay_button{
+    display: flex;
+    align-items: center;
+    height: 100%;
+}
+.button1{
+    width: 50%;
+}
+.button1 button{
+    width: 120px;
+}
+
+</style>
\ No newline at end of file
-- 
Gitee