From-wh пре 2 година
родитељ
комит
2fa86e3b53

+ 1 - 1
template/admin/src/pages/order/orderList/components/tableList.vue

@@ -653,11 +653,11 @@ export default {
     // 发送货
     // 发送货
     sendOrder(row) {
     sendOrder(row) {
       this.$refs.send.total_num = row.total_num;
       this.$refs.send.total_num = row.total_num;
+      this.virtual_type = row.virtual_type;
       this.$refs.send.modals = true;
       this.$refs.send.modals = true;
       this.orderId = row.id;
       this.orderId = row.id;
       this.status = row._status;
       this.status = row._status;
       this.pay_type = row.pay_type;
       this.pay_type = row.pay_type;
-      this.virtual_type = row.virtual_type;
       this.$refs.send.getList();
       this.$refs.send.getList();
       this.$refs.send.getDeliveryList();
       this.$refs.send.getDeliveryList();
       this.$nextTick((e) => {
       this.$nextTick((e) => {

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

@@ -235,6 +235,21 @@
             <Col span="12" class="fontColor2">{{ orderDatalist.orderInfo.mark }}</Col>
             <Col span="12" class="fontColor2">{{ orderDatalist.orderInfo.mark }}</Col>
           </Row>
           </Row>
         </div>
         </div>
+        <div v-if="orderDatalist.orderInfo.refund_type > 0">
+          <Divider style="margin: 20px 0 !important" />
+          <div class="ivu-description-list-title">售后信息</div>
+          <Row class="mb10">
+            <Col span="12">备注:{{ orderDatalist.orderInfo.refund_reason }}</Col>
+          </Row>
+          <Row class="mb10">
+            <Col span="12">
+              <div class="pic">
+                <div v-for="(img, i) in orderDatalist.orderInfo.refund_img" :key="i" class="img">
+                  <img v-viewer :src="img" alt="" />
+                </div></div
+            ></Col>
+          </Row>
+        </div>
       </Card>
       </Card>
     </Drawer>
     </Drawer>
     <Modal v-model="modal2" scrollable title="物流查询" width="350" class="order_box2">
     <Modal v-model="modal2" scrollable title="物流查询" width="350" class="order_box2">

+ 19 - 11
template/admin/src/pages/order/orderList/handle/orderSend.vue

@@ -157,10 +157,11 @@
             </template>
             </template>
           </i-table>
           </i-table>
         </FormItem>
         </FormItem>
-        <FormItem label="寄件金额计算:" v-if="selectData.length">
-          <Button @click="watchPrice">立即计算</Button>
-        </FormItem>
       </div>
       </div>
+      <FormItem label="寄件金额计算:">
+        <span class="red">{{ sendPrice }}</span>
+        <a class="ml10" @click="watchPrice">立即计算</a>
+      </FormItem>
     </Form>
     </Form>
     <div slot="footer">
     <div slot="footer">
       <Button @click="cancel">取消</Button>
       <Button @click="cancel">取消</Button>
@@ -197,11 +198,6 @@ export default {
     pay_type: String,
     pay_type: String,
     virtual_type: Number,
     virtual_type: Number,
   },
   },
-  watch: {
-    orderId(val) {
-      if (this.virtual_type == 3) this.formItem.type = '3';
-    },
-  },
   data() {
   data() {
     return {
     return {
       orderStatus: 0,
       orderStatus: 0,
@@ -291,6 +287,7 @@ export default {
       ],
       ],
       selectData: [],
       selectData: [],
       serviceTypeList: [],
       serviceTypeList: [],
+      sendPrice: 0,
     };
     };
   },
   },
   watch: {
   watch: {
@@ -298,6 +295,9 @@ export default {
       if (newVal) {
       if (newVal) {
       }
       }
     },
     },
+    virtual_type(val) {
+      if (this.virtual_type == 3) this.formItem.type = '3';
+    },
   },
   },
   mounted() {
   mounted() {
     this.kuaidiComsList(1);
     this.kuaidiComsList(1);
@@ -322,9 +322,14 @@ export default {
           cart_num: v.num || v.surplus_num,
           cart_num: v.num || v.surplus_num,
         });
         });
       });
       });
-      orderPrice(data).then((res) => {
-        console.log(res);
-      });
+      orderPrice(data)
+        .then((res) => {
+          console.log(res);
+          this.sendPrice = res.data.price;
+        })
+        .catch((err) => {
+          this.$Message.error(err.msg);
+        });
     },
     },
     selectOne(data) {
     selectOne(data) {
       this.selectData = data;
       this.selectData = data;
@@ -343,6 +348,9 @@ export default {
             this.manyFormValidate.push(res.data[key]);
             this.manyFormValidate.push(res.data[key]);
           });
           });
         });
         });
+      } else {
+        this.formItem.cart_ids = [];
+        this.selectData = [];
       }
       }
     },
     },
     changeRadio(o) {
     changeRadio(o) {

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

@@ -568,13 +568,13 @@ export default {
       getDataInfoNew(id)
       getDataInfoNew(id)
         .then(async (res) => {
         .then(async (res) => {
           this.orderDatalist = res.data;
           this.orderDatalist = res.data;
-          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 = [];
-            }
-          }
+          // if (this.orderDatalist.orderInfo.refund_img.length) {
+          //   try {
+          //     this.orderDatalist.orderInfo.refund_img = this.orderDatalist.orderInfo.refund_img;
+          //   } catch (e) {
+          //     this.orderDatalist.orderInfo.refund_img = [];
+          //   }
+          // }
           this.$nextTick((e) => {
           this.$nextTick((e) => {
             this.$refs.detailss.modals = true;
             this.$refs.detailss.modals = true;
           });
           });