fix

.env.development

@@ -4,7 +4,7 @@ ENV = 'development'
 # 趣程管理系统/开发环境
 VUE_APP_BASE_API = 'http://47.97.38.17/api'
 VUE_APP_DATA_API = 'http://data.zanxiangnet.com:8009'
-VUE_APP_BASE_URL = 'http://test.erp.zanxiangnet.com'
+VUE_APP_BASE_URL = 'http://test.erp.zanxiangnet.com/#/login'
 VUE_APP_DDAPPID = 'dingtqel20goyqnsnekd'
 #VUE_APP_BASE_API = 'http://localhost:8081'
 

.env.production

@@ -2,9 +2,9 @@
 ENV = 'production'
 
 # 趣程管理系统/生产环境
-VUE_APP_BASE_API = 'https://api.zanxiangnet.com'
+VUE_APP_BASE_API = 'http://api.zanxiangwl.com'
 VUE_APP_DATA_API = 'http://data.zanxiangnet.com:8009'
-VUE_APP_BASE_URL = 'http://mp.zanxiangnet.com'
+VUE_APP_BASE_URL = 'http://erp.zanxiangnet.com/admin/#/login'
 VUE_APP_DDAPPID = 'dingwfmhucedfluenpuj'
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/api/accounts/adApi.js

