From 77dec51503e3dfbe316d73a86dc081fcc61387be Mon Sep 17 00:00:00 2001 From: GL <954534408@qq.com> Date: Tue, 2 Feb 2021 15:13:47 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=AF=8F=E6=97=A5=E7=AD=BE=E5=88=B0?= =?UTF-8?q?=E3=80=81=E6=B4=BB=E5=8A=A8=E6=97=A5=E5=8E=86=E3=80=91=E3=80=90?= =?UTF-8?q?=E6=AF=8F=E6=97=A5=E7=AD=BE=E5=88=B0=20=E3=80=81=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E6=97=A5=E5=8E=86=E6=9C=AA=E6=8E=88=E6=9D=83=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E5=88=B0=E6=8E=88=E6=9D=83=E9=A1=B5=E9=9D=A2=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 22 +-- components/dateLsit/dateLsit.js | 79 ++++++++++- components/dateLsit/dateLsit.wxml | 7 +- components/dateLsit/dateLsit.wxss | 102 +++++++++++--- ext.json | 39 ++++-- index/index.js | 1 + index/user.js | 2 +- index/user.wxml | 16 ++- index/user.wxss | 35 +++-- pages/ConsumeDetail/ConsumeDetail.js | 1 + pages/activityCalendar/activityCalendar.js | 140 +++++++++++++------ pages/activityCalendar/activityCalendar.wxml | 2 +- pages/activityCalendar/activityCalendar.wxss | 3 +- pages/bargain/bargainDatail/bargainDatail.js | 1 + pages/cardListDetail/cardListDetail.js | 1 + pages/cardorder/index/index.js | 1 + pages/coupon/detail/index.js | 3 + pages/dateLsit/dateLsit.js | 12 +- pages/dateLsit/dateLsit.wxml | 2 +- pages/dateLsit/dateLsit.wxss | 27 ++-- pages/game/index.js | 1 + pages/getphoneInfo/index.js | 3 +- pages/getuserinfo/index.js | 16 ++- pages/index/index.js | 13 +- pages/index/searchbar/detail/index.js | 1 + pages/order/detail/index.js | 1 + pages/radetail/index.js | 23 ++- pages/radetail/index.wxml | 26 ++-- pages/radetail/index.wxss | 12 +- pages/radetail/joinActivity/edit.js | 1 + pages/shareFriend/shareFriend.js | 6 +- pages/spellDetail/index.js | 2 + pages/spellGroup/mySpellGroup/index.js | 2 + pages/user/myactivity/index.js | 34 ++++- pages/user/myactivity/index.wxml | 13 +- pages/user/myactivity/index.wxss | 21 ++- project.config.json | 2 +- 37 files changed, 504 insertions(+), 169 deletions(-) diff --git a/app.js b/app.js index 51413e3..69bbeda 100644 --- a/app.js +++ b/app.js @@ -6,27 +6,14 @@ App({ newArr:[],//存放分享二维进入消息信息 }, onLaunch: function(options) { - wx.hideTabBar({ - fail: function () { - setTimeout(function () { // 做了个延时重试一次,作为保底。 - wx.hideTabBar() - }, 500) - } - }); - }, - - onShow:function(options){ - var that = this; - if (that.globalData.previewFlag){//解决微信图片预览重复进入app.js onshow + if (that.globalData.previewFlag) {//解决微信图片预览重复进入app.js onshow that.globalData.previewFlag = false return } if (options.query.scene) { that.globalData.newArr = decodeURIComponent(options.query.scene).split(":"); } - console.log(that.globalData.newArr, "我是app.js") - that.globalData.sceneAddress = options.scene; /** * 小程序版本更新 @@ -42,6 +29,11 @@ App({ } }) }, + + onShow:function(options){ + console.log("onshow被调用了!") + + }, statusBarHeight: 0, /** * 用户登录 @@ -173,7 +165,7 @@ App({ }, globalData: { previewFlag:false,//解决图片预览调用noshow - + activityId:'',//活动id方便授权数据回传 typeLsit: [],//初始哈样式 scene: "", // token diff --git a/components/dateLsit/dateLsit.js b/components/dateLsit/dateLsit.js index 59e5e32..72c57e0 100644 --- a/components/dateLsit/dateLsit.js +++ b/components/dateLsit/dateLsit.js @@ -26,7 +26,9 @@ Component({ xiala: imgurl.concealBnt.url, xiangshang: imgurl.xiangshang.url, switchFlag: true, - activityDateList: [] + activityDateList: [], + activiyFalg:"", + context: -1 ,//-1表示取一周下标 1表示取一个月的下标 }, /** @@ -54,7 +56,9 @@ Component({ dateLsit: tempDateLsit, thendata: tempThenData }) + this.setThenDye(0) }, + getDey() { //查询当月标记日期 let tempMonth = this.data.month let tempDey = this.getDays(this.data.year, this.data.month) //获取每月有多少天 @@ -86,6 +90,18 @@ Component({ this.setData({ switchFlag: !temp }) + if(this.data.switchFlag){ + this.setData({ + context:-1 + }) + this.setThenDye() + }else{ + this.setData({ + context: 1 + }) + this.setThenDye() + } + // console.log(this.data.switchFlag) }, showDate(year, month) { //刷新日历 let thenDey = this.getThenWeek(year, month) //每个月第一天星期几 @@ -110,7 +126,7 @@ Component({ style: "1", value: lastMonth - (thenDey - 1), y: year, - m: month - 1 + m: month==1?12:month-1 }) lastMonth++ } @@ -119,17 +135,59 @@ Component({ style: "2", value: i + 1, y: year, - m: month + 1 + m: month == 12 ? 1 : month + 1 }) } this.setData({ dateLsit: tempDey }) this.itiActivityLst() + this.setThenDye() + }, + setThenDye(){//设置当天index + if (this.data.context==-1){//-1表示一周 + console.log(this.data.thendata,this.data.dey,this.data.monthFlgh,this.data.yearFlgh,"this.data.thendata") + let index_ = "" + this.data.thendata.map((item,index)=>{ + if(item.value == this.data.dey && this.data.monthFlgh == item.m && item.y == this.data.yearFlgh){ + index_ = index + this.setData({ + activiyFalg: index_ + }) + return + } + }) + }else{ + let index_ = "" + if(this.data.year==this.data.yearFlgh&&this.data.month==this.data.monthFlgh){ + this.data.dateLsit.map((item, index) => { + if (item.value == this.data.dey && this.data.monthFlgh == item.m && item.y == this.data.yearFlgh) { + console.log(index, "index") + index_ = index + this.setData({ + activiyFalg: index_ + }) + return + } + }) + }else{ + this.setData({ + activiyFalg: -1 + }) + } + + } + }, handle(e) { //点击号数 let item = e.currentTarget.dataset.item + let index = e.currentTarget.dataset.index + if (this.data.allFlag){ + this.setData({ + activiyFalg:index + }) + } if (item.style==0){ this.triggerEvent("setDate", { y: this.data.year, @@ -195,6 +253,9 @@ Component({ }) }, front() { //前面 + this.setData({ + context:1 + }) if (this.data.month == 1) { let temp = this.data.switchFlag this.setData({ @@ -214,9 +275,14 @@ Component({ m: this.data.month }) //第一个是自定义事件名,第二个是要传递的值(可以为空) this.getDey() + + }, behind() { //后面 + this.setData({ + context: 1 + }) let temp = this.data.switchFlag this.setData({ switchFlag: false @@ -237,7 +303,8 @@ Component({ this.triggerEvent("setDate", { y: this.data.year, m: this.data.month - }) //第一个是自定义事件名,第二个是要传递的值(可以为空) + }) + }, }, @@ -282,8 +349,10 @@ Component({ } } this.setData({ - thendata: tempArr + thendata: tempArr, + context:this.data.allFlag ? -1 : 1 }) + // 设置单周数组 // setTimeout(() => { // this.showDate(this.data.year, this.data.month) diff --git a/components/dateLsit/dateLsit.wxml b/components/dateLsit/dateLsit.wxml index 57bc0e1..aee458c 100644 --- a/components/dateLsit/dateLsit.wxml +++ b/components/dateLsit/dateLsit.wxml @@ -1,12 +1,13 @@ - {{'<'}} + + {{year+'年 '+month+'月 '}} - {{'>'}} + {{item}} - {{ (item.value==dey&&monthFlgh==item.m&&item.y==yearFlgh)?'':item.value }} + {{ (item.value==dey&&monthFlgh==item.m&&item.y==yearFlgh)?'':item.value }} diff --git a/components/dateLsit/dateLsit.wxss b/components/dateLsit/dateLsit.wxss index f714a55..b409cd9 100644 --- a/components/dateLsit/dateLsit.wxss +++ b/components/dateLsit/dateLsit.wxss @@ -1,37 +1,51 @@ -.dateText_box{ +.dateText_box { width: 60%; margin: 0 auto; overflow: hidden; text-align: center; } -.dateMinus{ - font-size: 36rpx; +.Box { + width: 94%; + margin: 30rpx auto; + border-radius: 16rpx; + background-color: #fff; +} + +.dateMinus { float: left; line-height: 60rpx; padding: 10rpx; - height: 60rpx; - margin-left: 100rpx; + height: 50rpx; + margin-left: 40rpx; + width: 50rpx; + margin-top: 6rpx; } -.dateText{ + +.dateText { float: left; - padding: 10rpx; + padding: 10rpx 20rpx; line-height: 60rpx; height: 60rpx; } -.dateAdd{ + +.dateAdd { padding: 10rpx; line-height: 60rpx; - height: 60rpx; + height: 50rpx; float: left; - font-size: 36rpx; + /* font-size: 36rpx; + */ + margin-top: 6rpx; + width: 50rpx; } -.weekBox{ - width: 96%; - margin: 0 auto; - overflow: hidden + +.weekBox { + overflow: hidden; + font-family: SimHei; } -.weekItme{ + +.weekItme { height: 80rpx; line-height: 80rpx; width: 80rpx; @@ -41,16 +55,50 @@ /* background-color: red; border-radius: 50%; */ } -.noThen{ + +.weekItme_a { + height: 80rpx; + line-height: 80rpx; + width: 80rpx; + margin: 0 10rpx; + text-align: center; + float: left; + /* background-color: red;*/ + border-radius: 50%; + background-color: #ff990050; +} + +.deyBox { + height: 80rpx; + line-height: 80rpx; + width: 80rpx; + margin: 0 10rpx; + text-align: center; +} + +.noThen { height: 80rpx; line-height: 80rpx; width: 80rpx; margin: 0 10rpx; text-align: center; float: left; - color: rgba(0, 0, 0, 0.1) + color: rgba(0, 0, 0, 0.1); } -.today{ + +.noThen_a { + height: 80rpx; + line-height: 80rpx; + width: 80rpx; + margin: 0 10rpx; + text-align: center; + float: left; + color: rgba(0, 0, 0, 0.1); + border-radius: 50%; + background-color: #f90; +} + +.today_a { height: 80rpx; line-height: 80rpx; width: 80rpx; @@ -64,7 +112,23 @@ background-repeat: no-repeat; background-position: 50% 50%; } -.concealBnt{ + +.today { + height: 80rpx; + line-height: 80rpx; + width: 80rpx; + margin: 0 10rpx; + text-align: center; + float: left; + color: #fff; + /* background-color: rgba(50,177,252,1); */ + background-image: url('https://formall.oss-accelerate.aliyuncs.com/cimg/jintian_huise.png'); + background-size: 50rpx 50rpx; + background-repeat: no-repeat; + background-position: 50% 50%; +} + +.concealBnt { width: 60rpx; height: 60rpx; /* background-color: rebeccapurple; */ diff --git a/ext.json b/ext.json index 5a139c3..fa5db67 100644 --- a/ext.json +++ b/ext.json @@ -2,33 +2,43 @@ "ext": { "attr": { "car": { + "tjd": { + "payPath": "", + "tjdAppId": "wx6945d1bda68d7993" + }, "etcp": { - "etcpAppId": "wx192b7d2e8dcbefd0", - "etcpVersion": "release", - "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" - } + "payPath": "pages/pay/order-pay-open/main", + "etcpAppId": "wxc07f9d67923d676d", + "etcpCallbackUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback" + }, + "bolink": { + "payPath": "pages/park/park", + "bolinkAppId": "wxbd08b4baa10fcc1d" + }, + "version": "release" }, "imgProxy": [ { - "newUrl": "https://ctest.malls.iformall.com/img", + "newUrl": "https://c.malls.iformall.com/img", "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com" }, { - "newUrl": "https://ctest.malls.iformall.com/img1", + "newUrl": "https://c.malls.iformall.com/img1", "orgUrl": "https://formall.oss-accelerate.aliyuncs.com" }, { - "newUrl": "https://ctest.malls.iformall.com/img2", + "newUrl": "https://c.malls.iformall.com/img2", "orgUrl": "https://wx.qlogo.cn" } ], - "configUrl": "https://ctest.malls.iformall.com/C/api", + "configUrl": "https://c.malls.iformall.com/C/api", + "ifStoreApp": "0", "ifHaveWebSocket": "0", - "ifHaveCarModular": "1" + "ifHaveCarModular": "0" }, - "name": "金泸商务", - "weappId": "wx649b3be73c1afe47", - "appVersion": "C.test.5.2.0" + "name": "富茂链客生产版", + "weappId": "wx6a2524a8286d687f", + "appVersion": "C.5.1.1" }, "debug": false, "tabBar": { @@ -58,8 +68,7 @@ "selectedIconPath": "assets/images/user-a.png" } ], - "color": "#abb1be", - "selectedColor": "#b2743d" + "custom": true }, "window": { "backgroundTextStyle": "dark", @@ -73,7 +82,7 @@ "provider": "wx2b03c6e691cd7370" } }, - "extAppid": "wx649b3be73c1afe47", + "extAppid": "wx6a2524a8286d687f", "extEnable": true, "permission": { "scope.userLocation": { diff --git a/index/index.js b/index/index.js index 033fd43..e89fd7e 100644 --- a/index/index.js +++ b/index/index.js @@ -867,6 +867,7 @@ Page({ }, // 用户点击右上角分享 onShareAppMessage: function() { + app.globalData.previewFlag = true return { title: this.data.weappShareTitle, imageUrl: this.data.weappShareCoverImg, diff --git a/index/user.js b/index/user.js index c595d8a..bcb9269 100644 --- a/index/user.js +++ b/index/user.js @@ -318,7 +318,7 @@ Page({ if(res.code==200){ this.setData({ memberName:res.data.name, - memberLogo:res.data.imgUrl + memberLogo:res.data.imgUrlH }) } if (res.data.businessHours !== '[]') { diff --git a/index/user.wxml b/index/user.wxml index 473eba3..dc49b40 100644 --- a/index/user.wxml +++ b/index/user.wxml @@ -36,20 +36,25 @@ {{memberName}} {{levelName}} + + + - + + + 会员码:{{userId}} - 我的 - 成长值{{score}} + 我的成长值:{{score}} + | 更多成长值 - + @@ -66,7 +71,7 @@ 我的券包 - + @@ -75,7 +80,6 @@ 我的卡包 - diff --git a/index/user.wxss b/index/user.wxss index 102f32e..494b1ec 100644 --- a/index/user.wxss +++ b/index/user.wxss @@ -11,12 +11,12 @@ page{ } .particulars_list{ overflow: hidden; - border-bottom: 1rpx #ccc solid; + border-bottom: 1rpx #f6f6f6 solid; width: 90%; margin: auto; height: 80rpx; line-height: 80rpx; - color: #666666; + color: #888; font-family: PingFangSC-Regular; } .particulars_name{ @@ -91,13 +91,13 @@ page{ .RQcode{ width: 80rpx; height: 80rpx; - margin: 10rpx 10rpx 0 40rpx; + margin: 20rpx 10rpx 0 40rpx; float: left; } .memberLogo{ - width: 80rpx; + max-width: 150rpx; height: 80rpx; - margin: 10rpx 10rpx 0 60rpx; + margin: 20rpx 10rpx 0 30rpx; float: left; } .memberBox{ @@ -107,9 +107,9 @@ page{ font-size: 24rpx; font-family: PingFangSC-Regular; font-weight: 400; - color: rgba(166,166,166,1); + color: #888; line-height: 34rpx; - margin: 10rpx 0 0 20rpx; + margin: 20rpx 0 0 20rpx; } .user-phone { font-family: PingFangSC-Regular; @@ -137,6 +137,18 @@ page{ border-radius: 16rpx 16rpx 0 0; background-color: #ff9933; overflow: hidden; + height: 172rpx; + position: relative ; +} +.share{ + position: absolute; + bottom: 20rpx; + right: 0; + font-size: 26rpx; + border-radius:10rpx 0 0 10rpx; + background-color: #f6f6f6; + color:#993300; + padding: 5rpx 10rpx; } .marketName{ margin: 30rpx 40rpx; @@ -192,7 +204,7 @@ page{ background: #fff; border-radius: 16rpx; margin: 30rpx auto ; - box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); + /* box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); */ } .user-btns navigator{ width: 25%; @@ -216,7 +228,7 @@ page{ background: #fff; border-radius: 16rpx; margin: -100rpx auto 0; - box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); + /* box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); */ } .btns_bg{ width: 94%; @@ -224,10 +236,10 @@ page{ border-radius: 16rpx; margin: 30rpx auto; padding: 20rpx 0; - box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); + /* box-shadow: 0 6px 20px 0 rgba(0, 0, 0, 0.10); */ } .user-btns .user-btn > view { - padding: 20rpx 10px ; + padding: 30rpx 10px ; font-size: 28rpx; color: #888; letter-spacing: 1.16rpx; @@ -427,6 +439,7 @@ page{ .mybtn { width: 686rpx; margin: 60rpx auto; + color: #888; } .mask { diff --git a/pages/ConsumeDetail/ConsumeDetail.js b/pages/ConsumeDetail/ConsumeDetail.js index 85bd614..6ea1004 100644 --- a/pages/ConsumeDetail/ConsumeDetail.js +++ b/pages/ConsumeDetail/ConsumeDetail.js @@ -89,6 +89,7 @@ Page({ // }) }, onShareAppMessage: function (res) { + app.globalData.previewFlag = true if (res.from === 'button') { console.log(this.data.cardDetail) console.log(111) diff --git a/pages/activityCalendar/activityCalendar.js b/pages/activityCalendar/activityCalendar.js index f0fab12..0a3863a 100644 --- a/pages/activityCalendar/activityCalendar.js +++ b/pages/activityCalendar/activityCalendar.js @@ -9,80 +9,134 @@ Page({ */ data: { navigationBarHeight, - activityStyle: '',//选中当前日历样式 - hideFlag:false,//遮罩成 + activityStyle: '', //选中当前日历样式 + hideFlag: false, //遮罩成 childUrl: config.api.signDey, - continueSign:'',//连续签到天数 - signInDay:'',//0能签到 1是不能签到 - rules:[],//积分规则 - rewardPoints:"",//记录签到后的奖励积分 + continueSign: '', //连续签到天数 + signInDay: '', //0能签到 1是不能签到 + rules: [], //积分规则 + rewardPoints: "", //记录签到后的奖励积分 }, - getSignRule(){//查询签到规则 + getSignRule() { //查询签到规则 Http.get({ url: config.api.signRule - }).then(res=>{ - let {code ,data}=res - if(code==200){ + }).then(res => { + let { + code, + data + } = res + if (code == 200) { let tempArr = [] - JSON.parse(data.rules).map(item=>{ - if (item.id == 17 || item.id == 18 || item.id == 19 || item.id == 20){ + JSON.parse(data.rules).map(item => { + if (item.id == 17 || item.id == 18 || item.id == 19 || item.id == 20) { tempArr.push(item) } }) - if (this.data.continueSign>=7){ - tempArr[1].activity=1 - if (this.data.continueSign >= 14){ - tempArr[2].activity = 1 - if (tempArr[1].activity >= 28){ - tempArr[3].activity = 1 - } + + if (tempArr[0].score == 0 && tempArr[1].score == 0 && tempArr[2].score == 0 && tempArr[3].score == 0) { + this.setData({ + signInDay: 1 + }) + } + if (this.data.continueSign >= 7) { + tempArr[1].activity = 1 + if (this.data.continueSign >= 14) { + tempArr[2].activity = 1 + if (this.data.continueSign >= 28) { + tempArr[3].activity = 1 } } + } + console.log(tempArr, "tempArr") this.setData({ rules: tempArr }) } - }) + }).catch(err => { + wx.showToast({ + title: err.errMsg, + icon: 'none', + duration: 2000, + mask: false + }); + }) }, - setContinuousDye(){//获取连续签到天数 + setContinuousDye() { //获取连续签到天数 Http.get({ url: config.api.continuousDye - }).then(res=>{ - let{code ,data}=res - if(code==200){ + }).then(res => { + let { + code, + data + } = res + if (code == 200) { this.setData({ continueSign: data.continueSign, signInDay: data.signInDay }) } + }).catch(err => { + if (err.code == 1989) { + app.globalData.type = "qd" + wx.navigateTo({ + url: '/pages/getuserinfo/index', + }) + }else{ + wx.showToast({ + title: err.errMsg, + icon: 'none', + duration: 2000, + mask: false + }); + } }) + // .catch(err => { + // wx.showToast({ + // title: err.errMsg, + // icon: 'none', + // duration: 2000, + // mask: false + // }); + // }) }, - setHide(){//设置遮罩成 - this.setData({ - hideFlag:!this.data.hideFlag - }) + setHide() { //设置遮罩成 + this.setData({ + hideFlag: !this.data.hideFlag + }) }, - setSign(){//点击签到 + setSign() { //点击签到 Http.post({ url: config.api.userSign, - data:{type:"1"} - }).then(res=>{ - let{code}=res - if(code==200){ + data: { + type: "1" + } + }).then(res => { + let { + code + } = res + if (code == 200) { this.setData({ rewardPoints: res.data.credit }) this.setContinuousDye() + this.getSignRule() this.setHide() } - }) + }).catch(err => { + wx.showToast({ + title: err.errMsg, + icon: 'none', + duration: 2000, + mask: false + }); + }) }, /** * 生命周期函数--监听页面加载 */ - onLoad: function (options) { + onLoad: function(options) { this.setContinuousDye() this.getSignRule() }, @@ -90,49 +144,49 @@ Page({ /** * 生命周期函数--监听页面初次渲染完成 */ - onReady: function () { + onReady: function() { }, /** * 生命周期函数--监听页面显示 */ - onShow: function () { + onShow: function() { }, /** * 生命周期函数--监听页面隐藏 */ - onHide: function () { + onHide: function() { }, /** * 生命周期函数--监听页面卸载 */ - onUnload: function () { + onUnload: function() { }, /** * 页面相关事件处理函数--监听用户下拉动作 */ - onPullDownRefresh: function () { + onPullDownRefresh: function() { }, /** * 页面上拉触底事件的处理函数 */ - onReachBottom: function () { + onReachBottom: function() { }, /** * 用户点击右上角分享 */ - onShareAppMessage: function () { + // onShareAppMessage: function() { - } + // } }) \ No newline at end of file diff --git a/pages/activityCalendar/activityCalendar.wxml b/pages/activityCalendar/activityCalendar.wxml index 6fa0a26..ebd1f33 100644 --- a/pages/activityCalendar/activityCalendar.wxml +++ b/pages/activityCalendar/activityCalendar.wxml @@ -10,7 +10,7 @@ {{item.desc}} {{item.score+''}} 积分 - 已领取 + 已领取 diff --git a/pages/activityCalendar/activityCalendar.wxss b/pages/activityCalendar/activityCalendar.wxss index c193413..1609af5 100644 --- a/pages/activityCalendar/activityCalendar.wxss +++ b/pages/activityCalendar/activityCalendar.wxss @@ -36,11 +36,12 @@ text-align: center; } .singvLsit{ - width: 80%; + width: 94%; overflow: hidden; margin: 20rpx auto; background-color: #fff; border-radius: 12rpx; + color: #888; } .singvLsit_item_l{ width: 40%; diff --git a/pages/bargain/bargainDatail/bargainDatail.js b/pages/bargain/bargainDatail/bargainDatail.js index 65e0356..7b57d7b 100644 --- a/pages/bargain/bargainDatail/bargainDatail.js +++ b/pages/bargain/bargainDatail/bargainDatail.js @@ -776,6 +776,7 @@ Page({ } }, onShareAppMessage: function(options) { + app.globalData.previewFlag = true var that = this; var shareObj = { title: that.data.nickName + '邀请您帮砍' + that.data.data.title, diff --git a/pages/cardListDetail/cardListDetail.js b/pages/cardListDetail/cardListDetail.js index fa0b35e..4fb5803 100644 --- a/pages/cardListDetail/cardListDetail.js +++ b/pages/cardListDetail/cardListDetail.js @@ -531,6 +531,7 @@ Page({ }) }, onShareAppMessage: function (options) { + app.globalData.previewFlag = true var that = this; var shareObj = { title: that.data.data.title, diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js index ef010f1..ef12c97 100644 --- a/pages/cardorder/index/index.js +++ b/pages/cardorder/index/index.js @@ -62,6 +62,7 @@ Page({ }, // 扫一扫去支付 gotoPay: function(e) { + app.globalData.previewFlag = true /* wx.navigateTo({ url: `/pages/scanPay/scanPay`, }) diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 7de855c..e343b21 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -298,6 +298,7 @@ Page({ }, 500) }, gotopay: function(e) { + app.globalData.previewFlag = true /* 判断是否授权*/ Http.get({ url: config.api.checkUserStatus, @@ -645,6 +646,7 @@ Page({ * 支付订单更新 */ payOrderUpdate: (orderId, payOrderId, status, reason, type, _this) => { + console.log("*-----------------") let that = this; // 支付成功 Http.post({ @@ -1043,6 +1045,7 @@ Page({ clearInterval(that.data.setInterval) }, onShareAppMessage: function(options) { + app.globalData.previewFlag = true var that = this; console.log(options) var shareObj = { diff --git a/pages/dateLsit/dateLsit.js b/pages/dateLsit/dateLsit.js index b1fb680..2f6e8fc 100644 --- a/pages/dateLsit/dateLsit.js +++ b/pages/dateLsit/dateLsit.js @@ -81,10 +81,10 @@ Page({ let tempArr = this.data.list tempArr.push(...res.data.list) tempArr.map(item => { - item.activityEndTime = util.formatTime(item.activityEndTime, "yyyy-MM-dd") - item.activityStartTime = util.formatTime(item.activityStartTime, "yyyy-MM-dd") - item.startTime = util.formatTime(item.startTime, "yyyy-MM-dd") - item.endTime = util.formatTime(item.endTime, "yyyy-MM-dd") + item.activityEndTime = util.formatTime(item.activityEndTime, "yyyy-MM-dd hh:mm") + item.activityStartTime = util.formatTime(item.activityStartTime, "yyyy-MM-dd hh:mm") + item.startTime = util.formatTime(item.startTime, "yyyy-MM-dd hh:mm") + item.endTime = util.formatTime(item.endTime, "yyyy-MM-dd hh:mm") }) this.setData({ list: tempArr, @@ -148,7 +148,7 @@ Page({ /** * 用户点击右上角分享 */ - onShareAppMessage: function() { + // onShareAppMessage: function() { - } + // } }) \ No newline at end of file diff --git a/pages/dateLsit/dateLsit.wxml b/pages/dateLsit/dateLsit.wxml index 2891624..4c965a0 100644 --- a/pages/dateLsit/dateLsit.wxml +++ b/pages/dateLsit/dateLsit.wxml @@ -4,7 +4,7 @@ {{item.title}} - 报名时间:{{item.startTime}}至{{item.endTime}} + 报名时间:{{item.startTime}}至{{item.endTime}} 活动时间:{{item.activityStartTime}}至{{item.activityEndTime}} 当月商场未设置活动,敬请期待! diff --git a/pages/dateLsit/dateLsit.wxss b/pages/dateLsit/dateLsit.wxss index 9fa27f8..2d517fc 100644 --- a/pages/dateLsit/dateLsit.wxss +++ b/pages/dateLsit/dateLsit.wxss @@ -18,38 +18,41 @@ .title { text-align: left; - font-size: 18px; + font-size: 32rpx; font-weight: 700; - margin-left: 40rpx; + margin-left: 10rpx; height: 60rpx; line-height: 60rpx; } -.Box{ - background-image: linear-gradient(#cc9966, #F4F5F9); + +.Box { + background-image: linear-gradient(#c96, #f4f5f9); } + .text { line-height: 50rpx; height: 50rpx; text-align: left; - margin-left: 40rpx; + margin-left: 10rpx; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; font-size: 26rpx; word-wrap: break-word; - color: rgba(0, 0, 0, 0.3) + color: rgba(0, 0, 0, 0.3); } -.noData{ + +.noData { text-align: center; height: 60rpx; line-height: 60rpx; margin-top: 60rpx; - color:rgba(0, 0, 0, 0.3); - + color: rgba(0, 0, 0, 0.3); } -.loading{ - text-align: center; + +.loading { + text-align: center; height: 60rpx; line-height: 60rpx; - color:rgba(0, 0, 0, 0.3); + color: rgba(0, 0, 0, 0.3); } diff --git a/pages/game/index.js b/pages/game/index.js index c80d614..e994ee9 100644 --- a/pages/game/index.js +++ b/pages/game/index.js @@ -7,6 +7,7 @@ Page({ url:'' }, onShareAppMessage: function (res) { + app.globalData.previewFlag = true let _this=this; return { title: '小游戏', diff --git a/pages/getphoneInfo/index.js b/pages/getphoneInfo/index.js index db063a5..f493f66 100755 --- a/pages/getphoneInfo/index.js +++ b/pages/getphoneInfo/index.js @@ -15,6 +15,7 @@ Page({ // skip: app.globalData.skip }, onLoad: function(options) { + var that = this; console.log(options.skipUrl, "options.skipUrl") that.setData({ @@ -83,7 +84,7 @@ Page({ }).then(res => { app.globalData.phone = res.data.phone; if (that.data.skipUrl == '1') { - + console.log(app.globalData.skip,app.globalData.skipUrl,"跳转地址" ) if (app.globalData.skip == 'redirectTo') { wx.redirectTo({ url: app.globalData.skipUrl, diff --git a/pages/getuserinfo/index.js b/pages/getuserinfo/index.js index 12d8903..27219af 100755 --- a/pages/getuserinfo/index.js +++ b/pages/getuserinfo/index.js @@ -16,7 +16,6 @@ Page({ couponChannelIdflag: '' }, judgePhonelngo() { - Http.get({ url: config.api.checkPhoneStatus, data: {} @@ -49,6 +48,7 @@ Page({ onLoad: function(options) { + console.log(app.globalData.skip, app.globalData.skipUrl, "跳转地址") var that = this; // options.fromflag == 'coupondetail'; // 来自优惠券详情页面 @@ -57,6 +57,9 @@ Page({ fromflag: options.fromflag }) } + if (options && options.goFlaig){ + that.se + } // 来自优惠券列表券详情页面的 couponChannelId if (options && options.couponChannelIdflag) { that.setData({ @@ -246,6 +249,17 @@ Page({ app.globalData.skipUrl = '/index/index', app.globalData.skip = 'switchTab' that.judgePhonelngo() + } else if (app.globalData.type == "qd"){ + //每日签到 + app.globalData.skipUrl = "/pages/activityCalendar/activityCalendar" + app.globalData.skip = 'reLaunch' + that.judgePhonelngo() + } + else if (app.globalData.type == "hdrl") { + //活动日历 + app.globalData.skipUrl = `/pages/radetail/index?id=${app.globalData.activityId}` + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() } // 积分 else if (app.globalData.type == 'jf') { diff --git a/pages/index/index.js b/pages/index/index.js index e828822..093d332 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -38,7 +38,6 @@ Page({ that.setData({ newArr: this.data.scene.split(':') }) - //// 大屏-二维码-start if (this.data.newArr[0] == 'JC') { // 跳转券详情 @@ -331,6 +330,18 @@ Page({ url: `/pages2/live/livelist/index` }); } + //活动日历 + else if (app.globalData.type == 'arl') { + wx.redirectTo({ + url: `/pages/dateLsit/dateLsit` + }); + } + //每日签到 + else if (app.globalData.type == 'qd') { + wx.redirectTo({ + url: `/pages/activityCalendar/activityCalendar` + }); + } // 门店 else if (app.globalData.type == 'ml') { wx.switchTab({ diff --git a/pages/index/searchbar/detail/index.js b/pages/index/searchbar/detail/index.js index 866e3ad..116aa7e 100644 --- a/pages/index/searchbar/detail/index.js +++ b/pages/index/searchbar/detail/index.js @@ -221,6 +221,7 @@ Page({ * 获取多商铺列表 */ onShareAppMessage: function(res) { + app.globalData.previewFlag = true let that = this; let shareObj = { title: that.data.data.merchantName, diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 9784169..9af3f45 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -64,6 +64,7 @@ Page({ }) }, onShareAppMessage: function (res) { + app.globalData.previewFlag = true if (res.from === 'button') { console.log(res, 3333333333333333333333) // 来自页面内转发按钮 diff --git a/pages/radetail/index.js b/pages/radetail/index.js index 2855cd5..10ce9ba 100644 --- a/pages/radetail/index.js +++ b/pages/radetail/index.js @@ -9,10 +9,13 @@ const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} let configUrls = extConfig.attr.configUrl; Page({ data: { + ifBtn:true,//是否能报名 fenxiang: imgurl.fenxiang1.url, navigationBarHeight, data: {}, - status: 1, + // status: 1, + activityStatus:'', + joinStatus:'', couponId: null, orderId: "", question: [], @@ -44,8 +47,19 @@ Page({ }).then(res => { that.setData({ - status: res.data.status + status: res.data.status, + activityStatus: res.data.activityStatus, + joinStatus:res.data.joinStatus }); + if (res.data.activity.activityType==0){ + that.setData({ + ifBtn:false + }) + }else{ + that.setData({ + ifBtn: true + }) + } if (res && res.data && res.data.activity) { that.setData({ data: res.data.activity @@ -90,8 +104,10 @@ Page({ }) }).catch(err=>{ wx.hideLoading() + app.globalData.activityId = activityId + app.globalData.type = "hdrl" wx.navigateTo({ - url: `/pages/getphoneInfo/index?signActivity=${activityId}`, + url: '/pages/getuserinfo/index', }) }) }, @@ -101,6 +117,7 @@ Page({ }) }, onShareAppMessage: function (options) { + app.globalData.previewFlag = true var that = this; let shareObj = {}; // 来自页面内的按钮的转发 diff --git a/pages/radetail/index.wxml b/pages/radetail/index.wxml index fc6166f..a68df39 100644 --- a/pages/radetail/index.wxml +++ b/pages/radetail/index.wxml @@ -24,13 +24,14 @@ 活动说明 {{data.detail}} - - 1、活动人数:{{data.personLimit}}人 + + 1、活动人数:{{data.personLimit}}人 消耗积分:{{data.credit}} 积分 - 2、报名有效日期 - {{startTime}}--{{endTime}} - 3、活动有效日期 + 2、报名有效日期 + {{startTime}}--{{endTime}} + 1、活动有效日期 + 3、活动有效日期 {{activityStartTime}}--{{activityEndTime}} @@ -42,7 +43,14 @@