diff --git a/pages.json b/pages.json index a0ac878..0f09b50 100644 --- a/pages.json +++ b/pages.json @@ -69,6 +69,14 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/signwebview/index", + "style": { + + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + }, { "path": "pages/order-goods/order-details", "style": { diff --git a/pages/consignment-painting/index.vue b/pages/consignment-painting/index.vue index 631d29f..01c5185 100644 --- a/pages/consignment-painting/index.vue +++ b/pages/consignment-painting/index.vue @@ -103,7 +103,7 @@
画作编号
- +
@@ -111,7 +111,7 @@
画作名称
- +
@@ -119,7 +119,7 @@
画家名称
- +
@@ -128,7 +128,7 @@
画作平尺数
- +
@@ -168,7 +168,7 @@
*仅微信付款
预计 ¥{{expectedPayment}}
-
确认金额并签署合同
+
确认金额并签署合同
@@ -237,6 +237,21 @@ export default { this.data = [today.getFullYear(), today.getMonth() + 1, today.getDate()] }, methods: { + async signContract(){ + const data={ + cycleId:this.cycleId, + warehouseID:this.warehouseID, + artworkSquareSize:this.info.artworkSquareSize + } + const res = await postDataByParams('/api/warehouse/fdd/contract/h5',data) + if (res.code===200){ + uni.setStorageSync("jumpUrl", res.data.jumpUrl) + uni.navigateTo({ + url: `/pages/signwebview/index`, + }); + } + + }, async obtainAmount(){ const data={ cycleID:this.cycleId, diff --git a/pages/order-goods/index.vue b/pages/order-goods/index.vue index 00aee66..5dfcb10 100644 --- a/pages/order-goods/index.vue +++ b/pages/order-goods/index.vue @@ -120,22 +120,34 @@ export default { computed: {}, methods: { popForward() { + if (this.messageText === '确认补款吗') { this.supplementaryPayment() } else if (this.messageText === '确认删除吗') { this.deleteClick() } }, - openShow2() { + openShow2(item) { + this.item = item this.messageText = `确认补款吗` this.$refs.alertDialog.open() }, - async supplementaryPayment(item) { + async supplementaryPayment() { const data = { - ID: item.ID + ID: this.item.ID + } + const res = await postDataByParams('/api/warehouse/supply/paid', data) + if (res.code===200){ + uni.showToast({ + title: '补款成功', + icon: 'none' + }) + }else { + uni.showToast({ + title: res.msg, + icon: 'none' + }) } - const res = await postDataByParams('/api/warehouse/remove', data) - console.log(res, 'supplementaryPayment') }, async getDistanceFromTopToPageBottom(classValue) { const {windowHeight, windowWidth} = await uni.getSystemInfo(); diff --git a/pages/signwebview/index.vue b/pages/signwebview/index.vue new file mode 100644 index 0000000..875f82a --- /dev/null +++ b/pages/signwebview/index.vue @@ -0,0 +1,23 @@ + + + + + +