Merge branch 'feature_20260513_新建专业五金店' into uat(dev)

src/api/index.js

@@ -1224,3 +1224,12 @@ export function recognizeDisplayPhoto(query) {
     params: query,
   });
 }
+
+// 根据门店code获取陈列照识别数据
+export function getDisplayPhotoIdentify(query) {
+  return request({
+    url: 'mobile/store/getDisplayPhotoIdentify',
+    method: 'get',
+    params: query,
+  });
+}

src/views/signApproval/newStoreApprovalDetail.vue

@@ -188,7 +188,19 @@
             </van-col>
           </van-row>
           <van-collapse v-model="activeNames" class="orderList">
-            <van-collapse-item title="门店下单记录" name="1">
+            <van-collapse-item title="门店陈列照识别结果" name="0" v-if="photoIdentify.length">
+              <div class="orderItem" v-for="(item, index) in photoIdentify" :key="index">
+                <el-table
+                  :data="photoIdentify"
+                  border
+                  class="table-headermd table-headermdhome"
+                  style="width: 100%">
+                  <el-table-column label="产品名称" prop="name" />
+                  <el-table-column label="排面数" prop="count" width="80px" />
+                </el-table>
+              </div>
+            </van-collapse-item>
+            <van-collapse-item title="门店下单记录" name="1" v-if="orderList.length">
               <div class="orderItem" v-for="(item, index) in orderList" :key="index">
                 <div class="orderTitle">
                   {{ item.ORDERID }} | {{ item.ORDERDATE }} | {{ item.STATUS_DESCR }}
@@ -212,6 +224,7 @@
             </van-collapse-item>
           </van-collapse>
           <div
+            v-if="list.storeCategory != '126565'"
             style="font-size: 16px; font-weight: 600; padding: 10px 16px 0 16px; line-height: 25px">
             同城分销店首批铺货要求
             <span style="color: red">1000元</span>
@@ -315,6 +328,7 @@ import {
   getOrderByStoreCode,
   approvalStore,
   storeApprovaHistory,
+  getDisplayPhotoIdentify,
 } from '@/api/index';
 import mapmarker from '@/components/mapMarker';
 import viewUploadImg from '@/components/viewUploadImg';
@@ -355,13 +369,14 @@ export default {
       rejectMsgShow: false,
       //退回原因详情列表
       rejectMsg: [],
-      activeNames: [],
+      activeNames: [0, 1],
       orderList: [],
       rejectReasonShow: false, //退回提交原因
       rejectMessage: '',
       displayImg: [],
       orderPrice: 0, //订单总金额
       storeCompetitorList: '',
+      photoIdentify: [],
     };
   },
   activated() {
@@ -621,6 +636,7 @@ export default {
           }
           // 获取门店订单
           this.getStoreOrderList(this.list.storeCode);
+          this.getDisplayPhotoIdentifyFun(this.list.storeCode);
         } else {
           this.$toast.fail(res.msg);
         }
@@ -668,6 +684,13 @@ export default {
         }
       });
     },
+    getDisplayPhotoIdentifyFun(storeCode) {
+      getDisplayPhotoIdentify({ storeCode: storeCode }).then((res) => {
+        if (res.code == 200) {
+          this.photoIdentify = res.data.skuList || [];
+        }
+      });
+    },
     getSummaries(param) {
       const { columns, data } = param;
       const sums = [];

src/views/storeManagement/storeDetail.vue

@@ -248,7 +248,10 @@
               </div>
             </van-col>
           </van-row>
-          <van-row gutter="20" style="padding: 16px">
+          <van-row
+            gutter="20"
+            style="padding: 16px"
+            v-if="list.newStoreDisplayPhoto || list.newStoreSignPhoto">
             <van-col span="12" v-if="list.newStoreSignPhoto">
               <div v-if="storeTypePOP">
                 <van-image
@@ -310,7 +313,7 @@
           <van-collapse
             v-model="activeNames"
             class="orderList"
-            v-if="list.approvalStatus == 0 && cityABStore">
+            v-if="list.approvalStatus == 0 && cityABStore && orderList.length">
             <van-collapse-item title="门店下单记录" name="1">
               <div class="orderItem" v-for="(item, index) in orderList" :key="index">
                 <div class="orderTitle">
@@ -1659,7 +1662,7 @@ export default {
           .then(() => {});
         return;
       }
-      if (!this.orderList.length) {
+      if (!this.orderList.length && this.list.storeCategory != '126565') {
         this.$notify({ type: 'warning', message: '门店没有系统订单，请根据实际情况下单' });
         return;
       }