Explorar el Código

提交素材多维度测试

朱鑫波 hace 3 años
padre
commit
1064243f40

+ 3 - 3
src/api/video.js

@@ -2,7 +2,7 @@
 import {axios} from '@/utils/request'
 
 
-//获取登账户已经绑定过的快手账户列表
+//获取登账户已经绑定过的快手账户列表
 export function getUserList() {
     return axios({
       url: "/ks/web/user/list",
@@ -11,7 +11,7 @@ export function getUserList() {
     })
 }
 
-// 获取登二维码
+// 获取登二维码
 export function getLoginQr() {
     return axios({
       url: "/ks/web/login/qr",
@@ -20,7 +20,7 @@ export function getLoginQr() {
     })
 }
 
-// 获取登状态
+// 获取登状态
 // /ks/web/login/status
 // 参数 String requestId
 export function getLoginStatus(parameter) {

+ 1 - 1
src/components/README.md

@@ -11,7 +11,7 @@ onEnd倒计时结束触发函数
 ####6.Ellipsis包:字符串截取组件,可以指定字符串的显示长度,并将全部内容显示到tip中,简单使用参考src\views\system\PermissionList.vue
 ####7.jeecg包:该包下自定义了很多列表/表单中用到的组件 参考包下readme文件
 ####8.jeecgbiz包:该包下定义了一些业务相关的组件,比如选择用户弹框,根据部门选择用户等等
-####9.layouts+page包:系统页面布局相关组件,比如登进去之后页面顶部显示什么,底部显示什么,菜单点击触发多个tab的布局等等 一般情况不需要修改
+####9.layouts+page包:系统页面布局相关组件,比如登进去之后页面顶部显示什么,底部显示什么,菜单点击触发多个tab的布局等等 一般情况不需要修改
 ####10.menun包:菜单组件,俩个,一个折叠菜单一个正常显示的菜单
 ####11.NumberInfo:数字信息显示组件 如下图
 ![输入图片说明](https://static.oschina.net/uploads/img/201904/12185858_uvJ5.png "在这里输入图片标题")

+ 1 - 1
src/components/tools/UserPassword.vue

@@ -88,7 +88,7 @@
     methods: {
       show(uname){
         if(!uname){
-          this.$message.warning("当前系统无登用户!");
+          this.$message.warning("当前系统无登用户!");
           return
         }else{
           this.username = uname

+ 1 - 1
src/views/account/settings/BaseSetting.vue

@@ -38,7 +38,7 @@
             <a-input placeholder="h3gSbecd"/>
           </a-form-item>
           <a-form-item
-            label="登密码"
+            label="登密码"
             :required="false"
           >
             <a-input placeholder="密码"/>

+ 1 - 1
src/views/modules/BatchCreate/components/Treeselect.vue

@@ -61,7 +61,7 @@
       reqUrl: {
         type: String,
         default () {
-          return '/ctop/projectMember/participateList'
+          return ''
         }
 
       }

+ 1 - 1
src/views/modules/advertiser/UserAllocationList.vue

@@ -341,7 +341,7 @@ export default {
           dataIndex: 'projectId_dictText',
         },
         //    {
-        //     title: '输入账号  --登',
+        //     title: '输入账号  --登',
         //     align:"center",
         //     dataIndex: 'accountName'
         //    },

+ 2 - 2
src/views/modules/advertiser/modules/BindAccountLoginModal__Style#Drawer.vue

@@ -38,8 +38,8 @@
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
-          label="1未登陆 2已登陆">
-          <a-input placeholder="请输入1未登陆 2已登陆" v-decorator="['status', {}]" />
+          label="1未登录 2已登录">
+          <a-input placeholder="请输入1未登录 2已登录" v-decorator="['status', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"

+ 2 - 2
src/views/modules/advertiser/modules/UserAllocationModal.vue

@@ -37,8 +37,8 @@
         <!-- <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
-          label="输入账号  --登">
-          <a-input placeholder="请输入输入账号  --登" v-decorator="['accountName', {}]" />
+          label="输入账号  --登">
+          <a-input placeholder="请输入输入账号  --登" v-decorator="['accountName', {}]" />
         </a-form-item> -->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="授权名称">
           <a-input placeholder="请输入授权名称" v-decorator="['authName', {}]" />

+ 4 - 4
src/views/modules/advertiser/modules/UserAllocationModal__Style#Drawer.vue

@@ -14,8 +14,8 @@
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
-          label="登人id">
-          <a-input placeholder="请输入登人id" v-decorator="['userId', {}]" />
+          label="登人id">
+          <a-input placeholder="请输入登人id" v-decorator="['userId', {}]" />
         </a-form-item>
         <a-form-item
           :labelCol="labelCol"
@@ -56,8 +56,8 @@
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
-          label="输入账号  --登">
-          <a-input placeholder="请输入输入账号  --登" v-decorator="['accountName', {}]" />
+          label="输入账号  --登">
+          <a-input placeholder="请输入输入账号  --登" v-decorator="['accountName', {}]" />
         </a-form-item>
         <a-form-item
                 :labelCol="labelCol"

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1170 - 1047
src/views/modules/autoLaunch/material-test/creatMaterialTest.vue


+ 137 - 77
src/views/modules/autoLaunch/material-test/index.vue

@@ -255,19 +255,7 @@
                         ref="accountTable"
                     >
                         <span slot="strategyStatus" slot-scope="text, record">
-                            <a-switch
-                                :checked="text == 0"
-                                @change="onChangeStatus(text, record, 'strategyStatus')"
-                                :loading="spinning"
-                            />
-                        </span>
-                        <span slot="projectStrategy" slot-scope="text, record">
-                            <a-switch
-                                :checked="text == 1"
-                                @change="onChangeStatus(text, record, 'projectStrategy')"
-                                :loading="spinning"
-                                v-if="record.projectName !== '-'"
-                            />
+                            <a-switch :checked="text == 0" @change="onChangeStatus(text, record, 'strategyStatus')" />
                         </span>
 
                         <span slot="statDate" slot-scope="text, record">
@@ -402,21 +390,23 @@
                     <a-form-item label="地区">
                         <checkBoxGroup
                             :options="regionData"
-                            v-decorator="['region', { initialValue: [] }]"
+                            v-decorator="[
+                                'region',
+                                {
+                                    rules: [{ required: true, message: '地区必选' }],
+                                    initialValue: ['unlimited']
+                                }
+                            ]"
                             @change="setData($event, 'region')"
                         />
                     </a-form-item>
                     <a-form-item label="年龄">
                         <checkBoxGroup
-                            :options="[
-                                { label: '不限', value: 'unlimited' },
-                                { label: '18-23岁', value: '18' },
-                                { label: '24-30岁', value: '24' },
-                                { label: '31-40岁', value: '31' },
-                                { label: '41-49岁', value: '41' },
-                                { label: '50-100岁', value: '50' }
+                            :options="ageData"
+                            v-decorator="[
+                                'agesRange',
+                                { rules: [{ required: true, message: '年龄必选' }], initialValue: ['unlimited'] }
                             ]"
-                            v-decorator="['agesRange', { initialValue: [] }]"
                             @change="setData($event, 'agesRange')"
                         />
                     </a-form-item>
@@ -425,9 +415,12 @@
                             :options="[
                                 { label: '不限', value: 'unlimited' },
                                 { label: '女', value: '1' },
-                                { label: '男', value: '0' }
+                                { label: '男', value: '2' }
+                            ]"
+                            v-decorator="[
+                                'gender',
+                                { rules: [{ required: true, message: '性别必选' }], initialValue: ['unlimited'] }
                             ]"
-                            v-decorator="['gender', { initialValue: [] }]"
                             @change="setData($event, 'gender')"
                         />
                     </a-form-item>
@@ -437,16 +430,22 @@
                                 { label: '不限', value: 'unlimited' },
                                 { label: '系统优选', value: '1' }
                             ]"
-                            v-decorator="['intentionTarget', { initialValue: [] }]"
+                            v-decorator="[
+                                'intentionTarget',
+                                { rules: [{ required: true, message: '行为意向必选' }], initialValue: ['unlimited'] }
+                            ]"
                         />
                     </a-form-item>
                     <a-form-item label="APP行为">
                         <checkBoxGroup
                             :options="[
                                 { label: '不限', value: 'unlimited' },
-                                { label: '按App名称', value: '1', disabled: !accountProjectDetail.accountId }
+                                { label: '按App名称', value: '1' }
+                            ]"
+                            v-decorator="[
+                                'appIds',
+                                { rules: [{ required: true, message: 'APP行为必选' }], initialValue: ['unlimited'] }
                             ]"
