Skip to content

M
mallapp
Commit cc1c61b3 authored by 罗超's avatar 罗超
Browse files
Options

1

parent 55e45c19
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 56 deletions
pages/index/index.vue
View file @ cc1c61b3
......@@ -23,11 +23,10 @@
<view
class="content"
:style="{
'padding-bottom': showtabs == true ? boxpaddingbottom+'px' : 0,
'padding-bottom': showtabs == true ? boxpaddingbottom + 'px' : 0,
paddingTop: pagePaddingBottom,
}"
>
<view
class="index-title"
:class="{ MainTopLeft: pageTitleStr.length > 10 }"
......@@ -207,14 +206,14 @@
:dataObj="d.data"
@refresh="refreshPage"
></Pubu>
<!-- 首店活动插件 -->
<tradeActivity
v-if="d.id == 'tradeActivity'"
:dataObj="d.data"
:pagePaddingBottom = 'pagePaddingBottom'
@refresh="refreshPage"
ref="tradeActive"
></tradeActivity>
<!-- 首店活动插件 -->
<tradeActivity
v-if="d.id == 'tradeActivity'"
:dataObj="d.data"
:pagePaddingBottom="pagePaddingBottom"
@refresh="refreshPage"
ref="tradeActive"
></tradeActivity>
</template>
</view>
</template>
......@@ -345,8 +344,8 @@ export default {
showorder: false, //显示弹出
carrierType: "", //载体type
AppletID: 0, //判断小程序的id,相亲：11
page_idt:0,//首页组件分享参数
boxpaddingbottom:0,//底部的高度
page_idt: 0, //首页组件分享参数
boxpaddingbottom: 0, //底部的高度
};
},
components: {
......@@ -385,11 +384,11 @@ export default {
miaiactivityCustom,
orderPopup,
Pubu,
tradeActivity,
tradeActivity,
},
onLoad(options) {
let that = this;
// that.yj()
// that.yj()
uni.getSystemInfo({
success(res) {
that.titleStyle = {
......@@ -400,7 +399,7 @@ export default {
},
});
let c = this.$uiConfig.is_bang ? 78 : 50;
this.boxpaddingbottom= c
this.boxpaddingbottom = c;
this.contentHeight = this.$utils.calcContentHeight(c);
if (options && options.page_id) {
this.pageId = options.page_id;
......@@ -519,9 +518,9 @@ export default {
this.guidecar.EndTime = options.EndTime ? options.EndTime : "";
}
}
if(options && options.page_idt){
this.page_idt = options.page_idt
}
if (options && options.page_idt) {
this.page_idt = options.page_idt;
}
if (options && options.J) {
//司导分享的的特殊处理
......@@ -571,6 +570,7 @@ export default {
that.showAuth = true;
} else {
that.sharejump(); //4-9新加
this.handleChengShuang();
}
//4-11这里暂时不能使用
// wx.getUserInfo({//4-9修改 不使用getUserInfo 会造成获取回来的微信默认名称和头像
......@@ -671,13 +671,24 @@ export default {
let Up = uni.getStorageSync("mall_UserInfo")
? uni.getStorageSync("mall_UserInfo").UserPageType
: 0;
let path
if(this.pageId>0){//首页子组件的分享
path = "user_id=" + uid + "&SmallShopId=" + SmallShopId + "&Up=" + Up+ "&page_idt=" + this.pageId+"&JumpType=19"
}else{//首页分享
path = "user_id=" + uid + "&SmallShopId=" + SmallShopId + "&Up=" + Up
}
console.log(path)
let path;
if (this.pageId > 0) {
//首页子组件的分享
path =
"user_id=" +
uid +
"&SmallShopId=" +
SmallShopId +
"&Up=" +
Up +
"&page_idt=" +
this.pageId +
"&JumpType=19";
} else {
//首页分享
path = "user_id=" + uid + "&SmallShopId=" + SmallShopId + "&Up=" + Up;
}
console.log(path);
return {
title: title,
query: path,
......@@ -713,15 +724,32 @@ export default {
let Up = uni.getStorageSync("mall_UserInfo")
? uni.getStorageSync("mall_UserInfo").UserPageType
: 0;
let path
if(this.pageId>0){//首页子组件的分享
path = "/pages/index/index?user_id=" + uid + "&SmallShopId=" + SmallShopId + "&Up=" + Up+ "&page_idt=" + this.pageId+"&JumpType=19"
}else{//首页分享
path = "/pages/index/index?user_id=" + uid + "&SmallShopId=" + SmallShopId + "&Up=" + Up
}
let path;
if (this.pageId > 0) {
//首页子组件的分享
path =
"/pages/index/index?user_id=" +
uid +
"&SmallShopId=" +
SmallShopId +
"&Up=" +
Up +
"&page_idt=" +
this.pageId +
"&JumpType=19";
} else {
//首页分享
path =
"/pages/index/index?user_id=" +
uid +
"&SmallShopId=" +
SmallShopId +
"&Up=" +
Up;
}
return {
title: title,
path:path,
path: path,
imageUrl: "",
};
},
......@@ -732,12 +760,12 @@ export default {
}, 500);
this.mainColor = this.$uiConfig.mainColor;
this.getIsOpenReserve();
//调用
if (Object.keys(this.$refs).length > 0 && this.$refs.tradeActive) {
//判断
this.$refs.tradeActive[0].getShow(); //调取最近学习组件的方法
console.log(this.$refs.tradeActive[0]);
}
//调用
if (Object.keys(this.$refs).length > 0 && this.$refs.tradeActive) {
//判断
this.$refs.tradeActive[0].getShow(); //调取最近学习组件的方法
console.log(this.$refs.tradeActive[0]);
}
},
methods: {
......@@ -1103,19 +1131,20 @@ export default {
uni.navigateTo({
url: "/pages/school/JIaheactivitydetails?Id=" + that.GoodsId,
});
}else if(that.JumpType==19){
that.JumpType=0
if(that.page_idt>0){
uni.navigateTo({
url: "/pages/index/index?page_id="+that.page_idt,
});
}
}else if(that.JumpType==20){//甲鹤的收据详情
uni.navigateTo({
url: "/pages/school/personal/receiptDetails?FinanceId="+that.GoodsId,
});
}
} else if (that.JumpType == 19) {
that.JumpType = 0;
if (that.page_idt > 0) {
uni.navigateTo({
url: "/pages/index/index?page_id=" + that.page_idt,
});
}
} else if (that.JumpType == 20) {
//甲鹤的收据详情
uni.navigateTo({
url:
"/pages/school/personal/receiptDetails?FinanceId=" + that.GoodsId,
});
}
}, 500);
},
updateuserinfo(msg) {
......@@ -1585,12 +1614,23 @@ export default {
// this.$forceUpdate();
// console.log("tag", "刷新");
},
//橙霜---未认证跳转到引导页
handleChengShuang() {
let AppletID = this.GetMiniAppId().TenantId;
if (AppletID === 24) {
let basedata = wx.getStorageSync("basedata");
let isAttestation = basedata?.user_info?.isAttestation ?? 0;
if (isAttestation === 0) {
uni.navigateTo({
url: "/pages/user-center/user-center",
});
}
}
},
yj() {
uni.navigateTo({
url: "/pages/school/personal/receiptDetails?FinanceId=116651",
// url: "/pages/school/personal/receiptList",
url: "/pages/school/personal/receiptDetails?FinanceId=116651",
// url: "/pages/school/personal/receiptList",
});
},
},
......
pages/school/picDetail.vue
View file @ cc1c61b3
......@@ -136,7 +136,6 @@ export default {
data() {
return {
id: 0,
boxOption: 0,
navsOption: 0,
titleStyle: {},
......
pages/user-center/components/blinddate-user.vue
View file @ cc1c61b3
......@@ -288,6 +288,14 @@
</view>
</template>
</view>
<view class="mask" v-if="isAttestation === 0">
<image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/tipbg.png"
mode="widthFix"
style="width690rpx"
@click="goperson"
/>
</view>
</view>
</template>
......@@ -308,6 +316,7 @@ export default {
nav: 0,
mainColor: "",
is_icon_members_grade: 0,
isAttestation: 0, //是否认证
};
},
created() {
......@@ -328,6 +337,8 @@ export default {
this.is_icon_members_grade = uni.getStorageSync("basedata")
? uni.getStorageSync("basedata").mall.setting.is_icon_members_grade
: 0;
let basedata = wx.getStorageSync("basedata");
this.isAttestation = basedata?.user_info?.isAttestation ?? 0;
},
methods: {
goUrl(url) {
......@@ -487,4 +498,17 @@ export default {
width: 100%;
padding: 0 15px;
}
.mask {
width: 100vw;
height: 100vh;
position: fixed;
bottom: 0;
left: 0;
z-index: 999999999999;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
justify-content: center;
box-sizing: border-box;
padding-top: 445rpx;
}
</style>
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