Merge branch 'dev' of xiongzhu/raex_front into master

src/components/asset/assetInfo.vue

@@ -119,10 +119,10 @@ export default {
     min-height: 35.73vw;
 
     &:nth-child(3n + 1) {
-        margin-right: 26px;
+        margin-right: 6.9vw;
     }
     &:nth-child(3n + 2) {
-        margin-right: 26px;
+        margin-right: 6.9vw;
     }
 
     .van-image {

src/views/Store.vue

@@ -60,6 +60,7 @@
                     active !== 'coupon' && showList.length > 0 ? `url(${require('../assets/png-zhantai.png')})` : '',
                 paddingBottom: showList.length % 3 === 0 ? '35.73vw' : '20px'
             }"
+            :class="{ couponList: active === 'coupon' }"
             v-model:loading="loading"
             :finished="finished"
             finished-text=""
@@ -426,10 +427,14 @@ export default {
     // display: flex;
     // flex-wrap: wrap;
     // padding: 8px 8px 100px;
-    padding: 0 0 0 16px;
+    padding: 0 0 0 5.3vw;
     background-size: 100vw 42vw;
     background-position: 0 -10vw;
     box-sizing: border-box;
+
+    &.couponList {
+        padding: 8px 8px 100px;
+    }
 }
 
 .tab {

src/views/product/Detail.vue

@@ -395,25 +395,25 @@ export default {
         this.$http.get('/order/checkLimit', { collectionId: this.$route.query.id }).then(res => {
             this.limit = res;
         });
-        if (this.isLogin) {
-            this.$http
-                .post(
-                    '/order/all',
-                    {
-                        query: {
-                            userId: this.$store.state.userInfo.id,
-                            collectionId: this.$route.query.id,
-                            status: 'NOT_PAID'
-                        }
-                    },
-                    { body: 'json' }
-                )
-                .then(res => {
-                    if (!res.empty) {
-                        this.noPay = true;
-                    }
-                });
-        }
+        // if (this.isLogin) {
+        //     this.$http
+        //         .post(
+        //             '/order/all',
+        //             {
+        //                 query: {
+        //                     userId: this.$store.state.userInfo.id,
+        //                     collectionId: this.$route.query.id,
+        //                     status: 'NOT_PAID'
+        //                 }
+        //             },
+        //             { body: 'json' }
+        //         )
+        //         .then(res => {
+        //             if (!res.empty) {
+        //                 this.noPay = true;
+        //             }
+        //         });
+        // }
     },
     methods: {
         preview(index = 0, list = []) {