.

src/main/nine-space/src/components/CouponInfo.vue

@@ -9,7 +9,7 @@
         </div>
         <div class="coupon-bottom">
             <span>有效期至:{{ info.expiration }}</span>
-            <span v-if="info.limited">规定商品可用</span>
+            <span v-if="info.limited">规定作品可用</span>
         </div>
         <template v-if="needChoose && !notUse">
             <img v-if="chooseId === info.id" class="icon" src="@assets/icon_gouxuan_pre.png" alt="" />

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

@@ -27,15 +27,27 @@ export default {
                 };
             }
 
-            this.$http.post(this.url, data, { 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;
-                }
-            });
+            if (this.httpType === 'get') {
+                this.$http.get(this.url, data, { 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;
+                    }
+                });
+            } else {
+                this.$http.post(this.url, data, { 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;
+                    }
+                });
+            }
         }
     }
 };

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

@@ -1,7 +1,7 @@
 <template>
     <div class="submit">
         <div class="page-top">
-            <div class="pageTitle">赠送商品</div>
+            <div class="pageTitle">赠送作品</div>
             <div class="product">
                 <van-image width="74" height="104" :radius="6" :src="getImg(changeImgs(info.pic))" fit="cover" />
                 <div class="product-content">

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

@@ -91,7 +91,7 @@
         <div class="orderList">
             <div class="order-info" @click="$router.push('/orders?type=DEFAULT')">
                 <img src="@assets/info_icon_shangpindingdan.png" alt="" />
-                <span>商品订单</span>
+                <span>作品订单</span>
             </div>
             <div class="order-info" @click="wait">
                 <img src="@assets/info_icon_zhuzaodingdan.png" alt="" />

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

@@ -14,7 +14,7 @@
 
         <div class="list">
             <div class="info">
-                <div class="text1">商品费用</div>
+                <div class="text1">作品费用</div>
                 <div class="text2">¥{{ info.price }}</div>
             </div>
             <div class="info">

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

@@ -164,7 +164,7 @@
                 </van-collapse-item>
                 <van-collapse-item name="6" class="goods-info">
                     <template #title>
-                        <div class="page-title"><img src="@assets/icon-lianshangxinxi(2).png" alt="" />商品特性</div>
+                        <div class="page-title"><img src="@assets/icon-lianshangxinxi(2).png" alt="" />作品特性</div>
                     </template>
                     <div class="specific-list" v-if="properties.length > 0">
                         <div class="specific-item" v-for="(item, index) in properties" :key="index">

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

@@ -24,7 +24,7 @@
             </div>
         </div>
         <div class="info-item">
-            <div class="text1">商品费用</div>
+            <div class="text1">作品费用</div>
             <div class="text1">¥{{ info.price }}</div>
         </div>
         <div class="info-item">

src/main/nine-space/src/views/order/Orders.vue

@@ -4,7 +4,7 @@
             <div class="top">
                 <div class="top-btn">
                     <div class="btn" :class="{ active: type === 'DEFAULT' }" @click="changeActive('DEFAULT')">
-                        商品订单
+                        作品订单
                     </div>
                     <div class="btn" :class="{ active: type === 'BLIND_BOX' }" @click="changeActive('BLIND_BOX')">
                         盲盒订单

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

@@ -164,7 +164,7 @@
                 </van-collapse-item>
                 <van-collapse-item name="6" class="goods-info">
                     <template #title>
-                        <div class="page-title"><img src="@assets/icon-lianshangxinxi(2).png" alt="" />商品特性</div>
+                        <div class="page-title"><img src="@assets/icon-lianshangxinxi(2).png" alt="" />作品特性</div>
                     </template>
                     <div class="specific-list" v-if="properties.length > 0">
                         <div class="specific-item" v-for="(item, index) in properties" :key="index">

src/main/nine-space/src/views/product/DetailMode.vue

@@ -104,7 +104,7 @@
                 </swiper>
             </template>
             <template v-if="properties.length > 0">
-                <div class="page-title">商品特性</div>
+                <div class="page-title">作品特性</div>
                 <div class="specific-list">
                     <div class="specific-item" v-for="(item, index) in properties" :key="index">
                         <div class="text1">{{ item.name }}</div>

src/main/nine-space/src/views/product/DetailPre.vue

@@ -99,7 +99,7 @@
                 </swiper>
             </template>
             <template v-if="properties.length > 0">
-                <div class="page-title">商品特性</div>
+                <div class="page-title">作品特性</div>
                 <div class="specific-list">
                     <div class="specific-item" v-for="(item, index) in properties" :key="index">
                         <div class="text1">{{ item.name }}</div>

src/main/nine-space/src/views/user/Exchange.vue

@@ -1,27 +1,25 @@
 <template>
     <div class="search">
-        <van-list
-            class="list"
-            v-model:loading="loading"
-            :immediate-check="false"
-            :finished="finished"
-            finished-text=""
-            @load="getData"
-        >
+        <van-list v-model:loading="loading" :finished="finished" finished-text="" @load="getData">
             <template v-for="(item, index) in list" :key="index">
                 <div class="exchange">
-                    <div class="text1">作品赠送</div>
+                    <div class="top">
+                        <div class="text1">{{ item.operation }}</div>
+                        <div class="text2">{{ item.createdAt }}</div>
+                    </div>
+                    <div class="product">
+                        <van-image width="32" height="32" radius="4" src="" fit="cover" />
+
+                        <div class="flex1">
+                            <div class="text2 van-ellipsis">游戏《百分之一》精美皮肤…</div>
+                            <div class="text2">
+                                <span>来源：{{ item.fromUser }}</span> <span>去向 ：{{ item.toUser }}</span>
+                            </div>
+                        </div>
+                    </div>
                 </div>
             </template>
-            <div class="exchange">
-                <div class="text1">作品赠送</div>
-                <div class="text2 van-ellipsis">游戏《百分之一》精美皮肤…</div>
-                <div class="text2">
-                    <span>来源：是奶盖吖</span> <span>去向 ：奶盖</span>
-                    <span class="flex1"></span>
-                    <span>09-03 09:56</span>
-                </div>
-            </div>
+
             <van-empty v-if="empty" description="暂无交易历史哦~" :image="require('@assets/kong_png_wusousuo.png')" />
         </van-list>
     </div>
@@ -36,7 +34,8 @@ export default {
         return {
             list: [],
             empty: false,
-            url: '/collection/all'
+            url: '/asset/userHistory',
+            httpType: 'get'
         };
     }
 };
@@ -62,9 +61,21 @@ export default {
     }
 
     .van-ellipsis {
-        width: 50%;
-        margin: 5px 0 2px;
+        margin-bottom: 2px;
     }
     border-top: 1px solid #202122;
+
+    .top {
+        .flex();
+        justify-content: space-between;
+    }
+    .product {
+        .flex();
+        margin-top: 5px;
+        .flex1 {
+            overflow: hidden;
+            margin-left: 6px;
+        }
+    }
 }
 </style>