Merge branch 'feature_20250828_竞品店维护' into uat(dev)

src/views/deviceOutside/index.vue

@@ -301,33 +301,38 @@
                   :src="sbpmdh"
                   @click="linkapp(item)" />
               </div>
-              <!-- 分销店 -->
-              <template
-                v-if="
-                  item.sfaStoreType &&
-                  item.sfaStoreType.type == 'fxd' &&
-                  item.sfaStoreChainsContactList
-                ">
-                <div class="info" v-if="typeShow">
-                  经销商：
-                  <div class="TCFXListItem" v-for="(item, index) in item.sfaStoreChainsContactList">
-                    <el-popover
-                      popper-class="zpover zpoverStoreztype"
-                      placement="bottom-start"
-                      trigger="click">
-                      <div>
-                        <div>{{ item.chainCode }}</div>
-                        <div>{{ item.chainName }}</div>
-                      </div>
-                      <div slot="reference" :key="index">
-                        {{ item.categoryDescribe }}
-                      </div>
-                    </el-popover>
+              <!-- 潜在店不显示经销商 -->
+              <template v-if="item.sfaStoreType.type != 'qzd'">
+                <!-- 分销店 -->
+                <template
+                  v-if="
+                    item.sfaStoreType &&
+                    item.sfaStoreType.type == 'fxd' &&
+                    item.sfaStoreChainsContactList
+                  ">
+                  <div class="info" v-if="typeShow">
+                    经销商：
+                    <div
+                      class="TCFXListItem"
+                      v-for="(item, index) in item.sfaStoreChainsContactList">
+                      <el-popover
+                        popper-class="zpover zpoverStoreztype"
+                        placement="bottom-start"
+                        trigger="click">
+                        <div>
+                          <div>{{ item.chainCode }}</div>
+                          <div>{{ item.chainName }}</div>
+                        </div>
+                        <div slot="reference" :key="index">
+                          {{ item.categoryDescribe }}
+                        </div>
+                      </el-popover>
+                    </div>
                   </div>
-                </div>
-              </template>
-              <template v-else>
-                <div class="info" v-if="typeShow">经销商：{{ item.chainName }}</div>
+                </template>
+                <template v-else>
+                  <div class="info" v-if="typeShow">经销商：{{ item.chainName }}</div>
+                </template>
               </template>
               <!-- storeLonExist 门店是否存在经纬度 字段false=不显示导航和距离，true=显示 -->
               <div class="info" v-if="item.storeLonExist">
@@ -512,9 +517,13 @@
             <p class="searchchecktitle" @click="isCompetingStores = !isCompetingStores">
               &nbsp;竞品店<van-icon name="arrow-down" style="float: right" />
             </p>
-            <div v-if="isCompetingStores">
-              <div class="checkbox1" v-for="(item, index) in storeTypeLists" :key="index">
-                <div v-if="item.groupType == 'qzd'" class="child">
+            <div v-if="isCompetingStores" style="width: 100%">
+              <div
+                class="checkbox1"
+                v-for="(item, index) in storeTypeLists"
+                :key="index"
+                v-if="item.groupType == 'qzd'">
+                <div class="child">
                   <van-checkbox :name="item.dictValue">{{ item.dictLabel }}</van-checkbox>
                 </div>
               </div>

src/views/deviceOutside/rangeStore.vue

@@ -445,33 +445,36 @@
                 >{{ info.telephone }}</a
               ><van-icon name="phone" size="16" color="#1989fa" />
             </p>
-            <!-- 分销店 -->
-            <template
-              v-if="
-                info.sfaStoreType &&
-                info.sfaStoreType.type == 'fxd' &&
-                info.sfaStoreChainsContactList
-              ">
-              <div class="text">
-                经销商：
-                <div class="TCFXListItem" v-for="(item, index) in info.sfaStoreChainsContactList">
-                  <el-popover
-                    popper-class="zpover zpoverStoreztype"
-                    placement="bottom-start"
-                    trigger="click">
-                    <div>
-                      <div>{{ item.chainCode }}</div>
-                      <div>{{ item.chainName }}</div>
-                    </div>
-                    <div slot="reference" :key="index">
-                      {{ item.categoryDescribe }}
-                    </div>
-                  </el-popover>
+            <!-- 潜在店不显示经销商 -->
+            <template v-if="info.sfaStoreType.type != 'qzd'">
+              <!-- 分销店 -->
+              <template
+                v-if="
+                  info.sfaStoreType &&
+                  info.sfaStoreType.type == 'fxd' &&
+                  info.sfaStoreChainsContactList
+                ">
+                <div class="text">
+                  经销商：
+                  <div class="TCFXListItem" v-for="(item, index) in info.sfaStoreChainsContactList">
+                    <el-popover
+                      popper-class="zpover zpoverStoreztype"
+                      placement="bottom-start"
+                      trigger="click">
+                      <div>
+                        <div>{{ item.chainCode }}</div>
+                        <div>{{ item.chainName }}</div>
+                      </div>
+                      <div slot="reference" :key="index">
+                        {{ item.categoryDescribe }}
+                      </div>
+                    </el-popover>
+                  </div>
                 </div>
