web/src/views/login/index.vue

@@ -61,14 +61,11 @@ const loginInfo = ref({
 initLoginInfo()
 
 function initLoginInfo() {
-  if(localStorage.getItem('phone')){
+  const localLoginInfo = lStorage.get('loginInfo')
-    loginInfo.value.phone = localStorage.getItem('phone')
+  if (localLoginInfo) {
+    loginInfo.value.phone = localLoginInfo.phone || ''
+    loginInfo.value.password = localLoginInfo.password || ''
   }
-  // const localLoginInfo = lStorage.get('loginInfo')
-  // if (localLoginInfo) {
-  //   loginInfo.value.phone = localLoginInfo.phone || ''
-  //   loginInfo.value.password = localLoginInfo.password || ''
-  // }
 }
 
 const loading = ref(false)
@@ -96,7 +93,7 @@ async function handleLogin() {
     setToken(res.error.access_token)
     if (query.redirect) {
       const path = query.redirect
-      localStorage.setItem('phone', phone)
+      console.log('path', { path, query })
       Reflect.deleteProperty(query, 'redirect')
       router.push({ path, query })
     } else {

web/src/views/pages/index.vue

@@ -511,11 +511,8 @@
                         <img style="width: 18px; height: 18px; transform: translate(0,2px);" src="@/assets/images/cost2.png" alt="">
                         文化价值评估
                     </div>
-                    <div 
+                    <div style="text-align: center; font-size: 30px; font-weight: bold; margin-top: 10px;">90</div>
-                        ref="culture"
+                    <div style="text-align: center; color: #909399">综合评估</div>
-                        style="text-align: center; font-size: 30px; font-weight: bold; margin-top: 10px; height: 95px;"  
-                        :style="{backgroundImage:`url(${backgroundImg5})`,backgroundSize: '167px 95px',backgroundPosition: 'center 2px',backgroundRepeat:'no-repeat'}"
-                    ></div>
                     <div style="margin-top: 20px;">活态传承系数评估：<span style="font-weight: bold;">优秀</span></div>
                     <div>纹样基因熵值评估：<span style="font-weight: bold;">优秀</span></div>
                 </div>
@@ -524,11 +521,7 @@
                         <img style="width: 18px; height: 18px; transform: translate(0,2px);" src="@/assets/images/cost1.png" alt="">
                         文化价值风险控制
                     </div>
-                    <div 
+                    <div style="text-align: center; font-size: 30px; font-weight: bold; margin-top: 10px;">5</div>
-                        ref="risk"
-                        style="text-align: center; font-size: 30px; font-weight: bold; margin-top: 10px; height: 95px;"  
-                        :style="{backgroundImage:`url(${backgroundImg6})`,backgroundSize: '167px 95px',backgroundPosition: 'center 2px',backgroundRepeat:'no-repeat'}"
-                    ></div>
                     <div style="text-align: center; color: #909399">综合评估</div>
                     <div style="margin-top: 20px;">风险调整系数：<span style="font-weight: bold; color: #2EAE44; ">低</span></div>
                 </div>
@@ -566,8 +559,6 @@ import backgroundImg1 from '@/assets/images/bgc.png';
 import backgroundImg2 from '@/assets/images/bgy.png';
 import backgroundImg3 from '@/assets/images/bgg.png';
 import backgroundImg4 from '@/assets/images/circleg.png';
-import backgroundImg5 from '@/assets/images/circley.png';
-import backgroundImg6 from '@/assets/images/circlec.png';
 const status = ref('create')
 const message = useMessage()
 const modalFormRef = ref<FormInst | null>(null)
@@ -581,7 +572,7 @@ const steps = [
 ];
 const loading = ref(false)
 const actionUrl = 'https://value.cdcee.net/api/v1/upload/image'
-const currentStep = ref(4)
+const currentStep = ref(0)
 const historyList = ref([])
 const modalForm = reactive({
     asset_name: '',
@@ -888,16 +879,16 @@ const fundingOptions2 = [
 const circulationOptions = [
     {
         label:'孤品：全球唯一，不可复制（如特定版权、唯一实物）',
-        value: '孤品：全球唯一，不可复制（如特定版权、唯一实物）',
+        value: '0',
     },{
         label:'限量：总发行份数 ≤100份',
-        value: '限量：总发行份数 ≤100份',
+        value: '1',
     },{
         label:'稀有：总发行份数∈[100, 1000]份，或二级市场流通率 < 5%',
-        value: '稀有：总发行份数∈[100, 1000]份，或二级市场流通率 < 5%',
+        value: '2',
     },{
         label:'流通：总发行份数 >1000份，或二级市场流通率 ≥ 5%',
-        value: '流通：总发行份数 >1000份，或二级市场流通率 ≥ 5%',
+        value: '3',
     },
 ]
 const activityOptions = [
@@ -1040,7 +1031,14 @@ import { unref } from 'vue'
 const router = useRouter()
 
 const navToLogin = () => {
-    userStore.logout()
+    console.log(221)
+    const currentRoute = unref(router.currentRoute)
+    const needRedirect =
+        !currentRoute.meta.requireAuth && !['/404', '/login'].includes(router.currentRoute.value.path)
+    router.replace({
+        path: '/login',
+        query: needRedirect ? { ...currentRoute.query, redirect: currentRoute.path } : {},
+    })
 }
 const nextStep = () => {
     console.log(modalForm)
@@ -1074,8 +1072,8 @@ const submit = () => {
         historical_evidence: { 
             artifacts: modalForm.historical_evidence[0],
             ancient_literature: modalForm.historical_evidence[1],
-            inheritor_testimony: modalForm.historical_evidence[2],
+            inheritor_testimony: modalForm.historical_evidence[3],
-            modern_research: modalForm.historical_evidence[3]
+            modern_research: modalForm.historical_evidence[4]
         },
         patent_certificates: modalForm.patent_certificates.map(item => item.url),
         pattern_images: modalForm.pattern_images.map(item => item.url),
@@ -1153,10 +1151,8 @@ const selectTimeBox = (item) => {
     selectedObj.value = item
     if(item.status == 'success'){
         setTimeout(() => {
-          getEcharts(economy.value, 75, '#16CEB9', '#6648FF')  
+          getEcharts()  
-          getEcharts(culture.value, 50, '#ffdd00', '#ffbb05')  
+        }, 500);
-          getEcharts(risk.value, 5, '#5ad775', '#2fab43')
-        }, 0);
     }
 }
 
@@ -1182,19 +1178,15 @@ const deleteValuations = (item) => {
 }
 import * as echarts from 'echarts';
 import type { ECharts, EChartsOption } from 'echarts';
-import { useUserStore } from '@/store'
-const userStore = useUserStore()
 const economy = ref<HTMLDivElement | null>(null);
-const culture = ref<HTMLDivElement | null>(null);
-const risk = ref<HTMLDivElement | null>(null);
 // 存储ECharts实例
 const chartInstance = ref<ECharts | null>(null);
 
-const getEcharts= (item, value, color1, color2)=>{
+const getEcharts= ()=>{
-    console.log(item)
+    console.log(economy.value)
-    if (!item) return;
+    if (!economy.value) return;
     // 创建实例
-    chartInstance.value = echarts.init(item);
+    chartInstance.value = echarts.init(economy.value);
     // 定义半圆形进度环配置
     const chartOptions = ref<EChartsOption>({
         title: [{
@@ -1206,7 +1198,7 @@ const getEcharts= (item, value, color1, color2)=>{
             fontWeight: 100,
             }
         }, {
-            text: value,
+            text: '75',
             top: '45%',
             textStyle: {
             fontSize: '26',
@@ -1238,14 +1230,14 @@ const getEcharts= (item, value, color1, color2)=>{
             roundCap: true,
             barWidth: 90,
             data: [{
-                value: value,
+                value: 75,
                 itemStyle: {
                 color: new echarts.graphic.LinearGradient(1, 0, 0, 0, [{
                             offset: 1,
-                            color: color1,
+                            color: '#16CEB9',
                         },{
                             offset: 0,
-                            color: color2,
+                            color: '#6648FF',
                         },
                     ]),
                 }