Merge branch 'dev' of http://1.94.207.143:3000/xyy/xyy-m into dev

src/app.vue

@@ -19,5 +19,6 @@ const themeVars = reactive({
   dropdownMenuTitleActiveTextColor: "#ff9300",
   treeSelectItemActiveColor: "#ff9300",
   sidebarSelectedBorderColor: "#ff9300",
+  pickerConfirmActionColor: "#ff9300",
 });
 </script>

src/assets/img/visa/chevron-down.svg

@@ -0,0 +1,5 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="chevron-down">
+<path id="union" d="M5.65223 10.9023L4.8479 10.0979L7.94573 7.00008L4.8479 3.90225L5.65223 3.09792L9.5544 7.00008L5.65223 10.9023Z" fill="#FF9300"/>
+</g>
+</svg>

src/components/Home/Menu/index.vue

@@ -29,7 +29,7 @@ const menuData = [
     icon: home_menu_house,
   },
   {
-    title: "买房卖房",
+    title: "房屋租售",
     to: "house",
     icon: home_menu_visa,
   },

src/pages/profile/visa-order-details/[id].vue

@@ -113,7 +113,7 @@
         <p
           v-for="(item, index) in infoList"
           :key="index + 'infoListOne'"
-          class="mb-11 w-full text-base leading-4xl"
+          class="mb-11 w-full shrink-0   text-base leading-4xl"
         >
           <span class="inline-block w-65 font-normal text-black-6">{{ item }}</span>
           <span class="font-semibold text-black/[0.9]">

src/pages/profile/visa-orders.vue

@@ -18,10 +18,10 @@
           class="scroll-box scrollbar-hide mb-16 box-border h-140 w-full overflow-hidden overflow-y-auto rounded-lg border bg-[#fff]"
         >
           <div
-            class="box-border flex h-32 w-full cursor-pointer items-center justify-between bg-[#F7F7F7] px-11"
+            class="box-border flex h-32 w-full shrink-0 cursor-pointer items-center justify-between bg-[#F7F7F7] px-11"
           >
-            <div class="flex justify-start items-center">
-              <span class="text-sm font-normal leading-xl text-black-3/[0.9]">
+            <div class="flex justify-start shrink-0 items-center">
+              <span class="text-sm font-normal  leading-xl text-black-3/[0.9]">
                 订单号:{{ item?.id }}
               </span>
               <div class="w-16 h-16 shrink-0 ml-8" @click="copyId(item?.id)">
@@ -34,7 +34,7 @@
               </div>
             </div>
             <div class="flex justify-start items-center">
-              <span class="mr-9 text-sm font-normal leading-xl text-black-9/[0.9]">
+              <span class="mr-9 text-sm font-normal shrink-0 leading-xl text-black-9/[0.9]">
                 {{ item?.createTime?.split(' ')[0] }}
               </span>
               <div class="w-16 h-16 shrink-0" @click="doDeleteVisaOrder(item?.id)">
@@ -65,24 +65,20 @@
                   <span class="text-3xl">{{ Number(item?.orderPrice).toFixed(2) }}</span>
                 </span>
                 <div
-                  :class="`w-53 h-20 text-center text-sm leading-3xl rounded-full ${colorLists[item?.payState].color} ${colorLists[item?.payState].textColor}`"
+                  :class="`w-53 line-clamp-1 h-20 text-center shrink-0 text-sm leading-3xl rounded-full ${colorLists[item?.payState].color} ${colorLists[item?.payState].textColor}`"
                 >
                   {{ formatStatus(item?.payState) }}
                 </div>
               </div>
 
-              <van-button
-                style="height: 24px"
-                plain
-                round
-                class="w-110"
-                type="warning"
-                icon-position="right"
-                color="#FF9300"
-                icon="arrow"
-              >
-                订单详情
-              </van-button>
+             <button  class=" text-sm shrink-0 px-10  line-clamp-1 flex-nowarp h-24 border-[0.5px] border-[#FF9300] rounded-full text-[#FF9300] bg-white flex justify-center items-center box-border active:bg-[#FF9300]/[0.1] " >
+              订单详情  <div class="w-13 h-13 shrink-0 ml-4">
+                <img class="w-full h-full  object-cover "  src="~/assets/img/visa/chevron-down.svg" alt="">
+              </div>
+
+             </button>
+
+             
             </div>
           </NuxtLink>
         </div>

src/pages/visa/index.vue

@@ -110,9 +110,9 @@
                 {{ item?.countryCodeIdDictMap?.name }}
               </span>
 
-              <span class="shrink-0 text-sm line-clamp-1">
-                <span class="text-[#f0a020]">￥</span>
-                <span class="text-base text-[#f0a020]">{{ item?.floorPrice }}</span>
+              <span class="shrink-0 text-sm  line-clamp-1">
+                <span class="text-[#FF9300] font-semibold">￥</span>
+                <span class="text-base text-[#FF9300] font-semibold">{{ item?.floorPrice }}</span>
                 <span class="text-black-9">起</span>
               </span>
             </div>
@@ -130,7 +130,7 @@
       class="flex w-full items-center border-b-[1px] border-[#E7E7E7] border- mb-16 justify-between overflow-hidden"
     >
       <div
-        :class="`flex relative justify-center items-center box-border h-48 flex-1 cursor-pointer ${tabs_value === item?.id ? 'border-b-1 border-b-[#FD9A00] bg-[#fff] font-[600] font-semibold text-[#FD9A00]' : ' bg-[#fff] font-normal text-black-9'}  text-base `"
+        :class="`flex relative justify-center items-center box-border h-48 flex-1 cursor-pointer ${tabs_value === item?.id ? 'border-b-1 border-b-[#FD9A00] bg-[#fff] font-[600] font-semibold text-[#FD9A00]' : ' bg-[#fff] font-normal text-black-3'} text-xl   `"
         v-for="item in allVisaList"
         :key="item?.id"
         @click="changeTabs(item?.id)"