|
@@ -27,7 +27,8 @@
|
|
|
<icon class="list-icon dd-icon"></icon>
|
|
<icon class="list-icon dd-icon"></icon>
|
|
|
<text>订单</text>
|
|
<text>订单</text>
|
|
|
</view>
|
|
</view>
|
|
|
- <view v-if="appleCode=='true'&¤tPlatform=='ios' || currentPlatform=='android'" class="list-item" @click="duihuamaDuihuan">
|
|
|
|
|
|
|
+ <view v-if="appleCode=='true'&¤tPlatform=='ios' || currentPlatform=='android'" class="list-item"
|
|
|
|
|
+ @click="duihuamaDuihuan">
|
|
|
<icon class="list-icon dhm-icon"></icon>
|
|
<icon class="list-icon dhm-icon"></icon>
|
|
|
<text>兑换码</text>
|
|
<text>兑换码</text>
|
|
|
</view>
|
|
</view>
|
|
@@ -90,6 +91,7 @@
|
|
|
let pageFrom = ref(null)
|
|
let pageFrom = ref(null)
|
|
|
|
|
|
|
|
onShow(() => {
|
|
onShow(() => {
|
|
|
|
|
+ console.log('pageFrom.value',pageFrom.value);
|
|
|
currentTabIndex.value = 3
|
|
currentTabIndex.value = 3
|
|
|
if (pageFrom.value === 'myInfo') {
|
|
if (pageFrom.value === 'myInfo') {
|
|
|
getMyInfo();
|
|
getMyInfo();
|
|
@@ -102,9 +104,10 @@
|
|
|
testRef.value.showPopup(7)
|
|
testRef.value.showPopup(7)
|
|
|
}
|
|
}
|
|
|
/***************** 测试 ******************/
|
|
/***************** 测试 ******************/
|
|
|
- function bangPhone(){
|
|
|
|
|
|
|
+ function bangPhone() {
|
|
|
|
|
+ pageFrom.value = 'myInfo'
|
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
|
- url: '/pages/bindPhone/bindPhone?from=my'
|
|
|
|
|
|
|
+ url: '/pages/bindPhone/bindPhone?from=my'
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -117,6 +120,7 @@
|
|
|
// 获取用户数据
|
|
// 获取用户数据
|
|
|
function getMyInfo() {
|
|
function getMyInfo() {
|
|
|
myInfo({}).then(res => {
|
|
myInfo({}).then(res => {
|
|
|
|
|
+ console.log('res',res);
|
|
|
myInfoData.userName = res.data.userName;
|
|
myInfoData.userName = res.data.userName;
|
|
|
myInfoData.nickName = res.data.nickName;
|
|
myInfoData.nickName = res.data.nickName;
|
|
|
pageFrom.value = ''
|
|
pageFrom.value = ''
|
|
@@ -218,4 +222,4 @@
|
|
|
url: '/pages/chanpinShop/index'
|
|
url: '/pages/chanpinShop/index'
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
-</script>
|
|
|
|
|
|
|
+</script>
|