朱鑫波 4 rokov pred
rodič
commit
c0ab7c38a8

+ 7 - 7
src/router/index.js

@@ -1,14 +1,14 @@
 import Vue from 'vue'
 import Router from 'vue-router'
-import {constantRouterMap} from '@/config/router.config'
+import { constantRouterMap } from '@/config/router.config'
 
 try {
-    const originalPush = Router.prototype.push
-    Router.prototype.push = function push(location) {
-      return originalPush.call(this, location).catch(err => err)
-    }
-  } catch (e) {
+  const originalPush = Router.prototype.push
+  Router.prototype.push = function push(location) {
+    return originalPush.call(this, location).catch(err => err)
   }
+} catch (e) {
+}
 
 Vue.use(Router)
 
@@ -22,6 +22,6 @@ Vue.use(Router)
 export default new Router({
   mode: 'history',
   base: process.env.BASE_URL,
-  scrollBehavior: () => ({y: 0}),
+  scrollBehavior: () => ({ y: 0 }),
   routes: constantRouterMap
 })

+ 1 - 1
src/views/modules/autoRules/newBlankRule.vue

@@ -915,7 +915,7 @@ export default {
         },
 
         goBack() {
-            this.$router.replace('/autoRules')
+            this.$router.push('/autoRules')
             this.$bus.$emit('remove', '/newBlankRule')
            
         },

+ 0 - 1
src/views/modules/earlyWarningRules/historyWarning.vue

@@ -55,7 +55,6 @@
         style="word-break: break-all"
       >
         <span slot="userId" slot-scope="text">{{ text.split('_')[0] }}</span>
-        <span slot="createTime" slot-scope="text">{{ text.split(' ')[0] }}</span>
         <div slot="alarmDetail" slot-scope="text" style="text-align: left; width: 100%; padding: 0 10px">
           {{ text }}
         </div>

+ 5 - 4
src/views/modules/kuaishouapp/account/stepForm/Step2.vue

@@ -941,10 +941,7 @@
             }
             postAction('/kuaishou/batch/createUnit', paramsEnd).then(res => {
               if (res.success) {
-                this.visible = true
-                this.allForm.fail = res.result.fail
-                this.allForm.success = res.result.success
-                this.loading = false
+               
                 if (res.result.success.length > 0) {
 
                   var dataElse =  res.result.success.map(item => {
@@ -959,6 +956,10 @@
                   var dataJson = JSON.stringify(dataElse)
                   localStorage.setItem('pans', dataJson)
                   localStorage.setItem('appId', this.getData('appId'))
+                  this.visible = true
+                  this.allForm.fail = res.result.fail
+                  this.allForm.success = res.result.success
+                  this.loading = false
                 }
               } else {
                 this.loading = false

+ 2 - 2
src/views/modules/kuaishouapp/batchCreation/creat/creatCampaign.vue

@@ -135,10 +135,10 @@ export default {
               localStorage.setItem('campaignList', res.result)
               localStorage.setItem('campaignType', this.type)
               this.loading = false
-              this.$router.replace({
+              this.$bus.$emit('remove', '/creat/creatCampaign')
+              this.$router.push({
                 path: '/creat/creatUnit',
               })
-              this.$bus.$emit('remove', '/creat/creatCampaign')
             } else {
               this.$message.error(res.message)
               this.loading = false

+ 2 - 2
vue.config.js

@@ -76,9 +76,9 @@ module.exports = {
         // target: 'http://192.168.1.43:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.43:8087', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.0.252:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
-        target: 'http://192.168.1.219:8080', //请求本地 需要jeecg-boot后台项目  赵西安
+        // target: 'http://192.168.1.219:8080', //请求本地 需要jeecg-boot后台项目  赵西安
         // target: 'http://192.168.1.193:8088', //请求本地 需要jeecg-boot后台项目  李煜一
-        //target: 'http://api.tjyourong.com.cn',
+        target: 'http://api.tjyourong.com.cn',
         // target: 'http://39.106.184.70:8088/', //请求本地 需要jeecg-boot后台项目
         // target:'http://139.186.151.174:8804', //测试