diff --git a/pages/order-goods/index.vue b/pages/order-goods/index.vue
index 0ca3867..e6245e7 100644
--- a/pages/order-goods/index.vue
+++ b/pages/order-goods/index.vue
@@ -12,10 +12,9 @@
@@ -43,7 +42,7 @@
@click="goRouter(item)"
:style="{transform: `translateX(${item.distanceX}px)`}" class="wrap1">
{{item.artworkName}}
@@ -131,7 +130,7 @@ export default {
const data = {
page: this.page, //分页
pageSize: this.pageSize, //每页数据量
- artworkStatus: this.artworkStatus, //状态(1-未入库 2-已入库 3-即将到期 4-超时 5-已取货)
+ status: this.artworkStatus, //状态(1-未入库 2-已入库 3-即将到期 4-超时 5-已取货)
mobileKey: this.mobileKey
}
const res = await postDataByParams('/api/warehouse/list', data)
@@ -215,7 +214,12 @@ export default {
position: relative;
width: 144rpx;
height: 228rpx;
-
+ &.status5{
+ background: #939393;
+ .wrap1_3_3_1 {
+ color: #939393;
+ }
+ }
&.status1 {
background: #FFBA00;
From 2d0e817c1fa392c41ab1226071f3dded83299964 Mon Sep 17 00:00:00 2001
From: xingyy <373639591@qq.com>
Date: Sat, 23 Sep 2023 11:50:34 +0800
Subject: [PATCH 04/15] submit
---
App.vue | 2 +-
components/title-block/title-block.vue | 2 +-
pages.json | 20 ++-
pages/order-goods/index.vue | 68 ++++++--
pages/order-goods/order-details.vue | 218 ++++++++++++++++++++-----
5 files changed, 238 insertions(+), 72 deletions(-)
diff --git a/App.vue b/App.vue
index f94cbc9..eee1add 100644
--- a/App.vue
+++ b/App.vue
@@ -3,7 +3,7 @@ import tabBar from "./util/tabbar";
export default {
onLaunch: function() {
- uni.setStorageSync("token",'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJJRCI6MCwiT3BlbklkIjoib01qYXY2eFFjQUttUW1ZUTFXV20zOXlCQUZ4byIsIk5pY2tOYW1lIjoiIiwiVGVsTnVtIjoiMTgyMDUwNTI2MjciLCJBdmF0YXIiOiIiLCJJRE51bSI6IiIsImV4cCI6MTY5NTQzNjEwMSwiaXNzIjoibWFsbCJ9.qYzFMtoOOBuawYDTl7iuwlTTz7Fakhr8657PjxWhQ8I')
+ uni.setStorageSync("token",'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJJRCI6MCwiT3BlbklkIjoib01qYXY2eFFjQUttUW1ZUTFXV20zOXlCQUZ4byIsIk5pY2tOYW1lIjoi6K645pe76L22IiwiVGVsTnVtIjoiMTgyMDUwNTI2MjciLCJBdmF0YXIiOiIiLCJJRE51bSI6IjMyMDUwNDE5OTgwOTE2NDAzMyIsImV4cCI6MTY5NjA0MTE4MCwiaXNzIjoibWFsbCJ9.bNsyjyMDacBrBlmP556rznofYq11M9AkoDpeixolE4o')
uni.hideTabBar();
uni.setStorageSync("tabBar", tabBar);
},
diff --git a/components/title-block/title-block.vue b/components/title-block/title-block.vue
index f61245b..61108d2 100644
--- a/components/title-block/title-block.vue
+++ b/components/title-block/title-block.vue
@@ -20,7 +20,7 @@ export default {
From 5a900e0378af260a3b4f8cb626a1699ab253378d Mon Sep 17 00:00:00 2001
From: xingyy <373639591@qq.com>
Date: Mon, 25 Sep 2023 19:01:50 +0800
Subject: [PATCH 12/15] submit
---
pages.json | 8 +
pages/confirm-order/index.vue | 319 +++++++++++++++++++++++++++
pages/consignment-painting/index.vue | 14 +-
pages/signwebview/index.vue | 7 +-
4 files changed, 345 insertions(+), 3 deletions(-)
create mode 100644 pages/confirm-order/index.vue
diff --git a/pages.json b/pages.json
index 0f09b50..993e272 100644
--- a/pages.json
+++ b/pages.json
@@ -77,6 +77,14 @@
"enablePullDownRefresh": false
}
},
+ {
+ "path": "pages/confirm-order/index",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+ },
{
"path": "pages/order-goods/order-details",
"style": {
diff --git a/pages/confirm-order/index.vue b/pages/confirm-order/index.vue
new file mode 100644
index 0000000..0a2794a
--- /dev/null
+++ b/pages/confirm-order/index.vue
@@ -0,0 +1,319 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
寄存时限
+
+
+
+
{{orderingInfo.cycleName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
*仅微信付款
+
总计 ¥{{orderingInfo.expectedPayment}}
+
+
付款
+
+
+
+
diff --git a/pages/consignment-painting/index.vue b/pages/consignment-painting/index.vue
index 01c5185..4c94726 100644
--- a/pages/consignment-painting/index.vue
+++ b/pages/consignment-painting/index.vue
@@ -195,6 +195,7 @@ export default {
days.push(i)
}
return {
+ dayMoney:'',
expectedPayment:'',
warehouseID: '',
cycleId: '',
@@ -238,6 +239,7 @@ export default {
},
methods: {
async signContract(){
+
const data={
cycleId:this.cycleId,
warehouseID:this.warehouseID,
@@ -246,6 +248,14 @@ export default {
const res = await postDataByParams('/api/warehouse/fdd/contract/h5',data)
if (res.code===200){
uni.setStorageSync("jumpUrl", res.data.jumpUrl)
+ uni.setStorageSync("orderingInfo", {
+ transactionId:res.data.transactionId,
+ dayMoney:this.dayMoney,
+ info:this.info,
+ expectedPayment:this.expectedPayment,
+ addressName:this.addressList.find(x=>x.ID===this.warehouseID).address,
+ cycleName:this.cycleList.find(x=>x.ID===this.cycleId).name
+ })
uni.navigateTo({
url: `/pages/signwebview/index`,
});
@@ -260,8 +270,8 @@ export default {
const res = await postDataByParams('/api/warehouse/calculate',data)
if (res.code===200){
this.expectedPayment=res.data.money
+ this.dayMoney=res.data.dayMoney
}
- console.log(res,'obtainAmount')
},
confirmCycle() {
this.show_1 = false
@@ -286,7 +296,6 @@ export default {
if (res.code === 200) {
this.addressList = res.data.data
}
- console.log(res, 'getAddress')
},
async getDetailUrl() {
const data = {
@@ -376,6 +385,7 @@ picker-view {
height: 100vh;
& > .content5 {
+
align-items: center;
left: 0;
background: #fff;
diff --git a/pages/signwebview/index.vue b/pages/signwebview/index.vue
index 875f82a..1748f0d 100644
--- a/pages/signwebview/index.vue
+++ b/pages/signwebview/index.vue
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
+
From 6ff493e6e3a4c0c5672ce06092fdb0327e072dce Mon Sep 17 00:00:00 2001
From: xingyy <373639591@qq.com>
Date: Mon, 25 Sep 2023 19:33:01 +0800
Subject: [PATCH 15/15] submit
---
pages/consignment-painting/index.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pages/consignment-painting/index.vue b/pages/consignment-painting/index.vue
index f3adde2..46e4378 100644
--- a/pages/consignment-painting/index.vue
+++ b/pages/consignment-painting/index.vue
@@ -229,9 +229,10 @@ export default {
}
},
mounted() {
-
this.getCycle()
- this.getDetailUrl()
+ if (this.url){
+ this.getDetailUrl()
+ }
this.getAddress()
const today = new Date();
this.value = [today.getFullYear() - 1990, today.getMonth(), today.getDate() - 1]