diff --git a/assets/mp3/open.mp3 b/assets/mp3/open.mp3 index ab775cf..4ceef60 100644 Binary files a/assets/mp3/open.mp3 and b/assets/mp3/open.mp3 differ diff --git a/common/common.js b/common/common.js index 759bc76..e59e346 100644 --- a/common/common.js +++ b/common/common.js @@ -221,8 +221,11 @@ export default { mask: false }) }, 100) - return + return; } + console.log("loadingloadingloadingloadingloading", loading); + loading = true; + console.log("loadingloadingloadingloadingloading", loading); /* 如果定时器未结束 */ if (this.data.timer) { @@ -254,6 +257,36 @@ export default { fun && fun(data && data) }, + noDouble1(fun, data) { + /** + * $common.noDouble(fun,data) + * fun 需要规避连点的方法 + * data 该方法需要用到的参数 + * loading 接口加载中状态 + * 传入方法不要写括号 + */ + + /* 如果接口加载中,终止任何操作 */ + if (this.data.loading) { + uni.showToast({ + title: '请勿重复点击', + icon: 'none', + mask: false + }) + console.log("防抖", this.data.loading); + return; + } + this.data.loading = true; + try { + fun && fun(data && data); + } catch (e) { + //TODO handle the exception + } + var that=this; + setTimeout(()=>{that.data.loading = false; console.log("方法执行结束", this.data.loading, this.data.loading);},1000) + }, + + /** * @description: tost提示 * @return {*} diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..83c614a --- /dev/null +++ b/package-lock.json @@ -0,0 +1,18 @@ +{ + "name": "flyx", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "dependencies": { + "uqrcodejs": "^4.0.7" + } + }, + "node_modules/uqrcodejs": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/uqrcodejs/-/uqrcodejs-4.0.7.tgz", + "integrity": "sha512-84+aZmD2godCVI+93lxE3YUAPNY8zAJvNA7xRS7R7U+q57KzMDepBSfNCwoRUhWOfR6eHFoAOcHRPwsP6ka1cA==", + "license": "Apache-2.0" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..589c027 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "uqrcodejs": "^4.0.7" + } +} diff --git a/pages/infinite/index.vue b/pages/infinite/index.vue index 386ef78..2696b28 100644 --- a/pages/infinite/index.vue +++ b/pages/infinite/index.vue @@ -1,8 +1,9 @@ @@ -410,7 +410,7 @@ - + 确认支付 {{ pageData.goods.type == 5 @@ -421,7 +421,7 @@ - + @@ -437,13 +437,13 @@ {{ item.goodslist_title }} - + @@ -527,7 +527,8 @@ logList: [], sendRuleData: '', - previewData: '' + previewData: '', + choujiangloading: false } }, computed: { @@ -760,6 +761,9 @@ } } }) + if (type == 1) { + this.close('buyPop') + } }, toggleCollect() { diff --git a/pages/shouye/detail_wuxian copy.vue b/pages/shouye/detail_wuxian copy.vue deleted file mode 100644 index 07f8cf0..0000000 --- a/pages/shouye/detail_wuxian copy.vue +++ /dev/null @@ -1,2578 +0,0 @@ - - - - diff --git a/pages/shouye/detail_wuxian.vue b/pages/shouye/detail_wuxian.vue index a20064b..11e9cc3 100644 --- a/pages/shouye/detail_wuxian.vue +++ b/pages/shouye/detail_wuxian.vue @@ -203,7 +203,7 @@ - + @@ -216,13 +216,13 @@ {{ item.goodslist_title }} - + @@ -237,19 +237,19 @@ + }" @click="confirmSubmit([0, buyNum])"> 继续抽 - 重置×{{ prizeData && prizeData.data.length }} (余{{ prizeData.item_card_count }}) - + --> @@ -450,7 +450,7 @@ - + 选择支付方式 @@ -508,7 +508,7 @@ - + 确认支付 {{ @@ -587,7 +587,8 @@ bossList: [], bossTotal: 0, playRuleData: '', - logList: [] + logList: [], + choujiangloading: false } }, @@ -605,15 +606,15 @@ }, onShareAppMessage() { - - if(this.$refs["couponPop"]!=null){ - var co= this.$refs["couponPop"].getfengxiaodata(); - if(co!=null){ + + if (this.$refs["couponPop"] != null) { + var co = this.$refs["couponPop"].getfengxiaodata(); + if (co != null) { console.log(co); return co; } } - + return { title: `吧唧一番赏${this.pageData.goods.title}系列`, imageUrl: this.pageData.goods.imgurl_detail, @@ -679,7 +680,7 @@ this.$refs.bossScroll.mescroll.resetUpScroll() this.$refs.bossScroll.mescroll.scrollTo(0, 0) }, - + previewDetail(item, a) { const obj = { imgurl: a.imgurl, @@ -810,6 +811,7 @@ }, confirmSubmit([type, num, fromNotice = false]) { + let url = 'infinite_ordermoney' console.log(type); if (type == 1) { @@ -823,7 +825,7 @@ this.buyNum = num - this.req({ + this.req({ url, data: { goods_id: this.pageData.goods.id, @@ -871,6 +873,9 @@ } } }) + if (type == 1) { + this.close('buyPop') + } }, doRefresh() { diff --git a/pages/user/index.vue b/pages/user/index.vue index 2a5de24..033869e 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -37,9 +37,9 @@ 查看详情 - + diff --git a/pages/user/tui-guang.vue b/pages/user/tui-guang.vue index 00d8cfd..662364d 100644 --- a/pages/user/tui-guang.vue +++ b/pages/user/tui-guang.vue @@ -35,8 +35,14 @@ - - + + + + + + + + @@ -67,10 +73,22 @@ + + + + + + + + +