修复激活码导出字段缺失 -zzx

src/views/operationManage/comboManage/checkoutCode.vue

@@ -269,10 +269,13 @@ export default {
         let codeStatus = ''
         let pushSync=''
         let pushTime=''
+        let validType=''
         if(item.activationType===1){
           createTime = item.startTime+'至'+item.endTime
+          validType='时间段'
         }else{
           createTime = item.activationDay+'天'
+          validType='天数'
         }
         if(item.phone==null){
           codeStatus='待使用'
@@ -290,7 +293,7 @@ export default {
           "激活ID": item.id,
           "激活码": item.serialNumber,
           "会员套餐": item.planningName,
-          "有效期类型": item.goodsAmount,
+          "有效期类型":validType,
           "时间段/天数": createTime,
           "创建时间":timeFormat(item.createTime),
           "状态": codeStatus,

src/views/operationManage/shopManage/shopAdd.vue

@@ -2,7 +2,7 @@
  * @Author: error: error: git config user.name & please set dead value or install git && error: git config user.email & please set dead value or install git & please set dead value or install git
  * @Date: 2023-05-26 16:37:34
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-10-31 17:42:39
+ * @LastEditTime: 2024-11-08 16:39:24
  * @FilePath: \admin-manage\src\views\operationManage\shopManage\shopAdd.vue
  * @Description:
  *
@@ -213,7 +213,8 @@
        <el-form-item label="绑定所属平台及分账规则" prop="platformType">
 
         <el-checkbox-group v-model="setQuery.platformType" prop="platformType">
-            <div class="flex" v-for="(item,index) in masterShopOptions" :key="index" ><el-checkbox :label="item.value">{{item.label}}</el-checkbox> 
+            <div class="flex" v-for="(item,index) in masterShopOptions" :key="index" >
+              <el-checkbox :label="item.value">{{item.label}}</el-checkbox> 
             <el-form-item label="分账规则：" v-if="setQuery.platformType.includes(item.value)" :prop="'shopInfos.' + index + '.shareId'" :rules="{required: true, message: '请选择分账规则', trigger: 'change'}">
               <el-select
               v-model="setQuery.shopInfos[index].shareId"
@@ -230,7 +231,7 @@
             </el-select>
             </el-form-item>
              <el-form-item label="银联分账帐户：" v-if="setQuery.platformType.includes(item.value)" >
-            <el-select v-model="setQuery.shopInfos[index].authAccount" size="small" filterable class="item-width-300" placeholder="请搜索选择店铺主体">
+            <el-select v-model="setQuery.shopInfos[index].authAccount" filterable class="item-width-300" placeholder="请搜索选择店铺主体">
               <el-option
                 v-for="(item,index) in authOptions"
                 :key="index"
@@ -667,16 +668,25 @@ export default {
           this.setQuery.serviceCate = this.setQuery.serviceCate.split('/').map(item=>{return item = item.split(',').map(item=> Number(item))})
           this.setQuery.shopMenuId = this.setQuery.shopMenuId.split(',').map(item=> Number(item))
           this.setQuery.platformType = this.setQuery.platformType.split(',').map(item=> Number(item))
-          if(!this.setQuery.shopInfos){
-            this.setQuery.shopInfos=[]
-            this.masterShopOptions.map(item=>{
-              this.setQuery.shopInfos.push({
-                shareId:'',
-                authAccount:'',
-                platformType:item.value
-              })
+          let shopInfos = JSON.parse(JSON.stringify(this.setQuery.shopInfos))
+          this.setQuery.shopInfos=[]
+          this.masterShopOptions.map(item=>{
+            this.setQuery.shopInfos.push({
+              shareId:'',
+              authAccount:'',
+              platformType:item.value
             })
-          }
+          })
+
+          this.setQuery.shopInfos.map(item=>{
+              shopInfos.map(i=>{
+                if(item.platformType == i.platformType){
+                  item.shareId = i.shareId
+                  item.authAccount = i.authAccount
+                }
+            })
+          })
+
         }
       });
     },