12121

Web/src/config/BaseConfig.ts

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

Web/src/pages/task/info.vue

@@ -3,13 +3,17 @@
         <strong>{{ npcData.npcName }}</strong>:{{ talkMsg }}
     </div>
     <div class="content" v-if="taskState == 100">
-       恭喜,任务已全部完成!
+        恭喜,任务已全部完成!
     </div>
     <div v-else>
         <div v-if="data.state != -1">
             <div class="content" v-if="needs.length > 0">
                 任务要求:<br>
-                <GameTaskPropVerify :data="verifyData.needs"  @mapTo="mapTo"></GameTaskPropVerify>
+                <GameTaskPropVerify :data="verifyData.needs" @mapTo="mapTo"></GameTaskPropVerify>
+            </div>
+            <div class="content" v-if="award.length > 0">
+                任务奖励:<br>
+                <GameProp :data="award" :count="1"></GameProp>
             </div>
             <div class="content" v-if="verifyData.result">
                 <div v-if="taskState == 1">
@@ -37,6 +41,7 @@ const btnTips = ref('');
 const taskState = ref(-1);
 const toGoods = ref(0);
 const retGoods = ref(0);
+const award = ref<Array<any>>([]);
 let taskId = PageExtend.QueryString("task");
 let npcId = LocalStorageHelper.GetOnNpc();
 onMounted(async () => {
@@ -60,6 +65,9 @@ const BindData = async (): Promise<void> => {
         taskState.value = result.data.taskState;
         toGoods.value = result.data.toGoods;
         retGoods.value = result.data.retGoods;
+        if (result.data.award != '') {
+            award.value = JSON.parse(result.data.award);
+        }
         verifyData.value = data.value.result;
         needs.value = verifyData.value.needs;
         taskId = data.value.itemId;
@@ -84,9 +92,9 @@ const ReturnTask = async () => {
     }
 }
 
-const mapTo = async (btnData: any) => {    
+const mapTo = async (btnData: any) => {
     MessageExtend.LoadingToast("传送中...");
-    let result = await TaskService.NeedMapTo( Number(data.value.itemId), btnData.num);
+    let result = await TaskService.NeedMapTo(Number(data.value.itemId), btnData.num);
     MessageExtend.LoadingClose();
     if (result.code == 0) {
         PageExtend.RedirectTo("/map");
@@ -96,9 +104,9 @@ const mapTo = async (btnData: any) => {
     }
 }
 
-const retTask = async (btnData: any) => {    
+const retTask = async (btnData: any) => {
     MessageExtend.LoadingToast("传送中...");
-    let result = await TaskService.ReturnTask( Number(data.value.itemId));
+    let result = await TaskService.ReturnTask(Number(data.value.itemId));
     MessageExtend.LoadingClose();
     if (result.code == 0) {
         PageExtend.RedirectTo("/map");

Web/src/pages/task/look.vue

@@ -14,6 +14,10 @@
                 任务要求:<br>
                 <GameTaskPropVerify :data="verifyData.needs" @mapTo="mapTo"></GameTaskPropVerify>
             </div>
+            <div class="content" v-if="award.length > 0">
+                任务奖励:<br>
+                <GameProp :data="award" :count="1"></GameProp>
+            </div>
             <div class="content" v-if="verifyData.result">
                 ➢<Abutton @click="retTask">我要传送</Abutton>(领路蝶:{{ retGoods }})
             </div>
@@ -32,6 +36,7 @@ definePageMeta({
 const data = ref<any>({});
 const verifyData = ref<any>({});
 const needs = ref<Array<any>>([]);
+const award = ref<Array<any>>([]);
 const talkMsg = ref('');
 const taskState = ref(-1);
 const toGoods = ref(0);
@@ -58,7 +63,10 @@ const BindData = async (): Promise<void> => {
         taskState.value = result.data.taskState;
         toGoods.value = result.data.toGoods;
         retGoods.value = result.data.retGoods;
-        lev.value =result.data.lev;
+        if (result.data.award != '') {
+            award.value = JSON.parse(result.data.award);
+        }
+        lev.value = result.data.lev;
         verifyData.value = data.value.result;
         needs.value = verifyData.value.needs;
         taskId = data.value.itemId;
@@ -111,7 +119,7 @@ const restTask = async (btnData: any) => {
     let result = await TaskService.RestTask(Number(data.value.taskId));
     MessageExtend.LoadingClose();
     if (result.code == 0) {
-        MessageExtend.Notify("任务重置成功!","success");        
+        MessageExtend.Notify("任务重置成功!", "success");
     }
     else {
         MessageExtend.Notify(result.msg, "danger");

Web/src/pages/trade/index.vue

@@ -1 +1,123 @@
-<template></template>
+<template>
+    <div class="module-title">
+        交易大厅.<Abar href="/trade/my">我的交易</Abar>
+    </div>
+    <div class="module-content">
+        分类:
+        <Acheak @click="Change('0')" :on-value="type" on-cheak="0">全部</Acheak>
+        <span>&nbsp;.&nbsp;</span>
+        <Acheak @click="Change('1')" :on-value="type" on-cheak="1">装备</Acheak>
+        <span>&nbsp;.&nbsp;</span>
+        <Acheak @click="Change('2')" :on-value="type" on-cheak="2">物品</Acheak>
+    </div>
+    <div class="module-content serch">
+        搜索内容：<input type="text" class="search-ipt" v-model="serch">&nbsp;
+        <button class="ipt-btn" name="serch" @click="BindData">搜索</button>
+    </div>
+    <div class="module-content">
+        <div class="item border-btm" v-for="(item, index) in data" :key="index">
+            {{ PageExtend.GetPageIndex(currentPage, 10, index + 1) }}.
+            <span v-if="item.code == 'Equ'">
+                <Abar :href='"/trade/info?id=" + item.tradeId'>{{ item.name }}({{ item.price }}铜贝)</Abar>
+            </span>
+            <span v-else>
+                <Abar :href='"/prop/goods?id=" + item.propId'>{{ item.name }}({{ item.price }}铜贝)</Abar>
+            </span>
+            [<Abutton @click="Buy(item)">购买</Abutton>]
+        </div>
+        <span v-if="data.length == 0">
+            暂无交易.
+        </span>
+    </div>
+    <div class="content">
+        <Pagination :currentPage="currentPage" :limit="10" :total="total" @pageChange="handlePageChange" />
+    </div>
+    <GamePopup v-model:show="showBuy" title="【购买】">
+        <!-- 自定义内容 -->
+        <div class="common">
+            物品名称：{{ showGoods.name }}<br>
+            购买单价：{{ showGoods.price }} 铜贝<br>
+            <span v-if="showGoods.code != 'Equ'">
+                剩余数量：{{ showGoods.count }}
+            </span>
+        </div>
+        <div class="common" style="text-align: center;">
+            <span v-if="showGoods.code != 'Equ'">
+                购买数量：<input type="number" class="search-ipt" v-model="count"><br>
+            </span>
+            <button class="ipt-btn" name="serch" @click="ShopOk" style="margin-top: 15px;">购买</button>
+        </div>
+    </GamePopup>
+</template>
+<script setup lang="ts">
+
+definePageMeta({
+    layout: layout.default,
+    middleware: 'page-loading'
+})
+
+const currentPage = ref<number>(1);
+const total = ref<number>(0);
+const data = ref<Array<any>>([]);
+const showBuy = ref(false);
+const count = ref(1);
+const showGoods = ref<any>({});
+const type = ref('0');
+const serch = ref('');
+
+onMounted(async () => {
+    try {
+        await BindData();
+    }
+    finally {
+        PageLoading.Close();
+    }
+})
+
+const BindData = async (): Promise<void> => {
+    let result = await TradeService.GetTradeData("", Number(type.value), serch.value, currentPage.value);
+    if (result.code == 0) {
+        data.value = result.data.data;
+        total.value = result.data.total;
+
+    }
+    else {
+        MessageExtend.ShowDialog("提示", result.msg);
+    }
+};
+
+const Change = async (_type: string) => {
+    type.value = _type;
+    await BindData();
+}
+
+/**翻页 */
+const handlePageChange = async (page: number): Promise<void> => {
+    currentPage.value = page;
+    await BindData();
+};
+
+
+const Buy = (info: any) => {
+    showGoods.value = info;
+    count.value = 1;
+    showBuy.value = true;
+}
+const ShopOk = async () => {
+    if (count.value < 1 || count.value > 99) {
+        MessageExtend.ShowToast("每次购买数量在1~99哦.");
+        return;
+    }
+    MessageExtend.LoadingToast("购买中...");
+    let result = await TradeService.Buy(showGoods.value.tradeId, count.value);
+    MessageExtend.LoadingClose();
+    if (result.code == 0) {
+        showBuy.value = false;
+        await BindData();
+        MessageExtend.Notify(`成功购买${showGoods.value.name}×${count.value}`, "success");
+    }
+    else {
+        MessageExtend.ShowDialog("提示", result.msg);
+    }
+}
+</script>

Web/src/pages/trade/info.vue

@@ -0,0 +1,122 @@
+<template>
+    <div class="content">
+        <div class="common" v-if="equInfo.img != ''">
+            <Aimage :url="equInfo.img" _alt="."></Aimage>
+        </div>
+
+        <div class="common">
+            名称:<span v-html="EquTool.ConvertEquName(equData, 0)"></span> <br>
+            <span v-if="equData.equName != equData.unitEquName">
+                装备名称:{{ equData.unitEquName }}<br>
+            </span>
+            部位:{{ EquTool.GetEquPlaceName(equData.code) }}<br>
+            等级:{{ equData.lev }}<br>
+            品质:{{ equData.qualityName }}<br>
+            交易:{{ equData.isDeal == 1 ? "可交易" : "不可交易" }}<br>
+            赠送:{{ equData.isGive == 1 ? "可赠送" : "不可赠送" }}<br>
+            获取途径:{{ equInfo.source }}<br>
+            说明:{{ equInfo.remark }}<br>
+            签名:{{ equData.sign }}<br>
+            获得人:<GameUser :data="owUser" :show-icon="0" :show-area="0"></GameUser><br>
+            <span v-if="equData.sex != 'Default'">
+                性别:{{ equData.sex == 'Boy' ? "男" : "女" }}<br>
+            </span>
+            强化:{{ equData.isIntensify == 1 ? "可强化" : "不可强化" }}<br>
+            <span v-if="equData.intensifyLev > 0">
+                强化等级:{{ equData.intensifyLev }}<br>
+            </span>
+            <span v-if="equAwaken.length > 0">
+                <Abar :href='"/user/equ/awaken?ue=" + equData.ueId'>装备特性:{{ equAwaken[0].name }}({{ equAwaken[0].lev
+                }}级)
+                </Abar><br>
+            </span>
+            附魔:{{ equMent.name }}<br>
+            负重:{{ equData.weight }}<br>
+            <div v-if="equData.isAppr == 1" style="margin:0px;">
+                <span v-if="Number(equData.blood) > 0">
+                    体力:{{ equData.blood }}<br>
+                </span>
+                <span v-if="Number(equData.minAtk) > 0">
+                    攻击:{{ equData.minAtk }}-{{ equData.maxAtk }}<br>
+                </span>
+                <span v-if="Number(equData.defense) > 0">
+                    防御:{{ equData.defense }}<br>
+                </span>
+                <span v-if="Number(equData.agility) > 0">
+                    敏捷:{{ equData.agility }}<br>
+                </span>
+                <span v-if="Number(equData.morale) > 0">
+                    士气:{{ equData.morale }}<br>
+                </span>
+            </div>
+            耐久:{{ equData.maxdurability }}/{{ equData.durability }}<br>
+            <span v-if="equData.suitCode != '0' && equData.suitCode != ''">
+                套装:<Abar :href='"/prop/suit?no=" + equData.suitCode'>{{ suitInfo.suitName }}</Abar><br>
+            </span>
+            特性:{{ EquTool.GetEquAttrName(equData.equAttr, 0) }}<br>
+            <span v-if="equData.holeCount > 0">
+                镶嵌:({{ gemMent.length }}/{{ equData.holeCount }})<br>
+            </span>
+            <span v-if="equData.opTime == 0">
+                <span v-if="equInfo.useTime > 0">
+                    有效期:{{ equInfo.useTime }}天
+                </span>
+            </span>
+            <span v-else>
+                <span v-if="equInfo.useTime > 0">
+                    到期时间:{{ TimeExtend.Format(equData.useEndTime, "yyyy-MM-dd") }}
+                </span>
+            </span>
+            <div v-if="equData.isAppr == 0">
+                (*该装备需要鉴定)
+            </div>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+
+
+definePageMeta({
+    layout: layout.default,
+    middleware: 'page-loading'
+})
+const equData = ref<any>({});
+const equInfo = ref<any>({});
+const suitInfo = ref<any>({});
+const owUser = ref<any>({});
+const equAwaken = ref<Array<any>>([]);
+const equMent = ref<any>({});
+const gemMent = ref<Array<any>>([]);
+onMounted(async () => {
+    try {
+        await BindData();
+    }
+    finally {
+        PageLoading.Close();
+    }
+})
+
+
+
+const BindData = async (): Promise<void> => {
+    let tradeId = PageExtend.QueryString("id");
+    let result = await TradeService.GetTradeInfo(tradeId);
+    if (result.code == 0) {
+        equData.value = result.data.equData;
+        equInfo.value = result.data.equ;
+        suitInfo.value = result.data.suit;
+        owUser.value = result.data.user;
+        equAwaken.value = result.data.equData.equAwaken;
+        equMent.value = result.data.equData.equMent;
+        gemMent.value = result.data.equData.gemMent;
+    }
+    else if (result.code == 100) {
+        PageExtend.RedirectTo("/prop/goods?id=" + result.msg);
+    }
+    else {
+        MessageExtend.ShowDialog("提示", result.msg);
+    }
+};
+
+
+</script>

Web/src/pages/trade/my.vue

@@ -1 +1,79 @@
-<template></template>
+<template>
+    <div class="module-title">
+        我的交易
+    </div>
+    <div class="module-content">
+        <div class="item border-btm" v-for="(item, index) in data" :key="index">
+            {{ index + 1 }}.[{{ GetRankName(item.code) }}]
+               <span v-if="item.code == 'Equ'">
+                <Abar :href='"/trade/info?id=" + item.tradeId'>{{ item.name }}({{ item.price }}铜贝)</Abar>
+            </span>
+            <span v-else>
+                <Abar :href='"/prop/goods?id=" + item.propId'>{{ item.name }}({{ item.price }}铜贝)</Abar>
+            </span>
+            (<Abutton @click="Down(item.tradeId)">下架</Abutton>)<br>            
+            <span v-if="item.code != 'Equ'">
+                数量:{{ item.count }}
+            </span>
+        </div>
+        <span v-if="data.length == 0">
+            暂无交易.
+        </span>
+    </div>
+</template>
+<script setup lang="ts">
+
+definePageMeta({
+    layout: layout.default,
+    middleware: 'page-loading'
+})
+
+const data = ref<Array<any>>([]);
+onMounted(async () => {
+    try {
+        await BindData();
+    }
+    finally {
+        PageLoading.Close();
+    }
+})
+
+const BindData = async (): Promise<void> => {
+    let result = await TradeService.GetMyTrade();
+    if (result.code == 0) {
+        data.value = result.data;
+
+    }
+    else {
+        MessageExtend.ShowDialog("提示", result.msg);
+    }
+};
+
+const GetRankName = (type: string) => {
+    let result = '其他';
+    switch (type) {
+        case "Equ":
+            result = "装备"; break;
+        case "Goods":
+            result = "物品"; break;
+
+    }
+    return result;
+}
+
+const Down = async (tradeId: string) => {
+    MessageExtend.ShowConfirmDialogAsyc("下架操作", `您确定要下架吗?`, async () => {
+        let result = await TradeService.DownTrade(tradeId);
+        if (result.code == 0) {
+            await BindData();
+            MessageExtend.Notify("下架成功!", "success");
+        }
+        else {
+            MessageExtend.Notify(result.msg, "danger");
+        }
+
+        return true;
+    });
+}
+
+</script>

Web/src/pages/trade/user.vue

@@ -1 +1,117 @@
-<template></template>
+<template>
+    <div class="module-title">
+        交易信息
+    </div>
+    <div class="module-content">
+        <div class="item border-btm" v-for="(item, index) in data" :key="index">
+            {{ PageExtend.GetPageIndex(currentPage, 10, index + 1) }}.[{{ GetRankName(item.code) }}]
+           <span v-if="item.code == 'Equ'">
+                <Abar :href='"/trade/info?id=" + item.tradeId'>{{ item.name }}({{ item.price }}铜贝)</Abar>
+            </span>
+            <span v-else>
+                <Abar :href='"/prop/goods?id=" + item.propId'>{{ item.name }}({{ item.price }}铜贝)</Abar>
+            </span>
+            [<Abutton @click="Buy(item)">购买</Abutton>]
+        </div>
+        <span v-if="data.length == 0">
+            暂无交易.
+        </span>
+    </div>
+    <div class="content">
+        <Pagination :currentPage="currentPage" :limit="10" :total="total" @pageChange="handlePageChange" />
+    </div>
+    <GamePopup v-model:show="showBuy" title="【购买】">
+        <!-- 自定义内容 -->
+        <div class="common">
+            物品名称：{{ showGoods.name }}<br>
+            购买单价：{{ showGoods.price }} 铜贝<br>
+            <span v-if="showGoods.code != 'Equ'">
+                剩余数量：{{ showGoods.count }}
+            </span>
+        </div>
+        <div class="common" style="text-align: center;">
+            <span v-if="showGoods.code != 'Equ'">
+                购买数量：<input type="number" class="search-ipt" v-model="count"><br>
+            </span>
+            <button class="ipt-btn" name="serch" @click="ShopOk" style="margin-top: 15px;">购买</button>
+        </div>
+    </GamePopup>
+</template>
+<script setup lang="ts">
+
+definePageMeta({
+    layout: layout.default,
+    middleware: 'page-loading'
+})
+
+const currentPage = ref<number>(1);
+const total = ref<number>(0);
+const data = ref<Array<any>>([]);
+const showBuy = ref(false);
+const count = ref(1);
+const showGoods = ref<any>({});
+
+
+let no = PageExtend.QueryString("no");
+
+onMounted(async () => {
+    try {
+        await BindData();
+    }
+    finally {
+        PageLoading.Close();
+    }
+})
+
+const BindData = async (): Promise<void> => {
+    let result = await TradeService.GetTradeData(no, 0, "", currentPage.value);
+    if (result.code == 0) {
+        data.value = result.data.data;
+        total.value = result.data.total;
+
+    }
+    else {
+        MessageExtend.ShowDialog("提示", result.msg);
+    }
+};
+
+/**翻页 */
+const handlePageChange = async (page: number): Promise<void> => {
+    currentPage.value = page;
+    await BindData();
+};
+
+const GetRankName = (type: string) => {
+    let result = '其他';
+    switch (type) {
+        case "Equ":
+            result = "装备"; break;
+        case "Goods":
+            result = "物品"; break;
+
+    }
+    return result;
+}
+const Buy = (info: any) => {
+    showGoods.value = info;
+    count.value = 1;
+    showBuy.value = true;
+}
+const ShopOk = async () => {
+    if (count.value < 1 || count.value > 99) {
+        MessageExtend.ShowToast("每次购买数量在1~99哦.");
+        return;
+    }
+    MessageExtend.LoadingToast("购买中...");
+    let result = await TradeService.Buy(showGoods.value.tradeId, count.value);
+    MessageExtend.LoadingClose();
+    if (result.code == 0) {
+        showBuy.value = false;
+        await BindData();
+        MessageExtend.Notify(`成功购买${showGoods.value.name}×${count.value}`, "success");        
+    }
+    else {
+        MessageExtend.ShowDialog("提示", result.msg);
+    }
+}
+</script>

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

@@ -1,11 +1,14 @@
 <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 class="content">
+    <div class="item" 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>
+    <span v-if="maxList.length == 0">暂无徽章.</span>
   </div>
   <div class="content">
     <Pagination :currentPage="currentPage" :limit="10" :total="total" @pageChange="handlePageChange" />

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

@@ -1,11 +1,16 @@
 <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 class="content">
+    <div class="item" 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>
+    <span v-if="maxList.length==0">
+      暂无称号.
+    </span>
   </div>
   <div class="content">
     <Pagination :currentPage="currentPage" :limit="10" :total="total" @pageChange="handlePageChange" />

Web/src/services/Index/TradeService.ts

@@ -6,4 +6,44 @@ export class TradeService {
     static async Trade(type: number, prop: string, price: number, count: number) {
         return await ApiService.Request("get", "/Trade/Trade", { type, prop, price, count });
     }
+
+    /**
+     * 购买
+     * GET /Trade/Buy
+     */
+    static async Buy(tradeId: string, count: number) {
+        return await ApiService.Request("get", "/Trade/Buy", { tradeId, count });
+    }
+
+    /**
+     * 获取交易列表
+     * GET /Trade/GetTradeData
+     */
+    static async GetTradeData(no: string, type: number, query: string, page: number) {
+        return await ApiService.Request("get", "/Trade/GetTradeData", { no, type, query, page });
+    }
+
+    /**
+     * 获取个人交易列表
+     * GET /Trade/GetMyTrade
+     */
+    static async GetMyTrade() {
+        return await ApiService.Request("get", "/Trade/GetMyTrade");
+    }
+
+    /**
+     * 下架交易
+     * GET /Trade/DownTrade
+     */
+    static async DownTrade(tradeId: string) {
+        return await ApiService.Request("get", "/Trade/DownTrade", { tradeId });
+    }
+
+    /**
+     * 获取交易详情
+     * GET /Trade/GetTradeInfo
+     */
+    static async GetTradeInfo(tradeId: string) {
+        return await ApiService.Request("get", "/Trade/GetTradeInfo", { tradeId });
+    }
 }