Compare commits

..

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

  1. 56
      high-unionPay/pages/tabBar/home/home.vue
  2. 26
      high-unionPay/pages/tabBar/user/user.vue

@ -5,12 +5,9 @@
<lottie :options="defaultOptions" :height="200" :width="200"
@animCreated="handleAnimation" />
</view> -->
<!-- <view class="status"></view> -->
<view v-if="isdisplay == 1">
<image :src="imagewxUrl+imgadres5" class="widthw30 mart110" mode="widthFix"></image>
</view>
<view v-if="isdisplay == 2">
<image :src="imagewxUrl+imgadres6" class="width90 mart110" mode="widthFix"></image>
<!-- <view class="status"></view> -->
<view v-if="isdisplay">
<image :src="imagewxUrl+imgadres5" class="widthw30 mart110" mode="widthFix"></image>
</view>
<view v-for="(item,index) in homeCateList" :key="index">
<view class="height90 backcorltop" v-if="item.type == 1">
@ -166,11 +163,10 @@
imgadres: '/home/home1.png',
imgadres1: '/home/home2.png',
imgadres2: 'jt.png',
// imgadres5: 'unionarea.png',
// imgadres5: 'unionarea.png',
imgadres5: 'loading.gif',
imgadres3: '',
imgadres4: 'cusservice.png',
imgadres6: 'notOpened.png',
webUrl: '',
//
productList: [],
@ -183,7 +179,7 @@
homeCateList: [],
//
jumpType: '',
isdisplay: 1 //
isdisplay: true //
};
},
onShow() {
@ -202,8 +198,8 @@
}
})
},
onLoad() {
this.hqaddress();
onLoad() {
this.hqaddress();
},
methods: {
//
@ -248,15 +244,15 @@
})
},
test(item) {
let datas = [];
for (var i = 0; i < this.homeCateList.length; i++) {
if (this.homeCateList[i].type == 3) {
datas.push(this.homeCateList[i])
}
}
let jumpid = datas[0].childDate[item].type;
uni.navigateTo({
url: '../../user/news/news?id=' + jumpid
let datas = [];
for (var i = 0; i < this.homeCateList.length; i++) {
if (this.homeCateList[i].type == 3) {
datas.push(this.homeCateList[i])
}
}
let jumpid = datas[0].childDate[item].type;
uni.navigateTo({
url: '../../user/news/news?id=' + jumpid
})
},
//
@ -304,7 +300,7 @@
app.globalData.cityId = res.return_data.regionId;
// app.globalData.cityId = '520000';
app.globalData.companyId = res.return_data.companyId;
this.getCmsContentcmsContent();
this.getCmsContentcmsContent();
this.getCmsAactibity();
}
});
@ -317,11 +313,9 @@
categoryCode: 'CMS_HOME'
}
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.isdisplay = 3;
} else {
this.isdisplay = 2;
}
});
},
@ -389,12 +383,12 @@
})
},
//
toGoods(e, id) {
uni.navigateTo({
url: e + id
});
toGoods(e, id) {
uni.navigateTo({
url: e + id
});
},
//
playPhone() {
uni.showModal({
@ -701,4 +695,4 @@
border-radius: 50%;
}
}
</style>
</style>

@ -259,20 +259,16 @@
url: '../../login/updatePas/updatePas',
text: '支付密码',
img: '../../../static/img/user/user11.png'
}, {
url: '',
text: '退出登录',
img: '../../../static/img/user/user12.png'
}, {
url: '',
text: '客服',
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;
}
this.czList = [{
@ -284,21 +280,17 @@
url: '../../login/updatePas/resetPas',
text: '支付密码',
img: '../../../static/img/user/user11.png'
},
}, {
url: '',
text: '退出登录',
img: '../../../static/img/user/user12.png'
},
{
url: '',
text: '客服',
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: {
findUser() {

Loading…
Cancel
Save