+
+
![]()
@@ -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 ()=>{
diff --git a/src/component/HomePage/Header.vue b/src/component/HomePage/Header.vue
index 7cef43cb..48fefe85 100644
--- a/src/component/HomePage/Header.vue
+++ b/src/component/HomePage/Header.vue
@@ -20,8 +20,8 @@
>
-
-
+
+
+
{{$t('Header.logOff')}}
@@ -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;
@@ -611,7 +627,7 @@ export default defineComponent({
margin: .7rem;
}
}
-
+
.icon-xiala {
font-size: 1.4rem;
cursor: pointer;
@@ -625,6 +641,36 @@ export default defineComponent({
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;
diff --git a/src/component/HomePage/UpgradePlan.vue b/src/component/HomePage/UpgradePlan.vue
index b71813a5..f5bf7533 100644
--- a/src/component/HomePage/UpgradePlan.vue
+++ b/src/component/HomePage/UpgradePlan.vue
@@ -59,9 +59,9 @@
{{ price.credits * price.num }} credits
${{ price.price * price.num }} USD
-
+
-
-
+
+ +
All credits are shared within the {{ }} name organization
UPGRADE NOW
@@ -242,6 +242,7 @@ export default defineComponent({
},
cancelDsign(){
this.showUpgradePlan = false
+ this.cancel()
},
},
});
diff --git a/src/component/Pay/payOrder.vue b/src/component/Pay/payOrder.vue
index 44f0e1e6..9b40e823 100644
--- a/src/component/Pay/payOrder.vue
+++ b/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.httpUrls.tradeRefund + `/${record.orderNo}/${"123"}`,
- // {}
- // ).then((rv: any) => {
- // console.log(rv);
- // })
- // .catch((res) => {});
+ Https.axiosPost(
+ Https.httpUrls.tradeRefund + `/${record.orderNo}/${"123"}`,
+ {}
+ ).then((rv: any) => {
+ console.log(rv);
+ })
+ .catch((res) => {});
},
},
});
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 492a085d..116a115e 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -112,7 +112,8 @@
{{ $t('HomeView.SelectedDesign') }}
-