@@ -0,0 +1,12 @@ | |||||
// c:\Users\Holy-Knight-IX\Desktop\Working Space\3.TikTok-MiniPro\ttc\components\shop\shop.js | |||||
Component({ | |||||
data: { | |||||
}, | |||||
properties: { | |||||
}, | |||||
methods: { | |||||
} | |||||
}) |
@@ -0,0 +1,4 @@ | |||||
{ | |||||
"component": true, | |||||
"usingComponents": {} | |||||
} |
@@ -0,0 +1,2 @@ | |||||
<!-- c:\Users\Holy-Knight-IX\Desktop\Working Space\3.TikTok-MiniPro\ttc\components\shop\shop.ttml --> | |||||
<text>c:\Users\Holy-Knight-IX\Desktop\Working Space\3.TikTok-MiniPro\ttc\components\shop\shop.ttml</text> |
@@ -0,0 +1 @@ | |||||
/* c:\Users\Holy-Knight-IX\Desktop\Working Space\3.TikTok-MiniPro\ttc\components\shop\shop.ttss */ |
@@ -3,7 +3,7 @@ | |||||
"attr": { | "attr": { | ||||
"configUrl": "https://ctest.malls.iformall.com/C/api" | "configUrl": "https://ctest.malls.iformall.com/C/api" | ||||
}, | }, | ||||
"name": "福喵", | |||||
"name": "富茂券券集团版", | |||||
"weappId": "tt620e14b3fd30264101" | "weappId": "tt620e14b3fd30264101" | ||||
}, | }, | ||||
"window": { | "window": { | ||||
@@ -10,7 +10,7 @@ Page({ | |||||
text: "授权手机号", | text: "授权手机号", | ||||
avatarUrl: "", | avatarUrl: "", | ||||
nickName: "", | nickName: "", | ||||
mouldType:1, | |||||
mouldType: 1, | |||||
}, | }, | ||||
showPhoemBtn() { | showPhoemBtn() { | ||||
@@ -23,7 +23,7 @@ Page({ | |||||
let url = e.currentTarget.dataset.url | let url = e.currentTarget.dataset.url | ||||
console.log(url); | console.log(url); | ||||
if (url == '/pages/order/index/index?id=all') { | if (url == '/pages/order/index/index?id=all') { | ||||
app.globalData.ifshowtab=false | |||||
app.globalData.ifshowtab = false | |||||
tt.navigateTo({ | tt.navigateTo({ | ||||
url: url, | url: url, | ||||
success: (res) => { | success: (res) => { | ||||
@@ -64,6 +64,13 @@ Page({ | |||||
}, | }, | ||||
}); | }); | ||||
}, | }, | ||||
goSetUserInfo() { | |||||
tt.navigateTo({ | |||||
url: '/pages/getuserinfo/getuserinfo?mineFlag=mine', | |||||
}); | |||||
}, | |||||
getmemberId: function (token) { | getmemberId: function (token) { | ||||
Http.get({ | Http.get({ | ||||
url: config.api.getScore, | url: config.api.getScore, | ||||
@@ -92,19 +99,19 @@ Page({ | |||||
}) | }) | ||||
tt.reLaunch({ | tt.reLaunch({ | ||||
url: "/index/index", | 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({ | // tt.showToast({ | ||||
// title: '取消授权', // 内容 | // title: '取消授权', // 内容 | ||||
// icon: 'none', // 图标 | // icon: 'none', // 图标 | ||||
// success: (res) => { | // success: (res) => { | ||||
// }, | // }, | ||||
// fail: (res) => { | // fail: (res) => { | ||||
@@ -112,9 +119,9 @@ Page({ | |||||
// }); | // }); | ||||
}, | }, | ||||
onShow: function (options) { | onShow: function (options) { | ||||
this.setData({ | this.setData({ | ||||
mouldType:app.globalData.mouldType | |||||
mouldType: app.globalData.mouldType | |||||
}) | }) | ||||
this.getmemberId() | this.getmemberId() | ||||
Http.get({ | Http.get({ | ||||
@@ -127,24 +134,24 @@ Page({ | |||||
url: config.api.checkPhoneStatus, | url: config.api.checkPhoneStatus, | ||||
}).then(res => { | }).then(res => { | ||||
this.setData({ | this.setData({ | ||||
text:res.data.phone | |||||
text: res.data.phone | |||||
}) | }) | ||||
}).catch(err => { | }).catch(err => { | ||||
if(app.globalData.ifCongPh==1){ | |||||
if (app.globalData.ifCongPh == 1) { | |||||
tt.navigateTo({ | tt.navigateTo({ | ||||
url: '/pages/getPhone/getPhone?mineFlag=mine', | url: '/pages/getPhone/getPhone?mineFlag=mine', | ||||
}); | }); | ||||
}else{ | |||||
} else { | |||||
this.setData({ | this.setData({ | ||||
showPhoem:true | |||||
showPhoem: true | |||||
}) | }) | ||||
} | } | ||||
}) | }) | ||||
}).catch(err => { | }).catch(err => { | ||||
if (err.code == 11004) {//未授权抖音 | |||||
if (err.code == 11004) { //未授权抖音 | |||||
app.globalData.type = 'uc' | app.globalData.type = 'uc' | ||||
tt.navigateTo({ | tt.navigateTo({ | ||||
url: '/pages/getuserinfo/getuserinfo', | url: '/pages/getuserinfo/getuserinfo', | ||||
@@ -4,29 +4,36 @@ | |||||
<navbar tt:if="{{mouldType!=1}}" text="我的" background='#FD832D' color="#fff"></navbar> --> | <navbar tt:if="{{mouldType!=1}}" text="我的" background='#FD832D' color="#fff"></navbar> --> | ||||
<!-- <view style="height:{{navigationBarHeight}} "></view> --> | <!-- <view style="height:{{navigationBarHeight}} "></view> --> | ||||
<view class="{{mouldType==1?'userBg1':'userBg'}}"> | <view class="{{mouldType==1?'userBg1':'userBg'}}"> | ||||
<view class="userLogo" style="{{mouldType==1?'':'background: linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%);'}}"> | |||||
<image style="width: 100%;height:100%;border-radius: 50%;" src="{{avatarUrl}}" /> | |||||
<view class="userLogo" | |||||
style="{{mouldType==1?'':'background: linear-gradient(180deg,rgba(253,131,45,1) 0%,rgba(254,74,22,1) 100%);'}}"> | |||||
<image style="width: 100%;height:100%;border-radius: 50%;" src="{{avatarUrl}}" bindtap="goSetUserInfo" /> | |||||
<!-- <open-data class="open" type="userAvatarUrl"></open-data> --> | <!-- <open-data class="open" type="userAvatarUrl"></open-data> --> | ||||
</view> | </view> | ||||
<view class="userData" style="{{mouldType==1?'#000':'#ffffff'}}"> | <view class="userData" style="{{mouldType==1?'#000':'#ffffff'}}"> | ||||
<view class="noInfo" >{{nickName}}</view> | |||||
<view class="noInfo">{{nickName}}</view> | |||||
<!-- <open-data class="noInfo" type="userNickName"></open-data> --> | <!-- <open-data class="noInfo" type="userNickName"></open-data> --> | ||||
<view class="{{mouldType==1?'infoX':'info'}}" bindtap="showPhoemBtn">{{text}}</view> | |||||
<view class="{{mouldType==1?'infoX':'info'}}" bindtap="showPhoemBtn">{{text}}</view> | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<view class="tempBpx"> | <view class="tempBpx"> | ||||
<view class="functionBox"> | <view class="functionBox"> | ||||
<view class="itemBox" bindtap="go" data-url="/pages/edit/edit"> | |||||
<view class="itemLogoBox"><image class="itemLogo" src="../assets/images/userInfo.png" /></view> | |||||
<view class="itemBox" bindtap="go" data-url="/pages/edit/edit"> | |||||
<view class="itemLogoBox"> | |||||
<image class="itemLogo" src="../assets/images/userInfo.png" /> | |||||
</view> | |||||
<view class="itemNAme">个人信息</view> | <view class="itemNAme">个人信息</view> | ||||
</view> | </view> | ||||
<view class="itemBox" bindtap="go" data-url="/pages/order/index/index?id=all"> | <view class="itemBox" bindtap="go" data-url="/pages/order/index/index?id=all"> | ||||
<view class="itemLogoBox"><image class="itemLogo" src="../assets/images/userDd.png" /></view> | |||||
<view class="itemLogoBox"> | |||||
<image class="itemLogo" src="../assets/images/userDd.png" /> | |||||
</view> | |||||
<view class="itemNAme">我的订单</view> | <view class="itemNAme">我的订单</view> | ||||
</view> | </view> | ||||
<view class="itemBox" bindtap="go" data-url="/pages/couponorder/index/index"> | <view class="itemBox" bindtap="go" data-url="/pages/couponorder/index/index"> | ||||
<view class="itemLogoBox"><image class="itemLogo" src="../assets/images/userQuan.png" /></view> | |||||
<view class="itemLogoBox"> | |||||
<image class="itemLogo" src="../assets/images/userQuan.png" /> | |||||
</view> | |||||
<view class="itemNAme">我的券包</view> | <view class="itemNAme">我的券包</view> | ||||
</view> | </view> | ||||
<!-- <view class="itemBox" bindtap="go" data-url="/pages/integralmall/index"> | <!-- <view class="itemBox" bindtap="go" data-url="/pages/integralmall/index"> | ||||
@@ -35,9 +42,9 @@ | |||||
</view> --> | </view> --> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
<view class="moreBox"> | <view class="moreBox"> | ||||
<view class="fuwu">更多服务</view> | |||||
<view class="fuwu">更多服务</view> | |||||
<view class="fuwuItemBox"> | <view class="fuwuItemBox"> | ||||
<!-- <view class="fuwuItem"> | <!-- <view class="fuwuItem"> | ||||
<navigator class="fuwuLogoBox" url="/pages/complaint/complaint" hover-class="navigator-hover" open-type="navigate"> | <navigator class="fuwuLogoBox" url="/pages/complaint/complaint" hover-class="navigator-hover" open-type="navigate"> | ||||
@@ -45,36 +52,38 @@ | |||||
</navigator> | </navigator> | ||||
<view class="fuwuName">投诉建议</view> | <view class="fuwuName">投诉建议</view> | ||||
</view> --> | </view> --> | ||||
<!-- <navigator class="fuwuItem" url="/pages/questionnaire/questionnaireLsit/questionnaireLsit" hover-class="navigator-hover" open-type="navigate"> | <!-- <navigator class="fuwuItem" url="/pages/questionnaire/questionnaireLsit/questionnaireLsit" hover-class="navigator-hover" open-type="navigate"> | ||||
<view class="fuwuLogoBox f" > | <view class="fuwuLogoBox f" > | ||||
<image class="itemLogo" src="../assets/images/wenquan.png" /> | <image class="itemLogo" src="../assets/images/wenquan.png" /> | ||||
</view> | </view> | ||||
<view class="fuwuName f">问卷调查</view> | <view class="fuwuName f">问卷调查</view> | ||||
</navigator> --> | </navigator> --> | ||||
<navigator class="fuwuItem" url="/pages/mallInfo/mallInfo" hover-class="navigator-hover" open-type="navigate"> | |||||
<view class="fuwuLogoBox f" > | |||||
<image class="itemLogo" src="../assets/images/mian1.png" /> | |||||
<navigator class="fuwuItem" url="/pages/mallInfo/mallInfo" hover-class="navigator-hover" | |||||
open-type="navigate"> | |||||
<view class="fuwuLogoBox f"> | |||||
<image class="itemLogo" src="../assets/images/mian1.png" /> | |||||
</view> | </view> | ||||
<view class="fuwuName f">关于我们</view> | <view class="fuwuName f">关于我们</view> | ||||
</navigator> | </navigator> | ||||
<button class="fuwuItem" open-type="contact"> | <button class="fuwuItem" open-type="contact"> | ||||
<view class="fuwuLogoBox f" > | |||||
<image class="itemLogo" src="../assets/images/service1.png" /> | |||||
<view class="fuwuLogoBox f"> | |||||
<image class="itemLogo" src="../assets/images/service1.png" /> | |||||
</view> | </view> | ||||
<view class="fuwuName f">在线客服</view> | <view class="fuwuName f">在线客服</view> | ||||
</button> | </button> | ||||
<navigator class="fuwuItem" url="/pages/certification/certification" hover-class="navigator-hover" open-type="navigate"> | |||||
<view class="fuwuLogoBox f" > | |||||
<image class="itemLogo" src="../assets/images/aptitude1.png" /> | |||||
<navigator class="fuwuItem" url="/pages/certification/certification" hover-class="navigator-hover" | |||||
open-type="navigate"> | |||||
<view class="fuwuLogoBox f"> | |||||
<image class="itemLogo" src="../assets/images/aptitude1.png" /> | |||||
</view> | </view> | ||||
<view class="fuwuName f">服务资质</view> | <view class="fuwuName f">服务资质</view> | ||||
</navigator> | </navigator> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
<phoem showBox="{{showPhoem}}" bind:hiePhoen="setPhone" bind:heiBox="setBox"></phoem> | <phoem showBox="{{showPhoem}}" bind:hiePhoen="setPhone" bind:heiBox="setBox"></phoem> | ||||
</view> | |||||
<tabbar/> | |||||
</view> | |||||
<tabbar /> |
@@ -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) { | } else if (err.code == 11006) { | ||||
// 用户手机已加密 | // 用户手机已加密 | ||||
tt.navigateTo({ | tt.navigateTo({ | ||||
@@ -598,20 +598,33 @@ Page({ | |||||
couponChannelId: couponChannelId | couponChannelId: couponChannelId | ||||
} | } | ||||
}).then(res => { | }).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 | |||||
// }) | |||||
}) | }) | ||||
}, | }, | ||||
@@ -49,9 +49,9 @@ | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<text class='title'>{{data.title}}<text class="elecard" tt:if="{{data.type==100}}">电子卡</text></text> | <text class='title'>{{data.title}}<text class="elecard" tt:if="{{data.type==100}}">电子卡</text></text> | ||||
<!-- 预购 --> | <!-- 预购 --> | ||||
<view class="moneyBox" tt:if="{{data.type==10}}"> | <view class="moneyBox" tt:if="{{data.type==10}}"> | ||||
<view class="earnest">定金:</view> | <view class="earnest">定金:</view> | ||||
@@ -77,18 +77,21 @@ | |||||
<text class='jifen'>积分</text> | <text class='jifen'>积分</text> | ||||
</view> | </view> | ||||
<text class='throgh' tt:if="{{data.unit==0&&data.type!=50&&data.type!=51}}">{{priceAndStockObj.price/100}}元</text> | |||||
<text class='throgh' | |||||
tt:if="{{data.unit==0&&data.type!=50&&data.type!=51}}">{{priceAndStockObj.price/100}}元</text> | |||||
<text tt:if="{{data.unit==1&&data.type!=50&&data.type!=51}}">{{priceAndStockObj.price/100}}小时</text> | <text tt:if="{{data.unit==1&&data.type!=50&&data.type!=51}}">{{priceAndStockObj.price/100}}小时</text> | ||||
</view> | </view> | ||||
<view class="fl" tt:if="{{data.type==8}}"> | <view class="fl" tt:if="{{data.type==8}}"> | ||||
<text class="pri01">{{priceAndStockObj.salePrice/100}}</text> | <text class="pri01">{{priceAndStockObj.salePrice/100}}</text> | ||||
<text class='presslimit' tt:if="{{data.type==8}}"><text>{{data.pressLimitNum+'人可砍至底价'}}</text></text> | <text class='presslimit' tt:if="{{data.type==8}}"><text>{{data.pressLimitNum+'人可砍至底价'}}</text></text> | ||||
<text class='throgh'>{{priceAndStockObj.price/100}}元</text> | <text class='throgh'>{{priceAndStockObj.price/100}}元</text> | ||||
</view> | </view> | ||||
<view class="sellBox"> {{'已售'+(priceAndStockObj.inventory-priceAndStockObj.remainInventory)+'|'+'库存'+priceAndStockObj.remainInventory}}</view> | |||||
<view class="sellBox"> | |||||
{{'已售'+(priceAndStockObj.inventory-priceAndStockObj.remainInventory)+'|'+'库存'+priceAndStockObj.remainInventory}} | |||||
</view> | |||||
</view> | </view> | ||||
<!-- <view class="subTitleBox"> | <!-- <view class="subTitleBox"> | ||||
@@ -107,17 +110,17 @@ | |||||
<view class="childMoney">¥{{item.priceStr}}</view> | <view class="childMoney">¥{{item.priceStr}}</view> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
<vieW class="groupTitleBox"> | <vieW class="groupTitleBox"> | ||||
<view class="groupTitle" tt:if="{{data.itemGroup.length>0}}">餐饮搭配</view> | <view class="groupTitle" tt:if="{{data.itemGroup.length>0}}">餐饮搭配</view> | ||||
<view class="groupTitle" tt:if="{{data.Description.length>0}}">商品描述</view> | <view class="groupTitle" tt:if="{{data.Description.length>0}}">商品描述</view> | ||||
</vieW> | </vieW> | ||||
<view class="groupTextBox" tt:if="{{data.itemGroup.length>0}}" tt:for="{{data.itemGroup}}"> | <view class="groupTextBox" tt:if="{{data.itemGroup.length>0}}" tt:for="{{data.itemGroup}}"> | ||||
<view class="groupTitleS">{{item.group_name}}</view> | <view class="groupTitleS">{{item.group_name}}</view> | ||||
<view class="groupDetailsBox" tt:for="{{item.item_list}}" tt:for-item="itemChi"> | <view class="groupDetailsBox" tt:for="{{item.item_list}}" tt:for-item="itemChi"> | ||||
<view class="groupTiemBox" > | |||||
<view class="groupTiemBox"> | |||||
<view class="yuandian"></view> | <view class="yuandian"></view> | ||||
<view class="groupTiemName">{{itemChi.name}}({{itemChi.count}}份)</view> | <view class="groupTiemName">{{itemChi.name}}({{itemChi.count}}份)</view> | ||||
<view class="groupTiemPay">¥{{itemChi.price/100}}</view> | <view class="groupTiemPay">¥{{itemChi.price/100}}</view> | ||||
@@ -131,17 +134,18 @@ | |||||
<!-- 适用门店 --> | <!-- 适用门店 --> | ||||
<store merchantVoList="{{merchantVoList}}" tt:if="{{data.type!=12}}"></store> | |||||
<!-- <store merchantVoList="{{merchantVoList}}" tt:if="{{data.type!=12}}"></store> --> | |||||
<view class='notes'> | <view class='notes'> | ||||
<view class="notesH">购买须知</view> | |||||
<view class="notesH">购买须知</view> | |||||
<view class="timeText">有效期</view> | <view class="timeText">有效期</view> | ||||
<view class="Hchild">• {{validStartDate}}至{{validEndDate}}</view> | <view class="Hchild">• {{validStartDate}}至{{validEndDate}}</view> | ||||
<view class="timeText">可用时间</view> | <view class="timeText">可用时间</view> | ||||
<view class="Hchild">• 商家营业时间内到店使用</view> | <view class="Hchild">• 商家营业时间内到店使用</view> | ||||
<view class="Hchild" tt:if="{{data.can_no_use_date.weekend}}">• 周末不支持使用</view> | <view class="Hchild" tt:if="{{data.can_no_use_date.weekend}}">• 周末不支持使用</view> | ||||
<view class="Hchild" tt:if="{{data.can_no_use_date.HolidaysFlag}}">• 节假日(元旦、春节、清明、劳动节、端午节、中秋节、国庆节、情人节、圣诞节)不支持使用</view> | |||||
<view class="Hchild" tt:if="{{data.can_no_use_date.HolidaysFlag}}">• 节假日(元旦、春节、清明、劳动节、端午节、中秋节、国庆节、情人节、圣诞节)不支持使用 | |||||
</view> | |||||
<view class="timeText">购买限制</view> | <view class="timeText">购买限制</view> | ||||
<view class="Hchild">• 每个用户限购{{data.useLimitQuantity}}单</view> | <view class="Hchild">• 每个用户限购{{data.useLimitQuantity}}单</view> | ||||
@@ -149,7 +153,7 @@ | |||||
<view class="Hchild" tt:if="{{!data.subscribeSing}}">• 无需预约,高峰时段可能等位</view> | <view class="Hchild" tt:if="{{!data.subscribeSing}}">• 无需预约,高峰时段可能等位</view> | ||||
<view class="Hchild" tt:if="{{data.subscribeSing}}">• {{data.subscribeSing}}</view> | <view class="Hchild" tt:if="{{data.subscribeSing}}">• {{data.subscribeSing}}</view> | ||||
<view class="timeText" tt:if="{{data.rec_person_num_max}}">适用人数</view> | <view class="timeText" tt:if="{{data.rec_person_num_max}}">适用人数</view> | ||||
<view class="Hchild" tt:if="{{data.rec_person_num_max}}">• 该团购劵最多{{data.rec_person_num_max}}人使用</view> | <view class="Hchild" tt:if="{{data.rec_person_num_max}}">• 该团购劵最多{{data.rec_person_num_max}}人使用</view> | ||||
@@ -157,8 +161,9 @@ | |||||
<view class="Hchild">• 团购券不支持配送或外卖</view> | <view class="Hchild">• 团购券不支持配送或外卖</view> | ||||
<view class="Hchild" tt:if="{{data.pack}}">• 该团购商品{{data.pack=='false'?'不支持':'支持'}}打包</view> | <view class="Hchild" tt:if="{{data.pack}}">• 该团购商品{{data.pack=='false'?'不支持':'支持'}}打包</view> | ||||
<view class="Hchild" tt:if="{{data.besides}}">• {{data.besides=="false"?'不可以':'可以'}}外带餐食</view> | <view class="Hchild" tt:if="{{data.besides}}">• {{data.besides=="false"?'不可以':'可以'}}外带餐食</view> | ||||
<view class="Hchild" tt:if="{{data.superimposed_discounts}}">• {{data.superimposed_discounts=="false"?'不可以':'可以'}}享受店内其他优惠</view> | |||||
<view class="Hchild" tt:if="{{data.superimposed_discounts}}">• | |||||
{{data.superimposed_discounts=="false"?'不可以':'可以'}}享受店内其他优惠</view> | |||||
<view class="Hchild" tt:if="{{data.private_room}}">• {{data.private_room=="false"?'不可以使用':'可以使用'}}包间</view> | <view class="Hchild" tt:if="{{data.private_room}}">• {{data.private_room=="false"?'不可以使用':'可以使用'}}包间</view> | ||||
<view class="notesH">使用规则</view> | <view class="notesH">使用规则</view> | ||||
@@ -172,9 +177,10 @@ | |||||
<text class="Hchild">{{item.content}}</text> | <text class="Hchild">{{item.content}}</text> | ||||
</view> | </view> | ||||
</view> | </view> | ||||
<view tt:if="{{couponList.length!=0}}" | <view tt:if="{{couponList.length!=0}}" | ||||
style="color: #333;letter-spacing: 0;font-size: 30rpx;height: 70rpx;line-height: 70rpx;margin-left: 35rpx;font-weight: bold;">其他活动 | |||||
style="color: #333;letter-spacing: 0;font-size: 30rpx;height: 70rpx;line-height: 70rpx;margin-left: 35rpx;font-weight: bold;"> | |||||
其他活动 | |||||
</view> | </view> | ||||
<view class='couponsL clearfix'> | <view class='couponsL clearfix'> | ||||
<c-coupons tt:if="{{couponList.length!=0}}" tt:for="{{couponList}}" from="fromMerchant" paramAtoB="{{loading}}" | <c-coupons tt:if="{{couponList.length!=0}}" tt:for="{{couponList}}" from="fromMerchant" paramAtoB="{{loading}}" | ||||
@@ -185,7 +191,7 @@ | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<form data-type='{{data.type}}' report-submit='true' tt:if="{{mouldType!=1}}"> | |||||
<form data-type='{{data.type}}' report-submit='true' tt:if="{{mouldType!=1}}"> | |||||
<view class="buy-view app-border-top" style="position:fixed;z-index:{{zIndex}};"> | <view class="buy-view app-border-top" style="position:fixed;z-index:{{zIndex}};"> | ||||
<button class='goback' bindtap='goback'> | <button class='goback' bindtap='goback'> | ||||
<image src='{{homeSelectedO}}' mode="widthFix"></image> | <image src='{{homeSelectedO}}' mode="widthFix"></image> | ||||
@@ -215,14 +221,14 @@ | |||||
<button class='buy' disabled='true' tt:if="{{total_micro_second<=0&&data.activityStatus!=0}}">活动已结束</button> | <button class='buy' disabled='true' tt:if="{{total_micro_second<=0&&data.activityStatus!=0}}">活动已结束</button> | ||||
<button id='noBuy' disabled='true' tt:if="{{data.activityStatus==0}}">活动未开始</button> | <button id='noBuy' disabled='true' tt:if="{{data.activityStatus==0}}">活动未开始</button> | ||||
</view> | </view> | ||||
</form> | |||||
</form> | |||||
<form data-type='{{data.type}}' report-submit='true' tt:if="{{mouldType==1}}"> | |||||
<form data-type='{{data.type}}' report-submit='true' tt:if="{{mouldType==1}}"> | |||||
<view class="app-border-topX" style="position:fixed;z-index:{{zIndex}}; bottom: 0;"> | <view class="app-border-topX" style="position:fixed;z-index:{{zIndex}}; bottom: 0;"> | ||||
<view class="biaoz">{{data.type!=50?'¥':''}}</view> | <view class="biaoz">{{data.type!=50?'¥':''}}</view> | ||||
<view class="selling">{{data.type==50?priceAndStockObj.creditPrice+'积分':priceAndStockObj.salePrice/100}} </view> | <view class="selling">{{data.type==50?priceAndStockObj.creditPrice+'积分':priceAndStockObj.salePrice/100}} </view> | ||||
<view class="qsOriginal">¥{{priceAndStockObj.price/100}}</view> | |||||
<view class="qsOriginal">¥{{priceAndStockObj.price/100}}</view> | |||||
<button bindtap="gotopay" disabled='{{showbutton}}' hover-class='active' class='buyX' | <button bindtap="gotopay" disabled='{{showbutton}}' hover-class='active' class='buyX' | ||||
tt:if="{{data.type!=11&&data.type!=8&&data.type!=50&&data.type!=51&&priceAndStockObj.salePrice/100!=0&&priceAndStockObj.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}"> | tt:if="{{data.type!=11&&data.type!=8&&data.type!=50&&data.type!=51&&priceAndStockObj.salePrice/100!=0&&priceAndStockObj.remainInventory!=0&&endtime!='活动已结束'&&data.activityStatus!=0}}"> | ||||
马上购买</button> | 马上购买</button> | ||||
@@ -248,8 +254,8 @@ | |||||
<button id='buyX' disabled='true' tt:if="{{data.activityStatus==0}}">活动未开始</button> | <button id='buyX' disabled='true' tt:if="{{data.activityStatus==0}}">活动未开始</button> | ||||
<!-- <view class="sell">已售出<span class="sellP">{{data.inventory-priceAndStockObj.remainInventory}}</span>件</view> --> | <!-- <view class="sell">已售出<span class="sellP">{{data.inventory-priceAndStockObj.remainInventory}}</span>件</view> --> | ||||
<button class="serviceBox" open-type="contact"> | <button class="serviceBox" open-type="contact"> | ||||
<view class="fuwuLogoBox f" > | |||||
<image class="itemLogo" src="../../../assets/images/service1.png" /> | |||||
<view class="fuwuLogoBox f"> | |||||
<image class="itemLogo" src="../../../assets/images/service1.png" /> | |||||
</view> | </view> | ||||
</button> | </button> | ||||
</view> | </view> | ||||
@@ -262,7 +268,7 @@ | |||||
<image src='{{homeSelectedO}}' mode="widthFix"></image> | <image src='{{homeSelectedO}}' mode="widthFix"></image> | ||||
<text class='btnTxt'>首页</text> | <text class='btnTxt'>首页</text> | ||||
</button> | </button> | ||||
<form report-submit='true' class="fl"> | |||||
<form report-submit='true' class="fl"> | |||||
<button bindtap="gotopay" style='background:transparent;color:#fff;' data-discount='discount1' | <button bindtap="gotopay" style='background:transparent;color:#fff;' data-discount='discount1' | ||||
disabled='{{showbutton}}'> | disabled='{{showbutton}}'> | ||||
<text>¥{{priceAndStockObj.price/100}}</text> | <text>¥{{priceAndStockObj.price/100}}</text> | ||||
@@ -297,7 +303,7 @@ | |||||
</label> | </label> | ||||
</radio-group> | </radio-group> | ||||
<!-- 多选 --> | <!-- 多选 --> | ||||
<checkbox-group bindchange="checkboxChange" tt:if="{{questionnaire.flag=='multi'}}" > | |||||
<checkbox-group bindchange="checkboxChange" tt:if="{{questionnaire.flag=='multi'}}"> | |||||
<label class="radio ques" tt:for="{{questionnaire.answers}}" tt:key="index"> | <label class="radio ques" tt:for="{{questionnaire.answers}}" tt:key="index"> | ||||
<checkbox value="{{item.id}}" />{{item.name}} | <checkbox value="{{item.id}}" />{{item.name}} | ||||
</label> | </label> | ||||
@@ -352,4 +358,4 @@ | |||||
</button> | </button> | ||||
</view> --> | </view> --> | ||||
<phoen showBox="{{showBox}}" bind:hiePhoen="setPhone" bind:heiBox="setBox" /> | <phoen showBox="{{showBox}}" bind:hiePhoen="setPhone" bind:heiBox="setBox" /> | ||||
</view> | |||||
</view> |
@@ -13,13 +13,13 @@ Page({ | |||||
optionData: null, | optionData: null, | ||||
fromflag: '', | fromflag: '', | ||||
couponChannelIdflag: '', | couponChannelIdflag: '', | ||||
confirmationFlag:'', | |||||
confirmationFlag: '', | |||||
wjId: "", | wjId: "", | ||||
composeOrderType: "", | composeOrderType: "", | ||||
fillIndentId: "", | fillIndentId: "", | ||||
url: null,//游戏路径 | |||||
id: null,//游戏id, | |||||
gameId: null,//游戏gameId | |||||
url: null, //游戏路径 | |||||
id: null, //游戏id, | |||||
gameId: null, //游戏gameId | |||||
}, | }, | ||||
backHome() { | backHome() { | ||||
@@ -32,10 +32,10 @@ Page({ | |||||
tt.reLaunch({ | tt.reLaunch({ | ||||
url: "/index/index", | url: "/index/index", | ||||
success: (res) => { | success: (res) => { | ||||
}, | }, | ||||
fail: (res) => { | fail: (res) => { | ||||
}, | }, | ||||
}); | }); | ||||
}, | }, | ||||
@@ -75,29 +75,29 @@ Page({ | |||||
} | } | ||||
}).catch(err => { | }).catch(err => { | ||||
if(app.globalData.ifCongPh==1){ | |||||
if (app.globalData.ifCongPh == 1) { | |||||
tt.redirectTo({ | tt.redirectTo({ | ||||
url: `/pages/getPhone/getPhone?skipUrl=1` | url: `/pages/getPhone/getPhone?skipUrl=1` | ||||
}); | }); | ||||
}else{ | |||||
} else { | |||||
tt.navigateBack({ | tt.navigateBack({ | ||||
delta: 1, | delta: 1, | ||||
}) | }) | ||||
} | } | ||||
}) | }) | ||||
}, | }, | ||||
onLoad: function (options) { | onLoad: function (options) { | ||||
console.log(app.globalData.skip, app.globalData.skipUrl, app.globalData.type, "跳转地址") | console.log(app.globalData.skip, app.globalData.skipUrl, app.globalData.type, "跳转地址") | ||||
var that = this; | var that = this; | ||||
// options.fromflag == 'coupondetail'; | // options.fromflag == 'coupondetail'; | ||||
// 游戏页面 | // 游戏页面 | ||||
if (options && options.url && options.id && options.gameId) { | if (options && options.url && options.id && options.gameId) { | ||||
that.setData({ | that.setData({ | ||||
url: options.url,//游戏路径 | |||||
id: options.id,//游戏id, | |||||
gameId: options.gameId,//游戏gameId | |||||
url: options.url, //游戏路径 | |||||
id: options.id, //游戏id, | |||||
gameId: options.gameId, //游戏gameId | |||||
}) | }) | ||||
} | } | ||||
// 来自优惠券详情页面 | // 来自优惠券详情页面 | ||||
@@ -130,6 +130,12 @@ Page({ | |||||
confirmationFlag: options.confirmationFlag | confirmationFlag: options.confirmationFlag | ||||
}) | }) | ||||
} | } | ||||
// 我的 | |||||
if (options && options.mineFlag) { | |||||
that.setData({ | |||||
mineFlag: options.mineFlag | |||||
}) | |||||
} | |||||
//调查问卷 | //调查问卷 | ||||
if (options && !options.wjId || options.wjId) { | if (options && !options.wjId || options.wjId) { | ||||
this.setData({ | this.setData({ | ||||
@@ -184,18 +190,18 @@ Page({ | |||||
}) | }) | ||||
} | } | ||||
Http.get({ | Http.get({ | ||||
url: config.api.marketicon, | |||||
data: { | |||||
appId: app.globalData.appId | |||||
} | |||||
}).then(res => { | |||||
that.setData({ | |||||
mallImgUrl: res.data.mallImgUrl | |||||
}); | |||||
tt.setNavigationBarTitle({ | |||||
title: res.data.mallName | |||||
url: config.api.marketicon, | |||||
data: { | |||||
appId: app.globalData.appId | |||||
} | |||||
}).then(res => { | |||||
that.setData({ | |||||
mallImgUrl: res.data.mallImgUrl | |||||
}); | |||||
tt.setNavigationBarTitle({ | |||||
title: res.data.mallName | |||||
}) | |||||
}) | }) | ||||
}) | |||||
.catch(err => { | .catch(err => { | ||||
tt.showToast({ | tt.showToast({ | ||||
title: err.errMsg, | title: err.errMsg, | ||||
@@ -246,241 +252,248 @@ Page({ | |||||
// console.log(res,"数据"); | // console.log(res,"数据"); | ||||
// return | // return | ||||
tt.login({ | tt.login({ | ||||
success:(res=>{ | |||||
let {code} = res | |||||
console.log(code,"code"); | |||||
success: (res => { | |||||
let { | |||||
code | |||||
} = res | |||||
console.log(code, "code"); | |||||
Http.post({ | Http.post({ | ||||
url:config.api.login, | |||||
data:{ | |||||
code:code, | |||||
appId:app.globalData.appId, | |||||
systemInfo:JSON.stringify(app.globalData.systemInfo) | |||||
url: config.api.login, | |||||
data: { | |||||
code: code, | |||||
appId: app.globalData.appId, | |||||
systemInfo: JSON.stringify(app.globalData.systemInfo) | |||||
} | } | ||||
}).then(res=>{ | |||||
}).then(res => { | |||||
Http.setToken(res.data.token); | Http.setToken(res.data.token); | ||||
app.globalData.token = res.data.token | app.globalData.token = res.data.token | ||||
Http.post({ | Http.post({ | ||||
url: config.api.getUserInfo, | |||||
data: { | |||||
encryptedData: encryptedData, | |||||
iv: iv | |||||
} | |||||
}).then(res => { | |||||
if (app.globalData.type == 'gm' && that.data.id && that.data.gameId && that.data.url) {//游戏页面 | |||||
app.globalData.skipUrl = '/pages/game/index?url=' + that.data.url + "&id=" + that.data.id + "&gameId=" + that.data.gameId, | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
return; | |||||
} | |||||
if (that.data.wjId) { | |||||
app.globalData.skipUrl = `/pages/questionnaire/questionnaire?id=${that.data.wjId}` | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
return; | |||||
} | |||||
if (that.data.fromflag == 'poster') { | |||||
app.globalData.skipUrl = `/pages/canvas/index?couponChannelId=${that.data.couponChannelId}` | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
return; | |||||
} | |||||
// | |||||
if (that.data.optionData != null && that.data.optionData.orderGroupId != null && that.data.optionData.orderGroupId != "") { | |||||
app.globalData.skipUrl = `/pages/joinFrDpell/index?couponId=${that.data.optionData.couponId}&orderGroupId=${that.data.optionData.orderGroupId}&couponChannelId=${that.data.optionData.couponChannelId}&orderId=${that.data.optionData.orderId}&avatarUrl=${that.data.optionData.avatarUrl}&nickName=${that.data.optionData.nickName}` | |||||
app.globalData.skip = 'reLaunch' | |||||
that.judgePhonelngo() | |||||
return; | |||||
} | |||||
if (that.data.path == 'index') { | |||||
app.globalData.skipUrl = "/pages/game/index" | |||||
app.globalData.skip = 'reLaunch' | |||||
that.judgePhonelngo() | |||||
} else { | |||||
//返回主页 | |||||
// if (that.data.couponChannelId && !that.data.cuserId && !that.data.spellGroup||that.data.couponChannelId && !that.data.cuserId&&app.globalData.type == 'cd') { | |||||
if (that.data.couponChannelId && !that.data.cuserId && !that.data.spellGroup && app.globalData.type == 'cd') { | |||||
// 跳转普通券/消费卡/限时秒杀/砍价详情 | |||||
app.globalData.skipUrl = `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelId}` | |||||
app.globalData.skip = 'navigateTo' | |||||
that.judgePhonelngo() | |||||
} else if (that.data.couponChannelId && that.data.cuserId && !that.data.spellGroup && app.globalData.type != 'sd') { | |||||
// 来自转赠 | |||||
app.globalData.skipUrl = `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelId}&cuserId=${that.data.cuserId}&coverImg=${that.data.coverImg}&userName=${that.data.userName}&avatarUrl=${that.data.avatarUrl}&couponOrderId=${that.data.couponOrderId}&updateDate=${that.data.updateDate}` | |||||
app.globalData.skip = 'reLaunch' | |||||
url: config.api.getUserInfo, | |||||
data: { | |||||
encryptedData: encryptedData, | |||||
iv: iv | |||||
} | |||||
}).then(res => { | |||||
if (app.globalData.type == 'gm' && that.data.id && that.data.gameId && that.data.url) { //游戏页面 | |||||
app.globalData.skipUrl = '/pages/game/index?url=' + that.data.url + "&id=" + that.data.id + "&gameId=" + that.data.gameId, | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | that.judgePhonelngo() | ||||
} else if (that.data.couponChannelId && app.globalData.type == 'sd' || that.data.couponChannelId && that.data.spellGroup) { | |||||
// 拼团详情页 | |||||
app.globalData.skipUrl = `/pages/spellGroup/mySpellGroup/index?couponChannelId=${that.data.couponChannelId}` | |||||
return; | |||||
} | |||||
if (that.data.wjId) { | |||||
app.globalData.skipUrl = `/pages/questionnaire/questionnaire?id=${that.data.wjId}` | |||||
app.globalData.skip = 'redirectTo' | app.globalData.skip = 'redirectTo' | ||||
that.judgePhonelngo() | that.judgePhonelngo() | ||||
} else if (that.data.optionData != null && that.data.optionData.id && app.globalData.type == 'gm') { | |||||
// 游戏页面 | |||||
that.getGameOne(app.globalData.token, that.data.optionData.id) | |||||
} else if (that.data.optionData != null && that.data.optionData.id && app.globalData.type == 'td') { | |||||
app.globalData.skipUrl = `/pages/topicDetail/index?id=${that.data.optionData.id}` | |||||
return; | |||||
} | |||||
if (that.data.mineFlag) { | |||||
app.globalData.skipUrl = `/index/user` | |||||
app.globalData.skip = 'redirectTo' | app.globalData.skip = 'redirectTo' | ||||
that.judgePhonelngo() | that.judgePhonelngo() | ||||
return; | |||||
} | } | ||||
// 报名活动 | |||||
else if (that.data.optionData != null && that.data.optionData.id && app.globalData.type == 'ra') { | |||||
app.globalData.skipUrl = `/pages/radetail/index?id=${that.data.optionData.id}`, | |||||
app.globalData.skip = 'redirectTo' | |||||
if (that.data.fromflag == 'poster') { | |||||
app.globalData.skipUrl = `/pages/canvas/index?couponChannelId=${that.data.couponChannelId}` | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | that.judgePhonelngo() | ||||
return; | |||||
} | } | ||||
// 报名签到 | |||||
else if (that.data.optionData != null && that.data.optionData.id && app.globalData.type == 'si') { | |||||
app.globalData.skipUrl = `/pages/acSignIn/index?id=${that.data.optionData.id}`, | |||||
app.globalData.skip = 'redirectTo' | |||||
// | |||||
if (that.data.optionData != null && that.data.optionData.orderGroupId != null && that.data.optionData.orderGroupId != "") { | |||||
app.globalData.skipUrl = `/pages/joinFrDpell/index?couponId=${that.data.optionData.couponId}&orderGroupId=${that.data.optionData.orderGroupId}&couponChannelId=${that.data.optionData.couponChannelId}&orderId=${that.data.optionData.orderId}&avatarUrl=${that.data.optionData.avatarUrl}&nickName=${that.data.optionData.nickName}` | |||||
app.globalData.skip = 'reLaunch' | |||||
that.judgePhonelngo() | that.judgePhonelngo() | ||||
return; | |||||
} | } | ||||
// 门店详情 | |||||
else if (that.data.optionData != null && that.data.optionData.id && app.globalData.type == 'md') { | |||||
app.globalData.skipUrl = `/pages/index/searchbar/detail/index?id=${that.data.optionData.id}`, | |||||
app.globalData.skip = 'redirectTo' | |||||
if (that.data.path == 'index') { | |||||
app.globalData.skipUrl = "/pages/game/index" | |||||
app.globalData.skip = 'reLaunch' | |||||
that.judgePhonelngo() | that.judgePhonelngo() | ||||
} | |||||
// 通过分享进入的门店详情页面 | |||||
else if (that.data.id && that.data.frommd == 'md') { | |||||
app.globalData.skipUrl = `/pages/index/searchbar/detail/index?id=${that.data.id}`, | |||||
} else { | |||||
//返回主页 | |||||
// if (that.data.couponChannelId && !that.data.cuserId && !that.data.spellGroup||that.data.couponChannelId && !that.data.cuserId&&app.globalData.type == 'cd') { | |||||
if (that.data.couponChannelId && !that.data.cuserId && !that.data.spellGroup && app.globalData.type == 'cd') { | |||||
// 跳转普通券/消费卡/限时秒杀/砍价详情 | |||||
app.globalData.skipUrl = `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelId}` | |||||
app.globalData.skip = 'navigateTo' | |||||
that.judgePhonelngo() | |||||
} else if (that.data.couponChannelId && that.data.cuserId && !that.data.spellGroup && app.globalData.type != 'sd') { | |||||
// 来自转赠 | |||||
app.globalData.skipUrl = `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelId}&cuserId=${that.data.cuserId}&coverImg=${that.data.coverImg}&userName=${that.data.userName}&avatarUrl=${that.data.avatarUrl}&couponOrderId=${that.data.couponOrderId}&updateDate=${that.data.updateDate}` | |||||
app.globalData.skip = 'reLaunch' | |||||
that.judgePhonelngo() | |||||
} else if (that.data.couponChannelId && app.globalData.type == 'sd' || that.data.couponChannelId && that.data.spellGroup) { | |||||
// 拼团详情页 | |||||
app.globalData.skipUrl = `/pages/spellGroup/mySpellGroup/index?couponChannelId=${that.data.couponChannelId}` | |||||
app.globalData.skip = 'redirectTo' | app.globalData.skip = 'redirectTo' | ||||
that.judgePhonelngo() | |||||
} else if (that.data.optionData != null && that.data.optionData.bt && that.data.optionData.id && app.globalData.type == 'bd') { | |||||
// 宣传页详情 | |||||
if (that.data.optionData != null && that.data.optionData.bt == '2') { | |||||
// 自由图文 | |||||
app.globalData.skipUrl = `/pages/freeBannerDetail/index?id=${that.data.optionData.id}`, | |||||
that.judgePhonelngo() | |||||
} else if (that.data.optionData != null && that.data.optionData.id && app.globalData.type == 'gm') { | |||||
// 游戏页面 | |||||
that.getGameOne(app.globalData.token, that.data.optionData.id) | |||||
} else if (that.data.optionData != null && that.data.optionData.id && app.globalData.type == 'td') { | |||||
app.globalData.skipUrl = `/pages/topicDetail/index?id=${that.data.optionData.id}` | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} | |||||
// 报名活动 | |||||
else if (that.data.optionData != null && that.data.optionData.id && app.globalData.type == 'ra') { | |||||
app.globalData.skipUrl = `/pages/radetail/index?id=${that.data.optionData.id}`, | |||||
app.globalData.skip = 'redirectTo' | app.globalData.skip = 'redirectTo' | ||||
that.judgePhonelngo() | that.judgePhonelngo() | ||||
} else { | |||||
// 标准格式 | |||||
app.globalData.skipUrl = `/pages/bannerdetail/index?id=${that.data.optionData.id}`, | |||||
} | |||||
// 报名签到 | |||||
else if (that.data.optionData != null && that.data.optionData.id && app.globalData.type == 'si') { | |||||
app.globalData.skipUrl = `/pages/acSignIn/index?id=${that.data.optionData.id}`, | |||||
app.globalData.skip = 'redirectTo' | app.globalData.skip = 'redirectTo' | ||||
that.judgePhonelngo() | that.judgePhonelngo() | ||||
} | } | ||||
} else if (that.data.orderId || that.data.orderId && app.globalData.type == 'bg') { | |||||
// 参与砍价 | |||||
app.globalData.skipUrl = `/pages/bargain/bargainDatail/bargainDatail?orderId=${that.data.orderId}&composeOrderType=${that.composeOrderType}`, | |||||
app.globalData.skip = 'navigateTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'uc') { | |||||
// 我的 | |||||
app.globalData.skipUrl = '/index/user', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'in') { | |||||
// 首页 | |||||
app.globalData.skipUrl = app.globalData.goHomeUrl, | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == "qd") { | |||||
//每日签到 | |||||
app.globalData.skipUrl = "/pages/activityCalendar/activityCalendar" | |||||
app.globalData.skip = 'reLaunch' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == "hdrl") { | |||||
//活动日历 | |||||
app.globalData.skipUrl = `/pages/radetail/index?id=${app.globalData.activityId}` | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} | |||||
// 积分 | |||||
else if (app.globalData.type == 'jf') { | |||||
app.globalData.skipUrl = '/pages/integralmall/index', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'pc') { | |||||
// 停车 | |||||
app.globalData.skipUrl = '/index/passCar', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'mc') { | |||||
// 我的券包 | |||||
app.globalData.skipUrl = '/pages/couponorder/index/index', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'mo') { | |||||
// 我的订单 | |||||
app.globalData.skipUrl = '/pages/order/index/index?id=all', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'ca') { | |||||
// 我的卡包 | |||||
app.globalData.skipUrl = '/pages/cardorder/index/index', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'sc') { | |||||
// 特享礼遇 | |||||
app.globalData.skipUrl = '/pages/specialcourtesy/specialcourtesy', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'rb') { | |||||
// 限时秒杀 | |||||
app.globalData.skipUrl = '/pages/rushToBuy/index', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'bl') { | |||||
// 砍价专场 | |||||
app.globalData.skipUrl = '/pages/bargain/bargain', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'mb') { | |||||
// 我的砍价 | |||||
app.globalData.skipUrl = '/pages/bargain/bargain?from=myhtml', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'sl') { | |||||
// 拼团专场 | |||||
app.globalData.skipUrl = '/pages/spellGroup/spellGroup', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'ms') { | |||||
// 我的拼团 | |||||
app.globalData.skipUrl = '/pages/spellGroup/spellGroup?from=myhtml', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'dc') { | |||||
// 消费卡 | |||||
app.globalData.skipUrl = '/pages/discountCardList/discountCardList', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'td') { | |||||
// 专题活动页 | |||||
app.globalData.skipUrl = '/pages/topicDetail/index', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'ml') { | |||||
// 门店 | |||||
app.globalData.skipUrl = '/index/searchbar', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (that.data.fromflag == 'confirmation' && that.data.confirmationFlag) { | |||||
//订单确认 confirmation | |||||
app.globalData.skipUrl = `/pages/coupon/confirmation/confirmation?couponChannelId=${that.data.confirmationFlag}`, | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} | |||||
else if (that.data.fromflag == 'coupondetail' && that.data.couponChannelIdflag) { | |||||
app.globalData.skipUrl = `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelIdflag}`, | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (that.data.fromflag == 'spellcoupondetail' && that.data.couponChannelIdflag) { | |||||
app.globalData.skipUrl = `/pages/spellGroup/mySpellGroup/index?couponChannelId=${that.data.couponChannelIdflag}`, | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (that.data.fromflag == 'fillIndent' && that.data.fillIndentId && that.data.couponId) { | |||||
//线上配送 填写订单 | |||||
app.globalData.skipUrl = `/pages/fillIndent/fillIndent?id=${that.data.fillIndentId}&couponId=${that.data.couponId}`, | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else { | |||||
app.globalData.skipUrl = app.globalData.goHomeUrl, | |||||
// 门店详情 | |||||
else if (that.data.optionData != null && that.data.optionData.id && app.globalData.type == 'md') { | |||||
app.globalData.skipUrl = `/pages/index/searchbar/detail/index?id=${that.data.optionData.id}`, | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} | |||||
// 通过分享进入的门店详情页面 | |||||
else if (that.data.id && that.data.frommd == 'md') { | |||||
app.globalData.skipUrl = `/pages/index/searchbar/detail/index?id=${that.data.id}`, | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (that.data.optionData != null && that.data.optionData.bt && that.data.optionData.id && app.globalData.type == 'bd') { | |||||
// 宣传页详情 | |||||
if (that.data.optionData != null && that.data.optionData.bt == '2') { | |||||
// 自由图文 | |||||
app.globalData.skipUrl = `/pages/freeBannerDetail/index?id=${that.data.optionData.id}`, | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else { | |||||
// 标准格式 | |||||
app.globalData.skipUrl = `/pages/bannerdetail/index?id=${that.data.optionData.id}`, | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} | |||||
} else if (that.data.orderId || that.data.orderId && app.globalData.type == 'bg') { | |||||
// 参与砍价 | |||||
app.globalData.skipUrl = `/pages/bargain/bargainDatail/bargainDatail?orderId=${that.data.orderId}&composeOrderType=${that.composeOrderType}`, | |||||
app.globalData.skip = 'navigateTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'uc') { | |||||
// 我的 | |||||
app.globalData.skipUrl = '/index/user', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'in') { | |||||
// 首页 | |||||
app.globalData.skipUrl = app.globalData.goHomeUrl, | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == "qd") { | |||||
//每日签到 | |||||
app.globalData.skipUrl = "/pages/activityCalendar/activityCalendar" | |||||
app.globalData.skip = 'reLaunch' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == "hdrl") { | |||||
//活动日历 | |||||
app.globalData.skipUrl = `/pages/radetail/index?id=${app.globalData.activityId}` | |||||
app.globalData.skip = 'redirectTo' | app.globalData.skip = 'redirectTo' | ||||
that.judgePhonelngo() | |||||
that.judgePhonelngo() | |||||
} | |||||
// 积分 | |||||
else if (app.globalData.type == 'jf') { | |||||
app.globalData.skipUrl = '/pages/integralmall/index', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'pc') { | |||||
// 停车 | |||||
app.globalData.skipUrl = '/index/passCar', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'mc') { | |||||
// 我的券包 | |||||
app.globalData.skipUrl = '/pages/couponorder/index/index', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'mo') { | |||||
// 我的订单 | |||||
app.globalData.skipUrl = '/pages/order/index/index?id=all', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'ca') { | |||||
// 我的卡包 | |||||
app.globalData.skipUrl = '/pages/cardorder/index/index', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'sc') { | |||||
// 特享礼遇 | |||||
app.globalData.skipUrl = '/pages/specialcourtesy/specialcourtesy', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'rb') { | |||||
// 限时秒杀 | |||||
app.globalData.skipUrl = '/pages/rushToBuy/index', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'bl') { | |||||
// 砍价专场 | |||||
app.globalData.skipUrl = '/pages/bargain/bargain', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'mb') { | |||||
// 我的砍价 | |||||
app.globalData.skipUrl = '/pages/bargain/bargain?from=myhtml', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'sl') { | |||||
// 拼团专场 | |||||
app.globalData.skipUrl = '/pages/spellGroup/spellGroup', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'ms') { | |||||
// 我的拼团 | |||||
app.globalData.skipUrl = '/pages/spellGroup/spellGroup?from=myhtml', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'dc') { | |||||
// 消费卡 | |||||
app.globalData.skipUrl = '/pages/discountCardList/discountCardList', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'td') { | |||||
// 专题活动页 | |||||
app.globalData.skipUrl = '/pages/topicDetail/index', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (app.globalData.type == 'ml') { | |||||
// 门店 | |||||
app.globalData.skipUrl = '/index/searchbar', | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (that.data.fromflag == 'confirmation' && that.data.confirmationFlag) { | |||||
//订单确认 confirmation | |||||
app.globalData.skipUrl = `/pages/coupon/confirmation/confirmation?couponChannelId=${that.data.confirmationFlag}`, | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (that.data.fromflag == 'coupondetail' && that.data.couponChannelIdflag) { | |||||
app.globalData.skipUrl = `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelIdflag}`, | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (that.data.fromflag == 'spellcoupondetail' && that.data.couponChannelIdflag) { | |||||
app.globalData.skipUrl = `/pages/spellGroup/mySpellGroup/index?couponChannelId=${that.data.couponChannelIdflag}`, | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else if (that.data.fromflag == 'fillIndent' && that.data.fillIndentId && that.data.couponId) { | |||||
//线上配送 填写订单 | |||||
app.globalData.skipUrl = `/pages/fillIndent/fillIndent?id=${that.data.fillIndentId}&couponId=${that.data.couponId}`, | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} else { | |||||
app.globalData.skipUrl = app.globalData.goHomeUrl, | |||||
app.globalData.skip = 'redirectTo' | |||||
that.judgePhonelngo() | |||||
} | |||||
} | } | ||||
} | |||||
}) | |||||
}) | |||||
.catch(err => { | .catch(err => { | ||||
tt.showToast({ | tt.showToast({ | ||||
title: err.code, | title: err.code, | ||||
@@ -489,8 +502,8 @@ Page({ | |||||
mask: false | mask: false | ||||
}); | }); | ||||
}) | }) | ||||
}).catch(err=>{ | |||||
}).catch(err => { | |||||
console.log(err); | console.log(err); | ||||
tt.showModal({ | tt.showModal({ | ||||
title: '提示', | title: '提示', | ||||
@@ -508,11 +521,11 @@ Page({ | |||||
} | } | ||||
}); | }); | ||||
}) | }) | ||||
}), | }), | ||||
}); | }); | ||||
}, | }, | ||||
@@ -524,16 +537,16 @@ Page({ | |||||
getGameOne: function (token, id) { | getGameOne: function (token, id) { | ||||
let _this = this; | let _this = this; | ||||
Http.get({ | Http.get({ | ||||
url: config.api.getOneGame, | |||||
data: { | |||||
token: token, | |||||
id: id | |||||
} | |||||
}).then(res => { | |||||
tt.redirectTo({ | |||||
url: '/pages/game/index?url=' + res.data.url + "&id=" + res.data.id + "&gameId=" + res.data.gameId, | |||||
url: config.api.getOneGame, | |||||
data: { | |||||
token: token, | |||||
id: id | |||||
} | |||||
}).then(res => { | |||||
tt.redirectTo({ | |||||
url: '/pages/game/index?url=' + res.data.url + "&id=" + res.data.id + "&gameId=" + res.data.gameId, | |||||
}) | |||||
}) | }) | ||||
}) | |||||
.catch(err => { | .catch(err => { | ||||
tt.showModal({ | tt.showModal({ | ||||
title: '提示', | title: '提示', | ||||
@@ -3,7 +3,9 @@ const util = require("../../utils/util.js"); | |||||
const Http = require("../../utils/HttpBasics"); | const Http = require("../../utils/HttpBasics"); | ||||
const config = require("../../config/config"); | const config = require("../../config/config"); | ||||
const imgurl = require("../../utils/imgurl"); | const imgurl = require("../../utils/imgurl"); | ||||
const { alipay } = require("../../utils/imgurl"); | |||||
const { | |||||
alipay | |||||
} = require("../../utils/imgurl"); | |||||
let app = getApp(); | let app = getApp(); | ||||
Page({ | Page({ | ||||
data: { | data: { | ||||
@@ -12,16 +14,16 @@ Page({ | |||||
noDataFlag: false, | noDataFlag: false, | ||||
businePageNum: 1, | businePageNum: 1, | ||||
businessData: null, | businessData: null, | ||||
Lsit:[], | |||||
Lsit: [], | |||||
}, | }, | ||||
goOrder(){ | |||||
goOrder() { | |||||
tt.navigateTo({ | tt.navigateTo({ | ||||
url: '/pages/order/index/index', | url: '/pages/order/index/index', | ||||
success: (res) => { | success: (res) => { | ||||
}, | }, | ||||
fail: (res) => { | fail: (res) => { | ||||
}, | }, | ||||
}); | }); | ||||
}, | }, | ||||
@@ -60,8 +62,8 @@ Page({ | |||||
let data = res.data.list | let data = res.data.list | ||||
data.map(item => { | data.map(item => { | ||||
tempArr.push(item.id) | tempArr.push(item.id) | ||||
item.discount = (((item.salePriceStr*1)/(item.priceStr*1))*10).toFixed(1) | |||||
item.discount = (((item.salePriceStr * 1) / (item.priceStr * 1)) * 10).toFixed(1) | |||||
}) | }) | ||||
if (this.data.businePageNum > 1) { | if (this.data.businePageNum > 1) { | ||||
this.setData({ | this.setData({ | ||||
@@ -122,7 +124,7 @@ Page({ | |||||
let data = res.data.list | let data = res.data.list | ||||
data.map(item => { | data.map(item => { | ||||
tempArr.push(item.id) | tempArr.push(item.id) | ||||
item.discount = (((item.salePriceStr*1)/(item.priceStr*1))*10).toFixed(1) | |||||
item.discount = (((item.salePriceStr * 1) / (item.priceStr * 1)) * 10).toFixed(1) | |||||
}) | }) | ||||
if (this.data.businePageNum > 1) { | if (this.data.businePageNum > 1) { | ||||
this.setData({ | this.setData({ | ||||
@@ -210,7 +212,8 @@ Page({ | |||||
}) | }) | ||||
}, | }, | ||||
onLoad: function (options) { | onLoad: function (options) { | ||||
app.globalData.ifCongPh = 1//固定写法 放在指定要手机号授权框出现 | |||||
//固定写法 放在指定要手机号授权框出现 | |||||
// app.globalData.ifCongPh = 1 | |||||
this.getCouponChannelList() | this.getCouponChannelList() | ||||
}, | }, | ||||
onReachBottom: function () { | onReachBottom: function () { | ||||
@@ -219,7 +222,7 @@ Page({ | |||||
that.setData({ | that.setData({ | ||||
businePageNum: that.data.businePageNum + 1 | businePageNum: that.data.businePageNum + 1 | ||||
}); | }); | ||||
console.log("加载更多页数" + that.data.page,); | |||||
console.log("加载更多页数" + that.data.page, ); | |||||
console.log("加载更多key" + that.data.code); | console.log("加载更多key" + that.data.code); | ||||
this.getCouponChannelList(0) | this.getCouponChannelList(0) | ||||
}, | }, |
@@ -1,61 +1,24 @@ | |||||
{ | { | ||||
"setting": { | |||||
"urlCheck": true, | |||||
"es6": true, | |||||
"newFeature": false, | |||||
"postcss": false, | |||||
"mockUpdate": true, | |||||
"minified": false, | |||||
"autoPush": false, | |||||
"scripts": false, | |||||
"mockLogin": false, | |||||
"autoCompile": true, | |||||
"localPlugins": false, | |||||
"IDEPreviewHotRestartCache": false | |||||
}, | |||||
"appid": "ttde7ca8c141425a2301", | |||||
"projectname": "tt富茂C", | |||||
"condition": { | |||||
"miniprogram": { | |||||
"current": -1, | |||||
"list": [ | |||||
{ | |||||
"id": 1669558749378, | |||||
"name": "商品详情页", | |||||
"pathName": "pages/main/index", | |||||
"query": "type=cd&couponChannelId=756802201412231168&tenantId=1034", | |||||
"scene": "990001", | |||||
"launchFrom": "scan", | |||||
"location": "qr_code" | |||||
}, | |||||
{ | |||||
"id": 1669632886124, | |||||
"name": "商品支付页", | |||||
"pathName": "pages/main/index", | |||||
"query": "type=orderAffirm&couponChannelId=756802201412231168&tenantId=1034", | |||||
"scene": "990001", | |||||
"launchFrom": "scan", | |||||
"location": "qr_code" | |||||
}, | |||||
{ | |||||
"id": 1669798102509, | |||||
"name": "二维码进入(index)", | |||||
"pathName": "pages/index/index", | |||||
"query": "scene=t:cd:756802201412231168:1034", | |||||
"scene": "990001", | |||||
"launchFrom": "scan", | |||||
"location": "qr_code" | |||||
}, | |||||
{ | |||||
"id": 1669799932530, | |||||
"name": "二维码进入(main)", | |||||
"pathName": "pages/main/index", | |||||
"query": "scene=t:cd:756802201412231168:1034", | |||||
"scene": "990001", | |||||
"launchFrom": "scan", | |||||
"location": "qr_code" | |||||
"setting": { | |||||
"urlCheck": false, | |||||
"es6": true, | |||||
"newFeature": false, | |||||
"postcss": false, | |||||
"mockUpdate": true, | |||||
"minified": false, | |||||
"autoPush": false, | |||||
"scripts": false, | |||||
"mockLogin": false, | |||||
"autoCompile": true, | |||||
"localPlugins": false, | |||||
"IDEPreviewHotRestartCache": false | |||||
}, | |||||
"appid": "ttde7ca8c141425a2301", | |||||
"projectname": "tt富茂C", | |||||
"condition": { | |||||
"miniprogram": { | |||||
"current": -1, | |||||
"list": [] | |||||
} | } | ||||
] | |||||
} | } | ||||
} | |||||
} | } |