修改

src/main/nine-space/src/plugins/http.js

@@ -5,9 +5,9 @@ import qs from 'qs';
 let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
-        // baseUrl = 'https://nfttest.9space.vip/';
+        baseUrl = 'https://nfttest.9space.vip/';
         // baseUrl = 'http://192.168.50.190:8080';
-        baseUrl = 'http://localhost:8080';
+        // baseUrl = 'http://localhost:8080';
         // baseUrl = 'http://192.168.50.190:8080';
         break;
     case 'test':

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

@@ -21,7 +21,7 @@
         <div class="list">
             <div class="info">
                 <div class="text1">GAS费用</div>
-                <div class="text2">¥11</div>
+                <div class="text2">¥{{ gas }}</div>
             </div>
 
             <div class="pay">
@@ -35,7 +35,7 @@
 
         <div class="bottom van-safe-area-bottom" ref="bottom">
             <div class="bottom-content">
-                <div class="btn1">
+                <div class="btn1" @click="$router.go(-1)">
                     取消
                     <!-- <van-button @click="submit" :disabled="orderId"> 取消 </van-button> -->
                 </div>
@@ -93,9 +93,9 @@ export default {
         }
     },
     mounted() {
-        // this.$http.get('/sysConfig/get/gas_fee').then(res => {
-        //     this.gas = res.value;
-        // });
+        this.$http.get('/sysConfig/get/gas_fee').then(res => {
+            this.gas = res.value;
+        });
         this.$toast.loading({
             message: '加载中...',
             forbidClick: true
@@ -140,6 +140,72 @@ export default {
     },
     methods: {
         submit() {
+            this.$http
+                .post('/user/verifyTradeCode', {
+                    tradeCode: this.password
+                })
+                .then(() => {
+                    this.$http
+                        .post('/asset/gift', {
+                            assetId: this.$route.query.id,
+                            toUserId: this.$route.query.toUserId
+                        })
+                        .then(res => {
+                            console.log(res);
+                            // this.$nextTick(() => {
+                            //     if (this.payType === 'ALIPAY') {
+                            //         document.location.replace(
+                            //             path.resolve(this.$baseUrl, 'payOrder/gift/alipay?id=' + res.id)
+                            //         );
+                            //     } else if (this.payType === 'WEIXIN') {
+                            //         if (this.inWeixin) {
+                            //             this.$toast.loading('加载中');
+                            //             this.$http
+                            //                 .post('/payOrder/gift/weixin', {
+                            //                     id: res.id,
+                            //                     openId: localStorage.getItem('openId')
+                            //                 })
+                            //                 .then(res => {
+                            //                     console.log({
+                            //                         ...res,
+                            //                         package: res.package || res.packageValue
+                            //                     });
+                            //                     let _this = this;
+                            //                     wx.chooseWXPay({
+                            //                         ...res,
+                            //                         package: res.package || res.packageValue,
+                            //                         timestamp: res.timeStamp,
+                            //                         success(res) {
+                            //                             _this.$toast.success('支付成功');
+                            //                             // setTimeout(() => {
+                            //                             //     _this.$router.replace('/orders');
+                            //                             // }, 1000);
+                            //                         },
+                            //                         fail(e) {
+                            //                             console.log(e);
+                            //                             _this.$toast('支付失败，请稍后再试');
+                            //                         }
+                            //                     });
+                            //                 });
+                            //         } else {
+                            //             document.location.replace(
+                            //                 path.resolve(this.$baseUrl, 'payOrder/gift/weixin_h5?id=' + res.id)
+                            //             );
+                            //         }
+                            //     }
+                            // });
+                        })
+                        .catch(e => {
+                            if (e) {
+                                this.$toast(e.error);
+                            }
+                        });
+                })
+                .catch(e => {
+                    if (e) {
+                        this.$toast('失败点击忘记密码进行修改');
+                    }
+                });
             // this.$toast.loading('加载中');
             // this.$http
             //     .post('/order/create?collectionId=' + this.$route.query.id + '&qty=1')

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

@@ -100,6 +100,36 @@
                     </div>
                 </div>
             </template>
+            <div class="top">
+                <div class="top1">
+                    <div class="text1">类型</div>
+                    <div class="text2">{{ info.category }}</div>
+                </div>
+                <div class="top1" @click="Whisper">
+                    <div class="text1">悄悄话</div>
+                    <div class="text2 text3" :class="{ prim: init2.opened }">
+                        <img v-if="init2.opened" class="img" :src="init2.icon[2]" alt="" />
+                        <!-- <img v-else class="img" :src="init2.icon[2]" alt="" /> -->
+                        <div class="text4" :class="{ prim: init2.opened }">
+                            {{ init2.opened ? '已打开' : '未打开' }}
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="page-title">持有特权<span>（灰色表示已使用）</span></div>
+            <div class="prive">
+                <div v-for="(item, index) in init" :key="index">
+                    <!-- :class="{ prim: item.opened }" -->
+                    <div class="prive1" :class="{ prim: item.opened }">
+                        <img v-if="!item.opened" class="img" :src="item.icon[0]" alt="" />
+                        <!-- <img class="img" :src="item.icon[0]" alt="" /> -->
+                        <img v-if="item.opened" class="img" :src="item.icon[2]" alt="" />
+                        <div @click="privilegeFn(item)" class="prive2">
+                            {{ item.name }}
+                        </div>
+                    </div>
+                </div>
+            </div>
             <div class="page-title">链上信息</div>
             <div class="page-text">
                 Hash地址：{{ info.txHash }}<br />
@@ -140,13 +170,68 @@
         <!-- <driver /> -->
 
         <!-- <van-collapse v-model="activeName" accordion>
-      <van-collapse-item title="交易记录" name="1">
-        <van-cell title="单元格" value="内容"> </van-cell>
-      </van-collapse-item>
-    </van-collapse> -->
+            <van-collapse-item title="交易记录" name="1">
+                <van-cell title="单元格" value="内容"> </van-cell>
+            </van-collapse-item>
+        </van-collapse> -->
+        <div v-if="list.length != 0">
+            <div style="padding-left: 16px" class="page-title">交易历史</div>
+            <div class="content">
+                <img class="img" :src="list.avatar" alt="" />
+                <div class="init">
+                    <div>
+                        <div class="text1">{{ list.realName || '保密' }}</div>
+                        <div class="text2">
+                            <div class="text3">111</div>
+                            <div class="text4">{{ list.createdAt }}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
 
         <driver />
-
+        <van-dialog v-model:show="show" confirm-button-text="返回">
+            <div class="title2">
+                <img class="img" :src="list2.icon[1]" alt="" />
+                <div class="title3">{{ list2.name }}</div>
+            </div>
+            <div class="border"></div>
+            <div class="name" v-if="list2.name == '版权权利'">该特权将证明持有者拥有该作品版权使用权力</div>
+            <div class="name1">
+                说明：<span>{{ list2.description }}</span>
+            </div>
+            <!-- <div class="name" v-if="init.name == '铸造'">注：使用后后该特权将不能二次使用</div> -->
+        </van-dialog>
+        <van-dialog v-model:show="show3" confirm-button-text="返回">
+            <div class="title2">
+                <img class="img" :src="init2.icon[1]" alt="" />
+                <div class="title3">{{ init2.name }}</div>
+            </div>
+            <div class="border"></div>
+            <div class="name">藏有创作者填写的隐藏内容，持有者才能打开</div>
+            <div class="name1">
+                说明：<span>{{ init2.description }}</span>
+            </div>
+        </van-dialog>
+        <van-popup v-model:show="show2">
+            <div class="con">
+                <div class="Whisper">提示</div>
+                <img
+                    @click="show2 = false"
+                    class="icon"
+                    src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-11-12-16-13-37tvHvqsIN.png"
+                    alt=""
+                />
+            </div>
+            <img
+                @click="openedFn"
+                class="imgBox"
+                src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-11-12-16-13-07DtWLMcPy.png"
+                alt=""
+            />
+            <div class="Whisper1">点击图标打开悄悄话,(隐藏内容，只能开启一次)</div>
+        </van-popup>
         <post :info="info" pageUrl="assetDetail" />
     </div>
 </template>
@@ -181,7 +266,13 @@ export default {
             activeName: '1',
             info: {},
             liked: false,
-            btn: null
+            show2: false,
+            show3: false,
+            btn: null,
+            list: [],
+            show: false,
+            init: [],
+            init2: []
         };
     },
     computed: {
@@ -198,8 +289,58 @@ export default {
     },
     mounted() {
         this.getProduct();
+        setTimeout(() => {
+            this.record();
+        }, 1000);
+        // setTimeout(() => {
+        //     this.privilegeFn();
+        // }, 1000);
     },
     methods: {
+        privilegeFn(init) {
+            this.list2 = init;
+            if (!init.once && !init.opened) {
+                this.show = true;
+                this.$http
+                    .post('/asset/usePrivilege', {
+                        assetId: this.info.id,
+                        privilegeId: init.id
+                    })
+                    .then(res => {
+                        console.log(res);
+                    });
+            }
+        },
+        openedFn() {
+            this.show2 = false;
+            this.show3 = true;
+            if (!this.init2.once) {
+                this.show = true;
+                this.$http
+                    .post('/asset/usePrivilege', {
+                        assetId: this.info.id,
+                        privilegeId: this.init2.id
+                    })
+                    .then(res => {
+                        console.log(res);
+                    });
+            }
+        },
+        Whisper() {
+            if (!this.init2.opened) {
+                this.show2 = true;
+            }
+        },
+        record() {
+            this.$http
+                .get('/asset/tokenHistory', {
+                    tokenId: this.info.tokenId,
+                    assetId: this.info.id
+                })
+                .then(res => {
+                    this.list = res;
+                });
+        },
         Consignment() {
             if (!this.info.consignment) {
                 Dialog.confirm({
@@ -275,6 +416,14 @@ export default {
             });
             this.$http.get('/asset/get/' + this.$route.query.id).then(res => {
                 this.info = res;
+                this.tokenId = this.info.tokenId;
+                this.init2 = res.privileges.find(item => {
+                    return item.name === '悄悄话';
+                });
+                this.init = res.privileges.filter(item => {
+                    return item.name !== '悄悄话';
+                });
+                // console.log(this.init);
                 console.log(this.info);
                 this.$nextTick(() => {
                     if (this.isBuy) {
@@ -316,6 +465,49 @@ export default {
 .detail {
     padding-bottom: 100px;
 }
+.content {
+    padding: 0px 16px;
+    display: flex;
+    align-items: center;
+    width: 343px;
+    height: 68px;
+    border-radius: 12px;
+    .img {
+        width: 40px;
+        height: 40px;
+        border-radius: 50%;
+        margin-right: 10px;
+    }
+    .init {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        width: 100%;
+        .text1 {
+            font-size: 14px;
+            font-weight: bold;
+            color: #ffffff;
+            line-height: 24px;
+        }
+        .text2 {
+            display: flex;
+            align-items: center;
+            .text3 {
+                font-size: 14px;
+                font-weight: 400;
+                color: #939599;
+                line-height: 24px;
+            }
+            .text4 {
+                font-size: 14px;
+                font-weight: 400;
+                color: #939599;
+                line-height: 24px;
+                margin-left: 137px;
+            }
+        }
+    }
+}
 .info {
     // height: 164px;
     background-color: @bg;
@@ -420,7 +612,41 @@ export default {
         font-size: 13px;
     }
 }
-
+/deep/ .van-popup {
+    width: 260px;
+    background: rgb(209, 206, 18);
+    border-radius: 10px;
+    .con {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 12px 16px 0;
+        .Whisper {
+            font-size: 16px;
+            font-weight: 400;
+            color: #000000;
+            line-height: 24px;
+        }
+        .icon {
+            width: 24px;
+            height: 24px;
+        }
+    }
+    .imgBox {
+        width: 80px;
+        height: 80px;
+        text-align: center;
+        margin: 30px 90px 22px;
+    }
+    .Whisper1 {
+        font-size: 12px;
+        font-weight: 400;
+        color: #303133;
+        line-height: 18px;
+        padding-bottom: 36px;
+        margin: 0 64px;
+    }
+}
 /deep/ .mySwiper {
     width: 100vw;
     height: 100vw;
@@ -449,17 +675,146 @@ export default {
         border-radius: 4px;
     }
 }
+/deep/ .van-dialog {
+    width: 228px;
+    background: #ffffff;
+    padding: 0 16px;
+    border-radius: 8px;
+    .title2 {
+        display: flex;
+        align-items: center;
+        padding-top: 12px;
+        .img {
+            width: 18px;
+            height: 18px;
+            color: #ff4f50;
+            margin-right: 3px;
+        }
+        .title3 {
+            font-size: 16px;
+            font-weight: 400;
+            color: #ff4f50;
+            line-height: 24px;
+        }
+    }
+    .border {
+        height: 1px;
+        background: #f2f3f5;
+        border-radius: 1px;
+        margin: 12px 0 6px;
+    }
+    .name1 {
+        width: 208px;
+        padding: 10px;
+        background: #f5f7fa;
+        border-radius: 4px;
+        color: #939599;
+        margin-bottom: 11px;
+    }
+    span {
+        color: #303133;
+    }
+    .name {
+        font-size: 12px;
+        font-weight: 400;
+        color: #939599;
+        line-height: 18px;
+        margin-bottom: 6px;
+    }
+}
 .goods {
-    padding: 20px 16px;
+    // padding: 20px 16px;
 
     .page-title {
         &:not(:first-child) {
             padding-top: 16px;
         }
     }
+    span {
+        font-size: 14px;
+        font-weight: 400;
+        color: #939599;
+        line-height: 24px;
+    }
+    .top {
+        padding: 20px 16px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        .top1 {
+            display: flex;
+            align-items: center;
+            .text1 {
+                font-size: 18px;
+                font-weight: bold;
+                color: #ffffff;
+                line-height: 28px;
+            }
+            .text2 {
+                width: 94px;
+                height: 32px;
+                border: 1px solid yellow;
+                border-radius: 4px;
+                margin-left: 14px;
+                line-height: 32px;
+                text-align: center;
+                color: #ffffff;
+                &.text3 {
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+                }
+                .img {
+                    width: 18px;
+                    height: 18px;
+                    margin-right: 4px;
+                }
+                &.prim {
+                    color: #939599;
+                    border: 1px solid #303133;
+                    background: #202122;
+                }
+            }
+            .text4 {
+                color: #fdfb60;
+                &.prim {
+                    color: #939599;
+                }
+            }
+        }
+    }
+    .prive {
+        display: flex;
+        align-items: center;
+        .prive1 {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin: 16px 15px 0;
+            width: 94px;
+            height: 32px;
+            color: #000;
+            background: linear-gradient(48deg, #fdfb60 0%, #ff8f3e 100%);
+            border-radius: 4px;
+            &.prim {
+                background: #202122;
+                color: #939599;
+            }
+        }
+        .prive2 {
+            text-align: center;
+        }
+        .img {
+            text-align: center;
+            width: 18px;
+            height: 18px;
+            margin-right: 4px;
+        }
+    }
 }
 
 .page-title {
+    padding: 0 16px;
     font-size: 18px;
     font-weight: bold;
     color: #ffffff;
@@ -505,6 +860,7 @@ export default {
     line-height: 28px;
     margin-top: 10px;
     word-break: break-all;
+    padding: 0 16px;
 }
 
 .btn {

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

@@ -23,10 +23,11 @@
             finished-text=""
             @load="getData"
         >
-            <!-- <template v-for="(item, index) in list" :key="index"> -->
-            <!-- <product-info></product-info> -->
-            <!-- </template> -->
-            <div v-if="empty" class="content" @click="$router.push('/givesubmit?id=' + this.$route.query.id)">
+            <div
+                v-if="info.length != 0"
+                class="content"
+                @click="$router.push('/givesubmit?id=' + this.$route.query.id + '&toUserId=' + info.id)"
+            >
                 <img class="img" :src="info.avatar" alt="" />
                 <div class="init">
                     <div>
@@ -34,7 +35,6 @@
                         <div class="text2">
                             手机号码 <span>{{ info.phone }}</span>
                         </div>
-                        <div class="text2">真实姓名 <span>11111</span></div>
                     </div>
                     <div class="btn">赠送</div>
                 </div>
@@ -53,12 +53,12 @@ export default {
     mixins: [product, list],
     data() {
         return {
-            empty: false,
             info: [],
             phone: '',
             stiky: null,
             type: '',
-            minterId: ''
+            minterId: '',
+            empty: false
         };
     },
     computed: {
@@ -75,10 +75,14 @@ export default {
                 })
                 .then(res => {
                     this.info = res;
-                    if (this.info != '') {
+                    if (this.info.length === 0) {
                         this.empty = true;
                     }
-                    console.log(res);
+                })
+                .catch(e => {
+                    if (e) {
+                        this.$toast(e.error);
+                    }
                 });
         }
     }

src/main/pc-space/src/views/AssetDetail.vue

@@ -103,6 +103,21 @@
                         >
                     </div>
                 </div>
+                <div class="init">
+                    <div class="name">类型</div>
+                    <div class="name">悄悄话<span>（灰色表示已使用）</span></div>
+                    <div class="name">持有特权<span>（灰色表示已使用）</span></div>
+                </div>
+                <div class="init1">
+                    <div class="name">{{ info.category }}</div>
+                    <div class="bor"></div>
+                    <div>111</div>
+                    <div class="bor"></div>
+                    <div>11</div>
+                    <div>11</div>
+                    <div>11</div>
+                    <div>11</div>
+                </div>
                 <div v-if="properties.length > 0">
                     <div class="time">
                         <div class="time1">商品特性</div>
@@ -144,18 +159,19 @@
                         <div v-html="info.detail"></div>
                     </div>
                 </el-collapse-item>
-
-                <!-- <el-collapse-item name="3">
-                    <template slot="title">
-                        <img class="imgs" src="../assets/info_icon_jiaoyijilu.png" alt="" />
-                        <span>交易历史</span>
-                    </template>
-                    <el-table :data="tableData" stripe style="width: 100%">
-                        <el-table-column prop="date" label="日期" width="180"> </el-table-column>
-                        <el-table-column prop="name" label="姓名" width="180"> </el-table-column>
-                        <el-table-column prop="address" label="地址"> </el-table-column>
-                    </el-table>
-                </el-collapse-item> -->
+                <div v-if="list.length != 0">
+                    <el-collapse-item name="3">
+                        <template slot="title">
+                            <img class="imgs" src="../assets/info_icon_jiaoyijilu.png" alt="" />
+                            <span>交易历史</span>
+                        </template>
+                        <el-table :data="tableData" stripe style="width: 100%">
+                            <el-table-column prop="realName" label="用户" width="555"> </el-table-column>
+                            <el-table-column prop="name" label="操作" width="555"> </el-table-column>
+                            <el-table-column prop="createdAt" label="时间"> </el-table-column>
+                        </el-table>
+                    </el-collapse-item>
+                </div>
             </el-collapse>
         </div>
         <div class="nft" v-if="relateds.length > 0">
@@ -203,7 +219,8 @@ export default {
             activeNames: ['2', '3'],
             relateds: [],
             boxOptions: { slidesPerView: 4, spaceBetween: 24, autoplay: true },
-            loading: true
+            loading: true,
+            list: []
         };
     },
     computed: {
@@ -226,6 +243,9 @@ export default {
     },
     mounted() {
         this.getDetail();
+        setTimeout(() => {
+            this.record();
+        }, 1000);
     },
     watch: {
         $route() {
@@ -233,6 +253,16 @@ export default {
         }
     },
     methods: {
+        record() {
+            this.$http
+                .get('/asset/tokenHistory', {
+                    tokenId: this.info.tokenId,
+                    assetId: this.info.id
+                })
+                .then(res => {
+                    this.list = res;
+                });
+        },
         getDetail() {
             this.$http.get('/asset/get/' + this.$route.query.id).then(res => {
                 this.info = res;
@@ -382,7 +412,37 @@ export default {
             flex-grow: 1;
             margin-left: 30px;
         }
-
+        .init {
+            background: #1c1e26;
+            border-radius: 8px 8px 0px 0px;
+            display: flex;
+            align-items: center;
+            .name {
+                font-size: 18px;
+                font-weight: bold;
+                color: #ffffff;
+                line-height: 28px;
+            }
+            span {
+                font-size: 14px;
+                font-weight: 400;
+                color: #939599;
+                line-height: 24px;
+            }
+        }
+        .init {
+            display: flex;
+            align-items: center;
+            height: 102px;
+            background: #1f2230;
+            border-radius: 0px 0px 8px 8px;
+            .bor {
+                width: 1px;
+                height: 62px;
+                background: #494a4d;
+                border-radius: 1px;
+            }
+        }
         .works {
             display: flex;
             align-items: center;

src/main/pc-space/src/views/user/AccountData.vue

@@ -59,9 +59,9 @@
                                     </el-button>
                                 </div>
                             </div>
-                            <div class="imgBox" v-if="item.bg">
+                            <!-- <div class="imgBox" v-if="item.bg">
                                 <img class="imgBox1" :src="item.bg" alt="" />
-                            </div>
+                            </div> -->
                         </div>
                     </router-link>
                 </div>

src/main/pc-space/src/views/user/OrderValue.vue

@@ -24,8 +24,8 @@
                 :highlight-current-row="false"
                 style="width: 100%; background: #1c1e26"
             >
-                <el-table-column prop="name" label="商品信息" width="178"> </el-table-column>
-                <el-table-column prop="id" label="订单编号" width="184"> </el-table-column>
+                <el-table-column prop="name" label="商品信息" width="268"> </el-table-column>
+                <el-table-column prop="id" label="订单编号" width="134"> </el-table-column>
                 <el-table-column style="color: #fdfb60" prop="payTime" label="交易时间" width="190"> </el-table-column>
                 <el-table-column prop="totalPrice" label="实际金额" width="140"> </el-table-column>
                 <el-table-column prop="payMethod" label="收益类型" width="140" :formatter="statusFormatter">