Merge branch '拍卖' of xiongzhu/raex_front into dev

src/views/asset/AuctionPublish.vue

@@ -145,7 +145,7 @@ export default {
         return {
             price: '',
             startingPrice: '',
-            showStarting: false,
+            showStarting: true,
             showKeyboard: false,
             password: '',
             sets: false,

src/views/asset/Detail.vue

@@ -382,9 +382,9 @@
             <van-action-sheet v-model:show="showAction">
                 <div class="more-btns-content">
                     <van-button @click="Consignment" type="primary" block round>{{
-                        info.consignment ? '取消寄售' : '寄售上架'
+                        info.consignment ? '取消一口价' : '一口价竞拍'
                     }}</van-button>
-                    <van-button @click="publish" color="#FF7F1F" block round>拍卖上架</van-button>
+                    <van-button @click="publish" color="#FF7F1F" block round>竞价拍卖</van-button>
                     <van-button @click="Add" color="#FFBF27" block round>赠送</van-button>
                 </div>
             </van-action-sheet>

src/views/product/Detail.vue

@@ -338,6 +338,15 @@
                         </van-button>
                     </template>
 
+                    <van-button
+                        v-else-if="assignment && info.totalQuota && userInfo.vipPoint > 0"
+                        type="primary"
+                        block
+                        round
+                        @click="checkBuy"
+                        >立即购买
+                    </van-button>
+
                     <van-button v-else type="primary" block round @click="buy">
                         {{ info.couponPayment ? '立即兑换' : '立即购买' }}
                     </van-button>
@@ -650,6 +659,25 @@ export default {
                     });
                 });
         },
+        checkBuy() {
+            this.checkLogin()
+                .then(() => {
+                    return this.checkAuth();
+                })
+                .then(() => {
+                    return this.checkBank();
+                })
+                .then(() => {
+                    console.log('checkLOgin');
+                    this.$router.push({
+                        path: '/submit',
+                        query: {
+                            id: this.collectionId,
+                            invitor: this.$route.query.invitor || ''
+                        }
+                    });
+                });
+        },
         buy() {
             this.checkLogin().then(() => {
                 if (this.info.couponPayment && this.couponList.length === 0) {