diff --git a/app.json b/app.json index 93b5729..73830d2 100644 --- a/app.json +++ b/app.json @@ -1,11 +1,12 @@ { "pages": [ + "pages/index/index", "pages/main/index", - "index/index", "index/searchbar", "index/passCar", "index/user", + "index/index", "pages/searchbar/searchbar", "pages/integralmall/integraHistory/index", "pages/integralmall/payIntegcouponStatus/index", diff --git a/pages/bargain/bargainDatail/bargainDatail.js b/pages/bargain/bargainDatail/bargainDatail.js index 868cb35..43a2c5f 100644 --- a/pages/bargain/bargainDatail/bargainDatail.js +++ b/pages/bargain/bargainDatail/bargainDatail.js @@ -10,7 +10,6 @@ Page({ * 页面的初始数据 */ data: { - url:"", navigationBarHeight, bannerUrl: imgurl.banner.url, wmhome: imgurl.wmhome.url, @@ -34,46 +33,96 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function(options) { - Http.get({ - url: config.api.checkUserStatus, - data: { - token: app.globalData.token - } - }).then(res => { + if(app.globalData.token) { Http.get({ - url: config.api.checkPhoneStatus, - data: {} + url: config.api.checkUserStatus, + data: { + token: app.globalData.token + } }).then(res => { - let that = this; - if (options.orderId || options.orderId && options.from == 'discount') { - console.log(options, "options") - if (options.from) { - - that.setData({ - orderId: options.orderId, - composeOrderType: options.composeOrderType, - from: "discount" - }) - } else { - that.setData({ - orderId: options.orderId, - composeOrderType: options.composeOrderType, - }) + Http.get({ + url: config.api.checkPhoneStatus, + data: {} + }).then(res => { + let that = this; + if (options.orderId || options.orderId && options.from == 'discount') { + console.log(options, "options") + if (options.from) { + + that.setData({ + orderId: options.orderId, + composeOrderType: options.composeOrderType, + from: "discount" + }) + } else { + that.setData({ + orderId: options.orderId, + composeOrderType: options.composeOrderType, + }) + } + app.globalData.wmorder = options.orderId + that.pressOrderDetail(options.orderId); } - app.globalData.wmorder = options.orderId - that.pressOrderDetail(options.orderId); - } - this.getUserInfo() - }).catch(res=>{ + this.getUserInfo() + }).catch(res => { + wx.redirectTo({ + url: `/pages/getphoneInfo/index` + }); + }) + }).catch(res => { wx.redirectTo({ - url: `/pages/getphoneInfo/index` - }); - }) - }).catch(res => { - wx.redirectTo({ - url: `/pages/getuserinfo/index` + url: `/pages/getuserinfo/index` + }) }) - }) + }else{ + app.tokenCallback = token =>{ + Http.get({ + url: config.api.checkUserStatus, + data: { + token: app.globalData.token + } + }).then(res => { + Http.get({ + url: config.api.checkPhoneStatus, + data: {} + }).then(res => { + let that = this; + if (options.orderId || options.orderId && options.from == 'discount') { + console.log(options, "options") + if (options.from) { + + that.setData({ + orderId: options.orderId, + composeOrderType: options.composeOrderType, + from: "discount" + }) + } else { + that.setData({ + orderId: options.orderId, + composeOrderType: options.composeOrderType, + }) + } + app.globalData.wmorder = options.orderId + that.pressOrderDetail(options.orderId); + } + this.getUserInfo() + }).catch(res => { + + app.globalData.type = "bg" + wx.redirectTo({ + url: `/pages/getuserinfo/index?orderId=${options.orderId}&composeOrderType=${options.composeOrderType}` + }); + }) + }).catch(res => { + + app.globalData.type = "bg" + wx.redirectTo({ + url: `/pages/getuserinfo/index?orderId=${options.orderId}&composeOrderType=${options.composeOrderType}` + }) + }) + } + } + }, getUserInfo: function() { @@ -800,9 +849,7 @@ Page({ // var orderId = options.target.dataset.orderid; shareObj.path = `/pages/index/index?orderId=${that.data.orderId}&from=${"discount"}&composeOrderType=${that.data.composeOrderType}`; } - this.setData({ - url: shareObj.path - }) + console.log(shareObj) // 返回shareObj // return shareObj; diff --git a/pages/bargain/bargainDatail/bargainDatail.wxml b/pages/bargain/bargainDatail/bargainDatail.wxml index 7a72f25..98b8664 100644 --- a/pages/bargain/bargainDatail/bargainDatail.wxml +++ b/pages/bargain/bargainDatail/bargainDatail.wxml @@ -68,8 +68,6 @@ - {{url}} -
+ - 商品名称商品名称商品名称商品名称 商品名称商品名称 + {{title}} - ¥9.9 + ¥{{salePriceStr}} + @@ -35,119 +41,41 @@ 商品金额: - ¥9.9 + ¥{{salePriceStr*num}} 运费: - ¥9.9 + ¥{{freightPriceStr}} 合计 - ¥15.9 + ¥{{(salePriceStr*num)+(freightPriceStr*1)}} - ¥15.90 + ¥{{(salePriceStr*num)+(freightPriceStr*1)}} 支付 - + - - - - 北京是朝阳区三环以内 - - 北京市朝阳区南磨房东里123号楼234号 - - 圣达菲 - 138****7654 - - - - + - 北京是朝阳区三环以内 + {{item.regionStr}} - 北京市朝阳区南磨房东里123号楼234号 + {{item.address}} - 圣达菲 - 138****7654 + {{item.consignee}} + {{item.mobile}} - - - - 北京是朝阳区三环以内 - - 北京市朝阳区南磨房东里123号楼234号 - - 圣达菲 - 138****7654 - - - - - - - - 北京是朝阳区三环以内 - - 北京市朝阳区南磨房东里123号楼234号 - - 圣达菲 - 138****7654 - - - - - - - - 北京是朝阳区三环以内 - - 北京市朝阳区南磨房东里123号楼234号 - - 圣达菲 - 138****7654 - - - - - - - - 北京是朝阳区三环以内 - - 北京市朝阳区南磨房东里123号楼234号 - - 圣达菲 - 138****7654 - - - - - - - 北京是朝阳区三环以内 - - 北京市朝阳区南磨房东里123号楼234号 - - 圣达菲 - 138****7654 - - - - - - \ No newline at end of file diff --git a/pages/fillIndent/fillIndent.wxss b/pages/fillIndent/fillIndent.wxss index 831c65d..baf9d2a 100644 --- a/pages/fillIndent/fillIndent.wxss +++ b/pages/fillIndent/fillIndent.wxss @@ -6,6 +6,11 @@ width: 96%; margin: 0 auto; } +.addSeit{ + text-align: center; + padding: 20rpx 0; + +} .siteBox{ background-color: #fff; border-radius: 10rpx; @@ -172,11 +177,11 @@ top: 0; position: fixed; height: 100vh; - background-color: rgba(36, 36, 36, 0.3) + background-color: rgba(36, 36, 36, 0.3); } .shade{ width: 80%; - height: 70vh; - margin: 200rpx auto 0 auto; + max-height: 70vh; overflow: scroll; + margin: 300rpx auto 0 auto; } \ No newline at end of file diff --git a/pages/getuserinfo/index.js b/pages/getuserinfo/index.js index d173259..d26cd12 100755 --- a/pages/getuserinfo/index.js +++ b/pages/getuserinfo/index.js @@ -15,6 +15,7 @@ Page({ fromflag: '', couponChannelIdflag: '', wjId: "", + composeOrderType:"", }, //是否授权手机号 judgePhonelngo() { @@ -56,7 +57,13 @@ Page({ that.setData({ fromflag: options.fromflag }) + } + if (options && options.composeOrderType){ + that.setData({ + composeOrderType: options.composeOrderType + }) } + // 来自优惠券列表券详情页面的 couponChannelId if (options && options.couponChannelIdflag) { that.setData({ @@ -395,6 +402,10 @@ Page({ } }).then( function(res) { + // wx.showToast({ + // title: "授权个人信息成功11", + // icon: "none" + // }); if (that.data.wjId) { app.globalData.skipUrl = `/pages/questionnaire/questionnaire?id=${that.data.wjId}` app.globalData.skip = 'redirectTo' @@ -408,7 +419,8 @@ Page({ return; } // - if (that.data.optionData.orderGroupId) { + + if (that.data.optionData!=null && that.data.optionData.orderGroupId != null && that.data.optionData.orderGroupId !="" ) { app.globalData.skipUrl = `/pages/joinFrDpell/index?couponId=${that.data.optionData.couponId}&orderGroupId=${that.data.optionData.orderGroupId}&couponChannelId=${that.data.optionData.couponChannelId}&orderId=${that.data.optionData.orderId}&avatarUrl=${that.data.optionData.avatarUrl}&nickName=${that.data.optionData.nickName}` app.globalData.skip = 'reLaunch' that.judgePhonelngo() @@ -436,29 +448,29 @@ Page({ app.globalData.skipUrl = `/pages/spellGroup/mySpellGroup/index?couponChannelId=${that.data.couponChannelId}` app.globalData.skip = 'redirectTo' that.judgePhonelngo() - } else if (that.data.optionData.id && app.globalData.type == 'gm') { + } else if (that.data.optionData != null && that.data.optionData.id && app.globalData.type == 'gm') { // 游戏页面 that.getGameOne(app.globalData.token, that.data.optionData.id) - } else if (that.data.optionData.id && app.globalData.type == 'td') { + } else if (that.data.optionData != null && that.data.optionData.id && app.globalData.type == 'td') { app.globalData.skipUrl = `/pages/topicDetail/index?id=${that.data.optionData.id}` app.globalData.skip = 'redirectTo' that.judgePhonelngo() } // 报名活动 - else if (that.data.optionData.id && app.globalData.type == 'ra') { + else if (that.data.optionData != null && that.data.optionData.id && app.globalData.type == 'ra') { app.globalData.skipUrl = `/pages/radetail/index?id=${that.data.optionData.id}`, app.globalData.skip = 'redirectTo' that.judgePhonelngo() } // 报名签到 - else if (that.data.optionData.id && app.globalData.type == 'si') { + else if (that.data.optionData != null && that.data.optionData.id && app.globalData.type == 'si') { app.globalData.skipUrl = `/pages/acSignIn/index?id=${that.data.optionData.id}`, app.globalData.skip = 'redirectTo' that.judgePhonelngo() } // 门店详情 - else if (that.data.optionData.id && app.globalData.type == 'md') { + else if (that.data.optionData != null && that.data.optionData.id && app.globalData.type == 'md') { app.globalData.skipUrl = `/pages/index/searchbar/detail/index?id=${that.data.optionData.id}`, app.globalData.skip = 'redirectTo' that.judgePhonelngo() @@ -468,9 +480,9 @@ Page({ app.globalData.skipUrl = `/pages/index/searchbar/detail/index?id=${that.data.id}`, app.globalData.skip = 'redirectTo' that.judgePhonelngo() - } else if (that.data.optionData.bt && that.data.optionData.id && app.globalData.type == 'bd') { + } else if (that.data.optionData != null && that.data.optionData.bt && that.data.optionData.id && app.globalData.type == 'bd') { // 宣传页详情 - if (that.data.optionData.bt == '2') { + if (that.data.optionData != null && that.data.optionData.bt == '2') { // 自由图文 app.globalData.skipUrl = `/pages/freeBannerDetail/index?id=${that.data.optionData.id}`, app.globalData.skip = 'redirectTo' @@ -483,7 +495,7 @@ Page({ } } else if (that.data.orderId || that.data.orderId && app.globalData.type == 'bg') { // 参与砍价 - app.globalData.skipUrl = `/pages/bargain/bargainDatail/bargainDatail?orderId=${that.data.orderId}`, + app.globalData.skipUrl = `/pages/bargain/bargainDatail/bargainDatail?orderId=${that.data.orderId}&composeOrderType=${that.composeOrderType}`, app.globalData.skip = 'navigateTo' that.judgePhonelngo() } else if (app.globalData.type == 'uc') { @@ -604,7 +616,7 @@ Page({ ) .catch(err => { wx.showToast({ - title: err.errMsg, + title: err.code, icon: 'none', duration: 2000, mask: false diff --git a/pages/index/index.js b/pages/index/index.js index 05806df..10ec31c 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -8,7 +8,6 @@ Page({ * 页面的初始数据 */ data: { - token:"" }, /** * 生命周期函数--监听页面加载 @@ -84,9 +83,7 @@ Page({ wx.setStorageSync('imgurl', imgurl); if (app.globalData.token) { - that.setData({ - token: app.globalData.token - }) + this.updateUserInfo(); if (options.couponChannelId || options.orderId || options.id) { @@ -95,14 +92,9 @@ Page({ that.userStatus(); } } else { - // 由于 token 是网络请求,可能会在 Page.onLoad 之后才返回 // 所以此处加入 callback 以防止这种情况 app.tokenCallback = token => { - that.setData({ - token: app.globalData.token - }) - this.updateUserInfo(); if (options.couponChannelId || options.orderId || options.id) { that.userStatus(options); @@ -117,6 +109,7 @@ Page({ * 检查用户的状态 */ userStatus: function(options) { + var that = this; if (options && (options.couponChannelId || options.orderId || options.id)) { that.checkuserstatus(options); @@ -142,6 +135,7 @@ Page({ }) }, checkuserstatus(options) { + let that = this; Http.get({ @@ -151,7 +145,6 @@ Page({ } }) .then(res => { - return // res = JSON.parse('{"code":11004,"message":"用户昵称未授权,请跳转到用户昵称授权页!","data":{}}') //参与拼团 @@ -388,16 +381,11 @@ Page({ } }) .catch(err => { - console.log(err) - this.setData({ - err:err - }) wx.showToast({ title: err, icon: "loading", - duration: 20001 + duration: 2000 }) - return if (err.code == 11004) { // 用户昵称未授权 if (options && options.orderGroupId) { diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 8dd408b..e69de29 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,2 +0,0 @@ -{{token}} -"w lai le " \ No newline at end of file diff --git a/pages/index/index.wxss b/pages/index/index.wxss index adeb4d3..f859af0 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -2,10 +2,5 @@ Page{ height: 100%; width: 100%; background:#fff; - /* opacity: 0; */ -} -.temp{ - width: 100%; - height: 100rpx; - margin-top: 40rpx; + opacity: 0; } diff --git a/pages/siteUser/siteUser.js b/pages/siteUser/siteUser.js index 9ba6d81..a28e7cd 100644 --- a/pages/siteUser/siteUser.js +++ b/pages/siteUser/siteUser.js @@ -25,7 +25,7 @@ Page({ url: config.api.siteList, data:{ pageNum: this.data.pageNum, - pageSize:5, + pageSize:1000, } }).then(res=>{ let tempLsit = res.data.list diff --git a/project.config.json b/project.config.json index fb97b60..c1a3335 100644 --- a/project.config.json +++ b/project.config.json @@ -134,9 +134,9 @@ }, { "id": 10, - "name": "pages/index/index", - "pathName": "pages/index/index", - "query": "orderId=600924863166734336&from=discount&composeOrderType=0", + "name": "123", + "pathName": "pages/bargain/bargainDatail/bargainDatail", + "query": "orderId=601302157553754112&from=discount&composeOrderType=0", "scene": null }, { @@ -145,6 +145,13 @@ "pathName": "pages/fillIndent/fillIndent", "query": "", "scene": null + }, + { + "id": 12, + "name": "授权测试", + "pathName": "/pages/getuserinfo/index", + "query": "", + "scene": null } ] }