diff --git a/pages/index/index.js b/pages/index/index.js index 0822603..3b1389f 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -83,11 +83,9 @@ Page({ }, doSaveUserInfo() { try { - console.log('保存') var names = wx.getStorageSync('name') var icon = wx.getStorageSync('userIcon') var _self = this - console.log(names) if (names) { app.http.put(app.urls.doSaveUserInfo, { header: { @@ -99,7 +97,6 @@ Page({ } }) .then(res => { - console.log(res) }) .catch(err => { console.log(err) @@ -111,7 +108,6 @@ Page({ }, //获取首页展示的栏目 getMainColumn(id) { - console.log(id) var _self = this _self.setData({ dataList: [] @@ -359,7 +355,6 @@ Page({ const ix = e.currentTarget.dataset.i const a = e.currentTarget.dataset.a var audio = e.currentTarget.dataset.item - console.log(_self.data.isPlayAudio) if (_self.data.isPlayAudio) { //有播放的 //先需要停止其他录音文件的播放 @@ -418,7 +413,6 @@ Page({ innerAudioContext.onCanplay((res) => {}) innerAudioContext.onStop((res) => { - console.log('onStop===') _self.data.dataList[index].list[idx].list[ix].valueList[a].isPlay = false _self.data.dataList[index].list[idx].list[ix].valueList[a].curDuration = 0 _self.data.dataList[index].list[idx].list[ix].valueList[a].curDurationStr = '00:00' @@ -428,8 +422,6 @@ Page({ }) }) innerAudioContext.onEnded((res) => { - console.log(res) - console.log('播放完毕') _self.data.dataList[index].list[idx].list[ix].valueList[a].isPlay = false _self.data.dataList[index].list[idx].list[ix].valueList[a].curDuration = 0 _self.data.dataList[index].list[idx].list[ix].valueList[a].curDurationStr = '00:00' @@ -439,8 +431,6 @@ Page({ }) }) innerAudioContext.onError((res) => { - console.log('播放错误') - console.log(res) _self.data.dataList[index].list[idx].list[ix].valueList[a].isPlay = false _self.data.dataList[index].list[idx].list[ix].valueList[a].curDuration = 0 _self.data.dataList[index].list[idx].list[ix].valueList[a].curDurationStr = '00:00' @@ -457,8 +447,11 @@ Page({ // 跳转模板列表 goList: function () { wx.navigateTo({ - url: '/packagecard/cardList/cardList', + url: '/pages/mine/shop/mineshop', }) + // wx.navigateTo({ + // url: '/packagecard/cardList/cardList', + // }) }, // 获取个人简介 getPersonIntro: function () { @@ -595,7 +588,6 @@ Page({ cardTemplateUseTop: "" } }).then(res => { - console.log(res.data) wx.showToast({ title: '加入卡包成功!', }) @@ -802,7 +794,6 @@ Page({ wx.showShareMenu({ withShareTicket: true, success: function (res) { - console.log(res) } }) @@ -931,7 +922,6 @@ Page({ cardTemplateDispatchId: self.data.cardTemplateDispatchId } }).then(res => { - console.log(res) }).catch(res => { console.log(res) }) diff --git a/pages/mine/product/coupon/couponlist.wxml b/pages/mine/product/coupon/couponlist.wxml index 5fc72e7..60e340d 100644 --- a/pages/mine/product/coupon/couponlist.wxml +++ b/pages/mine/product/coupon/couponlist.wxml @@ -5,28 +5,29 @@ refresher-background="#fff" bindrefresherrefresh="dorefresh" refresher-triggered="{{isRefreshing}}"> - + - - {{item.couponName}} + + + + + 全部商品 + + + 限品类 + + {{item.couponName}} - + + {{item.startDate+'-'+item.endDate}} - + 领取当日{{item.expiringDays}}天内有效 - + 领取次日{{item.expiringDays}}天内有效 - - - - 全部商品 - - - 限品类 - @@ -46,7 +47,7 @@ 删除 - 恢复 + 编辑 diff --git a/pages/mine/product/coupon/couponlist.wxss b/pages/mine/product/coupon/couponlist.wxss index d3f5c67..4e5e91b 100644 --- a/pages/mine/product/coupon/couponlist.wxss +++ b/pages/mine/product/coupon/couponlist.wxss @@ -6,28 +6,14 @@ page { .right-box { width: 100%; position: relative; - min-height: 200rpx; + min-height: 140rpx; flex: 3; display: flex; align-items: center; justify-content: center; border-radius: 15rpx 10rpx 10rpx 15rpx; flex-direction: column; -} - -.price { - color: #ffffff; - font-size: 54rpx; -} - -.price-icon { - color: #ffffff; - font-size: 28rpx; -} - -.price-term { - font-size: 20rpx; - color: #ffffff; + padding: 10rpx; } .left-box { @@ -36,21 +22,62 @@ page { background: #ffffff; position: relative; border-radius: 10rpx 15rpx 15rpx 10rpx; - min-height: 200rpx; + min-height: 140rpx; display: flex; align-items: flex-start; flex-direction: column; justify-content: center; + padding: 5rpx 15rpx; } +.price { + color: #ffffff; + font-size: 48rpx; +} + +.price-icon { + color: #ffffff; + font-size: 28rpx; +} + +.price-term { + font-size: 24rpx; + color: #ffffff; +} + + + .btn-box { width: 100%; display: flex; flex-direction: row; justify-content: flex-end; - padding: 10rpx; + padding: 10rpx 20rpx; } .btn { padding: 10rpx 40rpx; +} +.coupon-name{ + font-size: 32rpx; + font-weight: bold; + color: black; +} +.coupon-desc{ + font-size: 24rpx; + color: #797979; +} +.coupon-type-yellow{ + font-size: 24rpx; + color: #ffffff; + background: #ff9800; + padding: 0rpx 10rpx; + border-radius: 5rpx; +} +.coupon-type-blue{ + font-size: 24rpx; + color: #ffffff; + background: #0471ff; + padding: 0rpx 10rpx; + border-radius: 5rpx; } \ No newline at end of file