-                            v-decorator="['appIds', { initialValue: [] }]"
                             @change="setData($event, 'appIds')"
                         />
                         <el-select
@@ -470,11 +469,7 @@
                         </el-select>
                     </a-form-item>
                     <a-form-item label="智能扩量">
-                        <checkBoxGroup
-                            :options="[
-                                { label: '关闭', value: '0' },
-                                { label: '开启', value: '1' },
-                                {
+                        <!-- {
                                     label: '不可突破年龄',
                                     value: '2',
                                     disabled: getElseData('agesRange')
@@ -504,9 +499,16 @@
                                             ? false
                                             : true
                                         : true
-                                }
+                                } -->
+                        <checkBoxGroup
+                            :options="[
+                                { label: '关闭', value: '0' },
+                                { label: '开启', value: '1' }
+                            ]"
+                            v-decorator="[
+                                'intelliExtend',
+                                { rules: [{ required: true, message: '智能扩量必选' }], initialValue: ['0'] }
                             ]"
-                            v-decorator="['intelliExtend', { initialValue: [] }]"
                         />
                     </a-form-item>
                     <a-form-item label="投放时段">
@@ -542,46 +544,54 @@
                 sumContent = 0
             "
         >
-            <div style="width:100%;display:flex;">
-                <span></span>
+            <div style="width:100%;display:flex;    justify-content: space-between;">
                 <span>已选择:{{ sumContent }}</span>
+                <a-button slot="tabBarExtraContent" type="primary" @click="tongbu()" :loading="tongbuLoading">
+                    刷新素材</a-button
+                >
             </div>
-            <a-checkbox-group v-model="checkVideo" style="width: 100%;" @change="setVideoDataAll">
-                <div class="card-person-drawer info-detail">
-                    <a-card class="card-person card-item" v-for="(item, index) in dataVideoList" :key="index">
-                        <div
-                            slot="title"
-                            style="    overflow: hidden;
+            <a-spin :spinning="spinning">
+                <a-checkbox-group v-model="checkVideo" style="width: 100%;" @change="setVideoDataAll">
+                    <div class="card-person-drawer info-detail">
+                        <a-card class="card-person card-item" v-for="(item, index) in dataVideoList" :key="index">
+                            <div
+                                slot="title"
+                                style="    overflow: hidden;
                             text-overflow: ellipsis;
                             white-space: nowrap;"
-                        >
-                            {{ item.photoName }}
-                        </div>
-                        <div slot="extra">
-                            <a-checkbox :value="item.photoId" @change="setVideoData(item.photoId)"></a-checkbox>
-                        </div>
-                        <div style="width:100%;border: 1px solid #f2f2f2;position:relative">
-                            <img :src="item.coverUrl" style="width:100%" alt="" />
-                            <a-tag color="blue" v-if="item.useStatus == 0" style="position:absolute;top:5px;right:0px">
-                                已测试
-                            </a-tag>
-                        </div>
-                    </a-card>
+                            >
+                                {{ item.photoName }}
+                            </div>
+                            <div slot="extra">
+                                <a-checkbox :value="item.photoId" @change="setVideoData(item.photoId)"></a-checkbox>
+                            </div>
+                            <div style="width:100%;border: 1px solid #f2f2f2;position:relative">
+                                <img :src="item.coverUrl" style="width:100%" alt="" />
+                                <a-tag
+                                    color="blue"
+                                    v-if="item.useStatus == 0"
+                                    style="position:absolute;top:5px;right:0px"
+                                >
+                                    已测试
+                                </a-tag>
+                            </div>
+                        </a-card>
+                    </div>
+                </a-checkbox-group>
+                <div style="text-align:right">
+                    <a-pagination
+                        size="small"
+                        :showTotal="ipaginationVideo.showTotal"
+                        style="float:right"
+                        v-if="dataVideoList.length > 0"
+                        showQuickJumper
+                        :pageSize.sync="ipaginationVideo.pageSize"
+                        :total="ipaginationVideo.total"
+                        v-model="ipaginationVideo.current"
+                        @change="getDataVideo"
+                    />
                 </div>
