diff --git a/src/components/LablesMember.vue b/src/components/LablesMember.vue index 26c618f..c9e946a 100644 --- a/src/components/LablesMember.vue +++ b/src/components/LablesMember.vue @@ -20,42 +20,15 @@
金币充值
-
- 基础功能 +
+ 年度会员
高级功能
-
-
金币充值
-
- - - - - - - - - - - -
-
-
基础功能
+
金币充值
¥ {{ price.originPrice }}
-

{{ price.coin }}金币

+

{{ price.coin }}条/每年

+
+
+ +
+
年度会员
+
+
+

{{ price.title }}

+
+ ¥ + {{ price.price }} +
+
+ ¥ + {{ price.originPrice }} +
+
@@ -99,8 +94,8 @@ -
支付方式
-
+
支付方式
+
@@ -123,15 +118,6 @@
-
-
-
-
-
- 确定 -
-
-
@@ -203,45 +189,13 @@ } }) }, + show () { this.isShow = true }, hide () { this.isShow = false - }, - - onConfirm () { - this.$refs.form.validate((valid) => { - if (valid) { - this.$http.post(`/api/coupon/getDetail`, null, { - params: { - code: this.form.code - } - }).then(res => { - if (res.code == 0) { - let msg = this.getMessage(res.data.type); - this.$confirm(msg, '温馨提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'info' - }).then(() => { - this.$http.post(`/api/order/upgradeByCode`, null, { - params: { - ...this.form - } - }).then(res => { - if (res.code == 0) { - this.$message.success('激活成功') - this.$store.dispatch('getUserInfo') - this.isShow = false - } - }) - }) - } - }) - } - }) } } } @@ -280,7 +234,7 @@ top: 50%; left: 50%; z-index: 11; - min-width: 840px; + min-width: 916px; // height: 620px; padding: 40px 40px; transform: translate(-50%, -50%); diff --git a/src/components/print/customProvider.js b/src/components/print/customProvider.js index 7789a48..d5c2111 100644 --- a/src/components/print/customProvider.js +++ b/src/components/print/customProvider.js @@ -117,8 +117,10 @@ export const customProvider = function () { { tid: 'providerModule1.image', title: '图片', - data: 'https://foruda.gitee.com/avatar/1677050350324030848/5400665_ccsimple_1591166830.png!avatar200', - type: 'image' + type: 'image', + options: { + src: 'http://lyshunong.oss-cn-beijing.aliyuncs.com/image/material/a6e14259412606502e49f1abd866039.png', + } } ]) ]) diff --git a/src/store/index.js b/src/store/index.js index 4d1f521..bca7163 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -57,7 +57,7 @@ export default new Vuex.Store({ state.showTemuAlert = flag }, setLabelInfo(state, info) { - state.info = info + state.labelInfo = info } }, @@ -70,7 +70,7 @@ export default new Vuex.Store({ resolve(res.data) } }) - // this.getLabelInfo() + store.dispatch('getLabelInfo') }) }, @@ -78,7 +78,11 @@ export default new Vuex.Store({ return new Promise(resolve => { request.post('/api/userExtend/getLabelDetail').then(res => { if (res.code === 0) { - store.commit('setLabelInfo', res.data) + const isExpires = new Date().getTime() > new Date(res.data.expireTime).getTime() || res.data.skuUsed > res.data.skuTotal + store.commit('setLabelInfo', { + ...res.data, + isExpires + }) resolve(res.data) } }) diff --git a/src/view/Home.vue b/src/view/Home.vue index 6f14ded..ab3423f 100644 --- a/src/view/Home.vue +++ b/src/view/Home.vue @@ -7,7 +7,7 @@
-
+
{{ $store.state.userInfo.coin }}
@@ -15,7 +15,7 @@ 签到 -
+
会员信息:
{{ getStateInfo }}
@@ -252,11 +252,6 @@
- -
diff --git a/src/view/lables/SkuManage.vue b/src/view/lables/SkuManage.vue index 3cf8a9f..df6a12e 100644 --- a/src/view/lables/SkuManage.vue +++ b/src/view/lables/SkuManage.vue @@ -531,6 +531,8 @@ this.getList() } + this.btnLoading = false + }).catch(() => { this.btnLoading = false }) }, diff --git a/src/view/lables/Template.vue b/src/view/lables/Template.vue index 0193f40..ccdaf1f 100644 --- a/src/view/lables/Template.vue +++ b/src/view/lables/Template.vue @@ -4,6 +4,12 @@ slot="title" title="模板管理" isShowBottomBorder> +