Skip to content

P
pica-cooperation-cme
提交 5d7df74a 编写于 作者: guangjun.yang's avatar guangjun.yang
浏览文件
操作

Merge branch 'dev-compliance-0708' of... 

Merge branch 'dev-compliance-0708' of 192.168.110.53:com.pica.cloud.education.frontend/pica-cooperation-cme into dev-compliance-0708

* 'dev-compliance-0708' of 192.168.110.53:com.pica.cloud.education.frontend/pica-cooperation-cme:
  提交兑换ui

# Conflicts:
#	src/views/merge-detail.vue
上级 51d62d6d d54a689a
隐藏空白字符变更
内嵌 并排
正在显示 包含 144 行增加 和 93 行删除
package-lock.json
浏览文件 @ 5d7df74a
...@@ -692,15 +692,13 @@ ...@@ -692,15 +692,13 @@
"version": "0.3.2", "version": "0.3.2",
"resolved": "http://192.168.110.93:4873/array-unique/-/array-unique-0.3.2.tgz", "resolved": "http://192.168.110.93:4873/array-unique/-/array-unique-0.3.2.tgz",
"integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
"dev": true, "dev": true
"optional": true
}, },
"braces": { "braces": {
"version": "2.3.2", "version": "2.3.2",
"resolved": "http://192.168.110.93:4873/braces/-/braces-2.3.2.tgz", "resolved": "http://192.168.110.93:4873/braces/-/braces-2.3.2.tgz",
"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"arr-flatten": "^1.1.0", "arr-flatten": "^1.1.0",
"array-unique": "^0.3.2", "array-unique": "^0.3.2",
...@@ -719,7 +717,6 @@ ...@@ -719,7 +717,6 @@
"resolved": "http://192.168.110.93:4873/extend-shallow/-/extend-shallow-2.0.1.tgz", "resolved": "http://192.168.110.93:4873/extend-shallow/-/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"is-extendable": "^0.1.0" "is-extendable": "^0.1.0"
} }
...@@ -902,7 +899,6 @@ ...@@ -902,7 +899,6 @@
"resolved": "http://192.168.110.93:4873/fill-range/-/fill-range-4.0.0.tgz", "resolved": "http://192.168.110.93:4873/fill-range/-/fill-range-4.0.0.tgz",
"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"extend-shallow": "^2.0.1", "extend-shallow": "^2.0.1",
"is-number": "^3.0.0", "is-number": "^3.0.0",
...@@ -915,7 +911,6 @@ ...@@ -915,7 +911,6 @@
"resolved": "http://192.168.110.93:4873/extend-shallow/-/extend-shallow-2.0.1.tgz", "resolved": "http://192.168.110.93:4873/extend-shallow/-/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"is-extendable": "^0.1.0" "is-extendable": "^0.1.0"
} }
...@@ -942,8 +937,7 @@ ...@@ -942,8 +937,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",
...@@ -964,14 +958,12 @@ ...@@ -964,14 +958,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"
...@@ -986,20 +978,17 @@ ...@@ -986,20 +978,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",
...@@ -1116,8 +1105,7 @@ ...@@ -1116,8 +1105,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",
...@@ -1129,7 +1117,6 @@ ...@@ -1129,7 +1117,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"
} }
...@@ -1144,7 +1131,6 @@ ...@@ -1144,7 +1131,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"
} }
...@@ -1152,14 +1138,12 @@ ...@@ -1152,14 +1138,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"
...@@ -1178,7 +1162,6 @@ ...@@ -1178,7 +1162,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"
} }
...@@ -1259,8 +1242,7 @@ ...@@ -1259,8 +1242,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",
...@@ -1272,7 +1254,6 @@ ...@@ -1272,7 +1254,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"
} }
...@@ -1358,8 +1339,7 @@ ...@@ -1358,8 +1339,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",
...@@ -1395,7 +1375,6 @@ ...@@ -1395,7 +1375,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",
...@@ -1415,7 +1394,6 @@ ...@@ -1415,7 +1394,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"
} }
...@@ -1459,14 +1437,12 @@ ...@@ -1459,14 +1437,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
} }
} }
}, },
...@@ -1540,7 +1516,6 @@ ...@@ -1540,7 +1516,6 @@
"resolved": "http://192.168.110.93:4873/is-number/-/is-number-3.0.0.tgz", "resolved": "http://192.168.110.93:4873/is-number/-/is-number-3.0.0.tgz",
"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"kind-of": "^3.0.2" "kind-of": "^3.0.2"
}, },
...@@ -1550,7 +1525,6 @@ ...@@ -1550,7 +1525,6 @@
"resolved": "http://192.168.110.93:4873/kind-of/-/kind-of-3.2.2.tgz", "resolved": "http://192.168.110.93:4873/kind-of/-/kind-of-3.2.2.tgz",
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"is-buffer": "^1.1.5" "is-buffer": "^1.1.5"
} }
...@@ -1561,15 +1535,13 @@ ...@@ -1561,15 +1535,13 @@
"version": "3.0.1", "version": "3.0.1",
"resolved": "http://192.168.110.93:4873/isobject/-/isobject-3.0.1.tgz", "resolved": "http://192.168.110.93:4873/isobject/-/isobject-3.0.1.tgz",
"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
"dev": true, "dev": true
"optional": true
}, },
"kind-of": { "kind-of": {
"version": "6.0.2", "version": "6.0.2",
"resolved": "http://192.168.110.93:4873/kind-of/-/kind-of-6.0.2.tgz", "resolved": "http://192.168.110.93:4873/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
"dev": true, "dev": true
"optional": true
}, },
"micromatch": { "micromatch": {
"version": "3.1.10", "version": "3.1.10",
...@@ -2395,7 +2367,6 @@ ...@@ -2395,7 +2367,6 @@
"resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
"integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"hoek": "2.x.x" "hoek": "2.x.x"
} }
...@@ -3885,8 +3856,7 @@ ...@@ -3885,8 +3856,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",
...@@ -3907,14 +3877,12 @@ ...@@ -3907,14 +3877,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"
...@@ -3929,20 +3897,17 @@ ...@@ -3929,20 +3897,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",
...@@ -4059,8 +4024,7 @@ ...@@ -4059,8 +4024,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",
...@@ -4072,7 +4036,6 @@ ...@@ -4072,7 +4036,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"
} }
...@@ -4087,7 +4050,6 @@ ...@@ -4087,7 +4050,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"
} }
...@@ -4095,14 +4057,12 @@ ...@@ -4095,14 +4057,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"
...@@ -4121,7 +4081,6 @@ ...@@ -4121,7 +4081,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"
} }
...@@ -4202,8 +4161,7 @@ ...@@ -4202,8 +4161,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",
...@@ -4215,7 +4173,6 @@ ...@@ -4215,7 +4173,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"
} }
...@@ -4301,8 +4258,7 @@ ...@@ -4301,8 +4258,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",
...@@ -4338,7 +4294,6 @@ ...@@ -4338,7 +4294,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",
...@@ -4358,7 +4313,6 @@ ...@@ -4358,7 +4313,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"
} }
...@@ -4402,14 +4356,12 @@ ...@@ -4402,14 +4356,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
} }
} }
}, },
...@@ -4767,8 +4719,7 @@ ...@@ -4767,8 +4719,7 @@
"version": "2.16.3", "version": "2.16.3",
"resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
"integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
"dev": true, "dev": true
"optional": true
}, },
"home-or-tmp": { "home-or-tmp": {
"version": "2.0.0", "version": "2.0.0",
......
src/components/cme/bind-card-button.vue
浏览文件 @ 5d7df74a
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
</div> </div>
</article> </article>
<article class="right"> <article class="right">
<span @click="gotoExchange" class="left">去兑换</span> <span class="left" @click="changeClick">去兑换</span>
<span @click="gotoBuy" class="right">去购买</span> <span @click="gotoBuy" class="right">去购买</span>
</article> </article>
</section> </section>
</template> </template>
...@@ -30,6 +30,9 @@ export default { ...@@ -30,6 +30,9 @@ export default {
return {}; return {};
}, },
methods: { methods: {
changeClick(){
this.$emit("changeClick","去兑换")
},
gotoExchange() { gotoExchange() {
this.$emit("gotoExchange"); this.$emit("gotoExchange");
}, },
......
src/components/cme/change-card.vue 0 → 100644
浏览文件 @ 5d7df74a
<template>
<van-popup v-model="show"
closeable
close-icon-position="top-right"
position="bottom"
>
<section class="bind-cart-wrapper">
<article class="title">兑换详情</article>
<article class="tip">
<div class="left">
<img src="../../images/cme/phrase2/info.png" />
<span>激活码用于兑换课程，您可以从订单详情或已购买到实体卡查看激活码密码。激活码一旦兑换，不可退回。</span>
</div>
</article>
<article class="code">
<van-field v-model="value"
clearable
label="激活码"
placeholder="请输入激活码"
error-message="请输入正确的激活码"
/>
</article>
<article class="bottom"> <van-button size="large" round color="#449284">确认兑换</van-button></article>
</section>
</van-popup>
</template>
<script>
export default {
props: {
cardInfo: {
type: Object,
default: () => {}
},
show: {
type: Boolean,
default: false,
}
},
data() {
return {
activationCode: '',
};
},
methods: {
}
};
</script>
<style lang="scss" scoped>
@import "../../style/mixin";
.bind-cart-wrapper {
width: 100%;
display: flex;
line-height: 1;
padding: px2rem(10px) px2rem(15px);
display: flex;
flex-direction: column;
background: rgba(255, 255, 255, 1);
box-shadow: 0px -2px 10px 0px rgba(0, 0, 0, 0.1);
.title{
display: flex;
flex-direction: row;
font-size : 18px;
align-items: center;
justify-content: center;
width: 100%;
margin-top: px2rem(20px);
}
.tip{
display: flex;
margin-top: px2rem(40px);
.left{
display: flex;
line-height: 1.2;
font-size: px2rem(12px);
img {
width: px2rem(12px);
height: px2rem(12px);
margin-left: 1px;
margin-right: px2rem(4px);
}
color: #979899;
}
}
.code{
display: flex;
}
.bottom{
display: flex;
margin-bottom: px2rem(4px);
}
}
</style>
\ No newline at end of file
src/views/merge-detail.vue
浏览文件 @ 5d7df74a
...@@ -134,10 +134,12 @@ ...@@ -134,10 +134,12 @@
<BindCardButton <BindCardButton
v-if="project.cmeType == 2 && !hasBindCard" v-if="project.cmeType == 2 && !hasBindCard"
:cardInfo="cardInfo" :cardInfo="cardInfo"
:gotoExchange="gotoExchange"
:gotoBuy="confirm" :gotoBuy="confirm"
@changeClick="changeClick"
></BindCardButton> ></BindCardButton>
<!--去兑换-->
<ChangeCard :show="show" :cardInfo="cardInfo" ></ChangeCard>
<!-- <CardPopup :cardInfo="cardInfo" :isShow="isShowPopup" @clickOverlay="clickOverlay" @cancle="jumpToCardList()" @confirm="confirm"></CardPopup> --> <!-- <CardPopup :cardInfo="cardInfo" :isShow="isShowPopup" @clickOverlay="clickOverlay" @cancle="jumpToCardList()" @confirm="confirm"></CardPopup> -->
<Loading v-show="showLoading" /> <Loading v-show="showLoading" />
<div> <div>
...@@ -174,7 +176,7 @@ import vueFilters from "@/utils/filter"; ...@@ -174,7 +176,7 @@ import vueFilters from "@/utils/filter";
import { Toast } from 'vant'; import { Toast } from 'vant';
// import CardPopup from "@/components/cme/card-popup"; // import CardPopup from "@/components/cme/card-popup";
import BindCardButton from "@/components/cme/bind-card-button"; import BindCardButton from "@/components/cme/bind-card-button";
import ChangeCard from "@/components/cme/change-card";
let cataOffsetTop = 0; let cataOffsetTop = 0;
let intorOffsetTop = 0; let intorOffsetTop = 0;
let titleOffsetHeight = 50; let titleOffsetHeight = 50;
...@@ -272,6 +274,7 @@ export default { ...@@ -272,6 +274,7 @@ export default {
id: 0 id: 0
}, },
advertInfoList: [], advertInfoList: [],
show: false,//是否展示兑换弹框
}; };
}, },
components: { components: {
...@@ -293,7 +296,8 @@ export default { ...@@ -293,7 +296,8 @@ export default {
// CardPopup, // CardPopup,
CommonAdertImg, CommonAdertImg,
NoMoreContent, NoMoreContent,
BindCardButton BindCardButton,
ChangeCard
}, },
computed: { computed: {
...@@ -368,16 +372,6 @@ export default { ...@@ -368,16 +372,6 @@ export default {
}); });
}, },
// 打开兑换码弹框
gotoExchange() {
},
// // 调用支付页面
// gotoBuy() {
// },
// 查询教培项目广告位配置信息 // 查询教培项目广告位配置信息
getAdvertInfoList() { getAdvertInfoList() {
let param = { let param = {
...@@ -417,7 +411,7 @@ export default { ...@@ -417,7 +411,7 @@ export default {
component_tag: `883#8831` component_tag: `883#8831`
}); });
this.isShowEJDialog = false; this.isShowEJDialog = false;
this.jumpToCardList(); this.jumpToCardList();
// this.isBuy(2); // this.isBuy(2);
this.firstIntoExamAction(); this.firstIntoExamAction();
}, },
...@@ -448,6 +442,9 @@ export default { ...@@ -448,6 +442,9 @@ export default {
component_tag: `885#8851` component_tag: `885#8851`
}); });
// 复制卡密
this.copyLink();
this.showLoading = false; this.showLoading = false;
// this.isShowPopup = false; // this.isShowPopup = false;
// 判断版本号，如果小于3.4.0，则只做提示 // 判断版本号，如果小于3.4.0，则只做提示
...@@ -711,7 +708,11 @@ export default { ...@@ -711,7 +708,11 @@ export default {
} }
}); });
}, },
//去兑换
changeClick(msg){
console.log(msg)
this.show = !this.show;
},
// 弹框按钮事件 // 弹框按钮事件
handlerAction(data) { handlerAction(data) {
this.isShowDialog = false; this.isShowDialog = false;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或