diff --git a/App.vue b/App.vue index cd3feb8..9f424f8 100644 --- a/App.vue +++ b/App.vue @@ -7,12 +7,80 @@ globalData: { wxSilentLoginURL: config.baseUrl + "/lpkcustomer/wxSilentLogin", sid: "", + token: "", navInfo: { } }, onLaunch: function() { + + const updateManager = uni.getUpdateManager(); + + updateManager.onCheckForUpdate(function(res) { + // 请求完新版本信息的回调 + console.log(res.hasUpdate); + }); + + updateManager.onUpdateReady(function(res) { + uni.showModal({ + title: '更新提示', + content: '新版本已经准备好，是否重启应用？', + success(res) { + if (res.confirm) { + // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启 + updateManager.applyUpdate(); + } + } + }); + + }); + + updateManager.onUpdateFailed(function(res) { + // 新的版本下载失败 + }); + + this.globalData.navInfo = navParams() + let _this = this; + wx.login({ + success: function(res) { + uni.request({ + // 组装请求地址 + url:_this.globalData.wxSilentLoginURL + "?wxCode=" + res.code, + method: "GET", + header: { + 'content-type': "application/x-www-form-urlencoded" + }, + data: { + "wxCode": res.code + }, + success: res => { + if (res.statusCode == 200) { + if (!res.data.success) { + if (res.data.code == "110") { + // 需要绑定手机号 + uni.reLaunch({ + url: '/pages/index/BindPhone?openid=' + + res.data.data.wxMpOpenid + }) + } else { + // _this.status = 'more' + } + } else { + // 成功后跳转主页 + _this.globalData.sid = res.data.data.sid + console.log("用户sid",_this.globalData.sid) + } + } else { + } + }, + fail: (err) => { + } + }); + }, + fail: function(res) { + } + }); }, onShow: function() { console.log('App Show') diff --git a/common/bus.js b/common/bus.js new file mode 100644 index 0000000..cb21a52 --- /dev/null +++ b/common/bus.js @@ -0,0 +1,3 @@ +import Vue from 'vue' +const bus = new Vue() +export default bus \ No newline at end of file diff --git a/common/config.js b/common/config.js index 28a73ee..4c156c5 100644 --- a/common/config.js +++ b/common/config.js @@ -6,10 +6,10 @@ * loginTimeoutPage = "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面 */ module.exports = { - // baseUrl: 'http://192.168.2.106:7201', - baseUrl: 'https://supervise.yxtsoft.com/lpkapi', - // baseUrl: 'http://jianguan.yyundong.com/api', + baseUrl: 'http://192.168.2.106:7201', // 本地 + // baseUrl: 'https://lpk.yyundong.com/lpkapi', // 测试服务器 + // baseUrl: 'https://supervise.yxtsoft.com/lpkapi', // 正式服务器 tokenName: "Authorization", // 请求头中token的名字，与服务器端对应 loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码 loginTimeoutPage: "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面 -} \ No newline at end of file +} \ No newline at end of file diff --git a/common/request.api.js b/common/request.api.js index 978c03f..05b08ff 100644 --- a/common/request.api.js +++ b/common/request.api.js @@ -16,18 +16,28 @@ export default { gifcardDetail: (params = {}) => request.get("/empcardgift/getGifCardBySid/" + params, params, {}, {}, true), // 企业卡详情 empCardDetail: (params = {}) => request.get("/empcard/getEmpCardBySid/" + params, params, {}, {}, true), + // 福礼卡分享 改变卡状态 + shareEmpCard: (params = {}) => request.get("/empcardgift/shareEmpCard/" + params, params, {}, {}, true), // 提货日期 周六日的日期组合 isSaturAndSun: (params = {}) => request.get("/lpkgiftcard/isSaturAndSun/" + params, params, {}, {}, true), // 提货日期 周六日的日期组合 isSaturAndSun2: (params = {}) => request.get("/empcardgift/isSaturAndSun/" + params, params, {}, {}, true), + // 提货日期 周六日的日期组合 + isSaturAndSun3: (params = {}) => request.get("/empcard/isSaturAndSun/" + params, params, {}, {}, true), // 提货卡预约初始化 cardBooking: (params = {}) => request.get("/lpkgiftcard/getReservationBySid/" + params, params, {}, {}, true), // 提货卡预约保存 cardBookingSave: (params = {}) => request.post("/lpksreservoorder/submission", params), + // 提货卡转赠保存 + generateEmpCard: (params = {}) => request.post("/empcardgift/generateEmpCard", params), // 福礼卡预约保存 gifcardBookingSave: (params = {}) => request.post("/empsreservoorder/submission", params), + // 福利卡转赠保存 + generateEmpCardGift: (params = {}) => request.post("/empcardgift/generateEmpCardGift", params), // 企业卡生成福利卡 empcardSave: (params = {}) => request.post("/empcardgift/generateCard", params), + // 企业卡预约保存 + empcardBookingSave: (params = {}) => request.post("/empsreservoorder/submissionEmp", params), // 绑定提货卡 cardBind: (params = {}) => request.post("/lpkgiftcard/bindCard", params), // 绑定企业卡 @@ -35,11 +45,26 @@ export default { // 单一提货卡预约记录 orderByCardSid: (params = {}) => request.get("/lpksreservoorder/orderByCardSid/" + params, params, {}, {}, true), // 预约记录 - orderListByUserSid: (params = {}) => request.post("/lpksreservoorder/orderListByUserSid/", params, {}, {}, true), + orderListByUserSid: (params = {}) => request.post("/lpksreservoorder/orderListByUserSid", params, {}, {}, true), // 预约记录详情 orderDetails: (params = {}) => request.get("/lpksreservoorder/orderDetails/" + params, params, {}, {}, true), // 商品详情 goodsDetail: (params = {}) => request.get("/lpkgoods/goodsDetails/" + params, params, {}, {}, true), // 提货点 address: (params = {}) => request.post("/lpkstore/getAllStoreByQuery", params, {}, {}, true), + + + // 2024-1-13 新需求接口 所有卡数据整合到一个页面 + // 新提货卡列表 + pickUpCardList: (params = {}) => request.post("/lpkgiftcard/gifCardsByCustomerSid", params, {}, {}, true), + // 新绑定提货卡 + pickUpCardBind: (params = {}) => request.post("/lpkgiftcard/bindAllCard", params), + + // 云菜窖列表 + appletGiftBagList: (params = {}) => request.get("/appletgiftbag/appletGiftBagList", params), + // 云菜窖列表 + getGiftBagBySid: (params = {}) => request.get("/appletgiftbag/getGiftBagBySid/"+params, params), + // 自选菜窖 商品信息 + getAllGiftBag: (params = {}) => request.get("/lpkgoods/getAllGiftBag", params), + } \ No newline at end of file diff --git a/components/NavBar/NavBar.vue b/components/NavBar/NavBar.vue index eb92a50..c46a5b1 100644 --- a/components/NavBar/NavBar.vue +++ b/components/NavBar/NavBar.vue @@ -174,7 +174,7 @@ return; }else{ uni.switchTab({ - url: '/pages/card/card' + url: '/pages/home/pickUpCard' }) } diff --git a/main.js b/main.js index f51ce1c..5ba2691 100644 --- a/main.js +++ b/main.js @@ -29,6 +29,12 @@ import { Vue.prototype.shortToast = shortToast Vue.prototype.longToast = longToast + +import bus from './common/bus.js'; + +//挂载到this上 +Vue.prototype.$bus = bus; + const app = new Vue({ store, ...App diff --git a/pages.json b/pages.json index 6766fc2..e8b4c6c 100644 --- a/pages.json +++ b/pages.json @@ -7,6 +7,12 @@ "enablePullDownRefresh": false } }, + { + "path" : "pages/home/cloudCard", + "style": { + "navigationStyle": "custom" + } + }, { "path": "pages/card/card_detail", "style": { @@ -20,11 +26,27 @@ } }, { - "path": "pages/card/card", + "path": "pages/home/personCard", + "style": { + "navigationStyle": "custom" + + + } + }, + { + "path": "pages/home/giftCard", + "style": { + "navigationStyle": "custom" + + + } + }, + { + "path": "pages/home/pickUpCard", "style": { "navigationStyle": "custom" - - + + } }, { @@ -40,8 +62,23 @@ "navigationBarTitleText": "预约记录" } }, + + { - "path": "pages/card/card_bind", + "path": "pages/bind/bind_pickUpCard", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/bind/bind_pickUpCard2", + "style": { + "navigationStyle": "custom" + } + }, + + { + "path": "pages/bind/bind_personCard", "style": { "navigationStyle": "custom" } @@ -49,29 +86,42 @@ // 扫码进入 { - "path": "pages/card/card_bind2", + "path": "pages/bind/bind_personCard2", "style": { "navigationStyle": "custom" } }, + + { - "path": "pages/card/card_bind3", + "path": "pages/bind/bind_giftCard", "style": { "navigationStyle": "custom" } }, + + // 扫码进入 { - "path": "pages/index/BindPhone", + "path": "pages/bind/bind_giftCard2", "style": { - "navigationBarTitleText": "绑定账号", - "navigationStyle": "custom", - "app-plus": { - "scrollIndicator": false //禁用原生导航栏, - } + "navigationStyle": "custom" } }, + { - "path": "pages/home/UserFragment", + "path": "pages/bind/bind_enterpriseCard", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/bind/bind_enterpriseCard2", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/index/BindPhone", "style": { "navigationBarTitleText": "绑定账号", "navigationStyle": "custom", @@ -80,6 +130,7 @@ } } }, + { "path": "pages/card/card_record_detail", "style": { @@ -88,7 +139,13 @@ } }, { - "path": "pages/record/recordList", + "path": "pages/home/recordList", + "style": { + "navigationBarTitleText": "预约记录" + } + }, + { + "path": "pages/home/recordList2", "style": { "navigationBarTitleText": "预约记录" } @@ -108,10 +165,9 @@ } }, { - "path" : "pages/enterprise/corporateCard", - "style" : - { - "navigationBarTitleText" : "企业卡" + "path": "pages/home/corporateCard", + "style": { + "navigationStyle": "custom" } }, { @@ -127,19 +183,68 @@ } }, { - "path" : "pages/enterprise/welfare_card_detail", - "style" : - { - "navigationStyle": "custom" + "path": "pages/enterprise/welfare_card_detail", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/enterprise/welfare_card_detail2", + "style": { + "navigationStyle": "custom" + } + }, + + + { + "path": "pages/detail/detail_affeection", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/detail/detail_affeection2", + "style": { + "navigationStyle": "custom" } }, { - "path" : "pages/enterprise/welfare_card_detail2", - "style" : - { + "path": "pages/detail/detail_family", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/detail/detail_family2", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/detail/detail_enterprise", + "style": { + "navigationStyle": "custom" + } + }, + { + "path": "pages/detail/detail_enterprise2", + "style": { + "navigationStyle": "custom" + } + }, + { + "path" : "pages/cloud/detail_cloudCard", + "style": { + "navigationStyle": "custom" + } + }, + { + "path" : "pages/cloud/optionalCard", + "style": { "navigationStyle": "custom" } } + ], "globalStyle": { "navigationBarTextStyle": "white", @@ -152,22 +257,46 @@ "selectedColor": "#191919", "borderStyle": "black", "backgroundColor": "#ffffff", - "list": [{ - "pagePath": "pages/card/card", - "text": "礼包", - "iconPath": "static/bomicon/bom_notPack.png", - "selectedIconPath": "static/bomicon/bom_pack.png" - }, { - "pagePath": "pages/record/recordList", + "list": [ + // { + // "pagePath": "pages/home/personCard", + // "text": "个人卡", + // "iconPath": "static/bomicon/bom_notPerson.png", + // "selectedIconPath": "static/bomicon/bom_person.png" + // }, { + // "pagePath": "pages/home/giftCard", + // "text": "福礼卡", + // "iconPath": "static/bomicon/bom_notGift.png", + // "selectedIconPath": "static/bomicon/bom_gift.png" + // }, { + // "pagePath": "pages/home/corporateCard", + // "text": "企业卡", + // "iconPath": "static/bomicon/bom_notCorporate.png", + // "selectedIconPath": "static/bomicon/bom_corporate.png" + // }, + // { + // "pagePath": "pages/home/recordList", + // "text": "预约记录", + // "iconPath": "static/bomicon/bom_notRecordNew.png", + // "selectedIconPath": "static/bomicon/bom_recordNew.png" + // } + { + "pagePath": "pages/home/cloudCard", + "text": "云选菜窖", + "iconPath": "static/bomicon/bom_notCloudCard.png", + "selectedIconPath": "static/bomicon/bom_cloudCard.png" + }, + { + "pagePath": "pages/home/pickUpCard", + "text": "提菜卡", + "iconPath": "static/bomicon/bom_notPickUp.png", + "selectedIconPath": "static/bomicon/bom_pickUp.png" + }, + { + "pagePath": "pages/home/recordList2", "text": "预约记录", - "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" + "iconPath": "static/bomicon/bom_notRecordNew.png", + "selectedIconPath": "static/bomicon/bom_recordNew.png" } ] }, diff --git a/pages/card/card_bind.vue b/pages/bind/bind_enterpriseCard.vue similarity index 89% rename from pages/card/card_bind.vue rename to pages/bind/bind_enterpriseCard.vue index c6db62c..b400e2e 100644 --- a/pages/card/card_bind.vue +++ b/pages/bind/bind_enterpriseCard.vue @@ -5,10 +5,11 @@ - - + + - + + + + + + + + + + + + + + + + + + + + + 绑定企业卡 + + + 提货编码 + + + + + + 提货密码 + + + + + + 绑定 + + + + + + + \ No newline at end of file diff --git a/pages/bind/bind_giftCard.vue b/pages/bind/bind_giftCard.vue new file mode 100644 index 0000000..ebde0c4 --- /dev/null +++ b/pages/bind/bind_giftCard.vue @@ -0,0 +1,157 @@ + + + + + \ No newline at end of file diff --git a/pages/bind/bind_giftCard2.vue b/pages/bind/bind_giftCard2.vue new file mode 100644 index 0000000..39c6345 --- /dev/null +++ b/pages/bind/bind_giftCard2.vue @@ -0,0 +1,202 @@ + + + + + \ No newline at end of file diff --git a/pages/card/card_bind3.vue b/pages/bind/bind_personCard.vue similarity index 83% rename from pages/card/card_bind3.vue rename to pages/bind/bind_personCard.vue index e32219a..b83c26b 100644 --- a/pages/card/card_bind3.vue +++ b/pages/bind/bind_personCard.vue @@ -2,13 +2,14 @@ - - - + + - + + + + + + + + 绑定云菜窖卡 + + + 提货编码 + + + + + + 提货密码 + + + + + + 绑定 + + + + + + + \ No newline at end of file diff --git a/pages/bind/bind_pickUpCard2.vue b/pages/bind/bind_pickUpCard2.vue new file mode 100644 index 0000000..c54a904 --- /dev/null +++ b/pages/bind/bind_pickUpCard2.vue @@ -0,0 +1,202 @@ + + + + + \ No newline at end of file diff --git a/pages/card/card.vue b/pages/card/card.vue deleted file mode 100644 index 377f76a..0000000 --- a/pages/card/card.vue +++ /dev/null @@ -1,401 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/card/card_booking.vue b/pages/card/card_booking.vue index ce7d4be..adeacb2 100644 --- a/pages/card/card_booking.vue +++ b/pages/card/card_booking.vue @@ -101,6 +101,8 @@ \ No newline at end of file diff --git a/pages/card/card_detail2.vue b/pages/card/card_detail2.vue index 8037ce3..ae108e3 100644 --- a/pages/card/card_detail2.vue +++ b/pages/card/card_detail2.vue @@ -26,8 +26,9 @@ - - {{data.pname}} + + {{data.pname}} @@ -74,44 +75,96 @@ + + - - - - - - - 提货时间：{{item.reserveDate}} - - - - - 提货地点：{{item.store}} - - - - - 提 货 人：{{item.userName}} - - - - - 联系电话：{{item.userPhone}} - - - + + + + 提货时间：{{item.reserveDate}} + + + + + 提货地点：{{item.store}} + + + + + 提 货 人：{{item.userName}} + + + + + 联系电话：{{item.userPhone}} + + + - {{item.goods}} + + + + + + + + 转赠信息 + + + + + + + + + + + + + + 福礼卡编码：{{data.empCardGift.code}} + 提货密码：{{data.empCardGift.codeKey}} + 备注说明：{{data.empCardGift.remarks}} + + + {{data.empCardGift.goods}} + + + + + + + + + + + + + + @@ -122,6 +175,8 @@ \ No newline at end of file diff --git a/pages/cloud/optionalCard.vue b/pages/cloud/optionalCard.vue new file mode 100644 index 0000000..e3a8257 --- /dev/null +++ b/pages/cloud/optionalCard.vue @@ -0,0 +1,227 @@ + + + + + \ No newline at end of file diff --git a/pages/detail/detail_affeection.vue b/pages/detail/detail_affeection.vue new file mode 100644 index 0000000..112ff0a --- /dev/null +++ b/pages/detail/detail_affeection.vue @@ -0,0 +1,732 @@ + + + + + \ No newline at end of file diff --git a/pages/detail/detail_affeection2.vue b/pages/detail/detail_affeection2.vue new file mode 100644 index 0000000..fbf4440 --- /dev/null +++ b/pages/detail/detail_affeection2.vue @@ -0,0 +1,495 @@ + + + + + \ No newline at end of file diff --git a/pages/detail/detail_enterprise.vue b/pages/detail/detail_enterprise.vue new file mode 100644 index 0000000..d1090aa --- /dev/null +++ b/pages/detail/detail_enterprise.vue @@ -0,0 +1,746 @@ + + + + + \ No newline at end of file diff --git a/pages/detail/detail_enterprise2.vue b/pages/detail/detail_enterprise2.vue new file mode 100644 index 0000000..baad94c --- /dev/null +++ b/pages/detail/detail_enterprise2.vue @@ -0,0 +1,489 @@ + + + + + \ No newline at end of file diff --git a/pages/detail/detail_family.vue b/pages/detail/detail_family.vue new file mode 100644 index 0000000..811ff6f --- /dev/null +++ b/pages/detail/detail_family.vue @@ -0,0 +1,734 @@ + + + + + \ No newline at end of file diff --git a/pages/detail/detail_family2.vue b/pages/detail/detail_family2.vue new file mode 100644 index 0000000..d70a25f --- /dev/null +++ b/pages/detail/detail_family2.vue @@ -0,0 +1,497 @@ + + + + + \ No newline at end of file diff --git a/pages/enterprise/corporateCard.vue b/pages/enterprise/corporateCard.vue deleted file mode 100644 index 2a45668..0000000 --- a/pages/enterprise/corporateCard.vue +++ /dev/null @@ -1,194 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/enterprise/corporate_card_detail.vue b/pages/enterprise/corporate_card_detail.vue index a533cab..4d00c42 100644 --- a/pages/enterprise/corporate_card_detail.vue +++ b/pages/enterprise/corporate_card_detail.vue @@ -25,8 +25,8 @@ - - + + 商品明细 @@ -52,59 +52,118 @@ + + + + + + + + 预约记录 + + + + + + + + + + + + 提货时间：{{item.reserveDate}} + + + + + 提货地点：{{item.store}} + + + + + 提 货 人：{{item.userName}} + + + + + 联系电话：{{item.userPhone}} + + + - {{item.goods}} + + + + + + - - + + 已生成福礼卡 + + - + - + + - - + - + 福礼卡编码：{{item.code}} + 提货密码：{{item.codeKey}} + 备注说明：{{item.remarks}} - 福礼卡编码：{{item.code}} - 提货密码：{{item.codeKey}} - 备注说明：{{item.remarks}} + + {{item.goods}} - - {{item.goods}} - 分享 - 已分享 + + + + + + + - - + 生成卡券 - 生成卡券 + 预约提货 @@ -113,59 +172,159 @@ + + + - + + 卡券数量 + + + + - - + + 备注说明 + +