Merge branch 'master' of https://gitaa.cn/KxGame/Kg.SeaTime

Web/src/config/BaseConfig.ts

@@ -2,8 +2,8 @@
 统一配置中心
 */
 export class BaseConfig {
-  public static BaseUrl: string = 'https://localhost:7198'
-  public static BaseMediaUrl: string = 'https://localhost:7198/'
+  public static BaseUrl: string = 'https://192.168.0.142:7198'
+  public static BaseMediaUrl: string = 'https://192.168.0.142:7198/'
   // public static  BaseUrl:string="http://v3.pccsh.com";
   // public static BaseMediaUrl:string="http://v3.pccsh.com";
 }

Web/src/pages/user/badge/index.vue

@@ -1,3 +1,84 @@
 <template>
-    暂未开放.
+  <div class="module-title">
+    【更改徽章】
+  </div>
+  <div class="content" v-for="item in maxList" :key="item.umnId">
+    <Aimage :url="item.img"></Aimage>
+    <span style="margin: 0 4px;">{{ item.name }} </span>
+    <Abutton @click="updown(item.ubId)"> {{ item.show == 0 ? '佩戴' : '卸下' }} </Abutton>
+  </div>
+  <div class="content">
+    <Pagination :currentPage="currentPage" :limit="10" :total="total" @pageChange="handlePageChange" />
+  </div>
+  <!-- 选择装备 -->
+  <GamePopup v-model:show="showData" :title="'【' + maxDetail.name + '】'" style="min-width: 60%;">
+    <!-- 自定义内容 -->
+    <div class="content">
+      <div class="mapList" style="max-height: 300px;margin-top: 15px;">
+
+        <div>
+          <Aimage :url="maxDetail.img"></Aimage>
+        </div>
+
+        <div class="forum-title" style="padding: 0;">
+          装备属性
+        </div>
+        <div v-for="(tipItem, index) in JSON.parse(maxDetail.attr)" :key="index">
+          {{ Number(index) + 1 }}: {{ tipItem.tip }}
+        </div>
+
+      </div>
+
+    </div>
+  </GamePopup>
+
 </template>
+
+<script setup lang="ts">
+const currentPage = ref<number>(1);
+const total = ref<number>(0);
+let maxList = ref<Array<any>>([])
+let showData = ref(false)
+let maxDetail = ref<any>({})
+
+onMounted(() => {
+
+  getData()
+})
+
+const getData = async () => {
+  let result = await UserService.GetUserBadgeList(currentPage.value);
+  if (result.code == 0) {
+    maxList.value = result.data.list
+    total.value = result.data.total.value
+  }
+  else {
+    MessageExtend.ShowDialog("错误信息", result.msg);
+  }
+}
+
+
+/**翻页 */
+const handlePageChange = async (page: number): Promise<void> => {
+  currentPage.value = page;
+  await getData();
+};
+
+
+
+
+
+
+const updown = async (id: any) => {
+  let result = await UserService.UpdateBadgeShow(id);
+  if (result.code == 0) {
+    getData()
+  }
+  else {
+    MessageExtend.ShowDialog("错误信息", result.msg);
+  }
+}
+
+
+
+</script>

Web/src/pages/user/maxname/index.vue

