From f9f1467368f5124aec4c98f04e5470e984a2ebe6 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Wed, 13 Mar 2024 12:04:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E9=85=92=E9=81=93?=
=?UTF-8?q?=E9=A6=86=E7=99=BB=E5=BD=95token=E8=BF=87=E6=9C=9F=E5=90=8E?=
=?UTF-8?q?=E6=9C=AA=E6=AD=A3=E5=B8=B8=E5=A4=84=E7=90=86=EF=BC=8C=E5=AF=BC?=
=?UTF-8?q?=E8=87=B4=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BE=9D=E7=84=B6=E5=8F=AF?=
=?UTF-8?q?=E4=BB=A5=E7=99=BB=E5=BD=95=E4=BD=86=E6=98=AF=E4=B8=8D=E8=83=BD?=
=?UTF-8?q?=E6=AD=A3=E5=B8=B8=E4=BD=BF=E7=94=A8=20=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=EF=BC=9A=E7=94=B1=E4=BA=8E=E7=BC=96=E7=A0=81=E9=97=AE=E9=A2=98?=
=?UTF-8?q?=EF=BC=8C=E5=9C=A8=E7=9C=9F=E6=9C=BA=E4=B8=8A=E9=9D=A2=E4=B8=8D?=
=?UTF-8?q?=E8=83=BD=E6=AD=A3=E5=B8=B8=E8=BF=9B=E8=A1=8C=E6=89=AB=E7=A0=81?=
=?UTF-8?q?=E6=A0=B8=E9=94=80=E6=8F=90=E8=B4=A7=E5=88=B8=20=E6=96=87?=
=?UTF-8?q?=E5=AD=97=E4=BF=AE=E6=94=B9=EF=BC=9A=E9=83=A8=E5=88=86=E4=BC=98?=
=?UTF-8?q?=E6=83=A0=E5=88=B8=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=8F=90=E8=B4=A7?=
=?UTF-8?q?=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/app.js | 8 ++++----
pages.json | 4 ++--
pages/admin/business/index.vue | 2 +-
pages/admin/business/login.vue | 27 +++++++++++++++++++++------
pages/users/user_coupon/index.vue | 6 +++---
pages/users/write_off/index.vue | 14 +++++++++++---
6 files changed, 42 insertions(+), 19 deletions(-)
diff --git a/config/app.js b/config/app.js
index e76d97b..6a45260 100644
--- a/config/app.js
+++ b/config/app.js
@@ -6,13 +6,13 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user`
let openPlantGrass = '-openPlantGrass-'
// 网络接口修改此字符 小程序域名要求https
-let httpApi = 'https://bt.test.cdlfjy.com/' // 开发
-// let httpApi = 'https://mp.scwmbh.cn/' // 生产
+// let httpApi = 'https://bt.test.cdlfjy.com/' // 开发
+let httpApi = 'https://mp.scwmbh.cn/' // 生产
// 聊天接口修改此字符 小程序聊天要求wss 例如：
-let wsApi = 'wss://bt.test.cdlfjy.com'
-// let wsApi = 'wss://mp.scwmbh.cn'
+// let wsApi = 'wss://bt.test.cdlfjy.com'
+let wsApi = 'wss://mp.scwmbh.cn'
module.exports = {
diff --git a/pages.json b/pages.json
index e301aad..96e368a 100644
--- a/pages.json
+++ b/pages.json
@@ -239,7 +239,7 @@
{
"path": "user_coupon/index",
"style": {
- "navigationBarTitleText": "我的优惠券"
+ "navigationBarTitleText": "我的提货券"
}
},
{
@@ -584,7 +584,7 @@
{
"path": "write_off/index",
"style": {
- "navigationBarTitleText": "优惠券核销"
+ "navigationBarTitleText": "提货券核销"
}
}
]
diff --git a/pages/admin/business/index.vue b/pages/admin/business/index.vue
index 1253e61..960b000 100644
--- a/pages/admin/business/index.vue
+++ b/pages/admin/business/index.vue
@@ -75,7 +75,7 @@ export default {
if(merchantInfo.merchant_type == 1){
// 酒道馆核销用户优惠券
list.push({
- title: '优惠券核销',
+ title: '提货券核销',
url: '/pages/users/write_off/index',
icon: 'iconfont icon-dingdanhexiao'
});
diff --git a/pages/admin/business/login.vue b/pages/admin/business/login.vue
index 09e0c33..32adbe7 100644
--- a/pages/admin/business/login.vue
+++ b/pages/admin/business/login.vue
@@ -16,9 +16,10 @@
{{ item.mer_name || '' }}
-
+
登录
+ 已过期
@@ -73,6 +74,9 @@ export default {
account: '',
password: ''
},
+ // 当前时间戳
+ intervalId: '',
+ current_timestamp: 0,
}
},
computed: {
@@ -94,6 +98,17 @@ export default {
// 未登录 初始化
this.init();
},
+ onShow() {
+ let _this = this;
+ _this.intervalId = setInterval(function () {
+ const now = new Date();
+ _this.current_timestamp = Math.ceil(now.getTime() / 1000)
+ }, 1000); // 每秒更新一次时间
+ },
+ onUnload() {
+ // 页面销毁时清除定时器
+ if (this.intervalId) clearInterval(this.intervalId);
+ },
onReady() {
this.login_bg = `${HTTP_REQUEST_URL}/static/images/mer/mer_login_bg.png`;
this.list_bg = `${HTTP_REQUEST_URL}/static/images/mer/mer_login_list.png`;
@@ -169,6 +184,10 @@ export default {