修改bug、修改新登录页相关问题

ip.js

@@ -23,8 +23,8 @@ VUE_APP_BASE_API1 = 'https://apps.xoado.com'
 VUE_APP_BASE_API2 = 'https://core.xoado.com'
 VUE_APP_BASE_API2_ = 'https://core.xoado.com'
 VUE_APP_BASE_API3 = 'https://api.xoado.com'
-VUE_APP_BASE_API4 = 'https://hgxd.99zcx.com'
-VUE_APP_BASE_API5 = 'https://hgxd.99zcx.com/brand'
+VUE_APP_BASE_API4 = 'http://aitransport.xoado.com:8181'
+VUE_APP_BASE_API5 = 'http://aitransport.xoado.com:8181/brand'
 VUE_APP_BASE_API6 = 'https://projects.xoado.com/transport'
 VUE_APP_BASE_API7 = 'https://projects.xoado.com/operate'
 VUE_APP_BASE_API8 = 'https://projects.xoado.com/trace'

src/App.vue

@@ -28,7 +28,7 @@ export default {
         await this.$store.dispatch('user/PlatformCode')
         await this.mustFun();
         /** 测试环境需要解注 */
-        await this.getEnvironment();
+        // await this.getEnvironment();
     },
     mounted () {
         console.log(process.env.VUE_APP_BASE_API5)

src/styles/index.scss

@@ -145,4 +145,4 @@ body {
 }
 .el-input__suffix{
   height: 32px;
-}
\ No newline at end of file
+}

src/views/business/orderManagement/index.vue

@@ -118,7 +118,7 @@
                 <div></div>
             </div>
             <div>
-                <Table v-if="flag" :config="config" @getData="getData" @orderClick="orderClick"
+                <Table :config="config" @orderClick="orderClick"
                        @sortChange="sortChange"></Table>
             </div>
             <div class="bottom-part">
