Merge branch 'feature_20241014_同城店铺新建流程重构' into uat

src/views/storeManagement/storeDetail.vue

@@ -17,12 +17,12 @@
                   </span>
                 </template>
                 <!--下首单专用接口，只有在未结案、没有订单调用 -->
-                <span
+                <!-- <span
                   v-if="!orderList.length"
                   style="color: #0057ba; margin-left: 10px"
                   @click="placeOrderFn"
                   >去下单
-                </span>
+                </span> -->
               </template>
             </template>
             <template v-else>
@@ -364,26 +364,30 @@
         <!-- 正常查看详情状态 未结案并且未提交状态下可关闭门店、提交审核 -->
         <van-row
           gutter="20"
+          class="approvalBtnBox"
           v-else-if="
             list.approvalStatus == 0 &&
             list.processApprovalStatus == 0 &&
             list.updatable &&
             cityABStore
           ">
-          <van-col span="12">
-            <van-button round type="default" style="width: 100%" @click="valid"
-              >撤销建店</van-button
-            >
-          </van-col>
-          <van-col span="12"
-            ><van-button
+          <div class="approvalBtn">
+            <van-button round type="danger" style="width: 100%" @click="valid"
+              >撤销建店
+            </van-button>
+          </div>
+          <div class="approvalBtn">
+            <van-button
               round
               type="info"
               style="width: 100%; background-color: #0057ba"
               @click="submitApprovalFun"
               >提交审核</van-button
             >
-          </van-col>
+          </div>
+          <div class="approvalBtn" v-if="!orderList.length">
+            <van-button round type="default" style="width: 100%" @click="valid">去下单 </van-button>
+          </div>
         </van-row>
       </div>
       <van-dialog
@@ -1248,7 +1252,7 @@ export default {
             this.lon = res.data.lon;
           }
           this.list = res.data;
-          this.displayImg = this.list.imgSed.split(',');
+          this.displayImg = this.list.imgSed != '' ? this.list.imgSed.split(',') : [];
           if (this.list.storeCategory == '129081' || this.list.storeCategory == '10131') {
             this.cityABStore = true;
           } else {
@@ -1754,6 +1758,17 @@ export default {
     border-radius: 50%;
   }
 }
+.approvalBtnBox {
+  display: flex;
+  .approvalBtn {
+    flex: 1;
+    margin: 0 3px;
+    .van-button--danger {
+      background-color: #ee0a24 !important;
+      border: 1px solid #ee0a24 !important;
+    }
+  }
+}
 </style>
 <style lang="scss">
 .searchDiv {

src/views/storeManagement/storeEdit.vue

@@ -1176,7 +1176,7 @@ export default {
 
         if (res.code == 200) {
           this.fromValue = res.data;
-          this.displayImg = this.fromValue.imgSed.split(',');
+          this.displayImg = this.fromValue.imgSed != '' ? this.fromValue.imgSed.split(',') : [];
           if (this.fromValue.lat != null) {
           } else {
             this.fromValue.lat = '';