Merge branch 'develop' into localDevelop

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 {

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;

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

src/component/HomePage/PrintboardUpload.vue

@@ -1205,8 +1205,7 @@ export default defineComponent({
 			}
 			.input_box{
 				input{
-					&.forbidden{ 
+					
-					}
 				}
 			}
 			.modal_img{

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:{

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:{

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

src/views/HomeMain.vue

@@ -32,6 +32,7 @@
 					<!-- <i @click="Assignment" class="fi fi-rr-gift" title="Assignment"></i> -->
 					<i @click="UpgradePlan" title="Purchase" class="fi fi-rr-shop"></i>
                 </div>
+				
             </div>
             <nav class="homeMain_nav_content">
 				<router-link  :class="['nav_item',$route.name === 'homePage' ? 'select_nav' : '', ]" :to="`/home/homePage`">
@@ -71,6 +72,10 @@
 					<i class="fi fi-rs-notebook"></i>
 					<span class="select_item_des">{{$t('Header.ViewOrders')}}</span>
 				</div>
+				<router-link class="select_item" v-if="AdministratorUserIdList.indexOf(userInfo.userId) >= 0"  :to="`/administrator`">
+					<span class="icon iconfont icon-yonghu"></span>
+					<span class="select_item_des">Administrator</span>
+				</router-link>
 				<div class="select_item" @click="logout()">
 					<span class="icon iconfont icon-tuichu"></span
 					><span class="select_item_des">{{$t('Header.logOff')}}</span>
@@ -135,6 +140,7 @@ export default defineComponent({
 			return store.state.UserHabit.credits.value
 		})
 		let activeCredits = ref(false)
+		let AdministratorUserIdList = [88,6,46,31,73,83,87]
 		return {
 			store,
 			t,
@@ -143,6 +149,7 @@ export default defineComponent({
 			isMurmur,
 			credits,
 			activeCredits,
+			AdministratorUserIdList,
 		}
 	},
     data() {
@@ -567,8 +574,8 @@ export default defineComponent({
 	z-index: 1050;
 	position: absolute;
 	left: 15.5rem;
-	top: 4.7rem;
+	top: 6rem;
-	width: 11.4rem;
+	width: 13.5rem;
 	background: #ffffff;
 	box-shadow: 0px 0.4rem 0.4rem 0px rgba(0, 0, 0, 0.1);
 	overflow: hidden;