diff --git a/api/captcha.js b/api/captcha.js index 6fff247..8f9e806 100644 --- a/api/captcha.js +++ b/api/captcha.js @@ -3,7 +3,8 @@ import request from '@/utils/request' // api地址 const api = { image: 'captcha/image', - sendSmsCaptcha: 'captcha/sendSmsCaptcha' + sendSmsCaptcha: 'captcha/sendSmsCaptcha', + getStoreInfo:'store/getStoreInfo' } // 图形验证码 @@ -15,3 +16,7 @@ export function image() { export function sendSmsCaptcha(data) { return request.post(api.sendSmsCaptcha, data, { load: false }) } +// 发送短信验证码 +export function getStoreInfo(data) { + return request.get(api.getStoreInfo, data, { load: false }) +} diff --git a/pages/activity/newPeople.vue b/pages/activity/newPeople.vue index e5e63df..8f56b95 100644 --- a/pages/activity/newPeople.vue +++ b/pages/activity/newPeople.vue @@ -27,7 +27,7 @@ - + --> - + diff --git a/pages/activity/seckill.vue b/pages/activity/seckill.vue index fe0a7bd..f04d107 100644 --- a/pages/activity/seckill.vue +++ b/pages/activity/seckill.vue @@ -268,7 +268,7 @@ handleTargetGoods(sharpGoodsId) { let count_down_time = new Date(this.tabbar[this.curTabIndex].count_down_time.replace(/-/g, '/')) .getTime() - new Date().getTime() - + console.log(count_down_time) uni.navigateTo({ url: '/pages/goods/seckillDetail?activeTimeId=' + this.getCurTabbarId() + '&sharpGoodsId=' + sharpGoodsId + "&isSeckill=" + true + '&isBuy=' + count_down_time + '&seckillText=' + (this.tabbar[this diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue index ef62ebb..30de510 100644 --- a/pages/goods/detail.vue +++ b/pages/goods/detail.vue @@ -33,7 +33,7 @@ ￥{{goods.line_price_min?Number(goods.line_price_min):0}} - + @@ -45,16 +45,18 @@ ￥{{goods.cost_price_min?Number(goods.cost_price_min):0}} - ￥{{(goods.line_price_min>0&&goods.goods_price_min>0)?Number((Number(goods.line_price_min)-Number(goods.goods_price_min)).toFixed(2)):0}} + ￥{{(goods.line_price_min>0&&goods.goods_price_min>0)?Number((Number(goods.line_price_min)-Number(goods.goods_price_min)).toFixed(2)):0}} - + + + 限时抢购 - - 距活动{{seckillText}} - 距活动结束 + { if (res.status == 200) { that.$toast("设置成功"); + that.getGoodsDetail() this.$refs.setRange.afterSale = false; setTimeout(() => { that.getGoodsDetail(1); @@ -708,6 +712,7 @@ }, setPirce() { let item = this.findItemById(this.goods.skuList, this.goods.goods_id) + console.log('item', item) if (item) { this.$refs.setRange.startTime = item.sec_start_time; this.$refs.setRange.sec_hour = item.sec_hour @@ -989,6 +994,19 @@ GoodsApi.detail(this.goodsId) .then(result => { let info = result.data.detail; + let item = this.findItemById(info.skuList, info.goods_id) + if (item) { + if (item.sec_start_time) { + that.seckillCountTime = new Date(item.sec_start_time + .replace(/-/g, '/')) + .getTime() - new Date().getTime() + } else { + that.seckillCountTime = 0 + } + } else { + that.seckillCountTime = 0 + } + that.seckillCountTime = that.seckillCountTime > 0 ? that.seckillCountTime : 0 that.goods.skuList = []; that.godds = {} info.goods_images1 = [] @@ -1413,11 +1431,18 @@ } } - .right { + .right2 { display: flex; align-items: center; margin-right: 40rpx; flex-flow: column; + } + + .right { + display: flex; + align-items: center; + margin-right: 40rpx; + // flex-flow: column; .rightPrice { overflow: hidden; diff --git a/pages/index/index.vue b/pages/index/index.vue index d3eeb01..a4adbbf 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -169,7 +169,7 @@ + @click="handleTargetGoods(item)"> @@ -698,10 +698,10 @@ onChangeSeckillCutDownTime(e) { this.timeData = e }, - // 跳转到秒杀商品详情 - handleTargetGoods(sharpGoodsId) { + // 跳转到秒杀新的商品详情 + handleTargetGoods(item) { uni.navigateTo({ - url: '/pages/goods/detail?goodsId=' + sharpGoodsId + "&isSeckill=" + true + '&isBuy=' + this + url: '/pages/goods/seckillDetail?sharpGoodsId=' + item.sharp_goods_id +'&activeTimeId='+this.tabbar[this.curTabIndex].active_time_id+ "&isSeckill=" + true + '&isBuy=' + this .seckillCutDownTime + '&seckillText=' + (this.tabbar[this.curTabIndex].status == 10 ? '结束' : '开始') }) @@ -951,7 +951,7 @@ is_brand: '', is_new: 1, order: '', - is_in_store: 0 + is_in_store: '' } GoodsApi.brandList(param).then(res => { let arr = res.data.data @@ -981,7 +981,7 @@ is_brand: this.current == 0 ? 1 : '', is_new: '', order: '', - is_in_store: this.current == 0 ? 0 : 1 + is_in_store: this.current == 0 ? '' : 1 } GoodsApi.brandList(param).then(res => { let arr = res.data.data; diff --git a/pages/login/components/mp-weixin-mobile.vue b/pages/login/components/mp-weixin-mobile.vue index 7daaa5c..0c42864 100644 --- a/pages/login/components/mp-weixin-mobile.vue +++ b/pages/login/components/mp-weixin-mobile.vue @@ -1,12 +1,17 @@ \ No newline at end of file + diff --git a/pages/login/index.vue b/pages/login/index.vue index 593f83f..0437525 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -1,5 +1,5 @@ @@ -80,6 +83,7 @@ countDownFun: null, code: "", refereeId: "", + loginInfo:{} }; }, onLoad(o) { @@ -93,8 +97,25 @@ console.log(scene.refereeId) console.log("refereeId", refereeId) console.log(this.refereeId) + this.getLogoName() }, methods: { + getLogoName() { + let that = this + CaptchaApi.getStoreInfo({ + mobile: that.phoneNum + }).then((res) => { + if (res.status == 200) { + that.loginInfo=res.data + console.log(that.loginInfo) + } else { + uni.showToast({ + icon: "none", + title: res.message, + }); + } + }); + }, toTextPage(n) { uni.navigateTo({ url: "/pages/news1/text?pageFlag=" + n, @@ -226,30 +247,31 @@