时间改本周上周

src/views/accounts/caiwutongji/commission/index.vue

@@ -242,8 +242,12 @@ export default {
                         val: "yesterday"
                     },
                     {
-                        text: "最近7天",
-                        val: "lately7"
+                        text: "本周",
+                        val: "thisWeek"
+                    },
+                    {
+                        text: "上周",
+                        val: "lastWeek"
                     },
                     {
                         text: "最近30天",

src/views/accounts/caiwutongji/contribute/index.vue

@@ -151,8 +151,12 @@ export default {
                         val: "yesterday"
                     },
                     {
-                        text: "最近7天",
-                        val: "lately7"
+                        text: "本周",
+                        val: "thisWeek"
+                    },
+                    {
+                        text: "上周",
+                        val: "lastWeek"
                     },
                     {
                         text: "最近30天",

src/views/accounts/caiwutongji/fenrun/index.vue

@@ -154,8 +154,12 @@ export default {
                         val: "yesterday"
                     },
                     {
-                        text: "最近7天",
-                        val: "lately7"
+                        text: "本周",
+                        val: "thisWeek"
+                    },
+                    {
+                        text: "上周",
+                        val: "lastWeek"
                     },
                     {
                         text: "最近30天",

src/views/accounts/caiwutongji/fugou/index.vue

@@ -201,8 +201,12 @@ export default {
                         val: "yesterday"
                     },
                     {
-                        text: "最近7天",
-                        val: "lately7"
+                        text: "本周",
+                        val: "thisWeek"
+                    },
+                    {
+                        text: "上周",
+                        val: "lastWeek"
                     },
                     {
                         text: "最近30天",

src/views/accounts/caiwutongji/hongbao/index.vue

@@ -153,8 +153,12 @@ export default {
                         val: "yesterday"
                     },
                     {
-                        text: "最近7天",
-                        val: "lately7"
+                        text: "本周",
+                        val: "thisWeek"
+                    },
+                    {
+                        text: "上周",
+                        val: "lastWeek"
                     },
                     {
                         text: "最近30天",

src/views/accounts/caiwutongji/jingdou/index.vue

@@ -154,8 +154,12 @@ export default {
                         val: "yesterday"
                     },
                     {
-                        text: "最近7天",
-                        val: "lately7"
+                        text: "本周",
+                        val: "thisWeek"
+                    },
+                    {
+                        text: "上周",
+                        val: "lastWeek"
                     },
                     {
                         text: "最近30天",

src/views/accounts/caiwutongji/pension/index.vue

@@ -194,8 +194,12 @@ export default {
                         val: "yesterday"
                     },
                     {
-                        text: "最近7天",
-                        val: "lately7"
+                        text: "本周",
+                        val: "thisWeek"
+                    },
+                    {
+                        text: "上周",
+                        val: "lastWeek"
                     },
                     {
                         text: "最近30天",

src/views/accounts/caiwutongji/point/index.vue

@@ -152,8 +152,12 @@ export default {
                         val: "yesterday"
                     },
                     {
-                        text: "最近7天",
-                        val: "lately7"
+                        text: "本周",
+                        val: "thisWeek"
+                    },
+                    {
+                        text: "上周",
+                        val: "lastWeek"
                     },
                     {
                         text: "最近30天",

src/views/accounts/caiwutongji/pv/index.vue

@@ -154,8 +154,12 @@ export default {
                         val: "yesterday"
                     },
                     {
-                        text: "最近7天",
-                        val: "lately7"
+                        text: "本周",
+                        val: "thisWeek"
+                    },
+                    {
+                        text: "上周",
+                        val: "lastWeek"
                     },
                     {
                         text: "最近30天",

src/views/accounts/caiwutongji/vr/index.vue

@@ -151,8 +151,12 @@ export default {
                         val: "yesterday"
                     },
                     {
-                        text: "最近7天",
-                        val: "lately7"
+                        text: "本周",
+                        val: "thisWeek"
+                    },
+                    {
+                        text: "上周",
+                        val: "lastWeek"
                     },
                     {
                         text: "最近30天",

src/views/merchant/list/index.vue

@@ -462,7 +462,7 @@ export default {
         .then((res) => {
           Cookies.set("merchantToken", res.data.token);
           // window.open(SettingMer.httpUrl + res.data.url); // 2023年9月2日 - 前后端分离 去掉httpUrl
-          window.open("http://shop.hxxfb.com" + res.data.url); // 2023年9月2日 - 前后端分离 去掉httpUrl
+          window.open("http://testshop.hxxfb.com" + res.data.url); // 2023年9月2日 - 前后端分离 去掉httpUrl
           // window.open(res.data.url);
           console.log('跳转到merchant res = ')
           console.log(res)