From 74da231357534215ce464c2834c2c443a8792e58 Mon Sep 17 00:00:00 2001 From: xuminyui <576362016@qq.com> Date: Fri, 22 Sep 2023 14:35:58 +0800 Subject: [PATCH] fix --- http/deposit.js | 12 ++ http/index.js | 2 + pages/consignment-painting/index.vue | 11 +- pages/home/index.vue | 43 +++++-- pages/payError/payError.vue | 33 ++++- pages/paySuccess/paySuccess.vue | 3 +- static/image/error.png | Bin 0 -> 34504 bytes static/image/payError.png | Bin 0 -> 6495 bytes static/image/success.png | Bin 0 -> 37277 bytes .../mp-weixin/common/runtime.js.map | 2 +- .../.sourcemap/mp-weixin/common/vendor.js.map | 2 +- .../pages/consignment-painting/index.js.map | 2 +- .../mp-weixin/pages/home/index.js.map | 2 +- .../mp-weixin/pages/payError/payError.js.map | 2 +- .../pages/paySuccess/paySuccess.js.map | 2 +- .../dist/dev/mp-weixin/common/runtime.js | 4 +- unpackage/dist/dev/mp-weixin/common/vendor.js | 34 +++++- .../pages/consignment-painting/index.js | 16 ++- .../pages/consignment-painting/index.wxml | 2 +- .../dist/dev/mp-weixin/pages/home/index.js | 57 +++++++++ .../dist/dev/mp-weixin/pages/home/index.json | 1 + .../dist/dev/mp-weixin/pages/home/index.wxml | 2 +- .../dev/mp-weixin/pages/payError/payError.js | 114 +++++++++++++++--- .../mp-weixin/pages/payError/payError.json | 4 +- .../mp-weixin/pages/payError/payError.wxml | 2 +- .../mp-weixin/pages/payError/payError.wxss | 37 ++++++ .../pages/paySuccess/paySuccess.wxml | 2 +- .../pages/paySuccess/paySuccess.wxss | 1 + .../dev/mp-weixin/project.private.config.json | 14 +++ .../dist/dev/mp-weixin/static/image/error.png | Bin 0 -> 34504 bytes .../dev/mp-weixin/static/image/payError.png | Bin 0 -> 6495 bytes .../dev/mp-weixin/static/image/success.png | Bin 0 -> 37277 bytes .../static/image/矩形 497@2x (1).png | Bin 0 -> 37277 bytes .../static/image/矩形 497@2x (2).png | Bin 0 -> 34504 bytes .../mp-weixin/static/image/组 66@2x (2).png | Bin 0 -> 6495 bytes 35 files changed, 355 insertions(+), 51 deletions(-) create mode 100644 http/deposit.js create mode 100644 static/image/error.png create mode 100644 static/image/payError.png create mode 100644 static/image/success.png create mode 100644 unpackage/dist/dev/mp-weixin/pages/payError/payError.wxss create mode 100644 unpackage/dist/dev/mp-weixin/static/image/error.png create mode 100644 unpackage/dist/dev/mp-weixin/static/image/payError.png create mode 100644 unpackage/dist/dev/mp-weixin/static/image/success.png create mode 100644 unpackage/dist/dev/mp-weixin/static/image/矩形 497@2x (1).png create mode 100644 unpackage/dist/dev/mp-weixin/static/image/矩形 497@2x (2).png create mode 100644 unpackage/dist/dev/mp-weixin/static/image/组 66@2x (2).png diff --git a/http/deposit.js b/http/deposit.js new file mode 100644 index 0000000..5c88cc8 --- /dev/null +++ b/http/deposit.js @@ -0,0 +1,12 @@ +import http from "./interface"; + +// 地点 +export const address = () => { + return http.request({ + url: "/api/warehouse/address", + method: "POST", + }); +}; +export default { + address, +}; diff --git a/http/index.js b/http/index.js index 27ddd06..a31ef89 100644 --- a/http/index.js +++ b/http/index.js @@ -1,4 +1,6 @@ import login from "./login"; +import deposit from "./deposit"; export default { login, + deposit, }; diff --git a/pages/consignment-painting/index.vue b/pages/consignment-painting/index.vue index 96eb957..5ed6212 100644 --- a/pages/consignment-painting/index.vue +++ b/pages/consignment-painting/index.vue @@ -2,7 +2,7 @@
@@ -197,6 +197,12 @@ export default { day, value: [9999, month - 1, day - 1], visible: true, + url:''//二维码扫码的结果用户发起请求的body体 + } + }, + onLoad(e) { + if(e){ + this.url = e.url } }, mounted(){ @@ -212,6 +218,9 @@ export default { }, changeData(e){ this.data=[e.detail.value[0]+1990,e.detail.value[1]+1,e.detail.value[2]+1] + }, + back(){ + uni.navigateBack({ delta: 2 }) } } } diff --git a/pages/home/index.vue b/pages/home/index.vue index 28de76a..a64935c 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -2,8 +2,8 @@