From 37c21ebb407b40c054dbd663f1ce26912c0bfacb Mon Sep 17 00:00:00 2001
From: XiaoXinPro 14 IAH5R <568170040@qq.com>
Date: Mon, 9 Jan 2023 18:08:07 +0800
Subject: [PATCH 1/6] upload
---
pages/spellGroup/mySpellGroup/index.wxml | 5 ++++-
project.private.config.json | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/pages/spellGroup/mySpellGroup/index.wxml b/pages/spellGroup/mySpellGroup/index.wxml
index 6b5ae80..0c91b75 100644
--- a/pages/spellGroup/mySpellGroup/index.wxml
+++ b/pages/spellGroup/mySpellGroup/index.wxml
@@ -38,7 +38,10 @@
仅限新用户活动
({{minLimit}}-{{maxLimit}}成长值)
(大于{{minLimit}}成长值)
- 剩余{{data.remainInventory}}张
+
+ 已售{{data.selledCount}}张
+ 剩余{{data.remainInventory}}张
+
diff --git a/project.private.config.json b/project.private.config.json
index 5bcf610..be2dd80 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -3,7 +3,7 @@
"projectname": "C",
"setting": {
"compileHotReLoad": true,
- "urlCheck": true,
+ "urlCheck": false,
"preloadBackgroundData": false,
"useIsolateContext": true
},
From 755198e112d2540d1e4ca29f5d3ff249da3eb3d3 Mon Sep 17 00:00:00 2001
From: XiaoXinPro 14 IAH5R <568170040@qq.com>
Date: Wed, 11 Jan 2023 17:27:43 +0800
Subject: [PATCH 2/6] upload
---
ext.json | 41 +++++++++++++++---------
pages/joinFrDpell/index.js | 5 +--
pages/joinFrDpell/index.wxml | 1 +
pages/spellGroup/mySpellGroup/index.wxml | 2 +-
project.config.json | 2 +-
project.private.config.json | 2 +-
6 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/ext.json b/ext.json
index 34dfe10..af9aa49 100644
--- a/ext.json
+++ b/ext.json
@@ -2,35 +2,45 @@
"ext": {
"attr": {
"car": {
+ "tjd": {
+ "payPath": "",
+ "tjdAppId": "wx6945d1bda68d7993"
+ },
"etcp": {
- "etcpAppId": "wx192b7d2e8dcbefd0",
- "etcpVersion": "release",
- "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback"
- }
+ "payPath": "pages/pay/order-pay-open/main",
+ "etcpAppId": "wxc07f9d67923d676d",
+ "etcpCallbackUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback"
+ },
+ "bolink": {
+ "payPath": "pages/park/park",
+ "bolinkAppId": "wxbd08b4baa10fcc1d"
+ },
+ "version": "release"
},
"mchId": "1604439800",
"imgProxy": [
{
- "newUrl": "https://ctest.malls.iformall.com/img",
+ "newUrl": "https://c.malls.iformall.com/img",
"orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com"
},
{
- "newUrl": "https://ctest.malls.iformall.com/img1",
+ "newUrl": "https://c.malls.iformall.com/img1",
"orgUrl": "https://formall.oss-accelerate.aliyuncs.com"
},
{
- "newUrl": "https://ctest.malls.iformall.com/img2",
+ "newUrl": "https://c.malls.iformall.com/img2",
"orgUrl": "https://wx.qlogo.cn"
}
],
- "configUrl": "https://ctest.malls.iformall.com/C/api",
+ "configUrl": "https://c.malls.iformall.com/C/api",
+ "ifStoreApp": "0",
"businessSwitch": "1",
"ifHaveWebSocket": "0",
- "ifHaveCarModular": "1"
+ "ifHaveCarModular": "0"
},
- "name": "金泸商务",
- "weappId": "wx649b3be73c1afe47",
- "appVersion": "C.test.5.2.0"
+ "name": "富茂链客生产版",
+ "weappId": "wx6a2524a8286d687f",
+ "appVersion": "C.5.1.1"
},
"debug": false,
"tabBar": {
@@ -66,8 +76,7 @@
"selectedIconPath": "assets/images/user-a.png"
}
],
- "color": "#abb1be",
- "selectedColor": "#b2743d"
+ "custom": true
},
"window": {
"backgroundTextStyle": "dark",
@@ -81,11 +90,11 @@
"provider": "wxfab2bf944bfc4da6"
},
"live-player-plugin": {
- "version": "1.3.4",
+ "version": "1.3.5",
"provider": "wx2b03c6e691cd7370"
}
},
- "extAppid": "wx649b3be73c1afe47",
+ "extAppid": "wx6a2524a8286d687f",
"extEnable": true,
"permission": {
"scope.userLocation": {
diff --git a/pages/joinFrDpell/index.js b/pages/joinFrDpell/index.js
index e525fb1..e24296d 100644
--- a/pages/joinFrDpell/index.js
+++ b/pages/joinFrDpell/index.js
@@ -33,7 +33,8 @@ Page({
showErr: false,
showTime: true,
merchantVoList: [],
- mallList: []
+ mallList: [],
+ nickName: '微信用户'
},
/**
@@ -62,7 +63,7 @@ Page({
orderGroupId: options.orderGroupId,
orderId: options.orderId,
avatarUrl: options.avatarUrl,
- nickName: options.nickName,
+ nickName: options.nickName || '微信用户',
})
if (options.orderGroupId) {
this.checkUser(options);
diff --git a/pages/joinFrDpell/index.wxml b/pages/joinFrDpell/index.wxml
index 62f5a92..18e2928 100644
--- a/pages/joinFrDpell/index.wxml
+++ b/pages/joinFrDpell/index.wxml
@@ -31,6 +31,7 @@
+
diff --git a/pages/spellGroup/mySpellGroup/index.wxml b/pages/spellGroup/mySpellGroup/index.wxml
index 0c91b75..6615795 100644
--- a/pages/spellGroup/mySpellGroup/index.wxml
+++ b/pages/spellGroup/mySpellGroup/index.wxml
@@ -47,7 +47,7 @@
- {{spellData.nickName}}的团还差1人
+ {{spellData.nickName||'微信用户'}}的团还差1人
{{day}} 天
diff --git a/project.config.json b/project.config.json
index 0a33f27..79c196c 100644
--- a/project.config.json
+++ b/project.config.json
@@ -34,7 +34,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.11.2",
- "appid": "wxfa336cad86ed598d",
+ "appid": "wx453ae0d37f3550d0",
"projectname": "C",
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
diff --git a/project.private.config.json b/project.private.config.json
index be2dd80..9feb9d7 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -7,5 +7,5 @@
"preloadBackgroundData": false,
"useIsolateContext": true
},
- "libVersion": "2.28.1"
+ "libVersion": "2.29.1"
}
\ No newline at end of file
From 7790209c9f359bb55d83a32cdabee9a3e292d557 Mon Sep 17 00:00:00 2001
From: XiaoXinPro 14 IAH5R <568170040@qq.com>
Date: Fri, 10 Feb 2023 20:32:25 +0800
Subject: [PATCH 3/6] upload
---
ext.json | 17 +----
pages/order/detail/index.wxml | 4 ++
pages/order/detail/index.wxss | 38 ++++++-----
pages/order/index/index.wxml | 3 +-
pages/order/index/index.wxss | 116 +++++++++++++++++++++++-----------
5 files changed, 110 insertions(+), 68 deletions(-)
diff --git a/ext.json b/ext.json
index af9aa49..46be677 100644
--- a/ext.json
+++ b/ext.json
@@ -34,12 +34,11 @@
],
"configUrl": "https://c.malls.iformall.com/C/api",
"ifStoreApp": "0",
- "businessSwitch": "1",
"ifHaveWebSocket": "0",
"ifHaveCarModular": "0"
},
- "name": "富茂链客生产版",
- "weappId": "wx6a2524a8286d687f",
+ "name": "金茂悦茂邻荟",
+ "weappId": "wx7c9c7122a91946a7",
"appVersion": "C.5.1.1"
},
"debug": false,
@@ -84,17 +83,7 @@
"navigationBarTitleText": "",
"navigationBarBackgroundColor": "#FFFFFF"
},
- "plugins": {
- "auto-points-plugin": {
- "version": "1.3.0",
- "provider": "wxfab2bf944bfc4da6"
- },
- "live-player-plugin": {
- "version": "1.3.5",
- "provider": "wx2b03c6e691cd7370"
- }
- },
- "extAppid": "wx6a2524a8286d687f",
+ "extAppid": "wx7c9c7122a91946a7",
"extEnable": true,
"permission": {
"scope.userLocation": {
diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml
index 4627ea8..1439cd2 100644
--- a/pages/order/detail/index.wxml
+++ b/pages/order/detail/index.wxml
@@ -63,6 +63,10 @@
订单编号:
{{order.orderNumber}}
+
+ 支付状态:
+ 订单已取消,即将退款
+
物流状态:
{{(order.shippingStatus==10||order.shippingStatus==14)?"待自提":order.shippingStatus==15?"已自提":order.shippingStatus==20?"待发货":order.shippingStatus==24?"待收货":order.shippingStatus==25?"已收货":""}}
diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss
index 238998b..03df905 100644
--- a/pages/order/detail/index.wxss
+++ b/pages/order/detail/index.wxss
@@ -13,12 +13,14 @@ page {
width: 100%;
padding-bottom: 160rpx;
}
-.barnumImg{
+
+.barnumImg {
float: left;
height: 40rpx;
width: 40rpx;
- margin: 24rpx 20rpx;
+ margin: 24rpx 20rpx;
}
+
.success {
vertical-align: middle;
width: 40rpx;
@@ -130,14 +132,16 @@ page {
font-size: 24rpx;
}
-.info view:nth-child(2), .info view:nth-child(3) {
+.info view:nth-child(2),
+.info view:nth-child(3) {
font-size: 24rpx;
padding-left: 4%;
color: #919191;
letter-spacing: 0;
}
-.info view:nth-child(2) text, .info view:nth-child(3) text {
+.info view:nth-child(2) text,
+.info view:nth-child(3) text {
font-size: 22rpx;
color: #b8b8b8;
}
@@ -209,7 +213,7 @@ page {
.left {
float: left;
font-size: 26rpx;
- color: #a6a6a6;
+ color: #a6a6a6;
}
.copeCode {
@@ -220,7 +224,7 @@ page {
line-height: 30rpx;
border-radius: 8rpx;
color: #df3502;
- border:1rpx #a6a6a6 solid;
+ border: 1rpx #a6a6a6 solid;
font-size: 28rpx;
}
@@ -231,7 +235,7 @@ page {
padding: 10rpx;
height: 30rpx;
line-height: 30rpx;
- border:1rpx #a6a6a6 solid;
+ border: 1rpx #a6a6a6 solid;
border-radius: 8rpx;
color: #3cc51f;
font-size: 28rpx;
@@ -260,7 +264,8 @@ page {
line-height:94rpx;
} */
-.classif > view:nth-child(2), .classif > view:nth-child(3) {
+.classif>view:nth-child(2),
+.classif>view:nth-child(3) {
position: relative;
height: 94rpx;
line-height: 94rpx;
@@ -271,22 +276,22 @@ page {
/* border-bottom: 1rpx solid #eee; */
}
-.classif > view text:nth-child(2) {
+.classif>view text:nth-child(2) {
font-size: 28rpx;
/* color: #3c3c3c; */
}
-.classif > view text:nth-child(1) {
+.classif>view text:nth-child(1) {
font-size: 28rpx;
color: #a6a6a6;
float: left;
}
-.classif > view:nth-child(1) {
+.classif>view:nth-child(1) {
display: block;
}
-.classif > view:nth-child(6) text:nth-child(2) {
+.classif>view:nth-child(6) text:nth-child(2) {
color: #666;
}
@@ -342,7 +347,8 @@ page {
.drawer_content {
height: 210px;
- overflow-y: scroll; /*超出父盒子高度可滚动*/
+ overflow-y: scroll;
+ /*超出父盒子高度可滚动*/
}
.btn_ok {
@@ -476,7 +482,7 @@ radio {
color: #333;
}
-.barcode > canvas {
+.barcode>canvas {
width: 500rpx;
height: 100rpx;
}
@@ -489,7 +495,7 @@ radio {
align-items: center;
}
-.qrcode > canvas {
+.qrcode>canvas {
width: 350rpx;
height: 350rpx;
}
@@ -710,4 +716,4 @@ radio {
color: #919191;
letter-spacing: 0;
margin-left: 20rpx;
-}
+}
\ No newline at end of file
diff --git a/pages/order/index/index.wxml b/pages/order/index/index.wxml
index 8011980..227c75a 100644
--- a/pages/order/index/index.wxml
+++ b/pages/order/index/index.wxml
@@ -32,6 +32,7 @@
免费领取
积分兑换
付款成功
+ 订单已取消,即将退款
@@ -93,7 +94,7 @@
再忙,也要记得买点什么犒赏自己~
-
+
{{content}}
diff --git a/pages/order/index/index.wxss b/pages/order/index/index.wxss
index 3b6a255..289726e 100644
--- a/pages/order/index/index.wxss
+++ b/pages/order/index/index.wxss
@@ -4,6 +4,7 @@
background: #F4F5F9;
margin-top: 20rpx;
}
+
.tabs {
position: fixed;
width: 100% !important;
@@ -21,10 +22,12 @@
width: 30% !important;
display: inline-block;
}
-.section{
+
+.section {
background: #FFFFFF;
overflow: hidden;
}
+
.detail_msg {
position: relative;
width: 92%;
@@ -35,7 +38,8 @@
padding-top: 20rpx;
/* border-bottom: 1rpx solid #eee; */
}
-.sendImg{
+
+.sendImg {
position: absolute;
width: 100rpx;
top: 100rpx;
@@ -56,13 +60,15 @@
height: 120rpx;
border-radius: 20rpx;
}
-.detail_top{
+
+.detail_top {
width: 100%;
height: 40rpx;
line-height: 40rpx;
font-size: 30rpx;
padding-top: 30rpx;
}
+
.detail_top view:nth-child(1) {
display: flex;
justify-content: space-between;
@@ -96,20 +102,21 @@
white-space: nowrap;
text-overflow: ellipsis;
}
-.discount{
+
+.discount {
position: absolute;
width: 100rpx;
- top:86rpx;
- right:2rpx;
+ top: 86rpx;
+ right: 2rpx;
}
.detail_top .sucess {
display: inline-block;
width: 123rpx !important;
/* overflow: hidden; */
- font-family:PingFangSC-Regular;
+ font-family: PingFangSC-Regular;
font-size: 28rpx;
- font-weight:400;
+ font-weight: 400;
color: #2C8DFF;
letter-spacing: 0;
text-align: right;
@@ -118,13 +125,26 @@
.wait {
display: inline-block;
- width: 123rpx !important;
- overflow: visible!important;
+ width: 130rpx !important;
+ overflow: visible !important;
font-size: 28rpx;
color: #FD832D;
letter-spacing: 0;
text-align: right;
- line-height: 28rpx!important;
+ line-height: 28rpx !important;
+}
+
+.waiting {
+ position: relative;
+ top: 20rpx;
+ display: inline-block;
+ width: 280rpx !important;
+ overflow: visible !important;
+ font-size: 28rpx;
+ color: red;
+ letter-spacing: 0;
+ text-align: right;
+ line-height: 28rpx !important;
}
.close {
@@ -165,9 +185,11 @@
.info view:nth-child(3) {
margin-top: 16rpx;
}
+
.info view:nth-child(2) {
margin-top: 16rpx;
}
+
.payment {
position: relative;
width: 92%;
@@ -213,9 +235,10 @@
float: right;
font-size: 26rpx;
border-radius: 20rpx;
- background:linear-gradient(127deg,rgba(252,177,74,1) 0%,rgba(254,70,20,1) 100%);
+ background: linear-gradient(127deg, rgba(252, 177, 74, 1) 0%, rgba(254, 70, 20, 1) 100%);
}
-.btnZf{
+
+.btnZf {
position: absolute;
bottom: 0;
right: 0;
@@ -227,9 +250,10 @@
float: right;
font-size: 26rpx;
border-radius: 20rpx;
- background:linear-gradient(130deg,rgba(50,177,252,1) 0%,rgba(47,108,255,1) 100%);
+ background: linear-gradient(130deg, rgba(50, 177, 252, 1) 0%, rgba(47, 108, 255, 1) 100%);
}
-.btnGm{
+
+.btnGm {
position: absolute;
bottom: 0;
right: 0;
@@ -248,10 +272,12 @@
font-size: 26rpx;
color: #FFFFFF;
}
-.txGm{
- font-size: 26rpx!important;
- color: #2C8DFF!important;
+
+.txGm {
+ font-size: 26rpx !important;
+ color: #2C8DFF !important;
}
+
.dingdan {
margin-top: 33rpx;
}
@@ -293,20 +319,25 @@
vertical-align: middle;
margin-right: 10rpx;
}
-button::after{ border: none; }
-.goback{
+
+button::after {
+ border: none;
+}
+
+.goback {
position: fixed;
right: 50rpx;
bottom: 60rpx;
- width:100rpx!important;
- height:100rpx;
+ width: 100rpx !important;
+ height: 100rpx;
z-index: 100;
- background:rgba(255,255,255,1);
+ background: rgba(255, 255, 255, 1);
line-height: 95rpx;
- border:1rpx solid rgba(227,227,227,1);
- border-radius:50%;
+ border: 1rpx solid rgba(227, 227, 227, 1);
+ border-radius: 50%;
}
-.goback image{
+
+.goback image {
position: absolute;
width: 60rpx;
left: 0;
@@ -315,28 +346,32 @@ button::after{ border: none; }
bottom: 0;
margin: auto;
}
-.itemBox{
+
+.itemBox {
overflow: hidden;
margin: 0 60rpx 20rpx 60rpx;
padding-bottom: 20rpx;
position: relative;
}
-.payStatus{
+
+.payStatus {
text-align: right;
}
+
.payStatus .sucess {
display: inline-block;
width: 123rpx !important;
/* overflow: hidden; */
- font-family:PingFangSC-Regular;
+ font-family: PingFangSC-Regular;
font-size: 28rpx;
- font-weight:400;
+ font-weight: 400;
color: #2C8DFF;
letter-spacing: 0;
text-align: right;
line-height: 26px;
}
-.itemImg{
+
+.itemImg {
float: left;
display: block;
width: 120rpx;
@@ -344,31 +379,36 @@ button::after{ border: none; }
border: 1px solid #f8f8f8;
border-radius: 20rpx;
}
+
.itemImg image {
display: block;
width: 120rpx;
height: 120rpx;
border-radius: 20rpx;
}
-.itemContent{
+
+.itemContent {
float: left;
width: 70%;
}
-.face{
+
+.face {
font-size: 24rpx;
color: #999;
letter-spacing: 0;
padding-left: 4%;
line-height: 33rpx;
}
-.face text{
+
+.face text {
font-size: 24rpx;
color: #333;
letter-spacing: 0;
line-height: 33rpx;
}
-.date{
+
+.date {
/* margin-top: 16rpx; */
font-size: 24rpx;
color: #999;
@@ -377,7 +417,8 @@ button::after{ border: none; }
line-height: 26rpx;
}
-.yunfe{
+
+.yunfe {
font-size: 24rpx;
color: #999;
letter-spacing: 0;
@@ -385,7 +426,8 @@ button::after{ border: none; }
height: 33rpx;
line-height: 33rpx;
}
-.yunfeK{
+
+.yunfeK {
font-size: 24rpx;
color: #999;
letter-spacing: 0;
From 23c568fa0eea27f8d479eb4dd61425cc6e920a70 Mon Sep 17 00:00:00 2001
From: XiaoXinPro 14 IAH5R <568170040@qq.com>
Date: Mon, 13 Feb 2023 16:54:31 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=81=9C=E8=BD=A6=E6=A8=A1=E5=9D=97?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.json | 2 +
config/config.js | 4 +
ext.json | 50 ++++-----
index/passCar.js | 66 +++++++++++-
index/passCar.wxml | 23 +++--
pages/coupon/detail/index.wxml | 3 +-
pages/passCar/showDetail/showDetail.js | 125 +++++++++++++++++++++++
pages/passCar/showDetail/showDetail.json | 9 ++
pages/passCar/showDetail/showDetail.wxml | 43 ++++++++
pages/passCar/showDetail/showDetail.wxss | 8 ++
pages/passCar/showList/showList.js | 119 +++++++++++++++++++++
pages/passCar/showList/showList.json | 9 ++
pages/passCar/showList/showList.wxml | 14 +++
pages/passCar/showList/showList.wxss | 28 +++++
project.config.json | 2 +-
15 files changed, 470 insertions(+), 35 deletions(-)
create mode 100644 pages/passCar/showDetail/showDetail.js
create mode 100644 pages/passCar/showDetail/showDetail.json
create mode 100644 pages/passCar/showDetail/showDetail.wxml
create mode 100644 pages/passCar/showDetail/showDetail.wxss
create mode 100644 pages/passCar/showList/showList.js
create mode 100644 pages/passCar/showList/showList.json
create mode 100644 pages/passCar/showList/showList.wxml
create mode 100644 pages/passCar/showList/showList.wxss
diff --git a/app.json b/app.json
index c93061a..1e18c89 100644
--- a/app.json
+++ b/app.json
@@ -46,6 +46,8 @@
"pages/orderquanma/index",
"pages/passCar/couponList/couponList",
"pages/passCar/couponDetail/couponDetail",
+ "pages/passCar/showList/showList",
+ "pages/passCar/showDetail/showDetail",
"pages/managelicenseplate/managelicenseplate",
"pages/payrule/payrule",
"pages/grade/grade",
diff --git a/config/config.js b/config/config.js
index 297d2ca..b90f37c 100755
--- a/config/config.js
+++ b/config/config.js
@@ -180,6 +180,10 @@ var config = {
* 联合登录
*/
carInit: "/car/init",
+ /**
+ * 停车支付订单列表
+ */
+ carPayOrderList: "/car/payOrderList",
/**
* 绑车牌
*/
diff --git a/ext.json b/ext.json
index 46be677..34dfe10 100644
--- a/ext.json
+++ b/ext.json
@@ -2,44 +2,35 @@
"ext": {
"attr": {
"car": {
- "tjd": {
- "payPath": "",
- "tjdAppId": "wx6945d1bda68d7993"
- },
"etcp": {
- "payPath": "pages/pay/order-pay-open/main",
- "etcpAppId": "wxc07f9d67923d676d",
- "etcpCallbackUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback"
- },
- "bolink": {
- "payPath": "pages/park/park",
- "bolinkAppId": "wxbd08b4baa10fcc1d"
- },
- "version": "release"
+ "etcpAppId": "wx192b7d2e8dcbefd0",
+ "etcpVersion": "release",
+ "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback"
+ }
},
"mchId": "1604439800",
"imgProxy": [
{
- "newUrl": "https://c.malls.iformall.com/img",
+ "newUrl": "https://ctest.malls.iformall.com/img",
"orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com"
},
{
- "newUrl": "https://c.malls.iformall.com/img1",
+ "newUrl": "https://ctest.malls.iformall.com/img1",
"orgUrl": "https://formall.oss-accelerate.aliyuncs.com"
},
{
- "newUrl": "https://c.malls.iformall.com/img2",
+ "newUrl": "https://ctest.malls.iformall.com/img2",
"orgUrl": "https://wx.qlogo.cn"
}
],
- "configUrl": "https://c.malls.iformall.com/C/api",
- "ifStoreApp": "0",
+ "configUrl": "https://ctest.malls.iformall.com/C/api",
+ "businessSwitch": "1",
"ifHaveWebSocket": "0",
- "ifHaveCarModular": "0"
+ "ifHaveCarModular": "1"
},
- "name": "金茂悦茂邻荟",
- "weappId": "wx7c9c7122a91946a7",
- "appVersion": "C.5.1.1"
+ "name": "金泸商务",
+ "weappId": "wx649b3be73c1afe47",
+ "appVersion": "C.test.5.2.0"
},
"debug": false,
"tabBar": {
@@ -75,7 +66,8 @@
"selectedIconPath": "assets/images/user-a.png"
}
],
- "custom": true
+ "color": "#abb1be",
+ "selectedColor": "#b2743d"
},
"window": {
"backgroundTextStyle": "dark",
@@ -83,7 +75,17 @@
"navigationBarTitleText": "",
"navigationBarBackgroundColor": "#FFFFFF"
},
- "extAppid": "wx7c9c7122a91946a7",
+ "plugins": {
+ "auto-points-plugin": {
+ "version": "1.3.0",
+ "provider": "wxfab2bf944bfc4da6"
+ },
+ "live-player-plugin": {
+ "version": "1.3.4",
+ "provider": "wx2b03c6e691cd7370"
+ }
+ },
+ "extAppid": "wx649b3be73c1afe47",
"extEnable": true,
"permission": {
"scope.userLocation": {
diff --git a/index/passCar.js b/index/passCar.js
index 3b186f0..227aa6a 100644
--- a/index/passCar.js
+++ b/index/passCar.js
@@ -54,6 +54,7 @@ Page({
generalPayPath: '',
generalExtraData: {},
goHomeUrl: "",
+ supportPay: ""
},
getMoreList(e) {
let totalNum = this.data.ticketList.length;
@@ -192,6 +193,33 @@ Page({
}
},
+ callPay(data) {
+ wx.requestPayment({
+ timeStamp: data.timeStamp,
+ nonceStr: data.nonceStr,
+ package: data.package,
+ signType: data.signType ? data.signType : "MD5",
+ paySign: res.data.paySign,
+ success: res => {
+ wx.showLoading({
+ title: '订单正在处理中...',
+ })
+ this.showList()
+ },
+ fail: res => {
+ wx.hideLoading();
+ wx.showToast({
+ title: '支付失败',
+ icon: 'error'
+ })
+ /**
+ * 支付失败,需要更新订单的状态
+ */
+ },
+ complete: res => { }
+ });
+ },
+
//停车费用为0
paySuccess: function () {
wx.showModal({
@@ -201,6 +229,22 @@ Page({
})
},
+ // supportPay等于1时
+ goToPay() {
+ Http.post({
+ url: '/car/createPayOrder',
+ data: {
+ carNumber: this.data.listCardNum,
+ carFee: String(this.data.stopFees.remainingFee * 100)
+ }
+ }).then(res => {
+ const data = res.data
+ this.callPay(data)
+ }).catch(err => {
+
+ })
+ },
+
gotomange: function () {
wx.navigateTo({
url: '/pages/managelicenseplate/managelicenseplate',
@@ -236,6 +280,13 @@ Page({
url: '/pages/passCar/couponList/couponList',
})
},
+
+ showList: function () {
+ wx.navigateTo({
+ url: '/pages/passCar/showList/showList',
+ })
+ },
+
gotodetail: function (e) {
wx.showModal({
title: '缴费规则',
@@ -631,6 +682,15 @@ Page({
if (res.data.token) {
app.globalData.etcpToken = res.data.token;
}
+ if (res.data.supportPay && res.data.supportPay == 1) {
+ that.setData({
+ supportPay: 1
+ })
+ } else {
+ that.setData({
+ supportPay: 0
+ })
+ }
/**
* 获得停车费用
*/
@@ -912,7 +972,8 @@ Page({
},
timecha: res.data.duration
});
- } else {
+ } else { // *#06#
+
// var extraDataStr = {
// params: {
// token: app.globalData.etcpToken,
@@ -934,8 +995,7 @@ Page({
generalAppId: res.data.appId,
generalPayPath: res.data.payPath,
generalExtraData: res.data.extraData,
- extraDataFlag: JSON.stringify(res.data.extraData),
-
+ extraDataFlag: JSON.stringify(res.data.extraData)
});
console.log(that.data.extraDataFlag, "123456789")
}
diff --git a/index/passCar.wxml b/index/passCar.wxml
index 50daf4a..e489fdf 100644
--- a/index/passCar.wxml
+++ b/index/passCar.wxml
@@ -60,28 +60,28 @@
系统提示:
-->
-
+
立即支付
立即支付
-
+
立即支付
立即支付
-
+
立即支付
立即支付
-
+
立即支付
@@ -89,7 +89,7 @@
-
+
立即支付
@@ -97,7 +97,10 @@
- 立即支付
+
+ 立即支付
+
+
@@ -109,6 +112,14 @@
车辆入场后,才能绑车牌
+
+
+ 我的支付订单
+
+
+
+
+
我的停车券
diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml
index fadc9ee..567328c 100644
--- a/pages/coupon/detail/index.wxml
+++ b/pages/coupon/detail/index.wxml
@@ -164,7 +164,8 @@
首页
+ {{priceAndStockObj.salePrice/100}}元马上购买
+
\ No newline at end of file
diff --git a/pages/passCar/showList/showList.wxss b/pages/passCar/showList/showList.wxss
index f962e3e..fc702cc 100644
--- a/pages/passCar/showList/showList.wxss
+++ b/pages/passCar/showList/showList.wxss
@@ -25,4 +25,12 @@ page {
right: 40rpx;
top: 50%;
transform: translateY(-50%);
+}
+
+.list .item .notice {
+ position: absolute;
+ right: 40rpx;
+ top: 25rpx;
+ transform: translateY(-50%);
+ color: #ff0000;
}
\ No newline at end of file
From 16544227cecf04960d2c557e56ea069e48f897a8 Mon Sep 17 00:00:00 2001
From: XiaoXinPro 14 IAH5R <568170040@qq.com>
Date: Fri, 17 Feb 2023 16:17:55 +0800
Subject: [PATCH 6/6] upload
---
index/passCar.js | 7 ++++++-
index/passCar.wxml | 3 +--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/index/passCar.js b/index/passCar.js
index 227aa6a..ef2a825 100644
--- a/index/passCar.js
+++ b/index/passCar.js
@@ -238,10 +238,15 @@ Page({
carFee: String(this.data.stopFees.remainingFee * 100)
}
}).then(res => {
+ console.log(res, 'res');
const data = res.data
this.callPay(data)
}).catch(err => {
-
+ wx.showToast({
+ title: err.message,
+ icon: 'none',
+ mask: true
+ })
})
},
diff --git a/index/passCar.wxml b/index/passCar.wxml
index e489fdf..a901b26 100644
--- a/index/passCar.wxml
+++ b/index/passCar.wxml
@@ -97,8 +97,7 @@
-
- 立即支付
+ 立即支付