diff --git a/src/component/Account/frontPage/bindPage.vue b/src/component/Account/frontPage/bindPage.vue index a67eca16..bcdce51a 100644 --- a/src/component/Account/frontPage/bindPage.vue +++ b/src/component/Account/frontPage/bindPage.vue @@ -190,7 +190,10 @@ export default defineComponent({ }) onBeforeUnmount(()=>{ var existingScript = document.querySelector(`script[src="${data.scriptSrc}"]`); - if(existingScript)existingScript.remove() + if(existingScript){ + existingScript.remove() + window.isAddGmail = false + } }) return{ ...toRefs(accountHomeData), diff --git a/src/component/Administrator/Transaction/TransactionTable.vue b/src/component/Administrator/Transaction/TransactionTable.vue index a6f9abe1..2df967cf 100644 --- a/src/component/Administrator/Transaction/TransactionTable.vue +++ b/src/component/Administrator/Transaction/TransactionTable.vue @@ -48,10 +48,10 @@ >
- payerTotal: + Payment Amount: { diff --git a/src/component/Administrator/affiliate/affiliateAudit.vue b/src/component/Administrator/affiliate/affiliateAudit.vue index d6040f11..53efe406 100644 --- a/src/component/Administrator/affiliate/affiliateAudit.vue +++ b/src/component/Administrator/affiliate/affiliateAudit.vue @@ -257,7 +257,7 @@ export default defineComponent({ ? this.rangePickerValue[0]+' '+'00:00:00' : ""; let endDate: any = this.rangePickerValue?.[1] - ? this.rangePickerValue[1]+' '+'00:00:00' + ? this.rangePickerValue[1]+' '+'23:59:59' : ""; let data = { page: this.currentPage, diff --git a/src/component/Administrator/affiliate/itemAffiliateDetail.vue b/src/component/Administrator/affiliate/itemAffiliateDetail.vue index 080bd102..cf4fa566 100644 --- a/src/component/Administrator/affiliate/itemAffiliateDetail.vue +++ b/src/component/Administrator/affiliate/itemAffiliateDetail.vue @@ -186,7 +186,7 @@ export default defineComponent({ ? itemAffiliateDetail.rangePickerValue[0]+' '+'00:00:00' : ""; let endDate: any = itemAffiliateDetail.rangePickerValue?.[1] - ? itemAffiliateDetail.rangePickerValue[1]+' '+'00:00:00' + ? itemAffiliateDetail.rangePickerValue[1]+' '+'23:59:59' : ""; let data = { affiliateId:itemAffiliateDetail.itemId, diff --git a/src/component/Administrator/recentActiveChart.vue b/src/component/Administrator/recentActiveChart.vue index 3400ef0f..0b30756e 100644 --- a/src/component/Administrator/recentActiveChart.vue +++ b/src/component/Administrator/recentActiveChart.vue @@ -88,7 +88,7 @@ export default defineComponent({ ? filterData.rangePickerValue[0]+' '+'00:00:00' : ""; let endDate: any = filterData.rangePickerValue?.[1] - ? filterData.rangePickerValue[1]+' '+'00:00:00' + ? filterData.rangePickerValue[1]+' '+'23:59:59' : ""; let data = { endTime:endDate, diff --git a/src/component/Administrator/recentActiveUser.vue b/src/component/Administrator/recentActiveUser.vue index a966b01f..421ef4af 100644 --- a/src/component/Administrator/recentActiveUser.vue +++ b/src/component/Administrator/recentActiveUser.vue @@ -259,7 +259,7 @@ export default defineComponent({ ? filterData.rangePickerValue[0]+' '+'00:00:00' : ""; let endDate: any = filterData.rangePickerValue?.[1] - ? filterData.rangePickerValue[1]+' '+'00:00:00' + ? filterData.rangePickerValue[1]+' '+'23:59:59' : ""; let data = { endTime:endDate, diff --git a/src/component/Administrator/recentActiveUserChart.vue b/src/component/Administrator/recentActiveUserChart.vue index 1e51d5c9..c20b0e3a 100644 --- a/src/component/Administrator/recentActiveUserChart.vue +++ b/src/component/Administrator/recentActiveUserChart.vue @@ -71,7 +71,7 @@ export default defineComponent({ ? filterData.rangePickerValue[0]+' '+'00:00:00' : ""; let endDate: any = filterData.rangePickerValue?.[1] - ? filterData.rangePickerValue[1]+' '+'00:00:00' + ? filterData.rangePickerValue[1]+' '+'23:59:59' : ""; let data = { endTime:endDate, diff --git a/src/component/Administrator/recentNewUser.vue b/src/component/Administrator/recentNewUser.vue index dc8ba4b8..da8a628a 100644 --- a/src/component/Administrator/recentNewUser.vue +++ b/src/component/Administrator/recentNewUser.vue @@ -285,7 +285,7 @@ export default defineComponent({ ? filterData.rangePickerValue[0]+' '+'00:00:00' : ""; let endDate: any = filterData.rangePickerValue?.[1] - ? filterData.rangePickerValue[1]+' '+'00:00:00' + ? filterData.rangePickerValue[1]+' '+'23:59:59' : ""; let data = { endTime:endDate, diff --git a/src/component/Administrator/recentNewUserChart.vue b/src/component/Administrator/recentNewUserChart.vue index d29c6d9e..a50bec86 100644 --- a/src/component/Administrator/recentNewUserChart.vue +++ b/src/component/Administrator/recentNewUserChart.vue @@ -97,7 +97,7 @@ export default defineComponent({ ? filterData.rangePickerValue[0]+' '+'00:00:00' : ""; let endDate: any = filterData.rangePickerValue?.[1] - ? filterData.rangePickerValue[1]+' '+'00:00:00' + ? filterData.rangePickerValue[1]+' '+'23:59:59' : ""; let data = { endTime:endDate, diff --git a/src/component/Administrator/trialAllUser.vue b/src/component/Administrator/trialAllUser.vue index af72598b..606887b1 100644 --- a/src/component/Administrator/trialAllUser.vue +++ b/src/component/Administrator/trialAllUser.vue @@ -218,7 +218,7 @@ export default defineComponent({ ? filterData.rangePickerValue[0]+' '+'00:00:00' : ""; let endDate: any = filterData.rangePickerValue?.[1] - ? filterData.rangePickerValue[1]+' '+'00:00:00' + ? filterData.rangePickerValue[1]+' '+'23:59:59' : ""; let data = { endTime:endDate, diff --git a/src/component/Administrator/trialUserConversionRateChart.vue b/src/component/Administrator/trialUserConversionRateChart.vue index 302e1473..ff89c62e 100644 --- a/src/component/Administrator/trialUserConversionRateChart.vue +++ b/src/component/Administrator/trialUserConversionRateChart.vue @@ -88,7 +88,7 @@ export default defineComponent({ ? filterData.rangePickerValue[0]+' '+'00:00:00' : ""; let endDate: any = filterData.rangePickerValue?.[1] - ? filterData.rangePickerValue[1]+' '+'00:00:00' + ? filterData.rangePickerValue[1]+' '+'23:59:59' : ""; let data = { endTime:endDate, diff --git a/src/component/Administrator/trialUserCountry.vue b/src/component/Administrator/trialUserCountry.vue index 9b29b426..e9b1b42f 100644 --- a/src/component/Administrator/trialUserCountry.vue +++ b/src/component/Administrator/trialUserCountry.vue @@ -106,7 +106,7 @@ export default defineComponent({ ? filterData.rangePickerValue[0]+' '+'00:00:00' : ""; let endDate: any = filterData.rangePickerValue?.[1] - ? filterData.rangePickerValue[1]+' '+'00:00:00' + ? filterData.rangePickerValue[1]+' '+'23:59:59' : ""; let data = { endTime:endDate, diff --git a/src/component/Detail/setDesignItem.vue b/src/component/Detail/setDesignItem.vue index 3530a16b..03609a54 100644 --- a/src/component/Detail/setDesignItem.vue +++ b/src/component/Detail/setDesignItem.vue @@ -35,7 +35,7 @@
-
{{ $t('LibraryPage.Reset') }}
+
{{ $t('LibraryPage.Reset') }}
OK
@@ -746,7 +746,8 @@ export default defineComponent({ } .subitOkPreviewBtn{ z-index: 2; - margin-bottom: calc(1rem*1.2); + // margin-bottom: calc(1rem*1.2); + margin-bottom: 4rem; width: calc(10rem*1.2); text-align: center; bottom: 0; diff --git a/src/component/DetailCopy/designDetail.vue b/src/component/DetailCopy/designDetail.vue index 0e5842e9..ed3418d2 100644 --- a/src/component/DetailCopy/designDetail.vue +++ b/src/component/DetailCopy/designDetail.vue @@ -78,21 +78,19 @@ export default defineComponent({ setup() { const store = useStore(); - let designItemDetail :any = computed(()=>{ - return store.state.DesignDetailModule.designItemDetail - }) + const userDetail = computed(()=>{ return store.state.UserHabit.userDetail }) const detailData = reactive({ - designDetail:null, + designDetail:store.state.DesignDetailCopy.designDetail, designDetailShow:false, loadingShow:false, }) - provide('designDetailData',detailData) const closeModal = ()=>{ detailData.designDetailShow = false } + const showDesignDetailModal = (data:any,str:any)=>{ // this.moible = isMoible() // this.designItemId = data.design.designItemId @@ -118,9 +116,8 @@ export default defineComponent({ } }); }) - detailData.designDetail = rv detailData.designDetailShow = true - // this.store.commit('setDesignItemDetail',rv) + store.commit('designDeatailCopy/setDesignDetail',rv) // this.deleteShow = false setRevocation(rv,'') diff --git a/src/component/DetailCopy/model/index.vue b/src/component/DetailCopy/model/index.vue index 6c35de8e..a9fd0183 100644 --- a/src/component/DetailCopy/model/index.vue +++ b/src/component/DetailCopy/model/index.vue @@ -39,7 +39,7 @@ export default defineComponent({ total:0, pageSize:10, currentPage:1, - designDetailData:inject('designDetailData') as any//父组件传过来的数据 + designDetail:store.state.DesignDetailCopy.designDetail, }) const getDetailListDom = reactive({ libraryList:null as any, diff --git a/src/component/DetailCopy/model/modelPosition.vue b/src/component/DetailCopy/model/modelPosition.vue index 266d3055..1d145136 100644 --- a/src/component/DetailCopy/model/modelPosition.vue +++ b/src/component/DetailCopy/model/modelPosition.vue @@ -39,16 +39,13 @@ export default defineComponent({ back:{}, body:{}, }, - designDetailData:inject('designDetailData') as any//父组件传过来的数据 + frontBackc:store.state.DesignDetailModule.designItemDetail, + designDetail:store.state.DesignDetailCopy.designDetail, }) const getDetailListDom = reactive({ libraryList:null as any, }) - watch(detailData.designDetailData.designDetail,(newValue,oldValue)=>{ - console.log(123123); - - }) //设置尺寸 const itemSizeMousedown = (direction:any,event:any)=>{ diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 8a98c5f1..5fcc1ee7 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -813,7 +813,7 @@ export default defineComponent({ if(paste.length == 0)this.sketchboardList.push(file); this.sketchboardList = this.sketchboardList.filter((v: any) => v.status === "done"); nextTick().then(()=>{ - if(this.driver__.driver){ + if(this.driver__.driver && this.type_.type2 == 'Printboard'){ driverObj__.moveNext() } }) diff --git a/src/component/HomePage/productImg.vue b/src/component/HomePage/productImg.vue index 278db7be..cd63d987 100644 --- a/src/component/HomePage/productImg.vue +++ b/src/component/HomePage/productImg.vue @@ -29,8 +29,8 @@
-
-
+
+
@@ -187,8 +187,8 @@
-
    -
  • {{ menuItem.label }}
  • +
      +
    • {{ menuItem.label }}
@@ -432,6 +432,8 @@ export default defineComponent({ item.isChecked = !item.isChecked if(item.isChecked){ if(driver__.value.driver){ + let dom:any = document.querySelectorAll('.Guide_1_32')[0] + dom.scrollTop = dom.scrollHeight; nextTick(()=>{ driverObj__.moveNext(); }) @@ -696,6 +698,8 @@ export default defineComponent({ generalIsMenuShow.menuShow = false if(driver__.value.driver){ nextTick(()=>{ + let dom:any = document.querySelectorAll('.Guide_1_32')[0] + dom.scrollTop = dom.scrollHeight; driverObj__.moveNext(); }) } @@ -912,6 +916,7 @@ methods: { margin-bottom: 0; } .productImg_left{ + overflow-y: auto !important; width: 25%; position: relative; display: flex; diff --git a/src/component/LoginPage/googleLogin.vue b/src/component/LoginPage/googleLogin.vue index 87bf053e..88aea17e 100644 --- a/src/component/LoginPage/googleLogin.vue +++ b/src/component/LoginPage/googleLogin.vue @@ -26,6 +26,7 @@ // 获取回调响应的凭证数据 然后拿这个凭证给后台,后台jwt进行解析获取登录信息 let code = response.credential emit('googelLogin',code) + window.isAddGmail = false } let data = reactive({ // scriptSrc:'https://apis.google.com/js/platform.js', @@ -71,7 +72,10 @@ } onBeforeUnmount(()=>{ var existingScript = document.querySelector(`script[src="${data.scriptSrc}"]`); - if(existingScript)existingScript.remove() + if(existingScript){ + existingScript.remove() + window.isAddGmail = false + } }) createGmailLogin() return { diff --git a/src/component/Pay/payMethod.vue b/src/component/Pay/payMethod.vue index 6ae3e6e7..2b956daf 100644 --- a/src/component/Pay/payMethod.vue +++ b/src/component/Pay/payMethod.vue @@ -40,7 +40,7 @@ - Stripe + Stripe (Credit Card)