@@ -1,4 +1,5 @@ | |||
let config = require("./config/config.js"); | |||
const { defaultObj,huanLeChengObj } = require("./utils/mouldStyle.js") | |||
const Http = require("./utils/HttpBasics"); | |||
const extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {} | |||
@@ -108,6 +109,13 @@ App({ | |||
console.log(err,"商圈位置授权onL err") | |||
}) | |||
} | |||
if (res.data&&res.data.mouldType==0){//原风格尺寸 | |||
this.globalData.goHomeUrl="/index/index" | |||
this.globalData.mouldConfig = defaultObj | |||
} else if (res.data&&res.data.mouldType == 1){ | |||
this.globalData.goHomeUrl = "/pages/theme/index1/index" | |||
this.globalData.mouldConfig = huanLeChengObj | |||
} | |||
that.globalData.mouldType = res.data.mouldType ? res.data.mouldType:0 | |||
if (res.data.subMalls) { | |||
const squareList = JSON.parse(res.data.subMalls) | |||
@@ -215,6 +223,9 @@ App({ | |||
}) | |||
}, | |||
globalData: { | |||
userAvatarUrl:"",//用户头像地址 | |||
goHomeUrl:'/index/index', | |||
mouldConfig:{},//模板尺寸 | |||
mouldType:0,//主题风格模板 | |||
styleLsit: {}, | |||
previewFlag: false, //解决图片预览调用noshow | |||
@@ -77,7 +77,8 @@ | |||
"pages/siteUser/siteUser", | |||
"pages/siteAdd/siteAdd", | |||
"pages/fillIndent/fillIndent", | |||
"pages/coupon/childDetail/childDetail" | |||
"pages/coupon/childDetail/childDetail", | |||
"pages/theme/index1/index" | |||
], | |||
"subpackages": [ | |||
{ | |||
@@ -1,3 +1,4 @@ | |||
<!-- 原风格尺寸 --> | |||
<view wx:if="{{list.length>0&&mouldType==0}}" class="index-slide-view"> | |||
<swiper class="imageContainer" bindchange="handleChange" previous-margin="39rpx" next-margin="40rpx" circular autoplay> | |||
<block wx:for="{{list}}" wx:key="{{index}}"> | |||
@@ -7,7 +8,7 @@ | |||
</block> | |||
</swiper> | |||
</view> | |||
<!-- 欢乐城风格尺寸 --> | |||
<view wx:if="{{list.length>0&&mouldType==1}}" class="index-slide-view"> | |||
<swiper class="imageContainer1" bindchange="handleChange" indicator-color indicator-active-color="#fff" indicator-dots previous-margin="40rpx" next-margin="40rpx" circular autoplay> | |||
<block wx:for="{{list}}" wx:key="{{index}}"> | |||
@@ -2,6 +2,10 @@ | |||
width: 100%; | |||
height: 304rpx; | |||
} | |||
.imageContainer1 { | |||
width: 100%; | |||
height: 400rpx; | |||
} | |||
.itemImg { | |||
position: absolute; | |||
@@ -31,6 +35,13 @@ | |||
border-radius: 16rpx; | |||
} | |||
.item1 { | |||
width: 100%; | |||
height: 360rpx; | |||
overflow: hidden; | |||
border-radius: 16rpx; | |||
} | |||
.index-slide-view { | |||
margin-top: -30rpx; | |||
} | |||
@@ -38,10 +49,7 @@ | |||
margin-top: -40rpx; | |||
} | |||
.imageContainer1 { | |||
width: 100%; | |||
height: 400rpx; | |||
} | |||
.itemImg1 { | |||
position: absolute; | |||
@@ -72,9 +80,4 @@ | |||
transition: all 0.2s ease-in 0s; | |||
} | |||
.item1 { | |||
width: 100%; | |||
height: 360rpx; | |||
overflow: hidden; | |||
border-radius: 16rpx; | |||
} | |||
@@ -17,12 +17,14 @@ Component({ | |||
*/ | |||
data: { | |||
mouldType: 0, | |||
mouldConfig:{} | |||
}, | |||
attached: function () { | |||
// 在组件实例进入页面节点树时执行 | |||
if (app.globalData.mouldType) { | |||
this.setData({ | |||
mouldType: app.globalData.mouldType | |||
mouldType: app.globalData.mouldType, | |||
mouldConfig: app.globalData.mouldConfig | |||
}) | |||
} | |||
}, | |||
@@ -15,7 +15,7 @@ | |||
<view class="desc" wx:if="{{data.targetAd == 5}}">消费卡</view> | |||
</view> | |||
<view class="coupons-img"> | |||
<image src="{{data.coverImg}}" style="{{mouldType==1?'height: 300rpx;':''}}" mode='aspectFill' lazy-load="true"></image> | |||
<image src="{{data.coverImg}}" style="{{mouldConfig.imgHomeH}}" mode='aspectFill' lazy-load="true"></image> | |||
</view> | |||
<view class="coupons-info"> | |||
<view class="coupons-info-name tit">{{data.title}}</view> | |||
@@ -34,7 +34,6 @@ Component({ | |||
methods: { | |||
//获取砍价拼团数据 | |||
getList(val) { | |||
// debugger | |||
let that = this; | |||
let param = '' | |||
if(val=='1'){ | |||
@@ -39,8 +39,9 @@ Component({ | |||
methods: { | |||
backHome: function () { | |||
let url = app.globalData.goHomeUrl | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: url, | |||
}) | |||
}, | |||
bindPickerChange: function (e) { | |||
@@ -52,9 +52,9 @@ | |||
} | |||
.itemBox { | |||
width: 100rpx; | |||
/* width: 100rpx; */ | |||
height: 100rpx; | |||
margin: 0 20rpx; | |||
margin: 0 30rpx; | |||
} | |||
.className { | |||
@@ -113,7 +113,7 @@ var config = { | |||
/** | |||
* 订单列表 /order/list | |||
*/ | |||
orderList: "/order/listGoods", | |||
orderList: "/order/listGoods_v1", | |||
getWeRunData: '/user/getWeRunData', | |||
/** | |||
@@ -112,7 +112,7 @@ Component({ | |||
/** | |||
* 获取全局样式 | |||
*/ | |||
getType() { | |||
getType() { | |||
Http.get({ | |||
url: config.api.setType, | |||
data: { | |||
@@ -132,6 +132,8 @@ Component({ | |||
}, | |||
// 初始换底部导航栏 | |||
setTabStyle: function () { | |||
console.log(app.globalData.mouldType,"mouldType") | |||
if(app.globalData.mouldType==0){ | |||
this.getTabBar().setData({ | |||
selectedColor: `${app.globalData.styleLsit.t_in_std.styleClass}`, | |||
list: [{ | |||
@@ -160,6 +162,38 @@ Component({ | |||
} | |||
], | |||
}) | |||
}else if(app.globalData.mouldType==1){ | |||
this.getTabBar().setData({ | |||
selectedColor: `${app.globalData.styleLsit.t_in_std.styleClass}`, | |||
list: [{ | |||
"pagePath": "/pages/theme/index1/index", | |||
"iconPath": `${app.globalData.styleLsit.t_in.icon}`, | |||
"selectedIconPath": `${app.globalData.styleLsit.t_in_std.icon}`, | |||
"text": "首页" | |||
}, | |||
{ | |||
"pagePath": "/index/searchbar", | |||
"iconPath": `${app.globalData.styleLsit.t_md.icon}`, | |||
"selectedIconPath": `${app.globalData.styleLsit.t_md_std.icon}`, | |||
"text": "门店" | |||
}, | |||
{ | |||
"pagePath": "/index/passCar", | |||
"iconPath": `${app.globalData.styleLsit.t_tc.icon}`, | |||
"selectedIconPath": `${app.globalData.styleLsit.t_tc_std.icon}`, | |||
"text": "停车" | |||
}, | |||
{ | |||
"pagePath": "/index/user", | |||
"iconPath": `${app.globalData.styleLsit.t_uc.icon}`, | |||
"selectedIconPath": `${app.globalData.styleLsit.t_uc_std.icon}`, | |||
"text": "我的" | |||
} | |||
], | |||
}) | |||
} | |||
}, | |||
getTemplateId() { | |||
@@ -41,6 +41,12 @@ | |||
"pagePath": "index/index", | |||
"selectedIconPath": "assets/images/home-a.png" | |||
}, | |||
{ | |||
"text": "首页", | |||
"iconPath": "assets/images/home.png", | |||
"pagePath": "pages/theme/index1/index", | |||
"selectedIconPath": "assets/images/home-a.png" | |||
}, | |||
{ | |||
"text": "门店", | |||
"iconPath": "assets/images/mendian.png", | |||
@@ -109,6 +109,8 @@ Page({ | |||
squareName: "", //当前广场 | |||
isShowSqare: false, | |||
moduleList: [], //按钮列表 | |||
userAvatarUrl: "", | |||
userName: "", | |||
}, | |||
getBusineData(e) { | |||
this.setData({ | |||
@@ -666,7 +668,6 @@ Page({ | |||
}, 8000) | |||
// 如果有广告 | |||
setTimeout(function() { | |||
// debugger | |||
that.alphaClick1(); | |||
}, 8000) | |||
}, | |||
@@ -677,15 +678,20 @@ Page({ | |||
Http.get({ | |||
url: config.api.getScore, | |||
data: { | |||
token: token | |||
token: token | |||
} | |||
}).then(res => { | |||
if (res.data.avatarUrl){ | |||
app.globalData.userAvatarUrl = res.data.avatarUrl | |||
} | |||
that.setData({ | |||
levelName: res.data.levelName, | |||
upgradePercent: res.data.upgradePercent, | |||
upgradeScore: res.data.upgradeScore, | |||
memberId: res.data.id, | |||
credit: res.data.credit, | |||
userAvatarUrl: res.data.avatarUrl, | |||
userName: res.data.nickName, | |||
}) | |||
}) | |||
.catch(err => { | |||
@@ -1,5 +1,5 @@ | |||
<!-- 初始模板 --> | |||
<view wx:if="{{mouldType==0}}"> | |||
<view > | |||
<navbar color="{{typeLsit.sy_top_f.styleClass}}" background="{{typeLsit.sy_top.styleClass}}" text="首页"></navbar> | |||
<!-- style="padding-top:{{navigationBarHeight}}" --> | |||
<view class="container"> | |||
@@ -15,12 +15,15 @@ | |||
<!-- 头像 --> | |||
<view class='infoLeft' style="{{typeLsit.sy_xxb.styleClass}}"> | |||
<view class="user-avatar"> | |||
<open-data class="open" type="userAvatarUrl"></open-data> | |||
<!-- <open-data class="open" type="userAvatarUrl"></open-data> --> | |||
<image wx:if="{{userAvatarUrl!=''}}" class="userAvatarUrl" src="{{userAvatarUrl}}"></image> | |||
<image wx:if="{{userAvatarUrl==''}}" class="userAvatarUrl" src="../assets/images/default.png"></image> | |||
</view> | |||
<!-- 成长值 --> | |||
<view class="user-data fl" bindtap='gotoChengzhangzhi' style="{{typeLsit.sy_xxb.styleClass}}"> | |||
<view class='nameBox'> | |||
<open-data type="userNickName" style="{{typeLsit.sy_xxb_nf.styleClass}}"></open-data> | |||
<!-- <open-data type="userNickName" style="{{typeLsit.sy_xxb_nf.styleClass}}"></open-data> --> | |||
<p style="font-size: 26rpx;color:#292723;float: left;">{{userName}}</p> | |||
<view class='chengzhangBox' style='background:{{chengzhangBox}}'> | |||
<text class='chengzhang'>{{levelName}}</text> | |||
</view> | |||
@@ -97,7 +100,8 @@ | |||
</view> | |||
<!-- 顶部签到成长值 --> | |||
<view class='signin' wx:if="{{fistLogin}}" animation="{{alphaData}}"> | |||
<open-data class="open" type="userAvatarUrl"></open-data> | |||
<!-- <open-data class="open" type="userAvatarUrl"></open-data> --> | |||
<image class="userAvatarUrl" src="{{userAvatarUrl}}"></image> | |||
<text class='text'>您今日签到成功,获得{{fistLogin}}成长值</text> | |||
</view> | |||
<view class="integralBox" wx:if="{{businessSwitch}}"> | |||
@@ -114,139 +118,4 @@ | |||
<image src='https://formall.oss-accelerate.aliyuncs.com/cimg/self-help-integral.png' mode='widthFix' style="width: 100%;height: 100%;"></image> | |||
</navigator> | |||
</view> | |||
</view> | |||
<!-- 欢乐城模板 --> | |||
<view wx:if="{{mouldType==1}}"> | |||
<view class="container1"> | |||
<!-- 会员信息 --> | |||
<view class="color_box1"> | |||
<view style="height:{{navigationBarHeight}};overflow: hidden;" class="goSqunar1" bindtap="goSquareList"> | |||
<view class="title1" style="line-height:{{navLineHeight}}">{{marketName}}</view> | |||
<view style="height:{{navLineHeight}};position:relative;margin-right: 80rpx"> | |||
<image wx:if="{{isShowSqare}}" src="{{huanlechengImgurl}}home_ic_xialajt.png" mode='widthFix' class="xia"></image> | |||
</view> | |||
</view> | |||
<view class='userinfo1' wx:if="{{ifStoreApp!=1}}"> | |||
<!-- 头像 --> | |||
<view class='infoLeft' style="{{typeLsit.sy_xxb.styleClass}}"> | |||
<view class="user-avatar1"> | |||
<open-data class="open" type="userAvatarUrl"></open-data> | |||
</view> | |||
<!-- 成长值--> | |||
<view class="user-data1 fl" style="{{typeLsit.sy_xxb.styleClass}}"> | |||
<view class='nameBox' bindtap="goIntegralmall"> | |||
<!-- <open-data type="userNickName" style="{{typeLsit.sy_xxb_nf.styleClass}}"></open-data> --> | |||
<open-data type="userNickName" style="font-size: 26rpx;color:#292723;"></open-data> | |||
<!-- <image src="{{huanlechengImgurl+'home_ic_vip.png'}}" mode='widthFix'></image> --> | |||
<view class="vgrade">{{levelName}}</view> | |||
<view class="integralNum">积分:{{credit}}</view> | |||
</view> | |||
<view class="view" bindtap='gotoChengzhangzhi'> | |||
<progress percent="{{upgradePercent}}" stroke-width="6" activeColor="{{activeColor}}" /> | |||
<!-- <view class='remainchengzhangzhi' style="{{typeLsit.sy_xxb_cf.styleClass}}">还需{{upgradeScore}}成长值可升级</view> --> | |||
<view class='remainchengzhangzhi'>还需 | |||
<p style="color:#4D4941">{{upgradeScore}}成长值</p>可升级</view> | |||
</view> | |||
</view> | |||
</view> | |||
<!-- 二维码 style="{{typeLsit.sy_qrc.styleClass}}" --> | |||
<view class='qrcode1 fr' bindtap='qrcode'> | |||
<!-- <image src="{{typeLsit.sy_qrc.icon}}" class='qrcodeimg' mode='widthFix'></image> --> | |||
<image src="https://formall.oss-accelerate.aliyuncs.com/cimg/lqcbarcode.png" class='qrcodeimg' mode='widthFix'></image> | |||
</view> | |||
</view> | |||
<!-- banner --> | |||
<c-banner wx:key="unique" list="{{list}}" /> | |||
<!-- 频道 --> | |||
<view class="channelBox" wx:if="{{ifStoreApp!=1&&moduleList.length>0}}" style="{{typeLsit.sy_mbg.styleClass}}"> | |||
<view class='kjBox1' bindtap='goPage' data-obj="{{item}}" wx:for="{{moduleList}}" wx:key="{{index}}"> | |||
<image src='{{item.icon}}' mode='aspectFill'></image> | |||
<view class="text">{{item.name}}</view> | |||
</view> | |||
</view> | |||
<!-- 频道 --> | |||
<view class='channelBox' wx:if="{{ifStoreApp==1}}" style="width:525rpx;"> | |||
<view class='kjBox' bindtap='gotoBargain'> | |||
<image src='{{kanjia}}' mode='aspectFill'></image> | |||
<text>砍价</text> | |||
</view> | |||
<view class='kjBox' bindtap='gotoSpellGroup'> | |||
<image src='{{pintuan}}' mode='aspectFill'></image> | |||
<text>拼团</text> | |||
</view> | |||
<view class='kjBox' bindtap='gotoRushBuy'> | |||
<image src='{{xiaofeika}}' mode='aspectFill'></image> | |||
<text>限时抢购</text> | |||
</view> | |||
</view> | |||
</view> | |||
<!-- <view class='toutiao1' wx:if="{{showQg&&ifStoreApp!=1}}"> | |||
<view class='xianshi' bindtap='gotoRushBuy'> | |||
<text>限时专区</text> | |||
<text>限时惊爆价 轻松拎回家</text> | |||
</view> | |||
<view class='xsCon'> | |||
<view wx:for="{{xslist}}" wx:key="index"> | |||
<view class='igBox' data-couponId="{{item.couponId}}" data-couponChannelId="{{item.id}}" data-targetAd="{{item.targetAd}}" bindtap='gotodetail'> | |||
<image src='{{xslist[index].coverImg}}' mode='widthFix' class='imageH'></image> | |||
<view class='imTit'>{{xslist[index].title}}</view> | |||
</view> | |||
</view> | |||
<view> | |||
<view class='igBox' bindtap='gotoRushBuy'> | |||
<image src='{{more}}' mode='widthFix' class='more'></image> | |||
<view class='imTit'>更多...</view> | |||
</view> | |||
</view> | |||
</view> | |||
</view> | |||
--> | |||
<!-- 限时抢购 --> | |||
<c-mould wx:if="{{topicObj2}}" obj="{{topicObj2}}" isShowCount titleImgUrl="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_txt_xsqw.png" /> | |||
<!-- 砍价 --> | |||
<c-mould wx:if="{{topicObj3}}" obj="{{topicObj3}}" titleImgUrl="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_txt_kj.png" /> | |||
<!-- 拼团 --> | |||
<c-mould wx:if="{{topicObj4}}" obj="{{topicObj4}}" titleImgUrl="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_txt_pt.png" /> | |||
<!-- 专题 --> | |||
<c-mould wx:if="{{specialLsit.length>0}}" wx:for="{{specialLsit}}" wx:key="{{index}}" obj="{{item}}" special/> | |||
<!-- 消费卡 --> | |||
<c-mould wx:if="{{topicObj5}}" obj="{{topicObj5}}" titleImgUrl="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_txt_xfk.png" /> | |||
<!-- 积分商城 --> | |||
<c-mould wx:if="{{topicObj6}}" obj="{{topicObj6}}" titleImgUrl="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_txt_jfsc.png" /> | |||
<optimization wx:if="{{businessList.length>0}}" businessList="{{businessList}}" businessData="{{businessData}}" bind:businessid="getBusineData" /> | |||
<!-- <c-coupons id="lists" bind:myevent="onGetCode" class="business" loadingtext="{{loadingtext}}" loading="{{loading}}" /> --> | |||
<!-- 游戏蒙层 --> | |||
<g-entry id="listss" wx:if="{{showGame&&!played&&!havePlayEd}}" gamedata="{{gamedata}}" bind:myevent="" /> | |||
<!-- 广告蒙层 --> | |||
<c-advertisement id="advertisement" wx:if="{{showGg&&!played&&!havePlayEd1}}" ggdata="{{ggdata}}" /> | |||
</view> | |||
<!-- 顶部签到成长值 --> | |||
<view class='signin' wx:if="{{fistLogin}}" animation="{{alphaData}}"> | |||
<open-data class="open" type="userAvatarUrl"></open-data> | |||
<text class='text'>您今日签到成功,获得{{fistLogin}}成长值</text> | |||
</view> | |||
<view class="integralBox1" wx:if="{{businessSwitch}}"> | |||
<!--是未授权微信且未授权手机号 --> | |||
<navigator url="/pages/getuserinfo/index" open-type="navigate" wx:if="{{accreditFlag==1}}"> | |||
<image src='{{huanlechengImgurl}}home_icon_wgjf.png' mode='widthFix' style="width: 100%;height: 100%;"></image> | |||
</navigator> | |||
<!-- 授权了微信 没授权手机号 --> | |||
<navigator url="/pages/getuserinfo/index" open-type="navigate" wx:if="{{accreditFlag==2}}"> | |||
<image src='{{huanlechengImgurl}}home_icon_wgjf.png' mode='widthFix' style="width: 100%;height: 100%;"></image> | |||
</navigator> | |||
<!-- 微信和手机号都授权了 跳转到商圈--> | |||
<navigator url="{{goUrl}}" wx:if="{{accreditFlag==3}}"> | |||
<image src='{{huanlechengImgurl}}home_icon_wgjf.png' mode='widthFix' style="width: 100%;height: 100%;"></image> | |||
</navigator> | |||
</view> | |||
</view> |
@@ -178,7 +178,7 @@ page { | |||
border-radius: 16rpx; | |||
display: flex; | |||
justify-content: space-between; | |||
margin: 0 auto 30rpx; | |||
margin: 0 auto 30rpx auto; | |||
} | |||
.userinfo1 { | |||
@@ -335,12 +335,12 @@ page { | |||
width: 80rpx; | |||
height: 80rpx; | |||
border-radius: 50%; | |||
overflow: hidden; | |||
overflow: hidden; | |||
float: left; | |||
margin: 10rpx 10rpx; | |||
} | |||
.user-avatar open-data { | |||
.user-avatar image{ | |||
display: block; | |||
width: 100%; | |||
height: 100%; | |||
@@ -53,6 +53,7 @@ Page({ | |||
remark: '', | |||
generalPayPath: '', | |||
generalExtraData: {}, | |||
goHomeUrl:"", | |||
}, | |||
getMoreList(e) { | |||
let totalNum = this.data.ticketList.length; | |||
@@ -244,6 +245,9 @@ Page({ | |||
}) | |||
}, | |||
onShow: function(options) { | |||
this.setData({ | |||
goHomeUrl: app.globalData.goHomeUrl | |||
}) | |||
if (typeof this.getTabBar === 'function' && | |||
this.getTabBar()) { | |||
this.getTabBar().setData({ | |||
@@ -314,6 +318,7 @@ Page({ | |||
}) | |||
}, | |||
onLoad: function(options) { | |||
var that = this; | |||
/** | |||
* 获得分享小程序的 | |||
@@ -163,7 +163,7 @@ | |||
<image src="{{noCoupon}}" mode="widthFix" /> | |||
<text class="txt001">请您敬请期待</text> | |||
<text class='txt002'>我们正在筹备一大波优惠活动</text> | |||
<navigator class='nav' url="/index/index" open-type="switchTab" hover-class="other-navigator-hover"> | |||
<navigator class='nav' url="{{goHomeUrl}}" open-type="switchTab" hover-class="other-navigator-hover"> | |||
<button hover-class='active'>前往首页看看</button> | |||
</navigator> | |||
</view> | |||
@@ -60,7 +60,9 @@ Page({ | |||
maskHidden: true, | |||
imagePath: '', | |||
appVersion: "", | |||
placeholder: '' | |||
placeholder: '', | |||
userAvatarUrl: "", | |||
userName: "", | |||
}, | |||
suerService() { | |||
console.log("打开客服") | |||
@@ -327,7 +329,9 @@ Page({ | |||
credit: res.data.credit, | |||
curPhone: curPhone, | |||
levelName: res.data.levelName, | |||
userId: res.data.userId | |||
userId: res.data.userId, | |||
userAvatarUrl: res.data.avatarUrl, | |||
userName: res.data.nickName | |||
}) | |||
if (res.data.nickName) { | |||
that.setData({ | |||
@@ -14,10 +14,13 @@ | |||
<view class="top-content" wx:if="{{ifStoreApp!=1}}"> | |||
<view class='user_title'> | |||
<view class="user-avatar" bindtap='gotoedit'> | |||
<open-data class="open" type="userAvatarUrl"></open-data> | |||
<!-- <open-data class="open" type="userAvatarUrl"></open-data> --> | |||
<image wx:if="{{userAvatarUrl!=''}}" class="userAvatarUrl" src="{{userAvatarUrl}}"></image> | |||
<image wx:if="{{userAvatarUrl==''}}" class="userAvatarUrl" src="../../../assets/images/default.png"></image> | |||
</view> | |||
<view class="user-name" bindtap='gotoedit'> | |||
<open-data class="name" type="userNickName"></open-data> | |||
<!-- <open-data class="name" type="userNickName"></open-data> --> | |||
<p style="font-size: 26rpx;color:#292723;float: left;">{{userName}}</p> | |||
<!-- 会员等级 --> | |||
<!-- <view class=' usre_level'style='background:{{levelBg}}'> | |||
<text class='chengzhang '>{{levelName}}</text> | |||
@@ -45,7 +45,7 @@ page{ | |||
font-size: 22rpx; | |||
} | |||
.user-avatar open-data { | |||
.user-avatar image { | |||
display: block; | |||
width: 100%; | |||
height: 100%; | |||
@@ -2,6 +2,7 @@ const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' | |||
const util = require("../../utils/util.js"); | |||
const Http = require("../../utils/HttpBasics"); | |||
const config = require("../../config/config"); | |||
let app = getApp(); | |||
Page({ | |||
/** | |||
* 页面的初始数据 | |||
@@ -10,12 +11,16 @@ Page({ | |||
navigationBarHeight, | |||
showPage: false, | |||
showPage1:false, | |||
message:'' | |||
message:'', | |||
goHomeUrl: "", | |||
}, | |||
/** | |||
* 生命周期函数--监听页面加载 | |||
*/ | |||
onLoad: function (options) { | |||
this.setData({ | |||
goHomeUrl: app.globalData.goHomeUrl | |||
}) | |||
let that = this; | |||
if(options&&options.id){ | |||
that.signIn(options.id); | |||
@@ -58,8 +63,9 @@ Page({ | |||
} | |||
}, | |||
goback: function () { | |||
let this_=this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
} | |||
}) |
@@ -7,6 +7,7 @@ const imgurl = require("../../utils/imgurl"); | |||
Page({ | |||
data: { | |||
mouldType: 0, | |||
mouldConfig:{}, | |||
navigationBarHeight, | |||
data: {}, | |||
couponId: null, | |||
@@ -15,11 +16,14 @@ Page({ | |||
hour: "", | |||
wmhome: imgurl.wmhome.url, | |||
minute: "", | |||
nodes: '' | |||
nodes: '', | |||
goHomeUrl: "", | |||
}, | |||
onLoad(options) { | |||
this.setData({ | |||
mouldType: app.globalData.mouldType, | |||
mouldType: app.globalData.mouldType, | |||
mouldConfig: app.globalData.mouldConfig, | |||
goHomeUrl: app.globalData.goHomeUrl, | |||
}) | |||
let that = this; | |||
if (options.id){ | |||
@@ -48,8 +52,9 @@ Page({ | |||
} | |||
}, | |||
goback: function () { | |||
let this_=this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
}, | |||
}); |
@@ -2,34 +2,34 @@ | |||
<navbar back home text="详情" background="#fff"></navbar> | |||
<view style="height:{{navigationBarHeight}} "></view> | |||
<!-- banner活动详情页面 --> | |||
<view class='coupons' > | |||
<view class='coupons'> | |||
<view class="coupons-body"> | |||
<view class='banner'> | |||
<image src='{{data.coverImg}}' mode="widthFix"></image> | |||
</view> | |||
</view> | |||
<view class='act'> | |||
<text class='txt001'>{{data.title}}</text> | |||
<text class='txt002'>{{data.subTitle}}</text> | |||
<view class="proct"> | |||
<text>活动说明</text> | |||
<text>{{data.detail}}</text> | |||
</view> | |||
<text class='txt001'>{{data.title}}</text> | |||
<text class='txt002'>{{data.subTitle}}</text> | |||
<view class="proct"> | |||
<text>活动说明</text> | |||
<text>{{data.detail}}</text> | |||
</view> | |||
<view class='notes' style='display:none;'> | |||
<view> | |||
<text>活动详情</text> | |||
</view> | |||
<view> | |||
<text><text class='spot'></text>{{data.detail}}</text> | |||
</view> | |||
</view> | |||
<view class='notes' style='display:none;'> | |||
<view> | |||
<text>活动详情</text> | |||
</view> | |||
<view> | |||
<text><text class='spot'></text>{{data.detail}}</text> | |||
</view> | |||
</view> | |||
<view class='contain clearfix'> | |||
<!-- 优惠券 --> | |||
<navigator wx:for="{{data.coupons}}" wx:key="{{index}}" url="/pages/coupon/detail/index?couponChannelId={{item.id}}&couponId={{item.couponId}}"> | |||
<navigator wx:for="{{data.coupons}}" wx:key="{{index}}" url="/pages/coupon/detail/index?couponChannelId={{item.id}}&couponId{item.couponId}}"> | |||
<!-- 首页优惠券列表页面 --> | |||
<view class="coupons1" style="{{mouldType==1?'height: 540rpx;':''}}"> | |||
<view class="coupons1-img" style="{{mouldType==1?'height: 344rpx;':''}}"> | |||
<view class="coupons1" style="{{mouldConfig.publicitYchildBoxH}}"> | |||
<view class="coupons1-img" style="{{mouldConfig.publicitYchildH}}"> | |||
<image src="{{item.coverImg}}"></image> | |||
</view> | |||
<view class="coupons1-info"> | |||
@@ -45,11 +45,11 @@ | |||
</view> | |||
</view> | |||
</view> | |||
<!-- <view class="coupons1-info-name subtitle sy">剩余{{item.remainInventory}}</view> --> | |||
<!-- <view class="coupons1-info-name subtitle sy">剩余{{item.remainInventory}}</view> --> | |||
<view class="coupons1-btn"> | |||
<!-- 优惠券价格 --> | |||
<i-button class="buy" hover-class='active' wx:if="{{item.salePriceStr==0}}" data-date='{{data}}'>免费领</i-button> | |||
<i-button class="buy" hover-class='active' wx:if="{{item.salePriceStr==0}}" data-date='{{data}}'>免费领</i-button> | |||
<i-button class="buy" hover-class='active' wx:elif="{{item.salePriceStr!=0}}" data-date='{{data}}'>马上购</i-button> | |||
</view> | |||
<!-- <view class="coupons1-border"></view> --> | |||
@@ -2,6 +2,7 @@ const navigationBarHeight = (getApp().statusBarHeight + 44) + 'px' | |||
var config = require("../../config/config.js"); | |||
const Http = require("../../utils/HttpBasics"); | |||
const imgurl = require("../../utils/imgurl"); | |||
var app = getApp(); | |||
Page({ | |||
/** | |||
* 页面的初始数据 | |||
@@ -30,14 +31,18 @@ Page({ | |||
actUrl: imgurl.act.url, | |||
loadingUrl: imgurl.loading.url, | |||
flag: 'bargaingoods', | |||
goHomeUrl: "", | |||
}, | |||
goback: function () { | |||
let this_=this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
}, | |||
onLoad: function (options) { | |||
console.log(options) | |||
this.setData({ | |||
goHomeUrl: app.globalData.goHomeUrl | |||
}) | |||
let that = this; | |||
// options.from =='myhtml' | |||
// 来自我的列表 | |||
@@ -8,7 +8,7 @@ Page({ | |||
/** | |||
* 页面的初始数据 | |||
*/ | |||
*/ | |||
data: { | |||
navigationBarHeight, | |||
bannerUrl: imgurl.banner.url, | |||
@@ -26,13 +26,17 @@ Page({ | |||
discountStatus: null, | |||
disabled: false, | |||
display: "block!important", | |||
showButton1: false | |||
showButton1: false, | |||
goHomeUrl: "", | |||
}, | |||
/** | |||
* 生命周期函数--监听页面加载 | |||
*/ | |||
onLoad: function(options) { | |||
this.setData({ | |||
goHomeUrl: app.globalData.goHomeUrl | |||
}) | |||
if(app.globalData.token) { | |||
Http.get({ | |||
url: config.api.checkUserStatus, | |||
@@ -152,8 +156,9 @@ Page({ | |||
} | |||
}, | |||
goback: function() { | |||
let this_ = this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
}, | |||
/** | |||
@@ -830,7 +835,7 @@ Page({ | |||
that.pressOrderDetail(app.globalData.wmorder); | |||
} | |||
}, | |||
onShareAppMessage: function(options) { | |||
onShareAppMessage: function(options) { | |||
app.globalData.previewFlag = true | |||
var that = this; | |||
console.log(`/pages/index/index?orderId=${that.data.orderId}&from=${"discount"}&composeOrderType=${that.data.composeOrderType}`) | |||
@@ -78,6 +78,6 @@ | |||
</view> | |||
</form> | |||
<view style='display:{{display}}' wx:if="{{data.orderStatus == 7&&discountStatus == 1}}" class="btns01 clearfix" hover-class="none" hover-stop-propagation="false"> | |||
<button bindtap='orderFunc' disabled='{{showButton1}}' data-orderId="{{data.id}}" data-salePrice="{{data.salePrice/100}}" hover-class="other-button-hover">{{data.salePrice/100}}元 底价购买</button> | |||
<button bindtap='orderFunc' disabled='{{showButton1}}' data-orderId="{{data.composeOrderId}}" data-salePrice="{{data.salePrice/100}}" hover-class="other-button-hover">{{data.salePrice/100}}元 底价购买</button> | |||
</view> | |||
</view> |
@@ -187,7 +187,9 @@ Page({ | |||
} else if (options && options.couponChannelId) { | |||
this.drawNormalText(ctx, "长按识别,进店去看看", 155 * scale, 470 * scale, 16 * scale, "#000", "left", "middle", scale); | |||
this.drawNormalText(ctx, this.data.data.title, 30 * scale, 295 * scale, 20 * scale, "#000", "left", "middle", scale); | |||
// this.drawNormalText(ctx, this.data.data.title, 30 * scale, 295 * scale, 20 * scale, "#000", "left", "middle", scale); | |||
this.canvasTextAutoLine(this.data.data.title, ctx, 30 * scale, 295 * scale, 20 * scale, "#000", "left", "middle", 20, 260,1) | |||
this.drawNormalText(ctx, "售价:" + this.data.data.salePriceStr + "元", 30 * scale, 320 * scale, 15 * scale, "#F4AA91", "left", "middle", scale); | |||
this.drawNormalText(ctx, "适用门店:", 30 * scale, 348 * scale, 16 * scale, "#000", "left", "middle", scale); | |||
@@ -33,14 +33,19 @@ Page({ | |||
loading: true, //"上拉加载"的变量,默认false,隐藏 | |||
content: "", | |||
mystatus: '', | |||
showPage: false | |||
showPage: false, | |||
goHomeUrl: "", | |||
}, | |||
goback: function () { | |||
let this_ = this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
}, | |||
onLoad: function() { | |||
this.setData({ | |||
goHomeUrl: app.globalData.goHomeUrl | |||
}) | |||
let that = this; | |||
if (that.data.current_scroll == "4") { | |||
that.getList(4, 1); | |||
@@ -177,24 +182,27 @@ Page({ | |||
showPage: true | |||
}) | |||
} | |||
res.data.list.map(file => { | |||
file.expiredTime = util.formatTime(file.expiredTime, "yyyy.MM.dd") | |||
if (file.couponOrderStatus == 5 || file.couponOrderStatus == 6 || file.couponOrderStatus == 7 || file.couponOrderStatus == 8) { | |||
file.background = 'rgba(179,180,181,1)'; | |||
file.showImg = true; | |||
} else if (file.couponOrderStatus == 4) { | |||
if (file.remainingAmount > 0 && 29900 >= file.remainingAmount) { | |||
file.background = '#7184E2' | |||
} else if (file.remainingAmount >= 30000 && 49900 >= file.remainingAmount) { | |||
file.background = '#63AAE6' | |||
} else if (file.remainingAmount >= 50000 && 99900 >= file.remainingAmount) { | |||
file.background = '#E2A471' | |||
} else if (file.remainingAmount >= 100000) { | |||
file.background = '#E67663' | |||
if (res.data.list && res.data.list.length>0){ | |||
res.data.list.map(file => { | |||
file.expiredTime = util.formatTime(file.expiredTime, "yyyy.MM.dd") | |||
if (file.couponOrderStatus == 5 || file.couponOrderStatus == 6 || file.couponOrderStatus == 7 || file.couponOrderStatus == 8) { | |||
file.background = 'rgba(179,180,181,1)'; | |||
file.showImg = true; | |||
} else if (file.couponOrderStatus == 4) { | |||
if (file.remainingAmount > 0 && 29900 >= file.remainingAmount) { | |||
file.background = '#7184E2' | |||
} else if (file.remainingAmount >= 30000 && 49900 >= file.remainingAmount) { | |||
file.background = '#63AAE6' | |||
} else if (file.remainingAmount >= 50000 && 99900 >= file.remainingAmount) { | |||
file.background = '#E2A471' | |||
} else if (file.remainingAmount >= 100000) { | |||
file.background = '#E67663' | |||
} | |||
} | |||
} | |||
}); | |||
}); | |||
} | |||
setTimeout(function() { | |||
that.setData({ | |||
loading: false | |||
@@ -219,7 +227,7 @@ Page({ | |||
.catch(err => { | |||
wx.showModal({ | |||
title: '提示', | |||
content: err.errMsg, | |||
content: err.message ? err.message:err.data, | |||
showCancel: false | |||
}) | |||
}) | |||
@@ -11,7 +11,7 @@ | |||
<image src="{{noCoupon}}" mode="widthFix" /> | |||
<text class="txt001">请您敬请期待</text> | |||
<text class='txt002'>我们正在筹备一大波优惠活动</text> | |||
<navigator class='nav' url="/index/index" open-type="switchTab" hover-class="other-navigator-hover"> | |||
<navigator class='nav' url="{{goHomeUrl}}" open-type="switchTab" hover-class="other-navigator-hover"> | |||
<button hover-class='active'>前往首页看看</button> | |||
</navigator> | |||
</view> | |||
@@ -12,6 +12,7 @@ Page({ | |||
navigationBarHeight, | |||
titleVale: "", //标题 | |||
descrideVal: "", //描述 | |||
goHomeUrl: "", | |||
}, | |||
setDescrideVal(e) { //赋值标题 | |||
let descrideVal = e.detail.value | |||
@@ -49,6 +50,7 @@ Page({ | |||
url: config.api.suggest, | |||
data: parameter | |||
}).then(item=>{ | |||
let this_=this | |||
wx.showToast({ | |||
title: "提交成功!", | |||
icon: 'none', | |||
@@ -56,7 +58,7 @@ Page({ | |||
success: () => { | |||
setTimeout(() => { | |||
wx.switchTab({ | |||
url: '/index/index' | |||
url: this_.data.goHomeUrl | |||
}) | |||
}, 2000) | |||
} | |||
@@ -75,7 +77,9 @@ Page({ | |||
* 生命周期函数--监听页面加载 | |||
*/ | |||
onLoad: function(options) { | |||
this.setData({ | |||
goHomeUrl: app.globalData.goHomeUrl | |||
}) | |||
}, | |||
/** | |||
@@ -91,6 +91,7 @@ Page({ | |||
contentType: 0, | |||
page: 1,//查询商户优惠券page | |||
idList: [], | |||
goHomeUrl: "", | |||
}, | |||
/** | |||
* 显示分享弹框 | |||
@@ -298,8 +299,9 @@ Page({ | |||
}) | |||
}, | |||
goback: function () { | |||
let this_ = this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
}, | |||
/** | |||
@@ -1141,7 +1143,8 @@ Page({ | |||
onShow() { | |||
this.setData({ | |||
showbutton: false, | |||
showbutton1: false | |||
showbutton1: false, | |||
goHomeUrl: app.globalData.goHomeUrl | |||
}) | |||
if (this.data.end_time && this.data.activityStatus != 0) { | |||
this.countdown(this.data.end_time) | |||
@@ -6,7 +6,9 @@ const util = require("../../../utils/util"); | |||
const imgurl = require("../../../utils/imgurl"); | |||
Page({ | |||
data: { | |||
goHomeUrl: "", | |||
mouldType: 0, | |||
mouldConfig:{}, | |||
navigationBarHeight, | |||
homeSelectedO: imgurl.homeSelectedO.url, | |||
isshowposter: false, //是否显示分享弹框 | |||
@@ -299,8 +301,9 @@ Page({ | |||
}) | |||
}, | |||
goback: function() { | |||
let this_ = this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
}, | |||
/** | |||
@@ -506,6 +509,7 @@ Page({ | |||
onLoad(options) { | |||
this.setData({ | |||
mouldType: app.globalData.mouldType, | |||
}) | |||
let that = this; | |||
if (options.g) { | |||
@@ -1065,7 +1069,7 @@ Page({ | |||
} else { | |||
if (res) { | |||
wx.navigateTo({ | |||
url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${res.data.mainOrderId}&composeOrderType=${res.data.composeOrderType}`, | |||
url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${res.data.singleOrder.id}&composeOrderType=${res.data.composeOrderType}`, | |||
}) | |||
} | |||
} | |||
@@ -1135,7 +1139,7 @@ Page({ | |||
}) | |||
}else{ | |||
wx.navigateTo({ | |||
url: `/pages/order/detail/index?orderId=${that.data.disOrderNumber}&contentType=${that.data.contentType}&composeOrderType=${that.data.composeOrderType}`, | |||
url: `/pages/order/detail/index?orderId=${res.data.composeOrderId}&contentType=${that.data.contentType}&composeOrderType=${that.data.composeOrderType}`, | |||
}) | |||
} | |||
@@ -1153,9 +1157,11 @@ Page({ | |||
}, | |||
onShow() { | |||
this.setData({ | |||
mouldConfig: app.globalData.mouldConfig, | |||
mouldType: app.globalData.mouldType, | |||
showbutton: false, | |||
showbutton1: false | |||
showbutton1: false, | |||
goHomeUrl: app.globalData.goHomeUrl | |||
}) | |||
if (this.data.end_time && this.data.activityStatus != 0) { | |||
this.countdown(this.data.end_time) | |||
@@ -4,11 +4,11 @@ | |||
<!-- 券的详情页面 --> | |||
<view class='coupons'> | |||
<view class="coupons-body"> | |||
<view wx:if="{{coverPicture.length>0}}" class="banner" style="{{mouldType==1?'height: 750rpx;':''}}"> | |||
<swiper class="index-slide swiper-box" style="{{mouldType==1?'height: 750rpx;':''}}" bindchange="swiperChange" indicator-dots="true" circular="false" current="{{swiperCurrent}}"> | |||
<view wx:if="{{coverPicture.length>0}}" class="banner" style="{{mouldConfig.swiperDetailsH}}"> | |||
<swiper class="index-slide swiper-box" style="{{mouldConfig.swiperDetailsH}}" bindchange="swiperChange" indicator-dots="true" circular="false" current="{{swiperCurrent}}"> | |||
<block wx:for="{{coverPicture}}" wx:key="unique"> | |||
<swiper-item> | |||
<image data-data="{{item}}" src="{{item}}" class="index-slide-image" style="{{mouldType==1?'height: 750rpx;':''}}"/> | |||
<image data-data="{{item}}" src="{{item}}" class="index-slide-image" style="{{mouldConfig.swiperDetailsH}}"/> | |||
</swiper-item> | |||
</block> | |||
</swiper> | |||
@@ -116,10 +116,10 @@ | |||
<view> | |||
<text>购买须知</text> | |||
</view> | |||
<view wx:if="{{data.contentType==0}}"> | |||
<view wx:if="{{curHtml==''}}"> | |||
<text><text class='spot'></text>{{data.remark}}</text> | |||
</view> | |||
<view wx:if="{{data.contentType!=0}}"> | |||
<view wx:if="{{curHtml!=''}}"> | |||
<rich-text nodes="{{curHtml}}"></rich-text> | |||
</view> | |||
</view> | |||
@@ -37,10 +37,15 @@ Page({ | |||
loading: true, //"上拉加载"的变量,默认false,隐藏 | |||
content: "", | |||
mystatus: '', | |||
showPage:false | |||
showPage:false, | |||
goHomeUrl: "", | |||
}, | |||
onLoad() { | |||
this.setData({ | |||
goHomeUrl: app.globalData.goHomeUrl | |||
}) | |||
this.getList(0, 1); | |||
}, | |||
onShow: function () { | |||
let that = this; | |||
@@ -53,8 +58,9 @@ Page({ | |||
// }) | |||
}, | |||
goback: function () { | |||
let this_ = this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
}, | |||
//点击跳转到券详情页面 | |||
@@ -11,7 +11,7 @@ | |||
<image src="{{couponUrl}}" mode="widthFix" /> | |||
<text class="txt001">请您敬请期待</text> | |||
<text class='txt002'>我们正在筹备一大波优惠活动</text> | |||
<navigator class='nav' url="/index/index" open-type="switchTab" hover-class="other-navigator-hover"> | |||
<navigator class='nav' url="{{goHomeUrl}}" open-type="switchTab" hover-class="other-navigator-hover"> | |||
<button hover-class='active'>前往首页看看</button> | |||
</navigator> | |||
</view> | |||
@@ -18,7 +18,8 @@ Page({ | |||
childUrl: config.api.activityDey, | |||
startDate:'', | |||
endDate:'', | |||
mouldType:0 | |||
mouldType:0, | |||
mouldConfig:{}, | |||
}, | |||
goActivity(e){ | |||
let id = e.currentTarget.dataset.id | |||
@@ -100,6 +101,7 @@ Page({ | |||
onLoad: function(options) { | |||
this.setData({ | |||
mouldType: app.globalData.mouldType, | |||
mouldConfig: app.globalData.mouldConfig, | |||
}) | |||
this.setActivityCalendar(this.data.startDate, this.data.endDate) | |||
}, | |||
@@ -2,7 +2,7 @@ | |||
<view style="height:{{navigationBarHeight}} "></view> | |||
<detelsit allFlag="true" bind:setDate="getDate" childUrl="{{childUrl}}" activityStyle=" color:red"></detelsit> | |||
<view class="activityBox" wx:for="{{list}}" wx:key="index" bindtap="goActivity" data-id="{{item.id}}"> | |||
<image class="activity" src="{{item.coverImg}}" style="{{mouldType==1?'height:360rpx;':''}}"></image> | |||
<image class="activity" src="{{item.coverImg}}" style="{{mouldConfig.activityDeyImgH}}"></image> | |||
<view class="title">{{item.title}}</view> | |||
<view class="text" wx:if="{{item.activityType==1}}">报名时间:{{item.startTime}}至{{item.endTime}}</view> | |||
<view class="text">活动时间:{{item.activityStartTime}}至{{item.activityEndTime}}</view> | |||
@@ -7,6 +7,7 @@ let app = getApp(); | |||
Page({ | |||
data: { | |||
mouldType: 0, | |||
mouldConfig:{}, | |||
navigationBarHeight, | |||
tabData:[ | |||
{ | |||
@@ -37,17 +38,22 @@ Page({ | |||
content: "", | |||
mystatus: '', | |||
showPage: false, | |||
paramData:null | |||
paramData:null, | |||
goHomeUrl: "", | |||
}, | |||
goback: function () { | |||
let this_ = this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
}, | |||
onLoad(options) { | |||
this.setData({ | |||
goHomeUrl: app.globalData.goHomeUrl, | |||
mouldType: app.globalData.mouldType, | |||
mouldConfig: app.globalData.mouldConfig, | |||
}) | |||
console.log(this.data.mouldConfig,"mouldConfig") | |||
this.getList(0, 1); | |||
if(options.fromId){ | |||
this.setData({ | |||
@@ -14,7 +14,7 @@ | |||
<image src="{{noCoupon}}" mode="aspectFill" lazy-load="true" /> | |||
<text class="txt001">请您敬请期待</text> | |||
<text class='txt002'>我们正在筹备一大波优惠活动</text> | |||
<navigator class='nav' url="/index/index" open-type="switchTab" hover-class="other-navigator-hover"> | |||
<navigator class='nav' url="{{goHomeUrl}}" open-type="switchTab" hover-class="other-navigator-hover"> | |||
<button hover-class='active'>前往首页看看</button> | |||
</navigator> | |||
</view> | |||
@@ -22,7 +22,7 @@ | |||
<view class='mms'> | |||
<image src="{{canTransferred}}" wx-if='{{item.supportTransfer==1}}' class='cantransferred' mode="aspectFill"/> | |||
<view class='detail_msg'> | |||
<image mode="aspectFill" style="{{mouldType==1?'height: 300rpx!important;':'height: 176rpx!important;'}}" src='{{item.coverImg}}' ></image> | |||
<image mode="aspectFill" style="{{mouldConfig.consumeImgH}}" src='{{item.coverImg}}' ></image> | |||
<text>{{item.title}}</text> | |||
</view> | |||
<view class='buycardbtn'> | |||
@@ -17,11 +17,11 @@ | |||
<view class='section'> | |||
<text>身高</text> | |||
<input wx:if="{{height}}" name="height" type="text" placeholder='请填写身高单位cm' placeholder='{{height}}'/> | |||
<input wx:if="{{!height}}" name="height" type="text" placeholder='请填写体重单位kg' /> | |||
<input wx:if="{{!height}}" name="height" type="text" placeholder='请填写身高单位cm' /> | |||
</view> | |||
<view class='section'> | |||
<text>体重</text> | |||
<input wx:if="{{weight}}" name="weight" type="text" placeholder='请填写身高单位cm' placeholder='{{weight}}'/> | |||
<input wx:if="{{weight}}" name="weight" type="text" placeholder='请填写体重单位kg' placeholder='{{weight}}'/> | |||
<input wx:if="{{!weight}}" name="weight" type="text" placeholder='请填写体重单位kg' /> | |||
</view> | |||
<view class="section section_gap"> | |||
@@ -107,7 +107,7 @@ Page({ | |||
}, | |||
backHome: function() { | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: app.globalData.goHomeUrl, | |||
}) | |||
}, | |||
getPhoneNumber: function(e) { | |||
@@ -121,7 +121,6 @@ Page({ | |||
iv: iv | |||
} | |||
}).then(res => { | |||
// debugger | |||
app.globalData.phone = res.data.phone; | |||
if (that.data.skipUrl == '1') { | |||
console.log(app.globalData.skip, app.globalData.skipUrl, "跳转地址") | |||
@@ -218,7 +217,7 @@ Page({ | |||
}); | |||
} else if (that.data.mineFlag == 'index') { | |||
wx.switchTab({ | |||
url: '/index/index' | |||
url: app.globalData.goHomeUrl | |||
}); | |||
} else { | |||
wx.showToast({ | |||
@@ -196,7 +196,7 @@ Page({ | |||
backHome: function() { | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: app.globalData.goHomeUrl, | |||
}) | |||
}, | |||
@@ -328,7 +328,7 @@ Page({ | |||
that.judgePhonelngo() | |||
} else if (app.globalData.type == 'in') { | |||
// 首页 | |||
app.globalData.skipUrl = '/index/index', | |||
app.globalData.skipUrl = app.globalData.goHomeUrl, | |||
app.globalData.skip = 'switchTab' | |||
that.judgePhonelngo() | |||
} else if (app.globalData.type == "qd") { | |||
@@ -426,7 +426,7 @@ Page({ | |||
app.globalData.skip = 'redirectTo' | |||
that.judgePhonelngo() | |||
} else { | |||
app.globalData.skipUrl = "/index/index", | |||
app.globalData.skipUrl = app.globalData.goHomeUrl, | |||
app.globalData.skip = 'switchTab' | |||
that.judgePhonelngo() | |||
} | |||
@@ -266,7 +266,7 @@ Page({ | |||
// 首页 | |||
else if (app.globalData.type == 'in') { | |||
wx.switchTab({ | |||
url: '/index/index' | |||
url: app.globalData.goHomeUrl | |||
}); | |||
} | |||
// 停车 | |||
@@ -384,7 +384,7 @@ Page({ | |||
} else { | |||
// 主页 | |||
wx.switchTab({ | |||
url: '/index/index' | |||
url: app.globalData.goHomeUrl | |||
}) | |||
} | |||
}) | |||
@@ -456,7 +456,7 @@ Page({ | |||
// 首页 | |||
else if (app.globalData.type == 'in') { | |||
wx.switchTab({ | |||
url: '/index/index' | |||
url: app.globalData.goHomeUrl | |||
}); | |||
} | |||
// 停车 | |||
@@ -548,7 +548,7 @@ Page({ | |||
}) | |||
} else { | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: app.globalData.goHomeUrl, | |||
}) | |||
} | |||
} | |||
@@ -10,6 +10,7 @@ Page({ | |||
* 页面的初始数据 | |||
*/ | |||
data: { | |||
goHomeUrl: "", | |||
navigationBarHeight, | |||
noMerchant: imgurl.noMerchant.url, | |||
noCoupon: imgurl.noCoupon.url, | |||
@@ -40,15 +41,20 @@ Page({ | |||
}) | |||
}, | |||
goback: function () { | |||
let this_ = this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
}, | |||
/** | |||
* 生命周期函数--监听页面加载 | |||
*/ | |||
onLoad: function(options) { | |||
let that = this; | |||
that.setData({ | |||
goHomeUrl: app.globalData.goHomeUrl, | |||
}) | |||
if (options && options.id) { | |||
this.setData({ | |||
id: options.id | |||
@@ -3,6 +3,7 @@ var config = require("../../config/config.js"); | |||
const Http = require("../../utils/HttpBasics"); | |||
const imgurl = require("../../utils/imgurl"); | |||
const QR = require("../../utils/memberqrcode.js"); | |||
let app = getApp(); | |||
Page({ | |||
/** | |||
* 页面的初始数据 | |||
@@ -35,7 +36,9 @@ Page({ | |||
hidden:false, | |||
userCredit:'', | |||
sortColumn:'', | |||
sortOrder:'' | |||
sortOrder:'', | |||
goHomeUrl:"", | |||
userAvatarUrl:'',// | |||
}, | |||
qrcodeH: function () { | |||
var that = this; | |||
@@ -47,12 +50,18 @@ Page({ | |||
} | |||
}, | |||
goback: function () { | |||
let this_ = this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
}, | |||
onLoad: function (options) { | |||
// console.log("app.globalData.userAvatarUrl", app.globalData.userAvatarUrl) | |||
let that = this; | |||
that.setData({ | |||
goHomeUrl: app.globalData.goHomeUrl, | |||
userAvatarUrl: app.globalData.userAvatarUrl, | |||
}) | |||
var todayDate = new Date().getTime(); | |||
that.getPoints(); | |||
that.setData({ | |||
@@ -6,7 +6,9 @@ | |||
<view class='topbg-top'> | |||
<view class="user-avatar" bindtap='gotograde'> | |||
<view class='user-box'> | |||
<open-data class="open" type="userAvatarUrl"></open-data> | |||
<!-- <open-data class="open" type="userAvatarUrl"></open-data> --> | |||
<image wx:if="{{userAvatarUrl!=''}}" class="userAvatarUrl" src="{{userAvatarUrl}}"></image> | |||
<image wx:if="{{userAvatarUrl==''}}" class="userAvatarUrl" src="../../assets/images/default.png"></image> | |||
</view> | |||
</view> | |||
<view class='bot'> | |||
@@ -21,14 +21,14 @@ | |||
height: 100%; | |||
float: left; | |||
} | |||
.user-box { | |||
.user-box { | |||
width: 82rpx; | |||
height: 82rpx; | |||
border-radius: 50%; | |||
overflow: hidden; | |||
margin: 26rpx 0 0 60rpx; | |||
} | |||
.user-avatar open-data { | |||
.user-avatar image{ | |||
display: block; | |||
width: 100%; | |||
height: 100%; | |||
@@ -5,6 +5,7 @@ var config = require("../../../config/config.js"); | |||
const Http = require("../../../utils/HttpBasics"); | |||
const imgurl = require("../../../utils/imgurl"); | |||
const utils = require("../../../utils/util.js") | |||
let app = getApp(); | |||
Page({ | |||
/** | |||
@@ -13,6 +14,8 @@ Page({ | |||
data: { | |||
navigationBarHeight, | |||
teljpgUrl: imgurl.teljpg.url, | |||
goHomeUrl: "", | |||
}, | |||
/** | |||
@@ -20,7 +23,8 @@ Page({ | |||
*/ | |||
onLoad: function (options) { | |||
this.setData({ | |||
formData:options | |||
formData:options, | |||
goHomeUrl: app.globalData.goHomeUrl, | |||
}) | |||
}, | |||
@@ -69,8 +73,9 @@ Page({ | |||
* 返回首页 | |||
*/ | |||
gotoIndex(){ | |||
let this_ = this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
}, | |||
/** | |||
@@ -12,6 +12,7 @@ Page({ | |||
*/ | |||
data: { | |||
mouldType: 0, | |||
mouldConfig:{}, | |||
navigationBarHeight, | |||
teljpgUrl: imgurl.teljpg.url, | |||
wmhome: imgurl.wmhome.url, | |||
@@ -39,7 +40,8 @@ Page({ | |||
*/ | |||
onLoad: function(options) { | |||
this.setData({ | |||
mouldType: app.globalData.mouldType | |||
mouldType: app.globalData.mouldType, | |||
mouldConfig: app.globalData.mouldConfig, | |||
}) | |||
Http.get({ | |||
url: config.api.checkUserStatus, | |||
@@ -286,7 +288,7 @@ Page({ | |||
url: '/pages/order/detail/index?orderId=' + res.data.id, | |||
}) | |||
} else { | |||
_this.goToOrderGroup(orderId, res.data.singleOrder.orderGroupId, _this) | |||
_this.goToOrderGroup(res.data.singleOrder.id, res.data.singleOrder.orderGroupId, _this) | |||
} | |||
}) | |||
.catch(err => { | |||
@@ -2,8 +2,8 @@ | |||
<view style="height:{{navigationBarHeight}} "></view> | |||
<view class="content-box" > | |||
<view class='content'> | |||
<view class='top-img' style="{{mouldType==1?'height: 750rpx;':''}}"> | |||
<image src='{{data.coverImg}}' style="{{mouldType==1?'height: 750rpx;':''}}"></image> | |||
<view class='top-img' style="{{mouldConfig.groupSwiperH}}"> | |||
<image src='{{data.coverImg}}' style="{{mouldConfig.groupSwiperH}}"></image> | |||
</view> | |||
<view class='title'>{{data.title}}</view> | |||
<view class='text'> | |||
@@ -252,7 +252,7 @@ Page({ | |||
// 首页 | |||
else if (app.globalData.type == 'in') { | |||
wx.switchTab({ | |||
url: '/index/index' | |||
url: app.globalData.goHomeUrl | |||
}); | |||
} | |||
// 停车 | |||
@@ -352,7 +352,7 @@ Page({ | |||
} else { | |||
// 主页 | |||
wx.switchTab({ | |||
url: '/index/index' | |||
url: app.globalData.goHomeUrl | |||
}) | |||
} | |||
}) | |||
@@ -432,7 +432,7 @@ Page({ | |||
// 首页 | |||
else if (app.globalData.type == 'in') { | |||
wx.switchTab({ | |||
url: '/index/index' | |||
url: app.globalData.goHomeUrl | |||
}); | |||
} | |||
// 停车 | |||
@@ -524,7 +524,7 @@ Page({ | |||
}) | |||
} else { | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: app.globalData.goHomeUrl, | |||
}) | |||
} | |||
} | |||
@@ -9,7 +9,7 @@ Page({ | |||
* 页面的初始数据 | |||
*/ | |||
data: { | |||
showFlag:false, | |||
showFlag: false, | |||
navigationBarHeight, | |||
succUrl: imgurl.succ.url, | |||
spcodeUrl: imgurl.spcode.url, | |||
@@ -26,27 +26,27 @@ Page({ | |||
mystatus: '', | |||
staticGamedata: {}, | |||
showIf: false, | |||
showPage:false, | |||
showButton:false, | |||
cardDetail:null, | |||
supportTransfer:'', | |||
cardIf:false, | |||
showPage: false, | |||
showButton: false, | |||
cardDetail: null, | |||
supportTransfer: '', | |||
cardIf: false, | |||
contentType: 0, | |||
orderFlag: false,//判断是不是线上配送 | |||
orderFlag: false, //判断是不是线上配送 | |||
}, | |||
copeCode(e){ | |||
copeCode(e) { | |||
let code = e.currentTarget.dataset.text | |||
wx.setClipboardData({ | |||
data: code, | |||
success:function(){ | |||
success: function() { | |||
wx.showToast({ | |||
title: '复制成功', | |||
icon:"none" | |||
icon: "none" | |||
}) | |||
} | |||
}) | |||
}, | |||
gokuaidi(e){ | |||
gokuaidi(e) { | |||
let nu = e.currentTarget.dataset.nu | |||
wx.navigateToMiniProgram({ | |||
appId: 'wx6885acbedba59c14', | |||
@@ -54,9 +54,9 @@ Page({ | |||
}) | |||
}, | |||
setShow(){ | |||
setShow() { | |||
this.setData({ | |||
showFlag:true | |||
showFlag: true | |||
}) | |||
}, | |||
hieShow() { | |||
@@ -65,7 +65,7 @@ Page({ | |||
}) | |||
}, | |||
//刷新订单 | |||
updetail(){ | |||
updetail() { | |||
let that = this | |||
let url = config.api.orderDetail | |||
// let data = {} | |||
@@ -80,50 +80,51 @@ Page({ | |||
// orderId: this.data.orderId | |||
// } | |||
// } | |||
Http.get({ | |||
url: url, | |||
data: { orderId: this.data.orderId} | |||
}) | |||
.then(res => { | |||
url: url, | |||
data: { | |||
orderId: this.data.orderId | |||
} | |||
}).then(res => { | |||
wx.hideLoading(); | |||
if (res.data.level==0){//单券 | |||
if (res.code == 200) { | |||
that.getUserInfo() | |||
that.setData({ | |||
showPage: true, | |||
composeOrderType: res.data.composeOrderType | |||
}) | |||
} | |||
let tempData = res.data | |||
if (tempData.deliveryInfo) tempData.deliveryInfo = JSON.parse(tempData.deliveryInfo) | |||
// if (res.data.level == 0) { //单券 | |||
// if (res.code == 200) { | |||
// that.getUserInfo() | |||
// that.setData({ | |||
// showPage: true, | |||
// composeOrderType: res.data.composeOrderType | |||
// }) | |||
// } | |||
// let tempData = res.data | |||
// if (tempData.deliveryInfo) tempData.deliveryInfo = JSON.parse(tempData.deliveryInfo) | |||
that.setData({ | |||
order: res.data, | |||
supportTransfer: res.data.supportTransfer | |||
}); | |||
that.getStaticGame() | |||
//createDate 创建时间 | |||
var createDate = util.formatTime(res.data.createDate, "yyyy-MM-dd hh:mm:ss"); | |||
that.setData({ | |||
createDate: createDate | |||
}); | |||
}else{ | |||
// that.setData({ | |||
// order: res.data, | |||
// supportTransfer: res.data.supportTransfer | |||
// }); | |||
// that.getStaticGame() | |||
// //createDate 创建时间 | |||
// var createDate = util.formatTime(res.data.createDate, "yyyy-MM-dd hh:mm:ss"); | |||
// that.setData({ | |||
// createDate: createDate | |||
// }); | |||
// } else { | |||
// if (that.data.orderFlag) { | |||
var createDate = util.formatTime(res.data.orderCouponVoList[0].createDate, "yyyy-MM-dd hh:mm:ss"); | |||
let tempData = res.data.orderCouponVoList[0] | |||
tempData.deliveryInfo = tempData.deliveryInfo ? JSON.parse(tempData.deliveryInfo) : "" | |||
that.setData({ | |||
order: tempData, | |||
showPage: true, | |||
createDate: createDate, | |||
composeOrderType: tempData.composeOrderType | |||
}) | |||
console.log(that.data.order) | |||
var createDate = util.formatTime(res.data.orders[0].createDate, "yyyy-MM-dd hh:mm:ss"); | |||
let tempData = res.data.orders[0] | |||
tempData.deliveryInfo = tempData.deliveryInfo ? JSON.parse(tempData.deliveryInfo) : "" | |||
that.setData({ | |||
order: tempData, | |||
showPage: true, | |||
createDate: createDate, | |||
composeOrderType: tempData.composeOrderType | |||
}) | |||
console.log(that.data.order) | |||
// } | |||
} | |||
// } | |||
}) | |||
.catch(error => { | |||
@@ -135,28 +136,28 @@ Page({ | |||
}) | |||
}) | |||
}, | |||
//确认收货 | |||
verify(){ | |||
//确认收货 | |||
verify() { | |||
Http.post({ | |||
url: config.api.verify, | |||
data:{ | |||
data: { | |||
couponOrderId: this.data.order.couponOrderId | |||
} | |||
}).then(res=>{ | |||
}).then(res => { | |||
wx.showToast({ | |||
title: '签收成功', | |||
icon:"none" | |||
icon: "none" | |||
}) | |||
this.updetail() | |||
}).catch(err=>{ | |||
}).catch(err => { | |||
wx.showModal({ | |||
title: '提示', | |||
content: err.message ? err.message:err.data, | |||
content: err.message ? err.message : err.data, | |||
showCancel: false | |||
}) | |||
}) | |||
}, | |||
phone: function (e) { | |||
phone: function(e) { | |||
let that = this; | |||
console.log(e); | |||
wx.makePhoneCall({ | |||
@@ -171,13 +172,13 @@ Page({ | |||
url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}` | |||
}) | |||
}, | |||
getUserInfo: function () { | |||
getUserInfo: function() { | |||
let that = this; | |||
// 获取用户信息 | |||
Http.get({ | |||
url: config.api.getScore, | |||
data: {} | |||
}) | |||
url: config.api.getScore, | |||
data: {} | |||
}) | |||
.then(res => { | |||
console.log(res) | |||
that.setData({ | |||
@@ -186,20 +187,20 @@ Page({ | |||
}) | |||
}) | |||
}, | |||
onShareAppMessage: function (res) { | |||
onShareAppMessage: function(res) { | |||
app.globalData.previewFlag = true | |||
if (res.from === 'button') { | |||
console.log(res, 3333333333333333333333) | |||
// 来自页面内转发按钮 | |||
let _this = this; | |||
return { | |||
title: _this.data.userName+'赠送您一张' + _this.data.order.title, | |||
title: _this.data.userName + '赠送您一张' + _this.data.order.title, | |||
path: '/pages/index/index?couponChannelId=' + this.data.order.couponChannelId + '&cuserId=' + this.data.order.cuserId + '&couponId=' + this.data.order.productId + '&coverImg=' + this.data.order.coverImg + '&userName=' + this.data.userName + '&avatarUrl=' + this.data.avatarUrl + '&couponOrderId=' + this.data.order.couponOrderId + '&updateDate=' + this.data.order.updateDate, | |||
imageUrl: this.data.order.coverImg, | |||
success: function (res) { | |||
success: function(res) { | |||
// 转发成功 | |||
}, | |||
fail: function (res) { | |||
fail: function(res) { | |||
// 转发失败 | |||
} | |||
} | |||
@@ -208,8 +209,8 @@ Page({ | |||
} | |||
}, | |||
powerDrawer: function (e) { | |||
powerDrawer: function(e) { | |||
let that = this; | |||
console.log(e) | |||
// couponOrderStatus | |||
@@ -239,14 +240,14 @@ Page({ | |||
}); | |||
} | |||
}, | |||
gotogame: function () { | |||
gotogame: function() { | |||
let that = this; | |||
wx.redirectTo({ | |||
url: '/pages/game/index?url=' + that.data.staticGamedata.url + "&id=" + that.data.staticGamedata.id + "&gameId=" + that.data.staticGamedata.gameId, | |||
}) | |||
}, | |||
// 买完卡跳转到立即使用页面 | |||
gotoUse:function(){ | |||
gotoUse: function() { | |||
wx.navigateTo({ | |||
url: '/pages/cardorder/index/index' | |||
}) | |||
@@ -255,20 +256,20 @@ Page({ | |||
getStaticGame(token) { | |||
let _this = this; | |||
Http.get({ | |||
url: config.api.getGame, | |||
data: { | |||
triggleAction: 3 // 购买触发 | |||
} | |||
}).then(res => { | |||
if (res.data.id) { | |||
url: config.api.getGame, | |||
data: { | |||
triggleAction: 3 // 购买触发 | |||
} | |||
}).then(res => { | |||
if (res.data.id) { | |||
_this.setData({ | |||
showIf: true | |||
}) | |||
} | |||
_this.setData({ | |||
showIf: true | |||
staticGamedata: res.data | |||
}) | |||
} | |||
_this.setData({ | |||
staticGamedata: res.data | |||
}) | |||
}) | |||
.catch(err => { | |||
console.log(err); | |||
}) | |||
@@ -280,12 +281,12 @@ Page({ | |||
/** | |||
* 生命周期函数--监听页面加载 | |||
*/ | |||
onLoad: function (options) { | |||
onLoad: function(options) { | |||
let that = this; | |||
if (options.dingdan && options.dingdan =="order"){ | |||
if (options.dingdan && options.dingdan == "order") { | |||
that.setData({ | |||
orderFlag:true//判断是不是线上配送 | |||
orderFlag: true //判断是不是线上配送 | |||
}) | |||
} | |||
that.setData({ | |||
@@ -294,19 +295,19 @@ Page({ | |||
composeOrderType: options.composeOrderType | |||
}); | |||
wx.hideShareMenu() | |||
if(options.cardIf){ | |||
if (options.cardIf) { | |||
that.setData({ | |||
cardIf:true | |||
cardIf: true | |||
}) | |||
} | |||
wx.showLoading({ | |||
title: "加载中" | |||
}); | |||
that.updetail() | |||
}, | |||
onShow:function(){ | |||
onShow: function() { | |||
let that = this; | |||
that.setData({ | |||
showButton: false | |||
@@ -319,13 +320,13 @@ Page({ | |||
let that = this; | |||
// 支付成功 | |||
Http.post({ | |||
url: config.api.toOrderGroup, | |||
data: { | |||
id: orderGroupId, | |||
orderId, | |||
couponId: _this.data.order.productId | |||
} | |||
}) | |||
url: config.api.toOrderGroup, | |||
data: { | |||
id: orderGroupId, | |||
orderId, | |||
couponId: _this.data.order.productId | |||
} | |||
}) | |||
.then(res => { | |||
wx.redirectTo({ | |||
url: `/pages/spellDetail/index?orderId=${orderId}&couponId=${_this.data.order.productId}&orderGroupId=${res.data.orderGroupId}` | |||
@@ -370,10 +371,10 @@ Page({ | |||
wx.showLoading({ | |||
title: '订单正在处理中...', | |||
}) | |||
setTimeout(function () { | |||
setTimeout(function() { | |||
wx.hideLoading() | |||
}, 5000) | |||
that.payOrderUpdate(that.data.orderId, payOrderId, 1,'','',that); // 支付成功 | |||
that.payOrderUpdate(that.data.orderId, payOrderId, 1, '', '', that); // 支付成功 | |||
if (res.errMsg == "requestPayment:ok") { | |||
if (that.data.order.type == 100) { | |||
wx.setStorage({ | |||
@@ -390,13 +391,13 @@ Page({ | |||
}, | |||
fail: res => { | |||
that.setData({ | |||
showButton:false | |||
showButton: false | |||
}) | |||
that.payOrderUpdate(that.data.orderId, payOrderId, 2,'','fail',that); | |||
that.payOrderUpdate(that.data.orderId, payOrderId, 2, '', 'fail', that); | |||
return; | |||
}, | |||
}); | |||
}).catch(err=>{ | |||
}).catch(err => { | |||
wx.hideLoading(); | |||
that.setData({ | |||
showButton: false | |||
@@ -409,7 +410,7 @@ Page({ | |||
}); | |||
} else { | |||
// 免费券 | |||
that.payOrderUpdate(orderId, "0", 1,'','free') // 支付成功 | |||
that.payOrderUpdate(orderId, "0", 1, '', 'free') // 支付成功 | |||
if (that.data.order.type == 100) { | |||
wx.setStorage({ | |||
key: 'couponNum2', | |||
@@ -431,7 +432,7 @@ Page({ | |||
/** | |||
* 支付订单更新 | |||
*/ | |||
payOrderUpdate: (orderId, payOrderId, status, reason,type,_this) => { | |||
payOrderUpdate: (orderId, payOrderId, status, reason, type, _this) => { | |||
// 支付成功 | |||
Http.post({ | |||
url: config.api.payOrderUpdate, | |||
@@ -447,35 +448,35 @@ Page({ | |||
_this.setData({ | |||
showButton: false | |||
}) | |||
if (!type&&type!='free') { | |||
if (!type && type != 'free') { | |||
wx.showToast({ | |||
title: "购买成功", | |||
duration: 2000, | |||
image: imgurl.success.url, | |||
mask: false, | |||
success: function () { | |||
success: function() { | |||
wx.showLoading({ | |||
title: "加载中..." | |||
}); | |||
setTimeout(function () { | |||
setTimeout(function() { | |||
wx.hideLoading(); | |||
}, 1600); | |||
setTimeout(() => { | |||
let url = "" | |||
if (_this.data.orderFlag){ | |||
if (_this.data.orderFlag) { | |||
wx.redirectTo({ | |||
url: `/pages/order/detail/index?orderId=${orderId}&dingdan=order` | |||
}); | |||
}else{ | |||
} else { | |||
wx.redirectTo({ | |||
url: `/pages/order/detail/index?orderId=${orderId}` | |||
}); | |||
} | |||
}, 1600); | |||
} | |||
}); | |||
} else if (type == 'free'){ | |||
} else if (type == 'free') { | |||
wx.redirectTo({ | |||
url: `/pages/order/detail/index?orderId=${orderId}` | |||
}); | |||
@@ -484,7 +485,7 @@ Page({ | |||
.catch(err => { | |||
console.log(err) | |||
if (!type) { | |||
setTimeout(function () { | |||
setTimeout(function() { | |||
_this.payOrderUpdate(orderId, payOrderId, status, reason, type, _this); | |||
}, 1500) | |||
} | |||
@@ -32,16 +32,19 @@ Page({ | |||
allow_load: true, | |||
page: 1, | |||
content: "", | |||
goHomeUrl:"" | |||
}, | |||
goback: function () { | |||
let this_ = this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
}, | |||
onLoad(e) { | |||
this.getList(e.id, 1); | |||
this.setData({ | |||
current_scroll: e.id | |||
current_scroll: e.id, | |||
goHomeUrl: app.globalData.goHomeUrl, | |||
}); | |||
}, | |||
onShow(){ | |||
@@ -57,7 +60,7 @@ Page({ | |||
}) | |||
}, | |||
gotopay: function (e) { | |||
let level = e.currentTarget.dataset.level | |||
let shippingtype = e.currentTarget.dataset.shippingtype | |||
// if (e.currentTarget.dataset.shipping == 1 || e.currentTarget.dataset.shipping == 2){//线上购物 | |||
// wx.navigateTo({ | |||
@@ -68,7 +71,7 @@ Page({ | |||
// url: `/pages/order/detail/index?orderId=${e.currentTarget.dataset.id}&flag='pay'` | |||
// }) | |||
// } | |||
if (level == 0) { | |||
if (shippingtype != 1 && shippingtype!=2) { | |||
wx.navigateTo({ | |||
url: `/pages/order/detail/index?orderId=${e.currentTarget.dataset.id}&flag='pay'` | |||
}) | |||
@@ -115,7 +118,7 @@ Page({ | |||
pageNum: pageNum, | |||
pageSize: 15, | |||
orderStatus: key, | |||
paymentType: 0 | |||
paymentType: 0 | |||
}; | |||
} | |||
@@ -154,27 +157,28 @@ Page({ | |||
// 将砍价的状态过滤出来 | |||
console.log(tmpArr) | |||
tmpArr.map(item=>{ | |||
if(item.level==1){ | |||
item.orderCouponVoList.map(itemChild=>{ | |||
item.orders.map(itemChild=>{ | |||
itemChild.createDate = util.formatTime(itemChild.createDate, "yyyy-MM-dd hh:mm:ss"); | |||
}) | |||
} | |||
}) | |||
that.setData({ | |||
list: tmpArr | |||
}) | |||
for (let i = 0; i < that.data.list.length; i++) { | |||
var createDate1 = util.formatTime(that.data.list[i].createDate, "yyyy-MM-dd hh:mm:ss"); | |||
/** | |||
* 修改list的endtime | |||
* 渲染到页面 | |||
*/ | |||
var createDate = 'list[' + i + '].createDate' | |||
that.setData({ | |||
[createDate]: createDate1 | |||
}); | |||
} | |||
// for (let i = 0; i < that.data.list.length; i++) { | |||
// var createDate1 = util.formatTime(that.data.list[i].createDate, "yyyy-MM-dd hh:mm:ss"); | |||
// /** | |||
// * 修改list的endtime | |||
// * 渲染到页面 | |||
// */ | |||
// var createDate = 'list[' + i + '].createDate' | |||
// that.setData({ | |||
// [createDate]: createDate1 | |||
// }); | |||
// } | |||
}) | |||
.catch(err => { | |||
wx.showModal({ | |||
@@ -6,81 +6,70 @@ | |||
<i-tab class='i-tab' wx:for="{{tabs}}" wx:key="unique" key="{{item.key}}" title="{{item.name}}"></i-tab> | |||
</i-tabs> | |||
<view style='padding-top:90rpx;'> | |||
<view wx:for='{{list}}' wx:if="{{list.length!=0}}" class='section' wx:key='index' > | |||
<view wx:for='{{list}}' wx:if="{{list.length!=0}}" class='section' wx:key='index'> | |||
<view class='detail_top'> | |||
<view> | |||
<!-- <image wx:if="{{item.orderStatus == 6 || item.orderStatus == 7 || item.orderStatus == 8 || item.orderStatus == 9}}" src="{{wmdiscount}}" class="discount" mode="widthFix"></image> --> | |||
<!-- <image wx:if="{{item.orderStatus == 1&& item.type == 8}}" src="{{wmdiscount}}" class="discount" mode="widthFix"></image> --> | |||
<text wx:if="{{item.level==0}}">{{item.title}}</text> | |||
<text wx:if="{{item.level==1}}">订单id:{{item.composeOrderId}}</text> | |||
<text class='wait' wx:if="{{item.orderStatus==0}}">等待付款</text> | |||
<text class='wait' wx:if="{{item.orderStatus==10}}">拼团中</text> | |||
<text class='sucess' wx:if="{{item.orderStatus==3}}">待退款</text> | |||
<text class='close' wx:if="{{item.orderStatus==2}}">交易关闭</text> | |||
<text class='close' wx:if="{{item.orderStatus==6}}">砍价中</text> | |||
<text class='sucess' wx:if="{{item.orderStatus==7}}">砍价成功</text> | |||
<text class='close' wx:if="{{item.orderStatus==8}}">砍价失败</text> | |||
<text class='close' wx:if="{{item.orderStatus==9}}">砍价取消</text> | |||
<text class='close' wx:if="{{item.orderStatus==12}}">拼团已过期</text> | |||
<text class='close' wx:if="{{item.orderStatus==12}}">拼团失败</text> | |||
<text class='close' wx:if="{{item.orderStatus==8}}">砍价失败</text> | |||
<text class='close' wx:if="{{item.orderStatus==4}}">已退款</text> | |||
<text class='wait' wx:if="{{item.orderStatus==5}}">退款失败</text> | |||
<text class='sucess' wx:if="{{item.orderStatus==11}}">拼团成功</text> | |||
<text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice==0&&item.type!=50&&item.type!=51}}">免费领取</text> | |||
<text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice==0&&(item.type==50||item.type==51)}}">积分兑换</text> | |||
<text class='sucess' wx:if="{{item.orderStatus==1&&item.salePrice!=0}}">付款成功</text> | |||
<text>订单id:{{item.id}}</text> | |||
</view> | |||
</view> | |||
<view class='detail_msg' wx:if="{{item.type&&(item.type!=11&&item.type!=12)}}"> | |||
<view class='logo'> | |||
<image mode="aspectFill" src='{{item.coverImg}}'></image> | |||
</view> | |||
<view class='info'> | |||
<view class="sub">{{item.subTitle}}</view> | |||
<view class="value" wx:if="{{item.type != 8}}">面额:<text wx:if="{{item.unit==0}}">{{item.price/100}}元</text><text wx:if="{{item.unit==1}}">{{item.price/100}}小时</text></view> | |||
<view class="value" wx:if="{{item.type == 8}}">原价:<text wx:if="{{item.unit==0}}">{{item.price/100}}元</text><text wx:if="{{item.unit==1}}">{{item.price/100}}小时</text></view> | |||
<!-- <image class='sendImg' wx:if="{{item.sendChannelType!=1&&item.sendChannelType!=undefined}}" src='{{wmgive}}' mode='widthFix'></image> --> | |||
<view class="value">下单时间:<text>{{item.createDate}}</text> | |||
</view> | |||
<!-- 购物车模式 --> | |||
<view class="itemBox" wx:for="{{item.orders}}" wx:for-item="child" wx:key="index"> | |||
<view class="payStatus"> | |||
<text class='wait' wx:if="{{child.orderStatus==0}}">等待付款</text> | |||
<text class='wait' wx:if="{{child.orderStatus==10}}">拼团中</text> | |||
<text class='sucess' wx:if="{{child.orderStatus==3}}">待退款</text> | |||
<text class='close' wx:if="{{child.orderStatus==2}}">交易关闭</text> | |||
<text class='close' wx:if="{{child.orderStatus==6}}">砍价中</text> | |||
<text class='sucess' wx:if="{{child.orderStatus==7}}">砍价成功</text> | |||
<text class='close' wx:if="{{child.orderStatus==8}}">砍价失败</text> | |||
<text class='close' wx:if="{{child.orderStatus==9}}">砍价取消</text> | |||
<text class='close' wx:if="{{child.orderStatus==12}}">拼团已过期</text> | |||
<text class='close' wx:if="{{child.orderStatus==12}}">拼团失败</text> | |||
<text class='close' wx:if="{{child.orderStatus==8}}">砍价失败</text> | |||
<text class='close' wx:if="{{child.orderStatus==4}}">已退款</text> | |||
<text class='wait' wx:if="{{child.orderStatus==5}}">退款失败</text> | |||
<text class='sucess' wx:if="{{child.orderStatus==11}}">拼团成功</text> | |||
<text class='sucess' wx:if="{{child.orderStatus==1&&child.salePrice==0&&child.type!=50&&child.type!=51}}">免费领取</text> | |||
<text class='sucess' wx:if="{{child.orderStatus==1&&child.salePrice==0&&(child.type==50||child.type==51)}}">积分兑换</text> | |||
<text class='sucess' wx:if="{{child.orderStatus==1&&child.salePrice!=0}}">付款成功</text> | |||
</view> | |||
</view> | |||
<!-- 商品全包购买完成 --> | |||
<view class='detail_msg' wx:if="{{item.type&&(item.type==11||item.type==12)}}"> | |||
<view class="itemImg"> | |||
<image mode="aspectFill" src='{{item.coverImg}}'></image> | |||
</view> | |||
<view class="itemContent"> | |||
<view class="sub"></view> | |||
<view class="face">价格:<text>{{(item.salePrice)/100}}元 x {{item.couponNumber}}</text></view> | |||
<view class="yunfeK" wx:if="{{!(item.type==11&&item.shippingType==2)}}"></view> | |||
<view class="yunfe" wx:if="{{item.type==11&&item.shippingType==2}}">运费:{{item.freightPriceStr}}</view> | |||
<view class="date" >下单时间:<text>{{item.createDate}}</text></view> | |||
</view> | |||
</view> | |||
<!-- 商品全包购买完成 --> | |||
<!-- 购物车模式 --> | |||
<view class="itemBox" wx:if="{{item.level==1}}" wx:for="{{item.orderCouponVoList}}" wx:for-item="child" wx:key="index"> | |||
<view class="itemImg"> | |||
<image mode="aspectFill" src='{{child.coverImg}}'></image> | |||
</view> | |||
<view class="itemContent"> | |||
<view class="yunfeK" wx:if="{{!(child.type==11&&child.shippingType==2)}}"></view> | |||
<!-- <view class="yunfeK" wx:if="{{!(child.type==11&&child.shippingType==2)}}"></view> --> | |||
<view class="sub">{{child.title}}</view> | |||
<view class="face">价格:<text>{{(child.salePrice)/100}}元 x {{child.couponNumber}}</text></view> | |||
<view class="yunfe" wx:if="{{child.type==11&&child.shippingType==2}}">运费:{{child.freightPriceStr}}</view> | |||
<view class="date">下单时间:<text>{{child.createDate}}</text></view> | |||
<view class="face">价格: | |||
<text>{{(child.salePrice)/100}}元 x {{child.couponNumber}}</text> | |||
</view> | |||
<view class="yunfe" wx:if="{{child.type==11&&child.shippingType==2}}">运费:{{child.freightPriceStr}}</view> | |||
<view class="date">下单时间: | |||
<text>{{child.createDate}}</text> | |||
</view> | |||
<view wx:if="{{child.orderStatus==1||child.orderStatus==11}}" class="btnZf" data-shippingtype="{{child.shippingType}}" data-id="{{child.composeOrderId}}" data-shipping="{{child.shippingType}}" bindtap="gotopay"> | |||
<text>去查看</text> | |||
</view> | |||
<view wx:if="{{child.orderStatus == 6}}" class="btn" data-id="{{child.id}}" bindtap="gotoDiscount"> | |||
<text>砍价详情</text> | |||
</view> | |||
<view wx:if="{{child.orderStatus==0 || child.orderStatus==7}}" class="btn" data-shippingtype="{{child.shippingType}}" data-id="{{child.composeOrderId}}" bindtap="gotopay"> | |||
<text>去支付</text> | |||
</view> | |||
<view wx:if="{{child.orderStatus==5}}" style="background:#999;opacity: .6;" class="btn"> | |||
<text>退款失败</text> | |||
</view> | |||
</view> | |||
</view> | |||
<!-- 购物车模式 --> | |||
<!-- 购物车模式 --> | |||
<view class='payment'> | |||
<view> | |||
<text>实付金额:</text><text>{{item.payment/100}}元</text> | |||
<text>订单总金额:</text> | |||
<text>{{item.payment/100}}元</text> | |||
</view> | |||
<!-- | |||
orderStatus | |||
@@ -88,58 +77,15 @@ | |||
1完成 | |||
2取消 | |||
--> | |||
<!-- item.composeOrderId=='0'?item.id:item.composeOrderId --> | |||
<view wx:if="{{item.orderStatus==1||item.orderStatus==11}}" class="btnZf" data-level="{{item.level}}" data-id="{{item.id}}" data-shipping="{{item.shippingType}}" bindtap="gotopay"> | |||
<text>去查看</text> | |||
</view> | |||
<view wx:if="{{item.orderStatus == 6}}" class="btn" data-id="{{item.id}}" bindtap="gotoDiscount"> | |||
<text>砍价详情</text> | |||
</view> | |||
<view wx:if="{{item.orderStatus==0 || item.orderStatus==7}}" class="btn" data-level="{{item.level}}" data-id="{{item.level==0?item.id:item.composeOrderId}}" bindtap="gotopay"> | |||
<text>去支付</text> | |||
</view> | |||
<!-- <view wx:if="{{item.orderStatus==15&&item.type==9}}" data-data="{{item}}" class="btn" data-id="{{item.id}}" bindtap="gotoSpellPay"> | |||
<text>去支付</text> | |||
</view> --> | |||
<view wx:if="{{item.orderStatus==5}}" style="background:#999;opacity: .6;" class="btn"> | |||
<text>退款失败</text> | |||
</view> | |||
<!-- <view wx:if="{{item.orderStatus==2}}" class="btnGm" data-id="{{item.id}}" bindtap="gotopay" data-couponId="{{item.couponId}}" data-couponChannelId="{{item.id}}" data-targetAd="{{item.targetAd}}" > | |||
<text class='txGm'>再次购买</text> | |||
</view> --> | |||
</view> | |||
</view> | |||
<!-- item.composeOrderId=='0'?item.id:item.composeOrderId --> | |||
<!-- 券包样式 --> | |||
<!-- <view class="section"> | |||
</view> | |||
</view> | |||
<view class='payment'> | |||
<view> | |||
<text>实付金额:</text><text>{{item.payment/100}}元</text> | |||
</view> | |||
<view wx:if="{{item.orderStatus==1||item.orderStatus==11}}" class="btnZf" data-id="{{item.id}}" bindtap="gotopay"> | |||
<text>去查看</text> | |||
</view> | |||
<view wx:if="{{item.orderStatus == 6}}" class="btn" data-id="{{item.id}}" bindtap="gotoDiscount"> | |||
<text>砍价详情</text> | |||
</view> | |||
<view wx:if="{{item.orderStatus==0 || item.orderStatus==7}}" class="btn" data-id="{{item.id}}" bindtap="gotopay"> | |||
<text>去支付</text> | |||
</view> | |||
<view wx:if="{{item.orderStatus==5}}" style="background:#999;opacity: .6;" class="btn"> | |||
<text>退款失败</text> | |||
</view> | |||
</view> | |||
</view> --> | |||
<!-- 券包样式 --> | |||
<view > | |||
<view> | |||
</view> | |||
<view class="dingdan" wx:if="{{list.length==0}}"> | |||
<image src="{{noOrdersUrl}}" mode="widthFix"></image> | |||
@@ -147,6 +93,7 @@ | |||
<text>再忙,也要记得买点什么犒赏自己~</text> | |||
</view> | |||
</view> | |||
<view class="loading" wx:if="{{loading}}"> | |||
<image src="{{loadingUrl}}" mode="widthFix"></image>{{content}} | |||
</view> |
@@ -102,6 +102,7 @@ | |||
top:86rpx; | |||
right:2rpx; | |||
} | |||
.detail_top .sucess { | |||
display: inline-block; | |||
width: 123rpx !important; | |||
@@ -202,10 +203,8 @@ | |||
.btn { | |||
position: absolute; | |||
top: 0; | |||
bottom: 0; | |||
margin: auto; | |||
right: 20rpx; | |||
right: 0; | |||
width: 118rpx; | |||
height: 52rpx; | |||
line-height: 52rpx; | |||
@@ -218,10 +217,8 @@ | |||
} | |||
.btnZf{ | |||
position: absolute; | |||
top: 0; | |||
bottom: 0; | |||
margin: auto; | |||
right: 20rpx; | |||
right: 0; | |||
width: 118rpx; | |||
height: 52rpx; | |||
line-height: 52rpx; | |||
@@ -234,10 +231,8 @@ | |||
} | |||
.btnGm{ | |||
position: absolute; | |||
top: 0; | |||
bottom: 0; | |||
margin: auto; | |||
right: 20rpx; | |||
right: 0; | |||
width: 118rpx; | |||
height: 52rpx; | |||
line-height: 52rpx; | |||
@@ -322,7 +317,24 @@ button::after{ border: none; } | |||
} | |||
.itemBox{ | |||
overflow: hidden; | |||
margin: 20rpx 60rpx; | |||
margin: 0 60rpx 20rpx 60rpx; | |||
padding-bottom: 20rpx; | |||
position: relative; | |||
} | |||
.payStatus{ | |||
text-align: right; | |||
} | |||
.payStatus .sucess { | |||
display: inline-block; | |||
width: 123rpx !important; | |||
/* overflow: hidden; */ | |||
font-family:PingFangSC-Regular; | |||
font-size: 28rpx; | |||
font-weight:400; | |||
color: #2C8DFF; | |||
letter-spacing: 0; | |||
text-align: right; | |||
line-height: 26px; | |||
} | |||
.itemImg{ | |||
float: left; | |||
@@ -341,8 +353,6 @@ button::after{ border: none; } | |||
.itemContent{ | |||
float: left; | |||
width: 70%; | |||
} | |||
.face{ | |||
font-size: 24rpx; | |||
@@ -33,9 +33,13 @@ Page({ | |||
current: "0", | |||
current_scroll: "0", | |||
page: 1, | |||
allow_load: true | |||
allow_load: true, | |||
goHomeUrl: "", | |||
}, | |||
onLoad() { | |||
this.setData({ | |||
goHomeUrl: app.globalData.goHomeUrl | |||
}) | |||
this.getList(0, 1); | |||
}, | |||
@@ -10,7 +10,7 @@ | |||
<image src="{{noCoupon}}" mode="widthFix" /> | |||
<text class="txt001">请您敬请期待</text> | |||
<text class='txt002'>我们正在筹备一大波优惠活动</text> | |||
<navigator class='nav' url="/index/index" open-type="switchTab" hover-class="other-navigator-hover"> | |||
<navigator class='nav' url="{{goHomeUrl}}" open-type="switchTab" hover-class="other-navigator-hover"> | |||
<button hover-class='active'>前往首页看看</button> | |||
</navigator> | |||
</view> | |||
@@ -15,7 +15,9 @@ Page({ | |||
question: {}, | |||
userDetails: "", | |||
thenDate: "", | |||
mouldType: 0 | |||
mouldType: 0, | |||
mouldConfig:{}, | |||
goHomeUrl:"", | |||
}, | |||
//设置选中项 | |||
setLsit(e) { | |||
@@ -83,6 +85,7 @@ Page({ | |||
url: config.api.submitQuestin, | |||
data: param | |||
}).then(res => { | |||
let this_ = this | |||
let str = "" | |||
if (this.data.question.rewardCredit) { | |||
str = `感谢您的参与, | |||
@@ -97,7 +100,7 @@ Page({ | |||
success: () => { | |||
setTimeout(() => { | |||
wx.switchTab({ | |||
url: '/index/index' | |||
url: this_.data.goHomeUrl | |||
}) | |||
}, 2000) | |||
@@ -193,8 +196,10 @@ Page({ | |||
onLoad: function(options) { | |||
this.setData({ | |||
goHomeUrl: app.globalData.goHomeUrl, | |||
id: options.id, | |||
mouldType: app.globalData.mouldType, | |||
mouldConfig: app.globalData.mouldConfig, | |||
}) | |||
this.getDetail() | |||
}, | |||
@@ -4,7 +4,7 @@ | |||
<!-- <view class="hidBox"> | |||
<view class="contcBox"></view> | |||
</view> --> | |||
<image class="imgBox" src="{{question.logo}}" style="{{mouldType==1?'height:360rpx;':''}}"></image> | |||
<image class="imgBox" src="{{question.logo}}" style="{{mouldConfig.answerImgH}}"></image> | |||
<view class="titleBox"> | |||
<view class="title">{{question.title}}</view> | |||
<view class="time">{{'答题时间:'+question.startDate_Sing+'至'+question.endDate_Sing}}</view> | |||
@@ -14,7 +14,8 @@ Page({ | |||
pageNum: 1, | |||
pageSize: 4, | |||
thenDate:"", | |||
mouldType: 0 | |||
mouldType: 0, | |||
mouldConfig: {}, | |||
}, | |||
goDetails(e){ | |||
let id = e.currentTarget.dataset.id | |||
@@ -60,6 +61,7 @@ Page({ | |||
onLoad: function (options) { | |||
this.setData({ | |||
mouldType:app.globalData.mouldType, | |||
mouldConfig: app.globalData.mouldConfig, | |||
}) | |||
}, | |||
@@ -3,7 +3,7 @@ | |||
<view class="noData" wx:if="{{list.length==0}}"> 敬请期待!</view> | |||
<view class="questionLsi" wx:for="{{list}}" bindtap="goDetails" data-id="{{item.id}}"> | |||
<image class="img" style="{{mouldType==1?'height:360rpx;':''}}" src="{{item.logo}}"></image> | |||
<image class="img" style="{{mouldConfig.answerImgH}}" src="{{item.logo}}"></image> | |||
<view class="title">{{item.title}}</view> | |||
<view class="conten">{{item.topDesc}}</view> | |||
@@ -26,12 +26,16 @@ Page({ | |||
wmhome: imgurl.wmhome.url, | |||
minute: "", | |||
nodes: '', | |||
mouldType: 0 | |||
mouldType: 0, | |||
mouldConfig: {}, | |||
goHomeUrl: "", | |||
}, | |||
onLoad(options) { | |||
let that = this; | |||
that.setData({ | |||
mouldType: app.globalData.mouldType, | |||
mouldConfig: app.globalData.mouldConfig, | |||
goHomeUrl: app.globalData.goHomeUrl, | |||
}) | |||
wx.hideShareMenu(); | |||
if(options&&options.id){ | |||
@@ -116,8 +120,9 @@ Page({ | |||
}) | |||
}, | |||
goback: function() { | |||
let this_ = this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
}, | |||
onShareAppMessage: function (options) { | |||
@@ -8,8 +8,8 @@ | |||
<!-- 活动正常排版格式 --> | |||
<view class='coupons' style='{{data.type!=2?"padding-bottom: 160rpx":0}};'> | |||
<view class="coupons-body"> | |||
<view class='banner' style="{{mouldType==1?'height:360rpx;':''}}"> | |||
<image src='{{data.coverImg}}' style="{{mouldType==1?'height:360rpx;':''}}"></image> | |||
<view class='banner' style="{{mouldConfig.answerImgH}}"> | |||
<image src='{{data.coverImg}}' style="{{mouldConfig.answerImgH}}"></image> | |||
</view> | |||
<view class='box'> | |||
<view class='act'> | |||
@@ -3,6 +3,7 @@ const util = require("../../../utils/util.js"); | |||
const Http = require("../../../utils/HttpBasics"); | |||
const config = require("../../../config/config"); | |||
const imgurl = require("../../../utils/imgurl"); | |||
let app = getApp(); | |||
Page({ | |||
/** | |||
* 页面的初始数据 | |||
@@ -23,7 +24,8 @@ Page({ | |||
index: 0, | |||
index1: 0, | |||
showPage:false, | |||
credit:"" | |||
credit:"", | |||
goHomeUrl:"", | |||
}, | |||
gotomyAc(){ | |||
wx.navigateTo({ | |||
@@ -40,8 +42,9 @@ Page({ | |||
}) | |||
}, | |||
goback: function () { | |||
let this_ = this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
}, | |||
/** | |||
@@ -154,6 +157,9 @@ Page({ | |||
*/ | |||
onLoad: function (options) { | |||
let that = this; | |||
that.setData({ | |||
goHomeUrl: app.globalData.goHomeUrl, | |||
}) | |||
console.log(options) | |||
if (options && options.activityId){ | |||
that.setData({ | |||
@@ -22,11 +22,18 @@ Page({ | |||
minute: "", | |||
loading: true, //"上拉加载"的变量,默认false,隐藏 | |||
content: "", | |||
showPage:false | |||
showPage:false, | |||
goHomeUrl:"", | |||
}, | |||
goback: function () { | |||
let this_ = this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
}, | |||
onLoad: function (options) { | |||
this.setData({ | |||
goHomeUrl: app.globalData.goHomeUrl, | |||
}) | |||
}, | |||
//列表 | |||
@@ -13,7 +13,8 @@ Page({ | |||
myspeacialUrl: imgurl.myspeacial.url, | |||
teliconUrl: imgurl.telicon.url, | |||
wmhome: imgurl.wmhome.url, | |||
memberId:"000000" | |||
memberId:"000000", | |||
goHomeUrl: "", | |||
}, | |||
phone: function (e) { | |||
console.log(e) | |||
@@ -40,8 +41,12 @@ Page({ | |||
* 生命周期函数--监听页面显示 | |||
*/ | |||
onShow: function () { | |||
this.ifPhoneInfo() | |||
let that = this; | |||
that.setData({ | |||
goHomeUrl: app.globalData.goHomeUrl, | |||
}) | |||
console.log("渲染开始") | |||
Http.get({ | |||
url: config.api.getDiscountInfo, | |||
@@ -69,8 +74,9 @@ Page({ | |||
}, | |||
goback: function () { | |||
let this_ = this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
}, | |||
/** | |||
@@ -30,7 +30,8 @@ Page({ | |||
sec: "00", | |||
spellStatusList: spellStatus, | |||
isMyself: false, | |||
showAlert: false | |||
showAlert: false, | |||
goHomeUrl:"", | |||
}, | |||
gotoAgain() { | |||
let data = this.data.data; | |||
@@ -54,8 +55,9 @@ Page({ | |||
}) | |||
}, | |||
gotoIndex(){ | |||
let this_ = this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
}, | |||
gotoshare() { | |||
@@ -74,7 +76,8 @@ Page({ | |||
onLoad: function (options) { | |||
console.log(this.data.spellStatusList, options, 7777777) | |||
this.setData({ | |||
paramData: options | |||
paramData: options, | |||
goHomeUrl: app.globalData.goHomeUrl, | |||
}) | |||
this.getUserInfo(); | |||
if (options.orderGroupId){ | |||
@@ -260,15 +263,16 @@ Page({ | |||
this.checkUser(this.data.paramData) | |||
}, | |||
/** | |||
* 用户点击右上角分享 | |||
* 用户点击右上角分享 | |||
*/ | |||
// paramData | |||
onShareAppMessage: function (res) { | |||
let _this = this; | |||
app.globalData.previewFlag = true | |||
if (res.from === 'button') { | |||
console.log(res, this.data.nickName, this.data.avatarUrl, 3333333333333333333333) | |||
console.log(`/pages/index/index?couponId=${_this.data.data.couponId}&orderGroupId=${_this.data.data.orderGroupId}&couponChannelId=${_this.data.paramData.couponChannelId}&orderId=${_this.data.data.orderId}&avatarUrl=${_this.data.avatarUrl}&nickName=${_this.data.nickName}`,) | |||
// 来自页面内转发按钮 | |||
let _this = this; | |||
return { | |||
title: _this.data.nickName + '超值推荐的' + _this.data.data.title, | |||
path: `/pages/index/index?couponId=${_this.data.data.couponId}&orderGroupId=${_this.data.data.orderGroupId}&couponChannelId=${_this.data.paramData.couponChannelId}&orderId=${_this.data.data.orderId}&avatarUrl=${_this.data.avatarUrl}&nickName=${_this.data.nickName}`, | |||
@@ -12,6 +12,7 @@ Page({ | |||
*/ | |||
data: { | |||
mouldType: 0, | |||
mouldConfig: {}, | |||
navigationBarHeight, | |||
fenxiang: imgurl.fenxiang1.url, | |||
homeSelectedO: imgurl.homeSelectedO.url, | |||
@@ -48,7 +49,8 @@ Page({ | |||
zIndex: 11, | |||
display: "none", | |||
orderGroupId: '', | |||
merchantVoList: [] | |||
merchantVoList: [], | |||
goHomeUrl:"", | |||
}, | |||
/** | |||
@@ -56,7 +58,9 @@ Page({ | |||
*/ | |||
onLoad: function (options) { | |||
this.setData({ | |||
mouldType:app.globalData.mouldType | |||
mouldType:app.globalData.mouldType, | |||
mouldConfig: app.globalData.mouldConfig, | |||
goHomeUrl: app.globalData.goHomeUrl, | |||
}) | |||
Http.get({ | |||
url: config.api.checkUserStatus, | |||
@@ -143,8 +147,9 @@ Page({ | |||
}) | |||
}, | |||
gotoIndex: function () { | |||
let this_ = this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
}, | |||
/** | |||
@@ -354,10 +359,10 @@ Page({ | |||
title: '提示', | |||
content: "您有未支付拼团订单,请先进行支付", | |||
confirmText: "去支付", | |||
success: function (res) { | |||
if (res.confirm) { | |||
success: function (res1) { | |||
if (res1.confirm) { | |||
wx.navigateTo({ | |||
url: `/pages/spellGroup/paySpellGroup/index?orderId=${that.data.disOrderNumber}&couponChannelId=${that.data.couponChannelId}&couponId=${couponId}&orderGroupId={that.data.orderGroupId}&composeOrderType=${that.data.composeOrderType}`, | |||
url: `/pages/spellGroup/paySpellGroup/index?orderId=${res.data.composeOrderId}&couponChannelId=${that.data.couponChannelId}&couponId=${couponId}&orderGroupId={that.data.orderGroupId}&composeOrderType=${that.data.composeOrderType}`, | |||
}) | |||
} | |||
@@ -368,10 +373,10 @@ Page({ | |||
title: '提示', | |||
content: '您有未支付订单,请先进行支付', | |||
confirmText: "去支付", | |||
success: function (res) { | |||
if (res.confirm) { | |||
success: function (res1) { | |||
if (res1.confirm) { | |||
wx.navigateTo({ | |||
url: `/pages/order/detail/index?orderId=${that.data.disOrderNumber}&composeOrderType=${that.data.composeOrderType}`, | |||
url: `/pages/order/detail/index?orderId=${res.data.composeOrderId}&composeOrderType=${that.data.composeOrderType}`, | |||
}) | |||
} | |||
} | |||
@@ -521,7 +526,7 @@ Page({ | |||
url: '/pages/order/detail/index?orderId=' + res.data.mainOrderId, | |||
}) | |||
} else { | |||
_this.goToOrderGroup(orderId, res.data.mainOrderId, _this) | |||
_this.goToOrderGroup(res.data.singleOrder.id, res.data.mainOrderId, _this) | |||
} | |||
}) | |||
.catch(err => { | |||
@@ -2,11 +2,11 @@ | |||
<view style="height:{{navigationBarHeight}} "></view> | |||
<view class="content-box" > | |||
<view class='content'> | |||
<view wx:if="{{coverPicture.length>0}}" class="banner" style="{{mouldType==1?'height: 750rpx;':''}}"> | |||
<swiper class="index-slide swiper-box" style="{{mouldType==1?'height: 750rpx;':''}}" bindchange="swiperChange" indicator-dots="true" autoplay="true" circular="false" current="{{swiperCurrent}}"> | |||
<view wx:if="{{coverPicture.length>0}}" class="banner" style="{{mouldConfig.groupSwiperH}}"> | |||
<swiper class="index-slide swiper-box" style="{{mouldConfig.groupSwiperH}}" bindchange="swiperChange" indicator-dots="true" autoplay="true" circular="false" current="{{swiperCurrent}}"> | |||
<block wx:for="{{coverPicture}}" wx:key="unique"> | |||
<swiper-item > | |||
<image data-data="{{item}}" style="{{mouldType==1?'height: 750rpx;':''}}" src="{{item}}" class="index-slide-image" /> | |||
<image data-data="{{item}}" style="{{mouldConfig.groupSwiperH}}" src="{{item}}" class="index-slide-image" /> | |||
</swiper-item> | |||
</block> | |||
</swiper> | |||
@@ -158,7 +158,7 @@ Page({ | |||
url: '/pages/order/detail/index?orderId=' + res.data.id, | |||
}) | |||
} else { | |||
_this.goToOrderGroup(orderId, res.data.mainOrderId, _this) | |||
_this.goToOrderGroup(res.data.singleOrder.id, res.data.mainOrderId, _this) | |||
} | |||
}) | |||
.catch(err => { | |||
@@ -10,6 +10,7 @@ Page({ | |||
*/ | |||
data: { | |||
mouldType: 0, | |||
mouldConfig: {}, | |||
navigationBarHeight, | |||
noCoupon: imgurl.noCoupon.url, | |||
bannerUrl: imgurl.banner.url, | |||
@@ -33,17 +34,22 @@ Page({ | |||
loading:true, | |||
content:'数据正在加载中', | |||
flag: 'spellList', | |||
reloadIf:false | |||
reloadIf:false, | |||
goHomeUrl:"", | |||
}, | |||
goback: function () { | |||
let this_ = this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
}, | |||
onLoad: function (options) { | |||
this.setData({ | |||
mouldType: app.globalData.mouldType | |||
mouldType: app.globalData.mouldType, | |||
mouldConfig: app.globalData.mouldConfig, | |||
goHomeUrl: app.globalData.goHomeUrl, | |||
}) | |||
console.log(this.data.mouldConfig,"mouldConfig") | |||
let that = this; | |||
that.getBannerlist(); | |||
var todayDate = new Date().getTime(); | |||
@@ -175,7 +181,7 @@ Page({ | |||
}) | |||
let data = e.currentTarget.dataset.data | |||
wx.navigateTo({ | |||
url: `/pages/spellGroup/paySpellGroup/index?orderId=${data.orderId}&couponId=${data.couponId}&orderGroupId=${data.orderGroupId}&couponChannelId=${data.couponChannelId}&composeOrderType=${data.composeOrderType}`, | |||
url: `/pages/spellGroup/paySpellGroup/index?orderId=${data.composeOrderId}&couponId=${data.couponId}&orderGroupId=${data.orderGroupId}&couponChannelId=${data.couponChannelId}&composeOrderType=${data.composeOrderType}`, | |||
}) | |||
}, | |||
gotoEdit(e){ | |||
@@ -325,6 +331,7 @@ Page({ | |||
}) | |||
}, | |||
inviteFriend: function (e) { | |||
/** | |||
* 添加标识 | |||
*/ | |||
@@ -378,6 +385,7 @@ Page({ | |||
* @param goto拼团券详情 | |||
*/ | |||
invite: function (e) { | |||
let couponChannelId = e.currentTarget.dataset.id; | |||
let couponId = e.currentTarget.dataset.couponid; | |||
if (couponChannelId && couponId) { | |||
@@ -15,10 +15,10 @@ | |||
<image src='{{noCoupon}}'></image> | |||
<view class='no-data-text'>暂无数据</view> | |||
</view> | |||
<view class='content'> | |||
<view class='content'> | |||
<view class='sepll-list' wx:if='{{flag=="spellList"}}' wx:for="{{lists}}" wx:key="{{index}}" data-couponId='{{item.couponId}}' data-id='{{item.id}}' bindtap='invite'> | |||
<view class='spell-left' style="{{mouldType==1?'height: 300rpx':''}}"> | |||
<image src='{{item.coverImg}}' style="{{mouldType==1?'height: 300rpx;':''}}" mode="aspectFill"></image> | |||
<view class='spell-left' style="{{mouldConfig.imgHomeH}}"> | |||
<image src='{{item.coverImg}}' style="{{mouldConfig.imgHomeH}}" mode="aspectFill"></image> | |||
</view> | |||
<view class='spell-centerH'> | |||
<view class='tilte'>{{item.title}}</view> | |||
@@ -53,8 +53,8 @@ | |||
<image class="frImg" wx:if="{{item.status != 11&&item.status != 10}}" src="{{grayImg}}" mode="aspectFill" lazy-load="true"><text>{{item.statusText02}}</text></image> | |||
</view> | |||
<view class='spell-bottom'> | |||
<view class='spell-left' data-id='{{item.id}}' data-data='{{item}}' bindtap='{{((item.couponStatus==1&&item.orderStatus!=11)||(item.orderGroupId=="0"&&item.orderStatus!=15)||item.orderStatus==16)?"":item.orderStatus!=15?"gotoStatusDetail":"gotoPay"}}'> | |||
<image src='{{item.coverImg}}' mode="aspectFill"></image> | |||
<view class='spell-left' style="{{mouldConfig.imgHomeH}}" data-id='{{item.id}}' data-data='{{item}}' bindtap='{{((item.couponStatus==1&&item.orderStatus!=11)||(item.orderGroupId=="0"&&item.orderStatus!=15)||item.orderStatus==16)?"":item.orderStatus!=15?"gotoStatusDetail":"gotoPay"}}'> | |||
<image src='{{item.coverImg}}' style="{{mouldConfig.imgHomeH}}" mode="aspectFill"></image> | |||
</view> | |||
<view class='spell-centerHr' data-id='{{item.id}}' data-data='{{item}}' bindtap='{{((item.couponStatus==1&&item.orderStatus!=11)||(item.orderGroupId=="0"&&item.orderStatus!=15)||item.orderStatus==16)?"":item.orderStatus!=15?"gotoStatusDetail":"gotoPay"}}'> | |||
<view class='tilte'>{{item.title}}</view> | |||
@@ -0,0 +1,15 @@ | |||
{ | |||
"usingComponents": { | |||
"c-banner": "../components/banner/index", | |||
"discount-card": "../components/discountCard/index", | |||
"c-coupons": "../pages/main/coupons/index", | |||
"g-entry": "../components/gameentry/gentry", | |||
"c-hot": "../components/hot/index", | |||
"c-advertisement": "../components/advertisement/advertisement", | |||
"navbar": "../components/navbar/navbar", | |||
"c-mould": "../components/commodityMould/commodityMould", | |||
"optimization": "../components/optimization/optimization" | |||
}, | |||
"enablePullDownRefresh": true, | |||
"navigationBarBackgroundColor": "#F4F5F9" | |||
} |
@@ -0,0 +1,136 @@ | |||
<!-- 欢乐城模板 --> | |||
<view > | |||
<view class="container1"> | |||
<!-- 会员信息 --> | |||
<view class="color_box1"> | |||
<view style="height:{{navigationBarHeight}};overflow: hidden;" class="goSqunar1" bindtap="goSquareList"> | |||
<view class="title1" style="line-height:{{navLineHeight}}">{{marketName}}</view> | |||
<view style="height:{{navLineHeight}};position:relative;margin-right: 80rpx"> | |||
<image wx:if="{{isShowSqare}}" src="{{huanlechengImgurl}}home_ic_xialajt.png" mode='widthFix' class="xia"></image> | |||
</view> | |||
</view> | |||
<view class='userinfo1' wx:if="{{ifStoreApp!=1}}"> | |||
<!-- 头像 --> | |||
<view class='infoLeft' style="{{typeLsit.sy_xxb.styleClass}}"> | |||
<view class="user-avatar1"> | |||
<!-- <open-data class="open" type="userAvatarUrl"></open-data> --> | |||
<image wx:if="{{userAvatarUrl!=''}}" class="userAvatarUrl" src="{{userAvatarUrl}}"></image> | |||
<image wx:if="{{userAvatarUrl==''}}" class="userAvatarUrl" src="../../../assets/images/default.png"></image> | |||
</view> | |||
<!-- 成长值--> | |||
<view class="user-data1 fl" style="{{typeLsit.sy_xxb.styleClass}}"> | |||
<view class='nameBox' bindtap="goIntegralmall"> | |||
<!-- <open-data type="userNickName" style="{{typeLsit.sy_xxb_nf.styleClass}}"></open-data> --> | |||
<!-- <open-data type="userNickName" style="font-size: 26rpx;color:#292723;"></open-data> --> | |||
<p style="font-size: 26rpx;color:#292723;float: left;">{{userName}}</p> | |||
<!-- <image src="{{huanlechengImgurl+'home_ic_vip.png'}}" mode='widthFix'></image> --> | |||
<view class="vgrade">{{levelName}}</view> | |||
<view class="integralNum">积分:{{credit}}</view> | |||
</view> | |||
<view class="view" bindtap='gotoChengzhangzhi'> | |||
<progress percent="{{upgradePercent}}" stroke-width="6" activeColor="{{activeColor}}" /> | |||
<!-- <view class='remainchengzhangzhi' style="{{typeLsit.sy_xxb_cf.styleClass}}">还需{{upgradeScore}}成长值可升级</view> --> | |||
<view class='remainchengzhangzhi'>还需 | |||
<p style="color:#4D4941">{{upgradeScore}}成长值</p>可升级</view> | |||
</view> | |||
</view> | |||
</view> | |||
<!-- 二维码 style="{{typeLsit.sy_qrc.styleClass}}" --> | |||
<view class='qrcode1 fr' bindtap='qrcode'> | |||
<!-- <image src="{{typeLsit.sy_qrc.icon}}" class='qrcodeimg' mode='widthFix'></image> --> | |||
<image src="https://formall.oss-accelerate.aliyuncs.com/cimg/lqcbarcode.png" class='qrcodeimg' mode='widthFix'></image> | |||
</view> | |||
</view> | |||
<!-- banner --> | |||
<c-banner wx:key="unique" list="{{list}}" /> | |||
<!-- 频道 --> | |||
<view class="channelBox" wx:if="{{ifStoreApp!=1&&moduleList.length>0}}" style="{{typeLsit.sy_mbg.styleClass}}"> | |||
<view class='kjBox1' bindtap='goPage' data-obj="{{item}}" wx:for="{{moduleList}}" wx:key="{{index}}"> | |||
<image src='{{item.icon}}' mode='aspectFill'></image> | |||
<view class="text">{{item.name}}</view> | |||
</view> | |||
</view> | |||
<!-- 频道 --> | |||
<view class='channelBox' wx:if="{{ifStoreApp==1}}" style="width:525rpx;"> | |||
<view class='kjBox' bindtap='gotoBargain'> | |||
<image src='{{kanjia}}' mode='aspectFill'></image> | |||
<text>砍价</text> | |||
</view> | |||
<view class='kjBox' bindtap='gotoSpellGroup'> | |||
<image src='{{pintuan}}' mode='aspectFill'></image> | |||
<text>拼团</text> | |||
</view> | |||
<view class='kjBox' bindtap='gotoRushBuy'> | |||
<image src='{{xiaofeika}}' mode='aspectFill'></image> | |||
<text>限时抢购</text> | |||
</view> | |||
</view> | |||
</view> | |||
<!-- <view class='toutiao1' wx:if="{{showQg&&ifStoreApp!=1}}"> | |||
<view class='xianshi' bindtap='gotoRushBuy'> | |||
<text>限时专区</text> | |||
<text>限时惊爆价 轻松拎回家</text> | |||
</view> | |||
<view class='xsCon'> | |||
<view wx:for="{{xslist}}" wx:key="index"> | |||
<view class='igBox' data-couponId="{{item.couponId}}" data-couponChannelId="{{item.id}}" data-targetAd="{{item.targetAd}}" bindtap='gotodetail'> | |||
<image src='{{xslist[index].coverImg}}' mode='widthFix' class='imageH'></image> | |||
<view class='imTit'>{{xslist[index].title}}</view> | |||
</view> | |||
</view> | |||
<view> | |||
<view class='igBox' bindtap='gotoRushBuy'> | |||
<image src='{{more}}' mode='widthFix' class='more'></image> | |||
<view class='imTit'>更多...</view> | |||
</view> | |||
</view> | |||
</view> | |||
</view> | |||
--> | |||
<!-- 限时抢购 --> | |||
<c-mould wx:if="{{topicObj2}}" obj="{{topicObj2}}" isShowCount titleImgUrl="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_txt_xsqw.png" /> | |||
<!-- 砍价 --> | |||
<c-mould wx:if="{{topicObj3}}" obj="{{topicObj3}}" titleImgUrl="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_txt_kj.png" /> | |||
<!-- 拼团 --> | |||
<c-mould wx:if="{{topicObj4}}" obj="{{topicObj4}}" titleImgUrl="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_txt_pt.png" /> | |||
<!-- 专题 --> | |||
<c-mould wx:if="{{specialLsit.length>0}}" wx:for="{{specialLsit}}" wx:key="{{index}}" obj="{{item}}" special/> | |||
<!-- 消费卡 --> | |||
<c-mould wx:if="{{topicObj5}}" obj="{{topicObj5}}" titleImgUrl="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_txt_xfk.png" /> | |||
<!-- 积分商城 --> | |||
<c-mould wx:if="{{topicObj6}}" obj="{{topicObj6}}" titleImgUrl="https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_txt_jfsc.png" /> | |||
<optimization wx:if="{{businessList.length>0}}" businessList="{{businessList}}" businessData="{{businessData}}" bind:businessid="getBusineData" /> | |||
<!-- <c-coupons id="lists" bind:myevent="onGetCode" class="business" loadingtext="{{loadingtext}}" loading="{{loading}}" /> --> | |||
<!-- 游戏蒙层 --> | |||
<g-entry id="listss" wx:if="{{showGame&&!played&&!havePlayEd}}" gamedata="{{gamedata}}" bind:myevent="" /> | |||
<!-- 广告蒙层 --> | |||
<c-advertisement id="advertisement" wx:if="{{showGg&&!played&&!havePlayEd1}}" ggdata="{{ggdata}}" /> | |||
</view> | |||
<!-- 顶部签到成长值 --> | |||
<view class='signin' wx:if="{{fistLogin}}" animation="{{alphaData}}"> | |||
<image class="userAvatarUrl" src="{{userAvatarUrl}}"></image> | |||
<text class='text'>您今日签到成功,获得{{fistLogin}}成长值</text> | |||
</view> | |||
<view class="integralBox1" wx:if="{{businessSwitch}}"> | |||
<!--是未授权微信且未授权手机号 --> | |||
<navigator url="/pages/getuserinfo/index" open-type="navigate" wx:if="{{accreditFlag==1}}"> | |||
<image src='{{huanlechengImgurl}}home_icon_wgjf.png' mode='widthFix' style="width: 100%;height: 100%;"></image> | |||
</navigator> | |||
<!-- 授权了微信 没授权手机号 --> | |||
<navigator url="/pages/getuserinfo/index" open-type="navigate" wx:if="{{accreditFlag==2}}"> | |||
<image src='{{huanlechengImgurl}}home_icon_wgjf.png' mode='widthFix' style="width: 100%;height: 100%;"></image> | |||
</navigator> | |||
<!-- 微信和手机号都授权了 跳转到商圈--> | |||
<navigator url="{{goUrl}}" wx:if="{{accreditFlag==3}}"> | |||
<image src='{{huanlechengImgurl}}home_icon_wgjf.png' mode='widthFix' style="width: 100%;height: 100%;"></image> | |||
</navigator> | |||
</view> | |||
</view> |
@@ -0,0 +1,831 @@ | |||
@import "../../../app.wxss"; | |||
page { | |||
background: #f4f5f9; | |||
} | |||
.temp{ | |||
width: 100rpx; | |||
height: 100rpx; | |||
background-color: darkcyan | |||
} | |||
.xia { | |||
width: 24rpx; | |||
height: 14rpx; | |||
margin: auto 10rpx; | |||
display: block; | |||
position: absolute; | |||
top: 0; | |||
left: 0; | |||
right: 0; | |||
bottom: 0; | |||
/* margin: auto; */ | |||
} | |||
.goSqunar { | |||
display: flex; | |||
justify-content: space-around; | |||
} | |||
.goSqunar1 { | |||
display: flex; | |||
justify-content: center; | |||
} | |||
.title { | |||
font-size: 32rpx; | |||
font-family: OPPOSans; | |||
font-weight: bold; | |||
} | |||
.title1 { | |||
max-width:320rpx; | |||
font-size: 32rpx; | |||
font-family: OPPOSans; | |||
font-weight: bold; | |||
text-overflow: ellipsis; | |||
white-space: nowrap; | |||
overflow: hidden; | |||
} | |||
.squareMore { | |||
width: 24rpx; | |||
/* height: 15rpx; */ | |||
} | |||
.marketName{ | |||
} | |||
.f { | |||
float: left; | |||
} | |||
.r { | |||
float: right; | |||
} | |||
.vgrade { | |||
/* width: 40rpx; */ | |||
height: 26rpx; | |||
float: left; | |||
margin: 10rpx; | |||
background: linear-gradient(180deg, #d5a56e, #e9d0aa); | |||
border-radius: 16rpx 0 16rpx 0; | |||
color: #fff; | |||
line-height: 26rpx; | |||
font-size: 24rpx; | |||
padding: 4rpx 10rpx; | |||
} | |||
.integralNum { | |||
float: left; | |||
font-family: OPPOSans; | |||
font-weight: bold; | |||
color: #be8b50; | |||
font-size: 26rpx; | |||
} | |||
.color_box1 { | |||
background-color: #fff; | |||
background-image: url('https://formall.oss-accelerate.aliyuncs.com/cimg/v20211214/home_top_bnt.png'); | |||
background-size: 100% 100%; | |||
border-radius: 0 0 40rpx 40rpx; | |||
overflow: hidden; | |||
background-repeat: no-repeat; | |||
} | |||
.color_box { | |||
/* padding-top: 20rpx; *//* background-image: linear-gradient(#DC143C, #F4F5F9); */ | |||
background-color: #f4f5f9; | |||
} | |||
.underlingImg { | |||
width: 30rpx; | |||
height: 60rpx; | |||
font-size: 30prx; | |||
float: left; | |||
/* margin-top: 20rpx; */ | |||
} | |||
.underlingName { | |||
float: left; | |||
line-height: 30rpx; | |||
color: #a6a6a6; | |||
/* margin-top: 20rpx; */ | |||
margin-bottom: 20rpx; | |||
margin-left: 5rpx; | |||
} | |||
.index-position { | |||
background: rgba(0, 0, 0, 0.5); | |||
height: 88rpx; | |||
position: absolute; | |||
top: 0; | |||
width: 100%; | |||
font-family: PingFangSC-Semibold; | |||
font-size: 30rpx; | |||
color: #fff; | |||
letter-spacing: 0.75rpx; | |||
z-index: 9; | |||
line-height: 88rpx; | |||
overflow: hidden; | |||
} | |||
.red { | |||
position: absolute; | |||
width: 13rpx; | |||
height: 13rpx; | |||
border-radius: 50%; | |||
background: red; | |||
right: -50rpx; | |||
top: 19rpx; | |||
left: 0; | |||
margin: auto; | |||
display: none; | |||
} | |||
page { | |||
width: 100%; | |||
height: auto !important; | |||
overflow-x: hidden; | |||
} | |||
.txt { | |||
margin-left: 20rpx; | |||
} | |||
.game-entry { | |||
position: fixed; | |||
right: 27rpx; | |||
bottom: 443rpx; | |||
width: 120rpx; | |||
margin: 37rpx auto 0; | |||
z-index: 10; | |||
} | |||
.gameimg { | |||
display: block; | |||
width: 100%; | |||
} | |||
.underling { | |||
padding: 10rpx 30rpx; | |||
} | |||
.userinfo { | |||
width: 690rpx; | |||
height: 96rpx; | |||
border-radius: 16rpx; | |||
display: flex; | |||
justify-content: space-between; | |||
margin: 0 auto 30rpx; | |||
} | |||
.userinfo1 { | |||
width: 690rpx; | |||
height: 96rpx; | |||
border-radius: 16rpx; | |||
display: flex; | |||
justify-content: space-between; | |||
margin: 0 auto; | |||
} | |||
.infoLeft { | |||
height: 100%; | |||
border-radius: 12rpx; | |||
background: #fff; | |||
} | |||
.section { | |||
padding: 0 20rpx; | |||
justify-content: space-around; | |||
text-align: center; | |||
margin-top: 25rpx; | |||
margin-bottom: 30rpx; | |||
} | |||
.sellsection { | |||
margin-bottom: 37rpx; | |||
padding: 0 38rpx; | |||
} | |||
.section >view, .sellsection>view { | |||
width: 25%; | |||
display: inline-block; | |||
position: relative; | |||
} | |||
.section >view image, .sellsection>view image { | |||
display: block; | |||
margin: 0 auto; | |||
} | |||
.section >view image { | |||
width: 55rpx; | |||
height: 55rpx; | |||
margin-top: 20rpx; | |||
margin-bottom: 14rpx; | |||
} | |||
.sellsection>view image { | |||
width: 159rpx; | |||
height: 134rpx; | |||
} | |||
.section text { | |||
font-size: 24rpx; | |||
color: rgba(51, 51, 51, 1); | |||
display: block; | |||
margin-top: 0rpx; | |||
} | |||
.showQrcode { | |||
position: fixed; | |||
top: 0; | |||
left: 0; | |||
right: 0; | |||
bottom: 0; | |||
z-index: 1000; | |||
background: rgba(0, 0, 0, 0.6); | |||
} | |||
.qrcode image { | |||
margin: 15rpx 20rpx 15rpx; | |||
z-index: 100; | |||
} | |||
.qrcode1 image { | |||
margin: 15rpx 20rpx 15rpx; | |||
z-index: 100; | |||
} | |||
.showQrcode { | |||
position: fixed; | |||
top: 0; | |||
left: 0; | |||
right: 0; | |||
bottom: 0; | |||
z-index: 1000; | |||
background: rgba(0, 0, 0, 0.6); | |||
} | |||
.canvas-box { | |||
position: fixed; | |||
width: 500rpx; | |||
overflow: hidden; | |||
left: 0; | |||
top: 200rpx; | |||
right: 0; | |||
margin: auto; | |||
background: #fff; | |||
border-radius: 16rpx; | |||
z-index: 100; | |||
padding-bottom: 30rpx; | |||
} | |||
.showQrcode text { | |||
display: none; | |||
text-align: center; | |||
font-size: 28rpx; | |||
} | |||
.button { | |||
width: 414rpx; | |||
text-align: center; | |||
margin: 0 auto; | |||
height: 80rpx; | |||
line-height: 80rpx; | |||
background: rgba(255, 255, 255, 1); | |||
border-radius: 10rpx; | |||
font-size: 32rpx; | |||
color: rgba(2, 192, 255, 1); | |||
overflow: hidden; | |||
} | |||
.memberIds { | |||
padding-top: 30rpx; | |||
font-size: 30rpx; | |||
} | |||
.search { | |||
background: rgba(2, 192, 255, 1); | |||
height: 50rpx; | |||
} | |||
.searchbar { | |||
position: relative; | |||
width: 685rpx; | |||
height: 76rpx; | |||
margin: 0 auto; | |||
text-align: center; | |||
} | |||
.searchbar image { | |||
width: 40rpx; | |||
} | |||
.searchbar text { | |||
font-size: 28rpx; | |||
line-height: 50rpx; | |||
color: #fff; | |||
display: inline-block; | |||
} | |||
.user-avatar { | |||
width: 80rpx; | |||
height: 80rpx; | |||
border-radius: 50%; | |||
overflow: hidden; | |||
float: left; | |||
margin: 10rpx 10rpx; | |||
} | |||
.user-avatar open-data { | |||
display: block; | |||
width: 100%; | |||
height: 100%; | |||
} | |||
.user-avatar1 { | |||
width: 80rpx; | |||
height: 80rpx; | |||
border-radius: 50%; | |||
overflow: hidden; | |||
float: left; | |||
margin: 0 10rpx; | |||
} | |||
.user-avatar1 image { | |||
display: block; | |||
width: 100%; | |||
height: 100%; | |||
} | |||
.noAccredit{ | |||
text-align: center; | |||
height: 80rpx; | |||
font-size: 20rpx; | |||
background-color: rgba(0, 0, 0, 0.3) | |||
} | |||
.user-data { | |||
letter-spacing: 0.64rpx; | |||
line-height: 46rpx; | |||
font-size: 30rpx; | |||
color: #333; | |||
background: #fff; | |||
margin-top: 10rpx; | |||
margin-bottom: 26rpx; | |||
float: right; | |||
display: flex; | |||
flex-direction: column; | |||
} | |||
.user-data1 { | |||
letter-spacing: 0.64rpx; | |||
line-height: 46rpx; | |||
font-size: 30rpx; | |||
color: #333; | |||
background: #fff; | |||
/* margin-top: 10rpx; */ | |||
margin-bottom: 26rpx; | |||
float: right; | |||
display: flex; | |||
flex-direction: column; | |||
} | |||
.nameBox open-data { | |||
float: left; | |||
} | |||
.chengzhangBox { | |||
height: 32rpx; | |||
line-height: 26rpx; | |||
border-radius: 9px 9px 9px 0px; | |||
font-family: PingFangSC-Regular; | |||
font-weight: 400; | |||
color: rgba(255, 255, 255, 1); | |||
float: left; | |||
margin-top: 8rpx; | |||
} | |||
.chengzhang { | |||
font-size: 22rpx; | |||
font-weight: 400; | |||
color: #fff; | |||
height: 22rpx; | |||
line-height: 22rpx; | |||
padding: 0 8rpx; | |||
} | |||
.integral { | |||
margin-left: 70rpx; | |||
} | |||
.jifen { | |||
display: inline-block; | |||
height: 34rpx; | |||
color: #999; | |||
font-size: 24rpx; | |||
line-height: 34rpx; | |||
} | |||
.jifenNumber { | |||
color: #d18b4c; | |||
font-size: 34rpx; | |||
line-height: 34rpx; | |||
margin-left: 10rpx; | |||
font-weight: bold; | |||
} | |||
.view { | |||
display: flex; | |||
font-size: 24rpx; | |||
color: #999; | |||
} | |||
.view>.score { | |||
margin-left: 9rpx; | |||
color: #333; | |||
font-size: 30rpx; | |||
margin-right: 23rpx; | |||
font-family: PingFang-SC-Bold; | |||
} | |||
.qrcode1 { | |||
width: 106rpx; | |||
height: 96rpx; | |||
border-radius: 12rpx; | |||
} | |||
.qrcode { | |||
width: 106rpx; | |||
height: 96rpx; | |||
background: #fff; | |||
border-radius: 12rpx; | |||
} | |||
.qrcodeimg { | |||
width: 68rpx !important; | |||
height: 68rpx !important; | |||
} | |||
.leftimg { | |||
position: absolute; | |||
right: 40rpx; | |||
top: 60rpx; | |||
margin-top: -7rpx; | |||
width: 14rpx; | |||
height: 26rpx; | |||
} | |||
.duihuanimg { | |||
display: block; | |||
width: 48rpx; | |||
margin-top: 6rpx; | |||
} | |||
.product { | |||
width: 710rpx; | |||
margin: 30rpx auto 10rpx; | |||
border-radius: 16rpx; | |||
overflow: hidden; | |||
} | |||
.product image { | |||
display: block; | |||
width: 100%; | |||
} | |||
.textBox { | |||
width: 400rpx; | |||
height: 100%; | |||
float: left; | |||
margin-left: 10rpx; | |||
} | |||
.textBox .name { | |||
width: 400rpx; | |||
font-size: 28rpx; | |||
color: #3c3c3c; | |||
margin-top: 20rpx; | |||
} | |||
.textBox .title { | |||
width: 400rpx; | |||
font-size: 20rpx; | |||
color: #a6a6a6; | |||
margin-top: 10rpx; | |||
} | |||
.product .gift { | |||
width: 88rpx; | |||
height: 88rpx; | |||
float: left; | |||
margin-top: 30rpx; | |||
margin-left: 15rpx; | |||
} | |||
.next image { | |||
width: 26rpx; | |||
height: 40rpx; | |||
} | |||
.gift image { | |||
width: 88rpx; | |||
height: 76rpx; | |||
} | |||
.product .next { | |||
width: 32rpx; | |||
height: 60rpx; | |||
float: right; | |||
margin-top: 40rpx; | |||
margin-right: 26rpx; | |||
} | |||
#rushtobyCard { | |||
margin-top: 30rpx; | |||
} | |||
.signin { | |||
width: 542rpx; | |||
height: 94rpx; | |||
position: fixed; | |||
top: 0; | |||
left: 0; | |||
right: 0; | |||
z-index: 10000000; | |||
margin: auto; | |||
} | |||
.signin open-data { | |||
position: absolute; | |||
width: 90rpx; | |||
left: 0; | |||
top: 0; | |||
bottom: 0; | |||
height: 94rpx; | |||
margin: auto; | |||
border-radius: 50%; | |||
overflow: hidden; | |||
} | |||
.signin text { | |||
display: block; | |||
background: rgba(0, 0, 0, 0.5); | |||
font-size: 28rpx; | |||
height: 80rpx; | |||
width: 100%; | |||
line-height: 80rpx; | |||
color: #d6d5d5; | |||
text-indent: 4em; | |||
border-radius: 60rpx; | |||
margin-top: 7rpx; | |||
} | |||
.remainchengzhangzhi { | |||
display: block; | |||
color: #a6a6a6; | |||
font-size: 22rpx; | |||
margin-top: 5rpx; | |||
height: 30rpx; | |||
line-height: 30rpx; | |||
float: left; | |||
margin-left: 10rpx; | |||
width: 255rpx; | |||
overflow: hidden; | |||
text-overflow: ellipsis; | |||
white-space: nowrap; | |||
} | |||
progress { | |||
width: 200rpx; | |||
border-radius: 60rpx; | |||
overflow: hidden; | |||
float: left; | |||
margin-top: 10rpx; | |||
} | |||
.channelBox { | |||
width: 688rpx; | |||
/* height: 220rpx; */ | |||
margin: 20rpx auto; | |||
display: flex; | |||
flex-wrap: wrap; | |||
/* justify-content: space-between; */ | |||
background: #f4f5f9; | |||
} | |||
.kjBox { | |||
width: 25%; | |||
height: 118rpx; | |||
font-size: 24rpx; | |||
color: #a6a6a6; | |||
margin-top: 10rpx; | |||
text-align: center; | |||
} | |||
.kjBox1 { | |||
width: 25%; | |||
height: 118rpx; | |||
font-size: 24rpx; | |||
color: #a6a6a6; | |||
margin-top: 10rpx; | |||
text-align: center; | |||
} | |||
.kjBox image { | |||
width: 60rpx; | |||
height: 60rpx; | |||
margin: auto; | |||
} | |||
.kjBox1 image { | |||
width: 80rpx; | |||
height: 80rpx; | |||
margin: auto; | |||
} | |||
.text { | |||
margin: 0 auto; | |||
} | |||
.toutiao { | |||
width: 710rpx; | |||
height: 128rpx; | |||
line-height: 128rpx; | |||
margin: 0 auto; | |||
background: #fff; | |||
box-shadow: 0px 6rpx 16rpx 0px rgba(236, 238, 243, 1); | |||
border-radius: 12rpx; | |||
margin-top: 18rpx; | |||
margin-bottom: 18rpx; | |||
position: relative; | |||
} | |||
.toutiao1 { | |||
width: 710rpx; | |||
height: 128rpx; | |||
margin: 0 auto; | |||
background: #fff; | |||
box-shadow: 0px 6rpx 16rpx 0px rgba(236, 238, 243, 1); | |||
border-radius: 12rpx; | |||
margin-top: 18rpx; | |||
margin-bottom: 18rpx; | |||
display: flex; | |||
justify-content: space-between; | |||
} | |||
.xianshi { | |||
display: flex; | |||
flex-direction: column; | |||
justify-content: center; | |||
align-content: center; | |||
font-size: 30rpx; | |||
padding: 20rpx; | |||
} | |||
.xianshi>text { | |||
height: 40rpx; | |||
} | |||
.xianshi>text:nth-child(1) { | |||
font-size: 30rpx; | |||
font-family: PingFangSC; | |||
font-weight: 500; | |||
} | |||
.xianshi>text:nth-child(2) { | |||
margin-top: 10rpx; | |||
height: 28rpx; | |||
font-size: 20rpx; | |||
font-family: PingFangSC; | |||
font-weight: 400; | |||
color: rgba(166, 166, 166, 1); | |||
line-height: 28rpx; | |||
} | |||
.xsCon { | |||
width: 300rpx; | |||
display: flex; | |||
justify-content: flex-end; | |||
overflow: hidden; | |||
} | |||
.igBox { | |||
height: 100%; | |||
width: 100rpx; | |||
display: flex; | |||
flex-direction: column; | |||
justify-content: center; | |||
align-content: center; | |||
} | |||
.igBoxm { | |||
height: 100%; | |||
width: 100rpx; | |||
display: flex; | |||
flex-direction: column; | |||
text-align: center; | |||
} | |||
.imageH { | |||
height: 50rpx !important; | |||
width: 50rpx !important; | |||
border-radius: 50%; | |||
margin: 15rpx auto; | |||
margin-bottom: 15rpx; | |||
} | |||
.more { | |||
height: 70rpx !important; | |||
width: 70rpx !important; | |||
margin: 0 auto; | |||
} | |||
.imTit { | |||
height: 14px; | |||
font-size: 10px; | |||
font-family: PingFangSC; | |||
font-weight: 400; | |||
color: rgba(60, 60, 60, 1); | |||
line-height: 14px; | |||
width: 100%; | |||
overflow: hidden; | |||
text-overflow: ellipsis; | |||
white-space: nowrap; | |||
text-align: center; | |||
} | |||
.toutiao view:nth-child(2) { | |||
font-size: 26rpx; | |||
font-family: PingFangSC-Regular; | |||
font-weight: 400; | |||
color: rgba(60, 60, 60, 1); | |||
float: left; | |||
width: 500rpx; | |||
overflow: hidden; | |||
text-overflow: ellipsis; | |||
white-space: nowrap; | |||
} | |||
.toutiao view:nth-child(2) text:nth-child(1) { | |||
color: red; | |||
} | |||
.toutiao view:nth-child(2) text:nth-child(2) { | |||
text-decoration: line-through; | |||
color: red; | |||
} | |||
.toutiao .imgBox { | |||
width: 64rpx; | |||
height: 64rpx; | |||
float: left; | |||
margin: 5rpx 0 5rpx 20rpx; | |||
} | |||
.toutiao image { | |||
width: 48rpx; | |||
height: 38rpx; | |||
margin: auto; | |||
} | |||
.toutiao .qg { | |||
width: 80rpx; | |||
height: 44rpx; | |||
line-height: 44rpx; | |||
border-radius: 18rpx; | |||
border: 2rpx solid; | |||
position: absolute; | |||
top: 0; | |||
bottom: 0; | |||
right: 20rpx; | |||
margin: auto; | |||
font-size: 24rpx; | |||
font-family: PingFangSC-Medium; | |||
font-weight: 500; | |||
color: #fd782d; | |||
text-align: center; | |||
} | |||
i-tabs i-tabs-scroll { | |||
background: #f4f5f9 !important; | |||
} | |||
.integralBox { | |||
width: 110rpx; | |||
height: 110rpx; | |||
bottom: 500rpx; | |||
right: 20rpx; | |||
position: fixed; | |||
z-index: 1000000; | |||
} | |||
.integralBox1 { | |||
width: 140rpx; | |||
height: 140rpx; | |||
bottom: 500rpx; | |||
right: 20rpx; | |||
position: fixed; | |||
z-index: 1000000; | |||
} |
@@ -7,6 +7,7 @@ const imgurl = require("../../utils/imgurl"); | |||
Page({ | |||
data: { | |||
mouldType: 0, | |||
mouldConfig: {}, | |||
navigationBarHeight, | |||
data: { | |||
bgColor:"#fff" | |||
@@ -19,10 +20,13 @@ Page({ | |||
minute: "", | |||
nodes: '', | |||
id:'', | |||
goHomeUrl:"" | |||
}, | |||
onLoad(options){ | |||
this.setData({ | |||
mouldType: app.globalData.mouldType | |||
mouldType: app.globalData.mouldType, | |||
mouldConfig: app.globalData.mouldConfig, | |||
goHomeUrl: app.globalData.goHomeUrl, | |||
}) | |||
console.log(options) | |||
if(options&&options.id){ | |||
@@ -33,8 +37,9 @@ Page({ | |||
} | |||
}, | |||
goback: function () { | |||
let this_ = this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
}, | |||
topicShow(id){ | |||
@@ -20,9 +20,9 @@ | |||
<!-- 优惠券 --> | |||
<view class='navigator' wx:for="{{data.couponList}}" wx:key="{{index}}" data-couponId='{{item.couponId}}' data-type='{{item.type}}' data-couponChannelId='{{item.id}}' bindtap='gotoDetail'> | |||
<!-- 首页优惠券列表页面 --> | |||
<view class="coupons1" style="{{mouldType==1?'height: 560rpx':''}}"> | |||
<view class="coupons1-img" style="{{mouldType==1?'height: 344rpx':''}}"> | |||
<image src="{{item.coverImg}}" style="{{mouldType==1?'height: 344rpx':''}}"></image> | |||
<view class="coupons1" style="{{mouldConfig.specialBox}}"> | |||
<view class="coupons1-img" style="{{mouldConfig.specialImg}}"> | |||
<image src="{{item.coverImg}}" style="{{mouldConfig.specialImg}}"></image> | |||
</view> | |||
<view class="coupons1-info"> | |||
<view class="coupons1-info-name tit">{{item.title}}</view> | |||
@@ -38,13 +38,19 @@ Page({ | |||
allow_load: true, | |||
page: 1, | |||
content: "", | |||
goHomeUrl:"", | |||
}, | |||
goback: function () { | |||
let this_ = this | |||
wx.switchTab({ | |||
url: '/index/index', | |||
url: this_.data.goHomeUrl, | |||
}) | |||
}, | |||
onLoad(options) { | |||
this.setData({ | |||
goHomeUrl: app.globalData.goHomeUrl, | |||
mouldConfig: app.globalData.mouldConfig, | |||
}) | |||
this.getList(0, 1); | |||
this.setData({ | |||
current_scroll: 0 | |||
@@ -8,7 +8,7 @@ | |||
<view wx:for='{{list}}' wx:if="{{list.length!=0}}" class='section' wx:key='{{index}}'> | |||
<view class='detail_msg' bindtap="gotoDetail" data-id='{{item.id}}'> | |||
<view class='logo'> | |||
<image src='{{item.coverImg}}'></image> | |||
<image src='{{item.coverImg}}' style="{{mouldConfig.activityDeyImgH}}"></image> | |||
</view> | |||
<view > | |||
<view class="title">{{item.title}}</view> | |||
@@ -20,7 +20,7 @@ Page({ | |||
}, | |||
// 定义全局map变量 | |||
fmap: null, | |||
canvas:null, | |||
/** | |||
* 生命周期函数--监听页面加载 | |||
*/ | |||
@@ -39,7 +39,6 @@ Page({ | |||
wx.createSelectorQuery().select('#fengMap').node().exec((res) => { | |||
const canvas = res[0].node; | |||
this.canvas = canvas | |||
wx.createSelectorQuery().select("#temp").node().exec((tempRes) => { | |||
const tmpCanvas = tempRes[0].node; | |||
@@ -71,7 +70,7 @@ Page({ | |||
// compassOffset:[28,100] | |||
}; | |||
console.log(mapOptions,"mapOptions") | |||
console.log(canvas,"canvas") | |||
//初始化地图对象 | |||
this.fmap = new fengmap.FMMap(mapOptions); | |||
@@ -31,7 +31,7 @@ | |||
"useIsolateContext": true | |||
}, | |||
"compileType": "miniprogram", | |||
"libVersion": "2.16.0", | |||
"libVersion": "2.12.3", | |||
"appid": "wxfa336cad86ed598d", | |||
"projectname": "oldC", | |||
"isGameTourist": false, | |||
@@ -58,9 +58,9 @@ | |||
"list": [ | |||
{ | |||
"id": 0, | |||
"name": "pages/joinFrDpell/index", | |||
"pathName": "pages/joinFrDpell/index", | |||
"query": "couponId=633104903746412544&orderGroupId=635632781235642368&couponChannelId=633104904094539776&orderId=635632719977832448&avatarUrl=https://thirdwx.qlogo.cn/mmopen/vi_32/RjiaOaB3fZCibg4fZK3SerNlyrSLLXxA2NnT9Q8PBbPBJ67Z8xPndbCO8sEHW1omhT2gXYF6L1AwN65rGg140AZw/132&nickName=乐", | |||
"name": "pages/index/index", | |||
"pathName": "pages/index/index", | |||
"query": "orderId=653810672414679040&from=discount&composeOrderType=0", | |||
"scene": 1036, | |||
"referrerInfo": {} | |||
}, | |||
@@ -0,0 +1,38 @@ | |||
const defaultObj={ //原风格 | |||
// swiperHomeW:"", | |||
// swiperHomeH:"", | |||
imgHomeW:"", | |||
imgHomeH:"", | |||
swiperDetailsW:"", | |||
swiperDetailsH: "", | |||
publicitYchildBoxH:"", | |||
publicitYchildH:"", | |||
activityDeyImgH:"", | |||
consumeImgH:"height: 176rpx!important;", | |||
groupSwiperH:"", | |||
answerImgH: "", | |||
specialBox:"", | |||
specialImg:"", | |||
} | |||
const huanLeChengObj = {//欢乐城风格 | |||
// swiperHomeW: "", | |||
// swiperHomeH: "", | |||
imgHomeW: "", | |||
imgHomeH: "height: 300rpx!important;", | |||
swiperDetailsW: "", | |||
swiperDetailsH: "height: 750rpx;", | |||
publicitYchildBoxH: "height: 540rpx;", | |||
publicitYchildH: "height: 344rpx;", | |||
activityDeyImgH: "height:360rpx;", | |||
consumeImgH: "height: 300rpx!important;", | |||
groupSwiperH: "height: 750rpx;", | |||
answerImgH: "height:360rpx;", | |||
specialBox: "height: 560rpx;", | |||
specialImg: "height: 344rpx;", | |||
} | |||
module.exports = { | |||
defaultObj, | |||
huanLeChengObj | |||
} |