Merge branch 'main' of 47.107.44.202:xionglijia/18xchat

# Conflicts:
#	assets/Scripts/chat18x/ui/panels/ThemePanel.ts

assets/Scripts/chat18x/ui/panels/ThemePanel.ts

@@ -19,11 +19,14 @@ import { ViewManager } from "../../../Main/Manager/ViewManager";
 import { InnerMsgCode } from "../../../Main/Config/InnerMsgCode";
 import { ThemeService } from "db://assets/Scripts/chat18x/network/services/ThemeService";
 import { GirlService } from "db://assets/Scripts/chat18x/network/services/GirlService";
+import { ShopService } from "db://assets/Scripts/chat18x/network/services/ShopService";
 import { DataManager, DataId } from "../../data/DataManager";
 import { ThemeData } from "../../data/ThemeData";
 import { GirlData } from "../../data/GirlData";
 import { WalletData } from "../../data/WalletData";
 import { AccountData } from "../../data/AccountData";
+
+import { ShopData } from "../../data/ShopData";
 import proto from "db://assets/Scripts/proto/proto.pb.js";
 
 const { ccclass, property } = _decorator;
@@ -117,6 +120,9 @@ export class ThemePanel extends li_BaseView {
         }
       );
     }
+
+    // 获取商品列表，提前把数据拿下来
+    this.reqShopList();
   }
 
   private registerListener() {
@@ -193,6 +199,19 @@ export class ThemePanel extends li_BaseView {
     ).replace("${leftTime}", leftTime);
   }
 
+  // 获取商品列表
+  async reqShopList() {
+    // 请求购买商品
+    const reqData = {};
+    let res = await ShopService.I.reqShopList(reqData);
+    if (res && res.code === proto.cs.EnmRetCode.SUCCESS) {
+      const resData = res.data;
+      // 保存数据
+      const shopData = DataManager.I.getDataById<ShopData>(DataId.Shop);
+      shopData.goods = res.data;
+    }
+  }
+
   onDestroy(): void {
     Utils.removeInnerEL(InnerMsgCode.LanguageChange, this, () => {
       this.recName.string = LanguageUtils.getText(this.rectNameKey);