From 92f74e84eca1cedb1de13651f3d99fa8ea24eb7d Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 26 Oct 2023 11:40:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E6=B7=BB=E5=8A=A0=E5=AE=9E=E5=90=8D?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=20=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=94=B6?=
 =?UTF-8?q?=E8=97=8F=E5=AE=A4=E6=94=AF=E6=8C=81=E6=98=BE=E7=A4=BA=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E6=94=B6=E8=97=8F=E5=93=81=EF=BC=8C=E5=9C=A8=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=94=B6=E8=97=8F=E5=93=81=E6=97=B6=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=A9=BA=E5=9B=BE=E6=A0=87=E8=80=8C=E4=B8=8D=E6=98=AF=E7=A9=BA?=
 =?UTF-8?q?=E7=99=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                         |   3 -
 src/views/member/collection_room/index.vue  | 165 +++++++++++---------
 src/views/member/info/components/pop-up.vue |  17 +-
 src/views/member/info/new_info_v2.vue       |   1 +
 4 files changed, 104 insertions(+), 82 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 5fbc6de..40fa1d4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -10386,9 +10386,6 @@ const routes = [
       foot: true
     }
   },
-
-
-
   // 典藏室
   {
     path: "/member/collection_room",
diff --git a/src/views/member/collection_room/index.vue b/src/views/member/collection_room/index.vue
index f033493..368c8e1 100644
--- a/src/views/member/collection_room/index.vue
+++ b/src/views/member/collection_room/index.vue
@@ -9,27 +9,32 @@
         <img class="top-image-content" :src="set.top_thumb" />
       </div>
       <!--收藏品列表-->
-      <div class="draw-list" v-if="set.collection_room_id > 0">
-        <div class="draw-box imitation">
-          <div class="status">
-            <img class="status-img" src="../../../assets/up-down.png" />交付中
-          </div>
-          <img class="draw-box-img" :src="set.imitation" />
-          <div class="text-content">
-            <div class="title">{{ set.title || '熊猫字画' }}</div>
-            <div class="number" v-if="set.unique_number > 0">编号:{{ set.unique_number }}</div>
-          </div>
-        </div>
-        <div class="draw-box collection">
-          <div class="status">
-            <img class="status-img" src="../../../assets/up-down.png" />交付中
-          </div>
-          <img class="draw-box-img" :src="set.collection" />
-          <div class="text-content">
-            <div class="title">{{ set.title || '熊猫字画' }}</div>
-            <div class="number" v-if="set.unique_number > 0">编号:{{ set.unique_number }}</div>
+      <div class="draw-list">
+        <div class="draw-list-content" v-if="Object.values(set.list).length > 0">
+          <div class="draw-block" v-for="(item,index) in Object.values(set.list)" :key="index">
+            <div class="draw-box imitation">
+              <div class="status">
+                <img class="status-img" src="../../../assets/up-down.png" />交付中
+              </div>
+              <img class="draw-box-img" :src="set.imitation" />
+              <div class="text-content">
+                <div class="title">{{ set.title || '熊猫字画' }}</div>
+                <div class="number" v-if="item.unique_number > 0">编号:{{ item.unique_number }}</div>
+              </div>
+            </div>
+            <div class="draw-box collection">
+              <div class="status">
+                <img class="status-img" src="../../../assets/up-down.png" />交付中
+              </div>
+              <img class="draw-box-img" :src="set.collection" />
+              <div class="text-content">
+                <div class="title">{{ set.title || '熊猫字画' }}</div>
+                <div class="number" v-if="item.unique_number > 0">编号:{{ item.unique_number }}</div>
+              </div>
+            </div>
           </div>
         </div>
+        <van-empty description="暂无收藏品" v-else />
       </div>
     </div>
   </div>
@@ -88,72 +93,76 @@ export default {
       background: #FFFFFF;
       border-top-left-radius: 20px;
       border-top-right-radius: 20px;
-      display: inline-flex;
-      flex-direction: row;
-      flex-wrap: wrap;
-      justify-content: space-between;
 
-      .draw-box{
-        --draw-box-size-: calc((100vw - 55px) / 2);
-        width: var(--draw-box-size-);
-        margin-bottom: 15px;
-        background: #FFFFFF;
-        box-shadow: 0 3px 5px rgba(0, 0, 0, 0.13);
-        border-radius: 10px;
-        overflow: hidden;
-        position: relative;
-        .status{
-          background: linear-gradient(95deg, #f8f8f8, #c9c4bf);
-          border-radius: 50px;
-          height: 23px;
-          text-align: right;
-          position: absolute;
-          top: 10px;
-          left: 10px;
-          width: 70px;
-          font-size: 14px;
+      .draw-list-content{
+
+        .draw-block{
+          width: 100%;
           display: inline-flex;
           flex-direction: row;
-          flex-wrap: nowrap;
-          align-items: center;
-          justify-content: center;
-          .status-img{
-            width: 14px!important;
-            //height: 15px!important;
-            margin: 0 3px 0 0!important;
-          }
-        }
-        .draw-box-img{
-          width: var(--draw-box-size-);
-          height: var(--draw-box-size-);
-        }
-        .text-content{
-          padding: 10px 5px;
-          text-align: left;
-          .title{
-            font-size: 15px;
-            font-weight: bold;
-            letter-spacing: 1px;
-            height: 30px;
-            line-height: 30px;
-            width: 100%;
-          }
-          .number{
-            background: url('../../../assets/number-icon.png') no-repeat;
-            background-size: 115px auto;
-            height: 30px;
-            line-height: 30px;
-            width: 100%;
-            margin-top: 10px;
-            margin-bottom: 10px;
-            font-size: 13px;
-            padding-left: 35px;
+          flex-wrap: wrap;
+          justify-content: space-between;
+          .draw-box{
+            --draw-box-size-: calc((100vw - 55px) / 2);
+            width: var(--draw-box-size-);
+            margin-bottom: 15px;
+            background: #FFFFFF;
+            box-shadow: 0 3px 5px rgba(0, 0, 0, 0.13);
+            border-radius: 10px;
+            overflow: hidden;
+            position: relative;
+            .status{
+              background: linear-gradient(95deg, #f8f8f8, #c9c4bf);
+              border-radius: 50px;
+              height: 23px;
+              text-align: right;
+              position: absolute;
+              top: 10px;
+              left: 10px;
+              width: 70px;
+              font-size: 14px;
+              display: inline-flex;
+              flex-direction: row;
+              flex-wrap: nowrap;
+              align-items: center;
+              justify-content: center;
+              .status-img{
+                width: 14px!important;
+                //height: 15px!important;
+                margin: 0 3px 0 0!important;
+              }
+            }
+            .draw-box-img{
+              width: var(--draw-box-size-);
+              height: var(--draw-box-size-);
+            }
+            .text-content{
+              padding: 10px 5px;
+              text-align: left;
+              .title{
+                font-size: 15px;
+                font-weight: bold;
+                letter-spacing: 1px;
+                height: 30px;
+                line-height: 30px;
+                width: 100%;
+              }
+              .number{
+                background: url('../../../assets/number-icon.png') no-repeat;
+                background-size: 115px auto;
+                height: 30px;
+                line-height: 30px;
+                width: 100%;
+                margin-top: 10px;
+                margin-bottom: 10px;
+                font-size: 13px;
+                padding-left: 35px;
+              }
+            }
           }
         }
       }
     }
   }
-
-
 }
 </style>
\ No newline at end of file
diff --git a/src/views/member/info/components/pop-up.vue b/src/views/member/info/components/pop-up.vue
index abecdcc..c5cc7f6 100644
--- a/src/views/member/info/components/pop-up.vue
+++ b/src/views/member/info/components/pop-up.vue
@@ -17,6 +17,10 @@
         <template v-else-if="popUpType == 'weChat'">
           <van-field v-model.trim="weChatForm.wechat" label="账号" placeholder="请输入账号" input-align="right" />
         </template>
+        <template v-else-if="popUpType == 'authentication'">
+          <van-field v-model.trim="realname" label="真实姓名" placeholder="请输入真实姓名" input-align="right" />
+          <van-field v-model.trim="authentication" label="身份证号码" placeholder="请输入身份证号码" input-align="right" />
+        </template>
       </div>
     </van-action-sheet>
   </div>
@@ -40,7 +44,9 @@ export default {
         //微信
         wechat: ""
       },
-      email: ""
+      email: "",
+      authentication: '',
+      realname: '',
     };
   },
   methods: {
@@ -58,6 +64,9 @@ export default {
       } else if (e == "email") {
         this.popUpType = e;
         this.popUpTitle = "邮箱";
+      } else if (e == "authentication") {
+        this.popUpType = e;
+        this.popUpTitle = "身份证";
       }
     },
     confirm() {
@@ -95,6 +104,12 @@ export default {
         json = {
           email: this.email
         };
+      } else if (this.popUpType == "authentication") {
+        url = "member.member-info.changeAuthentication";
+        json = {
+          realname: this.realname,
+          authentication: this.authentication
+        };
       }
       $http.post(url, json, "正在提交数据...").then(
         function(response) {
diff --git a/src/views/member/info/new_info_v2.vue b/src/views/member/info/new_info_v2.vue
index 0d25ade..a8f1661 100644
--- a/src/views/member/info/new_info_v2.vue
+++ b/src/views/member/info/new_info_v2.vue
@@ -17,6 +17,7 @@
           </div>
         </template>
       </van-cell>
+      <van-cell :title="'实名认证'" is-link :value="dataList.idcard == ''?'完善':'修改'" style="margin-top: 0.625rem;" @click='openPopUp("authentication")'/>
       <van-cell v-if="dataList.mobile!=undefined" :title="'手机号:'+ dataList.mobile" is-link :value="dataList.mobile == ''?'完善':'修改'" style="margin-top: 0.625rem;" @click.native="bindTel"/>
       <van-cell v-if="dataList.alipay!=undefined" :title="'支付宝:'+ dataList.alipay" is-link :value="dataList.alipay == ''?'完善':'修改'" style="margin-top: 0.625rem;" @click='openPopUp("alipay")'/>
       <van-cell v-if="dataList.wechat!=undefined" :title="'微信号:'+ dataList.wechat" is-link :value="dataList.wechat == ''?'完善':'修改'" style="margin-top: 0.625rem;" @click='openPopUp("weChat")'/>