-->
+
+
+
+ ![]()
+
+
+
+
+
+ {{ cookieUserInfo.userName }}
+ {{$t('account.email')}}: {{ cookieUserInfo?.email }}
+
+
+
+ {{$t('account.Follow')}}：{{ userInfo?.followeeCount }}
+
+
+ {{$t('account.Fans')}}：{{ userInfo?.followerCount }}
+
+
-
@@ -45,15 +63,19 @@ export default defineComponent({
const {t} = useI18n()
const store = useStore();
+ let userInfo:any= computed(()=>{
+ return store.state.UserHabit.userInfo
+ })
+ let cookieUserInfo = ref(null)
+ if(getCookie('userInfo')){
+ let userInfo:any = getCookie('userInfo')
+ cookieUserInfo.value = JSON.parse(userInfo)
+ }
let accountHomeData = reactive({
rootSubmenuKeys:[
{
- name:t('account.Home'),
- route:'/home/account/accountHome',
- icon:'fi-rr-house-chimney'
- },{
- name:t('account.myInformation'),
- route:'/home/account/accountEdit',
+ name:t('account.frontPage'),
+ route:'/home/account/frontPage',
icon:'fi-rr-user'
},{
name:t('account.Messages'),
@@ -74,6 +96,8 @@ export default defineComponent({
router.push({path:event.item.route})
}
return{
+ userInfo,
+ cookieUserInfo,
...toRefs(accountHomeData),
router,
handleClick,
@@ -89,8 +113,11 @@ export default defineComponent({
\ No newline at end of file
diff --git a/src/component/Account/accountHome.vue b/src/component/Account/accountHome.vue
deleted file mode 100644
index a7ff6bff..00000000
--- a/src/component/Account/accountHome.vue
+++ /dev/null
@@ -1,222 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/component/Account/accountMessage.vue b/src/component/Account/accountMessage.vue
index ea9df2e3..a3f807c4 100644
--- a/src/component/Account/accountMessage.vue
+++ b/src/component/Account/accountMessage.vue
@@ -1,11 +1,5 @@
-
-
-
-
-
-
- ![]()
-
-
-
-
-
- {{ cookieUserInfo.userName }}
- {{$t('account.email')}}: {{ cookieUserInfo?.email }}
-
-
-
- {{$t('account.Follow')}}：{{ userInfo?.followeeCount }}
-
-
- {{$t('account.Fans')}}：{{ userInfo?.followerCount }}
-
-
-
- {{$t('account.editUser')}}
-
-
-
-
-
-
-
-
-
+
+ Search
diff --git a/src/component/Account/followFans/follow.vue b/src/component/Account/followFans/follow.vue
index b2b9d40c..5277d011 100644
--- a/src/component/Account/followFans/follow.vue
+++ b/src/component/Account/followFans/follow.vue
@@ -1,11 +1,15 @@
-
+
+
+
+
Search
diff --git a/src/component/Account/frontPage.vue b/src/component/Account/frontPage.vue
new file mode 100644
index 00000000..d3e4fdad
--- /dev/null
+++ b/src/component/Account/frontPage.vue
@@ -0,0 +1,166 @@
+
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+
+
+
+
diff --git a/src/component/Account/frontPage/bindPage.vue b/src/component/Account/frontPage/bindPage.vue
new file mode 100644
index 00000000..75b3a5b7
--- /dev/null
+++ b/src/component/Account/frontPage/bindPage.vue
@@ -0,0 +1,92 @@
+
+
+
+
+
+
diff --git a/src/component/Account/frontPage/cancelRenewal.vue b/src/component/Account/frontPage/cancelRenewal.vue
new file mode 100644
index 00000000..14d3b41b
--- /dev/null
+++ b/src/component/Account/frontPage/cancelRenewal.vue
@@ -0,0 +1,181 @@
+
+
+
+
+
+
+ Bind Wechat
+
+
+
+ 
+
+
+ Unbound
+ Bind Now
+
+
+
+
+
diff --git a/src/component/Account/accountEdit.vue b/src/component/Account/frontPage/mylnformation.vue
similarity index 94%
rename from src/component/Account/accountEdit.vue
rename to src/component/Account/frontPage/mylnformation.vue
index 29af17bf..5c83f0d1 100644
--- a/src/component/Account/accountEdit.vue
+++ b/src/component/Account/frontPage/mylnformation.vue
@@ -37,7 +37,7 @@
+
+
+
+ Sorry to see you go
+ What is your reason for cancelling AiDA?
+
+
+
+
+ You’re about to cancel your subscription
+
+
+
+ What is your reason for cancelling AiDA?
+
+
+
+ What is your reason for cancelling AiDA?
+
+
+
+
+ Don’t worry!The data you have in Notion will be
+ safe.
+
-
+
@@ -164,18 +164,14 @@ export default defineComponent({
-
\ No newline at end of file
diff --git a/src/component/Detail/DesignDetailEnd.vue b/src/component/Detail/DesignDetailEnd.vue
index fdd10956..020cfe81 100644
--- a/src/component/Detail/DesignDetailEnd.vue
+++ b/src/component/Detail/DesignDetailEnd.vue
@@ -110,7 +110,6 @@ import { Https } from "@/tool/https";
import { useStore } from "vuex";
import { Sketch} from '@ans1998/vue3-color'
import DesignPrintOperation from './DesignPrintOperation.vue';
-import DesignPrintOperationMobile from './DesignPrintOperationMobile.vue';
import DesignElementsOperation from './DesignElements.vue';
import { message,Upload} from 'ant-design-vue';
import { openGuide,driverObj__ } from "@/tool/guide";
@@ -121,7 +120,7 @@ import sketchCategory from "@/component/HomePage/sketchCategory.vue";
export default defineComponent({
props: ["msg"],
components:{
- Draggable,Sketch,DesignPrintOperation,DesignPrintOperationMobile,
+ Draggable,Sketch,DesignPrintOperation,
DesignElementsOperation,sketchCategory
},
setup(prop) {
@@ -262,7 +261,6 @@ export default defineComponent({
setPrint(){
// if(this.current?.printObject?.prints?.[0]?.path){
let DesignPrintOperation = this.$refs.DesignPrintOperation
- // let DesignPrintOperation = isMoible() ? this.$refs.DesignPrintOperationMobile : this.$refs.DesignPrintOperation
DesignPrintOperation.init()
if(this.driver__.driver){
nextTick().then(()=>{
diff --git a/src/component/Detail/DesignElements.vue b/src/component/Detail/DesignElements.vue
index 0c799c46..e52f8bcf 100644
--- a/src/component/Detail/DesignElements.vue
+++ b/src/component/Detail/DesignElements.vue
@@ -1,9 +1,10 @@
-
{{$t('account.Submit')}}
+
-
{{ $t('DesignPrintOperation.Placement') }}
-
+
+
+
+
+
@@ -678,7 +686,7 @@ export default defineComponent({
});
-
\ No newline at end of file
diff --git a/src/component/Detail/DesignPrintOperation.vue b/src/component/Detail/DesignPrintOperation.vue
index ddf402a4..f9cc37ef 100644
--- a/src/component/Detail/DesignPrintOperation.vue
+++ b/src/component/Detail/DesignPrintOperation.vue
@@ -1,10 +1,11 @@
-
+
-
- {{ $t('DesignPrintOperation.Placement') }}
-
+
@@ -27,11 +29,15 @@
+
+
+
+
@@ -62,6 +70,7 @@
-
\ No newline at end of file
diff --git a/src/component/Detail/addDetails.vue b/src/component/Detail/addDetails.vue
index eff266d3..fc83417f 100644
--- a/src/component/Detail/addDetails.vue
+++ b/src/component/Detail/addDetails.vue
@@ -1,8 +1,10 @@
+
@@ -69,7 +75,7 @@ export default defineComponent({
},
});
-
\ No newline at end of file
diff --git a/src/component/Detail/setDesignItemMobile.vue b/src/component/Detail/setDesignItemMobile.vue
deleted file mode 100644
index 83eb0504..00000000
--- a/src/component/Detail/setDesignItemMobile.vue
+++ /dev/null
@@ -1,685 +0,0 @@
-
-
+
+
-
-
\ No newline at end of file
diff --git a/src/component/HomePage/collectionModal.vue b/src/component/HomePage/collectionModal.vue
index 7ab90c50..e67e1a69 100644
--- a/src/component/HomePage/collectionModal.vue
+++ b/src/component/HomePage/collectionModal.vue
@@ -1,12 +1,14 @@
{{ $t('DesignPrintOperation.Scale') }}
-
+
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/component/Events/eventsDetail.vue b/src/component/Events/eventsDetail.vue
index 69751de6..20430784 100644
--- a/src/component/Events/eventsDetail.vue
+++ b/src/component/Events/eventsDetail.vue
@@ -134,7 +134,7 @@ export default defineComponent({
.eventsDetail_page {
min-height: 100%;
width: 100%;
- padding: 0 9rem;
+ padding: 0 6rem;
padding-top: 5rem;
&.active{
diff --git a/src/component/HomePage/ColorboardUpload.vue b/src/component/HomePage/ColorboardUpload.vue
index b725610b..3f254046 100644
--- a/src/component/HomePage/ColorboardUpload.vue
+++ b/src/component/HomePage/ColorboardUpload.vue
@@ -181,6 +181,11 @@ export default defineComponent({
Sketch,
selectImgList,
},
+ props: {
+ collectionStep: {
+ type: Number,
+ }
+ },
setup(){
// console.log(isMoible());
let fileList = ref([])
@@ -236,6 +241,33 @@ export default defineComponent({
// this.setColorboardList(colorList)
// // this.clearSelectColor()
// },
+ collectionStep:{
+ handler(newVal,oldVal){
+ if(newVal != 3)return
+ const backIcon = document.createElement('div');
+ if(backIcon.classList.contains('vc-sketch-color-wrap'))return
+ backIcon.classList.add('vc-sketch-color-wrap')
+ let dropperDom = document.getElementsByClassName("colorboard_upload_modal")[0].getElementsByClassName('vc-chrome-fields-wrap')[0]
+ dropperDom.appendChild(backIcon);
+ backIcon.addEventListener('click', async ()=>{
+ try {
+ const dropper = new EyeDropper();
+ const result = await dropper.open();
+ let hex = result.sRGBHex.replace("#", "");
+ // 将十六进制颜色码拆分成红、绿、蓝三个部分
+ const r = parseInt(hex.substring(0, 2), 16);
+ const g = parseInt(hex.substring(2, 4), 16);
+ const b = parseInt(hex.substring(4, 6), 16);
+ this.selectColor = {rgba:{r:r,g:g,b:b,a:1},hex:result.sRGBHex}
+ // 返回RGB格式的字符串
+ // return `rgb(${r}, ${g}, ${b})`;
+ // box.style.backgroundColor = label.textContent = result.sRGBHex;
+ } catch (e) {
+ message.info(this.t('ColorboardUpload.jsContent1'))
+ }
+ })
+ }
+ },
selectColor:{
handler(newVal,oldVal){
if(typeof newVal?.rgba?.r !== 'number' && typeof newVal?.rgba?.r !== 'string'){
@@ -328,31 +360,12 @@ export default defineComponent({
}
},
mounted(){
- this.token = getCookie('token') || ''
- this.uploadUrl = getUploadUrl()
- const backIcon = document.createElement('div');
- backIcon.classList.add('vc-sketch-color-wrap')
- let dropperDom = document.getElementsByClassName("colorboard_upload_modal")[0].getElementsByClassName('vc-chrome-fields-wrap')[0]
- dropperDom.appendChild(backIcon);
-
-
- backIcon.addEventListener('click', async ()=>{
- try {
- const dropper = new EyeDropper();
- const result = await dropper.open();
- let hex = result.sRGBHex.replace("#", "");
- // 将十六进制颜色码拆分成红、绿、蓝三个部分
- const r = parseInt(hex.substring(0, 2), 16);
- const g = parseInt(hex.substring(2, 4), 16);
- const b = parseInt(hex.substring(4, 6), 16);
- this.selectColor = {rgba:{r:r,g:g,b:b,a:1},hex:result.sRGBHex}
- // 返回RGB格式的字符串
- // return `rgb(${r}, ${g}, ${b})`;
- // box.style.backgroundColor = label.textContent = result.sRGBHex;
- } catch (e) {
- message.info(this.t('ColorboardUpload.jsContent1'))
- }
+ nextTick(()=>{
+ this.token = getCookie('token') || ''
+ this.uploadUrl = getUploadUrl()
+
})
+
// this.clearSelectColor()
// if ("EyeDropper" in window) {
// console.log(true);
@@ -932,6 +945,9 @@ export default defineComponent({
box-shadow: 0 0px 4px 0px rgba(0, 0, 0, 0.3);
overflow: hidden;
background: #fff;
+ >div,>span{
+ width: 50%;
+ }
}
.upload_file_item_show:hover{
border-bottom: none;
diff --git a/src/component/HomePage/Cropper.vue b/src/component/HomePage/Cropper.vue
index 5bf812e9..5f7d1d3f 100644
--- a/src/component/HomePage/Cropper.vue
+++ b/src/component/HomePage/Cropper.vue
@@ -1,7 +1,9 @@
-
-
-
-
-
-
- ![]()
-
-
-
- ![]()
-
-
- ![]()
-
-
- ![]()
-
-
-
- -
-
-
-
-
-
-
{{ $t('LibraryPage.Reset') }}
- OK
-
-
+
-
-
+
+
+
+
+
@@ -46,7 +52,7 @@
@@ -400,11 +406,8 @@ export default defineComponent({
},
});
-
\ No newline at end of file
diff --git a/src/component/HomePage/productImg.vue b/src/component/HomePage/productImg.vue
index 0f1f04a5..8e3e224d 100644
--- a/src/component/HomePage/productImg.vue
+++ b/src/component/HomePage/productImg.vue
@@ -1,8 +1,10 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/component/LoginPage/weiXinLogin.vue b/src/component/LoginPage/weiXinLogin.vue
new file mode 100644
index 00000000..ae714a97
--- /dev/null
+++ b/src/component/LoginPage/weiXinLogin.vue
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/component/Pay/allOrder.vue b/src/component/Pay/allOrder.vue
index b9ede5fa..536b083a 100644
--- a/src/component/Pay/allOrder.vue
+++ b/src/component/Pay/allOrder.vue
@@ -3,7 +3,7 @@
-
+
+ {{ type }}
+
+
@@ -82,19 +84,20 @@ export default defineComponent({
const {t} = useI18n()
const columns: any = computed(() => {
return [
- {
+
+ {
title: useI18n().t('allOrder.Serial'),
align: "center",
ellipsis: true,
dataIndex: "orderNo",
key: "orderNo",
},
- {
- title: useI18n().t('allOrder.Title'),
+ {
+ title: useI18n().t('allOrder.Time'),
align: "center",
ellipsis: true,
- dataIndex: "title",
- key: "title",
+ dataIndex: "createTime",
+ key: "createTime",
},
{
title: useI18n().t('allOrder.Money'),
@@ -104,7 +107,7 @@ export default defineComponent({
key: "totalFee",
},
{
- title: useI18n().t('allOrder.Payment'),
+ title: useI18n().t('allOrder.PaymentMethods'),
align: "center",
ellipsis: true,
dataIndex: "paymentType",
@@ -117,6 +120,13 @@ export default defineComponent({
dataIndex: "orderStatus",
key: "orderStatus",
},
+ {
+ title: useI18n().t('allOrder.OrderType'),
+ align: "center",
+ ellipsis: true,
+ dataIndex: "title",
+ key: "title",
+ },
// {
// title: useI18n().t("HistoryPage.Operations"),
@@ -130,6 +140,7 @@ export default defineComponent({
let dataList: any = ref([]);
let rangePickerValue: any = ref([]);
let collectionList: any = ref([]);
+
let userInfo: any = {};
let currentState = ref({
value:'income',
@@ -144,6 +155,10 @@ export default defineComponent({
value:'expend',
},
])
+ let selectedRowKey = ref([])
+ const onSelectChange= (selectedRowKeys:any,)=>{
+ selectedRowKey.value = selectedRowKeys
+ }
return {
columns,
dataList,
@@ -154,6 +169,8 @@ export default defineComponent({
currentState,
state,
t,
+ selectedRowKey,
+ onSelectChange,
};
},
data() {
@@ -166,19 +183,17 @@ export default defineComponent({
};
},
mounted() {
- // let historyTable: any = this.$refs.historyTable;
- // this.historyTableHeight = historyTable.clientHeight - 130;
- this.getAllOrderList()
- nextTick(()=>{
- let historyTable: any = this.$refs.historyTable;
- this.historyTableHeight = historyTable.clientHeight - 130;
- })
},
methods: {
init(){
this.currentPage = 1
this.pageSize = 10
+ nextTick(()=>{
+ let historyTable: any = this.$refs.historyTable;
+ this.historyTableHeight = historyTable.clientHeight - 100;
+ })
this.getAllOrderList()
+
},
//改变页码
changePage(e: any) {
@@ -193,8 +208,8 @@ export default defineComponent({
},
//获取列表
getAllOrderList() {
- let startDate: any = this.rangePickerValue[0]?this.rangePickerValue[0] : "";
- let endDate: any = this.rangePickerValue[1]?this.rangePickerValue[1] : "";
+ let startDate: any = this.rangePickerValue?.[0]?this.rangePickerValue[0] : "";
+ let endDate: any = this.rangePickerValue?.[1]?this.rangePickerValue[1] : "";
let data = {
endTime: endDate,
isIncome: this.currentState.value == 'income'?true:false,
@@ -209,6 +224,7 @@ export default defineComponent({
this.currentPage = 1
this.getAllOrderList()
}else{
+ rv.content.forEach((item:any) => item.key = item.id);
this.collectionList = rv.content
this.total = rv.total
}
@@ -218,7 +234,7 @@ export default defineComponent({
},
});
-
\ No newline at end of file
diff --git a/src/component/Pay/payOrder.vue b/src/component/Pay/payOrder.vue
index d54124a0..a12cd74f 100644
--- a/src/component/Pay/payOrder.vue
+++ b/src/component/Pay/payOrder.vue
@@ -1,6 +1,7 @@
+
-
@@ -135,9 +142,15 @@
I agree to all Term, Privacy Policy and Fees
-
+
-
+
-
+
@@ -232,6 +238,7 @@
}"
:isProductimg="true">
+
+
\ No newline at end of file
diff --git a/src/component/HomePage/scaleImage.vue b/src/component/HomePage/scaleImage.vue
index 587e0412..71578e3e 100644
--- a/src/component/HomePage/scaleImage.vue
+++ b/src/component/HomePage/scaleImage.vue
@@ -1,8 +1,10 @@
+
-
-
diff --git a/src/component/LoginPage/phoneLogin.vue b/src/component/LoginPage/phoneLogin.vue
new file mode 100644
index 00000000..cea50ce8
--- /dev/null
+++ b/src/component/LoginPage/phoneLogin.vue
@@ -0,0 +1,57 @@
+
+
-
+
+
+
-
+
@@ -128,6 +134,7 @@
+
+
+
+
diff --git a/src/component/LoginPage/phoneModel.vue b/src/component/LoginPage/phoneModel.vue
new file mode 100644
index 00000000..eb74982d
--- /dev/null
+++ b/src/component/LoginPage/phoneModel.vue
@@ -0,0 +1,80 @@
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/component/LoginPage/weiXinModel.vue b/src/component/LoginPage/weiXinModel.vue
new file mode 100644
index 00000000..96a84a2f
--- /dev/null
+++ b/src/component/LoginPage/weiXinModel.vue
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- {{$t('allOrder.Time')}}:
+
-
Search
+ Export
+
{{ $t('HistoryPage.Delete') }}
-
-
+
+
+
+
+ {{ $t('payOrder.OrderInformation') }}
@@ -65,16 +73,19 @@ export default defineComponent({
methods: {
init() {
this.showPayOrder = true;
+ this.setState('paypal')
},
setState(str:any){
- this.presentState = str
- let setInit:any
- if(str == 'paypal'){
- setInit = this.$refs.allOrder
- }else{
- setInit = this.$refs.creditsDetail
- }
- setInit.init()
+ nextTick(()=>{
+ this.presentState = str
+ let setInit:any
+ if(str == 'paypal'){
+ setInit = this.$refs.allOrder
+ }else{
+ setInit = this.$refs.creditsDetail
+ }
+ setInit.init()
+ })
},
cancelDsign(){
this.showPayOrder = false
@@ -82,16 +93,19 @@ export default defineComponent({
},
});
-
-
\ No newline at end of file
diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue
index c1b68909..80d3de10 100644
--- a/src/component/WorksPage/newScaleImage.vue
+++ b/src/component/WorksPage/newScaleImage.vue
@@ -1,8 +1,10 @@
+
-
+
+
-
+
+
@@ -29,7 +36,7 @@
'login_active',
]"
>
- Visitor Register AiDA 3.0
+ Register for AiDA 3.0
+