diff --git a/.vscode/settings.json b/.vscode/settings.json index 9e26dfe..f7ea9f8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1 +1,120 @@ -{} \ No newline at end of file +{ + "http.proxy": "", + "http.proxySupport": "override", + "proxyType": "system", + "setProxy": "", + "systemProxyUrl": "", + "workbench.colorTheme": "Sublime VSCode Theme", + "workbench.colorThemeType": "dark", + "typescript.tsdk": "E:\\TikTok DevTool\\@bytedminiprogram-ide\\resources\\app\\app.content\\dist\\assets\\business\\typescript\\lib", + "files.associations": { + "*.ttss": "css", + "*.wxss": "css", + "*.sjs": "javascript", + "*.ttml": "ttml", + "*.wxml": "ttml", + "*.sk": "ttml" + }, + "files.exclude": { + "**/.git": true, + "**/.svn": true, + "**/.hg": true, + "**/CVS": true, + "**/.DS_Store": true, + "**/Thumbs.db": true, + "**/.byte-ide": true + }, + "emmet.includeLanguages": { + "sjs": "javascript" + }, + "security.workspace.trust.untrustedFiles": "open", + "[jsonc]": { + "editor.defaultFormatter": "HookyQR.beautify" + }, + "explorer.confirmDelete": false, + "less.compile": { + "compress": false, + "out": true, + "outExt": ".ttss" + }, + "[javascript]": { + "editor.defaultFormatter": "HookyQR.beautify" + }, + "[json]": { + "editor.defaultFormatter": "HookyQR.beautify" + }, + "editor.tokenColorCustomizations": { + "keywords": { + "foreground": "#FF0000", + "fontStyle": "italic bold" + }, + "variables": { + "foreground": "#ffffff", + "fontStyle": "italic bold", + }, + //字符串 + "strings": { + "foreground": "#fbff00", + "fontStyle": "italic" + }, + //函数 + "functions": "#00ffff", + //注释 + "comments": "#969696", + "types": "#00ff95" + }, + "editor.formatOnSave": true, + "editor.wordWrap": "on", + // 开启原生括号着色 + "editor.bracketPairColorization.enabled": true, + // 开启代码块边缘导轨线着色 + "editor.guides.bracketPairs": "active", + //覆盖当前所选颜色主题的颜色 + "workbench.colorCustomizations": { + //光标颜色 + "editorCursor.foreground": "#00ff00", + //编辑器背景色 + "editor.background": "#00000025", + //光标所在行边框颜色 + //光标所在行背景颜色 + "editor.lineHighlightBorder": "#ffffffa1", + "editor.lineHighlightBackground": "#ffffff1e", + //光标选中文本的背景颜色 + //光标选中文本时匹配同类型的值的背景颜色 + "editor.selectionBackground": "#ff0000c2", + "editor.selectionHighlightBackground": "#00ffff80", + //缩进参考线的颜色 + "editorIndentGuide.activeBackground": "#f92672", + //方括号出现意外的前景色 + "editorBracketHighlight.unexpectedBracket.foreground": "#ff0000", + //括号的前景色,需要启用括号对着色 + "editorBracketHighlight.foreground1": "#ffff00", + "editorBracketPairGuide.activeBackground1": "#ffff00", + "editorBracketHighlight.foreground2": "#f92672", + "editorBracketPairGuide.activeBackground2": "#f92672", + "editorBracketHighlight.foreground3": "#00ffff", + "editorBracketPairGuide.activeBackground3": "#00ffff", + "editorBracketHighlight.foreground4": "#00ff00", + "editorBracketPairGuide.activeBackground4": "#00ff00", + "workbench.colorTheme": "Sublime VSCode Theme", + "[Sublime VSCode Theme]": { + "activityBar.activeBackground": "#ffffff1e", + "activityBar.background": "#292b27", + "activityBar.foreground": "#ffffff", + "activityBar.activeBorder": "#ff0000", + "activityBar.activeFocusBorder": "#ff0000", + "breadcrumb.foreground": "#ffffff", + "breadcrumb.background": "#1a1b18", + "sideBar.background": "#1e1f1c", + "sideBarSectionHeader.background": "#343532", + "sideBarSectionHeader.foreground": "#fff", + "sideBar.border": "#777777", + "sideBar.foreground": "#fff", + "list.hoverBackground": "#8a8a8a", + "list.inactiveSelectionBackground": "#75715e", + "editor.selectionBackground": "#ff0000", + "editorGroupHeader.tabsBackground": "#141415" + }, + }, + "editor.cursorBlinking": "smooth", +} diff --git a/index/user.js b/index/user.js index 62841c3..87d3cca 100644 --- a/index/user.js +++ b/index/user.js @@ -10,7 +10,7 @@ Page({ text: "授权手机号", avatarUrl: "", nickName: "", - mouldType:1, + mouldType: 1, }, showPhoemBtn() { @@ -23,7 +23,7 @@ Page({ let url = e.currentTarget.dataset.url console.log(url); if (url == '/pages/order/index/index?id=all') { - app.globalData.ifshowtab=false + app.globalData.ifshowtab = false tt.navigateTo({ url: url, success: (res) => { @@ -64,6 +64,13 @@ Page({ }, }); }, + + goSetUserInfo() { + tt.navigateTo({ + url: '/pages/getuserinfo/getuserinfo?mineFlag=mine', + }); + }, + getmemberId: function (token) { Http.get({ url: config.api.getScore, @@ -92,19 +99,19 @@ Page({ }) tt.reLaunch({ url: "/index/index", - success(res) { - console.log(`${res}`); - app.globalData.selected = 0 - }, - fail(err) { - console.log(`navigateTo调用失败`,err); - }, + success(res) { + console.log(`${res}`); + app.globalData.selected = 0 + }, + fail(err) { + console.log(`navigateTo调用失败`, err); + }, }); // tt.showToast({ // title: '取消授权', // 内容 // icon: 'none', // 图标 // success: (res) => { - + // }, // fail: (res) => { @@ -112,9 +119,9 @@ Page({ // }); }, onShow: function (options) { - + this.setData({ - mouldType:app.globalData.mouldType + mouldType: app.globalData.mouldType }) this.getmemberId() Http.get({ @@ -127,24 +134,24 @@ Page({ url: config.api.checkPhoneStatus, }).then(res => { this.setData({ - text:res.data.phone + text: res.data.phone }) }).catch(err => { - - if(app.globalData.ifCongPh==1){ + + if (app.globalData.ifCongPh == 1) { tt.navigateTo({ url: '/pages/getPhone/getPhone?mineFlag=mine', }); - }else{ + } else { this.setData({ - showPhoem:true + showPhoem: true }) } - + }) }).catch(err => { - if (err.code == 11004) {//未授权抖音 + if (err.code == 11004) { //未授权抖音 app.globalData.type = 'uc' tt.navigateTo({ url: '/pages/getuserinfo/getuserinfo', diff --git a/index/user.ttml b/index/user.ttml index 3cc4986..2946f67 100644 --- a/index/user.ttml +++ b/index/user.ttml @@ -4,29 +4,36 @@ --> - - - + + + + 个人信息 - + + + 我的订单 - + + + 我的券包 - + - 更多服务 + 更多服务 - + - - - + + + 关于我们 - - - + + + 服务资质 - + - - \ No newline at end of file + + \ No newline at end of file diff --git a/pages/coupon/confirmation/confirmation.js b/pages/coupon/confirmation/confirmation.js index 97ce928..0064613 100644 --- a/pages/coupon/confirmation/confirmation.js +++ b/pages/coupon/confirmation/confirmation.js @@ -894,12 +894,15 @@ Page({ * 将值传到用户手机号授权的页面 * */ - // tt.navigateTo({ - // url: `/pages/getPhone/getPhone?couponChannelId=${that.data.couponChannelId}&path=qr` - // }); - this.setData({ - showPhoem: true - }) + if (app.globalData.ifCongPh == 1) { + tt.navigateTo({ + url: `/pages/getPhone/getPhone?couponChannelId=${that.data.couponChannelId}&path=qr`, + }); + } else { + this.setData({ + showPhoem: true + }) + } } else if (err.code == 11006) { // 用户手机已加密 tt.navigateTo({ diff --git a/pages/getuserinfo/getuserinfo.js b/pages/getuserinfo/getuserinfo.js index 5a33436..9e88270 100644 --- a/pages/getuserinfo/getuserinfo.js +++ b/pages/getuserinfo/getuserinfo.js @@ -13,13 +13,13 @@ Page({ optionData: null, fromflag: '', couponChannelIdflag: '', - confirmationFlag:'', + confirmationFlag: '', wjId: "", composeOrderType: "", fillIndentId: "", - url: null,//游戏路径 - id: null,//游戏id, - gameId: null,//游戏gameId + url: null, //游戏路径 + id: null, //游戏id, + gameId: null, //游戏gameId }, backHome() { @@ -32,10 +32,10 @@ Page({ tt.reLaunch({ url: "/index/index", success: (res) => { - + }, fail: (res) => { - + }, }); }, @@ -75,29 +75,29 @@ Page({ } }).catch(err => { - if(app.globalData.ifCongPh==1){ + if (app.globalData.ifCongPh == 1) { tt.redirectTo({ url: `/pages/getPhone/getPhone?skipUrl=1` }); - }else{ + } else { tt.navigateBack({ delta: 1, }) } - + }) }, onLoad: function (options) { - + console.log(app.globalData.skip, app.globalData.skipUrl, app.globalData.type, "跳转地址") var that = this; // options.fromflag == 'coupondetail'; // 游戏页面 if (options && options.url && options.id && options.gameId) { that.setData({ - url: options.url,//游戏路径 - id: options.id,//游戏id, - gameId: options.gameId,//游戏gameId + url: options.url, //游戏路径 + id: options.id, //游戏id, + gameId: options.gameId, //游戏gameId }) } // 来自优惠券详情页面 @@ -130,6 +130,12 @@ Page({ confirmationFlag: options.confirmationFlag }) } + // 我的 + if (options && options.mineFlag) { + that.setData({ + mineFlag: options.mineFlag + }) + } //调查问卷 if (options && !options.wjId || options.wjId) { this.setData({ @@ -184,18 +190,18 @@ Page({ }) } Http.get({ - url: config.api.marketicon, - data: { - appId: app.globalData.appId - } - }).then(res => { - that.setData({ - mallImgUrl: res.data.mallImgUrl - }); - tt.setNavigationBarTitle({ - title: res.data.mallName + url: config.api.marketicon, + data: { + appId: app.globalData.appId + } + }).then(res => { + that.setData({ + mallImgUrl: res.data.mallImgUrl + }); + tt.setNavigationBarTitle({ + title: res.data.mallName + }) }) - }) .catch(err => { tt.showToast({ title: err.errMsg, @@ -246,241 +252,248 @@ Page({ // console.log(res,"数据"); // return tt.login({ - success:(res=>{ - let {code} = res - console.log(code,"code"); + success: (res => { + let { + code + } = res + console.log(code, "code"); Http.post({ - url:config.api.login, - data:{ - code:code, - appId:app.globalData.appId, - systemInfo:JSON.stringify(app.globalData.systemInfo) + url: config.api.login, + data: { + code: code, + appId: app.globalData.appId, + systemInfo: JSON.stringify(app.globalData.systemInfo) } - }).then(res=>{ + }).then(res => { Http.setToken(res.data.token); app.globalData.token = res.data.token Http.post({ - url: config.api.getUserInfo, - data: { - encryptedData: encryptedData, - iv: iv - } - }).then(res => { - if (app.globalData.type == 'gm' && that.data.id && that.data.gameId && that.data.url) {//游戏页面 - app.globalData.skipUrl = '/pages/game/index?url=' + that.data.url + "&id=" + that.data.id + "&gameId=" + that.data.gameId, - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - return; - } - if (that.data.wjId) { - app.globalData.skipUrl = `/pages/questionnaire/questionnaire?id=${that.data.wjId}` - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - return; - } - if (that.data.fromflag == 'poster') { - app.globalData.skipUrl = `/pages/canvas/index?couponChannelId=${that.data.couponChannelId}` - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - return; - } - // - - 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() - return; - } - if (that.data.path == 'index') { - app.globalData.skipUrl = "/pages/game/index" - app.globalData.skip = 'reLaunch' - that.judgePhonelngo() - } else { - //返回主页 - // if (that.data.couponChannelId && !that.data.cuserId && !that.data.spellGroup||that.data.couponChannelId && !that.data.cuserId&&app.globalData.type == 'cd') { - if (that.data.couponChannelId && !that.data.cuserId && !that.data.spellGroup && app.globalData.type == 'cd') { - // 跳转普通券/消费卡/限时秒杀/砍价详情 - app.globalData.skipUrl = `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelId}` - app.globalData.skip = 'navigateTo' - that.judgePhonelngo() - } else if (that.data.couponChannelId && that.data.cuserId && !that.data.spellGroup && app.globalData.type != 'sd') { - // 来自转赠 - app.globalData.skipUrl = `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelId}&cuserId=${that.data.cuserId}&coverImg=${that.data.coverImg}&userName=${that.data.userName}&avatarUrl=${that.data.avatarUrl}&couponOrderId=${that.data.couponOrderId}&updateDate=${that.data.updateDate}` - app.globalData.skip = 'reLaunch' + url: config.api.getUserInfo, + data: { + encryptedData: encryptedData, + iv: iv + } + }).then(res => { + if (app.globalData.type == 'gm' && that.data.id && that.data.gameId && that.data.url) { //游戏页面 + app.globalData.skipUrl = '/pages/game/index?url=' + that.data.url + "&id=" + that.data.id + "&gameId=" + that.data.gameId, + app.globalData.skip = 'redirectTo' that.judgePhonelngo() - } else if (that.data.couponChannelId && app.globalData.type == 'sd' || that.data.couponChannelId && that.data.spellGroup) { - // 拼团详情页 - app.globalData.skipUrl = `/pages/spellGroup/mySpellGroup/index?couponChannelId=${that.data.couponChannelId}` + return; + } + if (that.data.wjId) { + app.globalData.skipUrl = `/pages/questionnaire/questionnaire?id=${that.data.wjId}` app.globalData.skip = 'redirectTo' that.judgePhonelngo() - } 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 != null && that.data.optionData.id && app.globalData.type == 'td') { - app.globalData.skipUrl = `/pages/topicDetail/index?id=${that.data.optionData.id}` + return; + } + if (that.data.mineFlag) { + app.globalData.skipUrl = `/index/user` app.globalData.skip = 'redirectTo' that.judgePhonelngo() + return; } - // 报名活动 - 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' + if (that.data.fromflag == 'poster') { + app.globalData.skipUrl = `/pages/canvas/index?couponChannelId=${that.data.couponChannelId}` + app.globalData.skip = 'redirectTo' that.judgePhonelngo() + return; } - // 报名签到 - 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' + // + + 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() + return; } - // 门店详情 - 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' + if (that.data.path == 'index') { + app.globalData.skipUrl = "/pages/game/index" + app.globalData.skip = 'reLaunch' that.judgePhonelngo() - } - // 通过分享进入的门店详情页面 - else if (that.data.id && that.data.frommd == 'md') { - app.globalData.skipUrl = `/pages/index/searchbar/detail/index?id=${that.data.id}`, + } else { + //返回主页 + // if (that.data.couponChannelId && !that.data.cuserId && !that.data.spellGroup||that.data.couponChannelId && !that.data.cuserId&&app.globalData.type == 'cd') { + if (that.data.couponChannelId && !that.data.cuserId && !that.data.spellGroup && app.globalData.type == 'cd') { + // 跳转普通券/消费卡/限时秒杀/砍价详情 + app.globalData.skipUrl = `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelId}` + app.globalData.skip = 'navigateTo' + that.judgePhonelngo() + } else if (that.data.couponChannelId && that.data.cuserId && !that.data.spellGroup && app.globalData.type != 'sd') { + // 来自转赠 + app.globalData.skipUrl = `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelId}&cuserId=${that.data.cuserId}&coverImg=${that.data.coverImg}&userName=${that.data.userName}&avatarUrl=${that.data.avatarUrl}&couponOrderId=${that.data.couponOrderId}&updateDate=${that.data.updateDate}` + app.globalData.skip = 'reLaunch' + that.judgePhonelngo() + } else if (that.data.couponChannelId && app.globalData.type == 'sd' || that.data.couponChannelId && that.data.spellGroup) { + // 拼团详情页 + app.globalData.skipUrl = `/pages/spellGroup/mySpellGroup/index?couponChannelId=${that.data.couponChannelId}` app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - } else if (that.data.optionData != null && that.data.optionData.bt && that.data.optionData.id && app.globalData.type == 'bd') { - // 宣传页详情 - if (that.data.optionData != null && that.data.optionData.bt == '2') { - // 自由图文 - app.globalData.skipUrl = `/pages/freeBannerDetail/index?id=${that.data.optionData.id}`, + that.judgePhonelngo() + } 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 != 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 != 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 { - // 标准格式 - app.globalData.skipUrl = `/pages/bannerdetail/index?id=${that.data.optionData.id}`, + } + // 报名签到 + 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.orderId || that.data.orderId && app.globalData.type == 'bg') { - // 参与砍价 - 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') { - // 我的 - app.globalData.skipUrl = '/index/user', - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - } else if (app.globalData.type == 'in') { - // 首页 - app.globalData.skipUrl = app.globalData.goHomeUrl, - app.globalData.skip = 'redirectTo' - 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') { - app.globalData.skipUrl = '/pages/integralmall/index', - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - } else if (app.globalData.type == 'pc') { - // 停车 - app.globalData.skipUrl = '/index/passCar', - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - } else if (app.globalData.type == 'mc') { - // 我的券包 - app.globalData.skipUrl = '/pages/couponorder/index/index', - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - } else if (app.globalData.type == 'mo') { - // 我的订单 - app.globalData.skipUrl = '/pages/order/index/index?id=all', - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - } else if (app.globalData.type == 'ca') { - // 我的卡包 - app.globalData.skipUrl = '/pages/cardorder/index/index', - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - } else if (app.globalData.type == 'sc') { - // 特享礼遇 - app.globalData.skipUrl = '/pages/specialcourtesy/specialcourtesy', - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - } else if (app.globalData.type == 'rb') { - // 限时秒杀 - app.globalData.skipUrl = '/pages/rushToBuy/index', - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - } else if (app.globalData.type == 'bl') { - // 砍价专场 - app.globalData.skipUrl = '/pages/bargain/bargain', - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - } else if (app.globalData.type == 'mb') { - // 我的砍价 - app.globalData.skipUrl = '/pages/bargain/bargain?from=myhtml', - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - } else if (app.globalData.type == 'sl') { - // 拼团专场 - app.globalData.skipUrl = '/pages/spellGroup/spellGroup', - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - } else if (app.globalData.type == 'ms') { - // 我的拼团 - app.globalData.skipUrl = '/pages/spellGroup/spellGroup?from=myhtml', - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - } else if (app.globalData.type == 'dc') { - // 消费卡 - app.globalData.skipUrl = '/pages/discountCardList/discountCardList', - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - } else if (app.globalData.type == 'td') { - // 专题活动页 - app.globalData.skipUrl = '/pages/topicDetail/index', - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - } else if (app.globalData.type == 'ml') { - // 门店 - app.globalData.skipUrl = '/index/searchbar', - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - } else if (that.data.fromflag == 'confirmation' && that.data.confirmationFlag) { - //订单确认 confirmation - app.globalData.skipUrl = `/pages/coupon/confirmation/confirmation?couponChannelId=${that.data.confirmationFlag}`, - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - } - else if (that.data.fromflag == 'coupondetail' && that.data.couponChannelIdflag) { - app.globalData.skipUrl = `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelIdflag}`, - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - } else if (that.data.fromflag == 'spellcoupondetail' && that.data.couponChannelIdflag) { - app.globalData.skipUrl = `/pages/spellGroup/mySpellGroup/index?couponChannelId=${that.data.couponChannelIdflag}`, - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - } else if (that.data.fromflag == 'fillIndent' && that.data.fillIndentId && that.data.couponId) { - //线上配送 填写订单 - app.globalData.skipUrl = `/pages/fillIndent/fillIndent?id=${that.data.fillIndentId}&couponId=${that.data.couponId}`, - app.globalData.skip = 'redirectTo' - that.judgePhonelngo() - } else { - app.globalData.skipUrl = app.globalData.goHomeUrl, + // 门店详情 + 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() + } + // 通过分享进入的门店详情页面 + else if (that.data.id && that.data.frommd == 'md') { + app.globalData.skipUrl = `/pages/index/searchbar/detail/index?id=${that.data.id}`, + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } else if (that.data.optionData != null && that.data.optionData.bt && that.data.optionData.id && app.globalData.type == 'bd') { + // 宣传页详情 + 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' + that.judgePhonelngo() + } else { + // 标准格式 + app.globalData.skipUrl = `/pages/bannerdetail/index?id=${that.data.optionData.id}`, + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } + } else if (that.data.orderId || that.data.orderId && app.globalData.type == 'bg') { + // 参与砍价 + 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') { + // 我的 + app.globalData.skipUrl = '/index/user', + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } else if (app.globalData.type == 'in') { + // 首页 + app.globalData.skipUrl = app.globalData.goHomeUrl, + app.globalData.skip = 'redirectTo' + 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() + that.judgePhonelngo() + } + // 积分 + else if (app.globalData.type == 'jf') { + app.globalData.skipUrl = '/pages/integralmall/index', + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } else if (app.globalData.type == 'pc') { + // 停车 + app.globalData.skipUrl = '/index/passCar', + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } else if (app.globalData.type == 'mc') { + // 我的券包 + app.globalData.skipUrl = '/pages/couponorder/index/index', + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } else if (app.globalData.type == 'mo') { + // 我的订单 + app.globalData.skipUrl = '/pages/order/index/index?id=all', + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } else if (app.globalData.type == 'ca') { + // 我的卡包 + app.globalData.skipUrl = '/pages/cardorder/index/index', + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } else if (app.globalData.type == 'sc') { + // 特享礼遇 + app.globalData.skipUrl = '/pages/specialcourtesy/specialcourtesy', + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } else if (app.globalData.type == 'rb') { + // 限时秒杀 + app.globalData.skipUrl = '/pages/rushToBuy/index', + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } else if (app.globalData.type == 'bl') { + // 砍价专场 + app.globalData.skipUrl = '/pages/bargain/bargain', + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } else if (app.globalData.type == 'mb') { + // 我的砍价 + app.globalData.skipUrl = '/pages/bargain/bargain?from=myhtml', + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } else if (app.globalData.type == 'sl') { + // 拼团专场 + app.globalData.skipUrl = '/pages/spellGroup/spellGroup', + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } else if (app.globalData.type == 'ms') { + // 我的拼团 + app.globalData.skipUrl = '/pages/spellGroup/spellGroup?from=myhtml', + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } else if (app.globalData.type == 'dc') { + // 消费卡 + app.globalData.skipUrl = '/pages/discountCardList/discountCardList', + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } else if (app.globalData.type == 'td') { + // 专题活动页 + app.globalData.skipUrl = '/pages/topicDetail/index', + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } else if (app.globalData.type == 'ml') { + // 门店 + app.globalData.skipUrl = '/index/searchbar', + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } else if (that.data.fromflag == 'confirmation' && that.data.confirmationFlag) { + //订单确认 confirmation + app.globalData.skipUrl = `/pages/coupon/confirmation/confirmation?couponChannelId=${that.data.confirmationFlag}`, + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } else if (that.data.fromflag == 'coupondetail' && that.data.couponChannelIdflag) { + app.globalData.skipUrl = `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelIdflag}`, + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } else if (that.data.fromflag == 'spellcoupondetail' && that.data.couponChannelIdflag) { + app.globalData.skipUrl = `/pages/spellGroup/mySpellGroup/index?couponChannelId=${that.data.couponChannelIdflag}`, + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } else if (that.data.fromflag == 'fillIndent' && that.data.fillIndentId && that.data.couponId) { + //线上配送 填写订单 + app.globalData.skipUrl = `/pages/fillIndent/fillIndent?id=${that.data.fillIndentId}&couponId=${that.data.couponId}`, + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } else { + app.globalData.skipUrl = app.globalData.goHomeUrl, + app.globalData.skip = 'redirectTo' + that.judgePhonelngo() + } } - } - }) + }) .catch(err => { tt.showToast({ title: err.code, @@ -489,8 +502,8 @@ Page({ mask: false }); }) - - }).catch(err=>{ + + }).catch(err => { console.log(err); tt.showModal({ title: '提示', @@ -508,11 +521,11 @@ Page({ } }); }) - + }), - + }); - + }, @@ -524,16 +537,16 @@ Page({ getGameOne: function (token, id) { let _this = this; Http.get({ - url: config.api.getOneGame, - data: { - token: token, - id: id - } - }).then(res => { - tt.redirectTo({ - url: '/pages/game/index?url=' + res.data.url + "&id=" + res.data.id + "&gameId=" + res.data.gameId, + url: config.api.getOneGame, + data: { + token: token, + id: id + } + }).then(res => { + tt.redirectTo({ + url: '/pages/game/index?url=' + res.data.url + "&id=" + res.data.id + "&gameId=" + res.data.gameId, + }) }) - }) .catch(err => { tt.showModal({ title: '提示', diff --git a/pages/liveLsit/liveLsit.js b/pages/liveLsit/liveLsit.js index de23f79..e149408 100644 --- a/pages/liveLsit/liveLsit.js +++ b/pages/liveLsit/liveLsit.js @@ -3,7 +3,9 @@ const util = require("../../utils/util.js"); const Http = require("../../utils/HttpBasics"); const config = require("../../config/config"); const imgurl = require("../../utils/imgurl"); -const { alipay } = require("../../utils/imgurl"); +const { + alipay +} = require("../../utils/imgurl"); let app = getApp(); Page({ data: { @@ -12,16 +14,16 @@ Page({ noDataFlag: false, businePageNum: 1, businessData: null, - Lsit:[], + Lsit: [], }, - goOrder(){ + goOrder() { tt.navigateTo({ url: '/pages/order/index/index', success: (res) => { - + }, fail: (res) => { - + }, }); }, @@ -60,8 +62,8 @@ Page({ let data = res.data.list data.map(item => { tempArr.push(item.id) - - item.discount = (((item.salePriceStr*1)/(item.priceStr*1))*10).toFixed(1) + + item.discount = (((item.salePriceStr * 1) / (item.priceStr * 1)) * 10).toFixed(1) }) if (this.data.businePageNum > 1) { this.setData({ @@ -122,7 +124,7 @@ Page({ let data = res.data.list data.map(item => { tempArr.push(item.id) - item.discount = (((item.salePriceStr*1)/(item.priceStr*1))*10).toFixed(1) + item.discount = (((item.salePriceStr * 1) / (item.priceStr * 1)) * 10).toFixed(1) }) if (this.data.businePageNum > 1) { this.setData({ @@ -210,7 +212,8 @@ Page({ }) }, onLoad: function (options) { - app.globalData.ifCongPh = 1//固定写法 放在指定要手机号授权框出现 + //固定写法 放在指定要手机号授权框出现 + // app.globalData.ifCongPh = 1 this.getCouponChannelList() }, onReachBottom: function () { @@ -219,7 +222,7 @@ Page({ that.setData({ businePageNum: that.data.businePageNum + 1 }); - console.log("加载更多页数" + that.data.page,); + console.log("加载更多页数" + that.data.page, ); console.log("加载更多key" + that.data.code); this.getCouponChannelList(0) }, diff --git a/project.config.json b/project.config.json index 741352c..53ef8c6 100644 --- a/project.config.json +++ b/project.config.json @@ -1,24 +1,24 @@ { - "setting": { - "urlCheck": true, - "es6": true, - "newFeature": false, - "postcss": false, - "mockUpdate": true, - "minified": false, - "autoPush": false, - "scripts": false, - "mockLogin": false, - "autoCompile": true, - "localPlugins": false, - "IDEPreviewHotRestartCache": false - }, - "appid": "ttde7ca8c141425a2301", - "projectname": "tt富茂C", - "condition": { - "miniprogram": { - "current": -1, - "list": [] + "setting": { + "urlCheck": false, + "es6": true, + "newFeature": false, + "postcss": false, + "mockUpdate": true, + "minified": false, + "autoPush": false, + "scripts": false, + "mockLogin": false, + "autoCompile": true, + "localPlugins": false, + "IDEPreviewHotRestartCache": false + }, + "appid": "ttde7ca8c141425a2301", + "projectname": "tt富茂C", + "condition": { + "miniprogram": { + "current": -1, + "list": [] + } } - } }