Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_front into dev

src/views/Discover.vue

@@ -1,7 +1,7 @@
 <template>
     <van-pull-refresh
         success-text="加载成功"
-        success-duration="1000"
+        success-duration="500"
         class="discover"
         v-model="isLoading"
         @refresh="onRefresh"

src/views/Home.vue

@@ -2,7 +2,7 @@
     <van-pull-refresh
         class="home"
         success-text="加载成功"
-        success-duration="1000"
+        success-duration="500"
         v-model="isLoading"
         :head-height="80"
         @refresh="onRefresh"

src/views/Mine.vue

@@ -1,7 +1,7 @@
 <template>
     <van-pull-refresh
         success-text="加载成功"
-        success-duration="1000"
+        success-duration="500"
         class="mine"
         v-model="isLoading"
         @refresh="onRefresh"

src/views/Store.vue

@@ -1,7 +1,7 @@
 <template>
     <van-pull-refresh
         success-text="加载成功"
-        success-duration="1000"
+        success-duration="500"
         class="discover"
         v-model="isLoading"
         @refresh="onRefresh"

src/views/activity/ChooseProduct.vue

@@ -16,47 +16,54 @@
                 </div>
             </div>
         </van-sticky>
+        <van-pull-refresh
+            success-text="刷新成功"
+            success-duration="500"
+            class="discover"
+            v-model="refreshing"
+            @refresh="onRefresh"
+        >
+            <van-empty
+                v-if="empty"
+                description="没有符合兑换的藏品哦~"
+                :image="require('../../assets/kong_png_yongyoude  (1).png')"
+            />
 
-        <van-empty
-            v-if="empty"
-            description="没有符合兑换的藏品哦~"
-            :image="require('../../assets/kong_png_yongyoude  (1).png')"
-        />
-
-        <div class="list">
-            <div
-                class="product"
-                :class="{ active: chooseIds.includes(item.id) }"
-                v-for="item in list"
-                :key="item.id"
-                @click="choose(item.id)"
-            >
-                <img
-                    class="icon"
-                    :src="
-                        chooseIds.includes(item.id)
-                            ? require('../../assets/icon_gouxuan_pre.png')
-                            : require('../../assets/icon_gouxuan_huise.png')
-                    "
-                    alt=""
-                />
-                <div class="product-content">
-                    <van-image
-                        width="60"
-                        height="60"
-                        radius="6"
-                        :src="getImg(changeImgs(item.pic, 600))"
-                        fit="contain"
+            <div class="list">
+                <div
+                    class="product"
+                    :class="{ active: chooseIds.includes(item.id) }"
+                    v-for="item in list"
+                    :key="item.id"
+                    @click="choose(item.id)"
+                >
+                    <img
+                        class="icon"
+                        :src="
+                            chooseIds.includes(item.id)
+                                ? require('../../assets/icon_gouxuan_pre.png')
+                                : require('../../assets/icon_gouxuan_huise.png')
+                        "
+                        alt=""
                     />
-                    <div class="product-info">
-                        <div class="text1 van-ellipsis">{{ item.name }}</div>
-                        <div class="flex1"></div>
-                        <div class="text2" v-if="item.category">{{ item.category }}</div>
-                        <div class="text2" v-if="item.number">编号：{{ item.number }}</div>
+                    <div class="product-content">
+                        <van-image
+                            width="60"
+                            height="60"
+                            radius="6"
+                            :src="getImg(changeImgs(item.pic, 600))"
+                            fit="contain"
+                        />
+                        <div class="product-info">
+                            <div class="text1 van-ellipsis">{{ item.name }}</div>
+                            <div class="flex1"></div>
+                            <div class="text2" v-if="item.category">{{ item.category }}</div>
+                            <div class="text2" v-if="item.number">编号：{{ item.number }}</div>
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
+        </van-pull-refresh>
 
         <div class="tips" v-if="showTips">当前可兑换藏品不足</div>
 
@@ -80,7 +87,8 @@ export default {
             needChoose: 3,
             search: '',
             activityId: 0,
-            info: {}
+            info: {},
+            refreshing: false
         };
     },
     computed: {
@@ -113,24 +121,22 @@ export default {
         }
     },
     methods: {
-        getList() {
+        getList(refresh, done) {
             this.$http
-                .post(
-                    '/asset/all',
-                    {
-                        page: 0,
-                        size: 999,
-                        query: { status: 'NORMAL,TRADING,GIFTING', userId: this.$store.state.userInfo.id },
-                        search: this.search
-                    },
-                    { body: 'json' }
-                )
+                .get('/asset/assetsForMint', {
+                    page: 0,
+                    size: 999,
+                    mintActivityId: this.activityId,
+                    refresh
+                })
                 .then(res => {
                     this.list = res.content;
                     this.empty = res.empty;
+                    done && done();
                 })
                 .then(() => {
                     this.$toast.clear();
+                    done && done();
                 });
         },
         choose(id) {
@@ -180,6 +186,12 @@ export default {
                     }
                 });
             });
+        },
+        onRefresh() {
+            this.refreshing = true;
+            this.getList(true, () => {
+                this.refreshing = false;
+            });
         }
     }
 };

src/views/activity/List1.vue

