Merge remote-tracking branch 'master/master'

Web/src/pages/customer/index.vue

@@ -0,0 +1,18 @@
+<template>
+  <div>
+    <div class="content">
+      <a class="" href="/">首页</a>&gt;客服
+    </div>
+    <div class="content">
+      微信客服：<a href="https://work.weixin.qq.com/kfid/kfc86bc348120aea3e7"
+        target="_blank">点击咨询</a><br />客服QQ：531493955<br />官方QQ群：238938639<br />客服邮箱：531493955@qq.com<br />
+    </div>
+    <a class="" href="/">返回游戏首页</a>
+  </div>
+</template>
+
+<script setup>
+
+</script>
+
+<style lang="scss" scoped></style>

Web/src/pages/index.vue

@@ -99,6 +99,40 @@
     <div v-for="(item, index) in areaData" :key="index">
       {{ index }} - {{ item.name }}
     </div>
+<<<<<<< HEAD
+    <div class="item">
+      4.
+      <a class="" href="/Pallet/Notice/Detail?nt=2026030101&amp;sid=klxy7ADn96CBYGWQ9AG4xPqFC2Ib6Ty1Kx">[推广] 3月份推广</a>
+    </div>
+    <div class="item">
+      5.
+      <a class=""
+        href="/Pallet/Notice/Detail?nt=2025080002&amp;sid=klxy7ADn96CBYGWQ9AG4xPqFC2Ib6Ty1Kx">&#x3010;驰骋四海&#x3011;卡片&#x306E;攻略&#xFF08;2.24&#xFF09;</a>
+    </div>
+  </div>
+  <div class="title">
+    =====☆服务导航☆=====
+  </div>
+  <div class="content">
+    <Abar url="/customer">客服</Abar>
+    .<a class="" href="/Index/About?sid=klxy7ADn96CBYGWQ9AG4xPqFC2Ib6Ty1Kx">关于</a>.<a class=""
+      href="/Index/Cooperation?sid=klxy7ADn96CBYGWQ9AG4xPqFC2Ib6Ty1Kx">合作</a>
+  </div>
+  <div class="content">
+    切换线路:
+    <span class="game_line">
+      <a class="" href="http://g.pccsh.com:5016/Index/Index?sid=klxy7ADn96CBYGWQ9AG4xPqFC2Ib6Ty1Kx">1</a>
+    </span>
+  </div>
+  <div class="foot">
+    <div class="timeService">
+      小G报时(18:33)
+    </div>
+  </div>
+  <div v-for="(item, index) in areaData" :key="index">
+    {{ index }} - {{ item.name }}
+=======
+>>>>>>> dccf21527f309c8fbc88362c5f0c177f13da8d23
   </div>
 </template>