修复注册选择订阅布局问题

src/component/Administrator/allUserPoerations.vue

@@ -321,6 +321,7 @@ export default defineComponent({
         data = setEditData()
         if (!data.userName || !data.userEmail || !data.validEndTime || !data.systemUser)
           return message.warning('Please check the input box marked with *')
+		delete data.userName
         Https.axiosPost(Https.httpUrls.modifyUser, {}, { params: data }).then(rv => {
           if (rv) {
             cancelDsign()

src/component/Administrator/globalAwardPopularity.vue

@@ -0,0 +1,99 @@
+<template>
+    <div class="admin_page globalAwardPopularity" ref="adminPage">
+        <div class="admin_table_search">
+			<div class="admin_state">
+				<div class="admin_state_item">
+					<span>Current Time:</span>
+					<span>{{ currentTimeStr }}</span>
+				</div>
+				<div class="admin_state_item">
+					<span>Raw Visi Count:</span>
+					<span>{{ rawVisitCount }}</span>
+				</div>
+				<div class="admin_state_item">
+					<span>Unique Visit Count:</span>
+					<span>{{ uniqueVisitCount }}</span>
+				</div>
+				
+			</div>
+			<div class="admin_search">
+				<div class="admin_search_item" @click="getGlobalAwardPopularity">
+					<i class="fi fi-br-refresh"></i>
+				</div>
+			</div>
+		</div>
+        <!-- <div class="admin_table_content" ref="questionnaireTable">
+			
+        </div> -->
+    </div>
+</template>
+<script lang="ts">
+import { defineComponent, ref, createVNode,toRefs, computed,reactive, onMounted, nextTick } from "vue";
+import { Https } from "@/tool/https";
+import type { TableColumnsType } from 'ant-design-vue';
+
+export default defineComponent({
+    components: {},
+    setup() {
+		const currentTime = ref(new Date())
+		const currentTimeStr = computed(()=>{
+			return currentTime.value.toLocaleString()
+		})
+		const rawVisitCount = ref(0)
+		const uniqueVisitCount = ref(0)
+		const getGlobalAwardPopularity = () => {
+			Https.axiosGet(Https.httpUrls.getGlobalAwardPopularity,).then((rv)=>{
+				currentTime.value = new Date()
+				rawVisitCount.value = rv.rawVisitCount
+				uniqueVisitCount.value = rv.uniqueVisitCount
+			})
+        }
+		onMounted(()=>{
+			getGlobalAwardPopularity()
+		})
+        return {
+			currentTimeStr,
+			getGlobalAwardPopularity,
+			rawVisitCount,
+			uniqueVisitCount,
+		};
+    },
+    data() {
+        return {
+		};
+    },
+    mounted() {
+		
+	},
+    methods: {},
+});
+</script>
+<style lang="less" scoped>
+.admin_page.globalAwardPopularity{
+	.admin_table_search{
+		// flex: 1;
+		width: min-content;
+		justify-content: flex-start;
+		border-radius: 2rem;
+		box-shadow: 0 0 1rem rgba(0, 0, 0, 0.2);
+		margin-left: 2rem;
+		flex-wrap: nowrap;
+		gap: 3rem;
+	}
+	.admin_state{
+		flex-direction: column;
+		width: auto;
+		cursor: auto;
+		.admin_state_item{
+			> span{
+				font-size: 2rem;
+			}
+		}
+	}
+	.admin_search{
+		i{
+			display: flex;
+		}
+	}
+}
+</style>

src/component/Detail/DesignDetail.vue

@@ -331,7 +331,6 @@ export default defineComponent({
 			store.commit('DesignDetail/setCurrentDetailType',str)
 		}
 		const setClothes = async (list:any,str:string)=>{
-			console.log(JSON.parse(JSON.stringify(list)))
 			let clothesList:any = []
 			if(detailData.isEditPattern.value == 'editSketch')await detailDom.canvasBox.submitBase64Data().then((rv)=>{
 				detailData.selectDetail.sketchString = rv
@@ -369,7 +368,6 @@ export default defineComponent({
 				// }else if(isCurrent){
 					
 				// }
-				console.log(JSON.parse(JSON.stringify(detailData.selectDetail.color)),'=====')
 				color = list[i].color?.rgba?.r != null?`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`:''
 					gradient = list[i].gradient
 				if((detailData.currentDetailType == 'sketch' && newData?.sketch) || detailData.isEditPattern.value == 'editSketch'){
@@ -565,11 +563,14 @@ export default defineComponent({
 				}
 			}else{
 				//走画布合成图片并且直接分割
-				if(detailData.isEditPattern.value !== 'canvasEditor'){
-					if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
+				if(detailData.isEditPattern.value !== 'canvasEditor' && detailData.isEditPattern.value !== 'redGreenExample'){
+					if(detailData.isEditPattern.value !== 'canvasEditor'){
+						if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
+					}
 					let otherData = await updateOtherLayers('single')
 					await detailDom.canvasBox.updateOtherLayers(otherData)
 				}
+				
 				await detailDom.canvasBox.privewDetail()
 				await upDateFrontBackSketch()
 				await uploadSelectDetail()
@@ -625,7 +626,7 @@ export default defineComponent({
 				if(detailData.isEditPattern.value && detailData.isEditPattern.value == str){
 					// await detailDom.canvasBox.saveCanvas()
 					await (detailDom.canvasBox as any).privewDetail()
-					if(detailData.isEditPattern.value == 'canvasEditor')await uploadSelectDetail()
+					if(detailData.isEditPattern.value == 'canvasEditor' || detailData.isEditPattern.value == 'redGreenExample')await uploadSelectDetail()
 					detailData.isEditPattern.value = ''
 				}else{
 					// if(detailData.isEditPattern.value && (str == 'canvasEditor' || str == 'redGreenExample')){
@@ -780,8 +781,7 @@ export default defineComponent({
 					color.gradient = canvasColor.gradient
 				}
 			}
-
-			if(detailData.isEditPattern.value == 'canvasEditor'){
+			if(detailData.isEditPattern.value == 'canvasEditor' || detailData.isEditPattern.value == 'redGreenExample'){
 				delete detailData.selectDetail.newDetail
 				detailData.selectDetail.trims.prints = allInfo.trims || []
 				detailData.selectDetail.printObject.prints = allInfo.prints || []
@@ -804,7 +804,6 @@ export default defineComponent({
 			if(detailData.currentDetailType == 'color'){
 				detailData.detailLeftColorKey++
 			}
-			
 		}
 		const canvasReload = async ()=>{
 			if(detailData.isEditPattern.value){

src/component/Detail/model/index.vue

@@ -124,7 +124,11 @@ export default defineComponent({
 		const handleResize = ()=>{ 
 			clearTimeout(time)
 			time = setTimeout(()=>{
-				store.commit('DesignDetail/setDesignDetail',getDetailListData.designDetail)
+				let data = {
+					...getDetailListData.designDetail,
+					fromType:'resize',
+				}
+				store.commit('DesignDetail/setDesignDetail',data)
 				getDetailListDom.position?.updataPosition?.()
 				getDetailListDom.modelNav?.setItemPosition?.()
 				getDetailListDom.position?.updateRect?.()

src/component/HomePage/Generate.vue

@@ -734,7 +734,9 @@ export default defineComponent({
       let maxImg = 8
       if (this.type_.type2 == 'Sketchboard') {
         maxImg = 20
-      }
+      }else if(this.type_.type2 == 'Printboard'){
+		maxImg = 16
+	}
       let parent: any = this.$parent
       if (parent.isUseGenerate) {
         // parent.useGenerate.designType = 'collection'

src/component/HomePage/layout.vue

@@ -70,7 +70,7 @@
 					<div class="layout_left_text">
 						{{ $t('layout.LayerOptions') }}
 					</div>
-					<div v-for="item,index in moodbList" class="layout_left_items" @click="setmoodb(item)">
+					<div v-for="item,index in moodbList" class="layout_left_items" :class="item.filter((item,index)=>item == 'w2h1').length != 0 ? 'active':''" @click="setmoodb(item)">
 						<div v-for="clasitem,clasindex in item" :class="clasitem" class="layout_left_item">
 						</div>
 					</div>
@@ -932,15 +932,17 @@ export default defineComponent({
 			height: calc(35rem*1.2);
 			width: calc(57rem*1.2);
 			// height: 60%;
-			flex-direction: column;
-			flex-wrap: wrap;
 			align-content: space-around;
 			margin: calc(3rem*1.2) auto;
 			overflow: hidden;
 			// padding: 3rem 0;
 			justify-content: space-between;
 			position: relative;
-			user-select:none
+			
+			flex-direction: column;
+			align-items: center;
+			flex-wrap: wrap;
+			justify-content: space-between;
 			&.active{
 				flex-direction: row;
 			}
@@ -1120,6 +1122,9 @@ export default defineComponent({
 				flex-direction: column;
 				margin-bottom: calc(2rem*1.2);
                 cursor: pointer;
+				&.active{
+					flex-direction: row;
+				}
 				.layout_left_item{
 					box-sizing: border-box;
 					border: 1px solid #000;
@@ -1152,6 +1157,9 @@ export default defineComponent({
 				flex-direction: column;
 				margin-bottom: calc(2rem*1.2);
                 cursor: pointer;
+				&.active{
+					flex-direction: row;
+				}
 				.layout_left_item{
 					box-sizing: border-box;
 					border: 1px solid #000;

src/component/HomePage/renew.vue

@@ -233,7 +233,7 @@
             {{ $t('upgradePlan.Continue') }}
           </div>
           <div class="payMethod_payAffirm_clause" ref="labelDisclaimer">
-            <label>
+            <label class="clause">
               <!-- <input type="checkbox" v-model="clause" /> -->
               <span class="generalModelDescription">
                 {{ $t('upgradePlan.policy') }}
@@ -251,6 +251,7 @@
                   {{ $t('upgradePlan.policy2') }}
                 </a>
                 <!-- . * -->
+                {{ $t('upgradePlan.statement') }}
               </span>
             </label>
             <label class="secure">
@@ -861,6 +862,7 @@ export default defineComponent({
           display: flex;
           flex-direction: column;
           align-items: center;
+		  color: #8A8A8A;
           label {
             input {
               margin-right: 1rem;
@@ -871,18 +873,22 @@ export default defineComponent({
               vertical-align: top;
               font-size: 1.4rem;
               a {
-                color: #000;
+		  		color: #8A8A8A;
                 text-decoration: underline;
               }
             }
           }
+		  > .clause{
+            margin-top: 2rem;
+			text-align: left;
+		  }
           > .secure {
             border: 1px solid #ededed;
             background: #f1fbf9;
             color: #1cb36c;
             padding: 0.4rem 0.8rem;
             border-radius: 0.5rem;
-            margin-top: 4rem;
+            margin-top: 2rem;
             > span {
               display: flex;
               align-items: center;

src/component/home/design/collection/MoodboardUpload.vue

@@ -476,6 +476,11 @@ export default defineComponent({
 		},
 		setmoodbClass(val:any){
 			this.moodb_className = val
+			if( val.filter((item,index)=> item == 'w2h1').length != 0  && val.length > 4){
+				this.flex_direction = true
+			}else{
+				this.flex_direction = false
+			}
 		}
     },
 });

src/component/home/design/index.vue

@@ -745,6 +745,12 @@ export default defineComponent({
 					"userLikeId": likeItem.id
 				}
 				arrData.push(obj)
+				designData.selectLikeDesign.forEach((v:any)=>{
+					if(v.id === likeItem.id){
+						v.oldSort = v.sort
+						v.sort = likeItem.sort
+					}
+				})
 			})
 			let data = {
 				"userLikeGroupId": userGroupId.value,
@@ -1304,9 +1310,9 @@ export default defineComponent({
 					})
 					return
 				}
-				const parents = designData.selectLikeDesign.filter((item:any) => item.resultType === 'Design');
+				const parents = designData.selectLikeDesign.filter((item:any) => item.resultType === 'Design').filter((item:any) => likeDesignCollectionList.value.some((v:any) => (v.id === item.id)));
 				parents.map((parent:any) => {
-					parent.sort = parent.oldSort||parent.sort
+					parent.sort = likeDesignCollectionList.value.find((v:any) => v.id === parent.id)?.sort || parent.oldSort||parent.sort
 					delete parent.oldSort
 					return {
 					...parent,
@@ -1533,7 +1539,7 @@ export default defineComponent({
 					this.observerData.time = setTimeout(()=>{
 						
 						this.setSystemDesigner(0)
-						this.setDesignItemStyle()
+						// this.setDesignItemStyle()
 					},100)
 					// const { width } = entry.contentRect;
 				}
@@ -1931,6 +1937,7 @@ export default defineComponent({
 			this.disLikeLoading = true;
 			Https.axiosPost(Https.httpUrls.designDislike, data)
 				.then((rv: any) => {
+					console.log(rv)
 					if (rv) {
 						this.recycleDomHidden = true
 						this.store.commit("addDesignCollectionList", [design]);

src/component/home/design/tools.vue

@@ -163,6 +163,7 @@ export default defineComponent({
 				if(value == 'toProduct'){
 					list.forEach((item:any) => {
 						item.type = 'DesignOutfit'
+						item.isChecked = false
 						fileList.push(item)
 						item.childList.forEach((child:any) => {
 							if(child.resultType == 'ToProductImage'){
@@ -174,6 +175,7 @@ export default defineComponent({
 					list.forEach((item:any) => {
 						if(item.childList){
 							item.childList.forEach((child:any) => {
+								child.isChecked = false
 								if(child.resultType == 'ToProductImage' || child.resultType == 'Relight'){
 									fileList.push(child)
 								}

src/component/mainPage/signUp/index.vue

@@ -75,6 +75,7 @@
           <div class="highlight" v-if="item?.highlight">{{ item?.highlight }}</div>
         </div>
       </div>
+		<span class="statement">{{ productList.Statement }}</span>
     </div>
     <registerModel ref="registerModel"></registerModel>
   </div>
@@ -104,6 +105,7 @@ export default defineComponent({
         Advantages: '我们的价格方案',
         Monthly: '月度',
         Yearly: '年度',
+		Statement: '*所有付费订阅服务均不可退款。',
         monthly: [
           {
             title: '试用版',
@@ -248,6 +250,7 @@ export default defineComponent({
         Advantages: 'Our Pricing Plan',
         Monthly: 'Monthly',
         Yearly: 'Yearly',
+		Statement: '*All paid subscription is non-refundable',
         monthly: [
           {
             title: 'Trial',
@@ -608,6 +611,13 @@ export default defineComponent({
       justify-content: center;
     }
   }
+  .statement{
+	width: 100%;
+	margin-top: 5rem;
+	font-size: 1.4rem;
+	text-align: center;
+	color: #8A8A8A;
+}
   .gallery_list {
     display: flex;
     // justify-content: center;
@@ -617,6 +627,7 @@ export default defineComponent({
     @media (max-width: 767px) {
       margin-top: 2.4rem;
     }
+	
     .gallery_item {
       width: 36.2rem;
       height: 46.8rem;

src/component/mainPage/signUp/registerModel.vue

@@ -226,7 +226,12 @@
               <div class="login_form_title marign_top30">
                 <label :class="{ active: emailStap == 2 }">
                   <input :state="emailStap" type="checkbox" v-model="checked" />
-                  <span>{{userI18n[selectUserI18n].articles}}</span>
+                   <span>
+					{{ userI18n[selectUserI18n].AgreeTo }} 
+					<a href="https://code-create.com.hk/aida-terms-and-conditions/" target="_blank" style="text-decoration: underline;color: #000;">{{ userI18n[selectUserI18n].Terms }}</a>, 
+					<a href="https://aida.com.hk/privacy-policy.html" target="_blank" style="text-decoration: underline;color: #000;">{{ userI18n[selectUserI18n].PrivacyPolicy }}</a>, 
+					{{ userI18n[selectUserI18n].AndFees }}
+				</span>
                 </label>
               </div>
               <div class="thirdPartyLogin marign_top30">
@@ -386,7 +391,10 @@ export default defineComponent({
 			SentTo:'Sent to',
 			Resend:'Resend',
 			PleaseCheck:"Please check the junk box if you haven't received verification code",
-			articles:'I agree to the Terms, Privacy Policy, and Fees.',
+			AgreeTo: 'I agree to the',
+			Terms: 'Terms',
+			PrivacyPolicy: 'Privacy Policy',
+			AndFees: 'and Fees.',
 			Register:'Register',
 			google:'Register with Google',
 			wechat:'Register with wechat',
@@ -407,7 +415,10 @@ export default defineComponent({
 			SentTo:'发送到',
 			Resend:'重新发送',
 			PleaseCheck:"如果没有收到验证码，请检查垃圾邮件",
-			articles:'我同意相关条款、隐私政策以及费用规定。',
+			AgreeTo: '我同意',
+			Terms: '条款',
+			PrivacyPolicy: '隐私政策',
+			AndFees: '和费用',
 			Register:'注册',
 			google:'使用谷歌进行注册',
 			wechat:'使用微信进行注册',

src/component/modules/habitSetStyle.vue

@@ -258,6 +258,7 @@ methods: {
 					display: flex;
 					justify-content: center;
 					align-items: center;
+					text-align: center;
 				}
 			}
 			.content_bottom_item:nth-child(4n){

src/lang/cn.ts

@@ -156,11 +156,12 @@ export default {
     Payment: '付款',
     PurchasePoints: '购买',
     paymentmethod: '请选择付款方式',
-    policy: '继续注册账号即表示您同意我们的使用',
+    policy: '*继续注册账号即表示您同意我们的使用',
     policy1: '条款',
     policy2: '服务协议',
     policy3: '(包括服务范围)及',
     policy4: '订购协议',
+	statement: '所有付费订阅服务均不可退款。',
     completed: '是否已完成支付？',
     hint: '请保持窗口打开，直到付款完成。如果您无法打开付款窗口，请检查您的浏览器设置，看看弹出窗口是否被阻止。成功付款后，积分可能会延迟发放。请等待1-3分钟，点击积分刷新按钮',
     Back: '返回'

src/lang/en.ts

@@ -158,11 +158,12 @@ export default {
 		Payment: 'Payment',
 		PurchasePoints: 'Purchase points',
 		paymentmethod: 'select a payment method',
-		policy: 'By continuing an account, you agree to our',
+		policy: '*By continuing an account, you agree to our',
 		policy1: 'Terms',
 		policy2: 'Conditions',
 		policy3: ' (including the Scope of service) and the ',
 		policy4: 'Subscription Agreement',
+		statement: 'All paid subscription is non-refundable',
 		completed: 'Is payment completed',
 		hint: 'Please keep the window open until the payment is completed. If you are unable to open the payment window, please check your browser settings to see if pop-ups are being blocked.Points may be delayed after successful payment. Please wait 1-3 minutes and click the credits refresh button',
 		Back: 'Back'

src/router/index.ts

@@ -337,6 +337,13 @@ const routes: Array<RouteRecordRaw> = [
         meta: { enter: 3 },
         component: () =>
           import("@/component/Administrator/SE/getGenerateFrequency/index.vue"),
+      },
+	  {
+        path: "globalAwardPopularity",
+        name: "globalAwardPopularity",
+        meta: { enter: 3 },
+        component: () =>
+          import("@/component/Administrator/globalAwardPopularity.vue"),
       },
     ],
   },

src/store/Detail/designDetail.ts

@@ -87,8 +87,10 @@ const DesignDetail : Module<DesignDetail,RootState> = {
 						left:0,
 						top:0,
 					}
-					v.maskMinioUrl = v.layersObject?.[0]?.maskMinioUrl
-					v.maskUrl = v.layersObject?.[0]?.maskUrl
+					if(data?.fromType !== 'resize'){
+						v.maskMinioUrl = v.layersObject?.[0]?.maskMinioUrl
+						v.maskUrl = v.layersObject?.[0]?.maskUrl
+					}
 					v.layersObject[i].designOpenrtionBtn = false
 					if(v.layersObject[i].imageCategory.indexOf("back") == -1){
 						front[index] = v.layersObject[i]

src/tool/adminRouter.js

@@ -198,6 +198,13 @@ const all = (t)=>{
       route: '/administrator/subscriptionPlan',
       key: 'sub14',
       isShow: true
+    },
+    {
+      name: 'Global Award Popularity',
+      icon: 'usetime',
+      route: '/administrator/globalAwardPopularity',
+      key: 'sub15',
+      isShow: true
     }
   ]
 }

src/tool/https.js

@@ -346,6 +346,7 @@ export const Https = {
 		switchSubscribePlan: '/api/subscription_plan/switchSubscriptionPlan', // 切换管理员订阅计划
 		switchSubAccountSubscribePlan:
 			'/api/subscription_plan/switchSubAccSubscriptionPlan', // 切换子账号订阅计划
+		getGlobalAwardPopularity: '/api/global-award/page/visit/count', // 获取global award流量
 
 		//云生成
 		designCloud: `/api/design/designCloud`, //创建云生成