diff --git a/pages.json b/pages.json index 89da860..10d7c4a 100644 --- a/pages.json +++ b/pages.json @@ -366,6 +366,19 @@ "navigationBarTitleText": "转赠亲友", "disableScroll": true } + }, + { + "path" : "pages/home/newUserPlay", + "style": { + "navigationStyle": "custom" + } + }, + { + "path" : "pages/records/recommendRecords", + "style": { + "navigationStyle": "custom", + "disableScroll": true + } } diff --git a/pages/bind/bind_pickUpCard2.vue b/pages/bind/bind_pickUpCard2.vue index 270474e..623d9a1 100644 --- a/pages/bind/bind_pickUpCard2.vue +++ b/pages/bind/bind_pickUpCard2.vue @@ -95,50 +95,50 @@ }) }, onLoad(options) { - // let _this = this; - // wx.login({ - // success: function(res) { - // uni.request({ - // // 组装请求地址 - // url: getApp().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 { - // // 成功后跳转主页 - // getApp().globalData.sid = res.data.data.sid - // _this.page.customerSid = getApp().globalData.sid - // console.log("用户sid", getApp().globalData.sid) - // } - // } else { - // // _this.status = 'more' - // } - // }, - // fail: (err) => { - // // _this.status = 'more' - // } - // }); - // }, - // fail: function(res) { - // // _this.status = 'more' - // } - // }); + let _this = this; + wx.login({ + success: function(res) { + uni.request({ + // 组装请求地址 + url: getApp().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 { + // 成功后跳转主页 + getApp().globalData.sid = res.data.data.sid + _this.page.customerSid = getApp().globalData.sid + console.log("用户sid", getApp().globalData.sid) + } + } else { + // _this.status = 'more' + } + }, + fail: (err) => { + // _this.status = 'more' + } + }); + }, + fail: function(res) { + // _this.status = 'more' + } + }); if (options) { console.log("options", options) diff --git a/pages/good/shoppCart.vue b/pages/good/shoppCart.vue index c63155d..ad7f7df 100644 --- a/pages/good/shoppCart.vue +++ b/pages/good/shoppCart.vue @@ -218,6 +218,9 @@ that.data.splice(index, 1) // that.getallPrice() // that.getweight() + + that.notData = that.data.length == 0 + that.upDateShoppCart(item) } else if (res.cancel) { diff --git a/pages/home/cloudCard2.vue b/pages/home/cloudCard2.vue index 74fda75..3f18392 100644 --- a/pages/home/cloudCard2.vue +++ b/pages/home/cloudCard2.vue @@ -223,15 +223,90 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{item.name}} + ￥{{item.prefPrice}} + + + + + {{item.weight}}斤 + ￥{{item.price}} + + + + + + + + + + + + + + 确认结算 + + + + + + @@ -240,10 +315,13 @@ export default { data() { return { - showModal: false, - modalUrl: "https://supervise.yxtsoft.com/lpk/image/banner.png", imgList: [], notData: false, + showModal: false, + showModal2: false, + newPerGiftList: [ + + ], dialogContent: "这里是协议内容，这里是协议内容,这里是协议内容，这里是协议内容,这里是协议内容，这里是协议内容,这里是协议内容，这里是协议内容这里是协议内容，这里是协议内容", confirmText: "我知道了（5s）", dialogBeforeClose: false, @@ -300,6 +378,12 @@ if (this.baseDataSuccess) { this.getgoods() } + + console.log("isPurchase", getApp().globalData.isPurchase); + + if (getApp().globalData.isPurchase == '1') + this.showModal = true + }, onLoad(options) { @@ -319,6 +403,58 @@ }, methods: { + showGift() { + let _this = this + + _this.$api.newUserQuota().then((resp) => { + // console.log("--------", resp); + _this.newPerGiftList = resp + + _this.showModal = false + _this.showModal2 = true + + }).catch(e => { + + }) + + }, + radioChange(event) { + // console.log("radioChange", event.detail.value); + this.newporGiftSid = event.detail.value + }, + newporGift() { + // console.log("radioChange", this.newporGiftSid); + if (!this.newporGiftSid) { + this.shortToast('请先选择优惠礼包') + return + } + + var params = { + customerSid: getApp().globalData.sid, + bagSid: this.newporGiftSid, + + } + // console.log("params", params); + + let _this = this + _this.$api.createNewUserBagOrder(params).then((resp) => { + + // console.log("resp", resp); + _this.$pay(resp) + _this.showModal2 = false + getApp().globalData.isPurchase = '0' + + console.log("isPurchase", getApp().globalData.isPurchase); + }).catch(e => {}) + + + }, + colseDialog() { + this.showModal = false + }, + colseDialog2() { + this.showModal2 = false + }, getBannerList() { let _this = this _this.$api.bannerList().then((resp) => { @@ -328,9 +464,10 @@ }, swiperClick(item) { console.log("swiperClick======", item); - this.modalUrl = item.contentUrl if (item.contentUrl != '') { - this.showModal = true + uni.navigateTo({ + url: "/pages/home/newUserPlay?url=" + encodeURIComponent(JSON.stringify(item.contentUrl)) + }) } }, @@ -756,6 +893,39 @@ align-items: center; } + .modalDlg2 { + /* 设置超出滚动 */ + overflow: auto; + position: fixed; + z-index: 100000; + display: flex; + width: 100%; + height: 100%; + top: 0; + left: 0; + flex-direction: column; + justify-content: center; + align-items: center; + } + + .device-list { + box-sizing: border-box; + padding: 26rpx 6%; + display: flex; + flex-direction: row; + align-items: center; + border-bottom: 1px solid #eee; + width: 100%; + } + + .newpor_bom { + /* 加载背景图 */ + background-image: url(https://supervise.yxtsoft.com/lpk/image/newpor_bom.png); + /* background-image: url(../../static/clound_bj1.png); */ + /* 让背景图基于容器大小伸缩 */ + background-size: 100% 100%; + } + .top { diff --git a/pages/home/myCellar.vue b/pages/home/myCellar.vue index 4e29c77..4fd70fa 100644 --- a/pages/home/myCellar.vue +++ b/pages/home/myCellar.vue @@ -165,92 +165,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{item.name}} - ￥{{item.prefPrice}} - - - - - {{item.weight}}斤 - ￥{{item.price}} - - - - - - - - - - - - - - 确认结算 - - - - - - - - - + @@ -404,8 +319,6 @@ butdisabled: true, transferNotData: true, notData: false, - showModal: false, - showModal2: false, showModal3: false, showModal4: false, scrollHeight: "", @@ -461,8 +374,7 @@ created() { // console.log("==========", getApp().globalData.isNewUser); - if (getApp().globalData.isPurchase == '1') - this.showModal = true + }, onShow() { if (typeof this.$mp.page.getTabBar === 'function' && this.$mp.page.getTabBar()) { @@ -708,54 +620,7 @@ } }, - showGift() { - let _this = this - - _this.$api.newUserQuota().then((resp) => { - // console.log("--------", resp); - _this.newPerGiftList = resp - - _this.showModal = false - _this.showModal2 = true - }).catch(e => { - - }) - - }, - radioChange(event) { - // console.log("radioChange", event.detail.value); - this.newporGiftSid = event.detail.value - }, - newporGift() { - // console.log("radioChange", this.newporGiftSid); - if (!this.newporGiftSid) { - this.shortToast('请先选择优惠礼包') - return - } - - var params = { - customerSid: getApp().globalData.sid, - bagSid: this.newporGiftSid, - - } - // console.log("params", params); - - let _this = this - _this.$api.createNewUserBagOrder(params).then((resp) => { - - // console.log("resp", resp); - _this.$pay(resp) - _this.showModal2 = false - }).catch(e => {}) - - - }, - colseDialog() { - this.showModal = false - }, - colseDialog2() { - this.showModal2 = false - }, + colseDialog3() { this.showModal3 = false }, @@ -876,14 +741,6 @@ border: 0; } - .newpor_bom { - /* 加载背景图 */ - background-image: url(https://supervise.yxtsoft.com/lpk/image/newpor_bom.png); - /* background-image: url(../../static/clound_bj1.png); */ - /* 让背景图基于容器大小伸缩 */ - background-size: 100% 100%; - } - .top { width: 100vw; diff --git a/pages/home/myHome.vue b/pages/home/myHome.vue index 6665902..f863b9e 100644 --- a/pages/home/myHome.vue +++ b/pages/home/myHome.vue @@ -18,13 +18,15 @@ style="width: 30px;height: 30px;margin-right: 10px;flex-shrink: 0;" :rotate="0"> + position: absolute;bottom: 8vw; "> - - + + + 客服电话 - + @@ -137,7 +139,7 @@ - @@ -147,7 +149,8 @@ - * {{child.remarks}} + * + {{child.remarks}} @@ -189,7 +192,7 @@ }, headImage: "", recommend: { - vos:[] + vos: [] }, banKInfo: null } @@ -217,10 +220,10 @@ }, methods: { makePhoneCall() { - wx.makePhoneCall({ - phoneNumber: '15503115233', - - }) + wx.makePhoneCall({ + phoneNumber: '15503115233', + + }) }, getUserInfo() { let _this = this @@ -254,6 +257,10 @@ }, recommendClick(item) { console.log("recommendClick>>>", item) + + // uni.navigateTo({ + // url: '/pages/records/recommendRecords' + // }) }, showDiaLog() { uni.navigateTo({ @@ -363,21 +370,21 @@ switch (type) { case "待提菜": - uni.navigateTo({ - url: '/pages/records/reservationRecords', - }) - // uni.navigateTo({ - // url: '/pages/records/reservationRecords3', + // url: '/pages/records/reservationRecords', // }) + + uni.navigateTo({ + url: '/pages/records/reservationRecords3', + }) break; case "已提菜": - uni.navigateTo({ - url: '/pages/records/reservationRecords2', - }) // uni.navigateTo({ - // url: '/pages/records/reservationRecords4', + // url: '/pages/records/reservationRecords2', // }) + uni.navigateTo({ + url: '/pages/records/reservationRecords4', + }) break; case "我的订单": uni.navigateTo({ @@ -430,8 +437,9 @@ background-image: url(https://supervise.yxtsoft.com/lpk/image/my_bj.png); /* 让背景图基于容器大小伸缩 */ background-size: 100% 100%; - -position: relative;/*父元素位置要设置为相对*/ + + position: relative; + /*父元素位置要设置为相对*/ } /* 顶部-用户信息 */ @@ -465,9 +473,11 @@ position: relative;/*父元素位置要设置为相对*/ /* 视图 */ .view { - box-sizing: border-box;margin-top: -15px; + box-sizing: border-box; + margin-top: -15px; background: #F7F7F7; - height: calc(100vh - 45px - 65vw);; + height: calc(100vh - 45px - 65vw); + ; width: 100%; border-radius: 15px; } diff --git a/pages/home/newUserPlay.vue b/pages/home/newUserPlay.vue new file mode 100644 index 0000000..1729d88 --- /dev/null +++ b/pages/home/newUserPlay.vue @@ -0,0 +1,32 @@ + + + + + diff --git a/pages/login/login.vue b/pages/login/login.vue index 58014c1..1c26405 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -48,6 +48,7 @@ this.status = "loading" let _this = this; + wx.login({ success: function(res) { diff --git a/pages/records/recommendRecords.vue b/pages/records/recommendRecords.vue new file mode 100644 index 0000000..e6c36ef --- /dev/null +++ b/pages/records/recommendRecords.vue @@ -0,0 +1,60 @@ + + + + + \ No newline at end of file diff --git a/pages/records/reservationRecords3.vue b/pages/records/reservationRecords3.vue index 3a9e80f..973adc8 100644 --- a/pages/records/reservationRecords3.vue +++ b/pages/records/reservationRecords3.vue @@ -44,8 +44,8 @@ - 预约时间： - {{item.createTime}} + 预约日期： + {{item.reserveDate}} @@ -76,12 +76,12 @@ - + 展开 - + 收起 diff --git a/pages/records/reservationRecords4.vue b/pages/records/reservationRecords4.vue index 036f014..693a227 100644 --- a/pages/records/reservationRecords4.vue +++ b/pages/records/reservationRecords4.vue @@ -35,7 +35,7 @@ 提菜日期： - {{item.endTime}} + {{item.reserveDate}} @@ -46,8 +46,8 @@ - 预约时间： - {{item.createTime}} + 预约日期： + {{item.reserveDate}} @@ -82,12 +82,12 @@ - + 展开 - + 收起