-            </a-checkbox-group>
-            <div style="text-align:right">
-                <a-pagination
-                    size="small"
-                    :showTotal="ipaginationVideo.showTotal"
-                    style="float:right"
-                    v-if="dataVideoList.length > 0"
-                    showQuickJumper
-                    :pageSize.sync="ipaginationVideo.pageSize"
-                    :total="ipaginationVideo.total"
-                    v-model="ipaginationVideo.current"
-                    @change="getDataVideo"
-                />
-            </div>
+            </a-spin>
         </a-modal>
     </div>
 </template>
@@ -736,6 +746,7 @@ export default {
 
     data() {
         return {
+            tongbuLoading: false,
             appIds: [],
             appOptions: [],
             materialVisible: false,
@@ -847,11 +858,39 @@ export default {
             accountVisible: false,
             againLoading: false,
             accountProjectDetail: null,
-            regionData: [{ label: '不限', value: 'unlimited' }]
+            regionData: [{ label: '不限', value: 'unlimited' }],
+            ageData: [{ label: '不限', value: 'unlimited' }]
         }
     },
     methods: {
         moment,
+        tongbu() {
+            this.tongbuLoading = true
+
+            this.getAction('/kuaishou/batch/syncVideo', {
+                accountId: this.ipaginationVideo.accountId
+            }).then(res => {
+                if (res.success) {
+                    this.$message.success(res.message)
+                    this.tongbuLoading = false
+                    postAction('/dimension/kuaiShouDimensionMaterial/getVideoList', {
+                        id: this.ipaginationVideo.id,
+                        accountId: this.ipaginationVideo.accountId,
+                        pageSize: this.ipaginationVideo.pageSize,
+                        pageNo: this.ipaginationVideo.current
+                    }).then(resNei => {
+                        if (resNei.success) {
+                            this.materialVisible = true
+                            this.dataVideoList = resNei.result.list
+                            this.ipaginationVideo.total = resNei.result.total
+                        }
+                    })
+                } else {
+                    this.$message.error(res.message)
+                    this.tongbuLoading = false
+                }
+            })
+        },
         setData(e, type) {
             if (type == 'region') {
                 if (e.includes('1') || e.includes('2')) {
@@ -934,7 +973,7 @@ export default {
                     this.variableLoading = true
                     let params = { ...values }
                     params.agesRange = JSON.stringify(values.agesRange)
-                    values.appIds = values.appIds.includes('1') ? ['unlimited'] : ['unlimited']
+                    values.appIds = values.appIds.includes('unlimited') ? ['unlimited'] : []
                     params.appIds =
                         this.appIds.length > 0
                             ? JSON.stringify([values.appIds, this.appIds])
@@ -1182,13 +1221,21 @@ export default {
                                     data.intentionTarget = JSON.parse(res.result.intentionTarget)
                                     data.appIds = tqFun(JSON.parse(res.result.appIds))
 
-                                    if (data.appIds.length >= 2) {
-                                        console.log(this.appIds)
+                                    if (data.appIds.length >= 1) {
                                         this.appIds = tqFun(JSON.parse(res.result.appIds))
-                                        console.log(this.appIds)
                                         let index = this.appIds.findIndex(item => item == 'unlimited')
-                                        this.appIds.splice(index, 1)
-                                        data.appIds = ['unlimited', '1']
+                                        if (index > -1) {
+                                            this.appIds.splice(index, 1)
+                                            if (this.appIds.length > 0) {
+                                                data.appIds = ['unlimited', '1']
+                                            } else {
+                                                data.appIds = ['unlimited']
+                                            }
+                                        } else {
+                                            data.appIds = ['1']
+                                        }
+                                    } else if (data.appIds.length == 0) {
+                                        data.appIds = ['unlimited']
                                     }
                                     data.intelliExtend = JSON.parse(res.result.intelliExtend)
                                     this.$nextTick(() => {
@@ -1249,17 +1296,19 @@ export default {
         getDataVideo(current, pageSize) {
             // 切换分页时的回调,
             // 当在页面定义change事件时,切记要把此处的事件清除,因为这两个事件重叠了,可能到时候会导致一些莫名的bug
+            this.spinning = true
             this.ipaginationVideo.current = current
             this.ipaginationVideo.pageSize = pageSize
             this.checkVideo = this.checkPersonElse
+            this.dataVideoList = []
             postAction('/dimension/kuaiShouDimensionMaterial/getVideoList', {
                 id: this.ipaginationVideo.id,
                 accountId: this.ipaginationVideo.accountId,
                 pageSize: this.ipaginationVideo.pageSize,
                 pageNo: this.ipaginationVideo.current
             }).then(resNei => {
+                this.spinning = false
                 if (resNei.success) {
-                    this.materialVisible = true
                     this.dataVideoList = resNei.result.list
                     this.ipaginationVideo.total = resNei.result.total
                 }
@@ -1515,6 +1564,17 @@ export default {
                 this.regionData.push(...data)
             }
         })
+        this.getAction('/dimension/kuaiShouDimensionAgeConfig/list').then(res => {
+            if (res.success) {
+                let data = res.result.map(item => {
+                    return {
+                        label: item.ageGroupName,
+                        value: item.ageGroupId
+                    }
+                })
+                this.ageData.push(...data)
+            }
+        })
     },
     activated: function() {},
 

+ 260 - 234
src/views/modules/autoLaunch/material-test/lookPreview.vue

@@ -117,173 +117,180 @@ li.chouzhen.first:before {
 <template>
     <div ref="questionnaireBox" class="look-preview">
         <div style="width: 100%;" class="chartBox">
-            <a-card>
-                <div slot="title">
-                    预览区
-                </div>
-                <div slot="extra">
-                    预估生成<span style="color: #409EFF">{{ groupCount }}</span
-                    >个广告组
-                    <a-button type="primary" style="margin: 0 15px" @click="createAll" :disabled="groupCount == 0">
-                        全部提交审核
-                    </a-button>
-                </div>
-                <div v-if="campaignList && campaignList[0].campaignInfo">
-                    <!-- <div v-for="(item, index) in campaignList" :key="index"></div> -->
-                    <el-collapse v-model="activeName" accordion>
-                        <el-collapse-item v-for="(item, index) in campaignList" :key="index" :name="item.id">
-                            <template slot="title">
-                                <h2 style="display: flex; justify-content: space-between;width: 100%">
-                                    <span>账户id:{{ item.accountId }}</span
-                                    ><span style="font-size: 14px; font-weight: 500"
-                                        >广告计划数量:{{ item.campaignCount }}&nbsp;&nbsp;&nbsp;&nbsp;广告组数量:{{
-                                            groupCount
-                                        }}</span
-                                    >
-                                    <div>
-                                        <a-popconfirm
-                                            :title="`确定要删除这 ${groupCheck.length} 项吗?`"
-                                            @confirm="handleConfirmDelete"
+            <a-spin :spinning="spinning">
+                <a-card>
+                    <div slot="title">
+                        预览区
+                    </div>
+                    <div slot="extra">
+                        预估生成<span style="color: #409EFF">{{ groupCount }}</span
+                        >个广告组
+                        <a-button type="primary" style="margin: 0 15px" @click="createAll" :disabled="groupCount == 0">
+                            全部提交审核
+                        </a-button>
+                    </div>
+                    <div v-if="campaignList && campaignList[0].campaignInfo">
+                        <!-- <div v-for="(item, index) in campaignList" :key="index"></div> -->
+                        <el-collapse v-model="activeName" accordion>
+                            <el-collapse-item v-for="(item, index) in campaignList" :key="index" :name="item.id">
+                                <template slot="title">
+                                    <h2 style="display: flex; justify-content: space-between;width: 100%">
+                                        <span>账户id:{{ item.accountId }}</span
+                                        ><span style="font-size: 14px; font-weight: 500"
+                                            >广告计划数量:{{
+                                                item.campaignCount
+                                            }}&nbsp;&nbsp;&nbsp;&nbsp;广告组数量:{{ item.unitCount }}</span
                                         >
-                                            <a-button style="margin: 0 15px" :disabled="groupCheck.length == 0">
-                                                批量删除广告组
-                                            </a-button>
-                                        </a-popconfirm>
+                                        <div>
+                                            <a-popconfirm
+                                                :title="`确定要删除这 ${groupCheck.length} 项吗?`"
+                                                @confirm="handleConfirmDelete"
+                                            >
+                                                <a-button style="margin: 0 15px" :disabled="groupCheck.length == 0">
+                                                    批量删除广告组
+                                                </a-button>
+                                            </a-popconfirm>
 
-                                        <a-button
-                                            type="primary"
-                                            style="margin: 0 15px"
-                                            :disabled="groupCheck.length == 0"
-                                            @click="createArr"
+                                            <a-button
+                                                type="primary"
+                                                style="margin: 0 15px"
+                                                :disabled="groupCheck.length == 0"
+                                                @click="createArr"
+                                            >
+                                                提交审核
+                                            </a-button>
+                                        </div>
+                                    </h2>
+                                </template>
+                                <div v-for="(items, indexUnit) in item.campaignInfo" :key="indexUnit">
+                                    <h3 style="display: flex; justify-content: space-between; width: 113%">
+                                        <span
+                                            style="flex:1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
+                                            >广告计划:{{ items.campaignName }}</span
                                         >
-                                            提交审核
-                                        </a-button>
-                                    </div>
-                                </h2>
-                            </template>
-                            <div v-for="(items, indexUnit) in item.campaignInfo" :key="indexUnit">
-                                <h3 style="display: flex; justify-content: space-between; width: 113%">
-                                    <span style="flex:1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
-                                        >广告计划:{{ items.campaignName }}</span
-                                    >
-                                    <span style="flex:1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
-                                        >营销目标:{{
-                                            items.campaignType == 2 ? '提升应用安装' : '收集销售线索'
-                                        }}</span
-                                    >
-                                    <span style="flex:1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
-                                        >预算:{{
-                                            items.dayBudget
-                                                ? items.dayBudget / 1000 + '元'
-                                                : '不限'
-                                        }}</span
+                                        <span
+                                            style="flex:1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
+                                            >营销目标:{{
+                                                items.campaignType == 2 ? '提升应用安装' : '收集销售线索'
+                                            }}</span
+                                        >
+                                        <span
+                                            style="flex:1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
+                                            >预算:{{ items.dayBudget ? items.dayBudget / 1000 + '元' : '不限' }}</span
+                                        >
+                                        <!-- <a-checkbox style="width: 10%" v-model="item.checkAll" @click.stop="setAll(item)"> 全选 </a-checkbox> -->
+                                    </h3>
+                                    <!-- :scroll="{ x: 2100 }" -->
+                                    <a-table
+                                        :columns="columns"
+                                        :data-source="items.unitDetail"
+                                        class="components-table-demo-nested"
+                                        :pagination="false"
+                                        bordered
+                                        tableLayout="fixed"
+                                        :row-selection="{ selectedRowKeys: groupCheck, onChange: onSelectChange }"
+                                        rowKey="id"
                                     >
-                                    <!-- <a-checkbox style="width: 10%" v-model="item.checkAll" @click.stop="setAll(item)"> 全选 </a-checkbox> -->
-                                </h3>
-                                <!-- :scroll="{ x: 2100 }" -->
-                                <a-table
-                                    :columns="columns"
-                                    :data-source="items.unitDetail"
-                                    class="components-table-demo-nested"
-                                    :pagination="false"
-                                    bordered
-                                    tableLayout="fixed"
-                                    :row-selection="{ selectedRowKeys: groupCheck, onChange: onSelectChange }"
-                                    rowKey="id"
-                                >
-                                    <span slot="unitName" slot-scope="text, records">
-                                        <p style="text-align: left">
-                                            {{ text }}
-                                        </p>
-                                    </span>
-                                    <div slot="target" slot-scope="text, records" style="    line-height: 30px;">
-                                        <a-row :gutter="20">
-                                            <a-col :sm="12" style="text-align:left">
-                                                <span>地域:</span>
-                                                <span>{{ records.regionGroupName }}</span>
-                                            </a-col>
-                                            <a-col :sm="12" style="text-align:left"
-                                                ><span>年龄:</span>
-                                                <span v-if="records.agesRange">{{
-                                                    JSON.parse(records.agesRange)[0] | ageShow
-                                                }}</span>
-                                                <span v-else>不限</span>
-                                            </a-col>
-                                        </a-row>
-                                        <a-row :gutter="20">
-                                            <a-col :sm="12" style="text-align:left">
-                                                <span>性别:</span>
-                                                <span>{{
-                                                    records.gender ? (records.gender == 1 ? '女' : '男') : '不限'
-                                                }}</span>
-                                            </a-col>
-                                            <a-col :sm="12" style="text-align:left"
-                                                ><span>行为意向:</span>
-                                                <span>{{ records.intentionTarget ? '系统优选' : '不限' }}</span></a-col
-                                            >
-                                        </a-row>
-                                        <a-row :gutter="20">
-                                            <a-col :sm="12" style="text-align:left">
-                                                <span>APP行为:</span>
-                                                <span>{{ records.appIds ? JSON.parse(records.appIds) : '不限' }}</span>
-                                            </a-col>
-                                            <a-col :sm="12" style="text-align:left"
-                                                ><span>智能扩量:</span>
-                                                <span>{{ records.isOpen == 0 ? '关闭' : '开启' }}</span></a-col
-                                            >
-                                        </a-row>
-                                        <a-row :gutter="20">
-                                            <a-col :sm="12" style="text-align:left">
-                                                <span>投放时段:</span>
-                                                <span>
-                                                    {{ setItemDate(records.scheduleTime) }}
-                                                </span>
-                                            </a-col>
-                                        </a-row>
-                                    </div>
-                                    <span slot="bidType" slot-scope="text, records">
-                                        {{ text | bidType }}
-                                    </span>
-                                    <span slot="dayBudget" slot-scope="text, records">
-                                        <p>
-                                            预算:{{
-                                                records.dayBudget || records.dayBudget > 0
-                                                    ? records.dayBudget / 1000 + '元'
-                                                    : '不限'
-                                            }}
-                                        </p>
-                                        <p>
-                                            出价:{{
-                                                records.bid
-                                                    ? records.bid / 1000
-                                                    : records.cpaBid
-                                                    ? records.cpaBid / 1000
-                                                    : ''
-                                            }}元
-                                        </p>
-                                        <p v-if="records.deepConversionType">
-                                            深度转化出价:{{
-                                                records.deepConversionBid ? records.deepConversionBid / 1000 : '无'
-                                            }}
-                                        </p>
-                                    </span>
+                                        <span slot="unitName" slot-scope="text, records">
+                                            <p style="text-align: left">
+                                                {{ text }}
+                                            </p>
+                                        </span>
+                                        <div slot="target" slot-scope="text, records" style="    line-height: 30px;">
+                                            <a-row :gutter="20">
+                                                <a-col :sm="12" style="text-align:left">
+                                                    <span>地域:</span>
+                                                    <span>{{ records.regionGroupName }}</span>
+                                                </a-col>
+                                                <a-col :sm="12" style="text-align:left"
+                                                    ><span>年龄:</span>
+                                                    <!-- JSON.parse(records.agesRange)[0] | ageShow -->
+                                                    <span v-if="records.ageGroupName">{{ records.ageGroupName }}</span>
+                                                    <span v-else>不限</span>
+                                                </a-col>
+                                            </a-row>
+                                            <a-row :gutter="20">
+                                                <a-col :sm="12" style="text-align:left">
+                                                    <span>性别:</span>
+                                                    <span>{{
+                                                        records.gender ? (records.gender == 1 ? '女' : '男') : '不限'
+                                                    }}</span>
+                                                </a-col>
+                                                <a-col :sm="12" style="text-align:left"
+                                                    ><span>行为意向:</span>
+                                                    <span>{{
+                                                        records.intentionTarget ? '系统优选' : '不限'
+                                                    }}</span></a-col
+                                                >
+                                            </a-row>
+                                            <a-row :gutter="20">
+                                                <a-col :sm="12" style="text-align:left">
+                                                    <span>APP行为:</span>
+                                                    <span>{{
+                                                        records.appIds ? JSON.parse(records.appIds) : '不限'
+                                                    }}</span>
+                                                </a-col>
+                                                <a-col :sm="12" style="text-align:left"
+                                                    ><span>智能扩量:</span>
+                                                    <span>{{ records.isOpen == 0 ? '关闭' : '开启' }}</span></a-col
+                                                >
+                                            </a-row>
+                                            <a-row :gutter="20">
+                                                <a-col :sm="12" style="text-align:left">
+                                                    <span>投放时段:</span>
+                                                    <span>
+                                                        {{ setItemDate(records.scheduleTime) }}
+                                                    </span>
+                                                </a-col>
+                                            </a-row>
+                                        </div>
+                                        <span slot="bidType" slot-scope="text, records">
+                                            {{ text | bidType }}
+                                        </span>
+                                        <span slot="dayBudget" slot-scope="text, records">
+                                            <p>
+                                                预算:{{
+                                                    records.dayBudget || records.dayBudget > 0
+                                                        ? records.dayBudget / 1000 + '元'
+                                                        : '不限'
+                                                }}
+                                            </p>
+                                            <p>
+                                                出价:{{
+                                                    records.bid
+                                                        ? records.bid / 1000
+                                                        : records.cpaBid
+                                                        ? records.cpaBid / 1000
+                                                        : ''
+                                                }}元
+                                            </p>
+                                            <p v-if="records.deepConversionType">
+                                                深度转化出价:{{
+                                                    records.deepConversionBid ? records.deepConversionBid / 1000 : '无'
+                                                }}
+                                            </p>
+                                        </span>
 
-                                    <span slot="action" slot-scope="text, record">
-                                        <a @click="lookCreative(record.id)">查看创意</a>
-                                        <a-divider type="vertical" />
-                                        <a-popconfirm :title="`确定要删除这项吗?`" @confirm="removeGroup(record.id)">
-                                            <a>删除</a>
-                                            <span class="gap"></span>
-                                        </a-popconfirm>
-                                    </span>
-                                </a-table>
-                            </div>
-                        </el-collapse-item>
-                    </el-collapse>
-                </div>
-            </a-card>
+                                        <span slot="action" slot-scope="text, record">
+                                            <a @click="lookCreative(record.id)">查看创意</a>
+                                            <a-divider type="vertical" />
+                                            <a-popconfirm
+                                                :title="`确定要删除这项吗?`"
+                                                @confirm="removeGroup(record.id)"
+                                            >
+                                                <a>删除</a>
+                                                <span class="gap"></span>
+                                            </a-popconfirm>
+                                        </span>
+                                    </a-table>
+                                </div>
+                            </el-collapse-item>
+                        </el-collapse>
+                    </div>
+                </a-card>
+            </a-spin>
             <a-modal
-                title="选择素材"
+                title="查看创意"
                 :width="1000"
                 v-if="creativeVisible"
                 :visible="creativeVisible"
@@ -413,6 +420,7 @@ export default {
     },
     data() {
         return {
+            spinning:false,
             fieldNames: {
                 label: 'category_name',
                 value: 'category_id',
@@ -570,86 +578,90 @@ export default {
     methods: {
         setItemDate(external_binary) {
             //初始化周数数组
-            var time_week_arr = []
+            if (external_binary) {
+                var time_week_arr = []
 
-            var date_html = ''
-            var binary = external_binary
+                var date_html = ''
+                var binary = external_binary
 
-            for (var y = 0; y < 7; y++) {
-                //初始化小时数组
-                var time_hour_arr = []
+                for (var y = 0; y < 7; y++) {
+                    //初始化小时数组
+                    var time_hour_arr = []
 
-                for (var x = 0; x < 24; x++) {
-                    //获取当前点击元素的位置
-                    if (y == 0) {
-                        var index = x
-                    } else {
-                        var index = y * 24 + x
-                    }
-                    //获取td对应的二进制值
-                    var Selected_val = binary.charAt(index)
+                    for (var x = 0; x < 24; x++) {
+                        //获取当前点击元素的位置
+                        if (y == 0) {
+                            var index = x
+                        } else {
+                            var index = y * 24 + x
+                        }
+                        //获取td对应的二进制值
+                        var Selected_val = binary.charAt(index)
 
-                    if (Selected_val == 1) {
-                        //组装保存进数组里
-                        if (time_hour_arr == []) {
-                            //表格的第一个位置的值
-                            time_hour_arr = arr_hour[x]
-                        } else if (binary.charAt(index - 1) == 1 && binary.charAt(index - 2) == 1) {
-                            //此位置(包含上一行)的前两个都为选中时
+                        if (Selected_val == 1) {
+                            //组装保存进数组里
+                            if (time_hour_arr == []) {
+                                //表格的第一个位置的值
+                                time_hour_arr = arr_hour[x]
+                            } else if (binary.charAt(index - 1) == 1 && binary.charAt(index - 2) == 1) {
+                                //此位置(包含上一行)的前两个都为选中时
 
-                            if (x == 0 && binary.charAt(index + 1) == 0) {
-                                //选中行里第一个,后一个表格没选中,加逗号
-                                time_hour_arr[time_hour_arr.length] = arr_hour[x] + ', '
-                            } else if (x == 0 && binary.charAt(index + 1) == 1) {
-                                //选中行里第一个,后一个表格已选中,不加逗号
-                                time_hour_arr[time_hour_arr.length] = arr_hour[x]
-                            } else if (x == 1 && binary.charAt(index - 1) == 0) {
-                                //选中行里第二个,上一个表格没选中,加逗号
-                                time_hour_arr[time_hour_arr.length] = arr_hour[x] + ', '
-                            } else if (x == 1 && binary.charAt(index - 1) == 1) {
-                                //选中行里第二个,上一个表格已选中,前加-号,后加逗号
+                                if (x == 0 && binary.charAt(index + 1) == 0) {
+                                    //选中行里第一个,后一个表格没选中,加逗号
+                                    time_hour_arr[time_hour_arr.length] = arr_hour[x] + ', '
+                                } else if (x == 0 && binary.charAt(index + 1) == 1) {
+                                    //选中行里第一个,后一个表格已选中,不加逗号
+                                    time_hour_arr[time_hour_arr.length] = arr_hour[x]
+                                } else if (x == 1 && binary.charAt(index - 1) == 0) {
+                                    //选中行里第二个,上一个表格没选中,加逗号
+                                    time_hour_arr[time_hour_arr.length] = arr_hour[x] + ', '
+                                } else if (x == 1 && binary.charAt(index - 1) == 1) {
+                                    //选中行里第二个,上一个表格已选中,前加-号,后加逗号
+                                    time_hour_arr[time_hour_arr.length] = '-' + arr_hour[x] + ', '
+                                } else {
+                                    //选中行里除第一、二的表格以外,前一个表格已经选中,此元素前加- 后加逗号
+                                    time_hour_arr[time_hour_arr.length - 1] = '-' + arr_hour[x] + ', '
+                                }
+                            } else if (binary.charAt(index - 1) == 1 && x > 0) {
+                                //选中的前一个已选中,且此次选中的不是行里第一个,此次选中的元素前加-后加逗号
                                 time_hour_arr[time_hour_arr.length] = '-' + arr_hour[x] + ', '
+                            } else if (binary.charAt(index + 1) != 1 || x == 47) {
+                                //选中的后一个没选中,或者此次选中的是行里最后一个,此次选中的元素加逗号
+                                time_hour_arr[time_hour_arr.length] = arr_hour[x] + ', '
                             } else {
-                                //选中行里除第一、二的表格以外,前一个表格已经选中,此元素前加- 后加逗号
-                                time_hour_arr[time_hour_arr.length - 1] = '-' + arr_hour[x] + ', '
+                                //选中的后一已选中,此次选中的元素不加逗号
+                                time_hour_arr[time_hour_arr.length] = arr_hour[x]
                             }
-                        } else if (binary.charAt(index - 1) == 1 && x > 0) {
-                            //选中的前一个已选中,且此次选中的不是行里第一个,此次选中的元素前加-后加逗号
-                            time_hour_arr[time_hour_arr.length] = '-' + arr_hour[x] + ', '
-                        } else if (binary.charAt(index + 1) != 1 || x == 47) {
-                            //选中的后一个没选中,或者此次选中的是行里最后一个,此次选中的元素加逗号
-                            time_hour_arr[time_hour_arr.length] = arr_hour[x] + ', '
-                        } else {
-                            //选中的后一已选中,此次选中的元素不加逗号
-                            time_hour_arr[time_hour_arr.length] = arr_hour[x]
                         }
                     }
-                }
 
-                time_week_arr[y] = time_hour_arr
-            }
-            //再次组装并输出数组
-            var time_html = []
-            for (var y = 0; y < 7; y++) {
-                for (var x = 0; x < time_week_arr[y].length; x++) {
-                    if (!time_html[y]) {
-                        time_html[y] = time_week_arr[y][x]
-                    } else {
-                        time_html[y] += time_week_arr[y][x]
-                    }
+                    time_week_arr[y] = time_hour_arr
                 }
+                //再次组装并输出数组
+                var time_html = []
+                for (var y = 0; y < 7; y++) {
+                    for (var x = 0; x < time_week_arr[y].length; x++) {
+                        if (!time_html[y]) {
+                            time_html[y] = time_week_arr[y][x]
+                        } else {
+                            time_html[y] += time_week_arr[y][x]
+                        }
+                    }
 
-                if (time_html[y]) {
-                    time_html[y] = time_html[y].substring(0, time_html[y].length - 1)
+                    if (time_html[y]) {
+                        time_html[y] = time_html[y].substring(0, time_html[y].length - 1)
 
-                    date_html += '星期' + num[y] + ' (' + time_html[y] + ')' + ', '
+                        date_html += '星期' + num[y] + ' (' + time_html[y] + ')' + ', '
+                    }
                 }
-            }
 
-            if (external_binary) {
-                return date_html
+                if (external_binary) {
+                    return date_html
+                }
+                // console.info(time_html);
+            } else {
+                return '不限'
             }
-            // console.info(time_html);
         },
         next() {
             closeAllVideoFun()
@@ -700,14 +712,22 @@ export default {
             params.strategyId = this.$route.query.id
             let that = this
             this.postDataAction('/dimension/kuaiShouDimensionUnit/editBatch', params).then(res => {
-                this.$success({
-                    title: '全部提交成功',
-                    // JSX support
-                    onOk: function() {
-                        that.$router.replace('/autoLaunch/material-test')
-                        that.$bus.$emit('remove', `/autoLaunch/lookPreview?id=${that.$route.query.id}`)
-                    }
-                })
+                let num = 0
+                for (let i = 0; i < this.campaignList.length; i++) {
+                    num += this.campaignList[i].campaignInfo.length
+                }
+                if (num == 0) {
+                    this.$success({
+                        title: '全部提交成功',
+                        // JSX support
+                        onOk: function() {
+                            that.$router.replace('/autoLaunch/material-test')
+                            that.$bus.$emit('remove', `/autoLaunch/lookPreview?id=${that.$route.query.id}`)
+                        }
+                    })
+                } else {
+                    this.getPreviewList()
+                }
             })
         },
         setAll(item) {
@@ -787,6 +807,7 @@ export default {
         },
 
         getPreviewList() {
+            this.spinning = true
             this.getAction('/dimension/kuaiShouDimensionUnit/previewByStrategyId', {
                 strategyId: this.$route.query.id
             }).then(res => {
@@ -799,15 +820,18 @@ export default {
                             if (result.success) {
                                 //console.log(res)
                                 this.createOptions = result.result
+                                this.spinning = false
                             }
                         })
                     } else {
                         this.$message.error('没有可预览的值')
+                        this.spinning = false
                     }
 
                     // this.activeName = this.campaignList[0].id
                 } else {
                     this.$message.error('网络开小差了,请刷新后重试')
+                    this.spinning = false
                 }
             })
         },
@@ -1083,8 +1107,10 @@ export default {
             this.newBatch = true
             var groupIds = []
             for (let i = 0; i < this.campaignList.length; i++) {
-                for (let j = 0; j < this.campaignList[i].campaignInfo.unitDetail.length; j++) {
-                    groupIds.push(this.campaignList[i].campaignInfo.unitDetail[j].id)
+                for (let j = 0; j < this.campaignList[i].campaignInfo.length; j++) {
+                    for (let o = 0; o < this.campaignList[i].campaignInfo[j].unitDetail.length; o++) {
+                        groupIds.push(this.campaignList[i].campaignInfo[j].unitDetail[o].id)
+                    }
                 }
             }
             var params = {}

+ 7 - 7
src/views/modules/material/materialList.vue

@@ -1010,13 +1010,13 @@ export default {
       })
     },
     getParticipateList() {
-      getAction('/ctop/projectMember/participateList', {
-        userId: this.userInfo().id
-      }).then(res => {
-        if (res.code == 0) {
-          this.dataElse = res.result
-        }
-      })
+      // getAction('/ctop/projectMember/participateList', {
+      //   userId: this.userInfo().id
+      // }).then(res => {
+      //   if (res.code == 0) {
+      //     this.dataElse = res.result
+      //   }
+      // })
     },
     getProjectId(items) {
       getAction('/ctop/projectMember/getMemberList', {

+ 1 - 1
src/views/modules/workBench/placeOrder.vue

@@ -240,7 +240,7 @@
                              <a-form-model-item ref="project"  prop="project">
                                <a-select  style="width: 500px" v-model="form.project" show-search  option-filter-prop="children" placeholder="请选择关联项目">
                                     <a-select-option v-for="item in projectList" :key="item.projectId" :value='item.projectId'>
-                                        {{item.projectName+'_'+ (item.mediaId==1?'头条':'快手')+'_'+ item.userName}}
+                                        {{item.projectName+'_'+ (item.mediaId==1?'头条':'快手')}}
                                     </a-select-option>
                                 </a-select>
                             </a-form-model-item>

+ 4 - 4
src/views/system/modules/PasswordModal.vue

@@ -16,12 +16,12 @@
           <a-input placeholder="请输入用户账号" v-decorator="[ 'username', {}]" :readOnly="true"/>
         </a-form-item>
 
-        <a-form-item label="登密码" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback>
-          <a-input type="password" placeholder="请输入登密码" v-decorator="[ 'password', validatorRules.password]"/>
+        <a-form-item label="登密码" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback>
+          <a-input type="password" placeholder="请输入登密码" v-decorator="[ 'password', validatorRules.password]"/>
         </a-form-item>
 
         <a-form-item label="确认密码" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback>
-          <a-input type="password" @blur="handleConfirmBlur" placeholder="请重新输入登密码"
+          <a-input type="password" @blur="handleConfirmBlur" placeholder="请重新输入登密码"
                    v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
         </a-form-item>
 
@@ -52,7 +52,7 @@
           },
           confirmpassword: {
             rules: [{
-              required: true, message: '请重新输入登密码!',
+              required: true, message: '请重新输入登密码!',
             }, {
               validator: this.compareToFirstPassword,
             }],

+ 4 - 4
src/views/system/modules/UserModal.vue

@@ -22,14 +22,14 @@
 				<a-input placeholder="请输入用户账号" v-decorator="['username', validatorRules.username]" :disabled="disableSubmit"/>
 				</a-form-item>
 				<template v-if="!model.id">
-				<a-form-item label="登密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-					<a-input type="password" placeholder="请输入登密码" v-decorator="['password', validatorRules.password]" :disabled="disableSubmit"/>
+				<a-form-item label="登密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+					<a-input type="password" placeholder="请输入登密码" v-decorator="['password', validatorRules.password]" :disabled="disableSubmit"/>
 				</a-form-item>
 				<a-form-item label="确认密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
 					<a-input
 					type="password"
 					@blur="handleConfirmBlur"
-					placeholder="请重新输入登密码"
+					placeholder="请重新输入登密码"
 					v-decorator="['confirmpassword', validatorRules.confirmpassword]"
 					:disabled="disableSubmit"
 					/>
@@ -191,7 +191,7 @@ export default {
 				rules: [
 					{
 					required: true,
-					message: '请重新输入登密码!',
+					message: '请重新输入登密码!',
 					},
 					{
 					validator: this.compareToFirstPassword,

+ 5 - 5
src/views/user/Login.vue

@@ -23,7 +23,7 @@
             </div>
           </a-form-item>
         </a-tab-pane>
-        <a-tab-pane key="tab2" tab="账号密码登">
+        <a-tab-pane key="tab2" tab="账号密码登">
           <a-form-item>
             <a-input
               size="large"
@@ -74,7 +74,7 @@
         </a-tab-pane>
       </a-tabs>
       <a-form-item v-if="customActiveKey != 'tab1'">
-        <a-checkbox v-model="formLogin.rememberMe">自动登</a-checkbox>
+        <a-checkbox v-model="formLogin.rememberMe">自动登</a-checkbox>
         <router-link :to="{ name: 'alteration' }" class="forge-password" style="float: right"> 忘记密码 </router-link>
         <!--
         <router-link :to="{ name: 'register'}" class="forge-password" style="float: right;margin-right: 10px" >
@@ -102,7 +102,7 @@
         <span class="FSinfo">使用飞书快捷登录</span>
       </div> -->
       <!-- <div class="user-login-other">
-        <span>其他登方式</span>
+        <span>其他登方式</span>
         <a><a-icon class="item-icon" type="alipay-circle"></a-icon></a>
         <a><a-icon class="item-icon" type="taobao-circle"></a-icon></a>
         <a><a-icon class="item-icon" type="weibo-circle"></a-icon></a>
@@ -330,7 +330,7 @@ export default {
         remember_me: that.formLogin.rememberMe,
       }
 
-      // 使用账户密码登
+      // 使用账户密码登
       if (that.customActiveKey === 'tab2') {
         that.form.validateFields(
           ['username', 'password', 'inputCode'],
@@ -359,7 +359,7 @@ export default {
             }
           }
         )
-        // 使用手机号登
+        // 使用手机号登
       } else if (that.customActiveKey === 'tab3') {
         that.form.validateFields(
           ['mobile', 'captcha'],

+ 6 - 6
src/views/user/layer.vue

@@ -5,7 +5,7 @@
 <!--        :activeKey="customActiveKey"-->
 <!--        :tabBarStyle="{ textAlign: 'center', borderBottom: 'unset' }"-->
 <!--        @change="handleTabClick">-->
-<!--        <a-tab-pane key="tab1" tab="账号密码登">-->
+<!--        <a-tab-pane key="tab1" tab="账号密码登">-->
 <!--          <a-form-item>-->
 <!--            <a-input-->
 <!--              size="large"-->
@@ -49,7 +49,7 @@
 
 
 <!--        </a-tab-pane>-->
-<!--        <a-tab-pane key="tab2" tab="手机号登">-->
+<!--        <a-tab-pane key="tab2" tab="手机号登">-->
 <!--          <a-form-item>-->
 <!--            <a-input-->
 <!--              v-decorator="['mobile',validatorRules.mobile]"-->
@@ -85,7 +85,7 @@
 <!--      </a-tabs>-->
 
 <!--      <a-form-item>-->
-<!--        <a-checkbox v-model="formLogin.rememberMe">自动登</a-checkbox>-->
+<!--        <a-checkbox v-model="formLogin.rememberMe">自动登</a-checkbox>-->
 <!--        <router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">-->
 <!--          忘记密码-->
 <!--        </router-link>-->
@@ -109,7 +109,7 @@
 <!--      </a-form-item>-->
 
 <!--      &lt;!&ndash; <div class="user-login-other">-->
-<!--        <span>其他登方式</span>-->
+<!--        <span>其他登方式</span>-->
 <!--        <a><a-icon class="item-icon" type="alipay-circle"></a-icon></a>-->
 <!--        <a><a-icon class="item-icon" type="taobao-circle"></a-icon></a>-->
 <!--        <a><a-icon class="item-icon" type="weibo-circle"></a-icon></a>-->
@@ -261,7 +261,7 @@
 <!--          remember_me: that.formLogin.rememberMe-->
 <!--        };-->
 
-<!--        // 使用账户密码登-->
+<!--        // 使用账户密码登-->
 <!--        if (that.customActiveKey === 'tab1') {-->
 <!--          that.form.validateFields(['username', 'password', 'inputCode'], {force: true}, (err, values) => {-->
 <!--            if (!err) {-->
@@ -279,7 +279,7 @@
 <!--              });-->
 <!--            }-->
 <!--          })-->
-<!--          // 使用手机号登-->
+<!--          // 使用手机号登-->
 <!--        } else {-->
 <!--          that.form.validateFields(['mobile', 'captcha'], {force: true}, (err, values) => {-->
 <!--            if (!err) {-->