-              </div>
-            </template>
-            <template v-else>
-              <p class="text">经销商:{{ info.chainName }}</p>
+              </template>
+              <template v-else>
+                <p class="text">经销商:{{ info.chainName }}</p>
+              </template>
             </template>
             <p class="text">地址:{{ info.addressLine }}</p>
             <div class="text" style="height: 24px">

src/views/deviceWithin/index.vue

@@ -296,33 +296,36 @@
                 :src="sbpmdh"
                 @click="linkapp(item)" />
             </div>
-            <!-- 分销店 -->
-            <template
-              v-if="
-                item.sfaStoreType &&
-                item.sfaStoreType.type == 'fxd' &&
-                item.sfaStoreChainsContactList
-              ">
-              <div class="info" v-if="typeShow">
-                经销商：
-                <div class="TCFXListItem" v-for="(item, index) in item.sfaStoreChainsContactList">
-                  <el-popover
-                    popper-class="zpover zpoverStoreztype"
-                    placement="bottom-start"
-                    trigger="click">
-                    <div>
-                      <div>{{ item.chainCode }}</div>
-                      <div>{{ item.chainName }}</div>
-                    </div>
-                    <div slot="reference" :key="index">
-                      {{ item.categoryDescribe }}
-                    </div>
-                  </el-popover>
+            <!-- 潜在店不显示经销商 -->
+            <template v-if="item.sfaStoreType.type != 'qzd'">
+              <!-- 分销店 -->
+              <template
+                v-if="
+                  item.sfaStoreType &&
+                  item.sfaStoreType.type == 'fxd' &&
+                  item.sfaStoreChainsContactList
+                ">
+                <div class="info" v-if="typeShow">
+                  经销商：
+                  <div class="TCFXListItem" v-for="(item, index) in item.sfaStoreChainsContactList">
+                    <el-popover
+                      popper-class="zpover zpoverStoreztype"
+                      placement="bottom-start"
+                      trigger="click">
+                      <div>
+                        <div>{{ item.chainCode }}</div>
+                        <div>{{ item.chainName }}</div>
+                      </div>
+                      <div slot="reference" :key="index">
+                        {{ item.categoryDescribe }}
+                      </div>
+                    </el-popover>
+                  </div>
                 </div>
-              </div>
-            </template>
-            <template v-else>
-              <div class="info" v-if="typeShow">经销商：{{ item.chainName }}</div>
+              </template>
+              <template v-else>
+                <div class="info" v-if="typeShow">经销商：{{ item.chainName }}</div>
+              </template>
             </template>
             <!-- storeLonExist 门店是否存在经纬度 字段false=不显示导航和距离，true=显示 -->
             <div class="info" v-if="item.storeLonExist">距离：{{ Micrometer(item.distance) }}m</div>

src/views/historicalVisit/historAllVisit.vue

@@ -101,33 +101,38 @@
                 <div class="info" v-if="item.dwellTime">拜访时长：{{ item.dwellTime }}</div>
                 <div class="info">地址：{{ item.addressLine }}</div>
               </div>
