diff --git a/App.vue b/App.vue index 737b05f..09794d1 100644 --- a/App.vue +++ b/App.vue @@ -14,6 +14,8 @@ }, onLaunch: function() { + wx.hideTabBar() + const updateManager = uni.getUpdateManager(); updateManager.onCheckForUpdate(function(res) { diff --git a/common/request.api.js b/common/request.api.js index ac25101..b6921cd 100644 --- a/common/request.api.js +++ b/common/request.api.js @@ -69,4 +69,16 @@ export default { // 結算商品 createOrder: (params = {}) => request.post("/empsreservoorder/createOrder", params), + + // 我的 + // 获取头像 昵称 + getUserInfo: (params = {}) => request.get("/lpkcustomer/customerInfo/"+params, params), + // 修改头像 + uploadHandImage: (params = {}) => request.post("/lpkcustomer/uploadAvatar", params), + // 获取默认提菜信息 + getStoreBySid: (params = {}) => request.get("/customerstore/getStoreBySid/"+params, params), + // 推荐有礼 + myRecommend: (params = {}) => request.get("/appletgiftbag/recommendRecord/"+params, params), + + } \ No newline at end of file diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js new file mode 100644 index 0000000..74ea968 --- /dev/null +++ b/custom-tab-bar/index.js @@ -0,0 +1,50 @@ +Component({ + data: { + selected: 0, + "color": "#FFEEE1", + "selectedColor": "#FFFFFF", + "backgroundColor": "#F69448", + list: [ + { + "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_notRecordNew.png", + "selectedIconPath": "/static/bomicon/bom_recordNew.png" + } + , + + // { + // "pagePath": "/pages/home/myHome", + // "text": "我的", + // "iconPath": "/static/bomicon/bom_NotMy.png", + // "selectedIconPath": "/static/bomicon/bom_my.png" + // } + + ] + }, + attached() { + }, + methods: { + switchTab(e) { + const data = e.currentTarget.dataset + const url = data.path + // console.log("ssss0",data); + wx.switchTab({url}) + // this.setData({ + // selected: data.index + // }) + } + } +}) \ No newline at end of file diff --git a/custom-tab-bar/index.json b/custom-tab-bar/index.json new file mode 100644 index 0000000..32640e0 --- /dev/null +++ b/custom-tab-bar/index.json @@ -0,0 +1,3 @@ +{ + "component": true +} \ No newline at end of file diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml new file mode 100644 index 0000000..87d7205 --- /dev/null +++ b/custom-tab-bar/index.wxml @@ -0,0 +1,7 @@ + + + + + {{item.text}} + + \ No newline at end of file diff --git a/custom-tab-bar/index.wxss b/custom-tab-bar/index.wxss new file mode 100644 index 0000000..7cb7fac --- /dev/null +++ b/custom-tab-bar/index.wxss @@ -0,0 +1,46 @@ +.tab-bar { + pointer-events: auto; + position: absolute; + bottom: 0; + left: 0; + right: 0; + height: 50px; + /* background: #F69448; */ + display: flex; + padding-top: 5px; + padding-bottom: 5px; + /* 加载背景图 */ + background-image: url(https://supervise.yxtsoft.com/lpk/image/bom_navigation.png); + /* 让背景图基于容器大小伸缩 */ + background-size: 100% 100%; + /* padding-bottom: env(safe-area-inset-bottom); */ +} + +.tab-bar-border { + background-color: rgba(246, 148, 72, 0.3); + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 1px; + transform: scaleY(0.5); +} + +.tab-bar-item { + flex: 1; + text-align: center; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; +} + +.tab-bar-item cover-image { + width: 27px; + height: 27px; +} + +.tab-bar-item cover-view { + margin-top: 3px; + font-size: 10px; +} \ No newline at end of file diff --git a/pages.json b/pages.json index e8a705a..e74656a 100644 --- a/pages.json +++ b/pages.json @@ -258,6 +258,14 @@ "backgroundColor": "#F8F8F8" } } + , + { + "path" : "pages/home/myHome", + "style": { + "navigationStyle": "custom", + "disableScroll":true + } + } ], "globalStyle": { @@ -267,42 +275,21 @@ "backgroundColor": "#FE9039" }, "tabBar": { - "color": "#7A7E83", + "custom": true, //自定义tabBar + "color": "#FFEEE1", "selectedColor": "#191919", - "borderStyle": "black", - "backgroundColor": "#ffffff", + "borderStyle": "white", + "backgroundColor": "#F69448", "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": "选菜窖", + "text": "补充菜窖", "iconPath": "static/bomicon/bom_notCloudCard.png", "selectedIconPath": "static/bomicon/bom_cloudCard.png" }, { "pagePath": "pages/home/pickUpCard", - "text": "提菜卡", + "text": "选菜窖", "iconPath": "static/bomicon/bom_notPickUp.png", "selectedIconPath": "static/bomicon/bom_pickUp.png" }, @@ -312,6 +299,13 @@ "iconPath": "static/bomicon/bom_notRecordNew.png", "selectedIconPath": "static/bomicon/bom_recordNew.png" } + // { + // "pagePath": "pages/home/myHome", + // "text": "我的", + // "iconPath": "static/bomicon/bom_NotMy.png", + // "selectedIconPath": "static/bomicon/bom_my.png" + // } + ] }, "uniIdRouter": {} diff --git a/pages/cloud/detail_cloudCard.vue b/pages/cloud/detail_cloudCard.vue index e8ceed4..0b179d8 100644 --- a/pages/cloud/detail_cloudCard.vue +++ b/pages/cloud/detail_cloudCard.vue @@ -95,7 +95,7 @@ 结算入窖 + @click="settlement()">结算 diff --git a/pages/cloud/optionalCard.vue b/pages/cloud/optionalCard.vue index ed30c63..c7e7e9f 100644 --- a/pages/cloud/optionalCard.vue +++ b/pages/cloud/optionalCard.vue @@ -114,7 +114,7 @@ 结算入窖 + @click="settlement()">结算 diff --git a/pages/detail/detail_affeection.vue b/pages/detail/detail_affeection.vue index 346b6a4..7e023d3 100644 --- a/pages/detail/detail_affeection.vue +++ b/pages/detail/detail_affeection.vue @@ -36,7 +36,7 @@ 转赠亲友 - + 转赠亲友 @@ -90,7 +90,7 @@ - + @@ -122,11 +122,11 @@ - {{item.goods}} - + - + - + @@ -153,6 +153,10 @@ + 亲情窖序号：{{item.serialNumber}} + 分享时间：{{item.createTime}} 亲情窖编码：{{item.code}} 提货密码：{{item.codeKey}} 备注说明：{{item.remarks}} @@ -394,7 +398,7 @@ this.page.sid = options.sid this.request() this.getSun() - this.$bus.$on('order', msg => { + this.$bus.$on('order', msg => { this.$nextTick(() => { this.$refs.pageView.setLoadState(0) }) @@ -446,7 +450,7 @@ }, onKeyInput3: function(event) { this.info.count = event.target.value - + }, onKeyInput4: function(event) { this.info.remarks = event.target.value @@ -500,7 +504,7 @@ save2() { this.pageScroll() this.colseDialog2() - + let num = 0; for (var i = 0; i < this.data.goodsVos.length; i++) { num += Number(this.data.goodsVos[i].select); @@ -520,14 +524,14 @@ _this.$api.generateEmpCardGift(this.info).then((resp) => { bus.$emit('order', "监听回调"); // uni.navigateBack() - + }).catch(e => { _this.shortToast(e.msg) }) }, pageScroll() { - + //获取容器高度，使页面滚动到容器底部 #xxx就是view的id名 wx.createSelectorQuery().select('#page').boundingClientRect(function(rect) { console.log('rect', rect); @@ -537,9 +541,9 @@ scrollTop: rect.height }) }).exec() - + }, - + request() { let _this = this @@ -597,13 +601,13 @@ }, functionName: 'bindCard', url: '/pages/detail/detail_affeection?sid=' + data.sid - + // url:'/pages/bind/bind_pickUpCard?code=' + + &codeKey=' + data.codeKey, // FunctionName:'share! }) // 转码传输 let value = encodeURIComponent(shareData) - + return { title: '汇融惠享-云菜窖', // ② diff --git a/pages/detail/detail_affeection2.vue b/pages/detail/detail_affeection2.vue index f8e32a7..bfb228b 100644 --- a/pages/detail/detail_affeection2.vue +++ b/pages/detail/detail_affeection2.vue @@ -23,20 +23,19 @@ - - + + - + {{data.pname}} - - 转赠亲友 + + 转赠亲友 - + @@ -44,8 +43,8 @@ - - + + 商品明细 @@ -76,8 +75,8 @@ - - + + 预约记录 @@ -86,7 +85,7 @@ - + @@ -118,62 +117,65 @@ - {{item.goods}} - + - + - + - + - + - - + + 转赠信息 - + - + - + - + - + - + - + + 亲情窖序号：{{item.serialNumber}} + 分享时间：{{item.createTime}} 亲情窖编码：{{item.code}} 提货密码：{{item.codeKey}} 备注说明：{{item.remarks}} - + - - {{item.goods}} - + - {{item.goods}} + - - + + - + - + - + - + @@ -212,7 +214,7 @@ onLoad(options) { this.page.sid = options.sid this.request() - this.$bus.$on('order', msg => { + this.$bus.$on('order', msg => { this.$nextTick(() => { this.$refs.pageView.setLoadState(0) }) @@ -265,13 +267,13 @@ }, functionName: 'bindCard', url: '/pages/detail/detail_affeection?sid=' + data.sid - + // url:'/pages/bind/bind_pickUpCard?code=' + + &codeKey=' + data.codeKey, // FunctionName:'share! }) // 转码传输 let value = encodeURIComponent(shareData) - + return { title: '汇融惠享-云菜窖', // ② @@ -286,18 +288,18 @@ } } }, - + shareCard(sid) { let _this = this - + _this.$api.shareEmpCard(sid).then((resp) => { - + var item = _this.data.empCardGiftVos.find(item => item.sid === sid) - + console.log("item", item); - + item.share = '2' - + }).catch(e => {}) } @@ -306,12 +308,11 @@ \ No newline at end of file diff --git a/pages/home/pickUpCard.vue b/pages/home/pickUpCard.vue index 7c34242..97ddb2c 100644 --- a/pages/home/pickUpCard.vue +++ b/pages/home/pickUpCard.vue @@ -1,6 +1,6 @@