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 a76f587..bd289e8 100644
--- a/ext.json
+++ b/ext.json
@@ -3,7 +3,7 @@
"attr": {
"configUrl": "https://ctest.malls.iformall.com/C/api"
},
- "name": "福喵",
+ "name": "富茂券券集团版",
"weappId": "tt620e14b3fd30264101"
},
"window": {
diff --git a/index/user.js b/index/user.js
index 62841c3..87d3cca 100644
--- a/index/user.js
+++ b/index/user.js
@@ -10,7 +10,7 @@ Page({
text: "授权手机号",
avatarUrl: "",
nickName: "",
- mouldType:1,
+ mouldType: 1,
},
showPhoemBtn() {
@@ -23,7 +23,7 @@ Page({
let url = e.currentTarget.dataset.url
console.log(url);
if (url == '/pages/order/index/index?id=all') {
- app.globalData.ifshowtab=false
+ app.globalData.ifshowtab = false
tt.navigateTo({
url: url,
success: (res) => {
@@ -64,6 +64,13 @@ Page({
},
});
},
+
+ goSetUserInfo() {
+ tt.navigateTo({
+ url: '/pages/getuserinfo/getuserinfo?mineFlag=mine',
+ });
+ },
+
getmemberId: function (token) {
Http.get({
url: config.api.getScore,
@@ -92,19 +99,19 @@ Page({
})
tt.reLaunch({
url: "/index/index",
- success(res) {
- console.log(`${res}`);
- app.globalData.selected = 0
- },
- fail(err) {
- console.log(`navigateTo调用失败`,err);
- },
+ success(res) {
+ console.log(`${res}`);
+ app.globalData.selected = 0
+ },
+ fail(err) {
+ console.log(`navigateTo调用失败`, err);
+ },
});
// tt.showToast({
// title: '取消授权', // 内容
// icon: 'none', // 图标
// success: (res) => {
-
+
// },
// fail: (res) => {
@@ -112,9 +119,9 @@ Page({
// });
},
onShow: function (options) {
-
+
this.setData({
- mouldType:app.globalData.mouldType
+ mouldType: app.globalData.mouldType
})
this.getmemberId()
Http.get({
@@ -127,24 +134,24 @@ Page({
url: config.api.checkPhoneStatus,
}).then(res => {
this.setData({
- text:res.data.phone
+ text: res.data.phone
})
}).catch(err => {
-
- if(app.globalData.ifCongPh==1){
+
+ if (app.globalData.ifCongPh == 1) {
tt.navigateTo({
url: '/pages/getPhone/getPhone?mineFlag=mine',
});
- }else{
+ } else {
this.setData({
- showPhoem:true
+ showPhoem: true
})
}
-
+
})
}).catch(err => {
- if (err.code == 11004) {//未授权抖音
+ if (err.code == 11004) { //未授权抖音
app.globalData.type = 'uc'
tt.navigateTo({
url: '/pages/getuserinfo/getuserinfo',
diff --git a/index/user.ttml b/index/user.ttml
index 3cc4986..2946f67 100644
--- a/index/user.ttml
+++ b/index/user.ttml
@@ -4,29 +4,36 @@
-->
-
-
+
+
- {{nickName}}
+ {{nickName}}
- {{text}}
+ {{text}}
-
-
+
+
+
+
个人信息
-
+
+
+
我的订单
-
+
+
+
我的券包
-
+
- 更多服务
+ 更多服务
-
+
-
-
-
+
+
+
关于我们
-
-
-
+
+
+
服务资质
-
+
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/pages/coupon/confirmation/confirmation.js b/pages/coupon/confirmation/confirmation.js
index 97ce928..0064613 100644
--- a/pages/coupon/confirmation/confirmation.js
+++ b/pages/coupon/confirmation/confirmation.js
@@ -894,12 +894,15 @@ Page({
* 将值传到用户手机号授权的页面
*
*/
- // tt.navigateTo({
- // url: `/pages/getPhone/getPhone?couponChannelId=${that.data.couponChannelId}&path=qr`
- // });
- this.setData({
- showPhoem: true
- })
+ if (app.globalData.ifCongPh == 1) {
+ tt.navigateTo({
+ url: `/pages/getPhone/getPhone?couponChannelId=${that.data.couponChannelId}&path=qr`,
+ });
+ } else {
+ this.setData({
+ showPhoem: true
+ })
+ }
} else if (err.code == 11006) {
// 用户手机已加密
tt.navigateTo({
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;">
+ 其他活动
-
+
-