yuany 3 éve
szülő
commit
2fc7708359

+ 1 - 1
.env.development

@@ -1,4 +1,4 @@
-VUE_APP_BASE_URL=https://test.adcs.vip
+VUE_APP_BASE_URL=https://www.lasuo.cc
 NODE_ENV=development
 VUE_APP_PUBLIC_PATH=/
 ASSETS_PATH=raex

+ 1 - 1
src/components/product/productLarge.vue

@@ -131,7 +131,7 @@ export default {
         bottom: 0;
     }
     .not_sold_out {
-        width: 144px;
+        // width: 144px;
         height: 25px;
         background: #000000;
         border-radius: 15px;

+ 3 - 0
src/views/account/TradingPassword.vue

@@ -169,6 +169,9 @@ export default {
     color: #ffffff;
     background: @bg;
 }
+/deep/ .van-key{
+    color: #333333;
+}
 .login {
     padding: 60px 48px 0px;
     background: @bg;

+ 7 - 7
src/views/account/Waiting.vue

@@ -1,14 +1,8 @@
 <template>
     <!-- <TopNavigation/> -->
     <div class="content">
-        <!-- 实名认证审核中 -->
-        <div class="under_review" v-if="this.userInfo && !this.userInfo.authStatus">
-            <img :src="require('@assets/shenqing_shenhezhong.png')" alt="" class="under_review_img" />
-            <div class="under_review_title">提交成功,请等待审核</div>
-            <div class="under_review_tip">平台将于3日内完成资料审核,请耐心等待</div>
-        </div>
         <!-- 实名认证失败 -->
-        <div class="under_review" v-else>
+        <div class="under_review" v-if="this.userInfo && this.userInfo.authStatus === 'FAIL'">
             <img :src="require('@assets/shenqing_weitongguo.png')" alt="" class="under_review_img" />
             <div class="under_review_title">资料审核失败</div>
             <div class="audit_failed_tip">很遗憾,您的资料审核失败!请检查您填写的资料是否正确以及上传照片是否清晰</div>
@@ -16,6 +10,12 @@
                 <div class="under_review_return_con" @click="$router.replace('/verified')">申请认证</div>
             </div>
         </div>
+        <!-- 实名认证审核中 -->
+        <div class="under_review" v-else>
+            <img :src="require('@assets/shenqing_shenhezhong.png')" alt="" class="under_review_img" />
+            <div class="under_review_title">提交成功,请等待审核</div>
+            <div class="under_review_tip">平台将于3日内完成资料审核,请耐心等待</div>
+        </div>
     </div>
     <!-- <div class="page">
         <img class="img" :src="statusInfo.img" alt="" />

+ 100 - 25
src/views/asset/Detail.vue

@@ -63,10 +63,10 @@
                     <div class="list_of_details_one_title_con">{{ info.name }}</div>
                     <div class="list_of_details_one_text" v-if="!info.consignment">
                         <img :src="require('@assets/blockchain@3x.png')" alt="" class="list_of_details_one_text_img" />
-                        <div class="list_of_details_one_text_con">{{info.numericCode}}</div>
+                        <div class="list_of_details_one_text_con">{{ info.numericCode }}</div>
                     </div>
                     <div class="list_of_details_one_title_one" v-else>
-                        <div class="list_of_details_one_title_one_text1">{{info.collectionCategory}}</div>
+                        <div class="list_of_details_one_title_one_text1">{{ info.collectionCategory }}</div>
                         <div class="list_of_details_one_title_one_text2">{{ info.category }}</div>
                     </div>
                 </div>
@@ -77,10 +77,22 @@
                         <div class="collection_holder_one_title">持有者</div>
                         <div class="collection_holder_one_time">{{ userInfo.nickname }}</div>
                     </div>
-                    <div class="collection_holder_one">
+                    <div class="collection_holder_one collection_holder_two">
                         <div class="collection_holder_one_title">生成时间</div>
                         <div class="collection_holder_one_time">{{ info.createdAt }}</div>
                     </div>
+                    <div class="collection_holder_one">
+                        <div class="collection_holder_one_title">藏品哈希值</div>
+                        <div class="collection_holder_one_con">
+                            <div class="collection_holder_one_time_con">{{ info.tokenId }}</div>
+                            <img
+                                @click="copyOne(info.tokenId)"
+                                src="@assets/svgs/copy_icon.svg"
+                                alt=""
+                                class="collection_holder_one_time_con_img"
+                            />
+                        </div>
+                    </div>
                 </div>
                 <div class="collection_holder_publisher" v-else>
                     <van-image
@@ -92,7 +104,7 @@
                     />
                     <div class="collection_holder_publisher_title">
                         <div class="collection_holder_publisher_title_one">{{ userInfo.nickname }}</div>
-                        <div class="collection_holder_publisher_title_two">{{info.collectionWorks}}</div>
+                        <div class="collection_holder_publisher_title_two">{{ info.collectionWorks }}</div>
                     </div>
                 </div>
             </div>
@@ -106,7 +118,7 @@
                     </div>
                     <div class="work_story_creator">
                         <div class="work_story_creator_left">发行方</div>
-                        <div class="work_story_creator_right">{{info.issuer}}</div>
+                        <div class="work_story_creator_right">{{ info.issuer }}</div>
                     </div>
                 </div>
             </div>
@@ -118,7 +130,12 @@
                     </div>
                     <div class="hold_privileges_name" v-if="privileges.length == 0">创作者暂时未设置</div>
                     <div class="hold_privileged_information" v-else>
-                        <div class="hold_privileged_information_con" :class="{ hold_privileged_information_con_opened: item.opened }" v-for="(item, index) in privileges" :key="index">
+                        <div
+                            class="hold_privileged_information_con"
+                            :class="{ hold_privileged_information_con_opened: item.opened }"
+                            v-for="(item, index) in privileges"
+                            :key="index"
+                        >
                             <van-image
                                 v-if="!item.opened"
                                 width="18px"
@@ -135,7 +152,11 @@
                                 fit="cover"
                                 class="hold_privileged_information_con_img"
                             />
-                            <div v-if="item.once" @click="privilegeFn2(item)" class="hold_privileged_information_con_title_opened">
+                            <div
+                                v-if="item.once"
+                                @click="privilegeFn2(item)"
+                                class="hold_privileged_information_con_title_opened"
+                            >
                                 {{ item.name }}
                             </div>
                             <div v-else @click="privilegeFn(item)" class="hold_privileged_information_con_title">
@@ -151,12 +172,19 @@
             <div class="hold_privileges">
                 <div class="hold_privileges_con">
                     <div class="hold_privileges_title">作品特效</div>
-                    <div class="hold_privileges_name" v-if="properties.length == 0">创作者暂时未设置</div>
-                    <div class="digital_equity_card" v-else>
-                        <div class="digital_equity_card_con" v-for="(item, index) in properties" :key="index" @click="Whisper">
-                            <span class="digital_equity_card_con_one">{{ item.name }}</span>
-                            <span class="digital_equity_card_con_two">{{ item.value }}</span>
+                    <!-- <div class="hold_privileges_name" v-if="properties.length == 0">创作者暂时未设置</div> -->
+                    <div class="digital_equity_card">
+                        <div class="digital_equity_card_con" @click="openedFn">
+                            <span class="digital_equity_card_con_one">数字权益卡</span>
+                            <span class="digital_equity_card_con_two">打开可见</span>
                         </div>
+                        <!-- <div
+                            class="digital_equity_card_con"
+                            v-for="(item, index) in properties"
+                            :key="index"
+                            @click="openedFn"
+                        > -->
+                        <!-- </div> -->
                     </div>
                 </div>
             </div>
@@ -179,7 +207,9 @@
                                 <div class="hold_privileges_list_con_right">
                                     <div v-if="item.price">
                                         <div class="hold_privileges_list_con_text1">¥{{ item.price }}</div>
-                                        <div class="hold_privileges_list_con_text2 hold_privileges_list_con_text2_con">{{ item.operation }}</div>
+                                        <div class="hold_privileges_list_con_text2 hold_privileges_list_con_text2_con">
+                                            {{ item.operation }}
+                                        </div>
                                     </div>
                                     <div class="hold_privileges_list_con_text3" v-else>{{ item.operation }}</div>
                                     <!-- <div class="hold_privileges_list_con_text1">仅展示</div> -->
@@ -406,15 +436,21 @@
                     <div class="list_of_details_one_title_con">{{ info.name }}</div>
                     <div class="list_of_details_one_text">
                         <img :src="require('@assets/blockchain@3x.png')" alt="" class="list_of_details_one_text_img" />
-                        <div class="list_of_details_one_text_con">{{info.numericCode}}</div>
+                        <div class="list_of_details_one_text_con">{{ info.numericCode }}</div>
                     </div>
                 </div>
             </div>
             <!-- 赠送 -->
             <div class="gift_collection">
                 <div class="gift_collection_one">
-                    <img :src="collectionStatus === 'CANCELLED' ? giftSuccess : giftFailed" alt="" class="gift_collection_one_img" />
-                    <div class="gift_collection_one_title">{{ collectionStatus === 'CANCELLED' ? '赠送成功' : '赠送失败' }}</div>
+                    <img
+                        :src="collectionStatus === 'CANCELLED' ? giftSuccess : giftFailed"
+                        alt=""
+                        class="gift_collection_one_img"
+                    />
+                    <div class="gift_collection_one_title">
+                        {{ collectionStatus === 'CANCELLED' ? '赠送成功' : '赠送失败' }}
+                    </div>
                 </div>
                 <div class="gift_collection_two">
                     {{ collectionStatus === 'CANCELLED' ? '我们会在24小时内,短信通知您的好友' : '很遗憾!赠送失败' }}
@@ -783,7 +819,7 @@ export default {
             giftCollection: false,
             giftSuccess: require('@assets/zengsongchenggong@3x.png'),
             giftFailed: require('@assets/zengsongshibai@3x.png'),
-            collectionStatus: ""
+            collectionStatus: ''
         };
     },
     computed: {
@@ -806,9 +842,9 @@ export default {
         setTimeout(() => {
             this.record();
         }, 1000);
-        if(this.$route.query.collectionStatus){
-            this.collectionStatus = this.$route.query.collectionStatus
-        } 
+        if (this.$route.query.collectionStatus) {
+            this.collectionStatus = this.$route.query.collectionStatus;
+        }
     },
     methods: {
         share() {
@@ -837,6 +873,18 @@ export default {
                 }
             );
         },
+        copyOne(text) {
+            this.$copyText(text).then(
+                e => {
+                    this.$toast.success('复制成功');
+                    console.log(e);
+                },
+                e => {
+                    this.$toast('复制失败');
+                    console.log(e);
+                }
+            );
+        },
         privilegeFn(init) {
             this.list2 = init;
             this.show = true;
@@ -864,11 +912,19 @@ export default {
             }
         },
         openedFn() {
-            console.log("14313131",this.init2)
+            if (this.info.tokenId) {
+                Dialog.alert({
+                    title: '数字权益卡',
+                    message: this.info.tokenId,
+                    confirmButtonText: '好的'
+                }).then(() => {
+                    // on close
+                });
+            }
             // this.show2 = false;
             // this.show3 = true;
             // if (!this.init2.once) {
-                // this.show2 = false;
+            // this.show2 = false;
             //     this.$http
             //         .post('/asset/usePrivilege', {
             //             assetId: this.info.id,
@@ -1333,6 +1389,25 @@ export default {
                     .collection_holder_one_title {
                         opacity: 0.5;
                     }
+                    .collection_holder_one_con{
+                        display: flex;
+                        .collection_holder_one_time_con{
+                            width: 180px;
+                            font-size: 12px;
+                            font-family: PingFangSC-Regular, PingFang SC;
+                            font-weight: 400;
+                            color: #FFFFFF;
+                            line-height: 18px;
+                            margin: 2px 10px 0px 0px;
+                            overflow: hidden;
+                            white-space: nowrap;
+                            text-overflow: ellipsis;
+                        }
+                        .collection_holder_one_time_con_img{
+                            width: 24px;
+                            height: 24px;
+                        }
+                    }
                 }
                 .collection_holder_two {
                     margin-bottom: 16px;
@@ -1469,7 +1544,7 @@ export default {
                             line-height: 18px;
                             margin-left: 1px;
                         }
-                        .hold_privileged_information_con_title_opened{
+                        .hold_privileged_information_con_title_opened {
                             font-size: 12px;
                             font-family: PingFangSC-Regular, PingFang SC;
                             font-weight: 400;
@@ -1478,7 +1553,7 @@ export default {
                             margin-left: 1px;
                         }
                     }
-                    .hold_privileged_information_con_opened{
+                    .hold_privileged_information_con_opened {
                         background: #ffffff;
                         opacity: 0.5;
                     }
@@ -1535,7 +1610,7 @@ export default {
                         line-height: 18px;
                         opacity: 0.3;
                     }
-                    .hold_privileges_list_con_text2_con{
+                    .hold_privileges_list_con_text2_con {
                         text-align: right;
                     }
                     .hold_privileges_list_con_text3 {

+ 1 - 1
src/views/order/Detail.vue

@@ -49,7 +49,7 @@
             </div>
             <div class="fee_details_con">
                 <div class="fee_details_actual_payment">支付流水号</div>
-                <div>2930010137474708</div>
+                <div>{{info.paySerialNumber}}</div>
             </div>
         </div>
         <!-- <div class="fee_details">