@@ -1,7 +1,7 @@
 <template>
     <van-pull-refresh
         success-text="加载成功"
-        success-duration="1000"
+        success-duration="500"
         class="search"
         v-model="isLoading"
         :head-height="80"

src/views/asset/Detail.vue

@@ -2,7 +2,7 @@
 <template>
     <van-pull-refresh
         success-text="加载成功"
-        success-duration="1000"
+        success-duration="500"
         class="detail"
         v-model="isLoading"
         :head-height="80"

src/views/creator/Detail.vue

@@ -1,7 +1,7 @@
 <template>
     <van-pull-refresh
         success-text="加载成功"
-        success-duration="1000"
+        success-duration="500"
         class="mine"
         v-model="isLoading"
         :head-height="80"

src/views/creator/List.vue

@@ -1,7 +1,7 @@
 <template>
     <van-pull-refresh
         success-text="加载成功"
-        success-duration="1000"
+        success-duration="500"
         class="follow"
         v-model="isLoading"
         :head-height="80"

src/views/hall/List.vue

@@ -1,7 +1,7 @@
 <template>
     <van-pull-refresh
         success-text="加载成功"
-        success-duration="1000"
+        success-duration="500"
         class="list"
         v-model="isLoading"
         @refresh="onRefresh"

src/views/order/ActivityDetail.vue

@@ -1,7 +1,7 @@
 <template>
     <van-pull-refresh
         success-text="加载成功"
-        success-duration="1000"
+        success-duration="500"
         class="order"
         v-model="isLoading"
         :head-height="80"

src/views/order/ActivityOrders.vue

@@ -1,7 +1,7 @@
 <template>
     <van-pull-refresh
         success-text="加载成功"
-        success-duration="1000"
+        success-duration="500"
         class="discover"
         v-model="isLoading"
         :head-height="80"

src/views/order/Detail.vue

@@ -2,7 +2,7 @@
     <van-pull-refresh
         class="order"
         success-text="加载成功"
-        success-duration="1000"
+        success-duration="500"
         v-model="isLoading"
         :head-height="80"
         @refresh="onRefresh"

src/views/order/Orders.vue

@@ -1,7 +1,7 @@
 <template>
     <van-pull-refresh
         success-text="加载成功"
-        success-duration="1000"
+        success-duration="500"
         class="discover"
         v-model="isLoading"
         :head-height="80"

src/views/product/Detail.vue

@@ -1,7 +1,7 @@
 <template>
     <van-pull-refresh
         success-text="加载成功"
-        success-duration="1000"
+        success-duration="500"
         class="detail"
         v-model="isLoading"
         @refresh="onRefresh"
@@ -286,7 +286,7 @@
                             <van-button @click="vipAssignment" class="vip" type="danger" block round>
                                 vip通道
                             </van-button>
-                            <van-button style="font-size: 12px;" class="no-btn" v-if="!info.openQuota" block round>
+                            <van-button style="font-size: 12px" class="no-btn" v-if="!info.openQuota" block round>
                                 名额为空
                             </van-button>
                             <van-button @click="share" v-else-if="info.totalQuota" type="primary" block round
@@ -294,7 +294,7 @@
                             </van-button>
                         </div>
                         <van-button
-                            style="font-size: 12px;"
+                            style="font-size: 12px"
                             @click="showReason"
                             class="no-btn"
                             v-else-if="!info.openQuota"
@@ -304,7 +304,7 @@
                             活动名额已被抢光
                         </van-button>
                         <van-button
-                            style="font-size: 12px;"
+                            style="font-size: 12px"
                             @click="showReason"
                             class="no-btn"
                             v-else-if="noPay"
@@ -321,7 +321,7 @@
                     <template v-else-if="assignment && isSale && info.timeDelay">
                         <van-button class="no-btn" block round>
                             <div class="appoint">
-                                <span style="font-size: 12px;">任务完成,即将开卖</span>
+                                <span style="font-size: 12px">任务完成,即将开卖</span>
                                 <span>{{ saleTime }}</span>
                             </div>
                         </van-button>

src/views/product/HopeMarket.vue

@@ -98,7 +98,7 @@
 
         <van-pull-refresh
             success-text="加载成功"
-            success-duration="1000"
+            success-duration="500"
             v-model="isLoading"
             :head-height="80"
             @refresh="onRefresh"

src/views/product/List.vue

@@ -1,7 +1,7 @@
 <template>
     <van-pull-refresh
         success-text="加载成功"
-        success-duration="1000"
+        success-duration="500"
         class="follow"
         v-model="isLoading"
         @refresh="onRefresh"

src/views/product/Search.vue

@@ -2,7 +2,7 @@
     <van-pull-refresh
         class="search"
         success-text="加载成功"
-        success-duration="1000"
+        success-duration="500"
         :style="{ backgroundColor: isSearch ? $colors.bg3 : $colors.bg }"
         v-model="isLoading"
         @refresh="onRefresh"

src/views/user/Exchange.vue

@@ -1,7 +1,7 @@
 <template>
     <van-pull-refresh
         success-text="加载成功"
-        success-duration="1000"
+        success-duration="500"
         class="search"
         v-model="isLoading"
         :head-height="80"