chenrui 4 tahun lalu
induk
melakukan
37caaa98c8

+ 1 - 1
src/views/equipmentManage/network/detailsModal.vue

@@ -27,7 +27,7 @@
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">经度:</p>
-          <p class="item-main">{{ detailsData.lon }}</p>
+          <p class="item-main">{{ detailsData.lng }}</p>
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">投递时间段:</p>

+ 5 - 5
src/views/equipmentManage/network/editModal.vue

@@ -66,10 +66,10 @@
         <a-col :span="10">
           <a-form-item label="经度" :label-col="{ span: 10 }" :wrapper-col="{ span: 14 }">
             <a-input
-              id="network-edit-lon"
+              id="network-edit-lng"
               v-decorator="[
-                'formData.lon',
-                { initialValue: formData.lon, getValueFromEvent: $filterEmpty, rules: [
+                'formData.lng',
+                { initialValue: formData.lng, getValueFromEvent: $filterEmpty, rules: [
                   { required: true, message: '请输入经度' },
                   { pattern: /^[\-\+]?(0?\d{1,2}\.\d{1,8}|1[0-7]?\d{1}\.\d{1,8}|180\.0{1,8})$/, message: '请输入正确的经度,整数部分为0~180,必须输入1到8位小数' }
                 ] }
@@ -156,7 +156,7 @@ export default {
         districtCode: null, // 区
         address: '', //  详细地址
         lat: '', //  纬度
-        lon: '', //  经度
+        lng: '', //  经度
         goldExRuleNo: undefined, //  兑换规则
         deliveryTimeRuleNo: undefined //  投递时间段
       },
@@ -181,7 +181,7 @@ export default {
           this.form.setFieldsValue({ 'formData.name': res.data.name })
           this.form.setFieldsValue({ 'formData.address': res.data.address })
           this.form.setFieldsValue({ 'formData.lat': res.data.lat })
-          this.form.setFieldsValue({ 'formData.lon': res.data.lon })
+          this.form.setFieldsValue({ 'formData.lng': res.data.lng })
           this.form.setFieldsValue({ 'formData.goldExRuleNo': res.data.goldExRuleNo })
           this.form.setFieldsValue({ 'formData.deliveryTimeRuleNo': res.data.deliveryTimeRuleNo })
         }

+ 7 - 2
src/views/shop/orderDetail.vue

@@ -14,7 +14,7 @@
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">订单编号:</p>
-          <p class="item-main">{{ orderDetail.orderNo }}</p>
+          <p class="item-main">{{ orderDetail.orderSn }}</p>
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">订单总额:</p>
@@ -54,9 +54,11 @@
           <a-tab-pane v-for="item in orderDetail.officialPartnerOrderList" :key="item.officialPartnerNo" :tab="item.officialPartner.name"></a-tab-pane>
         </a-tabs>
         <!-- 商品订单 -->
-        <div v-if="orderData">
+        <div v-if="orderData && orderData.orderGoodsList">
           <!-- 待发货 -->
           <GoodsOrder type="orderGoods" :orderData="orderData.orderGoodsList" :isReset="isReset" @sendGoods="sendGoods" />
+        </div>
+        <div v-if="orderData && orderData.orderExpressList">
           <!-- 已发货 -->
           <GoodsOrder v-for="(item, index) in orderData.orderExpressList" :key="index" type="express" :orderData="item" />
         </div>
@@ -118,7 +120,10 @@ export default {
     },
     //  提交物流
     handleSubmit (form) {
+      this.isReset = false
       form.orderGoodsNoList = this.orderGoodsNoList
+      form.orderNo = this.orderDetail.orderNo
+      form.officialPartnerNo = this.officialPartnerNo
       orderExpressSend(form).then(res => {
         if (res.status == 200) {
           this.isReset = true