@@ -10,7 +10,7 @@ import request from '@/utils/request'
 // }
 export function listAd(data) {
     return request({
-        url: '/ad/adAccount/list',
+        url: '/adq/admin/adAccount/list',
         method: 'POST',
         data
     })
@@ -44,7 +44,7 @@ export function adtAuthSuccess(query) {
 // 荣哥新 成功后 在请求
 export function adtDoAuth(query) {
     return request({
-        url: `/ad/adAccount/doAuth`,
+        url: `/adq/admin/adAccount/doAuth`,
         method: 'POST',
         params: query
     })
@@ -53,7 +53,7 @@ export function adtDoAuth(query) {
 // 荣新授权
 export function toAuth(query) {
     return request({
-        url: '/ad/adAccount/toAuth',
+        url: '/adq/admin/adAccount/toAuth',
         method: 'POST',
         params: query
     })
@@ -160,7 +160,7 @@ export function getSwitchPlatform(query) {
 // 获取腾讯广告管理列表
 export function getAdAppList(data) {
     return request({
-        url: `/ad/adApp/list`,
+        url: `/adq/admin/adApp/list`,
         method: 'POST',
         data
     })
@@ -168,14 +168,14 @@ export function getAdAppList(data) {
 // 获取所有腾讯广告管理列表
 export function getAdAppListAll() {
     return request({
-        url: `/ad/adApp/all`,
+        url: `/adq/admin/adApp/all`,
         method: 'GET'
     })
 }
 // 新增腾讯广告管理列表
 export function addApp(data) {
     return request({
-        url: `/ad/adApp`,
+        url: `/adq/admin/adApp`,
         method: 'POST',
         data
     })
@@ -184,7 +184,7 @@ export function addApp(data) {
 export function editApp(data) {
     let { adAppId, ...params } = data
     return request({
-        url: `/ad/adApp/${adAppId}`,
+        url: `/adq/admin/adApp/${adAppId}`,
         method: 'PUT',
         data: params
     })
@@ -193,8 +193,17 @@ export function editApp(data) {
 // 刷新服务商
 export function refreshByIds(data) {
     return request({
-        url: `/ad/adAccount/refreshByIds`,
+        url: `/adq/admin/adAccount/refreshByIds`,
         method: 'PUT',
         data
     })
+}
+
+
+// 切换投手
+export function cutPut({adAccountId, putUserId}) {
+    return request({
+        url: `/adq/admin/adAccount/configPutUser/${adAccountId}/${putUserId}`,
+        method: 'PUT'
+    })
 }

src/views/accounts/account/components/cutBook.vue

@@ -75,6 +75,21 @@ export default {
             rules: {
                 beginTime: [
                     { required: true, message: '请选择开始时间', trigger: 'blur' }
+                ],
+                periodId: [
+                    { required: true, message: '请选择期数', trigger: 'blur' }
+                ],
+                platformId: [
+                    { required: true, message: '请选择书城', trigger: 'blur' }
+                ],
+                bookId: [
+                    { required: true, message: '请选择书', trigger: 'blur' }
+                ],
+                businessGroupId: [
+                    { required: true, message: '请选择项目组', trigger: 'blur' }
+                ],
+                putChannel: [
+                    { required: true, message: '请选择投放渠道', trigger: 'blur' }
                 ]
             }
         }

src/views/accounts/account/index.vue

@@ -720,6 +720,7 @@ export default {
         },
         /** 搜索 */
         handleQuery() {
+            this.queryParams.pageNum = 1
             this.getList()
         },
         /** 状态修改 */
@@ -749,7 +750,7 @@ export default {
         resetQuery() {
             this.queryParams = {
                 pageNum: 1,
-                pageSize: 15
+                pageSize: 10
             }
             this.getList()
         },

src/views/accounts/adWarrant/index.vue

@@ -87,6 +87,18 @@
                     >刷新服务商</el-button>
                 </div>
             </el-col>
+            <el-col :span="1.5">
+                <div class="grid-content">
+                    <el-button
+                        type="success"
+                        size="mini"
+                        icon="el-icon-sort"
+                        :disabled="multiple"
+                        :loading="reLoading"
+                        @click="putsHandle"
+                    >指派</el-button>
+                </div>
+            </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
@@ -100,6 +112,7 @@
                     <div>{{scope.row.sourceType == 0 ? '微信' : 'QQ'}}</div>
                 </template>
             </el-table-column>
+            <el-table-column label="投手ID" prop="putUserId" align="center" width="100"/>
             <el-table-column label="公众号信息" align="center" width="150" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                     <el-row align="middle" type="flex" justify="center">
@@ -173,7 +186,7 @@
             </el-table-column> -->
             
             <!-- <el-table-column label="账户类型" prop="wechatAccountType" align="center"  width="80"/> -->
-            <el-table-column label="授权时间" align="center" prop="createTime">
+            <el-table-column label="授权时间" align="center" prop="createTime" width="150">
                 <template slot-scope="scope">
                     <span>{{ parseTime(scope.row.createTime) }}</span>
                 </template>
@@ -183,9 +196,9 @@
                     <span>{{ parseTime(scope.row.updateTime) }}</span>
                 </template>
             </el-table-column> -->
-            <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="240">
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="240">
                 <template slot-scope="scope" v-if="scope.row.id && typeof scope.row.id === 'number'">
-                    <el-button
+                    <!-- <el-button
                         size="mini"
                         type="text"
                         icon="el-icon-edit"
@@ -204,15 +217,15 @@
                         icon="el-icon-sort"
                         v-hasPermi="['adWarrant:switch']"
                         @click="handleSwitch(scope.row, 'book')"
-                    >切书</el-button>
+                    >切书</el-button> -->
                     <el-button
                         size="mini"
                         type="text"
                         icon="el-icon-sort"
                         v-hasPermi="['adWarrant:switch']"
-                        @click="handleSwitch(scope.row, 'pitcher')"
-                    >切投手</el-button>
-                    <el-button
+                        @click="puthangdle(scope.row)"
+                    >指派</el-button>
+                    <!-- <el-button
                         size="mini"
                         type="text"
                         icon="el-icon-sort"
@@ -237,9 +250,9 @@
                             type="text"
                             icon="el-icon-delete"
                         >删除</el-button>
-                    </el-popconfirm>
+                    </el-popconfirm> -->
                 </template>
-            </el-table-column> -->
+            </el-table-column>
         </el-table>
 
         <pagination
@@ -614,11 +627,36 @@
                 <el-button type="primary" @click="onSubmitTenSwitch()">确 定</el-button>
             </span>
         </el-dialog>
+
+        <!-- 指派 -->
+        <el-dialog 
+            title="指派投手" 
+            :visible.sync="putVisible" 
+            width="450px"
+            append-to-body
+        >
+            <el-form :model="putParamsForm" :rules="putRulesType" ref="platFormPut" label-width="80px" label-position="top">
+                <el-form-item label="用户" prop="putUserId" >
+                    <el-select v-model="putParamsForm.putUserId" placeholder="请选择" filterable style="width: 100%" clearable>
+                        <el-option
+                            v-for="item in userAll"
+                            :key="item.id"
+                            :label="item.nickName"
+                            :value="item.id">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="putParamsForm = {};putVisible = false">取 消</el-button>
+                <el-button type="primary" @click="submitPUt('platFormPut')">确 定</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 
 <script>
-import { listAd, getAd, toAuth, editAdMp, refreshByIds, deleteAdMp, getAdt, switchAcc, switchBook, switchPitcher, switchPlatform, getAdAppList, addApp, editApp, getAdAppListAll } from "@/api/accounts/adApi";
+import { listAd, getAd, toAuth, editAdMp, refreshByIds, deleteAdMp, getAdt, switchAcc, switchBook, switchPitcher, switchPlatform, getAdAppList, addApp, editApp, getAdAppListAll, cutPut } from "@/api/accounts/adApi";
 import { getAllBook } from "@/api/system/books";
 import { getPeriodAll } from "@/api/accounts/period";
 import { allUser } from "@/api/system/user";
@@ -782,7 +820,14 @@ export default {
             tenTotal: 0,
             loading: false,
             tenAllList: [],
-            reLoading: false
+            reLoading: false,
+            putVisible: false,
+            putParamsForm: {},
+            putRulesType: {
+                putUserId: [
+                    { required: true, message: '请选择投手', trigger: 'blur' }
+                ]
+            }
         }
     },
     mounted(){
@@ -802,17 +847,8 @@ export default {
     },
     created(){
         this.getAppListAll()
-        // this.getList()
         this.getAll()
     },
-    watch: {
-        "store.getters.btnPower": {
-            handler(val) {
-                console.log(222222, val);
-            },
-            immediate: true
-        }
-    },
     methods: {
         /** 刷新服务商 */
         refreshServer() {
@@ -852,6 +888,37 @@ export default {
             }
             this.openTenAddEditSwitch = true
         },
+        /** 指派 */
+        puthangdle(row) {
+            this.putParamsForm = {
+                adAccountId: row.id,
+                putUserId: row.putUserId
+            }
+            this.putVisible = true
+        },
+        /** 批量指派 */
+        putsHandle() {
+            this.putParamsForm = {
+                adAccountId: this.ids.toString(),
+                putUserId: undefined
+            }
+            this.putVisible = true
+        },
+        /** 切换投手 */
+        submitPUt(type) {
+            this.$refs[type].validate((valid) => {
+                if (valid) {
+                    cutPut(this.putParamsForm).then(res => {
+                        if (res.data) {
+                            this.msgSuccess('切换成功')
+                            this.putParamsForm = {}
+                            this.putVisible = false
+                            this.getList()
+                        }
+                    })
+                }
+            })
+        },
         /** 确定新增 */
         onSubmitTenSwitch() {
             this.$refs['addTenqueryForm'].validate((valid) => {
@@ -1113,18 +1180,12 @@ export default {
             allUser().then(response => {
                 let data = response.data
                 this.userAll = data.map((item) => {
-                    return { id: item.userId, nickName: item.nickName }
+                    return { id: item.userId, nickName: item.nickname }
                 })
             })
         },
         /** 老的授权广告平台 */
         handleWarrantOld() {
-            // getAdt({ callbackPage: window.location.origin + '/admin/adCode' }).then(response => {
-            //     if (response.data) {
-            //         localStorage.setItem('adType', 'oldType')
-            //         window.open(response.data)
-            //     }
-            // });
             toAuth({ adAppId: this.queryParams.adAppId, callbackPage: encodeURIComponent(window.location.origin + '/admin/adCode') }).then(res => {
                 if (res.data) {
                     window.open(res.data)

src/views/login.vue

@@ -102,7 +102,7 @@ export default {
     return {
       signInType: 'pwd',  // 登录类型
       APPID: process.env.VUE_APP_DDAPPID, // dingdsfuoevmawlyyrjx
-      REDIRECT_URI: encodeURIComponent(process.env.VUE_APP_BASE_URL + '/#/login'), //encodeURIComponent(location.href),
+      REDIRECT_URI: encodeURIComponent(process.env.VUE_APP_BASE_URL), //encodeURIComponent(location.href),
       state: '',
       dingdingLoginForm: {
         code: '',