Merge branch '7.9.6' into 7.9.7

src/views/components/quickSendGame/vipTools.vue

@@ -69,67 +69,71 @@
         ></i>
       </div>
       <el-collapse-transition>
-        <el-collapse
-          v-show="showGameCode"
-          v-if="giftCodeGame.length > 0"
-          :disabled="disabled"
-          class="giftGameCollapse"
-        >
-          <el-collapse-item
-            v-for="(item, index) in giftCodeGame"
-            :key="index"
-            :title="item.label"
-            style="margin-bottom: 10px"
+        <div v-show="showGameCode">
+          <div style="margin-bottom: 8px">
+            <mainGameSelect width="100%" @result="handleGiftGameSelect" />
+          </div>
+          <el-collapse
+            v-if="giftCodeGame.length > 0"
+            :disabled="disabled"
+            class="giftGameCollapse"
           >
-            <div v-if="giftCodeGame.length > 0">
-              <div
-                v-for="(items, indexs) in item.children"
-                :key="indexs"
-                class="gameListItemChange"
-              >
-                <div class="gameListItemApp gameListItemAppAC">
-                  <p v-if="items.gift_package_group_name" class="gameName">
-                    {{ items.gift_package_group_name }}
-                  </p>
-                  <div
-                    class="rowFlex columnCenter spaceBetween"
-                    style="margin-left: 20px"
-                  >
-                    <p class="rowFlex columnCenter spaceBetween">
-                      <el-popover placement="top" width="300" trigger="hover">
-                        <div>{{ items.name }}</div>
-                        <div slot="reference" class="gameName">
-                          {{ items.name }}
-                        </div>
-                      </el-popover>
-                      <el-popover placement="top" trigger="hover">
-                        <div
-                          class="contentPopover"
-                          v-html="items.content"
-                        ></div>
-                        <el-button
-                          slot="reference"
-                          type="text"
-                          size="medium"
-                          style="margin-right: 10px"
-                          >礼包内容</el-button
-                        >
-                      </el-popover>
+            <el-collapse-item
+              v-for="(item, index) in giftCodeGame"
+              :key="index"
+              :title="item.label"
+              style="margin-bottom: 10px"
+            >
+              <div v-if="giftCodeGame.length > 0">
+                <div
+                  v-for="(items, indexs) in item.children"
+                  :key="indexs"
+                  class="gameListItemChange"
+                >
+                  <div class="gameListItemApp gameListItemAppAC">
+                    <p v-if="items.gift_package_group_name" class="gameName">
+                      {{ items.gift_package_group_name }}
                     </p>
-                    <el-button
-                      size="mini"
-                      type="primary"
-                      :loading="loading"
-                      @click="sendGameCodeCopyDialog(items)"
-                      >发送礼包码</el-button
+                    <div
+                      class="rowFlex columnCenter spaceBetween"
+                      style="margin-left: 20px"
                     >
+                      <p class="rowFlex columnCenter spaceBetween">
+                        <el-popover placement="top" width="300" trigger="hover">
+                          <div>{{ items.name }}</div>
+                          <div slot="reference" class="gameName">
+                            {{ items.name }}
+                          </div>
+                        </el-popover>
+                        <el-popover placement="top" trigger="hover">
+                          <div
+                            class="contentPopover"
+                            v-html="items.content"
+                          ></div>
+                          <el-button
+                            slot="reference"
+                            type="text"
+                            size="medium"
+                            style="margin-right: 10px"
+                            >礼包内容</el-button
+                          >
+                        </el-popover>
+                      </p>
+                      <el-button
+                        size="mini"
+                        type="primary"
+                        :loading="loading"
+                        @click="sendGameCodeCopyDialog(items)"
+                        >发送礼包码</el-button
+                      >
+                    </div>
                   </div>
                 </div>
               </div>
-            </div>
-            <div v-else class="rowFlex allCenter">暂无游戏</div>
-          </el-collapse-item>
-        </el-collapse>
+              <div v-else class="rowFlex allCenter">暂无游戏</div>
+            </el-collapse-item>
+          </el-collapse>
+        </div>
       </el-collapse-transition>
     </div>
     <giftCodeDialog
@@ -154,6 +158,7 @@ import { passwardEncryption, createVipUrl } from "@/api/game";
 import { giftCodeList, sendGiftCode, getZyouAuthLink } from "@/api/works";
 import giftCodeDialog from "./giftCodeDialog.vue";
 import flowerLinkDialog from "./flowerLinkDialog.vue";
+import mainGameSelect from "@/components/mainGame.vue";
 export default {
   name: "vipTools",
   data() {
@@ -164,6 +169,7 @@ export default {
       dialogVisible: false,
       game_name: "",
       flowerLinkDialogVisible: false,
+      giftMainGameId: "",
       giftCodeForm: {
         member_id: "",
         username: "",
@@ -178,6 +184,7 @@ export default {
   components: {
     giftCodeDialog,
     flowerLinkDialog,
+    mainGameSelect,
   },
   mounted() {
     this.requestGiftCode();
@@ -308,6 +315,10 @@ export default {
         this.$message.warning("暂无申诉自助链接");
       }
     },
+    handleGiftGameSelect(value) {
+      this.giftMainGameId = value;
+      this.requestGiftCode();
+    },
     async requestGiftCode() {
       this.giftCodeGame = [];
       // 1 企微 2 微信
@@ -315,6 +326,9 @@ export default {
         userid: this.userid,
         user_type: 1,
       };
+      if (this.giftMainGameId) {
+        data.main_game_id = this.giftMainGameId;
+      }
       const res = await giftCodeList(data);
       if (res.status_code == 1 && res.data.length > 0) {
         // this.giftCodeGame = res.data