From-wh 2 лет назад
Родитель
Сommit
17057a67c5

+ 2 - 2
template/admin/src/pages/marketing/storeIntegralOrder/handle/orderSend.vue

@@ -8,7 +8,7 @@
           <Radio label="3">虚拟</Radio>
         </RadioGroup>
       </FormItem>
-      <FormItem v-show="formItem.type === '1' && export_open" label="发货类型:">
+      <FormItem v-show="formItem.type == '1' && export_open" label="发货类型:">
         <RadioGroup v-model="formItem.express_record_type" @on-change="changeExpress">
           <Radio label="1">手动填写</Radio>
           <Radio label="2">电子面单打印</Radio>
@@ -142,7 +142,7 @@ export default {
       //     ]
       // },
       temp: {},
-      export_open: true,
+      export_open: false,
     };
   },
   methods: {

+ 3 - 3
template/admin/src/pages/order/orderList/handle/orderDetails.vue

@@ -8,8 +8,8 @@
           <Col span="12">收货人:{{ orderDatalist.orderInfo.real_name }}</Col>
         </Row>
         <Row class="mb10">
-          <Col span="12">联系电话:{{ orderDatalist.orderInfo.user_phone }}</Col>
-          <Col span="12">收货地址:{{ orderDatalist.orderInfo.user_address }}</Col>
+          <Col span="12">联系电话:{{ orderDatalist.orderInfo.user_phone || '' }}</Col>
+          <Col span="12">收货地址:{{ orderDatalist.orderInfo.user_address || '' }}</Col>
         </Row>
         <Divider style="margin: 20px 0 !important" />
         <div class="ivu-description-list-title">订单信息</div>
@@ -18,7 +18,7 @@
           <Col span="12" class="fontColor1"
             >订单状态:{{ orderDatalist.orderInfo._status._title }}
             {{
-              orderDatalist.orderInfo.refund.length
+              orderDatalist.orderInfo.refund && orderDatalist.orderInfo.refund.length
                 ? orderDatalist.orderInfo.is_all_refund
                   ? '退款中'
                   : '部分退款中'

+ 5 - 3
template/admin/src/pages/order/refund/index.vue

@@ -567,15 +567,17 @@ export default {
     getData(id) {
       getDataInfoNew(id)
         .then(async (res) => {
-          this.$refs.detailss.modals = true;
           this.orderDatalist = res.data;
-          if (this.orderDatalist.orderInfo.refund_img) {
+          if (this.orderDatalist.orderInfo.refund_img.length) {
             try {
               this.orderDatalist.orderInfo.refund_img = JSON.parse(this.orderDatalist.orderInfo.refund_img);
             } catch (e) {
               this.orderDatalist.orderInfo.refund_img = [];
             }
           }
+          this.$nextTick((e) => {
+            this.$refs.detailss.modals = true;
+          });
         })
         .catch((res) => {
           this.$Message.error(res.msg);
@@ -668,7 +670,7 @@ export default {
   position: relative;
 }
 .ivu-form-item{
-  
+
 }
 .QRpic {
   width: 180px;