Bläddra i källkod

同城店铺新建流程重构

zhujindu 1 år sedan
förälder
incheckning
e7aa3b3874

+ 35 - 22
src/views/signApproval/newStoreApprovalDetail.vue

@@ -183,10 +183,11 @@
           rows="2"
           autosize
           type="textarea"
+          maxlength="300"
           placeholder="请输入退回原因" />
-        <div class="btnBox">
-          <van-button type="primary" round @click="rejectReasonSubmit">提交</van-button>
-        </div>
+      </div>
+      <div class="btnBox">
+        <van-button type="primary" round @click="rejectReasonSubmit">提交</van-button>
       </div>
     </van-popup>
     <!-- 提交审核后退回原因 只有同城分销店显示 -->
@@ -527,27 +528,32 @@ export default {
     // 获取门店订单
     getStoreOrderList(storeCode) {
       getOrderByStoreCode({ storeCode: storeCode }).then((res) => {
-        if (res.code == 200) {
-          let orderList = res.data.ORDERS;
-          let orderMap = new Map();
-          for (let i = 0; i < orderList.length; i++) {
-            if (orderMap.has(orderList[i].ORDERID)) {
-              orderMap.get(orderList[i].ORDERID).productDetail.push(orderList[i]);
-            } else {
-              let orderObj = {
-                ORDERID: orderList[i].ORDERID,
-                ORDERDATE: orderList[i].ORDERDATE,
-                STATUS_DESCR: orderList[i].STATUS_DESCR,
-                productDetail: [orderList[i]],
-              };
-              orderMap.set(orderList[i].ORDERID, orderObj);
+        if (res.code == 200 && res.data) {
+          let orderList = res.data.ORDERS || [];
+          if (orderList.length) {
+            let orderMap = new Map();
+            for (let i = 0; i < orderList.length; i++) {
+              if (orderMap.has(orderList[i].ORDERID)) {
+                orderMap.get(orderList[i].ORDERID).productDetail.push(orderList[i]);
+              } else {
+                let orderObj = {
+                  ORDERID: orderList[i].ORDERID,
+                  ORDERDATE: orderList[i].ORDERDATE,
+                  STATUS_DESCR: orderList[i].STATUS_DESCR,
+                  productDetail: [orderList[i]],
+                };
+                orderMap.set(orderList[i].ORDERID, orderObj);
+              }
             }
+            let orderListArr = [];
+            for (let value of orderMap.values()) {
+              orderListArr.push(value);
+            }
+            this.orderList = orderListArr;
+          } else {
+            this.orderList = [];
           }
-          let orderListArr = [];
-          for (let value of orderMap.values()) {
-            orderListArr.push(value);
-          }
-          this.orderList = orderListArr;
+          this.activeNames = ['1'];
         }
       });
     },
@@ -662,6 +668,12 @@ export default {
   }
   .value {
     flex: 1;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    padding-right: 20px;
   }
   .examineDetail {
     width: 70px;
@@ -703,6 +715,7 @@ export default {
     }
   }
   .btnBox {
+    height: 44px;
     button {
       width: 100%;
     }

+ 1 - 0
src/views/storeManagement/storeDetail.vue

@@ -1629,6 +1629,7 @@ export default {
     display: -webkit-box;
     -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;
+    padding-right: 20px;
   }
   .examineDetail {
     width: 70px;