Browse Source

Merge branch 'feature_20241104_门店列表-进入拜访删除visitSource字段判断'

zhujindu 1 năm trước cách đây
mục cha
commit
4e49a3041e

+ 4 - 4
src/views/deviceOutside/index.vue

@@ -1115,7 +1115,7 @@ export default {
       getUserOrgStoreList({
         lat: that.lat,
         lon: that.lon,
-        chainCode: this.chainCode,
+        chainCode: this.chainCode ? this.chainCode : '',
         storeLabelTypes: this.storeLabelTypes.join(','),
         pageNum: this.pageNum,
         storeCategoryList: this.storeCategoryList,
@@ -1301,7 +1301,7 @@ export default {
       getUserOutPlaList({
         lat: that.lat,
         lon: that.lon,
-        chainCode: this.chainCode,
+        chainCode: this.chainCode ? this.chainCode : '',
         storeLabelTypes: this.storeLabelTypes.join(','),
         pageNum: this.pageNum,
         storeCategoryList: this.storeCategoryList,
@@ -1478,7 +1478,7 @@ export default {
               this.timer = setTimeout(() => {
                 this.flag = true;
               }, 2000);
-              if (val.stateString.indexOf('拜访中') != -1 && val.visitSource == 1) {
+              if (val.stateString.indexOf('拜访中') != -1) {
                 localStorage.setItem('startTime', new Date());
                 localStorage.setItem('ORGName', val.deptName);
                 localStorage.setItem('chainNameR', val.storeName);
@@ -1742,7 +1742,7 @@ export default {
           this.timer = setTimeout(() => {
             this.flag = true;
           }, 2000);
-          if (val.stateString.indexOf('拜访中') != -1 && val.visitSource == 1) {
+          if (val.stateString.indexOf('拜访中') != -1) {
             localStorage.setItem('startTime', new Date());
             localStorage.setItem('ORGName', val.deptName);
             localStorage.setItem('chainNameR', val.storeName);

+ 1 - 1
src/views/deviceOutside/rangeStore.vue

@@ -1609,7 +1609,7 @@ export default {
               this.timer = setTimeout(() => {
                 this.flag = true;
               }, 2000);
-              if (val.stateString.indexOf('拜访中') != -1 && val.visitSource == 1) {
+              if (val.stateString.indexOf('拜访中') != -1) {
                 localStorage.setItem('startTime', new Date());
                 localStorage.setItem('ORGName', val.deptName);
                 localStorage.setItem('chainNameR', val.storeName);

+ 2 - 2
src/views/deviceOutside/topStore.vue

@@ -1454,7 +1454,7 @@ export default {
               this.timer = setTimeout(() => {
                 this.flag = true;
               }, 2000);
-              if (val.stateString.indexOf('拜访中') != -1 && val.visitSource == 1) {
+              if (val.stateString.indexOf('拜访中') != -1) {
                 localStorage.setItem('startTime', new Date());
                 localStorage.setItem('ORGName', val.deptName);
                 localStorage.setItem('chainNameR', val.storeName);
@@ -1887,7 +1887,7 @@ export default {
           this.timer = setTimeout(() => {
             this.flag = true;
           }, 2000);
-          if (val.stateString.indexOf('拜访中') != -1 && val.visitSource == 1) {
+          if (val.stateString.indexOf('拜访中') != -1) {
             localStorage.setItem('startTime', new Date());
             localStorage.setItem('ORGName', val.deptName);
             localStorage.setItem('chainNameR', val.storeName);

+ 2 - 2
src/views/deviceWithin/index.vue

@@ -763,7 +763,7 @@ export default {
               that.timer = setTimeout(() => {
                 that.flag = true;
               }, 2000);
-              if (val.stateString.indexOf('拜访中') != -1 && val.visitSource == 1) {
+              if (val.stateString.indexOf('拜访中') != -1) {
                 that.$router.push({
                   path: '/storeVisitpage',
                   query: {
@@ -1190,7 +1190,7 @@ export default {
           this.timer = setTimeout(() => {
             this.flag = true;
           }, 2000);
-          if (val.stateString.indexOf('拜访中') != -1 && val.visitSource == 1) {
+          if (val.stateString.indexOf('拜访中') != -1) {
             localStorage.setItem('startTime', new Date());
             localStorage.setItem('ORGName', val.deptName);
             localStorage.setItem('chainNameR', val.storeName);