@@ -1 +1,93 @@
-<template>暂未开放</template>
+<template>
+  <div class="module-title">
+    【更改称号】
+  </div>
+  <div class="content" v-for="item in maxList" :key="item.umnId">
+    <Aimage :url="item.img"></Aimage>
+    <span @click="getDetail(item.umnId)" style="margin: 0 4px;">{{ item.name }} ×{{ item.count }}</span>
+    <Abutton @click="updown(item.umnId)"> {{ item.show == 0 ? '佩戴' : '卸下' }} </Abutton>
+  </div>
+  <div class="content">
+    <Pagination :currentPage="currentPage" :limit="10" :total="total" @pageChange="handlePageChange" />
+  </div>
+  <!-- 选择装备 -->
+  <GamePopup v-model:show="showData" :title="'【' + maxDetail.name + '】'" style="min-width: 60%;">
+    <!-- 自定义内容 -->
+    <div class="content">
+      <div class="mapList" style="max-height: 300px;margin-top: 15px;">
+
+        <div>
+          <Aimage :url="maxDetail.img"></Aimage>
+        </div>
+
+        <div class="forum-title" style="padding: 0;">
+          装备属性
+        </div>
+        <div v-for="(tipItem, index) in JSON.parse(maxDetail.attr)" :key="index">
+          {{ Number(index) + 1 }}: {{ tipItem.tip }}
+        </div>
+
+      </div>
+
+    </div>
+  </GamePopup>
+
+</template>
+
+<script setup lang="ts">
+const currentPage = ref<number>(1);
+const total = ref<number>(0);
+let maxList = ref<Array<any>>([])
+let showData = ref(false)
+let maxDetail = ref<any>({})
+
+onMounted(() => {
+
+  getData()
+})
+
+const getData = async () => {
+  let result = await UserService.GetUserMaxnameList(currentPage.value);
+  if (result.code == 0) {
+    maxList.value = result.data.list
+    total.value = result.data.total.value
+  }
+  else {
+    MessageExtend.ShowDialog("错误信息", result.msg);
+  }
+}
+
+
+/**翻页 */
+const handlePageChange = async (page: number): Promise<void> => {
+  currentPage.value = page;
+  await getData();
+};
+
+
+
+const getDetail = async (id: any) => {
+  let result = await UserService.GetUserMaxnameInfo(id);
+  if (result.code == 0) {
+    showData.value = true
+    maxDetail.value = result.data.data
+  }
+  else {
+    MessageExtend.ShowDialog("错误信息", result.msg);
+  }
+}
+
+
+const updown = async (id: any) => {
+  let result = await UserService.UpdateMaxnameShow(id);
+  if (result.code == 0) {
+    getData()
+  }
+  else {
+    MessageExtend.ShowDialog("错误信息", result.msg);
+  }
+}
+
+
+
+</script>

Web/src/services/user/UserService.ts

