Skip to content

P
pica-new-compaign
提交 c7b69edf 编写于 作者: guangjun.yang's avatar guangjun.yang
浏览文件
操作

个人明细页面

上级 f2099e6e
隐藏空白字符变更
内嵌 并排
正在显示 包含 86 行增加 和 117 行删除
components/bussiness/detail-btn.vue
浏览文件 @ c7b69edf
...@@ -38,6 +38,8 @@ export default { ...@@ -38,6 +38,8 @@ export default {
position: fixed; position: fixed;
left: 0; left: 0;
bottom: 0; bottom: 0;
z-index: 3;
background: #fff;
} }
.detail-btn { .detail-btn {
display: flex; display: flex;
......
components/bussiness/detail-list.vue
浏览文件 @ c7b69edf
<template> <template>
<div class="detail-list br"> <div class="detail-list br">
<ul v-show="dataList.length"> <ul v-show="!dataList.length">
<li class="list" v-for="(item, index) in dataList" :key="index"> <li class="list" v-for="(item, index) in dataList" :key="index">
<img src="../../assets/type-2.png" alt=""> <img src="../../assets/type-2.png" alt="">
<ul class="desc"> <ul class="desc">
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<span class="score"><span>+5</span>勤奋分</span> <span class="score"><span>+5</span>勤奋分</span>
</li> </li>
</ul> </ul>
<div v-show="!dataList.length" class="no-content"> <div v-show="dataList.length" class="no-content">
<img src="../../assets/no-content.png" alt=""> <img src="../../assets/no-content.png" alt="">
<div class="text">暂无记录,您还没有参加活动</div> <div class="text">暂无记录,您还没有参加活动</div>
<DetailBtn style="margin-top: 30px;" btnText="立即参加" :isFixed="isFixed" btnWidth="50%"></DetailBtn> <DetailBtn style="margin-top: 30px;" btnText="立即参加" :isFixed="isFixed" btnWidth="50%"></DetailBtn>
...@@ -26,7 +26,7 @@ export default { ...@@ -26,7 +26,7 @@ export default {
props: { props: {
dataList: { dataList: {
type: Array, type: Array,
default: () => [0, 1, 3, 4] default: () => [0, 1, 3,0, 1, 3,0, 1, 3,0, 1, 3, 4]
} }
}, },
data() { data() {
......
components/header/index.vue
浏览文件 @ c7b69edf
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div :class="{ active: isScroll }" class="content title"> <div :class="{ active: isScroll }" class="content title">
<span>{{ shareTitle1 }}</span> <span>{{ shareTitle1 }}</span>
</div> </div>
<div class="content right-icon" @click="share"> <div v-show="isShowRightIcon" class="content right-icon" @click="share">
<img :src="headerRightIcon" /> <img :src="headerRightIcon" />
</div> </div>
</div> </div>
...@@ -45,6 +45,10 @@ export default { ...@@ -45,6 +45,10 @@ export default {
}, },
shareIconUrl: { shareIconUrl: {
type: String type: String
},
isShowRightIcon: {
type: Boolean,
default: false
} }
}, },
computed: { computed: {
...@@ -61,8 +65,11 @@ export default { ...@@ -61,8 +65,11 @@ export default {
}, },
methods: { methods: {
goBack() { goBack() {
this.$emit('closeVideo'); if(this.$rocNative.isWeb) {
this.$rocNative.goBack(); this.$router.go(-1);
} else {
this.$rocNative.goBack();
}
}, },
share() { share() {
let shareUrl = ''; let shareUrl = '';
......
package-lock.json
浏览文件 @ c7b69edf
...@@ -6096,8 +6096,7 @@ ...@@ -6096,8 +6096,7 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -6118,14 +6117,12 @@ ...@@ -6118,14 +6117,12 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -6140,20 +6137,17 @@ ...@@ -6140,20 +6137,17 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -6270,8 +6264,7 @@ ...@@ -6270,8 +6264,7 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -6283,7 +6276,6 @@ ...@@ -6283,7 +6276,6 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -6298,7 +6290,6 @@ ...@@ -6298,7 +6290,6 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -6306,14 +6297,12 @@ ...@@ -6306,14 +6297,12 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -6332,7 +6321,6 @@ ...@@ -6332,7 +6321,6 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -6413,8 +6401,7 @@ ...@@ -6413,8 +6401,7 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -6426,7 +6413,6 @@ ...@@ -6426,7 +6413,6 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -6512,8 +6498,7 @@ ...@@ -6512,8 +6498,7 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -6549,7 +6534,6 @@ ...@@ -6549,7 +6534,6 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -6569,7 +6553,6 @@ ...@@ -6569,7 +6553,6 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -6613,14 +6596,12 @@ ...@@ -6613,14 +6596,12 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
} }
} }
}, },
...@@ -8089,8 +8070,7 @@ ...@@ -8089,8 +8070,7 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -8111,14 +8091,12 @@ ...@@ -8111,14 +8091,12 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -8133,20 +8111,17 @@ ...@@ -8133,20 +8111,17 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -8263,8 +8238,7 @@ ...@@ -8263,8 +8238,7 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -8276,7 +8250,6 @@ ...@@ -8276,7 +8250,6 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -8291,7 +8264,6 @@ ...@@ -8291,7 +8264,6 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -8299,14 +8271,12 @@ ...@@ -8299,14 +8271,12 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -8325,7 +8295,6 @@ ...@@ -8325,7 +8295,6 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -8406,8 +8375,7 @@ ...@@ -8406,8 +8375,7 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -8419,7 +8387,6 @@ ...@@ -8419,7 +8387,6 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -8505,8 +8472,7 @@ ...@@ -8505,8 +8472,7 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -8542,7 +8508,6 @@ ...@@ -8542,7 +8508,6 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -8562,7 +8527,6 @@ ...@@ -8562,7 +8527,6 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -8606,14 +8570,12 @@ ...@@ -8606,14 +8570,12 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
} }
} }
}, },
...@@ -12720,8 +12682,7 @@ ...@@ -12720,8 +12682,7 @@
}, },
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -12739,13 +12700,11 @@ ...@@ -12739,13 +12700,11 @@
}, },
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -12758,18 +12717,15 @@ ...@@ -12758,18 +12717,15 @@
}, },
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -12872,8 +12828,7 @@ ...@@ -12872,8 +12828,7 @@
}, },
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -12883,7 +12838,6 @@ ...@@ -12883,7 +12838,6 @@
"is-fullwidth-code-point": { "is-fullwidth-code-point": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -12896,20 +12850,17 @@ ...@@ -12896,20 +12850,17 @@
"minimatch": { "minimatch": {
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
}, },
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -12926,7 +12877,6 @@ ...@@ -12926,7 +12877,6 @@
"mkdirp": { "mkdirp": {
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -12999,8 +12949,7 @@ ...@@ -12999,8 +12949,7 @@
}, },
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -13010,7 +12959,6 @@ ...@@ -13010,7 +12959,6 @@
"once": { "once": {
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -13086,8 +13034,7 @@ ...@@ -13086,8 +13034,7 @@
}, },
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -13117,7 +13064,6 @@ ...@@ -13117,7 +13064,6 @@
"string-width": { "string-width": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -13135,7 +13081,6 @@ ...@@ -13135,7 +13081,6 @@
"strip-ansi": { "strip-ansi": {
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -13174,13 +13119,11 @@ ...@@ -13174,13 +13119,11 @@
}, },
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"bundled": true, "bundled": true
"optional": true
} }
} }
}, },
......
pages/perdetails.vue
浏览文件 @ c7b69edf
<template> <template>
<section class="personal-details-wrapper"> <section class="personal-detail">
<article class="user"> <Header
<img class="user-img" src="../assets/user-header.png" alt=""> :is-scroll="isScroll"
<div class="profile"> :share-title1="shareTitle1"
<img src="../assets/user-header.png" alt=""> :share-title2="shareTitle2"
<div class="desc"> />
<span class="score">22345</span> <section class="personal-details-wrapper">
<span class="text">我的勤奋分</span> <article class="user">
<img class="user-img" src="../assets/user-header.png" alt="">
<div class="profile">
<img src="../assets/user-header.png" alt="">
<div class="desc">
<span class="score">22345</span>
<span class="text">我的勤奋分</span>
</div>
</div> </div>
</div> </article>
</article> <DetailList></DetailList>
<DetailList></DetailList> <DetailBtn v-show="false" needBT=true @btnClick="goBack"></DetailBtn>
<DetailBtn needBT=true @btnClick="btnClick"></DetailBtn> </section>
</section> </section>
</template> </template>
<script> <script>
import DetailList from '@/components/bussiness/detail-list'; import DetailList from '@/components/bussiness/detail-list';
import DetailBtn from '@/components/bussiness/detail-btn'; import DetailBtn from '@/components/bussiness/detail-btn';
import Header from '../components/header';
export default { export default {
components: { components: {
Header,
DetailList, DetailList,
DetailBtn DetailBtn
}, },
data() { data() {
return { return {
token: '222',
shareTitle1: '个人明细',
shareTitle2: '',
shareIconUrl: '',
isScroll: true,
} }
}, },
methods: { methods: {
btnClick() { goBack() {
console.log(11); if(this.$rocNative.isWeb) {
// alert(1); this.$router.go(-1);
} } else {
this.$rocNative.goBack();
}
},
}, },
} }
</script> </script>
<style lang="less"> <style lang="less">
.personal-details-wrapper { .personal-details-wrapper {
padding: 70px 0 60px;
.user { .user {
position: relative; position: relative;
top: 0; top: 0;
...@@ -69,16 +86,16 @@ export default { ...@@ -69,16 +86,16 @@ export default {
// margin-left: 15px; // margin-left: 15px;
text-align: center; text-align: center;
.score { .score {
height: 24px; height: 18px;
line-height: 24px; line-height: 18px;
font-size: 24px; font-size: 24px;
font-weight: 700; font-weight: 700;
color: rgba(255,232,165, 0.8); color: rgba(255,232,165, 1);
} }
.text { .text {
height: 18px; height: 18px;
line-height: 18px; line-height: 18px;
// margin-top: 6px; margin-top: 6px;
font-size: 12px; font-size: 12px;
font-weight: 400; font-weight: 400;
color: #FFE8A5; color: #FFE8A5;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或