修改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/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/components/ForgetPassword.vue

 <template>
-  <div class="ForgetPassword">
     <el-dialog
             :visible.sync="AuthenticationShow"
             :close-on-click-modal="false"
@@ -23,13 +22,15 @@
                         <div style="position: relative">
                             <el-input v-model="password" maxlength="6" placeholder="请输入密码" label="密码"
                                       style="display: inline-block"></el-input>
-                <el-button style="display: inline-block" @click="Yanzheng" class="YanzhengBtn" :disabled="Btndisabled">
+                            <el-button style="display: inline-block" @click="Yanzheng" class="YanzhengBtn"
+                                       :disabled="Btndisabled">
                                 {{smscontent}}
                             </el-button>
                         </div>
                     </el-form-item>
                     <el-form-item prop="password" v-if="passwordShow" class="PassWord" label="设置密码">
-              <el-input type="password" maxlength="16" placeholder="请输入密码" style="height: 46px" v-model="newpassword"
+                        <el-input type="password" maxlength="16" placeholder="请输入密码" style="height: 46px"
+                                  v-model="newpassword"
                                   @keyup.enter.native="submitForm('ruleForm')">
                             <i slot="suffix" class="el-icon-view" @click="changePass('show')"></i>
                         </el-input>
@@ -59,7 +60,6 @@
             </div>
         </div>
     </el-dialog>
-  </div>
 </template>
 
 <script>
@@ -257,12 +257,15 @@
     .ForgetPassword {
         width: 100%;
         height: 100%;
+
         .el-dialog__header, .el-dialog__body {
             padding: 0;
         }
+
         .el-dialog {
             width: 482px;
         }
+
         .AuthenticationTop {
             font-size: 22px;
             font-weight: bold;
@@ -270,10 +273,12 @@
             padding-top: 28px;
             padding-bottom: 24px;
         }
+
         .AuthenticationTosat {
             width: 100%;
             height: 30px;
             background: #fdf4e3;
+
             span {
                 display: inline-block;
                 width: 22px;
@@ -283,6 +288,7 @@
                 vertical-align: middle;
                 margin-left: 25px;
             }
+
             p {
                 font-size: 12px;
                 line-height: 30px;
@@ -291,12 +297,15 @@
                 color: #ff8622;
             }
         }
+
         .AuthenticationBoxSection {
             margin-left: 10px;
             margin-top: 50px;
+
             .AuthenticationTitle {
                 height: 20px;
                 margin-bottom: 30px;
+
                 span {
                     display: inline-block;
                     width: 2px;
@@ -304,6 +313,7 @@
                     background: #0487fd;
                     vertical-align: middle;
                 }
+
                 p {
                     vertical-align: middle;
                     height: 100%;
@@ -313,13 +323,16 @@
                     line-height: 20px;
                 }
             }
+
             .el-input--small {
                 width: 350px;
                 height: 40px;
             }
+
             .el-input--small .el-input__inner {
                 height: 40px;
             }
+
             .YanzhengBtn {
                 border: none;
                 border-left: 1px solid #cccccc;
@@ -327,24 +340,27 @@
                 line-height: 2px;
                 position: absolute;
                 right: 30px;
-        top: 10px;
+                top: 8px;
                 color: #7093ef;
             }
+
             .AuthenticationTopBoxFooter {
                 padding-top: 20px;
                 padding-bottom: 60px;
                 text-align: center;
+
                 .AuthenticationTopBoxFooterBtn {
-          width: 110px;
-          height: 30px;
-          margin: 0 auto;
+                    padding: 10px 30px;
+                    /*width: 110px;*/
+                    /*height: 30px;*/
+                    /*margin: 0 auto;*/
                 }
             }
         }
     }
 
-  ::v-deep{
-    .el-button{
+    ::v-deep {
+        .el-button {
             padding: 0;
         }
     }

src/views/disposition/disposition.vue

@@ -11,7 +11,8 @@
                     icon="el-icon-plus"
                     size="small"
                     @click="$refs.addDialog.showDialog({})"
-        >新增原因</el-button
+            >新增原因
+            </el-button
             >
         </div>
 
@@ -28,7 +29,7 @@
             <el-table-column label="图标" align="center" width="120">
                 <template slot-scope="{ row }">
                     <el-avatar :size="50" shape="square">
-            <img :src="row.labelImgurl" />
+                        <img :src="row.labelImgurl"/>
                     </el-avatar>
                 </template>
             </el-table-column>
@@ -44,10 +45,12 @@
             <el-table-column label="操作" align="center" width="120">
                 <template slot-scope="{ row }">
                     <el-button type="text" @click="$refs.addDialog.showDialog({ row })"
-            >编辑</el-button
+                    >编辑
+                    </el-button
                     >
                     <el-button type="text" style="color: red" @click="DELcondition(row)"
-            >删除</el-button
+                    >删除
+                    </el-button
                     >
                 </template>
             </el-table-column>
@@ -71,9 +74,10 @@
 </template>
 
 <script>
-import { conditionList, delconditionList } from "@/port/set-request";
-import addDialog from "./componenets/disposition/addDialog";
-export default {
+    import {conditionList, delconditionList} from "@/port/set-request";
+    import addDialog from "./componenets/disposition/addDialog";
+
+    export default {
         name: "disposition",
         data() {
             return {
@@ -131,7 +135,7 @@ export default {
                 })
                     .then(() => {
                         this.tableLoading = true;
-          let json = { labelId: row.id };
+                        let json = {labelId: row.id};
                         delconditionList(json).then((res) => {
                             if (res.status == 200) {
                                 this.$message({
@@ -153,35 +157,37 @@ export default {
                         });
                     });
             },
-    tableRowStyle({ row, rowIndex }) {
+            tableRowStyle({row, rowIndex}) {
                 if (rowIndex % 2 !== 0) {
-        return { "background-color": "#e3f4ff" };
+                    return {"background-color": "#e3f4ff"};
                 }
             },
             // table变色，头
-    tableHeaderColor({ row, column, rowIndex, columnIndex }) {
-      return { "background-color": "#0099ff", color: "#ffffff" };
+            tableHeaderColor({row, column, rowIndex, columnIndex}) {
+                return {"background-color": "#0099ff", color: "#ffffff"};
             },
         },
-};
+    };
 </script>
 
 <style scoped lang="scss">
-.search-form {
+    .search-form {
         margin: 5px 0 5px 0;
 
         .el-form-item {
             margin-bottom: 5px;
         }
-}
-.pagination {
+    }
+
+    .pagination {
         margin-top: 16px;
         text-align: right;
-}
-.itemBtn {
+    }
+
+    .itemBtn {
         display: flex;
         align-items: center;
         justify-content: flex-end;
         margin: 10px 0;
-}
+    }
 </style>

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: "取消",