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 @@ -
-
-
- 交付中 -
- -
-
{{ set.title || '熊猫字画' }}
-
编号:{{ set.unique_number }}
-
-
-
-
- 交付中 -
- -
-
{{ set.title || '熊猫字画' }}
-
编号:{{ set.unique_number }}
+
+
+
+
+
+ 交付中 +
+ +
+
{{ set.title || '熊猫字画' }}
+
编号:{{ item.unique_number }}
+
+
+
+
+ 交付中 +
+ +
+
{{ set.title || '熊猫字画' }}
+
编号:{{ item.unique_number }}
+
+
+
@@ -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; + } + } } } } } } - - } \ 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 @@ +
@@ -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 @@ +