@@ -506,6 +506,7 @@ export default {
         await this.getOpenAreaListFun()
         await this.getTransport()
         await this.getOrderHeaders()
+        await this.getData()
     },
     methods: {
         async getTransport() {
@@ -542,7 +543,7 @@ export default {
             await this.getData()
         },
         async getAllPlatform() {
-            await getplatformList().then((res) => {
+            await getplatformList().then(async (res) => {
                 if (res.status == 200) {
                     res.data.forEach((element) => {
                         if(element.brandUrl) {
@@ -552,10 +553,10 @@ export default {
                             });
                         }
                     });
-
                     this.platform = this.platformList.length > 0 ? this.platformList[0].value : '';
                     this.brandUrl = sessionStorage.getItem('test') ? '' : JSON.parse(this.platformList[0].value).brandUrl;
                     this.plat = sessionStorage.getItem('test') ? '' : JSON.parse(this.platformList[0].value).platformId;
+                    // await this.getData();
                 }
             });
         },
@@ -598,7 +599,7 @@ export default {
          * 获取自定义列表数据
          * */
         async getOrderHeaders() {
-            this.flag = false
+            // this.flag = false
             let json = {
                 key: this.$store.getters.platformId
             }
@@ -609,9 +610,9 @@ export default {
                 headers: [],
                 data: []
             }
-            let {data} = await getAllOrderList(json1)
-            obj.data = data.content;
-            this.total = data.total
+            // let {data} = await getAllOrderList(json1)
+            // obj.data = data.content;
+            // this.total = data.total
             await getOrderListData(json).then(res => {
                 if (res.status == 200) {
                     let DataSource = res.data
@@ -642,20 +643,20 @@ export default {
                     } else {
                         this.config.data = obj.data
                     }
-                    this.flag = true
+                    // this.flag = true
                     console.log(this.config)
                 } else {
                     this.config.data = obj.data
                 }
             })
             this.loading = false
-            this.flag = true
+            // this.flag = true
         },
         /**
          * 存储自定义表头
          * */
         async setHeaders(val) {
-            this.flag = false
+            // this.flag = false
             //  val是传过来的头部数组信息
             console.info(val)
             let json = {
@@ -681,7 +682,7 @@ export default {
             })
             this.config.headers = NewArray
             this.$nextTick(() => {
-                this.flag = true;
+                // this.flag = true;
             })
             this.dialogVisible = false
         },
@@ -694,7 +695,9 @@ export default {
         async getData() {
             let json = this.selectResult;
             json.pageVo.page = this.page;
-            let {data} = await getAllOrderList(json, this.brandUrl, this.plat)
+
+            let that = this;
+            let {data} = await getAllOrderList(json, that.brandUrl, that.plat)
             this.loading = false
             this.config.data = []
             this.config.data = data.content

src/views/disposition/passDetail.vue

@@ -45,12 +45,12 @@
                             alt=""
                         />
                         <img
-                            v-if="selectResult.pageLocation == 2"
+                            v-if="selectResult.pageLocation == 3"
                             src="@/assets/img/rotation-wzgg.png"
                             alt=""
                         />
                         <img
-                            v-if="selectResult.pageLocation == 3"
+                            v-if="selectResult.pageLocation == 2"
                             src="@/assets/img/rotation-ddxq.png"
                             alt=""
                         />
@@ -464,12 +464,17 @@ export default {
     async created() {
         // await this.getAllDatas();
         // await this.getEligible();
-        await this.getAllOpendAreaListFun();
+        // await this.getAllOpendAreaListFun();
         this.headers = {
             XOADOAPPACCESSCODE: this.$store.state.user.code,
             XOADOTOKENID: this.$store.state.user.token,
             XOADOPLATFORMID: this.$store.getters.platformId,
         };
+        console.log('==================================')
+        console.log(this.$store.state.user.code)
+        console.log(this.$store.state.user.token)
+        console.log(this.$store.getters.platformId)
+        console.log('----------------------------------')
     },
     methods: {
         changeCodeList(val) {
@@ -745,6 +750,7 @@ export default {
                     //     pageJumpUrl: this.ruleForm.pageJumpFlag == 1 ? this.ruleForm.pageJumpUrl : this.ruleForm.insideJumpUrl,
                     //     pageJumpText: this.ruleForm.pageJumpText,
                     // };
+                    debugger
                     let json = {
                         "platformId": this.$store.getters.platformId,// (平台ID)
                         "displayPage": this.selectResult.pageLocation,// (展示页面)
@@ -752,7 +758,7 @@ export default {
                         "modelName": this.ruleForm.modelName,// (广告模块名称)
                         "positionIndex": this.ruleForm.positionIndex,// (位数)
                         "pictureUrl": this.ruleForm.pictureUrl,
-                        "areaBelong": this.checked ? ['000000'] : this.ruleForm.codeList,//(配置的区域)
+                        "areaBelong": this.checked ? ['000000'] : [this.ruleForm.codeList[this.ruleForm.codeList.length - 1]+''],//(配置的区域)
                         "activityId": this.ruleForm.activityId,// (关联的活动Id)
                         "activityName": this.ruleForm.activityName,// (关联的活动名称)
                         "pageJumpFlag": this.ruleForm.pageJumpFlag,// (跳转标记)

src/views/disposition/passRotation.vue

@@ -129,11 +129,11 @@
                     <div v-if="false">/</div>
                     <el-switch
                         v-else
-                        v-model="row.operationStats"
+                        v-model="row.isOnline"
                         active-color="#13ce66"
                         inactive-color="#ff4949"
-                        :active-value="'1'"
-                        :inactive-value="'0'"
+                        :active-value="1"
+                        :inactive-value="0"
                         @change="operatingStatuct(row)"
                     >
                     </el-switch>
@@ -256,13 +256,14 @@ export default {
          *弹窗开关切换
          * **/
         async operatingStatuct(val) {
+            debugger
             let {data, status} = await upOrDown({}, val.advertId, val.isOnline);
             if (status == 200) {
                 this.$message.success("操作成功");
             } else {
-                val.operationStats == "0"
-                    ? (val.operationStats = "1")
-                    : (val.operationStats = "0");
+                val.isOnline == "0"
+                    ? (val.isOnline = "1")
+                    : (val.isOnline = "0");
                 this.$confirm(data, "提示", {
                         confirmButtonText: "确定",
                         cancelButtonText: "取消",