feat: 对设备兑换新增免费流量兑换接口修改

src/api/operation/activity.js

@@ -28,6 +28,15 @@ export function list(data) {
   })
 }
 
+//合并 详情
+export function goodList(data) {
+  return request({
+    url: `/admin/activity/goodList`,
+    method: 'post',
+    data
+  })
+}
+
 // 详情
 export function detail(id) {
   return request({
@@ -51,4 +60,4 @@ export function change(id, status) {
     url: `/admin/activity/hitOrSold/${id}/${status}`,
     method: 'get'
   })
-}
+}

src/views/operation/activity/detail.vue

@@ -155,7 +155,7 @@
 </template>
 
 <script>
-import { detail, submit } from "@/api/operation/activity";
+import { detail, goodList, submit } from "@/api/operation/activity";
 import { devMixin, serviceTimeMixin } from "@/mixin/index";
 export default {
   mixins: [serviceTimeMixin, devMixin],
@@ -227,9 +227,31 @@ export default {
     }
   },
   methods: {
+    // 超级详情
+    getGoodList() {
+      var param = {
+        deviceId: this.$route.query.id,
+        platformId: 0,
+      };
+      goodList(param).then((res) => {
+        
+        console.log("操作结果dasd发==aaa=" + JSON.stringify(res));
+        if (res.code === 0) {
+          res.data.platformName =
+            res.data.platformId === 1
+              ? this.platformNames[1]
+              : this.platformNames[0];
+          this.form = res.data;
+          res.data.deviceRespList.map((i) => {
+            this.num.push(i.totalNum);
+          });
+        }
+      });
+    },
     // 详情
     getDetail() {
       detail(this.$route.query.id).then((res) => {
+        console.log("操作结果dasd发==111=" + JSON.stringify(res));
         if (res.code === 0) {
           res.data.platformName =
             res.data.platformId === 1

src/views/operation/activity/index.vue

@@ -154,20 +154,17 @@
       width="1000px"
       :before-close="getDialogClose"
     >
-      <el-form :model="dialogData" ref="dialogData" label-width="auto">
-        <!-- ICCID号 -->
-        <el-form-item
-          label="ICCID号："
-          prop="iccid"
-          :rules="[
+      <!-- :rules="[
             {
               required: true,
               message: '请输入要赠送设备的ICCID号',
               trigger: 'blur',
             },
             { max: 30, message: '不可超过30个字符', trigger: 'blur' },
-          ]"
-        >
+          ]" -->
+      <el-form :model="dialogData" ref="dialogData" label-width="auto">
+        <!-- ICCID号 -->
+        <el-form-item label="ICCID号：" prop="iccid">
           <el-input
             v-model="dialogData.iccid"
             placeholder="请输入要赠送设备的ICCID号"
@@ -191,14 +188,11 @@
 
         <!-- 设备型号 -->
         <el-form-item label="设备型号：">
-          <el-select
-            v-model="dialogData.deviceClientType"
-            placeholder="请选择设备型号"
-          >
+          <el-select v-model="dialogData.deviceId" placeholder="请选择设备型号">
             <el-option
               v-for="item in devOptions"
               :key="item.value"
-              :value="item.label"
+              :value="item.value"
               :label="item.label"
             />
           </el-select>
@@ -265,14 +259,13 @@ export default {
     getDialogSubmit() {
       var iccid = this.dialogData.iccid;
       var activityId = this.dialogData.activityId;
-      var deviceClientType = this.dialogData.deviceClientType;
+      var deviceId = this.dialogData.deviceId;
       var param = {
         iccid: iccid,
         activityId: activityId,
-        deviceClientType: deviceClientType,
+        deviceId: deviceId,
       };
 
-
       console.log("操作参数==" + JSON.stringify(param));
       doExchange(param).then((res) => {
         // 89860624650085884202
@@ -307,6 +300,7 @@ export default {
     getList() {
       this.loading = true;
       list(this.form).then((res) => {
+        console.log("操作结果dasd发==00=" + JSON.stringify(res));
         if (res.code === 0) {
           this.tableData = res.data.records;
           this.total = res.data.total;