xyvcard-order 0.0.20 → 0.0.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.mjs CHANGED
@@ -2582,7 +2582,7 @@ const Ti = {
2582
2582
  }
2583
2583
  };
2584
2584
  }
2585
- }, bi = () => import("./info-CO5qQeDW.mjs"), Ri = [
2585
+ }, bi = () => import("./info-Bnfa8Ksd.mjs"), Ri = [
2586
2586
  {
2587
2587
  path: "/raworder",
2588
2588
  component: Mr,
@@ -2658,7 +2658,7 @@ const Ti = {
2658
2658
  paymentCouponPrice: "电子券抵扣金额",
2659
2659
  orderPrice: "支付金额",
2660
2660
  paymentWay: "付款方式",
2661
- deliveryWay: "发货类型",
2661
+ deliveryWay: "配送方式",
2662
2662
  sellPrice: "销售单价",
2663
2663
  sellPriceRequired: "请输入销售单价",
2664
2664
  deliver: "发货",
@@ -2743,7 +2743,7 @@ function Ni(e) {
2743
2743
  let r = e.global.getLocaleMessage("en");
2744
2744
  r = Dt(r, xi), e.global.setLocaleMessage("zh-cn", t), e.global.setLocaleMessage("en", r);
2745
2745
  }
2746
- const Wi = /* @__PURE__ */ Object.assign({ "./views/order/order-appraises/index.vue": () => import("./index-D-mR7O2p.mjs"), "./views/order/order-appraises/reply.vue": () => import("./reply-BWKE7lzJ.mjs"), "./views/order/order-info/deliver.vue": () => import("./deliver-gP7_mD6E.mjs"), "./views/order/order-info/edit.vue": () => import("./edit-4YqpytcB.mjs"), "./views/order/order-info/index.vue": () => import("./index-CcsE0S8M.mjs"), "./views/order/order-info/info.vue": () => import("./info-CO5qQeDW.mjs"), "./views/order/order-info/orderList.vue": () => import("./orderList-BoclXj0f.mjs"), "./views/order/order-info/viewLogist.vue": () => import("./viewLogist-CHiDaaZx.mjs"), "./views/order/order-refunds/index.vue": () => import("./index-C8qclRvX.mjs"), "./views/order/order-refunds/info.vue": () => import("./info-BSPyLwcG.mjs"), "./views/order/order-refunds/review.vue": () => import("./review-DH5466Un.mjs") }), Ci = {
2746
+ const Wi = /* @__PURE__ */ Object.assign({ "./views/order/order-appraises/index.vue": () => import("./index-D-mR7O2p.mjs"), "./views/order/order-appraises/reply.vue": () => import("./reply-BWKE7lzJ.mjs"), "./views/order/order-info/deliver.vue": () => import("./deliver-gP7_mD6E.mjs"), "./views/order/order-info/edit.vue": () => import("./edit-4YqpytcB.mjs"), "./views/order/order-info/index.vue": () => import("./index-CcsE0S8M.mjs"), "./views/order/order-info/info.vue": () => import("./info-Bnfa8Ksd.mjs"), "./views/order/order-info/orderList.vue": () => import("./orderList-BoclXj0f.mjs"), "./views/order/order-info/viewLogist.vue": () => import("./viewLogist-CHiDaaZx.mjs"), "./views/order/order-refunds/index.vue": () => import("./index-C8qclRvX.mjs"), "./views/order/order-refunds/info.vue": () => import("./info-BSPyLwcG.mjs"), "./views/order/order-refunds/review.vue": () => import("./review-DH5466Un.mjs") }), Ci = {
2747
2747
  install(e) {
2748
2748
  vr(Wi, 7), Ni(Yr), e.use(Ti), Dr(Ri);
2749
2749
  }
@@ -1,8 +1,8 @@
1
- import { defineComponent as J, getCurrentInstance as X, ref as m, reactive as O, onMounted as Z, computed as x, resolveComponent as f, resolveDirective as ee, createElementBlock as b, openBlock as u, createVNode as o, createBlock as V, createCommentVNode as p, withCtx as a, createElementVNode as i, toDisplayString as l, unref as r, createTextVNode as I, withDirectives as S } from "vue";
1
+ import { defineComponent as J, getCurrentInstance as X, ref as m, reactive as Y, onMounted as Z, computed as x, resolveComponent as f, resolveDirective as ee, createElementBlock as I, openBlock as u, createVNode as o, createBlock as V, createCommentVNode as p, withCtx as a, createElementVNode as i, toDisplayString as l, unref as n, createTextVNode as b, withDirectives as S } from "vue";
2
2
  import { useRouter as te, useRoute as le } from "vue-router";
3
3
  import { useI18n as oe } from "vue-i18n";
4
- import { fileApi as $, routerUtil as ne } from "jmash-core";
5
- import { D as s, C as g } from "./index-CIvF2jlB.mjs";
4
+ import { fileApi as g, routerUtil as ne } from "jmash-core";
5
+ import { D as s, C as y } from "./index-CIvF2jlB.mjs";
6
6
  import { o as re } from "./index-DRFiw9Ec.mjs";
7
7
  import { _ as ie } from "./edit.vue_vue_type_script_setup_true_lang-D2vJHeGo.mjs";
8
8
  import { _ as ae } from "./deliver.vue_vue_type_script_setup_true_lang-bpU2ikKn.mjs";
@@ -10,7 +10,7 @@ import { _ as de } from "./viewLogist.vue_vue_type_script_setup_true_lang-CkSqEu
10
10
  const se = { class: "app-container" }, ue = { class: "shopName" }, me = { key: 0 }, pe = ["onClick"], fe = ["onClick"], ce = ["onClick"], _e = /* @__PURE__ */ J({
11
11
  __name: "info",
12
12
  setup(ve) {
13
- const { t: D } = oe(), R = te(), N = le(), { proxy: q } = X(), U = m(), y = m(), P = m(!1), M = m(""), T = m("");
13
+ const { t: D } = oe(), q = te(), N = le(), { proxy: w } = X(), T = m(), h = m(), P = m(!1), U = m(""), M = m("");
14
14
  s.shopBizDict.useValues(), s.phoneModelDict.useValues();
15
15
  const c = m({
16
16
  title: D("orderInfo.update"),
@@ -19,80 +19,82 @@ const se = { class: "app-container" }, ue = { class: "shopName" }, me = { key: 0
19
19
  title: D("orderInfo.deliver"),
20
20
  visible: !1
21
21
  });
22
- let h = O({}), B = O({});
23
- function Y(e) {
24
- h.orderId = e.orderId, c.value.visible = !0;
25
- }
22
+ let $ = Y({}), B = Y({});
26
23
  function A(e) {
27
- B.itemId = e.itemId, h.orderId = e.orderId, v.value.visible = !0;
24
+ $.orderId = e.orderId, c.value.visible = !0;
28
25
  }
29
26
  function j(e) {
27
+ B.itemId = e.itemId, $.orderId = e.orderId, v.value.visible = !0;
28
+ }
29
+ function z(e) {
30
30
  e.mobileEncrypt = !e.mobileEncrypt;
31
31
  }
32
- function z() {
33
- ne.closeTagView(N.fullPath, R, !1);
32
+ function H() {
33
+ ne.closeTagView(N.fullPath, q, !1);
34
34
  }
35
- function W(e) {
36
- e && w();
35
+ function L(e) {
36
+ e && O();
37
37
  }
38
- function w() {
38
+ function O() {
39
39
  re.findById({ orderId: N.query.orderId }).then(({ data: e }) => {
40
- y.value = [e], U.value = e.shopId;
40
+ h.value = [e], T.value = e.shopId;
41
41
  });
42
42
  }
43
43
  Z(() => {
44
- w();
44
+ O();
45
45
  });
46
- const H = x(
47
- () => (y.value || []).flatMap(
46
+ const R = x(
47
+ () => (h.value || []).flatMap(
48
48
  (e) => {
49
49
  var d;
50
- return (((d = e == null ? void 0 : e.orderItemList) == null ? void 0 : d.results) || []).map((k) => ({
50
+ return (((d = e == null ? void 0 : e.orderItemList) == null ? void 0 : d.results) || []).map((E) => ({
51
51
  orderStatus: e.orderStatus,
52
- ...k
52
+ postType: e.postType,
53
+ ...E
53
54
  }));
54
55
  }
55
56
  )
56
57
  );
57
- function K(e) {
58
- M.value = e.orderId, T.value = e.itemId, P.value = !0;
58
+ console.log(R);
59
+ function G(e) {
60
+ U.value = e.orderId, M.value = e.itemId, P.value = !0;
59
61
  }
60
- function Q() {
62
+ function K() {
61
63
  P.value = !1;
62
64
  }
63
65
  return (e, d) => {
64
- const k = f("el-button"), n = f("el-table-column"), E = f("el-table"), L = f("el-image"), F = f("jmash-mobileIns-component"), G = f("el-card"), _ = ee("hasPerm");
65
- return u(), b("div", se, [
66
- o(G, { shadow: "never" }, {
66
+ const E = f("el-button"), r = f("el-table-column"), k = f("el-table"), W = f("el-image"), Q = f("jmash-mobileIns-component"), F = f("el-card"), _ = ee("hasPerm");
67
+ return u(), I("div", se, [
68
+ o(F, { shadow: "never" }, {
67
69
  header: a(() => [
68
- o(k, {
70
+ o(E, {
69
71
  type: "primary",
70
- onClick: z
72
+ onClick: H
71
73
  }, {
72
74
  default: a(() => [
73
- I(l(e.$t("common.back")), 1)
75
+ b(l(e.$t("common.back")), 1)
74
76
  ]),
75
77
  _: 1
76
78
  })
77
79
  ]),
78
80
  default: a(() => [
79
81
  d[2] || (d[2] = i("div", { class: "title-content" }, "基本信息", -1)),
80
- i("div", ue, l(e.$t("orderInfo.shopName")) + ":" + l(r(s).shopBizDict.getValue(U.value)), 1),
81
- o(E, {
82
- data: y.value,
82
+ i("div", ue, l(e.$t("orderInfo.shopName")) + ":" + l(n(s).shopBizDict.getValue(T.value)), 1),
83
+ o(k, {
84
+ data: h.value,
83
85
  border: ""
84
86
  }, {
85
87
  default: a(() => [
86
- o(n, {
88
+ o(r, {
87
89
  label: e.$t("orderInfo.orderItemList")
88
90
  }, {
89
91
  default: a(({ row: t }) => [
90
92
  i("div", null, l(e.$t("orderInfo.orderCode")) + ": " + l(t.orderCode), 1),
91
- i("div", null, l(e.$t("orderInfo.createTime")) + ": " + l(r(q).$moment.formatDate(t.createTime, "YYYY-MM-DD HH:mm:ss")), 1)
93
+ i("div", null, l(e.$t("orderInfo.createTime")) + ": " + l(n(w).$moment.formatDate(t.createTime, "YYYY-MM-DD HH:mm:ss")), 1)
92
94
  ]),
93
95
  _: 1
94
96
  }, 8, ["label"]),
95
- o(n, {
97
+ o(r, {
96
98
  label: e.$t("orderInfo.salesPrice")
97
99
  }, {
98
100
  default: a(({ row: t }) => [
@@ -103,23 +105,23 @@ const se = { class: "app-container" }, ue = { class: "shopName" }, me = { key: 0
103
105
  ]),
104
106
  _: 1
105
107
  }, 8, ["label"]),
106
- o(n, {
108
+ o(r, {
107
109
  label: e.$t("orderInfo.status")
108
110
  }, {
109
111
  default: a(({ row: t }) => [
110
- i("div", null, l(e.$t("orderInfo.orderStatus")) + ": " + l(r(s).orderStatusEnum.getEnumValue(t.orderStatus)), 1),
111
- i("div", null, l(e.$t("orderInfo.paymentStatus")) + ": " + l(r(s).paymentStatusEnum.getEnumValue(t.paymentStatus)), 1),
112
- i("div", null, l(e.$t("orderInfo.appraisesStatus")) + ": " + l(r(s).appraisesStatus.getValue(t.appraisesStatus)), 1),
113
- i("div", null, l(e.$t("orderInfo.deliveryWay")) + ": " + l(r(s).deliveryWayEnum.getEnumValue(t.deliveryWay)), 1),
114
- i("div", null, l(e.$t("orderInfo.paymentWay")) + ": " + l(r(s).paymentWayEnum.getEnumValue(t.paymentWay)), 1)
112
+ i("div", null, l(e.$t("orderInfo.orderStatus")) + ": " + l(n(s).orderStatusEnum.getEnumValue(t.orderStatus)), 1),
113
+ i("div", null, l(e.$t("orderInfo.paymentStatus")) + ": " + l(n(s).paymentStatusEnum.getEnumValue(t.paymentStatus)), 1),
114
+ i("div", null, l(e.$t("orderInfo.appraisesStatus")) + ": " + l(n(s).appraisesStatus.getValue(t.appraisesStatus)), 1),
115
+ i("div", null, l(e.$t("orderInfo.deliveryWay")) + ": " + l(n(s).deliveryWayEnum.getEnumValue(t.deliveryWay)), 1),
116
+ i("div", null, l(e.$t("orderInfo.paymentWay")) + ": " + l(n(s).paymentWayEnum.getEnumValue(t.paymentWay)), 1)
115
117
  ]),
116
118
  _: 1
117
119
  }, 8, ["label"]),
118
- o(n, {
120
+ o(r, {
119
121
  label: e.$t("orderInfo.userMessage")
120
122
  }, {
121
123
  default: a(({ row: t }) => [
122
- I(l(t.userMessage), 1)
124
+ b(l(t.userMessage), 1)
123
125
  ]),
124
126
  _: 1
125
127
  }, 8, ["label"])
@@ -127,25 +129,25 @@ const se = { class: "app-container" }, ue = { class: "shopName" }, me = { key: 0
127
129
  _: 1
128
130
  }, 8, ["data"]),
129
131
  d[3] || (d[3] = i("div", { class: "title-content" }, "商品详情", -1)),
130
- o(E, {
131
- data: H.value,
132
+ o(k, {
133
+ data: R.value,
132
134
  border: "",
133
135
  style: { width: "100%" }
134
136
  }, {
135
137
  default: a(() => [
136
- o(n, {
138
+ o(r, {
137
139
  prop: "spuName",
138
140
  label: e.$t("orderInfo.spuName"),
139
141
  "min-width": 200
140
142
  }, null, 8, ["label"]),
141
- o(n, {
143
+ o(r, {
142
144
  label: e.$t("orderInfo.picUrl"),
143
145
  "min-width": 120
144
146
  }, {
145
147
  default: a(({ row: t }) => [
146
- o(L, {
147
- src: r($).imageUrl(t.picUrl, 0, 0),
148
- "preview-src-list": [r($).imageUrl(t.picUrl)],
148
+ o(W, {
149
+ src: n(g).imageUrl(t.picUrl, 0, 0),
150
+ "preview-src-list": [n(g).imageUrl(t.picUrl)],
149
151
  "preview-teleported": "",
150
152
  "hide-on-click-modal": "",
151
153
  fit: "contain"
@@ -153,22 +155,22 @@ const se = { class: "app-container" }, ue = { class: "shopName" }, me = { key: 0
153
155
  ]),
154
156
  _: 1
155
157
  }, 8, ["label"]),
156
- o(n, {
158
+ o(r, {
157
159
  prop: "specInfo",
158
160
  label: e.$t("orderInfo.specInfo"),
159
161
  "min-width": 150
160
162
  }, null, 8, ["label"]),
161
- o(n, {
163
+ o(r, {
162
164
  prop: "goodsPrice",
163
165
  label: e.$t("orderInfo.goodsPrice"),
164
166
  "min-width": 90
165
167
  }, null, 8, ["label"]),
166
- o(n, {
168
+ o(r, {
167
169
  prop: "quantity",
168
170
  label: e.$t("orderInfo.quantity"),
169
171
  "min-width": 90
170
172
  }, null, 8, ["label"]),
171
- o(n, {
173
+ o(r, {
172
174
  label: e.$t("orderInfo.salesPriceAndQuantity"),
173
175
  "min-width": 90
174
176
  }, {
@@ -177,32 +179,32 @@ const se = { class: "app-container" }, ue = { class: "shopName" }, me = { key: 0
177
179
  ]),
178
180
  _: 1
179
181
  }, 8, ["label"]),
180
- o(n, {
182
+ o(r, {
181
183
  prop: "freightPrice",
182
184
  label: e.$t("orderInfo.freightPrice"),
183
185
  "min-width": 90
184
186
  }, null, 8, ["label"]),
185
- o(n, {
187
+ o(r, {
186
188
  prop: "paymentCouponPrice",
187
189
  label: e.$t("orderInfo.paymentCouponPrice"),
188
190
  "min-width": 130
189
191
  }, null, 8, ["label"]),
190
- o(n, {
192
+ o(r, {
191
193
  prop: "paymentPrice",
192
194
  label: e.$t("orderInfo.paymentPrice"),
193
195
  "min-width": 90
194
196
  }, null, 8, ["label"]),
195
- o(n, {
197
+ o(r, {
196
198
  label: e.$t("orderInfo.customInfo"),
197
199
  "min-width": 100
198
200
  }, {
199
201
  default: a(({ row: t }) => [
200
- i("div", null, l(r(s).phoneModelDict.getValue(t.customInfo.split(",")[0])), 1),
201
- t.customInfo ? (u(), b("div", me, [
202
- o(L, {
203
- src: r($).imageUrl(t.customInfo.split(",")[1], 50, 0),
202
+ i("div", null, l(n(s).phoneModelDict.getValue(t.customInfo.split(",")[0])), 1),
203
+ t.customInfo ? (u(), I("div", me, [
204
+ o(W, {
205
+ src: n(g).imageUrl(t.customInfo.split(",")[1], 50, 0),
204
206
  "preview-src-list": [
205
- r($).imageUrl(t.customInfo.split(",")[1])
207
+ n(g).imageUrl(t.customInfo.split(",")[1])
206
208
  ],
207
209
  "preview-teleported": "",
208
210
  "hide-on-click-modal": "",
@@ -212,27 +214,27 @@ const se = { class: "app-container" }, ue = { class: "shopName" }, me = { key: 0
212
214
  ]),
213
215
  _: 1
214
216
  }, 8, ["label"]),
215
- o(n, {
217
+ o(r, {
216
218
  label: e.$t("common.operate"),
217
219
  fixed: "right",
218
220
  width: "90"
219
221
  }, {
220
222
  default: a(({ row: t }) => [
221
- t.orderStatus === r(g).UNPOST ? S((u(), b("span", {
223
+ t.orderStatus === n(y).UNPOST ? S((u(), I("span", {
222
224
  key: 0,
223
225
  class: "el-button-color",
224
- onClick: (C) => A(t)
226
+ onClick: (C) => j(t)
225
227
  }, [
226
- I(l(e.$t("orderInfo.deliver")), 1)
228
+ b(l(e.$t("orderInfo.deliver")), 1)
227
229
  ], 8, pe)), [
228
230
  [_, ["order:order_info:delivery"]]
229
231
  ]) : p("", !0),
230
- t.orderStatus === r(g).UNRECEIVE || t.orderStatus === r(g).COMPLETE ? S((u(), b("span", {
232
+ (t.orderStatus === n(y).UNRECEIVE || t.orderStatus === n(y).COMPLETE) && t.postType === n(y).LOGISTICS_DELIVERY ? S((u(), I("span", {
231
233
  key: 1,
232
234
  class: "el-button-color",
233
- onClick: (C) => K(t)
235
+ onClick: (C) => G(t)
234
236
  }, [
235
- I(l(e.$t("orderInfo.viewLogist")), 1)
237
+ b(l(e.$t("orderInfo.viewLogist")), 1)
236
238
  ], 8, fe)), [
237
239
  [_, ["order:order_logistics:list"]]
238
240
  ]) : p("", !0)
@@ -243,45 +245,45 @@ const se = { class: "app-container" }, ue = { class: "shopName" }, me = { key: 0
243
245
  _: 1
244
246
  }, 8, ["data"]),
245
247
  d[4] || (d[4] = i("div", { class: "title-content" }, "收货及用户信息", -1)),
246
- o(E, {
247
- data: y.value,
248
+ o(k, {
249
+ data: h.value,
248
250
  border: ""
249
251
  }, {
250
252
  default: a(() => [
251
- o(n, {
253
+ o(r, {
252
254
  prop: "userName",
253
255
  label: e.$t("orderInfo.userName"),
254
256
  width: "200"
255
257
  }, null, 8, ["label"]),
256
- o(n, {
258
+ o(r, {
257
259
  prop: "address",
258
260
  label: e.$t("orderInfo.address")
259
261
  }, null, 8, ["label"]),
260
- o(n, {
262
+ o(r, {
261
263
  label: e.$t("orderInfo.mobilePhone"),
262
264
  width: "150"
263
265
  }, {
264
266
  default: a(({ row: t }) => [
265
- o(F, {
267
+ o(Q, {
266
268
  mobileEncrypt: t.mobileEncrypt,
267
269
  mobilePhoneIns: t.mobilePhoneIns,
268
270
  mobilePhone: t.mobilePhone,
269
- onToggleEncrypt: (C) => j(t)
271
+ onToggleEncrypt: (C) => z(t)
270
272
  }, null, 8, ["mobileEncrypt", "mobilePhoneIns", "mobilePhone", "onToggleEncrypt"])
271
273
  ]),
272
274
  _: 1
273
275
  }, 8, ["label"]),
274
- o(n, {
276
+ o(r, {
275
277
  label: e.$t("common.operate"),
276
278
  width: "90"
277
279
  }, {
278
280
  default: a(({ row: t }) => [
279
- t.orderStatus === r(g).UNPOST ? S((u(), b("span", {
281
+ t.orderStatus === n(y).UNPOST ? S((u(), I("span", {
280
282
  key: 0,
281
283
  class: "el-button-color",
282
- onClick: (C) => Y(t)
284
+ onClick: (C) => A(t)
283
285
  }, [
284
- I(l(e.$t("orderInfo.update")), 1)
286
+ b(l(e.$t("orderInfo.update")), 1)
285
287
  ], 8, ce)), [
286
288
  [_, ["order:order_info:update"]]
287
289
  ]) : p("", !0)
@@ -299,8 +301,8 @@ const se = { class: "app-container" }, ue = { class: "shopName" }, me = { key: 0
299
301
  modelValue: c.value.visible,
300
302
  "onUpdate:modelValue": d[0] || (d[0] = (t) => c.value.visible = t),
301
303
  title: c.value.title,
302
- "entity-key": r(h),
303
- onRefresh: W,
304
+ "entity-key": n($),
305
+ onRefresh: L,
304
306
  width: "600px"
305
307
  }, null, 8, ["modelValue", "title", "entity-key"])) : p("", !0),
306
308
  v.value.visible ? (u(), V(ae, {
@@ -308,16 +310,16 @@ const se = { class: "app-container" }, ue = { class: "shopName" }, me = { key: 0
308
310
  modelValue: v.value.visible,
309
311
  "onUpdate:modelValue": d[1] || (d[1] = (t) => v.value.visible = t),
310
312
  title: v.value.title,
311
- "entity-key": r(h),
312
- "entity-model": r(B),
313
- onRefresh: W,
313
+ "entity-key": n($),
314
+ "entity-model": n(B),
315
+ onRefresh: L,
314
316
  width: "500px"
315
317
  }, null, 8, ["modelValue", "title", "entity-key", "entity-model"])) : p("", !0),
316
318
  P.value ? (u(), V(de, {
317
319
  key: 2,
318
- orderId: M.value,
319
- orderItemId: T.value,
320
- onClose: Q
320
+ orderId: U.value,
321
+ orderItemId: M.value,
322
+ onClose: K
321
323
  }, null, 8, ["orderId", "orderItemId"])) : p("", !0)
322
324
  ]);
323
325
  };
@@ -36,6 +36,7 @@ export interface OrderInfoModel extends EntityModel {
36
36
  mobilePhone?: string;
37
37
  mobilePhoneIns?: string;
38
38
  mobileEncrypt?: boolean;
39
+ postType?: string;
39
40
  }
40
41
  export interface OrderItemList extends EntityList {
41
42
  results: Array<OrderItemModel>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xyvcard-order",
3
- "version": "0.0.20",
3
+ "version": "0.0.21",
4
4
  "private": false,
5
5
  "module": "dist/index.mjs",
6
6
  "types": "dts/src/index.d.ts",