From 1145be18f1d866b992a95ee71f10fc1af5c1573b Mon Sep 17 00:00:00 2001
From: YWQ HK IX <568170040@qq.com>
Date: Sat, 26 Nov 2022 15:35:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ext.json | 8 ++++----
index/index.ttml | 22 +++++++++++-----------
index/user.ttml | 4 ++--
pages/coupon/confirmation/confirmation.js | 4 +---
pages/coupon/detail/index.ttml | 5 +++--
pages/order/detail/index.js | 4 +---
project.config.json | 14 ++++++++++++--
7 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/ext.json b/ext.json
index 82d0f4c..a76f587 100644
--- a/ext.json
+++ b/ext.json
@@ -1,17 +1,17 @@
{
"ext": {
"attr": {
- "configUrl": "https://c.malls.iformall.com/C/api"
+ "configUrl": "https://ctest.malls.iformall.com/C/api"
},
- "name": "精选常德",
- "weappId": "tt1e4668fb8178581401"
+ "name": "福喵",
+ "weappId": "tt620e14b3fd30264101"
},
"window": {
"backgroundTextStyle": "light",
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#fff"
},
- "extAppid": "tt1e4668fb8178581401",
+ "extAppid": "tt620e14b3fd30264101",
"extEnable": true,
"directCommit": false,
"networkTimeout": {
diff --git a/index/index.ttml b/index/index.ttml
index eed13d3..d72704a 100644
--- a/index/index.ttml
+++ b/index/index.ttml
@@ -97,7 +97,7 @@
-
+
@@ -171,19 +171,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -195,7 +195,7 @@
-
+
diff --git a/index/user.ttml b/index/user.ttml
index ea9a743..3cc4986 100644
--- a/index/user.ttml
+++ b/index/user.ttml
@@ -46,12 +46,12 @@
投诉建议
-->
-
+
diff --git a/pages/coupon/confirmation/confirmation.js b/pages/coupon/confirmation/confirmation.js
index 4f4cbbf..9422aa8 100644
--- a/pages/coupon/confirmation/confirmation.js
+++ b/pages/coupon/confirmation/confirmation.js
@@ -488,9 +488,7 @@ Page({
}
}).then(res => {
console.log(res,"789789");
- let tempCallbackData = {
- composeOrderId:res.data.outOrderNo
- }
+ let tempCallbackData = res.data.callbackData
// tempCallbackData[that.data.data.couponChannel.ttSpuId] = that.data.data.couponChannel.id
let options = {
callbackData: tempCallbackData,
diff --git a/pages/coupon/detail/index.ttml b/pages/coupon/detail/index.ttml
index c02fc7e..c2f2a69 100644
--- a/pages/coupon/detail/index.ttml
+++ b/pages/coupon/detail/index.ttml
@@ -107,6 +107,7 @@
¥{{item.priceStr}}
+
餐饮搭配
商品描述
@@ -344,11 +345,11 @@
-
+
diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js
index 1585a30..270dd77 100644
--- a/pages/order/detail/index.js
+++ b/pages/order/detail/index.js
@@ -731,9 +731,7 @@ Page({
}
}).then(res => {
if (res.data.createPay) {
- let tempCallbackData = {
- composeOrderId: res.data.outOrderNo
- }
+ let tempCallbackData = res.data.callbackData
// tempCallbackData[that.data.data.couponChannel.ttSpuId] = that.data.data.couponChannel.id
let options = {
callbackData: tempCallbackData,
diff --git a/project.config.json b/project.config.json
index 765075c..a557d6c 100644
--- a/project.config.json
+++ b/project.config.json
@@ -10,7 +10,8 @@
"scripts": false,
"mockLogin": false,
"autoCompile": true,
- "localPlugins": false
+ "localPlugins": false,
+ "IDEPreviewHotRestartCache": false
},
"appid": "ttde7ca8c141425a2301",
"projectname": "tt富茂C",
@@ -44,8 +45,17 @@
"scene": "990001",
"launchFrom": "scan",
"location": "qr_code"
+ },
+ {
+ "id": 1665480010958,
+ "name": "pages/coupon/detail/index",
+ "pathName": "pages/coupon/detail/index",
+ "query": "",
+ "scene": "",
+ "launchFrom": "",
+ "location": ""
}
]
}
}
-}
\ No newline at end of file
+}