diff --git a/src/assets/style/style.css b/src/assets/style/style.css index ed13c331..89e535b7 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -1197,6 +1197,11 @@ i { .library_page .input_border inputinput::-webkit-input-placeholder { color: rgba(0, 0, 0, 0.15); } +.collection_modal_body .input_border input.forbidden, +.design_detail_modal_component .input_border input.forbidden, +.library_page .input_border input.forbidden { + cursor: no-drop; +} .collection_modal_body .input_border span, .design_detail_modal_component .input_border span, .library_page .input_border span { diff --git a/src/assets/style/style.less b/src/assets/style/style.less index 5b1d3d3e..8e7c3734 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -1266,6 +1266,7 @@ i{ // color: rgb(255, 0, .7); border: 1px solid rgb(255, 0, .7); box-shadow: 0px 0px 3px 1px rgba(255, 0, 0, 0.2); + } span{ opacity: 1; @@ -1291,6 +1292,9 @@ i{ &input::-webkit-input-placeholder { color: rgba(0,0,0,.15); } + &.forbidden{ + cursor: no-drop; + } } span{ position: absolute; diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index f2c48686..cea786b2 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -1443,7 +1443,7 @@ export default defineComponent({ // message.info('Your print is empty') // return // } - if(this.allBoardData.printboardFiles.length<=0){ + if(allBoardData.value.printboardFiles.length<=0){ return } if(credits.value < 30){ @@ -1578,6 +1578,7 @@ export default defineComponent({ Promise.all(allPromise) .then(promiseArr => { if(arr.length > 0){ + arr.forEach((item,index)=>arr[index]+=1) let str = arr.join(',') message.info(useI18.t('exportModel.jsContent5',{str:str})) return diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue index ebb72abd..e3ac81ee 100644 --- a/src/component/HomePage/PrintboardUpload.vue +++ b/src/component/HomePage/PrintboardUpload.vue @@ -1205,8 +1205,7 @@ export default defineComponent({ } .input_box{ input{ - &.forbidden{ - } + } } .modal_img{ diff --git a/src/lang/cn.ts b/src/lang/cn.ts index 5fe1abba..72f11e21 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -53,14 +53,14 @@ export default { HDExport:'高清导出', Export:'导出', SR:'请选择需要超分的图片', - requiresCredits:'每张图片需要消耗{data}积分', + requiresCredits:'执行超分的图片需要消耗{data}积分', Scale:'倍率', Cancel:'取消', jsContent1:'画布内容没有保存是否离开页面', jsContent2:'我们只支持对印花进行超分', jsContent3:'您的积分小于一次超分', jsContent4:'您的积分余额不足', - jsContent5:'你选择的第 {str}张图片宽度或者高度超过2048,', + jsContent5:'您选择的{str}张图像在超分辨率增强后的分辨率超过2048。请选择较低的放大倍数。', jsContent6:'请选择需要超分的图片', }, upgradePlan:{ diff --git a/src/lang/en.ts b/src/lang/en.ts index 770be893..34bfb86e 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -54,14 +54,14 @@ export default { HDExport:'UpScale', Export:'Export', SR:'Please select the picture that requires upscale', - requiresCredits:'Each picture requires {data} credits', + requiresCredits:'Performing upscale image requires a {data} integral', Scale:'Scale', Cancel:'Cancel', jsContent1:'Canvas edit content is not saved, whether to leave the page', jsContent2:'We only provide super-resolution capabilities for printboard images.', jsContent3:'Your points are less than one SR', jsContent4:'Your points balance is insufficient', - jsContent5:'You selected the {str} image and zoom ratio more than 2048,', + jsContent5:'The resolution of the {str} images you selected exceeds 2048 after super-resolution enhancement, Please choose a lower magnification level.', jsContent6:'Please select the picture that requires upscale', }, upgradePlan:{ diff --git a/src/router/index.ts b/src/router/index.ts index 3d190607..6cf00b43 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -145,7 +145,7 @@ router.beforeEach((to, from, next) => { let token = getCookie("token"); let isMurmur = JSON.parse(getIsMurmur) let routeList = ['/testClickData','/trialApproval']//指定页面需要指定id才能进入 - let userIdList = [83,88,6,87] + let userIdList = [88,6,46,31,73,83,87] const routeExists = router.getRoutes().some(({ name }) =>{ if(name){ return name === to.name diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue index f34bb0cf..8024afd8 100644 --- a/src/views/HomeMain.vue +++ b/src/views/HomeMain.vue @@ -32,6 +32,7 @@ +