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