From 180fb9c33266ce2db1270fa5410ff266d385f586 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Tue, 12 Dec 2023 15:41:08 +0800 Subject: [PATCH] 2023-12-12 --- common/config.js | 4 +- common/request.api.js | 4 + manifest.json | 2 +- pages.json | 21 +- pages/card/card - 副本.vue | 241 ------------------- pages/card/card-223-12-12.vue | 357 +++++++++++++++++++++++++++++ pages/card/card.vue | 188 +++------------ pages/card/card_bind3.vue | 138 +++++++++++ pages/enterprise/corporateCard.vue | 130 ++++++++++- 9 files changed, 678 insertions(+), 407 deletions(-) delete mode 100644 pages/card/card - 副本.vue create mode 100644 pages/card/card-223-12-12.vue create mode 100644 pages/card/card_bind3.vue diff --git a/common/config.js b/common/config.js index ff0a685..28a73ee 100644 --- a/common/config.js +++ b/common/config.js @@ -6,8 +6,8 @@ * loginTimeoutPage = "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面 */ module.exports = { - baseUrl: 'http://192.168.2.106:7201', - // baseUrl: 'https://supervise.yxtsoft.com/lpkapi', + // baseUrl: 'http://192.168.2.106:7201', + baseUrl: 'https://supervise.yxtsoft.com/lpkapi', // baseUrl: 'http://jianguan.yyundong.com/api', tokenName: "Authorization", // 请求头中token的名字，与服务器端对应 loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码 diff --git a/common/request.api.js b/common/request.api.js index ed0dfaf..2621799 100644 --- a/common/request.api.js +++ b/common/request.api.js @@ -6,6 +6,8 @@ export default { // 不显示loading true // 提货卡列表 cardList: (params = {}) => request.post("/lpkgiftcard/gifCardByCustomerSid", params, {}, {}, true), + // 企业卡列表 + empcardList: (params = {}) => request.post("/empcard/getEmpCardByCustomerSid", params, {}, {}, true), // 提货卡详情 cardDetail: (params = {}) => request.get("/lpkgiftcard/getGifCardBySid/" + params, params, {}, {}, true), // 提货日期 周六日的日期组合 @@ -16,6 +18,8 @@ export default { cardBookingSave: (params = {}) => request.post("/lpksreservoorder/submission", params), // 绑定提货卡 cardBind: (params = {}) => request.post("/lpkgiftcard/bindCard", params), + // 绑定企业卡 + empcardBind: (params = {}) => request.post("/empcard/bindCard", params), // 单一提货卡预约记录 orderByCardSid: (params = {}) => request.get("/lpksreservoorder/orderByCardSid/" + params, params, {}, {}, true), // 预约记录 diff --git a/manifest.json b/manifest.json index 4b09164..c2b91d6 100644 --- a/manifest.json +++ b/manifest.json @@ -50,7 +50,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wx11565021714ba796", + "appid" : "wx4724e3a3c27f36b5", "setting" : { "urlCheck" : false }, diff --git a/pages.json b/pages.json index 18fd272..1b1c85d 100644 --- a/pages.json +++ b/pages.json @@ -51,7 +51,14 @@ "style": { "navigationStyle": "custom" } - }, { + }, + { + "path": "pages/card/card_bind3", + "style": { + "navigationStyle": "custom" + } + }, + { "path": "pages/index/BindPhone", "style": { "navigationBarTitleText": "绑定账号", @@ -129,12 +136,12 @@ "iconPath": "static/bomicon/bom_notRecord.png", "selectedIconPath": "static/bomicon/bom_record.png" } - , { - "pagePath": "pages/enterprise/corporateCard", - "text": "企业卡", - "iconPath": "static/bomicon/bom_notCard.png", - "selectedIconPath": "static/bomicon/bom_card.png" - } + // , { + // "pagePath": "pages/enterprise/corporateCard", + // "text": "企业卡", + // "iconPath": "static/bomicon/bom_notCard.png", + // "selectedIconPath": "static/bomicon/bom_card.png" + // } ] }, "uniIdRouter": {} diff --git a/pages/card/card - 副本.vue b/pages/card/card - 副本.vue deleted file mode 100644 index befebf4..0000000 --- a/pages/card/card - 副本.vue +++ /dev/null @@ -1,241 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/card/card-223-12-12.vue b/pages/card/card-223-12-12.vue new file mode 100644 index 0000000..09f5a05 --- /dev/null +++ b/pages/card/card-223-12-12.vue @@ -0,0 +1,357 @@ + + + + + \ No newline at end of file diff --git a/pages/card/card.vue b/pages/card/card.vue index 19c7ef0..a425f7a 100644 --- a/pages/card/card.vue +++ b/pages/card/card.vue @@ -21,139 +21,59 @@ - + - 提货卡 - - - - 福礼卡 + - + + - - - - + + + - + + - - + - - - + - + + 卡号: {{item.serialNumber}} + + {{item.time}} - - - - - - 卡号: - {{item.serialNumber}} - - {{item.time}} - - - - 预约提货 - - - - - {{item.pname}} - - {{item.state}} - - - + + 预约提货 + + + + {{item.pname}} + + {{item.state}} - - - - - - - - - - - - - - - - - - - - - - 卡号: - {{item.serialNumber}} - - {{item.time}} - - - - 预约提货 - - - - - {{item.pname}} - - {{item.state}} - - - - - - - + - - - + @@ -171,7 +91,6 @@ endHeight: 0 }, data: [], - currentTab: 0, } }, onLoad() { @@ -243,14 +162,6 @@ }) } - }, - tab(index) { - this.currentTab = index - - }, - tabChange(event) { - console.log("eeee", event.detail.current) - this.currentTab = event.detail.current } } } @@ -327,31 +238,4 @@ page { background: #FFFFFF; } - - .tab-box { - box-sizing: border-box; - height: 100vw; - } - - .tab-content { - overflow-y: scroll; - } - - .tab-bj1 { - background: #FFF6EF; - color: #FF7200; - font-size: 16px; - border-radius: 25px; - border: 1px solid #FF7200; - padding: 5px 30px; - } - - .tab-bj2 { - background: #E7E7E7; - color: #9D9D9D; - font-size: 16px; - border-radius: 25px; - padding: 5px 30px; - border: none; - } \ No newline at end of file diff --git a/pages/card/card_bind3.vue b/pages/card/card_bind3.vue new file mode 100644 index 0000000..e32219a --- /dev/null +++ b/pages/card/card_bind3.vue @@ -0,0 +1,138 @@ + + + + + \ No newline at end of file diff --git a/pages/enterprise/corporateCard.vue b/pages/enterprise/corporateCard.vue index 321ec17..4aae4c8 100644 --- a/pages/enterprise/corporateCard.vue +++ b/pages/enterprise/corporateCard.vue @@ -1,7 +1,8 @@