xyvcard-paper-buyer 0.0.47 → 0.0.49

package/dist/{applyEdit-CZsU0uYe.mjs → applyEdit-Ch-oVoTx.mjs}

@@ -5,7 +5,7 @@ import { routerUtil as D } from "jmash-core";
 import { useRouter as Q, useRoute as W } from "vue-router";
 import { D as U } from "./index-Knr6dYOL.mjs";
 import { _ as X, u as Y } from "./userInvoice.vue_vue_type_script_setup_true_lang-3eHl8CCv.mjs";
-import { o as Z } from "./index-DyTbbNUO.mjs";
+import { o as Z } from "./index-BKZPqxLM.mjs";
 import { E as x } from "./el-message-VSzNakoG.mjs";
 import { _ as ee } from "./_plugin-vue_export-helper-CHgC5LLL.mjs";
 const le = { class: "app-container" }, oe = { class: "search-container" }, te = { class: "form-footer" }, ae = /* @__PURE__ */ J({

package/dist/{confirm-CLQHmyNq.mjs → confirm-BK-aSN_z.mjs}

@@ -1,11 +1,11 @@
-import { defineComponent as Y, mergeModels as h, useModel as I, ref as U, reactive as y, resolveComponent as n, createBlock as H, openBlock as B, withCtx as o, createVNode as e, unref as a, createElementVNode as E, createTextVNode as V, toDisplayString as g } from "vue";
-import { useI18n as F } from "vue-i18n";
-import { useRouter as K, useRoute as j } from "vue-router";
+import { defineComponent as Y, mergeModels as h, useModel as U, ref as E, reactive as y, resolveComponent as n, createBlock as H, openBlock as B, withCtx as o, createVNode as e, unref as a, createElementVNode as F, createTextVNode as V, toDisplayString as g } from "vue";
+import { useI18n as K } from "vue-i18n";
+import { useRouter as j, useRoute as O } from "vue-router";
 import { ElMessage as k } from "element-plus";
-import { o as O } from "./index-B90ZLkZ9.mjs";
+import { o as z } from "./index-B90ZLkZ9.mjs";
 import N from "./assets/3a1c0fd6fbc19dd2.png";
-import { _ as z } from "./_plugin-vue_export-helper-CHgC5LLL.mjs";
-const G = { class: "footer" }, J = /* @__PURE__ */ Y({
+import { _ as G } from "./_plugin-vue_export-helper-CHgC5LLL.mjs";
+const J = { class: "footer" }, L = /* @__PURE__ */ Y({
   __name: "confirm",
   props: /* @__PURE__ */ h({
     confirmKey: {
@@ -26,11 +26,9 @@ const G = { class: "footer" }, J = /* @__PURE__ */ Y({
   }),
   emits: /* @__PURE__ */ h(["close"], ["update:modelValue"]),
   setup(i, { emit: v }) {
-    const _ = i, u = I(i, "modelValue"), R = v, { t: c } = F(), P = K();
-    j();
-    const w = U(), r = y({
+    const _ = i, u = U(i, "modelValue"), R = v, { t: c } = K(), P = j(), D = O(), w = E(), r = y({
       requestId: Math.random() * 10 + ""
-    }), D = y({
+    }), q = y({
       opponentAccountNo: [
         {
           required: !0,
@@ -50,12 +48,13 @@ const G = { class: "footer" }, J = /* @__PURE__ */ Y({
       await ((l = w.value) == null ? void 0 : l.validate(async (t) => {
         if (t)
           try {
-            (await O.completedTransfer({
+            (await z.completedTransfer({
               ...r,
               shopPayInfoId: _.confirmKey.shopPayInfoId,
               orderCode: _.confirmKey.orderCode
             })).data === "success" && (k.success(c("common.submitSuccess")), f(), P.push({
-              path: "/buyer/order-info"
+              path: "/buyer/order-info/applyEdit",
+              query: { orderId: D.query.orderId }
             }));
           } catch {
             k.error("提交失败，请重试");
@@ -66,7 +65,7 @@ const G = { class: "footer" }, J = /* @__PURE__ */ Y({
       R("close"), u.value = !1;
     }
     return (l, t) => {
-      const p = n("el-input"), m = n("el-form-item"), s = n("el-col"), q = n("el-date-picker"), C = n("el-divider"), M = n("el-image"), S = n("el-row"), T = n("el-form"), b = n("el-button"), A = n("el-dialog");
+      const p = n("el-input"), s = n("el-form-item"), m = n("el-col"), C = n("el-date-picker"), I = n("el-divider"), M = n("el-image"), S = n("el-row"), T = n("el-form"), b = n("el-button"), A = n("el-dialog");
       return B(), H(A, {
         modelValue: u.value,
         "onUpdate:modelValue": t[4] || (t[4] = (d) => u.value = d),
@@ -76,7 +75,7 @@ const G = { class: "footer" }, J = /* @__PURE__ */ Y({
         "destroy-on-close": ""
       }, {
         footer: o(() => [
-          E("div", G, [
+          F("div", J, [
             e(b, { onClick: f }, {
               default: o(() => [
                 V(g(l.$t("common.cancel")), 1)
@@ -100,15 +99,15 @@ const G = { class: "footer" }, J = /* @__PURE__ */ Y({
             ref: w,
             model: a(r),
             "label-width": "120px",
-            rules: a(D),
+            rules: a(q),
             style: { "margin-top": "20px" }
           }, {
             default: o(() => [
               e(S, { gutter: 20 }, {
                 default: o(() => [
-                  e(s, { span: 20 }, {
+                  e(m, { span: 20 }, {
                     default: o(() => [
-                      e(m, {
+                      e(s, {
                         label: l.$t("newsPapepr.opponentAccountNo"),
                         prop: "opponentAccountNo"
                       }, {
@@ -126,14 +125,14 @@ const G = { class: "footer" }, J = /* @__PURE__ */ Y({
                     ]),
                     _: 1
                   }),
-                  e(s, { span: 20 }, {
+                  e(m, { span: 20 }, {
                     default: o(() => [
-                      e(m, {
+                      e(s, {
                         label: l.$t("newsPapepr.tradeDateTime"),
                         prop: "tradeDateTime"
                       }, {
                         default: o(() => [
-                          e(q, {
+                          e(C, {
                             modelValue: a(r).tradeDateTime,
                             "onUpdate:modelValue": t[1] || (t[1] = (d) => a(r).tradeDateTime = d),
                             type: "datetime",
@@ -148,9 +147,9 @@ const G = { class: "footer" }, J = /* @__PURE__ */ Y({
                     ]),
                     _: 1
                   }),
-                  e(s, { span: 20 }, {
+                  e(m, { span: 20 }, {
                     default: o(() => [
-                      e(m, {
+                      e(s, {
                         label: l.$t("newsPapepr.bankSerialNo"),
                         prop: "bankSerialNo"
                       }, {
@@ -168,9 +167,9 @@ const G = { class: "footer" }, J = /* @__PURE__ */ Y({
                     ]),
                     _: 1
                   }),
-                  e(s, { span: 20 }, {
+                  e(m, { span: 20 }, {
                     default: o(() => [
-                      e(m, {
+                      e(s, {
                         label: l.$t("newsPapepr.handleRemark"),
                         prop: "handleRemark"
                       }, {
@@ -188,10 +187,10 @@ const G = { class: "footer" }, J = /* @__PURE__ */ Y({
                     ]),
                     _: 1
                   }),
-                  e(C),
-                  e(s, { span: 24 }, {
+                  e(I),
+                  e(m, { span: 24 }, {
                     default: o(() => [
-                      e(m, {
+                      e(s, {
                         label: l.$t("newsPapepr.image")
                       }, {
                         default: o(() => [
@@ -220,7 +219,7 @@ const G = { class: "footer" }, J = /* @__PURE__ */ Y({
       }, 8, ["modelValue", "title", "width"]);
     };
   }
-}), oe = /* @__PURE__ */ z(J, [["__scopeId", "data-v-bc31fa7a"]]);
+}), le = /* @__PURE__ */ G(L, [["__scopeId", "data-v-fa1e2eb5"]]);
 export {
-  oe as default
+  le as default
 };

package/dist/{edit-DwsTiwF8.mjs → edit-DFyOnrzr.mjs}

@@ -1,4 +1,4 @@
-import { defineComponent as S, mergeModels as y, ref as c, reactive as A, useModel as T, resolveComponent as m, createBlock as D, openBlock as J, withCtx as a, createVNode as l, unref as d, createElementVNode as L, createTextVNode as R, toDisplayString as q } from "vue";
+import { defineComponent as S, mergeModels as V, ref as f, reactive as A, useModel as T, resolveComponent as m, createBlock as D, openBlock as J, withCtx as a, createVNode as l, unref as d, createElementVNode as L, createTextVNode as R, toDisplayString as q } from "vue";
 import { ElMessage as w } from "element-plus";
 import { JmashRegionTree as z, dictRegionApi as C } from "jmash-region";
 import { useI18n as G } from "vue-i18n";
@@ -7,7 +7,7 @@ import { validatePhoneOrLandline as H } from "jmash-core";
 import { _ as Q } from "./_plugin-vue_export-helper-CHgC5LLL.mjs";
 const W = { class: "dialog-footer" }, X = /* @__PURE__ */ S({
   __name: "edit",
-  props: /* @__PURE__ */ y({
+  props: /* @__PURE__ */ V({
     entityKey: {
       type: Object,
       default: () => {
@@ -17,12 +17,12 @@ const W = { class: "dialog-footer" }, X = /* @__PURE__ */ S({
     modelValue: { type: Boolean },
     modelModifiers: {}
   }),
-  emits: /* @__PURE__ */ y(["refresh"], ["update:modelValue"]),
+  emits: /* @__PURE__ */ V(["refresh"], ["update:modelValue"]),
   setup(g, { emit: I }) {
-    const { t: i } = G(), v = c();
+    const { t: i } = G(), v = f();
     let t = A({
       requestId: Math.random() * 10 + "",
-      updateMask: "note,userName,mobilePhone,provinceName,detailInfo"
+      updateMask: "note,userName,mobilePhone,provinceName,detailInfo,cityName"
     });
     const P = (e, r, o) => {
       r && (H(r) || o(new Error(i("orderUserAddress.mobilePhoneTrueRequired")))), o();
@@ -61,32 +61,32 @@ const W = { class: "dialog-footer" }, X = /* @__PURE__ */ S({
           trigger: "change"
         }
       ]
-    }), u = T(g, "modelValue"), b = g, N = I, M = Object.keys(b.entityKey), _ = c(M.length >= 1);
+    }), u = T(g, "modelValue"), b = g, N = I, M = Object.keys(b.entityKey), _ = f(M.length >= 1);
     _.value && h.findById(b.entityKey).then(({ data: e }) => {
-      Object.assign(t, e);
+      Object.assign(t, e), t.provinceName = e.cityName;
     });
     function k() {
       t.provinceName && B(t.provinceName).then((e) => {
         t.cityName = e;
       });
     }
-    const f = c(/* @__PURE__ */ new Map());
+    const p = f(/* @__PURE__ */ new Map());
     async function B(e) {
       if (!e)
         return "";
-      if (f.value.has(e))
-        return f.value.get(e) || e;
+      if (p.value.has(e))
+        return p.value.get(e) || e;
       try {
         const r = await C.findByCode({
           regionCode: e
         });
         if (r.data) {
           const o = F(r.data);
-          return f.value.set(e, o), o;
+          return p.value.set(e, o), o;
         }
         return e;
       } catch {
-        return f.value.set(e, e), e;
+        return p.value.set(e, e), e;
       }
     }
     function F(e) {
@@ -112,25 +112,25 @@ const W = { class: "dialog-footer" }, X = /* @__PURE__ */ S({
         }));
       }));
     };
-    function U() {
+    function y() {
       u.value && (u.value = !1);
     }
     return (e, r) => {
-      const o = m("el-input"), s = m("el-form-item"), p = m("el-col"), E = m("el-row"), O = m("el-form"), V = m("el-button"), K = m("el-dialog");
+      const o = m("el-input"), s = m("el-form-item"), c = m("el-col"), E = m("el-row"), O = m("el-form"), U = m("el-button"), K = m("el-dialog");
       return J(), D(K, {
         modelValue: u.value,
         "onUpdate:modelValue": r[5] || (r[5] = (n) => u.value = n),
-        onClose: U
+        onClose: y
       }, {
         footer: a(() => [
           L("div", W, [
-            l(V, { onClick: U }, {
+            l(U, { onClick: y }, {
               default: a(() => [
                 R(q(e.$t("common.cancel")), 1)
               ]),
               _: 1
             }),
-            l(V, {
+            l(U, {
               type: "primary",
               onClick: j
             }, {
@@ -152,7 +152,7 @@ const W = { class: "dialog-footer" }, X = /* @__PURE__ */ S({
             default: a(() => [
               l(E, { gutter: 20 }, {
                 default: a(() => [
-                  l(p, { span: 24 }, {
+                  l(c, { span: 24 }, {
                     default: a(() => [
                       l(s, {
                         label: e.$t("orderUserAddress.note"),
@@ -172,7 +172,7 @@ const W = { class: "dialog-footer" }, X = /* @__PURE__ */ S({
                     ]),
                     _: 1
                   }),
-                  l(p, { span: 24 }, {
+                  l(c, { span: 24 }, {
                     default: a(() => [
                       l(s, {
                         label: e.$t("orderUserAddress.userName"),
@@ -192,7 +192,7 @@ const W = { class: "dialog-footer" }, X = /* @__PURE__ */ S({
                     ]),
                     _: 1
                   }),
-                  l(p, { span: 24 }, {
+                  l(c, { span: 24 }, {
                     default: a(() => [
                       l(s, {
                         label: e.$t("orderUserAddress.mobilePhone"),
@@ -212,7 +212,7 @@ const W = { class: "dialog-footer" }, X = /* @__PURE__ */ S({
                     ]),
                     _: 1
                   }),
-                  l(p, { span: 24 }, {
+                  l(c, { span: 24 }, {
                     default: a(() => [
                       l(s, {
                         prop: "provinceName",
@@ -233,7 +233,7 @@ const W = { class: "dialog-footer" }, X = /* @__PURE__ */ S({
                     ]),
                     _: 1
                   }),
-                  l(p, { span: 24 }, {
+                  l(c, { span: 24 }, {
                     default: a(() => [
                       l(s, { prop: "detailInfo" }, {
                         default: a(() => [
@@ -262,7 +262,7 @@ const W = { class: "dialog-footer" }, X = /* @__PURE__ */ S({
       }, 8, ["modelValue"]);
     };
   }
-}), te = /* @__PURE__ */ Q(X, [["__scopeId", "data-v-390f0c01"]]);
+}), te = /* @__PURE__ */ Q(X, [["__scopeId", "data-v-a53cccfe"]]);
 export {
   te as default
 };