diff --git a/commons/js/utils/stringEncrypt.js b/commons/js/utils/stringEncrypt.js
index 980941b..0e50452 100644
--- a/commons/js/utils/stringEncrypt.js
+++ b/commons/js/utils/stringEncrypt.js
@@ -134,6 +134,7 @@ let combineUrl = (DATA) => {
let toEncrypt = (DATA) => {
// let secretKey = randomString()
let data = combineUrl(DATA)
+ //console.log(data)//加密原始数据
return md5.hex_md5(data);
}
diff --git a/pages/order/edit/index2.js b/pages/order/edit/index2.js
index dd36f99..614d437 100644
--- a/pages/order/edit/index2.js
+++ b/pages/order/edit/index2.js
@@ -269,7 +269,6 @@ Page({
/*匹配其他信息*/
//匹配付款方式
if(res.data.payway==0||res.data.payway==1){
- console.log(434343)
let paymentIndex = -1
if(res.data.payway==0){
paymentIndex = 1
@@ -1085,7 +1084,7 @@ Page({
}
if(e.currentTarget.dataset.type=='price'){
this.setData({
- ['fines['+e.currentTarget.dataset.index+'].price']:e.detail.value,
+ ['fines['+e.currentTarget.dataset.index+'].price']:Number(e.detail.value),
})
let fine_total = 0
this.data.fines.forEach(item => {
diff --git a/pages/order/edit/index2.wxml b/pages/order/edit/index2.wxml
index d1148e6..690652f 100644
--- a/pages/order/edit/index2.wxml
+++ b/pages/order/edit/index2.wxml
@@ -307,6 +307,16 @@
+
+
+
+ {{item.txt}}
+
+
+
+
+
+
@@ -452,6 +462,14 @@
+
+
+
+ {{item.txt}}
+ {{item.price}}元
+
+
+
需开具本地发票
{{if_local_bill?'需要':'不需要'}}
diff --git a/pages/order/register/index.js b/pages/order/register/index.js
index 4a96ef3..0532dcd 100644
--- a/pages/order/register/index.js
+++ b/pages/order/register/index.js
@@ -298,6 +298,12 @@ Page({
userInfo: res,
})
+ if(res.biz_type == 3){
+ this.setData({
+ fines:[{"id":"-1","txt":"服务费","price":"0"}],//身份证
+ })
+ }
+
if(res.biz_name == '测试门店'){
this.setData({
cardid:'350000202101010000',//身份证
@@ -1032,7 +1038,7 @@ Page({
}
if(e.currentTarget.dataset.type=='price'){
this.setData({
- ['fines['+e.currentTarget.dataset.index+'].price']:e.detail.value,
+ ['fines['+e.currentTarget.dataset.index+'].price']:Number(e.detail.value),
})
let fine_total = 0
this.data.fines.forEach(item => {
diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml
index 5e43134..baa2f70 100644
--- a/pages/order/register/index.wxml
+++ b/pages/order/register/index.wxml
@@ -349,6 +349,16 @@
+
+
+
+ {{item.txt}}
+
+
+
+
+
+
特别约定
@@ -568,6 +578,14 @@
+
+
+
+ {{item.txt}}
+ {{item.price}}元
+
+
+
需开具本地发票
{{if_local_bill?'需要':'不需要'}}