首页

src/views/Home.vue

@@ -55,16 +55,25 @@
                         <div class="advance_notice_sale_left">近期发售计划</div>
                         <div class="advance_notice_sale_right">
                             <!-- <div class="advance_notice_sale_right_one">已预定</div> -->
-                            <div class="advance_notice_sale_right_two">预定</div>
+                            <div
+                                :class="reserve ? 'advance_notice_sale_right_one' : 'advance_notice_sale_right_two'"
+                                @click="reserveButton"
+                            >
+                                {{ reserve ? '已预定' : '预定' }}
+                            </div>
                         </div>
                     </div>
-                    <div class="collection_list_con" v-for="(item,index) in saleList" :key="index">
-                        <div class="collection_list_con_month">{{item.month}}</div>
-                        <div class="collection_list_con_time" v-for="(item,index) in item.children" :key="index">
-                            <div class="collection_list_con_time_con">{{item.time}}</div>
-                            <RecentSale v-for="(item,index) in item.saleChildren" :key="index" v-model:info="item[index]"></RecentSale>
+                    <div class="collection_list_con" v-for="(item, index) in saleList" :key="index">
+                        <div class="collection_list_con_month">{{ item.month }}</div>
+                        <div class="collection_list_con_time" v-for="(item, index) in item.children" :key="index">
+                            <div class="collection_list_con_time_con">{{ item.time }}</div>
+                            <RecentSale
+                                v-for="(item, index) in item.saleChildren"
+                                :key="index"
+                                v-model:info="item[index]"
+                            ></RecentSale>
                         </div>
-                    </div>                    
+                    </div>
                 </div>
             </div>
             <!-- <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white">
@@ -138,6 +147,7 @@ import product from '../mixins/product';
 import ProductLarge from '../components/product/productLarge.vue';
 import banner from '../mixins/banner';
 import RecentSale from '../components/product/recentSale.vue';
+import { Toast } from 'vant';
 // import ProductSmall from '../components/product/productSmall.vue';
 export default {
     data() {
@@ -150,34 +160,27 @@ export default {
             page: 0,
             isLoading: true,
             active: 0,
+            reserve: true,
             saleList: [
                 {
-                    month: "03月21日",
+                    month: '03月21日',
                     children: [
                         {
-                            time: "10:00开售",
-                            saleChildren: [
-                                {name:'11111'},
-                            ]
+                            time: '10:00开售',
+                            saleChildren: [{ name: '11111' }]
                         },
                         {
-                            time: "12:00开售",
-                            saleChildren: [
-                                {name:'11111'},
-                            ]
-                        },
+                            time: '12:00开售',
+                            saleChildren: [{ name: '11111' }]
+                        }
                     ]
                 },
                 {
-                    month: "03月22日",
+                    month: '03月22日',
                     children: [
                         {
-                            time: "10:00开售",
-                            saleChildren: [
-                                {name:'11111'},
-                                {name:'11111'},
-                                {name:'11111'}
-                            ]
+                            time: '10:00开售',
+                            saleChildren: [{ name: '11111' }, { name: '11111' }, { name: '11111' }]
                         }
                     ]
                 }
@@ -234,6 +237,13 @@ export default {
             Promise.all([this.getBanner(), this.getList()]).then(res => {
                 this.isLoading = false;
             });
+        },
+        // 预定
+        reserveButton() {
+            Toast({
+                message: '已订阅',
+                icon: require('@assets/yudingwancheng@3x.png')
+            });
         }
     },
     mounted() {
@@ -500,7 +510,7 @@ export default {
                         height: 28px;
                         border-radius: 4px;
                         border: 1px solid #222630;
-                        color: #ffffff;
+                        color: rgba(255, 255, 255, 0.3);
                         box-sizing: border-box;
                         line-height: 28px;
                         text-align: center;
@@ -517,28 +527,28 @@ export default {
                     }
                 }
             }
-            .collection_list_con{
+            .collection_list_con {
                 padding-top: 12px;
                 box-sizing: border-box;
-                background: linear-gradient(180deg, #232731 0%, #191D27 100%);
+                background: linear-gradient(180deg, #232731 0%, #191d27 100%);
                 border-radius: 18px;
-                .collection_list_con_month{
+                .collection_list_con_month {
                     margin-left: 15px;
                     height: 28px;
                     font-size: 20px;
                     font-family: PingFangSC-Semibold, PingFang SC;
                     font-weight: 600;
-                    color: #FFFFFF;
+                    color: #ffffff;
                     line-height: 28px;
                     margin-bottom: 2px;
                 }
-                .collection_list_con_time_con{
+                .collection_list_con_time_con {
                     margin-left: 15px;
                     height: 22px;
                     font-size: 16px;
                     font-family: PingFangSC-Medium, PingFang SC;
                     font-weight: 500;
-                    color: #FFFFFF;
+                    color: #ffffff;
                     line-height: 22px;
                     margin-bottom: 8px;
                 }

src/views/Submit.vue

@@ -459,6 +459,11 @@ export default {
                                 });
                                 this.getOrder(true);
                             }
+                        }else if (this.payType === 'H5PAY'){
+                             document.location.href = resolveUrl(
+                                this.$baseUrl,
+                                '/payOrder/sandQuick?id=' + this.orderId
+                            )
                         }
                     });
                 } else {
@@ -553,6 +558,14 @@ export default {
                                         });
                                     reject();
                                 });
+                        }else if (this.payType === 'H5PAY') {
+                            this.$router.replace({
+                                path: '/submit',
+                                query: {
+                                    orderId: this.orderId
+                                }
+                            });
+                            resolve();
                         }
                     });
                 } else {

src/views/asset/Detail.vue

@@ -317,7 +317,7 @@
                         {{ info.publicShow ? '公开展示' : '私密展示' }}
                     </div>
                 </div>
-                <div class="purchase_transaction_button_two_con_certificate">
+                <div class="purchase_transaction_button_two_con_certificate" @click="wait">
                     <img
                         :src="require('@assets/zhengshu@3x.png')"
                         alt=""