From 8911e9da14b03edd2bf1bef4aa049070ad5a5894 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 8 Mar 2024 16:51:24 +0800 Subject: [PATCH] fix --- .env.dev | 4 +- src/assets/iconfont2/iconfont.css | 18 +- src/assets/iconfont2/iconfont.json | 28 + src/assets/iconfont2/iconfont.ttf | Bin 5592 -> 6588 bytes src/assets/style/style.css | 53 +- src/assets/style/style.less | 7 +- .../Administrator}/TestClickData.vue | 9 +- src/component/Administrator/allUser.vue | 435 ++++++++++++++ src/component/Administrator/trialApproval.vue | 435 ++++++++++++++ src/component/HomePage/ExportModel.vue | 28 +- src/component/HomePage/Header.vue | 2 +- src/component/HomePage/UpgradePlan.vue | 2 +- src/router/index.ts | 44 +- src/tool/https.js | 2 +- src/views/Administrator.vue | 283 +++++++++ src/views/trialApproval.vue | 567 ------------------ 16 files changed, 1291 insertions(+), 626 deletions(-) rename src/{views => component/Administrator}/TestClickData.vue (98%) create mode 100644 src/component/Administrator/allUser.vue create mode 100644 src/component/Administrator/trialApproval.vue create mode 100644 src/views/Administrator.vue delete mode 100644 src/views/trialApproval.vue diff --git a/.env.dev b/.env.dev index dd5ff006..d429345a 100644 --- a/.env.dev +++ b/.env.dev @@ -3,6 +3,6 @@ NODE_ENV = 'development' # VUE_APP_BASE_URL = 'https://api.aida.com.hk' # VUE_APP_BASE_URL = 'http://18.167.251.121:10086' -# VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' +VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' # VUE_APP_BASE_URL = 'http://192.168.1.9:17088' -VUE_APP_BASE_URL = 'http://192.168.1.7:5567' +# VUE_APP_BASE_URL = 'http://192.168.1.7:5567' diff --git a/src/assets/iconfont2/iconfont.css b/src/assets/iconfont2/iconfont.css index 912e2297..f52dbb73 100644 --- a/src/assets/iconfont2/iconfont.css +++ b/src/assets/iconfont2/iconfont.css @@ -1,6 +1,6 @@ @font-face { font-family: "iconfont"; /* Project id */ - src: url('iconfont.ttf?t=1709865709415') format('truetype'); + src: url('iconfont.ttf?t=1709874981482') format('truetype'); } .iconfont { @@ -87,3 +87,19 @@ content: "\e62d"; } +.icon-shenpi:before { + content: "\e6a1"; +} + +.icon-yonghu:before { + content: "\e617"; +} + +.icon-usetime:before { + content: "\e601"; +} + +.icon-xiala:before { + content: "\e634"; +} + diff --git a/src/assets/iconfont2/iconfont.json b/src/assets/iconfont2/iconfont.json index 849c918d..578a73da 100644 --- a/src/assets/iconfont2/iconfont.json +++ b/src/assets/iconfont2/iconfont.json @@ -137,6 +137,34 @@ "font_class": "tuceng1", "unicode": "e62d", "unicode_decimal": 58925 + }, + { + "icon_id": "130751283", + "name": "审批", + "font_class": "shenpi", + "unicode": "e6a1", + "unicode_decimal": 59041 + }, + { + "icon_id": "130751284", + "name": "用户", + "font_class": "yonghu", + "unicode": "e617", + "unicode_decimal": 58903 + }, + { + "icon_id": "130751285", + "name": "使用次数", + "font_class": "usetime", + "unicode": "e601", + "unicode_decimal": 58881 + }, + { + "icon_id": "130751286", + "name": "下拉", + "font_class": "xiala", + "unicode": "e634", + "unicode_decimal": 58932 } ] } diff --git a/src/assets/iconfont2/iconfont.ttf b/src/assets/iconfont2/iconfont.ttf index 9ecc492eb17bfe3373e7a521ed8593053345fe48..1fee3e8140ab092063f3524c572e13aa2653815f 100644 GIT binary patch delta 1513 zcma)6YiJx*6h3EWc4o4(+1Vuf$~HT@vuQR<9;?niB4r;fMuJJ$Na-t!C0SzJO*Wfd zNeYS5E((G|ptW0&_FpN!pg)xS@D;^E|40i8g7~DOFi0u>vEmPtUC&Hfv4WBrzI*Ta z?m6E*_ntfR_25?QTyOmV0B!)l>|CW#8{PUS3cySPutUYA^=E!lrd|NBTm^8fmgWmj zM}(ip$oEG=vP6XVCO1dpEyDg%Wp%B-fHq3d_{H`g5<~Rtlp-3^q?NrhjmSl>y!GFUecHJ=k=HL%fHOruHKnxwE%P= zKi56K?*DXb9Af*Xki>`RefWQ0fHrW0gA!*!f_88LPy6ix8+bsbR0T@gPG{iUjIf;; z!u^!A@pz16c0mfD)8-6-yYVEKZ8K&G;A(7ev9>r_1n@MrxN)m~nM?vW8=NI4^6v{T zik;$t&BGSCy-r8n`joxE9)f)kpc79-F%i$8rl8Bo3$7Rq{HPjKj8$DKzL6SF6`w0o z`&l5SY=5i7mB*NyJ8=wGeAUr(F_kK&N2|Vy5)0I7vNaPpu3DwVACr(JR?fAq#f3|$4e9+%Bc}&{=K#-12_7Ia5B}q)=fI^7TX_pNLHKSZtyta`vboNy7A{XfQXBUCPi31G!-I(zIyR zByswpK_4tCN z&XzOT#WRc9>|!>Wi$-%#84dGVI{j8U{kGZiR=H@EW$Q)x3rA0f>SNCPLLp!Cx~&5{ zZ8&D?C_5+om6#tt&y-J>GiKAQ4(Co9VkdLMbV9rT67~q=rwZ9rwVa)4Z~kEKcQn6~8Oe^eW~*gq+gX}weq(2B*e4He&UU`Spto_`84=M< qYF_Mabh@so{7PwlxwgQsSC@;WQ^Kj0`PGHWyk%{nuv9SefWH7(aXiuh delta 510 zcmZ{gKS(1%7{%Z0A5Ee$L1PFO5;5vx6yy#BAt)B%t`M{k!748POOZ7RS||#^LhcF+ zWx6X*K@gFHv}vxn6BO+9xI)BYP)Q|<7Q*^gv2=zXv+wPjZ@!tz=YPqq_R;_#HUUgc zJ9c66=dJ>@6sgYVR_6RS$HRa*4g~A7v-XTt`{SJ1OVXdE;oCDZ{H~Bh)>&E}J98gd zuSz|Z%TL?ZMaLlbTh!f-y<8AoIOhKtb$r2gX2Uxzsb4_j6c3y)fX#7w_R3c=ZkZp-v#qoS~p} -
+
-
+
\ No newline at end of file diff --git a/src/component/Administrator/trialApproval.vue b/src/component/Administrator/trialApproval.vue new file mode 100644 index 00000000..713eb32b --- /dev/null +++ b/src/component/Administrator/trialApproval.vue @@ -0,0 +1,435 @@ + + + \ No newline at end of file diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index 4d9d8108..b0a23ac3 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -142,9 +142,12 @@
-
all
+ +
+
Your points balance is insufficient, if you need to use this feature, please click the top left corner to recharge
+
-
HD Export
+
HD Export
Export
@@ -183,12 +186,10 @@ export default defineComponent({ }); canvasWH.value.width = [window.innerWidth/2.4] canvasWH.value.width = canvasWH.value.width.map(num => Math.round(num / 100) * 100)[0]; - let sketch = computed(() => { - return store.state.HomeStoreModule.showSketchList; - }); - let sketchList = computed(() => { - return store.state.UploadFilesModule.showSketchboard; + let credits = computed(() => { + return store.state.UserHabit.credits.value; }); + let allBoardData = computed(() => { return store.state.UploadFilesModule.allBoardData; }); @@ -965,6 +966,7 @@ export default defineComponent({ return { showUpgradePlan, canvasWH, + credits, init, setExport, cancelDsign, @@ -1056,12 +1058,12 @@ export default defineComponent({ margin-bottom: .5rem; font-size: 1.8rem; font-weight: 600; - margin-top: 2rem; + // margin-top: 2rem; + padding-top: 2rem; display: flex; justify-content: space-between; cursor: pointer; position: sticky; - top: 1rem; background: #f9fafb; z-index: 2; .icon{ @@ -1185,13 +1187,21 @@ export default defineComponent({ // display: flex; flex: 1; } + .exportCanvasBox_right_credits{ + margin-bottom: 2rem; + } .exportCanvasBox_right_btn{ display: flex; justify-content: space-between; .subitOkPreviewBtn{ position: initial; transform: none; + &.active{ + opacity: .7; + cursor: not-allowed; + } } + } } .exportCanvasBox_center { diff --git a/src/component/HomePage/Header.vue b/src/component/HomePage/Header.vue index e6372214..b9a78939 100644 --- a/src/component/HomePage/Header.vue +++ b/src/component/HomePage/Header.vue @@ -217,7 +217,7 @@ export default defineComponent({ let isTest = ref() let isMurmur = ref() let credits = computed(()=>{ - return Number(store.state.UserHabit.credits.value) + return store.state.UserHabit.credits.value }) let activeCredits = ref(false) return { diff --git a/src/component/HomePage/UpgradePlan.vue b/src/component/HomePage/UpgradePlan.vue index 8f8aafa2..05b97d82 100644 --- a/src/component/HomePage/UpgradePlan.vue +++ b/src/component/HomePage/UpgradePlan.vue @@ -103,7 +103,7 @@
Paid completed
-
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.
+
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
diff --git a/src/router/index.ts b/src/router/index.ts index d2a75aa2..48519be6 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -3,6 +3,7 @@ import { defineAsyncComponent } from 'vue' import { getBrowserInfo, murmur } from '@/tool/util' import { getCookie, setCookie } from "@/tool/cookie"; const _import = (path: string) => defineAsyncComponent(() => import(`../views/${path}.vue`)); +const _import_custom = (path : string) => defineAsyncComponent(() => import(`../component/${path}`)); const routes: Array = [ { @@ -36,10 +37,32 @@ const routes: Array = [ name: 'history', component: _import('HistoryPage') }, + // { + // path: '/testClickData', + // name: 'testClickData', + // component: _import('TestClickData') + // }, { - path: '/testClickData', - name: 'testClickData', - component: _import('TestClickData') + path: '/administrator', + name: 'administrator', + component: _import('Administrator'), + children:[ + { + path:'allUser', + name:'allUser', + component: _import_custom('Administrator/allUser.vue'), + }, + { + path:'testClickData', + name:'testClickData', + component: _import_custom('Administrator/TestClickData.vue'), + }, + { + path:'trialApproval', + name:'trialApproval', + component: _import_custom('Administrator/trialApproval.vue'), + }, + ] }, // {//老版本history // path: '/oldHistory', @@ -56,11 +79,11 @@ const routes: Array = [ name: 'library', component: _import('LibraryPage') }, - { - path: '/trialApproval', - name: 'trialApproval', - component: _import('trialApproval') - }, + // { + // path: '/trialApproval', + // name: 'trialApproval', + // component: _import('trialApproval') + // }, { path: '/setIdentification', name: 'setIdentification', @@ -89,7 +112,6 @@ router.beforeEach((to, from, next) => { // 检查路由是否存在 // 机房用户 let userInfo = JSON.parse(getCookie("userInfo") as any); - let murmurStr: any = localStorage.getItem('murmurStr') let getIsMurmur: any = getCookie("isMurmur") let token = getCookie("token"); @@ -98,11 +120,13 @@ router.beforeEach((to, from, next) => { let userIdList = [83,88,6] const routeExists = router.getRoutes().some(({ name }) =>{ if(name){ - return name === to.name + console.log(name , to.name); + return name === to.name }else{ return false } }); + if (routeExists) { if (isMurmur && murmurStr && token) { const toName = to.name === 'login'; diff --git a/src/tool/https.js b/src/tool/https.js index 742966ab..7186abae 100644 --- a/src/tool/https.js +++ b/src/tool/https.js @@ -85,7 +85,7 @@ axios.interceptors.response.use((res) =>{ }, function(error) { if(error?.response?.status === 401 && router.currentRoute._value.name != 'setIdentification'){//如果是记录浏览器页面就不跳转login - router.replace('/login') + // router.replace('/login') return Promise.reject() } let data_new = error?.response?.data diff --git a/src/views/Administrator.vue b/src/views/Administrator.vue new file mode 100644 index 00000000..bc67adc0 --- /dev/null +++ b/src/views/Administrator.vue @@ -0,0 +1,283 @@ + + + diff --git a/src/views/trialApproval.vue b/src/views/trialApproval.vue deleted file mode 100644 index 6fb89ae2..00000000 --- a/src/views/trialApproval.vue +++ /dev/null @@ -1,567 +0,0 @@ - - - \ No newline at end of file