Merge branch 'master' of http://192.168.0.105:10010/r/school-web

shuishen

2022-03-18 bf58722dfd03ea1513f3acc7331d4d4403fca76e

Merge branch 'master' of http://192.168.0.105:10010/r/school-web

 src/components/mobilePopupOur/index.vue

@@ -37,7 +37,7 @@
        ></el-empty>
        <mobilePopupOurOnce
          v-for="(citem, cindex) in onlyData"
          :key="citem.icons + ''"
          :key="citem.name + cindex"
          :ends="onlyData.length - 1 == cindex"
          :onceData="citem"
        ></mobilePopupOurOnce>

 src/components/mobilePopupOurOnce/index.vue

@@ -126,7 +126,7 @@
            useJWD: true, // 仅使用经纬度
            from: "PopupOurOnce",
          };
          window.popupsDom = that.$store.dispatch("setMobileWindows", d);
         that.$store.dispatch("setMobileWindows", d);
        }, 500);
        // 固定窗口
        // that.$store.dispatch("SET_OPENWIDOWFIXED", d);

 src/components/mobilemap/index.vue

@@ -1075,10 +1075,7 @@
              // from: 'PopupOurOnce'
            };

            window.popupsDom = that.$store.dispatch(
              "setMobileWindows",
              dataInitialization
            );
            that.$store.dispatch("setMobileWindows", dataInitialization);
          }
        }
      }, 0);