@@ -231,11 +237,6 @@ export default {
url: ''//二维码扫码的结果用户发起请求的body体
}
},
- onLoad(e) {
- if (e) {
- this.url = e.url
- }
- },
watch:{
cycleId(newValue){
this.obtainAmount()
@@ -244,7 +245,8 @@ export default {
},
mounted() {
this.getCycle()
- if (this.url){
+ if (this.$mp.query.url){
+ this.url=this.$mp.query.url
this.getDetailUrl()
}
this.getAddress()
@@ -268,9 +270,8 @@ export default {
});
})
},
- // 删除图片
- deletePic(event) {
- this[`fileList${event.name}`].splice(event.index, 1)
+ deletePic() {
+ this.fileList1=[]
},
// 新增图片
async afterRead(event) {
@@ -297,7 +298,22 @@ export default {
}
},
async signContract(){
-
+ const checks = [{
+ value: this.warehouseID,
+ message: '请选择寄存地址'
+ }, {
+ value: this.cycleId,
+ message: '请选择寄存时限'
+ }]
+ for (const check of checks) {
+ if (!check.value) {
+ uni.showToast({
+ title: check.message,
+ icon: 'none'
+ })
+ return
+ }
+ }
const data={
cycleId:this.cycleId,
warehouseID:this.warehouseID,
@@ -492,6 +508,7 @@ picker-view {
padding-top: 28rpx;
padding-left: 30rpx;
padding-right: 30rpx;
+ margin-bottom: 72rpx;
& > .content6 {
margin-top: 26rpx;
@@ -593,6 +610,7 @@ picker-view {
}
.poup {
+ margin-bottom: 72rpx;
padding-top: 28rpx;
padding-left: 30rpx;
padding-right: 30rpx;
diff --git a/pages/order-goods/index.vue b/pages/order-goods/index.vue
index 700ecb4..65249e6 100644
--- a/pages/order-goods/index.vue
+++ b/pages/order-goods/index.vue
@@ -219,13 +219,22 @@ export default {
}
},
touchMove(e, index) {
+ if (this.mainList[index].artworkStatus!==5){
+ return
+ }
this.mainList[index].distanceX = e.touches[0].clientX - this.startX;
},
touchStart(e, index) {
+ if (this.mainList[index].artworkStatus!==5){
+ return
+ }
this.mainList[index].isRight = true
this.startX = e.touches[0].clientX;
},
touchEnd(index) {
+ if (this.mainList[index].artworkStatus!==5){
+ return
+ }
if (this.mainList[index].distanceX < -((144 / 750) * this.windowWidth)) {
this.mainList[index].distanceX = -((144 / 750) * this.windowWidth);
} else {
diff --git a/pages/order-goods/order-details.vue b/pages/order-goods/order-details.vue
index 79ea4a2..6828276 100644
--- a/pages/order-goods/order-details.vue
+++ b/pages/order-goods/order-details.vue
@@ -1,6 +1,6 @@
-
+
@@ -8,7 +8,7 @@
-
+
diff --git a/pages/paySuccess/paySuccess.vue b/pages/paySuccess/paySuccess.vue
index a3fc7be..8017ad4 100644
--- a/pages/paySuccess/paySuccess.vue
+++ b/pages/paySuccess/paySuccess.vue
@@ -48,10 +48,10 @@
*请携带您的画作在时限之前到达寄存地
-
+
-
+
@@ -72,6 +72,16 @@ export default {
this.getData()
},
methods: {
+ goDetails(){
+ uni.navigateTo({
+ url: "/pages/order-goods/order-details",
+ });
+ },
+ goHome(){
+ uni.switchTab({
+ url: "/pages/home/index",
+ });
+ },
async getData() {
const data1 = {
ID: Number(this.$mp.query.ID)
diff --git a/static/zu142@3x.png b/static/zu142@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..9aadea34a5d02e8a139d8e8395376f019017a6f6
GIT binary patch
literal 399
zcmeAS@N?(olHy`uVBq!ia0vp^Rv^s51|%Qu_R;`SjKx9jP7LeL$-D%zJw06vrX^N0apo$-GagP9gP_en9i^oFHB9D&^{w}Mu;
z<}VkW3lX1Q&Hec0JNATnFS)R*72D=)TH!NM!t}zqUM&UnU0kc`)6{lxo#7HCkV%~Ufr^;5h&C!=US+PUx{eQ{{iUcHl^eB-*wPRp-yjrIVr@w^y%H-+1!=$GpWq?N{x)d1pn_2d%x5sqUhjQFCU>
zh6;QLx?h1xE*6Ys9ovXw1g|9I6d6YLSheb2
btlNG@HUqV-hH3{uLC@gn>gTe~DWM4f>+!3R
literal 0
HcmV?d00001
From 61ddf6f32c79f2e7f9f731331440fcb15ac9a22d Mon Sep 17 00:00:00 2001
From: xingyy <373639591@qq.com>
Date: Tue, 26 Sep 2023 10:21:21 +0800
Subject: [PATCH 2/8] submit
---
App.vue | 2 ++
util/tabbar.js | 12 ++++++------
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/App.vue b/App.vue
index 9d80563..54c2aca 100644
--- a/App.vue
+++ b/App.vue
@@ -34,6 +34,8 @@ export default {
height: 306rpx!important;
}
.u-tabbar__content {
+ display: flex;
+ align-items: center;
height: 166rpx;
}
.u-border-top {
diff --git a/util/tabbar.js b/util/tabbar.js
index 1f2b891..5a9f07c 100644
--- a/util/tabbar.js
+++ b/util/tabbar.js
@@ -7,21 +7,21 @@ let tab1 = [{
{
"text": "订单",
"pagePath": "pages/order-goods/index",
- "iconPath": "../../static/tabbar/home.png",
- "selectedIconPath": "../../static/tabbar/home-active.png"
+ "iconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/cf65acab-6d46-4d2a-af07-3f1daf09139c.png",
+ "selectedIconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/a5710018-3791-4e0c-b698-caee9bbb642b.png"
},
{
"text": "合同",
"pagePath": "pages/contract/index",
- "iconPath": "../../static/tabbar/home.png",
- "selectedIconPath": "../../static/tabbar/home-active.png"
+ "iconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/17b5895b-6572-49de-b710-4b318fe0776c.png",
+ "selectedIconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/c37e0bb7-8702-4d6f-8caf-d62abcf07845.png"
}
,
{
"text": "我的",
"pagePath": "pages/mine/index",
- "iconPath": "../../static/tabbar/home.png",
- "selectedIconPath": "../../static/tabbar/home-active.png"
+ "iconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/bc489115-daba-4457-a8de-f151d7caf610.png",
+ "selectedIconPath": "https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/91cae751-1b5a-441d-aa09-aecca60c8519.png"
}
]
export default tab1
From 6d9779d21d37156b1cfabdb4f9920d932409d808 Mon Sep 17 00:00:00 2001
From: xingyy <373639591@qq.com>
Date: Tue, 26 Sep 2023 10:43:39 +0800
Subject: [PATCH 3/8] submit
---
pages.json | 17 +++++++++--------
pages/consignment-painting/index.vue | 17 ++++++++---------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/pages.json b/pages.json
index 2448966..9c57531 100644
--- a/pages.json
+++ b/pages.json
@@ -157,22 +157,23 @@
},
"uniIdRouter": {},
"tabBar": {
+ "custom": true,
"list": [
{
- "pagePath": "pages/home/index",
- "text": "首页"
+ "pagePath": "pages/home/index"
+
},
{
- "pagePath": "pages/mine/index",
- "text": "首页"
+ "pagePath": "pages/mine/index"
+
},
{
- "pagePath": "pages/contract/index",
- "text": "首页"
+ "pagePath": "pages/contract/index"
+
},
{
- "pagePath": "pages/order-goods/index",
- "text": "首页"
+ "pagePath": "pages/order-goods/index"
+
}
]
}
diff --git a/pages/consignment-painting/index.vue b/pages/consignment-painting/index.vue
index 29d9003..2b9e9f8 100644
--- a/pages/consignment-painting/index.vue
+++ b/pages/consignment-painting/index.vue
@@ -122,7 +122,7 @@
画作编号
-
+
@@ -130,7 +130,7 @@
画作名称
-
+
@@ -138,7 +138,7 @@
画家名称
-
+
@@ -147,7 +147,7 @@
画作平尺数
-
+
@@ -159,8 +159,8 @@
寄存地址
-
+
@@ -171,13 +171,12 @@
寄存时限
-
+
-
-
+
From 88e71903b3dc8df19425d7035a8d036790994759 Mon Sep 17 00:00:00 2001
From: xingyy <373639591@qq.com>
Date: Tue, 26 Sep 2023 10:47:45 +0800
Subject: [PATCH 4/8] submit
---
pages/consignment-painting/index.vue | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/pages/consignment-painting/index.vue b/pages/consignment-painting/index.vue
index 2b9e9f8..c5a621a 100644
--- a/pages/consignment-painting/index.vue
+++ b/pages/consignment-painting/index.vue
@@ -297,7 +297,27 @@ export default {
}
},
async signContract(){
- const checks = [{
+ const checks = [
+ {
+ value: this.fileList1.length>0,
+ message: '请上传画作图片'
+ },
+ {
+ value: this.info.artworkSquareSize,
+ message: '请输入画作平尺数'
+ },
+ {
+ value: this.info.artistName,
+ message: '请输入画家名称'
+ },
+ {
+ value: this.info.artworkName,
+ message: '请输入画作名称'
+ },
+ {
+ value: this.info.artworkNum,
+ message: '请输入画作编号'
+ },{
value: this.warehouseID,
message: '请选择寄存地址'
}, {
From ba755bbdd81d13694d0b806bb8233a0f2a5ae7da Mon Sep 17 00:00:00 2001
From: xingyy <373639591@qq.com>
Date: Tue, 26 Sep 2023 10:48:47 +0800
Subject: [PATCH 5/8] submit
---
pages/paySuccess/paySuccess.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/paySuccess/paySuccess.vue b/pages/paySuccess/paySuccess.vue
index 8017ad4..feea3d3 100644
--- a/pages/paySuccess/paySuccess.vue
+++ b/pages/paySuccess/paySuccess.vue
@@ -74,7 +74,7 @@ export default {
methods: {
goDetails(){
uni.navigateTo({
- url: "/pages/order-goods/order-details",
+ url: `/pages/order-goods/order-details?ID=${this.$mp.query.ID}`,
});
},
goHome(){
From b754cbf566a518d13c75fb3990ac6415ca8f9e54 Mon Sep 17 00:00:00 2001
From: xingyy <373639591@qq.com>
Date: Tue, 26 Sep 2023 10:51:48 +0800
Subject: [PATCH 6/8] submit
---
pages/paySuccess/paySuccess.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/paySuccess/paySuccess.vue b/pages/paySuccess/paySuccess.vue
index feea3d3..ad53e63 100644
--- a/pages/paySuccess/paySuccess.vue
+++ b/pages/paySuccess/paySuccess.vue
@@ -7,7 +7,7 @@
/>
-
+
From 4957abd51ca67bc69f7ca2efe0eb4e33cfc4816e Mon Sep 17 00:00:00 2001
From: xingyy <373639591@qq.com>
Date: Tue, 26 Sep 2023 11:13:01 +0800
Subject: [PATCH 7/8] submit
---
App.vue | 10 ++--------
components/uiq-tabbar/uiq-tabbar.vue | 10 +++++-----
uview-ui/components/u-tabbar/u-tabbar.vue | 7 +++----
3 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/App.vue b/App.vue
index 54c2aca..a638731 100644
--- a/App.vue
+++ b/App.vue
@@ -33,12 +33,6 @@ export default {
width: 404rpx!important;
height: 306rpx!important;
}
-.u-tabbar__content {
- display: flex;
- align-items: center;
- height: 166rpx;
-}
-.u-border-top {
- border: none !important;
-}
+
+
diff --git a/components/uiq-tabbar/uiq-tabbar.vue b/components/uiq-tabbar/uiq-tabbar.vue
index ad0686f..3d03983 100644
--- a/components/uiq-tabbar/uiq-tabbar.vue
+++ b/components/uiq-tabbar/uiq-tabbar.vue
@@ -1,11 +1,11 @@
-
-
+
-
+
@@ -42,7 +42,7 @@ export default {
}
-/*.tabbar-ios-fix {
+.tabbar-ios-fix {
bottom: calc(120rpx + env(safe-area-inset-bottom));
-}*/
+}
diff --git a/uview-ui/components/u-tabbar/u-tabbar.vue b/uview-ui/components/u-tabbar/u-tabbar.vue
index 953f33a..8ea0cff 100644
--- a/uview-ui/components/u-tabbar/u-tabbar.vue
+++ b/uview-ui/components/u-tabbar/u-tabbar.vue
@@ -40,7 +40,7 @@
* @property {Boolean} fixed 是否固定在底部(默认 true )
* @property {Boolean} placeholder fixed定位固定在底部时,是否生成一个等高元素防止塌陷(默认 true )
* @property {Object} customStyle 定义需要用到的外部样式
- *
+ *
* @example value2 = name" :fixed="false" :safeAreaInsetBottom="false">
*/
export default {
@@ -112,7 +112,6 @@
}
}
-