From d48c75fad4cc174cc9846392cd5bc8398003719e Mon Sep 17 00:00:00 2001 From: anhaogxs <704041637@qq.com> Date: Fri, 23 Apr 2021 09:18:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 2 +- pages/Loading/index.vue | 4 +- pages/shop/GoodsList/index.vue | 209 ++++++--------------------------- 3 files changed, 38 insertions(+), 177 deletions(-) diff --git a/config/index.js b/config/index.js index 728afb9..34018a4 100644 --- a/config/index.js +++ b/config/index.js @@ -5,4 +5,4 @@ export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api'; // export const VUE_APP_API_URL = 'https://tapi.xinxintuan.co/api' // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api'; -export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static' +export const VUE_APP_RESOURCES_URL = 'https://h5.yixiang.co/static' diff --git a/pages/Loading/index.vue b/pages/Loading/index.vue index 91060de..207912f 100644 --- a/pages/Loading/index.vue +++ b/pages/Loading/index.vue @@ -1,7 +1,7 @@ @@ -61,11 +61,11 @@ export default { console.log('loading home') this.changeAuthorization(false) let redirect = cookie.get('redirect').replace(/\ /g, '') + cookie.remove('redirect') if (redirect && redirect.indexOf('/pages') != -1) { this.$yrouter.replace({ path: '/pages' + redirect.split('/pages')[1], }) - cookie.remove('redirect') } else { this.$yrouter.switchTab({ path: '/pages/home/index', diff --git a/pages/shop/GoodsList/index.vue b/pages/shop/GoodsList/index.vue index d36d4f6..e902c4e 100644 --- a/pages/shop/GoodsList/index.vue +++ b/pages/shop/GoodsList/index.vue @@ -26,90 +26,41 @@ 新品 - - - - - - - - - - - {{ item.storeName }} - - - ￥{{ item.price }} - ￥{{ item.otPrice }} - - 已售{{ item.sales }}件 - - - - - - - - - - - - - {{ item.storeName }} - - - ￥{{ item.price }} - ￥{{ item.otPrice }} - - 已售{{ item.sales }}件 - - - - - - - - - - - - - - - - - {{ item.storeName }} - - - {{ item.integral }}积分 - - 已售{{ item.sales }}件 - - - - - - - - - - - - - {{ item.storeName }} - - - {{ item.integral }}积分 - - 已售{{ item.sales }}件 - - - - - - - - + + + + + + + {{ item.storeName }} + + ￥ + {{ item.price }} + + + ￥{{ item.otPrice }} + 已售{{ item.sales }}件 + + + + + + + + + + + {{ item.storeName }} + + {{ item.integral }}积分 + + + + 已售{{ item.sales }}件 + + + + @@ -358,94 +309,4 @@ export default { border-top: 3px solid #f5f5f5; padding-bottom: 1px; } - -.tui-product-list { - display: flex; - box-sizing: border-box; - margin-top: 1.72*100rpx; -} - -.tui-product-container { - display: flex; - flex-direction: row; - flex-wrap: wrap; - flex:1; - justify-content: space-between; - -} - -.tui-product-container:last-child { - margin-right: 0; -} - -.tui-pro-item { - flex: 0 0 49%; - margin-bottom: 10rpx; - background: #fff; - box-sizing: border-box; - border-radius: 12rpx; - overflow: hidden; - transition: all 0.15s ease-in-out; -} - -.tui-flex-list { - flex:1 1 100%; - display: flex; - margin-bottom: 1rpx !important; -} - -.tui-pro-img { - width: 100%; - display: block; -} - -.tui-proimg-list { - width: 260rpx; - height: 260rpx !important; - flex-shrink: 0; - border-radius: 12rpx; -} - -.tui-pro-content { - display: flex; - flex-direction: column; - justify-content: space-between; - box-sizing: border-box; - padding: 20rpx; -} - -.tui-pro-tit { - color: #2e2e2e; - font-size: 26rpx; - word-break: break-all; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 2; -} - -.tui-pro-price { - padding-top: 18rpx; -} - -.tui-sale-price { - font-size: 34rpx; - font-weight: 500; - color: #e41f19; -} - -.tui-factory-price { - font-size: 24rpx; - color: #a0a0a0; - text-decoration: line-through; - padding-left: 12rpx; -} - -.tui-pro-pay { - padding-top: 10rpx; - font-size: 24rpx; - color: #656565; -} -/* 商品列表*/ From 3b76e7754bb984dfd6829003b98c831692e4e9d3 Mon Sep 17 00:00:00 2001 From: anhaogxs <704041637@qq.com> Date: Wed, 12 May 2021 17:21:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=80=92=E8=AE=A1?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=EF=BC=8C=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/CountDown.vue | 170 +++++++++++++------------ pages/activity/BargainRecord/index.vue | 2 +- pages/activity/GroupDetails/index.vue | 2 +- pages/activity/GroupRule/index.vue | 5 +- pages/order/OrderSubmission/index.vue | 9 +- 5 files changed, 98 insertions(+), 90 deletions(-) diff --git a/components/CountDown.vue b/components/CountDown.vue index 33093e0..ca830df 100644 --- a/components/CountDown.vue +++ b/components/CountDown.vue @@ -12,93 +12,101 @@ diff --git a/pages/activity/BargainRecord/index.vue b/pages/activity/BargainRecord/index.vue index c0b6bc8..4991a0b 100644 --- a/pages/activity/BargainRecord/index.vue +++ b/pages/activity/BargainRecord/index.vue @@ -14,7 +14,7 @@ :hourText="' 时 '" :minuteText="' 分 '" :secondText="' 秒'" - :datatime="item.datatime/1000" + :datatime="item.datatime" > 已砍至 diff --git a/pages/activity/GroupDetails/index.vue b/pages/activity/GroupDetails/index.vue index 35d473e..5cfd5c1 100644 --- a/pages/activity/GroupDetails/index.vue +++ b/pages/activity/GroupDetails/index.vue @@ -72,7 +72,7 @@ 人成团 - + 去拼单 diff --git a/pages/activity/GroupRule/index.vue b/pages/activity/GroupRule/index.vue index 6798fea..86e5701 100644 --- a/pages/activity/GroupRule/index.vue +++ b/pages/activity/GroupRule/index.vue @@ -19,8 +19,9 @@ - 拼团失败 + 进行中 拼团成功 + 拼团失败 @@ -30,7 +31,7 @@ 剩余 - + 结束 diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue index 9da39db..ba2aacf 100644 --- a/pages/order/OrderSubmission/index.vue +++ b/pages/order/OrderSubmission/index.vue @@ -306,15 +306,13 @@ export default { useIntegral() { this.computedPrice() }, - $yroute(n) { - if (n.name === NAME) this.getCartInfo() - }, shipping_type() { this.computedPrice() }, }, - onShow: function() { + onLoad: function() { let that = this + console.log('loadddddddd') this.$store.dispatch('getUser', true) that.getCartInfo() console.log(that.$yroute) @@ -402,7 +400,8 @@ export default { this.storeSelfMention = res.data.storeSelfMention this.computedPrice() }) - .catch(() => { + .catch((error) => { + console.log(error) uni.showToast({ title: '加载订单数据失败', icon: 'none', From 183f9fa4c3bab8b54384d55c6ae6bf31f1b7bb8b Mon Sep 17 00:00:00 2001 From: Gaoxs <704041637@qq.com> Date: Sat, 15 May 2021 01:34:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=80=92=E8=AE=A1?= =?UTF-8?q?=E6=97=B6=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/CountDown.vue | 22 +++++++--- pages/activity/DargainDetails/index.vue | 58 ++++++++++++------------- pages/activity/GroupRule/index.vue | 16 +++---- 3 files changed, 50 insertions(+), 46 deletions(-) diff --git a/components/CountDown.vue b/components/CountDown.vue index ca830df..2a235db 100644 --- a/components/CountDown.vue +++ b/components/CountDown.vue @@ -54,28 +54,36 @@ export default { created: function () { this.show_time() }, + watch: { + datatime(val) { + clearInterval(this.timeInterval) + this.time = val + this.show_time() + }, + }, mounted: function () {}, methods: { show_time: function () { let that = this - if (parseInt(this.datatime).length == 13) { + if (parseInt(this.time).length == 13) { // 毫秒级 console.log('毫秒') - this.datatime = this.datatime / 1000 - } else if (parseInt(this.datatime).length == 10) { + this.time = this.time / 1000 + } else if (parseInt(this.time).length == 10) { console.log('秒') // 秒级 } else { // 时间 console.log('时间') - this.datatime = Date.parse(this.datatime) / 1000 + console.log(this.time) + this.time = Date.parse(this.time) / 1000 } + console.log(that.time) function runTime() { - console.log(that.datatime) //时间函数 - let intDiff = that.datatime - Date.parse(new Date()) / 1000 //获取数据中的时间戳的时间差； + let intDiff = that.time - Date.parse(new Date()) / 1000 //获取数据中的时间戳的时间差； let day = 0, hour = 0, minute = 0, @@ -105,7 +113,7 @@ export default { } } runTime() - setInterval(runTime, 1000) + this.timeInterval = setInterval(runTime, 1000) }, }, } diff --git a/pages/activity/DargainDetails/index.vue b/pages/activity/DargainDetails/index.vue index f55180f..c1930d0 100644 --- a/pages/activity/DargainDetails/index.vue +++ b/pages/activity/DargainDetails/index.vue @@ -7,9 +7,9 @@ {{ bargainShare.lookCount }}人查看 丨 {{ bargainShare.shareCount }}人分享 丨 {{ bargainShare.userCount }}人参与 --> - +
- + {{ bargainUserInfo.nickname }} 邀请您帮忙砍价 @@ -18,7 +18,7 @@ -
+
@@ -92,14 +92,14 @@ - + 砍价帮 - + - + @@ -116,18 +116,18 @@ - + 商品详情 - + - + 活动规则 - + @@ -163,7 +163,7 @@ export default { CountDown, }, props: {}, - data: function() { + data: function () { return { bargainId: 0, //砍价编号 bargainSumCount: 0, //砍价成功人数 @@ -190,12 +190,12 @@ export default { } }, computed: mapGetters(['userInfo', 'isLogin']), - mounted: function() { + mounted: function () { this.mountedStart() }, methods: { // 开始处理砍价逻辑 - mountedStart: function() { + mountedStart: function () { var that = this let url = handleQrCode() // bargainId 砍价商品id @@ -213,8 +213,6 @@ export default { // url未携带用户uid，填上登录用户uid，跳转 that.bargainUid = that.userInfo.uid } - console.log(this) - // 获取商品详情 that.getBargainDetail() // 砍价数据统计 @@ -236,7 +234,7 @@ export default { this.getBargainHelpCount() }, // 查看商品 - openAlone: function() { + openAlone: function () { this.$yrouter.push({ path: '/pages/shop/GoodsCon/index', query: { @@ -245,7 +243,7 @@ export default { }) }, // 砍价完成，去支付 - goPay: function() { + goPay: function () { var data = {} var that = this data.productId = that.goodsDetail.productId @@ -271,7 +269,7 @@ export default { }) }, // 生成海报 - goPoster: function() { + goPoster: function () { var that = this that.getBargainShare(that.bargainId) this.$yrouter.push({ @@ -283,7 +281,7 @@ export default { }) }, // 跳转砍价商品列表 - goList: function() { + goList: function () { this.$yrouter.push({ path: '/pages/activity/GoodsBargain/index', }) @@ -291,7 +289,7 @@ export default { //砍价分享 //bargainId 0 获取 查看人数 分享人数 参与人数 //bargainId 砍价产品编号 添加分享次数 获取 查看人数 分享人数 参与人数 - getBargainShare: function(bargainId) { + getBargainShare: function (bargainId) { var that = this getBargainShare({ bargainId: bargainId, @@ -300,7 +298,7 @@ export default { }) }, // 获取产品详情 - getBargainDetail: function() { + getBargainDetail: function () { var that = this uni.showLoading({ title: '加载中', @@ -310,9 +308,9 @@ export default { .then(res => { uni.hideLoading() that.goodsDetail = res.data.bargain + console.log(that.goodsDetail) that.goodsDetail.description = that.goodsDetail.description.replace(/\ { @@ -325,7 +323,7 @@ export default { }) }, // 开启砍价-发起人与当前用户非同一人 - getBargainStart: function() { + getBargainStart: function () { var that = this getBargainStart({ bargainId: that.bargainId, @@ -344,7 +342,7 @@ export default { }) }, // 参与砍价 - getBargainHelp: function() { + getBargainHelp: function () { var that = this if (this.bargainHelpCount.price === 0 && that.bargainUid !== that.userInfo.uid) { return uni.showToast({ @@ -382,7 +380,7 @@ export default { }) }, //获取砍掉的金额 - getBargainHelpPrice: function() { + getBargainHelpPrice: function () { var that = this getBargainHelpPrice({ bargainId: that.bargainId, @@ -409,7 +407,7 @@ export default { }) }, // 砍价帮助列表 - getBargainHelpList: function() { + getBargainHelpList: function () { var that = this if (that.helpListStatus === true) return getBargainHelpList({ @@ -440,7 +438,7 @@ export default { }) }, // 砍价 砍价帮总人数、剩余金额、进度条、已经砍掉的价格 - getBargainHelpCount: function() { + getBargainHelpCount: function () { getBargainHelpCount({ bargainId: this.bargainId, bargainUserUid: this.bargainUid, @@ -515,7 +513,7 @@ export default { }, // 获取开启砍价用户信息 // 参与砍价，为同一人发起砍价后 - getBargainStartUser: function() { + getBargainStartUser: function () { var that = this getBargainStartUser({ bargainId: that.bargainId, @@ -534,11 +532,11 @@ export default { }) }, // 关闭弹窗 - close: function() { + close: function () { this.active = false }, // 设置微信分享 - onShareAppMessage: function() { + onShareAppMessage: function () { return { title: this.storeInfo.title, imageUrl: this.storeInfo.image, diff --git a/pages/activity/GroupRule/index.vue b/pages/activity/GroupRule/index.vue index 86e5701..b03c23a 100644 --- a/pages/activity/GroupRule/index.vue +++ b/pages/activity/GroupRule/index.vue @@ -1,6 +1,6 @@