diff --git a/app.json b/app.json index 2e27020..0c617c1 100644 --- a/app.json +++ b/app.json @@ -63,6 +63,22 @@ "pages/integralmall/index", "pages/mallInfo/mallInfo" ], + "plugins": { + "live-player-plugin": { + "version": "1.0.13", + "provider": "wx2b03c6e691cd7370" + } + }, + "subpackages": [ + { + "root": "pages2", + "name": "pages2", + "independent": false, + "pages": [ + "live/livelist/index" + ] + } + ], "navigateToMiniProgramAppIdList": [ "wx192b7d2e8dcbefd0", "wxc07f9d67923d676d", diff --git a/app.wxss b/app.wxss index 5f45f48..a46838f 100644 --- a/app.wxss +++ b/app.wxss @@ -108,8 +108,10 @@ text { } page { width: 100%; - height: 100%; + min-height: 100vh; font-weight: 400; + padding-bottom: 160rpx; + background: #F4F5F9; } .fl{ float: left; diff --git a/ext.json b/ext.json index 0108214..e9fb59c 100644 --- a/ext.json +++ b/ext.json @@ -26,12 +26,6 @@ "weappId": "wx649b3be73c1afe47", "appVersion": "C.test.5.2.0" }, - "plugins": { - "live-player-plugin": { - "version": "1.0.11", - "provider": "wx2b03c6e691cd7370" - } - }, "debug": false, "tabBar": { "list": [ diff --git a/index/index.js b/index/index.js index a2170a4..29f0198 100644 --- a/index/index.js +++ b/index/index.js @@ -81,6 +81,11 @@ Page({ showGg: false, ggdata: {} }, + goLive(){ + wx.navigateTo({ + url: '/pages2/live/livelist/index', + }) + }, alphaClick1: function(even) { var animation = wx.createAnimation({}) animation.opacity(0).step({ diff --git a/index/index.wxml b/index/index.wxml index 82c9973..d6bb342 100644 --- a/index/index.wxml +++ b/index/index.wxml @@ -43,6 +43,10 @@ 消费卡 + + + 直播 + 游戏频道 diff --git a/index/user.js b/index/user.js index 184a3be..6cbfc29 100644 --- a/index/user.js +++ b/index/user.js @@ -95,8 +95,8 @@ Page({ onLoad() { this.getLocation(); this.updateScene(); - this.getRoomId(); - this.getRoomList(); + // this.getRoomId(); + // this.getRoomList(); console.log(wx.getExtConfigSync()) }, //获取房间列表 diff --git a/index/user.wxml b/index/user.wxml index 05e94fa..789cb1f 100644 --- a/index/user.wxml +++ b/index/user.wxml @@ -55,7 +55,7 @@ - + 直播 diff --git a/pages/main/index.js b/pages/main/index.js new file mode 100644 index 0000000..660e35f --- /dev/null +++ b/pages/main/index.js @@ -0,0 +1,537 @@ +const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} +const Http = require("../../utils/HttpBasics"); +const imgurl = require("../../utils/imgurl"); +const config = require("../../config/config"); +let app = getApp(); +Page({ + /** + * 页面的初始数据 + */ + data: {}, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function(options) { + let that = this; + console.log(options); + wx.showToast({ + title: '加载中', + icon: "loading", + duration: 2000 + }) + /** + * 根据接收到的参数的值,判断跳转到哪个页面 + */ + if (options && options.type) { + app.globalData.type = options.type; + } + if (decodeURIComponent(options.scene) == "undefined") { + that.setData({ + scene: 0 + }) + app.globalData.scene = 0; + } else { + that.setData({ + scene: decodeURIComponent(options.scene) + }); + app.globalData.scene = decodeURIComponent(options.scene) + that.setData({ + newArr: this.data.scene.split(':') + }) + + //// 大屏-二维码-start + if (this.data.newArr[0] == 'JC') { + // 跳转券详情 + options.couponChannelId = this.data.newArr[1]; + } else if (this.data.newArr[0] == 'JG') { + // 跳转拼团详情 + options.couponChannelId = this.data.newArr[1]; + options.path = 'daping' + } else if (this.data.newArr[0] == 't') { + // 普通二维码 + options.type = this.data.newArr[1]; + app.globalData.type = options.type; + if (options.type == 'cd') { + options.couponChannelId = this.data.newArr[2]; + } else if (options.type == 'bd') { + options.bt = this.data.newArr[2]; + options.id = this.data.newArr[3]; + } else if (options.type == 'gm') { + options.id = this.data.newArr[2]; + } else if (options.type == 'sd') { + options.couponChannelId = this.data.newArr[2]; + } else if (options.type == 'td') { + // 专题活动页 + options.id = this.data.newArr[2]; + } else if (options.type == 'md') { + // 门店详情 + options.id = this.data.newArr[2]; + } else if (options.type == 'ra') { + //活动详情 + options.id = this.data.newArr[2]; + } else if (options.type == 'si') { + //活动签到 + options.id = this.data.newArr[2]; + } + } + } + + wx.setStorageSync('options', JSON.stringify(options)) + wx.setStorageSync('imgurl', imgurl); + + if (app.globalData.token) { + this.updateUserInfo(); + if (options.couponChannelId || options.orderId || options.id) { + that.userStatus(options); + } else { + that.userStatus(); + } + } else { + // 由于 token 是网络请求,可能会在 Page.onLoad 之后才返回 + // 所以此处加入 callback 以防止这种情况 + app.tokenCallback = token => { + this.updateUserInfo(); + if (options.couponChannelId || options.orderId || options.id) { + that.userStatus(options); + } else { + that.userStatus(); + } + } + } + }, + + /** + * 检查用户的状态 + */ + userStatus: function(options) { + var that = this; + if (options && (options.couponChannelId || options.orderId || options.id)) { + that.checkuserstatus(options); + } else { + that.checkuserstatus(); + } + }, + /** + * 获取手机信息 + */ + updateUserInfo() { + wx.getSystemInfo({ + success: function (res) { + Http.post({ + url: config.api.updateUserInfo, + data: { + systemInfo: JSON.stringify(res) + } + }).then(res => { + console.log(res) + }) + } + }) + }, + checkuserstatus(options) { + let that = this; + + Http.get({ + url: config.api.checkUserStatus, + data: { + token: app.globalData.token + } + }) + .then(res => { + // res = JSON.parse('{"code":11004,"message":"用户昵称未授权,请跳转到用户昵称授权页!","data":{}}') + //参与拼团 + if (options && options.orderGroupId) { + wx.redirectTo({ + url: `/pages/joinFrDpell/index?couponId=${options.couponId}&orderGroupId=${options.orderGroupId}&couponChannelId=${options.couponChannelId}&orderId=${options.orderId}&avatarUrl=${options.avatarUrl}&nickName=${options.nickName}` + }) + } + //来自大屏的跳转拼团券详情 + else if (options && options.couponChannelId && options.path == 'daping') { + /** + * 主要是为了拿couponId + */ + Http.get({ + url: config.api.couponDetail, + data: { + couponChannelId: options.couponChannelId + } + }).then(res => { + let data = res.data; + wx.redirectTo({ + url: `/pages/spellGroup/mySpellGroup/index?couponChannelId=${options.couponChannelId}&couponId=${data.couponId}` + }) + }) + } else if (options && options.couponChannelId && !options.spellGroup && app.globalData.type != 'sd') { + // 转赠判断 + if (options.cuserId) { + wx.redirectTo({ + url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}&cuserId=${options.cuserId}&coverImg=${options.coverImg}&userName=${options.userName}&avatarUrl=${options.avatarUrl}&couponOrderId=${options.couponOrderId}&updateDate=${options.updateDate}`, + }) + } else { + // 跳转普通券/消费卡/限时秒杀/砍价详情 + wx.redirectTo({ + url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}`, + }) + } + } + // 拼团详情页(只有通过扫码进入才可能进入拼团详情页面,只有这一个入口) + else if ((options && options.couponChannelId && app.globalData.type == 'sd') || (options && options.couponChannelId && options.spellGroup)) { + wx.redirectTo({ + url: `/pages/spellGroup/mySpellGroup/index?couponChannelId=${options.couponChannelId}`, + }) + } + // 游戏页面 + else if (options && options.id && app.globalData.type == 'gm') { + that.getGameOne(app.globalData.token, options.id) + } + // 报名活动页面 + else if (options && options.id && app.globalData.type == 'ra') { + wx.redirectTo({ + url: `/pages/radetail/index?id=${options.id}`, + }) + } + //活动签到 + else if (options && options.id && app.globalData.type == 'si') { + wx.redirectTo({ + url: `/pages/acSignIn/index?id=${options.id}`, + }) + } + // 宣传页详情 + else if (options && options.bt && options.id && app.globalData.type == 'bd') { + if (options.bt == '2') { + // 自由图文 + wx.redirectTo({ + url: `/pages/freeBannerDetail/index?id=${options.id}`, + }) + } else { + // 标准格式 + wx.redirectTo({ + url: `/pages/bannerdetail/index?id=${options.id}`, + }) + } + } + // 专题 + else if (options && options.id && app.globalData.type == 'td') { + wx.redirectTo({ + url: `/pages/topicDetail/index?id=${options.id}` + }); + } + // 门店详情 + else if (options && options.id && app.globalData.type == 'md') { + wx.redirectTo({ + url: `/pages/index/searchbar/detail/index?id=${options.id}` + }); + } + // 参与砍价 + else if (options && options.orderId) { + wx.redirectTo({ + url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${options.orderId}&from=${"discount"}`, + }) + } + // 我的 + else if (app.globalData.type == 'uc') { + wx.switchTab({ + url: '/index/user' + }); + } + // 积分 + else if (app.globalData.type == 'jf') { + wx.redirectTo({ + url: '/pages/integralmall/index' + }); + } + // 首页 + else if (app.globalData.type == 'in') { + wx.switchTab({ + url: '/index/index' + }); + } + // 停车 + else if (app.globalData.type == 'pc') { + // 停车 + wx.switchTab({ + url: '/index/passCar' + }); + } + // 我的券包 + else if (app.globalData.type == 'mc') { + // 我的券包 + wx.redirectTo({ + url: '/pages/couponorder/index/index' + }); + } + // 我的订单 + else if (app.globalData.type == 'mo') { + // 我的订单 + wx.redirectTo({ + url: '/pages/order/index/index?id=all' + }); + } + // 我的卡包 + else if (app.globalData.type == 'ca') { + // 我的卡包 + wx.redirectTo({ + url: '/pages/cardorder/index/index' + }); + } + // 特享礼遇 + else if (app.globalData.type == 'sc') { + // 特享礼遇 + wx.redirectTo({ + url: '/pages/specialcourtesy/specialcourtesy' + }); + } + // 限时秒杀 + else if (app.globalData.type == 'rb') { + // 限时秒杀 + wx.redirectTo({ + url: '/pages/rushToBuy/index' + }) + } + // 砍价专场 + else if (app.globalData.type == 'bl') { + // 砍价专场 + wx.redirectTo({ + url: '/pages/bargain/bargain' + }) + } + // 我的砍价 + else if (app.globalData.type == 'mb') { + // 我的砍价 + wx.redirectTo({ + url: '/pages/bargain/bargain?from=myhtml' + }) + } + // 拼团专场 + else if (app.globalData.type == 'sl') { + // 拼团专场 + wx.redirectTo({ + url: '/pages/spellGroup/spellGroup' + }) + } + // 我的拼团 + else if (app.globalData.type == 'ms') { + // 我的拼团 + wx.redirectTo({ + url: '/pages/spellGroup/spellGroup?from=myhtml' + }) + } + // 消费卡 + else if (app.globalData.type == 'dc') { + // 消费卡 + wx.redirectTo({ + url: '/pages/discountCardList/discountCardList' + }) + } + // 门店 + else if (app.globalData.type == 'ml') { + wx.switchTab({ + url: '/index/searchbar' + }) + } + // 兑换 + else if (app.globalData.type == 'ec') { + wx.redirectTo({ + url: '/pages/exchange/exchange' + }) + } + // 通过分享进入的门店详情 + else if (options && options.id && options.frommd == 'md') { + wx.redirectTo({ + url: `/pages/index/searchbar/detail/index?id=${options.id}` + }); + } else { + // 主页 + wx.switchTab({ + url: '/index/index' + }) + } + }) + .catch(err => { + console.log(err) + if (err.code == 11004) { + // 用户昵称未授权 + if (options && options.orderGroupId) { + wx.redirectTo({ + url: `/pages/getuserinfo/index?couponId=${options.couponId}&orderGroupId=${options.orderGroupId}&couponChannelId=${options.couponChannelId}&orderId=${options.orderId}&avatarUrl=${options.avatarUrl}&nickName=${options.nickName}` + }) + } + /** + * spellGroup + * 区分是通过拼团详情分享过来的还是从普通券分享过来的 + * 注意:拼团券和普通券是两个页面 + */ + if (options && options.couponChannelId && !options.cuserId && !options.spellGroup) { + wx.redirectTo({ + url: `/pages/getuserinfo/index?couponChannelId=${options.couponChannelId}` + }) + } else if (options && options.couponChannelId && !options.cuserId && options.spellGroup) { + wx.redirectTo({ + url: `/pages/getuserinfo/index?couponChannelId=${options.couponChannelId}&spellGroup=${options.spellGroup}` + }) + } else if (options && options.couponChannelId && options.cuserId) { + /** + * 转赠判断 + */ + wx.redirectTo({ + url: `/pages/getuserinfo/index?couponChannelId=${options.couponChannelId}&cuserId=${options.cuserId}&coverImg=${options.coverImg}&userName=${options.userName}&avatarUrl=${options.avatarUrl}&couponOrderId=${options.couponOrderId}&updateDate=${options.updateDate}` + }) + } else if (options && options.orderId) { + wx.redirectTo({ + url: `/pages/getuserinfo/index?orderId=${options.orderId}&from='${"discount"}` + }) + } + // 通过分享进入的门店详情 + else if (options && options.id && options.frommd == 'md') { + wx.redirectTo({ + url: `/pages/getuserinfo/index?id=${options.id}&frommd=md` + }); + }// 门店详情 + else if (options && options.id && app.globalData.type == 'md') { + wx.redirectTo({ + url: `/pages/index/searchbar/detail/index?id=${options.id}` + }); + } else if (app.globalData.type == 'uc') { + wx.switchTab({ + url: '/index/user' + }); + } + // 积分 + else if (app.globalData.type == 'jf') { + wx.redirectTo({ + url: '/pages/integralmall/index' + }); + } + // 首页 + else if (app.globalData.type == 'in') { + wx.switchTab({ + url: '/index/index' + }); + } + // 停车 + else if (app.globalData.type == 'pc') { + // 停车 + wx.switchTab({ + url: '/index/passCar' + }); + } + // 我的券包 + else if (app.globalData.type == 'mc') { + // 我的券包 + wx.redirectTo({ + url: '/pages/couponorder/index/index' + }); + } + // 我的订单 + else if (app.globalData.type == 'mo') { + // 我的订单 + wx.redirectTo({ + url: '/pages/order/index/index?id=all' + }); + } + // 我的卡包 + else if (app.globalData.type == 'ca') { + // 我的卡包 + wx.redirectTo({ + url: '/pages/cardorder/index/index' + }); + } + // 特享礼遇 + else if (app.globalData.type == 'sc') { + // 特享礼遇 + wx.redirectTo({ + url: '/pages/specialcourtesy/specialcourtesy' + }); + } + // 限时秒杀 + else if (app.globalData.type == 'rb') { + // 限时秒杀 + wx.redirectTo({ + url: '/pages/rushToBuy/index' + }) + } + // 砍价专场 + else if (app.globalData.type == 'bl') { + // 砍价专场 + wx.redirectTo({ + url: '/pages/bargain/bargain' + }) + } + // 我的砍价 + else if (app.globalData.type == 'mb') { + // 我的砍价 + wx.redirectTo({ + url: '/pages/bargain/bargain?from=myhtml' + }) + } + // 拼团专场 + else if (app.globalData.type == 'sl') { + // 拼团专场 + wx.redirectTo({ + url: '/pages/spellGroup/spellGroup' + }) + } + // 我的拼团 + else if (app.globalData.type == 'ms') { + wx.redirectTo({ + url: '/pages/spellGroup/spellGroup?from=myhtml' + }) + } + // 消费卡 + else if (app.globalData.type == 'dc') { + // 消费卡 + wx.redirectTo({ + url: '/pages/discountCardList/discountCardList' + }) + } + // 兑换 + else if (app.globalData.type == 'ec') { + wx.redirectTo({ + url: '/pages/exchange/exchange' + }) + } + // 门店 + else if (app.globalData.type == 'ml') { + wx.switchTab({ + url: '/index/searchbar' + }) + } else { + wx.switchTab({ + url: '/index/index', + }) + } + } + }) + }, + + getGameOne: function(token, id) { + let _this = this; + Http.get({ + url: config.api.getOneGame, + data: { + token: token, + id: id + } + }).then(res => { + wx.redirectTo({ + url: '/pages/game/index?url=' + res.data.url + "&id=" + res.data.id + "&gameId=" + res.data.gameId, + }) + }) + .catch(err => { + wx.showModal({ + title: '提示', + content: err.message, + showCancel: false, + success: function(res) { + // 如果游戏下架或者找不到,重启首页 + if (res.confirm) { + wx.reLaunch({ + url: '/pages/index/index', + }) + } + } + }) + this.alphaClick(); + }) + }, +}) \ No newline at end of file diff --git a/pages/main/index.json b/pages/main/index.json new file mode 100644 index 0000000..64c01a5 --- /dev/null +++ b/pages/main/index.json @@ -0,0 +1,5 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "首页", + "navigationBarBackgroundColor": "#fff" +} \ No newline at end of file diff --git a/pages/main/index.wxml b/pages/main/index.wxml new file mode 100644 index 0000000..e69de29 diff --git a/pages/main/index.wxss b/pages/main/index.wxss new file mode 100644 index 0000000..f859af0 --- /dev/null +++ b/pages/main/index.wxss @@ -0,0 +1,6 @@ +Page{ + height: 100%; + width: 100%; + background:#fff; + opacity: 0; +} diff --git a/pages2/live/livelist/index.js b/pages2/live/livelist/index.js new file mode 100644 index 0000000..bd8aa6f --- /dev/null +++ b/pages2/live/livelist/index.js @@ -0,0 +1,155 @@ +const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' +let config = require("../../../config/config.js"); +let Http = require("../../../utils/HttpBasics"); +const util = require("../../../utils/util"); +let app = getApp(); +const imgurl = require("../../../utils/imgurl"); +const format = require("../../../utils/util.js"); +Page({ + data: { + navigationBarHeight, + noOrdersUrl: imgurl.noOrders.url, + loadingUrl: imgurl.loading.url, + wmhome: imgurl.wmhome.url, + wmdiscount: imgurl.wmdiscount.url, + wmgive: imgurl.wmgive.url, + tabs: [{ + key: "all", + name: "全部" + }, + { + key: 0, + name: "待付款" + }, + { + key: 1, + name: "已完成" + } + ], + liveStatusList:[ + { + name:'直播中', + value:101 + }, + { + name:'未开始', + value:102 + }, + { + name:'已结束', + value:103 + }, + { + name:'禁播', + value:104 + }, + { + name:' 暂停中', + value:105 + }, + { + name:' 异常', + value:106 + }, + { + name:'已过期', + value:107 + }, + ], + list: [], + current: "", + loading: true, //"上拉加载"的变量,默认false,隐藏 + current_scroll: "1", + allow_load: true, + page: 1, + content: "", + roomInfos:[], + customParams:'' + }, + onLoad(e) { + // this.getList(e.id, 1); + this.getRoomList(1); + let customParams = encodeURIComponent(JSON.stringify({ path: 'pages/index/index', pid: 1 })) + this.setData({ + customParams + }) + }, + goDetail(e){ + console.log(e.currentTarget.dataset.data) + let customParams = encodeURIComponent(JSON.stringify({ path: '/pages2live/livelist/index', pid: e.currentTarget.dataset.data.roomid })) // 开发者在直播间页面路径上携带自定义参数(如示例中的path和pid参数),后续可以在分享卡片链接和跳转至商详页时获取,详见【获取自定义参数】、【直播间到商详页面携带参数】章节(上限600个字符,超过部分会被截断) + wx.navigateTo({ + url: `plugin-private://wx2b03c6e691cd7370/pages2/live-player-plugin?room_id=${e.currentTarget.dataset.data.roomid}&type=10&custom_params=${customParams}`, + }) + }, + //获取房间列表 + getRoomList(pageNum){ + let that=this; + if (this.data.allow_load) { + this.setData({ + loading: true, + content: '小主,我在玩命加载中...' + }) + Http.get({ + url: config.api.getRoomList, + data: { + start:pageNum*5-5, + limit:5, + token: app.globalData.token, + appId:config.weapp.AppId + } + }).then(res => { + console.log(res) + this.setData({ + loading: false, + }) + res.data.roomInfos.map((item,index)=>{ + item.startTimeStr = format.formatTime( + item.startTime, + "MM-dd hh:mm" + ); + item.endTimeStr = format.formatTime( + item.endTime, + "MM-dd hh:mm" + ); + this.data.liveStatusList.map((item02,index02)=>{ + if(item.liveStatus==item02.value){ + item.statusName=item02.name + } + }) + }) + var tmpArr = this.data.roomInfos; + tmpArr.push.apply(tmpArr, res.data.roomInfos); + if(tmpArr.length==res.data.total){ + this.setData({ + allow_load:false + }) + } + this.setData({ + roomInfos:tmpArr + }) + }).catch(err=>{ + that.setData({ + loading: false, + }) + }) + }else{ + this.setData({ + loading: true, + content: "——— 再拉裤子就掉了啦 ———" + }) + setTimeout(function () { + that.setData({ + loading: false, + }) + }, 1400) + } + }, + onReachBottom: function () { + var that = this; + that.data.page++; + that.setData({ + page: that.data.page + }); + this.getRoomList(that.data.page); + } +}); \ No newline at end of file diff --git a/pages2/live/livelist/index.json b/pages2/live/livelist/index.json new file mode 100644 index 0000000..6a4b956 --- /dev/null +++ b/pages2/live/livelist/index.json @@ -0,0 +1,9 @@ +{ + "usingComponents": { + "i-tab": "../../../dist/tab/index", + "i-tabs": "../../../dist/tabs/index", + "navbar": "../../../components/navbar/navbar" + }, + "navigationBarTitleText": "我的订单", + "navigationBarBackgroundColor": "#F4F5F9" +} \ No newline at end of file diff --git a/pages2/live/livelist/index.wxml b/pages2/live/livelist/index.wxml new file mode 100644 index 0000000..701a302 --- /dev/null +++ b/pages2/live/livelist/index.wxml @@ -0,0 +1,47 @@ + + + + + + + + + + {{item.name}} + {{item.statusName}} + {{item.statusName}} + {{item.statusName}} + + + + + + 主播:{{item.anchorName}} + + 商品:{{index02==(item.goods.length-1)?professionitem.name:(professionitem.name+',')}} + + + + 开始时间:{{item.startTimeStr}} + 结束时间:{{item.endTimeStr}} + + + + + + + 加载中... + 再忙,也要记得买点什么犒赏自己~ + + + + 未找到相关直播信息 + 换个频道寻找乐趣吧! + + + + {{content}} + + \ No newline at end of file diff --git a/pages2/live/livelist/index.wxss b/pages2/live/livelist/index.wxss new file mode 100644 index 0000000..34f4bce --- /dev/null +++ b/pages2/live/livelist/index.wxss @@ -0,0 +1,342 @@ +.market { + width: 100%; + height: 100%; + background: #F4F5F9; + margin-top: 20rpx; + } + .tabs { + position: fixed; + width: 100% !important; + height: 96rpx; + /* top: 0; */ + left: 0; + right: 0; + text-align: center; + z-index: 10000000; + font-size: 26rpx; + background: #FFF; + } + + .i-tab { + width: 30% !important; + display: inline-block; + } + .section{ + background: #FFFFFF; + width: 680rpx; + margin: 10rpx auto; + border-radius: 10rpx; + } + .detail_msg { + position: relative; + width: 92%; + background: #fff; + display: flex; + margin: 0 30rpx; + padding-bottom: 20rpx; + padding-top: 20rpx; + border-bottom: 1rpx solid #eee; + } + .sendImg{ + position: absolute; + width: 100rpx; + top: 100rpx; + right: 6rpx; + } + + .logo { + display: block; + width: 300rpx; + height: 183rpx; + border: 1px solid #f8f8f8; + border-radius: 20rpx; + } + + .logo image { + display: block; + width: 300rpx; + height: 183rpx; + border-radius: 20rpx; + } + .detail_top{ + width: 100%; + height: 40rpx; + line-height: 40rpx; + font-size: 30rpx; + padding-top: 30rpx; + } + .detail_top view:nth-child(1) { + display: flex; + justify-content: space-between; + padding: 0 4% 0 4%; + } + + .info { + width: 100%; + } + + .sub { + font-size: 24rpx !important; + color: #919191 !important; + letter-spacing: 0; + line-height: 33rpx; + padding-left: 4%; + height: 33rpx; + overflow: hidden; + white-space: wrap; + text-overflow: ellipsis; + } + + .info view:nth-child(1) text { + display: inline-block; + width: 300rpx; + font-size: 30rpx; + letter-spacing: 0; + height: 42rpx; + overflow: hidden; + line-height: 42rpx; + white-space: nowrap; + text-overflow: ellipsis; + } + .discount{ + position: absolute; + width: 100rpx; + top:86rpx; + right:2rpx; + } + .detail_top .sucess { + display: inline-block; + width: 123rpx !important; + /* overflow: hidden; */ + font-family:PingFangSC-Regular; + font-size: 28rpx; + font-weight:400; + color: #2C8DFF; + letter-spacing: 0; + text-align: right; + line-height: 26px; + } + + .wait { + display: inline-block; + width: 123rpx !important; + overflow: visible!important; + font-size: 28rpx; + color: #999; + letter-spacing: 0; + text-align: right; + line-height: 28rpx!important; + } + .wait01{ + display: inline-block; + width: 123rpx !important; + overflow: visible!important; + font-size: 28rpx; + color: #ff4949; + letter-spacing: 0; + text-align: right; + line-height: 28rpx!important; + } + .wait02{ + display: inline-block; + width: 123rpx !important; + overflow: visible!important; + font-size: 28rpx; + color: #2C8DFF; + letter-spacing: 0; + text-align: right; + line-height: 28rpx!important; + } + .close { + display: inline-block; + width: 123rpx !important; + overflow: hidden; + font-size: 28rpx; + color: #999; + letter-spacing: 0; + text-align: right; + line-height: 28rpx; + } + + /* + .info view:nth-child(2), + .info view:nth-child(3), + .info view:nth-child(4) { + color: #333; + font-size: 24rpx; + + } */ + + .value { + font-size: 24rpx; + color: #999; + letter-spacing: 0; + padding-left: 4%; + line-height: 33rpx; + } + + .value text { + font-size: 24rpx; + color: #333; + letter-spacing: 0; + line-height: 33rpx; + } + + .info view:nth-child(3) { + margin-top: 16rpx; + } + .info view:nth-child(2) { + margin-top: 16rpx; + } + .payment { + position: relative; + width: 92%; + height: 80rpx; + line-height: 88rpx; + padding: 0 4%; + display: flex; + justify-content: space-between; + border-bottom: 8rpx solid #eee; + } + + .payment view:nth-child(1) text:nth-child(1) { + font-size: 24rpx; + color: #1f2d3d; + letter-spacing: 0; + } + + .payment view:nth-child(1) text:nth-child(2) { + font-size: 28rpx; + color: #ff4949; + letter-spacing: 0; + margin-left: 10rpx; + } + + .payment view:nth-child(1) text:nth-child(3) { + font-size: 24rpx; + color: #b4b4b4; + padding-left: 18rpx; + text-decoration: line-through; + } + + .btn { + position: absolute; + top: 0; + bottom: 0; + margin: auto; + right: 20rpx; + width: 118rpx; + height: 52rpx; + line-height: 52rpx; + text-align: center; + color: #fff; + float: right; + font-size: 26rpx; + border-radius: 20rpx; + background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%); + } + .btnZf{ + position: absolute; + top: 0; + bottom: 0; + margin: auto; + right: 20rpx; + width: 118rpx; + height: 52rpx; + line-height: 52rpx; + text-align: center; + color: #fff; + float: right; + font-size: 26rpx; + border-radius: 20rpx; + background:linear-gradient(130deg,rgba(50,177,252,1) 0%,rgba(47,108,255,1) 100%); + } + .btnGm{ + position: absolute; + top: 0; + bottom: 0; + margin: auto; + right: 20rpx; + width: 118rpx; + height: 52rpx; + line-height: 52rpx; + text-align: center; + color: #fff; + float: right; + font-size: 28rpx; + border: 2rpx solid #2C8DFF; + border-radius: 30rpx; + } + + .payment view:nth-child(2) text { + font-size: 26rpx; + color: #FFFFFF; + } + .txGm{ + font-size: 26rpx!important; + color: #2C8DFF!important; + } + .dingdan { + margin-top: 33rpx; + } + + .dingdan text:nth-of-type(1) { + display: block; + font-size: 34rpx; + color: #333; + letter-spacing: 0; + text-align: center; + } + + .dingdan text:nth-of-type(2) { + display: block; + font-size: 28rpx; + color: #999; + letter-spacing: 0; + text-align: center; + } + + .dingdan image { + display: block; + width: 300rpx; + height: 300rpx; + margin: 0 auto 16rpx; + } + + .loading { + text-align: center; + height: 80rpx; + line-height: 80rpx; + font-size: 26rpx; + color: #999; + } + + .loading image { + width: 60rpx; + height: 60rpx; + vertical-align: middle; + margin-right: 10rpx; + } + button::after{ border: none; } + .goback{ + position: fixed; + right: 50rpx; + bottom: 60rpx; + width:100rpx!important; + height:100rpx; + z-index: 100; + background:rgba(255,255,255,1); + line-height: 95rpx; + border:1rpx solid rgba(227,227,227,1); + border-radius:50%; + } + .goback image{ + position: absolute; + width: 60rpx; + left: 0; + right: 0; + top: 0; + bottom: 0; + margin: auto; + } + \ No newline at end of file diff --git a/project.config.json b/project.config.json index 68522de..7b80f69 100644 --- a/project.config.json +++ b/project.config.json @@ -7,6 +7,7 @@ "urlCheck": false, "es6": true, "postcss": true, + "preloadBackgroundData": false, "minified": true, "newFeature": true, "coverView": true, @@ -59,6 +60,35 @@ "id": -1, "name": "pages/bargain/bargainDatail/bargainDatail", "pathName": "pages/bargain/bargainDatail/bargainDatail", + "query": "", + "scene": null + }, + { + "id": -1, + "name": "直播列表", + "pathName": "pages2/live/livelist/index", + "query": "", + "scene": null + }, + { + "id": -1, + "name": "我的", + "pathName": "index/user", + "query": "", + "scene": null + }, + { + "id": -1, + "name": "pages2/live/livelist/index", + "pathName": "pages/index/index", + "query": "type=cd&couponChannelId=426712984674504704", + "scene": null + }, + { + "id": -1, + "name": "券详情", + "pathName": "pages/index/index", + "query": "type=cd&couponChannelId=420885883373359104", "scene": null } ]