Commit 609d2123 by 谢中龙

修改bug

parent df784535
...@@ -62,10 +62,10 @@ Component({ ...@@ -62,10 +62,10 @@ Component({
isAuthorization: false, isAuthorization: false,
_token: '', _token: '',
currentMobile: '', currentMobile: '',
baseImgUrl: '', baseImgUrl: app.globalData.imageUrl,
storgeUserInfo: wx.getStorageSync('_baseUserInfo'), storgeUserInfo: wx.getStorageSync('_baseUserInfo'),
isPlusVip: false, isPlusVip: false,
currentPlusStyle: null currentPlusStyle: null,
}, },
observers: { observers: {
'**': function (e) { '**': function (e) {
......
<!--component/personCenter/personCenter.wxml--> <!--component/personCenter/personCenter.wxml-->
<wxs src="../../wxs/utils.wxs" module="utils" /> <wxs src="../../wxs/utils.wxs" module="utils" />
<view wx:if='{{!currentMobile}}' class="member-unActive {{personCenter.noactiveBackgroundImageUrl ?'':'member-unActive-bgc'}}" bindtap="handleTtoActiveMemebr"> <view wx:if='{{!currentMobile}}' class="member-unActive {{ personCenter.noactiveBackgroundImageUrl ? '':'member-unActive-bgc'}}" bindtap="handleTtoActiveMemebr">
<image <image
wx:if="{{currentHasUserInfo}}" wx:if="{{currentHasUserInfo}}"
src="{{utils.formateUrl(personCenter.noactiveBackgroundImageUrl,baseImgUrl)}}" src="{{utils.formateUrl(personCenter.noactiveBackgroundImageUrl,baseImgUrl)}}"
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
wx:if='{{currentMobile}}' wx:if='{{currentMobile}}'
catchtap="handleToMemberOfOwn" catchtap="handleToMemberOfOwn"
class="activation-content activation-bg {{true ? 'user-content' : ''}}" class="activation-content activation-bg {{true ? 'user-content' : ''}}"
style="{{personData.backgroundImageUrl ? 'background-image: url('+ personData.backgroundImageUrl +');' : 'background-color: ' + baseUrl + ';'}}" style="{{personData.backgroundImageUrl ? 'background-image: url('+ utils.formateUrl(personData.backgroundImageUrl,baseImgUrl) +');' : 'background-color: ' + baseUrl + ';'}}"
> >
<view class='user-info' wx:if='{{currentMobile}}'> <view class='user-info' wx:if='{{currentMobile}}'>
<view class="user-avatar"> <view class="user-avatar">
......
...@@ -231,7 +231,7 @@ const prod_brand_config = { ...@@ -231,7 +231,7 @@ const prod_brand_config = {
contactUsPluginId: 'e61babc802dd4d0d1e819130f7aa4bc5', contactUsPluginId: 'e61babc802dd4d0d1e819130f7aa4bc5',
hasTrial: false, hasTrial: false,
isMall: isMall, isMall: isMall,
orderingMustOpenCard: false, orderingMustOpenCard: true,
isOpenSelfMention: false, // 是否开启门店自提 isOpenSelfMention: false, // 是否开启门店自提
isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息) isNeedGetLocation: false,//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle: '【悦芙媞微商城】', shareTitle: '【悦芙媞微商城】',
......
...@@ -15,18 +15,11 @@ wxService.page({ ...@@ -15,18 +15,11 @@ wxService.page({
onLoad(options) { onLoad(options) {
const { type } = options const { type } = options
if (type == 1){ this.data.type = type;
wx.setNavigationBarTitle({
title: '积分规则'
})
}else if (type == 3){
wx.setNavigationBarTitle({
title: '激活领卡规则'
})
}
this.setData({ this.setData({
type: type type: this.data.type
}) });
this.getRule(type) this.getRule(type)
}, },
...@@ -40,10 +33,24 @@ wxService.page({ ...@@ -40,10 +33,24 @@ wxService.page({
//获取规则 //获取规则
getRule(TYPE){ getRule(TYPE){
wxService.get(`/merchant/brandRuleDescSet/get?type=${TYPE}&brandId=${app.globalData.brandId}`).then(res => { wxService.get(`/merchant/brandRuleDescSet/get?type=${TYPE}&brandId=${app.globalData.brandId}`).then(res => {
if(res){
let obj = res.data.data ? res.data.data : null;
if(obj){
this.data.ruleImg = obj.content ? obj.content : '';
wx.setNavigationBarTitle({
title: obj.title
});
this.setData({ this.setData({
ruleImg: res.data && res.data.data && res.data.data.content || '' ruleImg: this.data.ruleImg
})
}) })
} }
else{
wx.setNavigationBarTitle({
title: '未配置规则'
});
}
}
});
}
}) })
\ No newline at end of file
{ {
"navigationBarTitleText": "会员规则", "navigationBarTitleText": "",
"usingComponents": { "usingComponents": {
"go-home": "/component/goHome/goHome", "go-home": "/component/goHome/goHome",
"go-guid": "/component/goGuid/goGuid" "go-guid": "/component/goGuid/goGuid"
......
...@@ -73,7 +73,8 @@ ...@@ -73,7 +73,8 @@
"id": 4, "id": 4,
"name": "会员规则", "name": "会员规则",
"pathName": "pages/memberRules/memberRules", "pathName": "pages/memberRules/memberRules",
"query": "type=1" "query": "type=3",
"scene": null
}, },
{ {
"id": 8, "id": 8,
......
...@@ -343,7 +343,7 @@ function _getUserInfo(ev) { ...@@ -343,7 +343,7 @@ function _getUserInfo(ev) {
}).catch(err => { }).catch(err => {
if (err) { if (err) {
wx.showToast({ wx.showToast({
title: `您已拒绝授权!`, title: `登录失败,请稍后再试!`,
icon: 'none' icon: 'none'
}) })
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment