瀏覽代碼

feat PC代码优化;bugfix

Funny 2 年之前
父節點
當前提交
e0873cb8a1

+ 7 - 0
src/components/Home.vue

@@ -362,6 +362,13 @@ export default {
 </script>
 
 <style lang="scss" scoped="scoped">
+/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: #fc7200;
+  color: #fff !important;
+}
+/deep/ .el-pagination.is-background .el-pager li:hover:not(.disabled) {
+  color: #fc7200;
+}
 /deep/ .el-input__inner {
   padding-right: 30px;
 }

+ 28 - 22
src/components/manualCreate.vue

@@ -102,7 +102,7 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="发单备注">
-            <el-input type="text" size="small" v-model="form.takeRemark" maxlength="20" placeholder="请添加备注信息,最多输入20个字!" clearable show-word-limit>
+            <el-input type="text" size="small" v-model="form.takeRemark" maxlength="80" placeholder="请添加备注信息,最多输入20个字!" clearable show-word-limit>
             </el-input>
           </el-form-item>
         </div>
@@ -131,11 +131,14 @@
           </el-input>
         </div>
         <div class="shop-list">
-          <div @dblclick="chooseShop" @click="curIdx = index" :class=" curIdx === index ? 'shop-item active' : 'shop-item'" v-for="(shop,index) in addressList" :key="index">
-            <div class="name">{{shop.name}}</div>
-            <div class="phone">{{shop.contact + ' ' + shop.phone}}</div>
-            <div class="address">{{shop.districtName + shop.address}}</div>
-          </div>
+          <template v-if="addressList.length">
+            <div @dblclick="chooseShop" @click="curIdx = index" :class=" curIdx === index ? 'shop-item active' : 'shop-item'" v-for="(shop,index) in addressList" :key="index">
+              <div class="name">{{shop.name}}</div>
+              <div class="phone">{{shop.contact + ' ' + shop.phone}}</div>
+              <div class="address">{{shop.districtName + shop.address}}</div>
+            </div>
+          </template>
+          <el-empty v-else :description="`暂无可用${addressType === 1 ? '门店' : '地址'}`"></el-empty>
         </div>
         <span slot="footer" class="dialog-footer">
           <el-button size="small" @click="showChooseShop = false">取 消</el-button>
