From 91d57a5b60fde83811a4efc67eb9266b3b16650b Mon Sep 17 00:00:00 2001 From: chengkun Date: Fri, 6 Oct 2023 09:04:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B9=BF=E5=91=8A=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/scan/Barcode.nvue | 125 +--------- pages/scan/Calendar.nvue | 429 +++++++++++++++++++++++--------- pages/scan/Contacts.nvue | 420 ++++++++++++++++++++++++-------- pages/scan/Email.nvue | 513 +++++++++++++++++++++++++++++++-------- pages/scan/Location.nvue | 422 +++++++++++++++++++++++--------- pages/scan/Product.nvue | 427 ++++++++++++++++++++++++-------- pages/scan/Sms.nvue | 414 +++++++++++++++++++++++-------- pages/scan/Tel.nvue | 416 +++++++++++++++++++++++-------- pages/scan/Text.nvue | 426 +++++++++++++++++++++++--------- static/favicon.ico | Bin 67646 -> 0 bytes static/logo.png | Bin 4023 -> 0 bytes 11 files changed, 2637 insertions(+), 955 deletions(-) delete mode 100644 static/favicon.ico delete mode 100644 static/logo.png diff --git a/pages/scan/Barcode.nvue b/pages/scan/Barcode.nvue index 408b2aa..283ed41 100644 --- a/pages/scan/Barcode.nvue +++ b/pages/scan/Barcode.nvue @@ -46,18 +46,18 @@ --> - {{ barcodeInfo.message }} + {{ barcodeInfo.message }} - + Web Search - + Share @@ -85,19 +85,6 @@ Feedback & Suggestion - @@ -141,7 +128,7 @@ barcodeInfo:{}, tableName: 'scan_code', textImgUrl: '', - bgColor: '', + bgColor: '#1F222B', nativeAdId:'ca-app-pub-3940256099942544/2247696110', //原生广告id @@ -391,106 +378,6 @@ justify-content: center; background-color: #1F222B; height:650vh; - - // .listView{ - // z-index: 0; - // position: relative; - // width: 660rpx; - // height:1300rpx; - // margin-top: 100rpx; - // background-color: #1F222B; - - // .listItem-1{ - // margin-top: 220rpx; - // background-color: #1F222B; - // //color: #fff; - // //border: 2px solid yellow; - // height: 160rpx; - // text-align: center; - // } - - // .listItem{ - // border: 2px solid yellow; - // /* #ifndef APP-PLUS-NVUE */ - // height: auto; - // /* #endif */ - // height: 160rpx; - // //margin-top: 30px; - // //padding-top: 30px; - // background-color: #1F222B; - // color: #fff; - - // .toolItem{ - // border: 2px solid red; - // background-color: #1F222B; - // font-size: 60rpx; - // color: #8f8f94; - // height: 120rpx; - // text-align: center; - - // .toolText{ - // font-size: 24rpx; - // color: #8f8f94; - // } - // } - - // } - - // .listItem-ad{ - // background-color: #1F222B; - // text-align: center; - // color: #fff; - // border: 2px solid blue; - // height: 160rpx; - // } - - // .listItemBottom{ - // height: 400rpx; - // margin-top: 20rpx; - // background-color: #1F222B; - // color: #fff; - // display: flex; - // flex-direction: column; - // align-items: center; - // justify-content: center; - - // .buttomImg{ - // width: 300rpx; - // height: 300rpx; - // } - - // } - // } - // // .icon{ - // // z-index: 1; - // // position: absolute; - // // margin-top: -620rpx; - // // background-color: #3e444d; - // // font-size: 120rpx; - // // color: #fff; - // // text-align: center; - // // } - - - // .bottomText{ - // color: #fff; - // text-align: center; - // font-size: 24rpx; - // //margin-top: 40rpx; - // margin-bottom: 240rpx; - // } - // .cutline{ - // border: 1px solid #8f8f94; - // } - - // .starTipText{ - // color: #fff; - // font-size: 48rpx; - // } - - // .startTipContent{ - // margin-bottom: 30rpx; - // } } .listView{ @@ -510,7 +397,7 @@ text-align: center; } - .listItem-1-text{ + .listItemText{ font-size: 36rpx; text-align: center; background-color: #1F222B; @@ -556,6 +443,8 @@ .listItemBottom{ height: 400rpx; margin-top: 20rpx; + width: 700rpx; + //border: 2px solid blue; background-color: #1F222B; color: #fff; display: flex; diff --git a/pages/scan/Calendar.nvue b/pages/scan/Calendar.nvue index 6038094..0eedd55 100644 --- a/pages/scan/Calendar.nvue +++ b/pages/scan/Calendar.nvue @@ -1,7 +1,7 @@ @@ -67,11 +131,11 @@ calendarInfo:{}, tableName: 'scan_code', textImgUrl: '', + bgColor: '#1F222B', + + nativeAdId:'ca-app-pub-3940256099942544/2247696110', //原生广告id starRateValue: 0, //评分星星数量 - showStarTip: false, //评分展示开关 - startTipColor: '#706F6F', //评分弹窗背景色 - startTipFontColor: '#fff' //评分文字色 } }, async onLoad(option) { @@ -101,10 +165,11 @@ let that = this; //判断评分弹窗条件是否达到要求 let starTipStatus = that.getStarTipStatus(); - console.log('starTipStatus',starTipStatus) + console.log('starTipStatus',JSON.stringify(starTipStatus)) if(starTipStatus === null || starTipStatus === ""){ //达到要求 - that.showStarTip = true; + //that.showStarTip = true; + that.starTipOpen(); that.setStarTipStatus(false); return true; }else{ @@ -113,6 +178,35 @@ }, methods: { + starTipOpen(){ + let that = this; + that.$refs.showStarTip.open(); + }, + + onAdLoaded() { + console.log('BarcodeNative广告加载成功'); + }, + + onAdClicked() { + console.log('点击BarcodeNative广告'); + }, + + onAdFailedToLoad(fail) { + console.log('native广告加载失败', fail.detail); + console.log('error code: ' + fail.detail.errorCode); + console.log('error message: ' + fail.detail.errorMessage); + this.showToast('ad load error!'); + }, + + showToast(title = '', duration = 1500) { + uni.showToast({ + title: title, + mask: true, + duration: duration, + icon: 'none' + }); + }, + //获取弹窗状态结果 getStarTipStatus(){ return uni.getStorageSync('starTipStatus'); @@ -127,14 +221,11 @@ starTipSubmit(){ let that = this; that.$refs.toast.show({ - title: 'Success', - content: 'Thanks for feedback!', - icon: 'success', + message: 'Thanks for feedback!', duration: 3000 }) - that.showStarTip = false; - //更改starTipStatus状态 - that.setStarTipStatus(false); + that.setStarTipStatus(true); + that.$refs.showStarTip.close(); }, //跳转到反馈页面 @@ -333,110 +424,230 @@ diff --git a/pages/scan/Contacts.nvue b/pages/scan/Contacts.nvue index 6fdc366..ab9c9e9 100644 --- a/pages/scan/Contacts.nvue +++ b/pages/scan/Contacts.nvue @@ -1,7 +1,7 @@ @@ -66,11 +132,10 @@ contactsInfo:{}, tableName: 'scan_code', textImgUrl: '', + nativeAdId:'ca-app-pub-3940256099942544/2247696110', //原生广告id starRateValue: 0, //评分星星数量 - showStarTip: false, //评分展示开关 - startTipColor: '#706F6F', //评分弹窗背景色 - startTipFontColor: '#fff' //评分文字色 + bgColor: '#1F222B' } }, async onLoad(option) { @@ -103,7 +168,8 @@ console.log('starTipStatus',JSON.stringify(starTipStatus)); if(starTipStatus === null || starTipStatus === ""){ //达到要求 - that.showStarTip = true; + //that.showStarTip = true; + that.starTipOpen(); //更改starTipStatus状态 that.setStarTipStatus(false); return true; @@ -113,6 +179,35 @@ }, methods: { + starTipOpen(){ + let that = this; + that.$refs.showStarTip.open(); + }, + + onAdLoaded() { + console.log('BarcodeNative广告加载成功'); + }, + + onAdClicked() { + console.log('点击BarcodeNative广告'); + }, + + onAdFailedToLoad(fail) { + console.log('native广告加载失败', fail.detail); + console.log('error code: ' + fail.detail.errorCode); + console.log('error message: ' + fail.detail.errorMessage); + this.showToast('ad load error!'); + }, + + showToast(title = '', duration = 1500) { + uni.showToast({ + title: title, + mask: true, + duration: duration, + icon: 'none' + }); + }, + //获取弹窗状态结果 getStarTipStatus(){ return uni.getStorageSync('starTipStatus'); @@ -127,14 +222,13 @@ starTipSubmit(){ let that = this; that.$refs.toast.show({ - title: 'Success', - content: 'Thanks for feedback!', - icon: 'success', + message: 'Thanks for feedback!', duration: 3000 }) - that.showStarTip = false; + //that.showStarTip = false; //更改starTipStatus状态 - that.setStarTipStatus(false); + that.setStarTipStatus(true); + that.$refs.showStarTip.close(); }, //跳转到反馈页面 @@ -309,107 +403,227 @@ diff --git a/pages/scan/Email.nvue b/pages/scan/Email.nvue index e407bd5..05f018c 100644 --- a/pages/scan/Email.nvue +++ b/pages/scan/Email.nvue @@ -1,7 +1,7 @@ @@ -63,11 +129,11 @@ emailInfo:{}, tableName: 'scan_code', textImgUrl: '', + bgColor: '#1F222B', + + nativeAdId:'ca-app-pub-3940256099942544/2247696110', //原生广告id starRateValue: 0, //评分星星数量 - showStarTip: false, //评分展示开关 - startTipColor: '#706F6F', //评分弹窗背景色 - startTipFontColor: '#fff' //评分文字色 } }, async onLoad(option) { @@ -96,11 +162,12 @@ onBackPress(e){ let that = this; //判断评分弹窗条件是否达到要求 - let starTipStatus = that.getStarTipStatus(); - console.log('starTipStatus',starTipStatus) + const starTipStatus = that.getStarTipStatus(); + console.log('starTipStatus',JSON.stringify(starTipStatus)) if(starTipStatus === null || starTipStatus === ""){ //达到要求 - that.showStarTip = true; + //that.showStarTip = true; + that.starTipOpen(); that.setStarTipStatus(false); return true; }else{ @@ -109,6 +176,35 @@ }, methods: { + starTipOpen(){ + let that = this; + that.$refs.showStarTip.open(); + }, + + onAdLoaded() { + console.log('BarcodeNative广告加载成功'); + }, + + onAdClicked() { + console.log('点击BarcodeNative广告'); + }, + + onAdFailedToLoad(fail) { + console.log('native广告加载失败', fail.detail); + console.log('error code: ' + fail.detail.errorCode); + console.log('error message: ' + fail.detail.errorMessage); + this.showToast('ad load error!'); + }, + + showToast(title = '', duration = 1500) { + uni.showToast({ + title: title, + mask: true, + duration: duration, + icon: 'none' + }); + }, + //获取弹窗状态结果 getStarTipStatus(){ return uni.getStorageSync('starTipStatus'); @@ -123,14 +219,13 @@ starTipSubmit(){ let that = this; that.$refs.toast.show({ - title: 'Success', - content: 'Thanks for feedback!', - icon: 'success', - duration: 3000 + message: 'Thanks for feedback!', + duration: 3000 }) - that.showStarTip = false; + //that.showStarTip = false; //更改starTipStatus状态 - that.setStarTipStatus(false); + that.setStarTipStatus(true); + that.$refs.showStarTip.close(); }, //跳转到反馈页面 @@ -308,110 +403,330 @@ diff --git a/pages/scan/Location.nvue b/pages/scan/Location.nvue index 2309a91..5b2d740 100644 --- a/pages/scan/Location.nvue +++ b/pages/scan/Location.nvue @@ -1,14 +1,14 @@ @@ -58,15 +114,15 @@ export default { data() { return { - col: 4, + col: 2, locationInfo:{}, tableName: 'scan_code', textImgUrl: '', + bgColor: '#1F222B', + + nativeAdId:'ca-app-pub-3940256099942544/2247696110', //原生广告id starRateValue: 0, //评分星星数量 - showStarTip: false, //评分展示开关 - startTipColor: '#706F6F', //评分弹窗背景色 - startTipFontColor: '#fff' //评分文字色 } }, async onLoad(option) { @@ -99,7 +155,8 @@ console.log('starTipStatus',starTipStatus) if(starTipStatus === null || starTipStatus === ""){ //达到要求 - that.showStarTip = true; + //that.showStarTip = true; + that.starTipOpen(); that.setStarTipStatus(false); return true; }else{ @@ -108,6 +165,35 @@ }, methods: { + starTipOpen(){ + let that = this; + that.$refs.showStarTip.open(); + }, + + onAdLoaded() { + console.log('BarcodeNative广告加载成功'); + }, + + onAdClicked() { + console.log('点击BarcodeNative广告'); + }, + + onAdFailedToLoad(fail) { + console.log('native广告加载失败', fail.detail); + console.log('error code: ' + fail.detail.errorCode); + console.log('error message: ' + fail.detail.errorMessage); + this.showToast('ad load error!'); + }, + + showToast(title = '', duration = 1500) { + uni.showToast({ + title: title, + mask: true, + duration: duration, + icon: 'none' + }); + }, + //获取弹窗状态结果 getStarTipStatus(){ return uni.getStorageSync('starTipStatus'); @@ -122,14 +208,13 @@ starTipSubmit(){ let that = this; that.$refs.toast.show({ - title: 'Success', - content: 'Thanks for feedback!', - icon: 'success', - duration: 3000 + message: 'Thanks for feedback!', + duration: 3000 }) - that.showStarTip = false; + //that.showStarTip = false; //更改starTipStatus状态 - that.setStarTipStatus(false); + that.setStarTipStatus(true); + that.$refs.showStarTip.close(); }, //跳转到反馈页面 @@ -169,7 +254,7 @@ //copy结果值 copyValue(){ let that = this; - //console.log('点击复制关键词事件') + //console.log('点击复制关键词事件',that.locationInfo) uni.setClipboardData({ data: that.locationInfo, success() { @@ -276,109 +361,228 @@ diff --git a/pages/scan/Product.nvue b/pages/scan/Product.nvue index 6753a8e..931386e 100644 --- a/pages/scan/Product.nvue +++ b/pages/scan/Product.nvue @@ -1,7 +1,7 @@ @@ -61,11 +126,11 @@ productInfo:{}, tableName: 'scan_code', textImgUrl: '', + bgColor: '#1F222B', + + nativeAdId:'ca-app-pub-3940256099942544/2247696110', //原生广告id starRateValue: 0, //评分星星数量 - showStarTip: false, //评分展示开关 - startTipColor: '#706F6F', //评分弹窗背景色 - startTipFontColor: '#fff' //评分文字色 } }, async onLoad(option) { @@ -98,7 +163,8 @@ console.log('starTipStatus',starTipStatus) if(starTipStatus === null || starTipStatus === ""){ //达到要求 - that.showStarTip = true; + //that.showStarTip = true; + that.starTipOpen(); that.setStarTipStatus(false); return true; }else{ @@ -107,6 +173,35 @@ }, methods: { + starTipOpen(){ + let that = this; + that.$refs.showStarTip.open(); + }, + + onAdLoaded() { + console.log('BarcodeNative广告加载成功'); + }, + + onAdClicked() { + console.log('点击BarcodeNative广告'); + }, + + onAdFailedToLoad(fail) { + console.log('native广告加载失败', fail.detail); + console.log('error code: ' + fail.detail.errorCode); + console.log('error message: ' + fail.detail.errorMessage); + this.showToast('ad load error!'); + }, + + showToast(title = '', duration = 1500) { + uni.showToast({ + title: title, + mask: true, + duration: duration, + icon: 'none' + }); + }, + //获取弹窗状态结果 getStarTipStatus(){ return uni.getStorageSync('starTipStatus'); @@ -121,14 +216,13 @@ starTipSubmit(){ let that = this; that.$refs.toast.show({ - title: 'Success', - content: 'Thanks for feedback!', - icon: 'success', - duration: 3000 + message: 'Thanks for feedback!', + duration: 3000 }) - that.showStarTip = false; + //that.showStarTip = false; //更改starTipStatus状态 - that.setStarTipStatus(false); + that.setStarTipStatus(true); + that.$refs.showStarTip.close(); }, //跳转到反馈页面 @@ -283,115 +377,236 @@ diff --git a/pages/scan/Sms.nvue b/pages/scan/Sms.nvue index 0e2a821..94a7f83 100644 --- a/pages/scan/Sms.nvue +++ b/pages/scan/Sms.nvue @@ -1,7 +1,7 @@ @@ -58,11 +119,11 @@ smsInfo:{}, tableName: 'scan_code', textImgUrl: '', + bgColor: '#1F222B', + + nativeAdId:'ca-app-pub-3940256099942544/2247696110', //原生广告id starRateValue: 0, //评分星星数量 - showStarTip: false, //评分展示开关 - startTipColor: '#706F6F', //评分弹窗背景色 - startTipFontColor: '#fff' //评分文字色 } }, async onLoad(option) { @@ -92,7 +153,8 @@ console.log('starTipStatus',starTipStatus) if(starTipStatus === null || starTipStatus === ""){ //达到要求 - that.showStarTip = true; + //that.showStarTip = true; + that.starTipOpen(); that.setStarTipStatus(false); return true; }else{ @@ -101,6 +163,35 @@ }, methods: { + starTipOpen(){ + let that = this; + that.$refs.showStarTip.open(); + }, + + onAdLoaded() { + console.log('BarcodeNative广告加载成功'); + }, + + onAdClicked() { + console.log('点击BarcodeNative广告'); + }, + + onAdFailedToLoad(fail) { + console.log('native广告加载失败', fail.detail); + console.log('error code: ' + fail.detail.errorCode); + console.log('error message: ' + fail.detail.errorMessage); + this.showToast('ad load error!'); + }, + + showToast(title = '', duration = 1500) { + uni.showToast({ + title: title, + mask: true, + duration: duration, + icon: 'none' + }); + }, + //获取弹窗状态结果 getStarTipStatus(){ return uni.getStorageSync('starTipStatus'); @@ -115,14 +206,13 @@ starTipSubmit(){ let that = this; that.$refs.toast.show({ - title: 'Success', - content: 'Thanks for feedback!', - icon: 'success', - duration: 3000 + message: 'Thanks for feedback!', + duration: 3000 }) - that.showStarTip = false; + //that.showStarTip = false; //更改starTipStatus状态 - that.setStarTipStatus(false); + that.setStarTipStatus(true); + that.$refs.showStarTip.close(); }, //发送短信 @@ -266,106 +356,226 @@ diff --git a/pages/scan/Tel.nvue b/pages/scan/Tel.nvue index 7176080..d6f2635 100644 --- a/pages/scan/Tel.nvue +++ b/pages/scan/Tel.nvue @@ -1,7 +1,7 @@ @@ -62,11 +127,11 @@ telInfo:{}, tableName: 'scan_code', textImgUrl: '', + bgColor: '#1F222B', + + nativeAdId:'ca-app-pub-3940256099942544/2247696110', //原生广告id starRateValue: 0, //评分星星数量 - showStarTip: false, //评分展示开关 - startTipColor: '#706F6F', //评分弹窗背景色 - startTipFontColor: '#fff' //评分文字色 } }, async onLoad(option) { @@ -99,7 +164,8 @@ console.log('starTipStatus',starTipStatus) if(starTipStatus === null || starTipStatus === ""){ //达到要求 - that.showStarTip = true; + //that.showStarTip = true; + that.starTipOpen(); that.setStarTipStatus(false); return true; }else{ @@ -109,6 +175,35 @@ }, methods: { + starTipOpen(){ + let that = this; + that.$refs.showStarTip.open(); + }, + + onAdLoaded() { + console.log('BarcodeNative广告加载成功'); + }, + + onAdClicked() { + console.log('点击BarcodeNative广告'); + }, + + onAdFailedToLoad(fail) { + console.log('native广告加载失败', fail.detail); + console.log('error code: ' + fail.detail.errorCode); + console.log('error message: ' + fail.detail.errorMessage); + this.showToast('ad load error!'); + }, + + showToast(title = '', duration = 1500) { + uni.showToast({ + title: title, + mask: true, + duration: duration, + icon: 'none' + }); + }, + //获取弹窗状态结果 getStarTipStatus(){ return uni.getStorageSync('starTipStatus'); @@ -123,14 +218,13 @@ starTipSubmit(){ let that = this; that.$refs.toast.show({ - title: 'Success', - content: 'Thanks for feedback!', - icon: 'success', - duration: 3000 + message: 'Thanks for feedback!', + duration: 3000 }) - that.showStarTip = false; + //that.showStarTip = false; //更改starTipStatus状态 - that.setStarTipStatus(false); + that.setStarTipStatus(true); + that.$refs.showStarTip.close(); }, //跳转到反馈页面 @@ -297,104 +391,224 @@ diff --git a/pages/scan/Text.nvue b/pages/scan/Text.nvue index fb6c275..a5b6616 100644 --- a/pages/scan/Text.nvue +++ b/pages/scan/Text.nvue @@ -1,12 +1,11 @@ @@ -59,7 +120,6 @@ col: 3, textInfo:{}, tableName: 'scan_code', - textImgUrl: '', shdowStyle: { paddingTop: "300rpx", marginTop: "-300rpx" @@ -67,10 +127,12 @@ // openFont: 'More', // closeFont: 'Close', + textImgUrl: '', + bgColor: '#1F222B', + + nativeAdId:'ca-app-pub-3940256099942544/2247696110', //原生广告id + starRateValue: 0, //评分星星数量 - showStarTip: false, //评分展示开关 - startTipColor: '#706F6F', //评分弹窗背景色 - startTipFontColor: '#fff' //评分文字色 } }, async onLoad(option) { @@ -107,8 +169,8 @@ console.log('starTipStatus',starTipStatus) if(starTipStatus === null || starTipStatus === ""){ //达到要求 - that.showStarTip = true; - //更改starTipStatus状态 + //that.showStarTip = true; + that.starTipOpen(); that.setStarTipStatus(false); return true; }else{ @@ -118,6 +180,35 @@ }, methods: { + starTipOpen(){ + let that = this; + that.$refs.showStarTip.open(); + }, + + onAdLoaded() { + console.log('BarcodeNative广告加载成功'); + }, + + onAdClicked() { + console.log('点击BarcodeNative广告'); + }, + + onAdFailedToLoad(fail) { + console.log('native广告加载失败', fail.detail); + console.log('error code: ' + fail.detail.errorCode); + console.log('error message: ' + fail.detail.errorMessage); + this.showToast('ad load error!'); + }, + + showToast(title = '', duration = 1500) { + uni.showToast({ + title: title, + mask: true, + duration: duration, + icon: 'none' + }); + }, + //获取弹窗状态结果 getStarTipStatus(){ return uni.getStorageSync('starTipStatus'); @@ -132,14 +223,13 @@ starTipSubmit(){ let that = this; that.$refs.toast.show({ - title: 'Success', - content: 'Thanks for feedback!', - icon: 'success', - duration: 3000 + message: 'Thanks for feedback!', + duration: 3000 }) - that.showStarTip = false; + //that.showStarTip = false; //更改starTipStatus状态 - that.setStarTipStatus(false); + that.setStarTipStatus(true); + that.$refs.showStarTip.close(); }, //跳转到反馈页面 @@ -285,111 +375,231 @@ diff --git a/static/favicon.ico b/static/favicon.ico deleted file mode 100644 index 7bf90375f6b3c53badd9cb1536841e207889f098..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 67646 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 diff --git a/static/logo.png b/static/logo.png deleted file mode 100644 index b5771e209bb677e2ebd5ff766ad5ee11790f305a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4023 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 SYs}WS&%*SCNx89m_