@@ -4,7 +4,7 @@ export class UserService {
    * GET /User/User/GetUserInfo
    */
   static async GetUserInfo() {
-        return await ApiService.Request("get", "/User/User/GetUserInfo");
+    return await ApiService.Request('get', '/User/User/GetUserInfo')
   }
 
   /**
@@ -12,7 +12,7 @@ export class UserService {
    * GET /User/User/GetUserBaseInfo
    */
   static async GetUserBaseInfo(no: string) {
-        return await ApiService.Request("get", "/User/User/GetUserBaseInfo", { no });
+    return await ApiService.Request('get', '/User/User/GetUserBaseInfo', { no })
   }
 
   /**
@@ -20,7 +20,7 @@ export class UserService {
    * GET /User/User/GetUserBaseAttrInfo
    */
   static async GetUserBaseAttrInfo(no: string) {
-        return await ApiService.Request("get", "/User/User/GetUserBaseAttrInfo", { no });
+    return await ApiService.Request('get', '/User/User/GetUserBaseAttrInfo', { no })
   }
 
   /**
@@ -28,7 +28,7 @@ export class UserService {
    * GET /User/User/GetUserBaseAttrData
    */
   static async GetUserBaseAttrData() {
-        return await ApiService.Request("get", "/User/User/GetUserBaseAttrData");
+    return await ApiService.Request('get', '/User/User/GetUserBaseAttrData')
   }
 
   /**
@@ -36,7 +36,7 @@ export class UserService {
    * GET /User/User/GetHomeInfo
    */
   static async GetHomeInfo(no: string) {
-        return await ApiService.Request("get", "/User/User/GetHomeInfo", { no });
+    return await ApiService.Request('get', '/User/User/GetHomeInfo', { no })
   }
 
   /**
@@ -45,7 +45,7 @@ export class UserService {
    * @param nick body
    */
   static async UpdateUserNick(nick: string) {
-        return await ApiService.Request("post", "/User/User/UpdateUserNick", { nick });
+    return await ApiService.Request('post', '/User/User/UpdateUserNick', { nick })
   }
 
   /**
@@ -54,7 +54,7 @@ export class UserService {
    * @param sex body
    */
   static async UpdateUserSex(sex: string) {
-        return await ApiService.Request("post", "/User/User/UpdateUserSex", { sex });
+    return await ApiService.Request('post', '/User/User/UpdateUserSex', { sex })
   }
 
   /**
@@ -63,7 +63,7 @@ export class UserService {
    * @param sign body
    */
   static async UpdateUserSign(sign: string) {
-        return await ApiService.Request("post", "/User/User/UpdateUserSign", { sign });
+    return await ApiService.Request('post', '/User/User/UpdateUserSign', { sign })
   }
 
   /**
@@ -71,7 +71,7 @@ export class UserService {
    * GET /User/User/GetUserSkill
    */
   static async GetUserSkill() {
-        return await ApiService.Request("get", "/User/User/GetUserSkill");
+    return await ApiService.Request('get', '/User/User/GetUserSkill')
   }
 
   /**
@@ -79,7 +79,7 @@ export class UserService {
    * GET /User/User/GetUserDrugColumn
    */
   static async GetUserDrugColumn() {
-        return await ApiService.Request("get", "/User/User/GetUserDrugColumn");
+    return await ApiService.Request('get', '/User/User/GetUserDrugColumn')
   }
 
   /**
@@ -87,7 +87,7 @@ export class UserService {
    * GET /User/User/RemoverUserDrug
    */
   static async RemoverUserDrug(id: string) {
-        return await ApiService.Request("get", "/User/User/RemoverUserDrug", { id });
+    return await ApiService.Request('get', '/User/User/RemoverUserDrug', { id })
   }
 
   /**
@@ -95,6 +95,54 @@ export class UserService {
    * GET /User/User/AddUserDrug
    */
   static async AddUserDrug(goodsId: number, count: number) {
-        return await ApiService.Request("get", "/User/User/AddUserDrug", { goodsId, count });
+    return await ApiService.Request('get', '/User/User/AddUserDrug', { goodsId, count })
+  }
+
+  /**
+   * 获取用户称号列表
+   * GET /Maxname/GetUserMaxnameList
+   */
+  static async GetUserMaxnameList(page: number) {
+    return await ApiService.Request('get', '/Maxname/GetUserMaxnameList', { page })
+  }
+
+  /**
+   * 获取用户称号详情
+   * GET /Maxname/GetUserMaxnameInfo
+   */
+  static async GetUserMaxnameInfo(umnId: string) {
+    return await ApiService.Request('get', '/Maxname/GetUserMaxnameInfo', { umnId })
+  }
+
+  /**
+   * 获取用户称号详情
+   * post /Maxname/UpdateMaxnameShow
+   */
+  static async UpdateMaxnameShow(umnId: string) {
+    return await ApiService.Request('post', '/Maxname/UpdateMaxnameShow', { umnId })
+  }
+
+  /**
+   * 获取用户徽章列表
+   * get /Badge/GetUserBadgeList
+   */
+  static async GetUserBadgeList(page: number) {
+    return await ApiService.Request('get', '/Badge/GetUserBadgeList', { page })
+  }
+
+  /**
+   * 获取微童详情
+   * get /Badge/GetUserBadgeInfo
+   */
+  static async GetUserBadgeInfo(ubId: string) {
+    return await ApiService.Request('get', '/Badge/GetUserBadgeInfo', { ubId })
+  }
+
+  /**
+   *修改徽章展示不展示
+   * get /Badge/UpdateBadgeShow
+   */
+  static async UpdateBadgeShow(ubId: string) {
+    return await ApiService.Request('post', '/Badge/UpdateBadgeShow', { ubId })
   }
 }