-              <!-- 分销店 -->
-              <template
-                v-if="
-                  item.sfaStoreType &&
-                  item.sfaStoreType.type == 'fxd' &&
-                  item.sfaStoreChainsContactList
-                ">
-                <div class="info">
-                  经销商：
-                  <div class="TCFXListItem" v-for="(item, index) in item.sfaStoreChainsContactList">
-                    <el-popover
-                      popper-class="zpover zpoverStoreztype"
-                      placement="bottom-start"
-                      trigger="click">
-                      <div>
-                        <div>{{ item.chainCode }}</div>
-                        <div>{{ item.chainName }}</div>
-                      </div>
-                      <div slot="reference" :key="index">
-                        {{ item.categoryDescribe }}
-                      </div>
-                    </el-popover>
+              <!-- 潜在店不显示经销商 -->
+              <template v-if="item.sfaStoreType.type != 'qzd'">
+                <!-- 分销店 -->
+                <template
+                  v-if="
+                    item.sfaStoreType &&
+                    item.sfaStoreType.type == 'fxd' &&
+                    item.sfaStoreChainsContactList
+                  ">
+                  <div class="info">
+                    经销商：
+                    <div
+                      class="TCFXListItem"
+                      v-for="(item, index) in item.sfaStoreChainsContactList">
+                      <el-popover
+                        popper-class="zpover zpoverStoreztype"
+                        placement="bottom-start"
+                        trigger="click">
+                        <div>
+                          <div>{{ item.chainCode }}</div>
+                          <div>{{ item.chainName }}</div>
+                        </div>
+                        <div slot="reference" :key="index">
+                          {{ item.categoryDescribe }}
+                        </div>
+                      </el-popover>
+                    </div>
                   </div>
-                </div>
-              </template>
-              <template v-else>
-                <div class="info">经销商：{{ item.chainName }}</div>
+                </template>
+                <template v-else>
+                  <div class="info">经销商：{{ item.chainName }}</div>
+                </template>
               </template>
             </van-cell>
             <div class="lineGrey"></div>

src/views/home/hintTabPage/unCreateStore.vue

@@ -229,35 +229,38 @@
                     </div>
                     <div class="info">联系电话：{{ item.telephone }}</div>
                     <div class="info">地址：{{ item.addressLine }}</div>
-                    <!-- 分销店 -->
-                    <template
-                      v-if="
-                        item.sfaStoreType &&
-                        item.sfaStoreType.type == 'fxd' &&
-                        item.sfaStoreChainsContactList
-                      ">
-                      <div class="info">
-                        经销商：
-                        <div
-                          class="TCFXListItem"
-                          v-for="(item, index) in item.sfaStoreChainsContactList">
-                          <el-popover
-                            popper-class="zpover zpoverStoreztype"
-                            placement="bottom-start"
-                            trigger="click">
-                            <div>
-                              <div>{{ item.chainCode }}</div>
-                              <div>{{ item.chainName }}</div>
-                            </div>
-                            <div slot="reference" :key="index">
-                              {{ item.categoryDescribe }}
-                            </div>
-                          </el-popover>
+                    <!-- 潜在店不显示经销商 -->
+                    <template v-if="item.sfaStoreType.type != 'qzd'">
+                      <!-- 分销店 -->
+                      <template
+                        v-if="
+                          item.sfaStoreType &&
+                          item.sfaStoreType.type == 'fxd' &&
+                          item.sfaStoreChainsContactList
+                        ">
+                        <div class="info">
+                          经销商：
+                          <div
+                            class="TCFXListItem"
+                            v-for="(item, index) in item.sfaStoreChainsContactList">
+                            <el-popover
+                              popper-class="zpover zpoverStoreztype"
+                              placement="bottom-start"
+                              trigger="click">
+                              <div>
+                                <div>{{ item.chainCode }}</div>
+                                <div>{{ item.chainName }}</div>
+                              </div>
+                              <div slot="reference" :key="index">
+                                {{ item.categoryDescribe }}
+                              </div>
+                            </el-popover>
+                          </div>
                         </div>
-                      </div>
-                    </template>
-                    <template v-else>
-                      <div class="info">经销商：{{ item.chainName }}</div>
+                      </template>
+                      <template v-else>
+                        <div class="info">经销商：{{ item.chainName }}</div>
+                      </template>
                     </template>
                   </div>
                 </van-cell>

src/views/storeManagement/index.vue

@@ -321,8 +321,9 @@
               </div>
               <div class="info">联系电话：{{ item.telephone }}</div>
               <div class="info">地址：{{ item.addressLine }}</div>
-              <!-- 分销店 -->
+              <!-- 潜在店不显示经销商 -->
               <template v-if="item.sfaStoreType.type != 'qzd'">
+                <!-- 分销店 -->
                 <template
                   v-if="
                     item.sfaStoreType &&