支付退款

src/assets/style/style.css

@@ -621,14 +621,16 @@ li {
 .payOrder_modal .ant-modal-body,
 .design_detail_modal_component .ant-modal-body,
 .designOpenrtion_modal .ant-modal-body,
-.library_page .ant-modal-body {
+.library_page .ant-modal-body,
+.Export .ant-modal-body {
   overflow-y: hidden;
 }
 .collection_modal .design_title_text,
 .payOrder_modal .design_title_text,
 .design_detail_modal_component .design_title_text,
 .designOpenrtion_modal .design_title_text,
-.library_page .design_title_text {
+.library_page .design_title_text,
+.Export .design_title_text {
   font-size: var(--aida-fsize2);
   font-weight: 900;
   color: rgba(0, 0, 0, 0.65);
@@ -639,7 +641,8 @@ li {
 .payOrder_modal .design_title_text .design_title_text_intro,
 .design_detail_modal_component .design_title_text .design_title_text_intro,
 .designOpenrtion_modal .design_title_text .design_title_text_intro,
-.library_page .design_title_text .design_title_text_intro {
+.library_page .design_title_text .design_title_text_intro,
+.Export .design_title_text .design_title_text_intro {
   font-size: var(--aida-fsize1-4);
   font-weight: 400;
   color: rgba(0, 0, 0, 0.45);
@@ -648,7 +651,8 @@ li {
 .payOrder_modal .ant-upload.ant-upload-select-picture-card,
 .design_detail_modal_component .ant-upload.ant-upload-select-picture-card,
 .designOpenrtion_modal .ant-upload.ant-upload-select-picture-card,
-.library_page .ant-upload.ant-upload-select-picture-card {
+.library_page .ant-upload.ant-upload-select-picture-card,
+.Export .ant-upload.ant-upload-select-picture-card {
   background: #FFFFFF;
   width: calc(6rem*1.2);
   height: calc(6rem*1.2);
@@ -660,7 +664,8 @@ li {
 .payOrder_modal .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao,
 .design_detail_modal_component .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao,
 .designOpenrtion_modal .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao,
-.library_page .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao {
+.library_page .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao,
+.Export .ant-upload.ant-upload-select-picture-card .upload_tip_block .icon-jiahao {
   font-size: calc(3.2rem*1.2);
   color: #B7B7B7;
 }
@@ -668,7 +673,8 @@ li {
 .payOrder_modal .ant-upload.ant-upload-select-picture-card .ant-upload-text,
 .design_detail_modal_component .ant-upload.ant-upload-select-picture-card .ant-upload-text,
 .designOpenrtion_modal .ant-upload.ant-upload-select-picture-card .ant-upload-text,
-.library_page .ant-upload.ant-upload-select-picture-card .ant-upload-text {
+.library_page .ant-upload.ant-upload-select-picture-card .ant-upload-text,
+.Export .ant-upload.ant-upload-select-picture-card .ant-upload-text {
   font-size: calc(1.6rem*1.2);
   color: #B7B7B7;
 }
@@ -676,14 +682,16 @@ li {
 .payOrder_modal .ant-upload-list-picture-card-container,
 .design_detail_modal_component .ant-upload-list-picture-card-container,
 .designOpenrtion_modal .ant-upload-list-picture-card-container,
-.library_page .ant-upload-list-picture-card-container {
+.library_page .ant-upload-list-picture-card-container,
+.Export .ant-upload-list-picture-card-container {
   display: none !important;
 }
 .collection_modal .ant-upload-picture-card-wrapper,
 .payOrder_modal .ant-upload-picture-card-wrapper,
 .design_detail_modal_component .ant-upload-picture-card-wrapper,
 .designOpenrtion_modal .ant-upload-picture-card-wrapper,
-.library_page .ant-upload-picture-card-wrapper {
+.library_page .ant-upload-picture-card-wrapper,
+.Export .ant-upload-picture-card-wrapper {
   width: auto;
   vertical-align: top;
 }
@@ -937,6 +945,12 @@ i {
 .library_page .upload_item .upload_file_item .upload_img_icon {
   width: calc(4.6rem*1.2);
 }
+.hideChecked {
+  user-select: none;
+  -moz-user-select: none;
+  -webkit-user-select: none;
+  -ms-user-select: none;
+}
 .cut_pricture_modal .ant-modal-content {
   border-radius: 1rem;
 }

src/assets/style/style.less

@@ -722,7 +722,7 @@ ul,li{
 	}
 }
 //collection 弹窗
-.collection_modal,.payOrder_modal,.design_detail_modal_component,.designOpenrtion_modal,.library_page{
+.collection_modal,.payOrder_modal,.design_detail_modal_component,.designOpenrtion_modal,.library_page,.Export{
 	
     .ant-modal-body{
         overflow-y: hidden;
@@ -988,7 +988,12 @@ i{
 		}
 	}
 }
-
+.hideChecked{
+	user-select: none;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+}
 //剪裁弹窗
 .cut_pricture_modal{
 	.ant-modal-content{

src/component/Detail/DesignDetail.vue

@@ -148,7 +148,8 @@
 import { defineComponent,computed,ref,provide,nextTick,createVNode} from 'vue'
 import DesignDetailAlter from '@/component/Detail/DesignDetailAlter.vue'
 import magnifyingGlass from '@/component/Detail/magnifyingGlass.vue'
-import setDesignItem from '@/component/Detail/setDesignItem2.vue'
+import setDesignItem from '@/component/Detail/setDesignItem.vue'
+// import setDesignItem from '@/component/Detail/setDesignItem2.vue'
 import setDesignItemMobile from '@/component/Detail/setDesignItemMobile.vue'
 import Draggable from 'vuedraggable'
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';

src/component/HomePage/ExportModel.vue

@@ -0,0 +1,155 @@
+<template>
+   <a-modal class="modal_component Export" 
+            v-model:visible="showUpgradePlan" 
+            :footer="null" 
+            width="78%"
+            :maskClosable="false"
+            :centered="true"
+			:closable="false"
+			:keyboard="false"
+        >
+        <div class="UpgradePlan_closeIcon">
+				
+			<i class="fi fi-rr-cross-small" @click.stop="cancelDsign()"></i>
+		</div>
+		<div class="UpgradePlan_content">
+			<div>Export</div>
+		</div>
+		<!-- <div>
+			<canvas ref="exportCanvas"></canvas>
+		</div> -->
+		<div class="exportCanvasBox">
+			<ExportNewCoolection ref="ExportNewCoolection"></ExportNewCoolection>
+		</div>
+	</a-modal>
+</template>
+<script lang="ts">
+import { defineComponent, computed, h, ref, nextTick, inject } from "vue";
+import { Https } from "@/tool/https";
+import scaleImage from "@/component/HomePage/scaleImage.vue";
+import ExportNewCoolection from "@/component/HomePage/ExportNewCoolection.vue";
+export default defineComponent({
+	components: {
+		scaleImage,	
+		ExportNewCoolection,
+	},
+    props: ["msg",'sketchCatecoryList'],
+    setup() {
+        // console.log(prop.msg);
+        let showUpgradePlan = ref(false)
+	
+        return {
+			showUpgradePlan,
+        };
+    },
+    data(prop) {
+        return {
+		}
+    },
+	
+    mounted() {
+    },
+	watch:{
+		// driver__:{
+		// 	handler(newVal,oldVal){
+		// 		if(this.type_.type2 == 'Printboard'){
+		// 			if(newVal.index >= 14 && newVal.index < 15){
+		// 				this.setKeyword(newVal.index-14)
+		// 			}else{
+		// 			}
+		// 		}else if(this.type_.type2 == 'Sketchboard'){
+					
+		// 		}
+				
+		// 	}
+		// },
+		
+	},
+    methods: {
+        init(){
+			this.showUpgradePlan = true
+		},
+		
+		cancelDsign(){
+			this.showUpgradePlan = false
+		},
+    },
+});
+</script>
+<style lang="less" scoped>
+.Export {
+	flex: 1;
+    // height: 30rem;
+    // overflow-x: hidden;
+	display: flex;
+    flex-direction: column;
+    border-right: 1px solid #e5e5e5;
+	position: relative;
+	.UpgradePlan_content{
+		font-size: var(--aida-fsize2);
+		font-weight: 900;
+		color: rgba(0, 0, 0, 0.65);
+	}
+    .UpgradePlan_closeIcon{
+		top: calc(2rem*1.2);
+		right: calc(2rem*1.2);
+        cursor: pointer;
+		width: calc(4rem*1.2);
+		height: calc(4rem*1.2);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: absolute;
+		.fi-rr-cross-small::before{
+			padding: calc(.2rem*1.2);
+			border-radius: 5px;
+			border: solid 2px rgba(0, 0, 0, 0.25);
+			transition: 1s all;
+			color: rgba(0, 0, 0, 0.55);
+		}
+		&.UpgradePlan_closeIcon:hover .fi-rr-cross-small::before{
+			border: solid 2px rgba(0, 0, 0, 0.55);
+			color: rgba(0, 0, 0, 1);
+		}
+	}
+	.exportCanvasBox{
+		flex: 1;
+		overflow-x: hidden;
+		.export_new_collection_review{
+			position: initial;
+			margin: 10rem auto;
+			margin-bottom: 0;
+		}
+	}
+	
+}
+	
+
+</style>
+<style lang="less">
+.Export{
+	.ant-modal-content{
+		border-radius: calc(1rem*1.2);
+		overflow: hidden;
+		.ant-modal-header{
+			background-color: #fff;
+			border-bottom: none;
+		}
+		.ant-modal-body{
+			display: flex;
+			flex-direction: column;
+			padding: calc(5rem*1.2) calc(5rem*1.2) !important;
+			// height: calc(65vh - 6.4rem);
+			height: calc(65rem*1.2);
+		}
+		//进度完成字体颜色
+		.ant-progress-circle.ant-progress-status-success .ant-progress-text{
+			color: #000;
+		}
+		.ant-progress-circle .ant-progress-text{
+			color:rgba(0, 0, 0, 0.55);
+			font-size: calc(1.6rem*1.2);
+		}
+	}
+}
+</style>

src/component/HomePage/ExportNewCoolection.vue

@@ -49,8 +49,10 @@
                 </div>
             </div>
         </div> -->
-		<div v-show="exportNav[3].change" class="img_block_item img_block_item_sketch">
+		<div v-show="exportNav[3].change" class="img_block_item img_block_item_sketch" >
-            <div class="lager_img_item" :class="'lager_img_item'+index" v-for="(item,index) in sketch" :key="item">
+            <div class="lager_img_item" draggable :class="'lager_img_item'+index" v-for="(item,index) in sketch" @dragstart="dragstart($event, index)"
+											@dragover.prevent 
+											@drop="dragDrop($event, index)" :key="item">
 				<div class="all_img_item_block" v-for="v in item" :key="sketch">
                     <img class="all_img_content" :src="v?.urlWithWhiteSide">
 				</div>
@@ -88,12 +90,14 @@ export default defineComponent({
         let allBoardData:any = computed(()=>{return store.state.UploadFilesModule.allBoardData})
         let likeDesignCollectionList : any = computed(()=>{return store.state.HomeStoreModule.likeDesignCollectionList})
 		let exportNav = inject('exportNav')
+		let dragIdx = 0
         return {
             allBoardData,
             likeDesignCollectionList,
 			sketch,
 			sketchList,
 			exportNav,
+			dragIdx,
         }
     },
 	watch: {
@@ -117,6 +121,17 @@ export default defineComponent({
 		// },
 	},
 	methods: {
+		dragstart (e:any, index:any) {
+			console.log(12312312312312);
+			
+			this.dragIdx = index
+			},
+			dragDrop (e:any, index:any) {
+			let _teams = this.likeDesignCollectionList  //将hotteams存起来
+			let _dragitem = _teams[this.dragIdx]  //将被拖拽的那条数据存起来
+			_teams.splice(this.dragIdx, 1)      //删除被拖拽的那条数据
+			_teams.splice(index, 0, _dragitem)  //将被拖拽的那条数据放到数组中指定的位置
+			},
 		setSketch(){
 			this.sketch = [[],[],[]]
 			nextTick().then(async ()=>{

src/component/HomePage/Header.vue

@@ -20,8 +20,8 @@
                     ></div>
                    
                 </div>
-				<div class="header_user_content marLeft2">
+				
-					<!-- <span class="icon iconfont icon-yuyan"></span> -->
+				<!-- <div class="header_user_content marLeft2">
 					<span class="username">{{$t('Header.language')}}</span>
 					<div
                         :class="[
@@ -32,21 +32,27 @@
                         ]"
                         @click.stop="changeLanguage()"
                     ></div>
-				</div>
+				</div> -->
 				<div
+					class="trialApproval button_second credits hideChecked"
+                >
+					Credits : 
+					<span :title="presentAssignment">
+						<!-- <div>{{ String(presentAssignment[presentAssignment.legnth-1]) }}</div> -->
+						<div class="credits_item" v-for="item in String(presentAssignment)" :style="{'transform': 'translateY('+item*-100+'%)'}">
+							<div v-for="numItem in 10">{{ numItem-1 }}</div>
+						</div>
+					</span>
+					<i @click="Assignment" class="fi fi-rr-gift" title="Assignment"></i>
+					<i @click="UpgradePlan" title="Purchase" class="fi fi-rr-shop"></i>
+                </div>
+				<!-- <div
 					v-if="userInfo.userId == 83"
 					class="trialApproval button_second"
                     @click="turnToPage('trialApproval')"
                 >
 					Trial Approval
-                </div>
+                </div> -->
-				<div
-					class="trialApproval button_second"
-                    @click="UpgradePlan()"
-                >
-					Upgrade Plan
-                </div>
-				
             </div>
             <nav class="header_nav_content">
                 <div
@@ -93,10 +99,10 @@
 			<!-- <div class="select_item" @click="showBindEmailModal()">
 				<span class="icon iconfont icon-youxiang"></span><span class="select_item_des">{{$t('Header.bindEmail')}}</span>
 			</div> -->
-			<!-- <div class="select_item" @click.stop="isLanguage = !isLanguage">
+			<div class="select_item" @click.stop="isLanguage = !isLanguage">
 				<span class="icon iconfont icon-yuyan"></span>
 				<span class="select_item_des">{{$t('Header.language')}}</span>
-			</div> -->
+			</div>
 			<div class="select_item" @click="logout()">
 				<span class="icon iconfont icon-tuichu"></span
 				><span class="select_item_des">{{$t('Header.logOff')}}</span>
@@ -225,6 +231,7 @@ export default defineComponent({
             timerSec: null,
             modalWarning: null,
             isLanguage: false,
+
 			language:[
 				{name:'English',value:'ENGLISH'},
 				{name:'中文',value:'CHINESE_SIMPLIFIED'},
@@ -235,9 +242,15 @@ export default defineComponent({
 				// {name:'แบบไทย',value:'THAI'},
 				// {name:'Tiếng Việt',value:'VIETNAMESE'},
 				// {name:'Italiano',value:'ITALIAN'},       
-			]
+			],
+			presentAssignment:String(0),
         };
     },
+	watch: {
+		// presentAssignment(newVal,oldVal){
+		// 	console.log(String(newVal).length);
+		// }
+	},
     mounted() {
         let isTest = getCookie('isTest')//获取是否是试用用户
         this.isTest =JSON.parse(isTest)
@@ -265,10 +278,13 @@ export default defineComponent({
             let noRefresh = name === "home" ? true : false;
             this.$router.push({ name: name, params: { noRefresh: noRefresh } });
         },
-		UpgradePlan(){
+		UpgradePlan(){//购买积分
 			let UpgradePlan = this.$refs.UpgradePlan
 			UpgradePlan.init()
 		},
+		Assignment(){//任务
+			this.presentAssignment = Number(this.presentAssignment) + 123
+		},
         //点击下拉图标出现操作
         changeShowOperateContent() {
             this.isShowOperate = !this.isShowOperate;
@@ -624,6 +640,36 @@ export default defineComponent({
                 transform: rotate(180deg);
                 animation-direction: 0.5s;
             }
+        }
+		.credits{
+			font-size: 1.8rem;
+			color: #1a1a1a;
+			font-weight: 900;
+			width: auto;
+			padding: 0 1rem;
+			cursor: auto;
+			display: flex;
+			span{
+				width: 5rem;
+				display: inline-block;
+				overflow: hidden;
+				display: flex;
+				.credits_item{
+					transition: .3s all;
+					div{
+						height: 100%;
+					}
+				}
+			}
+			i{
+				height: 100%;
+				display: inline-block;
+				border-left: .1rem solid ;
+				padding-left: .9rem;
+				margin-left: .9rem;
+				font-size: 1.8rem;
+				cursor: pointer;
+			}
 		}
 		.trialApproval{
 			margin-left: 2rem;
@@ -643,7 +689,8 @@ export default defineComponent({
 	border: 1px solid #000000;
 	&.select_list{
 		// display: none;
-		transform: translateX(120%);
+		transform: translateX(105%);
+		// transform: translateX(120%);
 	}
 	.select_item {
 		padding-left: 1.5rem;

src/component/HomePage/UpgradePlan.vue

@@ -59,9 +59,9 @@
 					<div class="UpgradePlan_payList2_name">{{ price.credits * price.num }} credits</div>
 					<div class="UpgradePlan_payList2_unitPrice">${{ price.price * price.num }} <span @click="setUnit">USD</span></div>
 					<div class="UpgradePlan_payList2_input">
-						<div class="UpgradePlan_payList2_input_add" @click="addPriceNum">+</div>
-						<input type="number" v-model="price.num">
 						<div class="UpgradePlan_payList2_input_remo"  @click="removePriceNum">-</div>
+						<input type="number" v-model="price.num">
+						<div class="UpgradePlan_payList2_input_add" @click="addPriceNum">+</div>
 					</div>
 					<div class="UpgradePlan_payList2_describe">All credits are shared within the {{  }} name organization</div>
 					<div class="UpgradePlan_payList-item-upgrade subitOkPreviewBtn" @click="upgrade">UPGRADE NOW</div>
@@ -242,6 +242,7 @@ export default defineComponent({
 		},
 		cancelDsign(){
 			this.showUpgradePlan = false
+			this.cancel()
 		},
     },
 });

src/component/Pay/payOrder.vue

@@ -312,13 +312,13 @@ export default defineComponent({
             // this.$router.push({name:'home',params: {id:record.id}})
             console.log(record);
 			this.showRefundReason = true
-            // Https.axiosPost(
+            Https.axiosPost(
-            //     Https.httpUrls.tradeRefund + `/${record.orderNo}/${"123"}`,
+                Https.httpUrls.tradeRefund + `/${record.orderNo}/${"123"}`,
-            //     {}
+                {}
-            // ).then((rv: any) => {
+            ).then((rv: any) => {
-			// 	console.log(rv);
+				console.log(rv);
-			// })
+			})
-			// .catch((res) => {});
+			.catch((res) => {});
         },
     },
 });

src/views/HomeView.vue

@@ -112,7 +112,8 @@
 									<i class="fi fi-rs-comments"></i><span class="content_header_des">{{ $t('HomeView.SelectedDesign') }}</span>
 								</div>
 								<div class="right_content_export" v-show="likeDesignCollectionList.length">
-									<div class="button_second Guide_1_31" @click="exportCanvas()">
+									<!-- <div class="button_second Guide_1_31" @click="exportCanvas()"> -->
+									<div class="button_second Guide_1_31" @click="exportModel()">
 										{{ $t('HomeView.Export') }}
 									</div>
 									<div
@@ -190,6 +191,7 @@
 		<CollectionModal ref="collectionModal" @finishCollection="finishCollection()"></CollectionModal>
 		<DesignDetail ref="designDetail" @finishRedesign="finishRedesign"></DesignDetail>
 		<ExportNewCoolection id="exportNewCoolection"></ExportNewCoolection>
+		<ExportModel ref="ExportModel"></ExportModel>
 		<!-- 导出缩略图的蒙层 start-->
 		<div class="mark_loading" v-show="isShowMark">
 			<a-spin size="large" />
@@ -215,11 +217,12 @@
 
 <script lang="ts">
 import { defineComponent, h, ref, computed ,inject,provide,nextTick,createVNode} from "vue";
-import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+// import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import HeaderComponent from "@/component/HomePage/Header.vue";
 import CollectionModal from "@/component/HomePage/collectionModal.vue";
 import NewCollectionReview from "@/component/HomePage/NewCollectionReview.vue";
 import ExportNewCoolection from "@/component/HomePage/ExportNewCoolection.vue";
+import ExportModel from "@/component/HomePage/ExportModel.vue";
 import affiche from "@/component/HomePage/affiche.vue";
 import DesignDetail from "@/component/Detail/DesignDetail.vue";
 import RobotAssist from "@/component/HomePage/RobotAssist.vue";
@@ -244,6 +247,7 @@ export default defineComponent({
 		NewCollectionReview,
 		DesignDetail,
 		ExportNewCoolection,
+		ExportModel,
 		affiche,
 		RobotAssist,
 		draggable
@@ -492,6 +496,7 @@ export default defineComponent({
 			// affiche.afficheMask = true
 		},
 		dragstart (e:any, index:any) {
+			
 		this.dragIdx = index
 		},
 		dragDrop (e:any, index:any) {
@@ -1000,7 +1005,10 @@ export default defineComponent({
             this.isShowOperate = false;
             document.removeEventListener("click", this.closeShowOperateContent);
         },
-
+		exportModel(){
+			let exportModel:any = this.$refs.ExportModel
+			exportModel.init()
+		},
 		//导出合成图
 		async exportCanvas() {
 			let collectionReview: any = document.querySelector(