Compare commits

..

No commits in common. 'dev' and 'master' have entirely different histories.
dev ... master

  1. 14
      high-unionPay/pages/tabBar/home/home.vue
  2. 24
      high-unionPay/pages/tabBar/user/user.vue

@ -6,12 +6,9 @@
@animCreated="handleAnimation" /> @animCreated="handleAnimation" />
</view> --> </view> -->
<!-- <view class="status"></view> --> <!-- <view class="status"></view> -->
<view v-if="isdisplay == 1"> <view v-if="isdisplay">
<image :src="imagewxUrl+imgadres5" class="widthw30 mart110" mode="widthFix"></image> <image :src="imagewxUrl+imgadres5" class="widthw30 mart110" mode="widthFix"></image>
</view> </view>
<view v-if="isdisplay == 2">
<image :src="imagewxUrl+imgadres6" class="width90 mart110" mode="widthFix"></image>
</view>
<view v-for="(item,index) in homeCateList" :key="index"> <view v-for="(item,index) in homeCateList" :key="index">
<view class="height90 backcorltop" v-if="item.type == 1"> <view class="height90 backcorltop" v-if="item.type == 1">
<view class="category-list"> <view class="category-list">
@ -170,7 +167,6 @@
imgadres5: 'loading.gif', imgadres5: 'loading.gif',
imgadres3: '', imgadres3: '',
imgadres4: 'cusservice.png', imgadres4: 'cusservice.png',
imgadres6: 'notOpened.png',
webUrl: '', webUrl: '',
// //
productList: [], productList: [],
@ -183,7 +179,7 @@
homeCateList: [], homeCateList: [],
// //
jumpType: '', jumpType: '',
isdisplay: 1 // isdisplay: true //
}; };
}, },
onShow() { onShow() {
@ -317,11 +313,9 @@
categoryCode: 'CMS_HOME' categoryCode: 'CMS_HOME'
} }
getCmsContent(params).then(res => { getCmsContent(params).then(res => {
if (res.return_code == '000000' && res.return_data != null) { this.isdisplay = false;
if (res.return_code == '000000') {
this.homeCateList = res.return_data; this.homeCateList = res.return_data;
this.isdisplay = 3;
} else {
this.isdisplay = 2;
} }
}); });
}, },

@ -259,20 +259,16 @@
url: '../../login/updatePas/updatePas', url: '../../login/updatePas/updatePas',
text: '支付密码', text: '支付密码',
img: '../../../static/img/user/user11.png' img: '../../../static/img/user/user11.png'
}, {
url: '',
text: '退出登录',
img: '../../../static/img/user/user12.png'
}, { }, {
url: '', url: '',
text: '客服', text: '客服',
img: '../../../static/img/user/user13.png' img: '../../../static/img/user/user13.png'
} }
] ]
if (app.globalData.userInfo) {
let menus = {
url: '',
text: '退出登录',
img: '../../../static/img/user/user12.png'
}
this.czList.push(menus);
}
return; return;
} }
this.czList = [{ this.czList = [{
@ -284,6 +280,10 @@
url: '../../login/updatePas/resetPas', url: '../../login/updatePas/resetPas',
text: '支付密码', text: '支付密码',
img: '../../../static/img/user/user11.png' img: '../../../static/img/user/user11.png'
}, {
url: '',
text: '退出登录',
img: '../../../static/img/user/user12.png'
}, },
{ {
url: '', url: '',
@ -291,14 +291,6 @@
img: '../../../static/img/user/user13.png' img: '../../../static/img/user/user13.png'
} }
] ]
if (app.globalData.userInfo) {
let menus = {
url: '',
text: '退出登录',
img: '../../../static/img/user/user12.png'
}
this.czList.push(menus);
}
}, },
methods: { methods: {
findUser() { findUser() {

Loading…
Cancel
Save