diff --git a/components/shop/shop.js b/components/shop/shop.js
new file mode 100644
index 0000000..0a51677
--- /dev/null
+++ b/components/shop/shop.js
@@ -0,0 +1,12 @@
+// c:\Users\Holy-Knight-IX\Desktop\Working Space\3.TikTok-MiniPro\ttc\components\shop\shop.js
+Component({
+ data: {
+
+ },
+ properties: {
+
+ },
+ methods: {
+
+ }
+})
\ No newline at end of file
diff --git a/components/shop/shop.json b/components/shop/shop.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/components/shop/shop.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/components/shop/shop.ttml b/components/shop/shop.ttml
new file mode 100644
index 0000000..a95926b
--- /dev/null
+++ b/components/shop/shop.ttml
@@ -0,0 +1,2 @@
+
+c:\Users\Holy-Knight-IX\Desktop\Working Space\3.TikTok-MiniPro\ttc\components\shop\shop.ttml
\ No newline at end of file
diff --git a/components/shop/shop.ttss b/components/shop/shop.ttss
new file mode 100644
index 0000000..1d36417
--- /dev/null
+++ b/components/shop/shop.ttss
@@ -0,0 +1 @@
+/* c:\Users\Holy-Knight-IX\Desktop\Working Space\3.TikTok-MiniPro\ttc\components\shop\shop.ttss */
\ No newline at end of file
diff --git a/ext.json b/ext.json
index 26298d9..bd289e8 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": "tt9f35e988000a035401"
+ "name": "富茂券券集团版",
+ "weappId": "tt620e14b3fd30264101"
},
"window": {
"backgroundTextStyle": "light",
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#fff"
},
- "extAppid": "tt9f35e988000a035401",
+ "extAppid": "tt620e14b3fd30264101",
"extEnable": true,
"directCommit": false,
"networkTimeout": {
diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js
index ba76fc4..53d39ab 100644
--- a/pages/coupon/detail/index.js
+++ b/pages/coupon/detail/index.js
@@ -598,20 +598,33 @@ Page({
couponChannelId: couponChannelId
}
}).then(res => {
- if (res.data && res.data.length) {
- let merchantVoList = res.data
- let idList = []
- merchantVoList.map(item => {
- idList.push(item.id)
- })
- this.setData({
- idList: idList
- })
- this.getCouponList(idList) //获取推荐列表
- }
- this.setData({
- merchantVoList: res.data
+ console.log(res.data, 'Merchant')
+ const keys = Object.keys(res.data)
+ const mallList = []
+ keys.forEach(item => {
+ const arr = item.split('|')
+ const obj = {
+ tenantId: arr[0],
+ mallName: arr[1],
+ merchantVoList: res.data[item]
+ }
+ mallList.push(obj)
})
+ console.log(mallList, 'mallList');
+ // if (res.data && res.data.length) {
+ // let merchantVoList = res.data
+ // let idList = []
+ // merchantVoList.map(item => {
+ // idList.push(item.id)
+ // })
+ // this.setData({
+ // idList: idList
+ // })
+ // this.getCouponList(idList) //获取推荐列表
+ // }
+ // this.setData({
+ // merchantVoList: res.data
+ // })
})
},
diff --git a/pages/coupon/detail/index.ttml b/pages/coupon/detail/index.ttml
index c2f2a69..e62a8c7 100644
--- a/pages/coupon/detail/index.ttml
+++ b/pages/coupon/detail/index.ttml
@@ -49,9 +49,9 @@
{{data.title}}电子卡
-
-
-
+
+
+
定金:
@@ -77,18 +77,21 @@
积分
- {{priceAndStockObj.price/100}}元
+ {{priceAndStockObj.price/100}}元
{{priceAndStockObj.price/100}}小时
-
+
{{priceAndStockObj.salePrice/100}}
{{data.pressLimitNum+'人可砍至底价'}}
{{priceAndStockObj.price/100}}元
- {{'已售'+(priceAndStockObj.inventory-priceAndStockObj.remainInventory)+'|'+'库存'+priceAndStockObj.remainInventory}}
+
+ {{'已售'+(priceAndStockObj.inventory-priceAndStockObj.remainInventory)+'|'+'库存'+priceAndStockObj.remainInventory}}
+
-
+
- 购买须知
+ 购买须知
有效期
• {{validStartDate}}至{{validEndDate}}
可用时间
• 商家营业时间内到店使用
• 周末不支持使用
- • 节假日(元旦、春节、清明、劳动节、端午节、中秋节、国庆节、情人节、圣诞节)不支持使用
-
+ • 节假日(元旦、春节、清明、劳动节、端午节、中秋节、国庆节、情人节、圣诞节)不支持使用
+
+
购买限制
• 每个用户限购{{data.useLimitQuantity}}单
@@ -149,7 +153,7 @@
• 无需预约,高峰时段可能等位
• {{data.subscribeSing}}
-
+
适用人数
• 该团购劵最多{{data.rec_person_num_max}}人使用
@@ -157,8 +161,9 @@
• 团购券不支持配送或外卖
• 该团购商品{{data.pack=='false'?'不支持':'支持'}}打包
• {{data.besides=="false"?'不可以':'可以'}}外带餐食
-
- • {{data.superimposed_discounts=="false"?'不可以':'可以'}}享受店内其他优惠
+
+ •
+ {{data.superimposed_discounts=="false"?'不可以':'可以'}}享受店内其他优惠
• {{data.private_room=="false"?'不可以使用':'可以使用'}}包间
使用规则
@@ -172,9 +177,10 @@
{{item.content}}
-
+
其他活动
+ style="color: #333;letter-spacing: 0;font-size: 30rpx;height: 70rpx;line-height: 70rpx;margin-left: 35rpx;font-weight: bold;">
+ 其他活动
-
+
-