fix

src/api/accounts/adApi.js

@@ -44,7 +44,15 @@ export function adtAuthSuccess(query) {
 // 荣哥新 成功后 在请求
 export function adtDoAuth(query) {
     return request({
-        url: `/adq/v3/admin/adAccount/doAuth`,
+        url: `/adq/admin/adAccount/doAuth`,
+        method: 'POST',
+        params: query
+    })
+}
+
+export function adtYwdyDoAuth(query) {
+    return request({
+        url: `/adq/admin/adAccount/adUnit/doAuth`,
         method: 'POST',
         params: query
     })
@@ -53,7 +61,7 @@ export function adtDoAuth(query) {
 // 荣新授权
 export function toAuth(query) {
     return request({
-        url: '/adq/v3/admin/adAccount/toAuth',
+        url: '/adq/admin/adAccount/toAuth',
         method: 'POST',
         params: query
     })

src/views/accounts/adWarrant/index.vue

@@ -30,19 +30,27 @@
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
             </el-form-item>
         </el-form>
-
         <el-row :gutter="10" class="mb8" align="middle">
             <el-col :span="1.5">
                 <div class="grid-content">
                     <el-radio-group v-model="queryParams.adAppId" size="small" @change="getList">
-                        <el-radio :label="item.id" v-for="item in tenAllList" :key="item.id">{{ item.appName }}</el-radio>
+                        <el-radio :label="item.id" v-for="item in tenAllList" :key="item.id">{{ item.appName
+                            }}</el-radio>
                     </el-radio-group>
                 </div>
             </el-col>
+        </el-row>
+        <el-row :gutter="10" class="mb8" align="middle">
             <el-col :span="1.5">
                 <div class="grid-content">
                     <el-button type="primary" icon="el-icon-plus" size="mini"
-                        @click="handleWarrantOld">授权广告平台</el-button>
+                        @click="handleWarrantOld(1)">授权广告平台</el-button>
+                </div>
+            </el-col>
+            <el-col :span="1.5">
+                <div class="grid-content">
+                    <el-button type="success" icon="el-icon-plus" size="mini"
+                        @click="handleWarrantOld(2)">广告业务单元授权</el-button>
                 </div>
             </el-col>
             <el-col :span="1.5">
@@ -64,7 +72,7 @@
             </el-col>
             <el-col :span="1.5">
                 <div class="grid-content">
-                    <putUsers :multiple="multiple" :accountIds="accountIds" @change="putChange" :userAll="userAll"/>
+                    <putUsers :multiple="multiple" :accountIds="accountIds" @change="putChange" :userAll="userAll" />
                 </div>
             </el-col>
             <el-col :span="1.5">
@@ -100,7 +108,8 @@
                     <el-row align="middle" type="flex" justify="center">
                         <div class="verticalCenter">
                             <div><strong>{{ scope.row.wechatAccountName }}</strong></div>
-                            <div style="color: rgb(136, 136, 136); font-size: 13px;">{{ scope.row.wechatAccountId }}</div>
+                            <div style="color: rgb(136, 136, 136); font-size: 13px;">{{ scope.row.wechatAccountId }}
+                            </div>
                         </div>
                     </el-row>
                 </template>
@@ -155,14 +164,16 @@
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
                 <template slot-scope="scope" v-if="scope.row.id && typeof scope.row.id === 'number'">
-                    <el-button size="mini" type="text" icon="el-icon-sort" v-hasPermi="['adWarrant:switch']" @click="puthangdle(scope.row)">指派</el-button>
-                    <el-button size="mini" type="text" icon="el-icon-sort" v-hasPermi="['adWarrant:switch']" @click="putUserHandle(scope.row)">指派投放助理</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-sort" v-hasPermi="['adWarrant:switch']"
+                        @click="puthangdle(scope.row)">指派</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-sort" v-hasPermi="['adWarrant:switch']"
+                        @click="putUserHandle(scope.row)">指派投放助理</el-button>
                 </template>
             </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
 
         <!-- 腾讯广告应用管理 -->
         <el-dialog title="腾讯广告应用管理" :visible.sync="openTenEditSwitch" width="950px">
@@ -275,8 +286,8 @@
             <el-form :model="queryWarrants" ref="warrantsQueryForm" label-position="top" :rules="rulesWarrants">
                 <el-form-item label="平台选择" prop="adAppIds">
                     <el-checkbox-group v-model="queryWarrants.adAppIds">
-                        <el-checkbox v-for="val in tenAllList" :label="val.id"
-                            :key="val.id">{{ val.appName }}</el-checkbox>
+                        <el-checkbox v-for="val in tenAllList" :label="val.id" :key="val.id">{{ val.appName
+                            }}</el-checkbox>
                     </el-checkbox-group>
                 </el-form-item>
                 <el-form-item label="账号ID" prop="users">
@@ -294,15 +305,15 @@
             <div>
                 <div v-if="errorData['1']" style="margin-top: 10px">
                     <div>趣程数据（旧版）失败列表：</div>
-                    <div style="margin-top: 5px">{{ errorData['1']}}</div>
+                    <div style="margin-top: 5px">{{ errorData['1'] }}</div>
                 </div>
                 <div v-if="errorData['2']" style="margin-top: 10px">
                     <div>赞象计划监控失败列表：</div>
-                    <div style="margin-top: 5px">{{ errorData['2']}}</div>
+                    <div style="margin-top: 5px">{{ errorData['2'] }}</div>
                 </div>
                 <div v-if="errorData['4']" style="margin-top: 10px">
                     <div>赞象数据（新版）失败列表</div>
-                    <div style="margin-top: 5px">{{ errorData['4']}}</div>
+                    <div style="margin-top: 5px">{{ errorData['4'] }}</div>
                 </div>
             </div>
 
@@ -316,7 +327,8 @@
             <img :src="this.imgBase64" width="180">
         </el-dialog>
 
-        <putUser @change="putChange" :accountIds="accountIds" :userAll="userAll" :putUserIds="putUserIds" @close="putUserShow = false" :show="putUserShow" v-if="putUserShow"/>
+        <putUser @change="putChange" :accountIds="accountIds" :userAll="userAll" :putUserIds="putUserIds"
+            @close="putUserShow = false" :show="putUserShow" v-if="putUserShow" />
     </div>
 </template>
 
@@ -689,7 +701,8 @@ export default {
             })
         },
         /** 老的授权广告平台 */
-        handleWarrantOld() {
+        handleWarrantOld(type) {
+            sessionStorage.setItem('ADSQ', type)
             toAuth({ adAppId: this.queryParams.adAppId, callbackPage: encodeURIComponent(window.location.origin + '/adCode') }).then(res => {
                 if (res.data) {
                     window.open(res.data)

src/views/ad.vue

@@ -1,4 +1,3 @@
-
 <template>
     <div>
         <!-- <el-dialog
@@ -16,7 +15,7 @@
 </template>
 <script>
 // 广告回调页
-import { adAuthSuccess, adtAuthSuccess, adtDoAuth } from "@/api/accounts/adApi";
+import { adAuthSuccess, adtAuthSuccess, adtDoAuth, adtYwdyDoAuth } from "@/api/accounts/adApi";
 export default {
     data() {
         return {
@@ -24,7 +23,7 @@ export default {
             accountData: {}
         }
     },
-    created(){
+    created() {
         console.log('created', localStorage.getItem('accountData'))
         this.accountData = JSON.parse(localStorage.getItem('accountData'))
         this.handleSubmit()
@@ -40,30 +39,64 @@ export default {
                     callbackPage: encodeURIComponent(window.location.origin + '/adCode'),
                     state: this.$route.query.state
                 }
-                adtDoAuth(query).then(response => {
-                    let data = response.data
-                    if (data) {
-                        this.$message({
-                            message: '授权成功',
-                            type: 'success'
-                        });
-                        localStorage.setItem("adMp", "ok");
-                    } else {
-                        this.$message({
-                            message: '授权失败',
-                            type: 'error'
-                        });
-                        localStorage.setItem("adMp", "false");
-                        return
-                    }
-                    setTimeout(()=>{
-                        window.close()
-                    }, 200)
-                }).catch(err => {
-                    // setTimeout(()=>{
-                    //     window.close()
-                    // }, 200)
-                });
+                let sqType = sessionStorage.getItem('ADSQ')
+                if (sqType === 1) {
+                    adtDoAuth(query).then(response => {
+                        let data = response.data
+                        if (data) {
+                            this.$message({
+                                message: '授权成功',
+                                type: 'success'
+                            });
+                            localStorage.setItem("adMp", "ok");
+                        } else {
+                            this.$message({
+                                message: '授权失败',
+                                type: 'error'
+                            });
+                            localStorage.setItem("adMp", "false");
+                            return
+                        }
+                        setTimeout(() => {
+                            window.close()
+                        }, 200)
+                    }).catch(err => {
+                        // setTimeout(()=>{
+                        //     window.close()
+                        // }, 200)
+                    });
+                } else if (sqType === 2) {
+                    adtYwdyDoAuth(query).then(response => {
+                        let data = response.data
+                        if (data) {
+                            this.$message({
+                                message: '授权成功',
+                                type: 'success'
+                            });
+                            localStorage.setItem("adMp", "ok");
+                        } else {
+                            this.$message({
+                                message: '授权失败',
+                                type: 'error'
+                            });
+                            localStorage.setItem("adMp", "false");
+                            return
+                        }
+                        setTimeout(() => {
+                            window.close()
+                        }, 200)
+                    }).catch(err => {
+                        // setTimeout(()=>{
+                        //     window.close()
+                        // }, 200)
+                    });
+                } else {
+                    this.$message({
+                        message: '授权失败，请联系管理员',
+                        type: 'error'
+                    });
+                }
+
                 // if(localStorage.getItem('adType') != "oldType"){
                 //     localStorage.removeItem('adType')
                 //     let accountName = ""
@@ -143,7 +176,7 @@ export default {
                 //     });
                 // }
 
-                
+
             }
         }
     }