列表

src/main/nine-space/src/mixins/list.js

@@ -12,6 +12,7 @@ export default {
             if (isFirst) {
                 this.page = 0;
                 this.list = [];
+                this.$root.$el.scrollTop = 0;
             }
 
             this.loading = true;

src/main/nine-space/src/views/Submit.vue

@@ -142,20 +142,24 @@ export default {
     },
     methods: {
         submit() {
-            this.$http
-                .post('/order/create?collectionId=' + this.$route.query.id + '&qty=1')
-                .then(res => {
-                    this.orderId = res.id;
-                    this.$router.replace('/submit?orderId=' + res.id);
-                    this.$nextTick(() => {
-                        document.location.replace(path.resolve(this.$baseUrl, 'payOrder/alipay?id=' + res.id));
+            if (this.payType === 'ALIPAY') {
+                this.$http
+                    .post('/order/create?collectionId=' + this.$route.query.id + '&qty=1')
+                    .then(res => {
+                        this.orderId = res.id;
+                        this.$router.replace('/submit?orderId=' + res.id);
+                        this.$nextTick(() => {
+                            document.location.replace(path.resolve(this.$baseUrl, 'payOrder/alipay?id=' + res.id));
+                        });
+                    })
+                    .catch(e => {
+                        if (e) {
+                            this.$toast(e.error);
+                        }
                     });
-                })
-                .catch(e => {
-                    if (e) {
-                        this.$toast(e.error);
-                    }
-                });
+            } else {
+                this.wait();
+            }
         }
     }
 };

src/main/nine-space/src/views/asset/Detail.vue

@@ -39,16 +39,7 @@
 
         <driver />
         <div class="user">
-            <van-cell
-                is-link
-                class="creator"
-                :to="{
-                    path: '/creatorDetail',
-                    query: {
-                        id: info.minterId
-                    }
-                }"
-            >
+            <van-cell class="creator">
                 <template #icon>
                     <van-image
                         width="40"

src/main/nine-space/src/views/creator/List.vue

@@ -4,13 +4,7 @@
             <div class="top">
                 <div class="name">铸造者</div>
             </div>
-            <van-tabs
-                v-model:active="sort"
-                :ellipsis="false"
-                line-width="16"
-                line-height="2"
-                @change="(page = 0), getList()"
-            >
+            <van-tabs v-model:active="sort" :ellipsis="false" line-width="16" line-height="2" @change="getData(true)">
                 <van-tab
                     :title="item.label"
                     :name="
@@ -30,7 +24,7 @@
                 </van-tab>
             </van-tabs>
         </van-sticky>
-        <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="" @load="getList">
+        <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="" @load="getData">
             <template v-for="(item, index) in list" :key="index">
                 <creator-info v-model:info="list[index]"></creator-info>
             </template>
@@ -41,9 +35,11 @@
 
 <script>
 import CreatorInfo from '../../components/creator/CreatorInfo.vue';
+import list from '../../mixins/list';
 export default {
     components: { CreatorInfo },
     inject: ['bar'],
+    mixins: [list],
     data() {
         return {
             list: [],
@@ -68,39 +64,15 @@ export default {
                     type: 'select'
                 }
             ],
-            loading: false,
-            finished: false,
-            page: 0
+            url: '/user/all'
         };
     },
     methods: {
-        getList() {
-            if (this.page === 0) {
-                this.list = [];
-            }
-            this.loading = true;
-            this.finished = false;
-            this.empty = false;
-            this.$http
-                .post(
-                    '/user/all',
-                    {
-                        page: this.page,
-                        query: { hasRole: 'ROLE_MINTER' },
-                        size: 20,
-                        sort: this.sort
-                    },
-                    { body: 'json' }
-                )
-                .then(res => {
-                    this.list = [...this.list, ...res.content];
-                    this.empty = res.empty;
-                    this.loading = false;
-                    this.finished = res.last;
-                    if (!this.finished) {
-                        this.page = this.page + 1;
-                    }
-                });
+        beforeData() {
+            return {
+                query: { hasRole: 'ROLE_MINTER' },
+                sort: this.sort
+            };
         }
     }
 };