@@ -291,7 +294,7 @@ export default {
   methods: {
     getOrderDetail() {
       getOrderDetail({ orderId: this.orderId }).then((res) => {
-        // console.log("再来一单订单详情:", res);
+        console.log("再来一单订单详情:", res);
         if (res.code === 200) {
           let data = res.data;
           let nowTime = new Date().getTime();
@@ -312,9 +315,19 @@ export default {
                 showCancelButton: false,
                 center: true,
               }
-            )
-              .then(() => {})
-              .catch(() => {});
+            );
+          }
+          let receiptPhone = data.receiptPhone;
+          let receiptExtension = data.receiptExtension;
+          let sendPhone = data.sendPhone;
+          let sendExtension = data.sendExtension;
+          if (data.receiptPhone.length > 11) {
+            receiptPhone = data.receiptPhone.slice(0, 11);
+            receiptExtension = data.receiptPhone.slice(12);
+          }
+          if (data.sendPhone.length > 11) {
+            sendPhone = data.sendPhone.slice(0, 11);
+            sendExtension = data.sendPhone.slice(12);
           }
           this.form = {
             createType: "",
@@ -334,8 +347,8 @@ export default {
               isDefault: "",
               lat: data.receiptLat,
               lng: data.receiptLng,
-              phone: data.receiptPhone,
-              extension: data.receiptExtension ?? "",
+              phone: receiptPhone,
+              extension: receiptExtension ?? "",
               provinceName: data.receiptProvinceName || data.sendProvinceName,
               street: data.receiptStreet,
               type: "",
@@ -350,8 +363,8 @@ export default {
               id: data.sendAddressId,
               lat: data.sendLat,
               lng: data.sendLng,
-              phone: data.sendPhone,
-              extension: data.sendExtension ?? "",
+              phone: sendPhone,
+              extension: sendExtension ?? "",
               provinceName: data.sendProvinceName,
               street: data.sendStreet,
             },
@@ -376,7 +389,6 @@ export default {
     },
     getResource() {
       getResource().then((res) => {
-        // console.log("物品来源:", res);
         if (res.code === 200) {
           this.goodsSource = res.data;
           this.form.platformType = this.goodsSource[0].type;
@@ -452,7 +464,6 @@ export default {
             this.curIdx = this.addressList.findIndex((v) => {
               return v.id === shopId;
             });
-            console.log("sendAddress1", sendAddress);
             Object.keys(this.form.sendAddress).map((v) => {
               this.form.sendAddress[v] = sendAddress ? sendAddress[v] : "";
             });
@@ -475,7 +486,6 @@ export default {
                 return v.isDefault;
               });
             }
-            console.log("sendAddress2", sendAddress);
             Object.keys(this.form.sendAddress).map((v) => {
               this.form.sendAddress[v] = sendAddress ? sendAddress[v] : "";
             });
@@ -488,7 +498,6 @@ export default {
             this.curIdx = this.addressList.findIndex((v) => {
               return v.id === this.personalReceiptAddressId;
             });
-            console.log("receiptAddress", receiptAddress);
             Object.keys(this.form.receiptAddress).map((v) => {
               this.form.receiptAddress[v] = receiptAddress
                 ? receiptAddress[v]
@@ -586,14 +595,12 @@ export default {
           message: "请填写平台流水号!",
         });
       }
-      console.log("重量1:", this.form.weight);
 
       let reg = new RegExp(/^[1-9]\d*$/g);
       if (
         !reg.test(Number(this.form.weight)) ||
         Number(this.form.weight) > 50
       ) {
-        console.log("重量:", this.form.weight);
         this.$refs.weight.focus();
         return this.$message({
           type: "error",
@@ -654,7 +661,6 @@ export default {
                   });
                 })
                 .catch((action) => {
-                  console.log("action:", action);
                   if (action === "close") {
                     return;
                   } else {
@@ -948,7 +954,7 @@ export default {
     }
   }
   .shop-list {
-    height: 60vh;
+    height: 55vh;
     overflow: scroll;
     .shop-item {
       border: 1px solid #999;

+ 1 - 4
src/components/orderComponents/orderList.vue

@@ -230,7 +230,7 @@
         </div>
       </div>
       <div class="text-area">
-        <el-input show-word-limit :rows="4" type="textarea" resize="none" :maxlength="50" placeholder="请输入其他原因" v-model="cancelReason"></el-input>
+        <el-input :disabled="reasonIndex < 8" show-word-limit :rows="4" type="textarea" resize="none" :maxlength="50" placeholder="请输入其他原因" v-model="cancelReason"></el-input>
       </div>
       <div style="text-align: center; margin-top: 20px">
         <el-button @click.stop="cancelStatus = false">取消</el-button>
@@ -1076,9 +1076,6 @@ export default {
     margin-right: 20px;
     margin-bottom: 20px;
     cursor: pointer;
-    &:last-child {
-      color: #d7d7d7;
-    }
     &.active {
       color: #fc7101;
       border-color: #fc7101;

+ 2 - 23
src/components/orderComponents/orderTrack.vue

@@ -21,39 +21,18 @@
       <div class="send-info" v-if="trackOrder.deliveryName">
         <div class="send-tlt">配送信息</div>
         <div class="delivery">
-          <img class="img" :src="trackOrder.deliveryLogo" alt="">
+          <img v-if="trackOrder.deliveryLogo" class="img" :src="trackOrder.deliveryLogo" alt="">
           <div class="con">
             <div class="delivery-top">
               <div class="left">{{trackOrder.shipperName}}</div>
               <div class="right">{{trackOrder.shipperPhone}}</div>
             </div>
-            <div class="delivery-bot">
+            <div class="delivery-bot" v-if="trackOrder.customerPhone">
               <div class="left">{{trackOrder.deliveryName}}客服</div>
               <div class="right">{{ trackOrder.customerPhone }}</div>
             </div>
           </div>
         </div>
-        <!-- <div class="label">
-          <div class="label-tlt">接单平台:</div>
-          <div class="label-right">
-            <img :src="trackOrder.deliveryLogo" class="send-logo" />
-            <span>{{ trackOrder.deliveryName }}</span>
-          </div>
-        </div>
-        <div class="label">
-          <div class="label-tlt">骑手信息:</div>
-          <div class="label-right">
-            <span>{{ trackOrder.shipperName }}({{
-                trackOrder.shipperPhone
-              }})</span>
-          </div>
-        </div>
-        <div class="label">
-          <div class="label-tlt">{{ trackOrder.deliveryName }}客服:</div>
-          <div class="label-right">
-            <span>{{ trackOrder.customerPhone }}</span>
-          </div>
-        </div> -->
         <div class="label">
           <div class="label-tlt">接单时间:</div>
           <div class="label-right">

+ 0 - 1
src/components/shopCompoents/bindDelivery.vue

@@ -442,7 +442,6 @@ export default {
         .children.find((v) => {
           return v.value === this.cityName[1];
         }).label;
-      // console.log("cityName", this.UUData.cityName);
       if (!this.UUData.cityName.trim()) {
         return this.$message({
           message: "城市不能为空",

+ 3 - 0
src/components/shopCompoents/bindTakeOut.vue

@@ -478,6 +478,9 @@ export default {
             font-weight: 500;
             line-height: 25px;
             color: #333333;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            overflow: hidden;
           }
           img {
             width: 30px;

+ 1 - 1
src/views/home.vue

@@ -122,7 +122,7 @@ export default {
   justify-content: flex-end;
   position: relative;
   width: 100%;
-  height: 80px;
+  height: 80px !important;
 }
 
 .el-main {