Merge branch 'dev' of xiongzhu/raex_front into master

src/components/auction/deposit.vue

@@ -444,6 +444,24 @@ export default {
                             .replace('www.raex.vip', 'jump.raex.vip')
                             .replace('test.raex.vip', 'jumptest.raex.vip')
                             .replace(/http:\/\/192\.168.*?\//, 'https://jumptest.raex.vip/');
+                    } else if (this.payType === 'QUICK_BIND') {
+                        this.$http
+                            .get('/payOrder/v2/auction/sandQuickBind?id=' + this.orderId)
+                            .then(res => {
+                                document.location.href = res;
+                                this.getOrder(true);
+                            })
+                            .catch(e => {
+                                this.$toast.clear();
+                                this.$dialog
+                                    .alert({
+                                        title: '提示',
+                                        message: e.error || '支付失败'
+                                    })
+                                    .then(res => {
+                                        this.$router.go(-2);
+                                    });
+                            });
                     } else if (this.payType === 'BALANCE') {
                         if (!this.tradeCode) {
                             this.$toast.clear();
@@ -586,6 +604,24 @@ export default {
                                 .replace('www.raex.vip', 'jump.raex.vip')
                                 .replace('test.raex.vip', 'jumptest.raex.vip')
                                 .replace(/http:\/\/192\.168.*?\//, 'https://jumptest.raex.vip/');
+                        } else if (this.payType === 'QUICK_BIND') {
+                            this.$http
+                                .get('/payOrder/v2/auction/sandQuickBind?id=' + this.orderId)
+                                .then(res => {
+                                    document.location.href = res;
+                                    this.getOrder(true);
+                                })
+                                .catch(e => {
+                                    this.$toast.clear();
+                                    this.$dialog
+                                        .alert({
+                                            title: '提示',
+                                            message: e.error || '支付失败'
+                                        })
+                                        .then(res => {
+                                            this.$router.go(-2);
+                                        });
+                                });
                         }
                     });
                 } else {

src/views/Givesubmit.vue

@@ -347,6 +347,24 @@ export default {
                         .replace('www.raex.vip', 'jump.raex.vip')
                         .replace('test.raex.vip', 'jumptest.raex.vip')
                         .replace(/http:\/\/192\.168.*?\//, 'https://jumptest.raex.vip/');
+                } else if (this.payType === 'QUICK_BIND') {
+                    this.$http
+                        .get('/payOrder/v2/gift/sandQuickBind?id=' + this.orderId)
+                        .then(res => {
+                            document.location.href = res;
+                            this.getOrder(true);
+                        })
+                        .catch(e => {
+                            this.$toast.clear();
+                            this.$dialog
+                                .alert({
+                                    title: '提示',
+                                    message: e.error || '支付失败'
+                                })
+                                .then(res => {
+                                    this.$router.go(-2);
+                                });
+                        });
                 } else if (this.payType === 'BALANCE') {
                     this.$toast.loading({
                         message: '支付中',

src/views/Store.vue

@@ -698,4 +698,4 @@ export default {
         margin-top: 10vh;
     }
 }
-</style>
+</style>

src/views/Submit.vue

@@ -419,14 +419,26 @@ export default {
                 console.log(url);
                 document.location.href = url;
                 this.getOrder(true);
-            } else if (this.payType === 'UNION') {
-                const url = resolveUrl(this.$baseUrl, '/payOrder/v2/sandQuickBind?id=' + this.orderId)
-                    .replace('www.raex.vip', 'jump.raex.vip')
-                    .replace('test.raex.vip', 'jumptest.raex.vip')
-                    .replace(/http:\/\/192\.168.*?\//, 'https://jumptest.raex.vip/');
-                console.log(url);
-                document.location.href = url;
-                this.getOrder(true);
+            } else if (this.payType === 'QUICK_BIND') {
+                this.$http
+                    .get('/payOrder/v2/sandQuickBind?id=' + this.orderId)
+                    .then(res => {
+                        document.location.href = res;
+                        this.getOrder(true);
+                    })
+                    .catch(e => {
+                        this.$toast.clear();
+                        e = e || {};
+                        e.error = e.error || '支付失败';
+                        this.$dialog
+                            .alert({
+                                title: '提示',
+                                message: this.backReson(e.error)
+                            })
+                            .then(res => {
+                                this.$router.back();
+                            });
+                    });
             } else if (this.payType === 'BALANCE') {
                 if (!this.tradeCode) {
                     this.$toast.clear();

src/views/activity/Submit.vue

@@ -372,6 +372,24 @@ export default {
                             .replace('www.raex.vip', 'jump.raex.vip')
                             .replace('test.raex.vip', 'jumptest.raex.vip')
                             .replace(/http:\/\/192\.168.*?\//, 'https://jumptest.raex.vip/');
+                    } else if (this.payType === 'QUICK_BIND') {
+                        this.$http
+                            .get('/payOrder/v2/mint/sandQuickBind?id=' + this.orderId)
+                            .then(res => {
+                                document.location.href = res;
+                                this.getOrder(true);
+                            })
+                            .catch(e => {
+                                this.$toast.clear();
+                                this.$dialog
+                                    .alert({
+                                        title: '提示',
+                                        message: e.error || '支付失败'
+                                    })
+                                    .then(res => {
+                                        this.$router.go(-1);
+                                    });
+                            });
                     } else if (this.payType === 'BALANCE') {
                         if (!this.tradeCode) {
                             this.$toast.clear();

src/views/asset/Detail.vue

@@ -1542,6 +1542,7 @@ export default {
     margin-right: 20px;
     box-sizing: border-box;
     min-width: 94px;
+    flex-shrink: 0;
 
     &::after {
         content: '';

src/views/auction/Submit.vue

@@ -432,6 +432,24 @@ export default {
                             .replace('www.raex.vip', 'jump.raex.vip')
                             .replace('test.raex.vip', 'jumptest.raex.vip')
                             .replace(/http:\/\/192\.168.*?\//, 'https://jumptest.raex.vip/');
+                    } else if (this.payType === 'QUICK_BIND') {
+                        this.$http
+                            .get('/payOrder/v2/auction/sandQuickBind?id=' + this.orderId)
+                            .then(res => {
+                                document.location.href = res;
+                                this.getOrder(true);
+                            })
+                            .catch(e => {
+                                this.$toast.clear();
+                                this.$dialog
+                                    .alert({
+                                        title: '提示',
+                                        message: e.error || '支付失败'
+                                    })
+                                    .then(res => {
+                                        this.$router.go(-1);
+                                    });
+                            });
                     } else if (this.payType === 'BALANCE') {
                         if (!this.tradeCode) {
                             this.$toast.clear();

src/views/product/Detail.vue

@@ -158,7 +158,25 @@
                         </van-cell>
                     </div>
                 </van-collapse-item>
-
+                <van-collapse-item name="xiyoudu" class="goods-info" v-if="ssr || sr || u">
+                    <template #title>
+                        <div class="page-title"><img src="@assets/icon-xiyoudu.png" alt="" />实时稀有度</div>
+                    </template>
+                    <div class="rarity-list">
+                        <div class="rarity-item ssr" v-if="ssr">
+                            <img src="@assets/png-ssr.png" alt="" />
+                            <span>{{ ssr }}</span>
+                        </div>
+                        <div class="rarity-item sr" v-if="sr">
+                            <img src="@assets/png-sr.png" alt="" />
+                            <span> {{ sr }}</span>
+                        </div>
+                        <div class="rarity-item u" v-if="u">
+                            <img src="@assets/png-u.png" alt="" />
+                            <span> {{ u }}</span>
+                        </div>
+                    </div>
+                </van-collapse-item>
                 <van-collapse-item name="2" class="goods-info">
                     <template #title>
                         <div class="page-title"><img src="@assets/icon-miaoshu.png" alt="" />作品描述</div>
@@ -177,6 +195,7 @@
                     </swiper>
                     <div v-if="info.detail" class="page-text page-detail" v-html="info.detail"></div>
                 </van-collapse-item>
+
                 <van-collapse-item name="3" class="goods-info top1">
                     <template #title>
                         <div class="page-title"><img src="@assets/icon-lianshangxinxi.png" alt="" /> 类型</div>
@@ -395,7 +414,7 @@
                 </div>
             </div>
         </div>
-        <div class="btn van-safe-area-bottom" v-else-if="info.soldOut&&info.source === 'TRANSFER'">
+        <div class="btn van-safe-area-bottom" v-else-if="info.soldOut && info.source === 'TRANSFER'">
             <div class="status-text">支付中</div>
         </div>
 
@@ -461,7 +480,7 @@ export default {
             init: [],
             init2: null,
             list: [],
-            activeNames: ['1', 'auction', '2', '3', '4', '5', '6', 'hashCode', 'hchashCode', '8'],
+            activeNames: ['1', 'auction', '2', '3', '4', '5', '6', 'hashCode', 'hchashCode', '8', 'xiyoudu'],
             inWeixin,
             limit: {},
             couponList: [],
@@ -470,7 +489,10 @@ export default {
             collectionId: 0,
             createrId: 0,
             type: '',
-            totalSales: 0
+            totalSales: 0,
+            ssr: '',
+            sr: '',
+            u: ''
         };
     },
     computed: {
@@ -634,6 +656,11 @@ export default {
                     this.$toast.clear();
 
                     if (res.type === 'BLIND_BOX') {
+                        this.$http.get('/blindBoxItem/rare/' + res.id).then(res => {
+                            this.ssr = res.SSR || '';
+                            this.sr = res.SR || '';
+                            this.u = res.U || '';
+                        });
                         return this.$http.post(
                             '/blindBoxItem/all',
                             {
@@ -1308,6 +1335,7 @@ export default {
     margin-right: 20px;
     box-sizing: border-box;
     min-width: 94px;
+    flex-shrink: 0;
 
     &::after {
         content: '';
@@ -1648,4 +1676,44 @@ export default {
         margin-top: 8px;
     }
 }
+
+.rarity-list {
+    .flex();
+    .rarity-item {
+        width: 33%;
+        padding: 8px 10px;
+        box-sizing: border-box;
+        .flex-col();
+        align-items: center;
+        background: rgba(255, 255, 255, 0.1);
+        border-radius: 4px;
+        border: 1px solid #d8b7ff;
+        img {
+            width: 100%;
+            display: block;
+        }
+        span {
+            font-size: 12px;
+            font-weight: bold;
+            color: #d8b7ff;
+            line-height: 22px;
+        }
+
+        &.sr {
+            border-color: #ffe590;
+            span {
+                color: #ffe590;
+            }
+        }
+        &.u {
+            border-color: #ffd7b4;
+            span {
+                color: #ffd7b4;
+            }
+        }
+    }
+    .rarity-item + .rarity-item {
+        margin-left: 12px;
+    }
+}
 </style>

src/views/user/Wallet.vue

@@ -311,6 +311,20 @@ export default {
                         '_blank'
                     );
                     break;
+                case 'QUICK_BIND':
+                    window.open(
+                        resolveUrl(
+                            this.$baseUrl,
+                            '/payOrder/v2/recharge/sandQuickBind?userId=' +
+                                this.$store.state.userInfo.id +
+                                '&amount=' +
+                                this.amount
+                        )
+                            .replace('www.raex.vip', 'jump.raex.vip')
+                            .replace('test.raex.vip', 'jumptest.raex.vip'),
+                        '_blank'
+                    );
+                    break;
                 case 'SYXPAY':
                     this.$router.push({
                         name: 'bankPay',

src/views/user/WalletBak.vue

@@ -190,6 +190,20 @@ export default {
                         '_blank'
                     );
                     break;
+                case 'QUICK_BIND':
+                    window.open(
+                        resolveUrl(
+                            this.$baseUrl,
+                            '/payOrder/v2/recharge/sandQuickBind?userId=' +
+                                this.$store.state.userInfo.id +
+                                '&amount=' +
+                                this.amount
+                        )
+                            .replace('www.raex.vip', 'jump.raex.vip')
+                            .replace('test.raex.vip', 'jumptest.raex.vip'),
+                        '_blank'
+                    );
+                    break;
                 case 'SYXPAY':
                     this.$router.push({
                         name: 'bankPay',