Skip to content

J
jz_Travel
Commit bf0c39da authored by 黄奎's avatar 黄奎
Browse files
Options

11

parent 091c9fa1
Hide whitespace changes
Inline Side-by-side
Showing with 455 additions and 674 deletions
components/auth/index.vue
View file @ bf0c39da
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<script> <script>
import coupon from "@/components/coupons/coupons"; import coupon from "@/components/coupons/coupons";
export default { export default {
components: { components: {
coupon, coupon,
...@@ -34,40 +34,18 @@ ...@@ -34,40 +34,18 @@
showLogin: true, showLogin: true,
canIUseGetUserProfile: false, canIUseGetUserProfile: false,
msg: {}, msg: {},
isOpenAuth: 0, //是否开启强制授权
}; };
}, },
created() { created() {
// this.pageinfo = uni.getStorageSync("basedata") ? let mallConfig = uni.getStorageSync("basedata");
// uni.getStorageSync("basedata").auth_page : {}; if (mallConfig && mallConfig.mall && mallConfig.mall.setting && mallConfig.mall.setting.is_show_auth) {
// if (wx.getUserProfile) { this.isOpenAuth = mallConfig.mall.setting.is_show_auth;
// this.canIUseGetUserProfile = true; }
// }
// // #ifdef MP-ALIPAY
// this.canIUseGetUserProfile = true;
// // #endif
// let x = this.pageinfo.hotspot;
// let y = this.pageinfo.hotspot_cancel;
// this.sureStyle = `height:${x.height}rpx;width:${x.width}rpx;left:${x.left}rpx;top:${x.top}rpx;`;
// this.cancelStyle = `height:${y.height}rpx;width:${y.width}rpx;left:${y.left}rpx;top:${y.top}rpx;`;
this.getUserInfo() this.getUserInfo()
}, },
methods: { methods: {
getoldUser() { getoldUser() {
//旧的 兼容电脑端
//4.27注释掉 给予新的提示不能在电脑端登录
// var that = this;
// uni.login({
// provider: 'weixin',
// success: function (loginRes) {
// // 获取用户信息
// uni.getUserInfo({
// provider: 'weixin',
// success: function (infoRes) {
// that.getUserInfo(infoRes)
// }
// });
// }
// });
uni.showToast({ uni.showToast({
title: "电脑端暂时不能获取用户信息,请转到手机端使用！", title: "电脑端暂时不能获取用户信息,请转到手机端使用！",
icon: "none", icon: "none",
...@@ -114,47 +92,13 @@ ...@@ -114,47 +92,13 @@
that.getCode(obj); that.getCode(obj);
}, },
fail() { fail() {
that.showDialog=false that.showDialog = false
uni.showToast({ uni.showToast({
title:'微信登录失败' title: '微信登录失败'
}) })
} }
}) })
// uni.getProvider({
// service: "oauth",
// success: function(res) {
// if (~res.provider.indexOf("weixin")) {
// uni.login({
// provider: "weixin",
// success: (res) => {
// //这里请求接口
// let obj = {
// Source: 1,
// OpenId: "",
// Name: info.userInfo.nickName,
// Photo: info.userInfo.avatarUrl,
// Gender: info.userInfo.gender,
// Moblie: "",
// SuperiorId: 0,
// code: res.code,
// };
// that.getCode(obj);
// },
// fail: () => {
// uni.showToast({
// title: "微信登录授权失败",
// icon: "none",
// });
// },
// });
// } else {
// uni.showToast({
// title: "请先安装微信或升级版本",
// icon: "none",
// });
// }
// },
// });
}, },
close() { close() {
this.showDialog = false; this.showDialog = false;
...@@ -164,7 +108,7 @@ ...@@ -164,7 +108,7 @@
getCode(obj) { getCode(obj) {
var that = this; var that = this;
uni.showLoading({ uni.showLoading({
title: "登录中", title: "登录中.",
}); });
//这里请求接口 //这里请求接口
var OpenId = ""; var OpenId = "";
...@@ -210,7 +154,6 @@ ...@@ -210,7 +154,6 @@
CounponPassword: CounponPassword, CounponPassword: CounponPassword,
KeyWord: KeyWord, KeyWord: KeyWord,
} }
console.log("loginMsg", loginMsg);
that.request2({ that.request2({
url: "/api/AppletLogin/Login", url: "/api/AppletLogin/Login",
data: loginMsg, data: loginMsg,
...@@ -240,14 +183,16 @@ ...@@ -240,14 +183,16 @@
that.msg.Id = uid; that.msg.Id = uid;
//HK 2023-10-31 新增 //HK 2023-10-31 新增
let b2bLoginParam = { let b2bLoginParam = {
OpenId: loginMsg.OpenId OpenId: res.data.OpenId
} }
let b2bResult = { let b2bResult = {
accountId: 0, accountId: 0,
customerId: 0, customerId: 0,
customerInfoChildrenId:0,
realNameAuthentication: 0, realNameAuthentication: 0,
account: "", account: "",
name: mallUserName, name: mallUserName,
customerName: "",
photo: "", photo: "",
secretKey: "", secretKey: "",
token: "", token: "",
...@@ -261,46 +206,24 @@ ...@@ -261,46 +206,24 @@
customerType: 1, //直客，2-同行 customerType: 1, //直客，2-同行
directCustomerId: 0, //直客Id directCustomerId: 0, //直客Id
} }
//erp判断是否是同行 that.apipost("LvXiaoYou_post_GetLvXiaoYouCustomerLogin", b2bLoginParam, b2bRes => {
that.apipost("b2b_post_Login", b2bLoginParam, (erpRes) => { var b2bData = b2bRes.data;
if (erpRes.resultCode == 1) { if (b2bRes.resultCode == 1) {
var tempdata = erpRes.data; b2bResult.accountId = b2bData.accountId;
b2bResult.accountId = tempdata.accountId; b2bResult.customerId = b2bData.customerId;
b2bResult.customerId = tempdata.customerId; b2bResult.customerInfoChildrenId=b2bData.customerInfoChildrenId;
b2bResult.realNameAuthentication = tempdata.realNameAuthentication; b2bResult.name = b2bData.name;
b2bResult.account = tempdata.account; b2bResult.customerName = b2bData.customerName;
b2bResult.name = tempdata.name; uni.setStorageSync('b2b_user', b2bResult)
b2bResult.photo = tempdata.photo;
b2bResult.secretKey = tempdata.secretKey;
b2bResult.token = tempdata.token;
b2bResult.groupId = tempdata.groupId;
b2bResult.isMember = tempdata.isMember;
b2bResult.createBy = tempdata.createBy;
b2bResult.EmLoginMobile = tempdata.EmLoginMobile;
b2bResult.contactNumber = tempdata.contactNumber;
b2bResult.salesBaseInfo = tempdata.salesBaseInfo;
b2bResult.count = tempdata.count;
b2bResult.customerType = 2;
} }
uni.setStorageSync('b2b_user', b2bResult) }, (error2) => {
}, (failed) => { if (that.isOpenAuth == 1) {
that.apipost("LvXiaoYouLogin_post", b2bLoginParam, b2cRes => { //未绑定的用户强制跳转到登录页面
var b2cData = b2cRes.data; uni.redirectTo({
if (b2cRes.resultCode == 1) { url: '/pages/jiuzhai/bind_Customer'
b2bResult.directCustomerId = b2cData.directCustomerId; })
b2bResult.name = b2cData.name; }
b2bResult.customerType = 1; });
b2bResult.token = b2cData.token;
b2bResult.photo = b2cData.photo;
b2bResult.contactNumber=b2cData.moblie;
uni.setStorageSync('b2b_user', b2bResult)
}
}, (error2) => {
});
}, (error) => {
console.log("error", error);
})
} }
} }
); );
...@@ -361,7 +284,7 @@ ...@@ -361,7 +284,7 @@
getCodeAli(obj) { getCodeAli(obj) {
var that = this; var that = this;
uni.showLoading({ uni.showLoading({
title: "登录中", title: "登录中..",
}); });
//这里请求接口 //这里请求接口
that.request2({ that.request2({
......
pages/coupon/index/index.vue
View file @ bf0c39da
<template> <template>
<view class="couponStyle" :style="{ height: contentHeight }"> <view class="couponStyle" :style="{ height: contentHeight }">
<u-tabs <u-tabs :list="list" :is-scroll="false" :current="currentIndex" @change="change" :active-color="mainColor" :show-bar="showBar"
:list="list" height="100"></u-tabs>
:is-scroll="false" <u-empty v-if="g.length == 0 && !loading" text="暂无相关优惠券" mode="coupon"></u-empty>
:current="currentIndex"
@change="change"
:active-color="mainColor"
:show-bar="showBar"
height="100"
></u-tabs>
<u-empty v-if="g.length == 0 && !loading" text="暂无相关优惠券" mode="coupon"></u-empty>
<view <view v-if="g.length > 0" style="
v-if="g.length > 0"
style="
height: calc(100vh - 50px); height: calc(100vh - 50px);
width: calc(100vw); width: calc(100vw);
overflow: hidden; overflow: hidden;
padding-bottom: 50px; padding-bottom: 50px;
" ">
> <scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
<scroll-view <view class="couponList">
:scroll-y="true" <view class="item" v-for="(x, i) in g" :key="i" @click="godetails(x)">
:enable-back-to-top="true" <view :class="{'ticket':msg.useState == 1,'ticket2':msg.useState != 1}">
:enable-flex="true" <view class="miane">
@scrolltolower="lower" <view class="money">
:style="{ height: '100%' }" <!-- <text style="font-size: 44px;">{{x.sub_price.toString().split('.')[0]}}</text>
>
<view class="couponList">
<view class="item" v-for="(x, i) in g" :key="i" @click="godetails(x)">
<view :class="{'ticket':msg.useState == 1,'ticket2':msg.useState != 1}">
<view class="miane">
<view class="money">
<!-- <text style="font-size: 44px;">{{x.sub_price.toString().split('.')[0]}}</text>
<text v-if="x.coupon.type==1">折</text> --> <text v-if="x.coupon.type==1">折</text> -->
<text class="small" style="font-family: microsoft yahei ui light;" v-if="x.couponsType == 1">￥</text> <text class="small" style="font-family: microsoft yahei ui light;" v-if="x.couponsType == 1">￥</text>
<Text style="font-size: 44px;font-family: nav-font;" <Text style="font-size: 44px;font-family: nav-font;">{{ Number(x.denomination) }}
>{{ Number(x.denomination) }} </Text>
</Text> <Text class="small" style="font-family: microsoft yahei ui light;">{{ x.couponsType != 1? "折" : "" }}</Text>
<Text class="small" style="font-family: microsoft yahei ui light;" >{{ x.couponsType != 1? "折" : "" }}</Text> </view>
</view> <view class="tiaojian">满{{ Number(x.useCondition) }}元可用</view>
<view class="tiaojian" </view>
>满{{ Number(x.useCondition) }}元可用</view <view style="
>
</view>
<view
style="
width: 10px; width: 10px;
height: 10px; height: 10px;
border-radius: 5px; border-radius: 5px;
...@@ -53,10 +33,8 @@ ...@@ -53,10 +33,8 @@
position: absolute; position: absolute;
right: -5px; right: -5px;
top: -5px; top: -5px;
" "></view>
></view> <view style="
<view
style="
width: 10px; width: 10px;
height: 10px; height: 10px;
border-radius: 5px; border-radius: 5px;
...@@ -64,34 +42,26 @@ ...@@ -64,34 +42,26 @@
position: absolute; position: absolute;
right: -5px; right: -5px;
bottom: -5px; bottom: -5px;
" "></view>
></view> </view>
</view> <view class="detail">
<view class="detail"> <view class="coupond">
<view class="coupond"> <view class="name" style="font-family:'microsoft yahei ui light';">{{ x.couponsName }}</view>
<view class="name" style="font-family:'microsoft yahei ui light';">{{ x.couponsName }}</view> <view class="date">{{ x.expirationDate }} 失效</view>
<view class="date">{{ x.expirationDate }} 失效</view>
<Text class="rule" v-if="x.lineTeamName!='' || x.lineName!=''">{{x.lineName}} {{x.lineTeamName}} 可用</Text> <Text class="rule" v-if="x.lineTeamName!='' || x.lineName!=''">{{x.lineName}} {{x.lineTeamName}} 可用</Text>
<!-- <Text class="rule" v-if="x.UseTypeStr == 2">限商品</Text> <!-- <Text class="rule" v-if="x.UseTypeStr == 2">限商品</Text>
<Text class="rule" v-if="x.UseTypeStr == 3">全场通用</Text> <Text class="rule" v-if="x.UseTypeStr == 3">全场通用</Text>
<Text class="rule" v-if="x.UseTypeStr == 4">当面付</Text> --> <Text class="rule" v-if="x.UseTypeStr == 4">当面付</Text> -->
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<u-loadmore <u-loadmore :status="status" :load-text="loadText" :font-size="24" :margin-top="20" :margin-bottom="20" bg-color="#f3f4f6" />
:status="status" </scroll-view>
:load-text="loadText" </view>
:font-size="24" <!-- <view
:margin-top="20"
:margin-bottom="20"
bg-color="#f3f4f6"
/>
</scroll-view>
</view>
<!-- <view
style=" style="
width: 100%; width: 100%;
height: 50px; height: 50px;
...@@ -107,309 +77,328 @@ ...@@ -107,309 +77,328 @@
> >
<Text>去领券</Text> <Text>去领券</Text>
</view> --> </view> -->
<!-- 加载中 --> <!-- 加载中 -->
<view class="loading" v-if="loading"> <view class="loading" v-if="loading">
<u-loading mode="flower" size="48">></u-loading> <u-loading mode="flower" size="48">></u-loading>
<Text style="color: #fff; margin-top: 10rpx">加载中...</Text> <Text style="color: #fff; margin-top: 10rpx">加载中...</Text>
</view> </view>
<!-- 取消提示 --> <!-- 取消提示 -->
<u-toast ref="uToast" /> <u-toast ref="uToast" />
<auth <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
v-if="showAuth" </view>
@changeuserinfo="reloadUserinfo"
@gbAuth="gbAuth"
></auth>
</view>
</template> </template>
<script> <script>
import auth from "../../../components/auth/index.vue"; import auth from "../../../components/auth/index.vue";
export default { export default {
components: { components: {
auth, auth,
}, },
data() { data() {
return { return {
pageTitle: "我的优惠券", pageTitle: "我的优惠券",
showAuth: false, showAuth: false,
U: {}, U: {},
list: [{ name: "未使用" }, { name: "已过期" }], list: [{
mainColor: "", name: "未使用"
contentHeight: 0, }, {
currentIndex:0, name: "已过期"
msg: { }],
"pageIndex":1, mainColor: "",
"pageSize":8, contentHeight: 0,
"useState":1, currentIndex: 0,
"lineId":0, msg: {
"lineteamId":0, "pageIndex": 1,
"couponsName":"", "pageSize": 8,
"couponsType":0, "useState": 1,
"couponStatus":1, "lineId": 0,
"couponEffectStatus":1, //1 有效；3 无效 "lineteamId": 0,
"couponsUseScope":0, "couponsName": "",
}, "couponsType": 0,
page_count: 1, "couponStatus": 1,
g: [], "couponEffectStatus": 1, //1 有效；3 无效
loading: false, "couponsUseScope": 0,
status: "loadmore", },
loadText: { page_count: 1,
loadmore: "轻轻上拉，加载更多", g: [],
loading: "努力加载中", loading: false,
nomore: "没有更多了", status: "loadmore",
}, loadText: {
showBar: true, loadmore: "轻轻上拉，加载更多",
}; loading: "努力加载中",
}, nomore: "没有更多了",
created() { },
this.contentHeight = this.$utils.calcContentHeight(-40) + "px"; showBar: true,
this.mainColor = this.$uiConfig.mainColor; };
// #ifdef MP-ALIPAY },
this.showBar = false; created() {
// #endif this.contentHeight = this.$utils.calcContentHeight(-40) + "px";
}, this.mainColor = this.$uiConfig.mainColor;
mounted() { // #ifdef MP-ALIPAY
let currentPages = getCurrentPages(); this.showBar = false;
let u = "/" + currentPages[currentPages.length - 1].route; // #endif
let pages = wx.getStorageSync("basedata") },
? wx.getStorageSync("basedata").bar_title mounted() {
: []; let currentPages = getCurrentPages();
pages.forEach((x) => { let u = "/" + currentPages[currentPages.length - 1].route;
if (x.value == u) { let pages = wx.getStorageSync("basedata") ?
this.pageTitle = x.new_name ? x.new_name : x.name; wx.getStorageSync("basedata").bar_title :
} [];
}); pages.forEach((x) => {
uni.setNavigationBarTitle({ if (x.value == u) {
title: this.pageTitle, this.pageTitle = x.new_name ? x.new_name : x.name;
}); }
}, });
onLoad: function (option) { uni.setNavigationBarTitle({
// this.u = uni.getStorageSync("mall_UserInfo"); title: this.pageTitle,
// if (!this.u) { });
// this.u = { },
// nickName: "未登录", onLoad: function(option) {
// avatarUrl: "", // this.u = uni.getStorageSync("mall_UserInfo");
// }; // if (!this.u) {
// this.showAuth = true; // this.u = {
// } else { // nickName: "未登录",
// this.init(); // avatarUrl: "",
// } // };
this.loading=true // this.showAuth = true;
this.init() // } else {
}, // this.init();
methods: { // }
this.loading = true
change(index) { this.init()
this.currentIndex=index },
this.msg.useState = index==0?1:3; methods: {
this.msg.pageIndex = 1;
this.g = [];
this.loading = true;
this.init();
},
init() {
uni.showLoading()
this.javaApipost('b2b/user/getUserCouponAllotList',this.msg,(res)=>{
this.loading = false;
this.g = this.g.concat(res.data.pageData);
this.page_count = res.data.pageCount;
if (this.page_count == 1) {
this.status = "nomore";
}
uni.hideLoading()
},(err)=>{
console.log(err)
uni.hideLoading()
})
// this.request2(
// {
// url: "/api/AppletUser/GetMemberCouponPageList",
// data: this.msg,
// },
// (res) => {
// if (res.resultCode == 1) {
// this.loading = false;
// this.g = this.g.concat(res.data.pageData);
// this.page_count = res.data.pageCount; change(index) {
// if (this.page_count == 1) { this.currentIndex = index
// this.status = "nomore"; this.msg.useState = index == 0 ? 1 : 3;
// } this.msg.pageIndex = 1;
// } this.g = [];
// } this.loading = true;
// ); this.init();
}, },
lower(e) { init() {
if (this.msg.pageIndex < this.page_count) { uni.showLoading()
this.msg.pageIndex++;
this.status = "loading"; // this.apipost("b2b_post_LvXiaoYouBindCustomerInfo", param, (res) => {
this.init(); // if (res.resultCode == 1) {
} else { // //移除缓存=>跳转到首页重新登录
this.status = "nomore"; // uni.removeStorageSync('b2b_user')
} // uni.removeStorageSync('mall_UserInfo')
}, // uni.redirectTo({
reloadUserinfo() { // url: '/pages/index/index'
this.u = uni.getStorageSync("mall_UserInfo"); // })
// this.showAuth=false; // } else {
this.init(); // this.loginLoading = false
}, // uni.hideLoading()
//关闭登录窗口 // }
gbAuth() { // }, (failed) => {
uni.navigateBack(); // this.loginLoading = false;
}, // uni.showToast({
godetails(item) { // title: failed.message,
if (this.msg.UseState == 0) { // icon: "none",
uni.navigateTo({ // });
url: // }, (error) => {
"/pages/coupon/details/details?item=" + // this.loginLoading = false;
encodeURIComponent(JSON.stringify(item)) + // uni.hideLoading()
"&type=1", // })
});
}
}, this.javaApipost('b2b/user/getUserCouponAllotList', this.msg, (res) => {
goUrl() { this.loading = false;
uni.navigateTo({ this.g = this.g.concat(res.data.pageData);
url: "/pages/coupon/list/list",
}); this.page_count = res.data.pageCount;
}, if (this.page_count == 1) {
}, this.status = "nomore";
}; }
uni.hideLoading()
}, (err) => {
console.log(err)
uni.hideLoading()
})
},
lower(e) {
if (this.msg.pageIndex < this.page_count) {
this.msg.pageIndex++;
this.status = "loading";
this.init();
} else {
this.status = "nomore";
}
},
reloadUserinfo() {
this.u = uni.getStorageSync("mall_UserInfo");
// this.showAuth=false;
this.init();
},
//关闭登录窗口
gbAuth() {
uni.navigateBack();
},
godetails(item) {
if (this.msg.UseState == 0) {
uni.navigateTo({
url: "/pages/coupon/details/details?item=" +
encodeURIComponent(JSON.stringify(item)) +
"&type=1",
});
}
},
goUrl() {
uni.navigateTo({
url: "/pages/coupon/list/list",
});
},
},
};
</script> </script>
<style> <style>
.couponStyle { .couponStyle {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #f3f4f6; background: #f3f4f6;
position: relative; position: relative;
} }
.couponStyle .loading {
width: 180rpx;
height: 180rpx;
background: #000000;
opacity: 0.7;
border-radius: 10rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
position: fixed;
left: 50%;
top: 30%;
margin-left: -100rpx;
z-index: 999;
}
.couponStyle .couponList {
width: 100%;
display: flex;
flex-direction: column;
align-items: center;
}
.couponStyle .couponitem {
width: 94%;
display: flex;
align-items: center;
height: 180rpx;
background: #f2ebe4;
margin-top: 20rpx;
}
.couponStyle .couponitem .couponitem_l {
width: 180rpx;
height: 180rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-around;
padding: 20rpx;
color: #fff;
}
.couponStyle .couponitem .couponitem_r {
width: calc(100vw - 220rpx);
height: 180rpx;
display: flex;
flex-direction: column;
padding: 20rpx;
justify-content: space-around;
}
.couponStyle .item {
display: flex;
margin-top: 10px;
align-items: flex-start;
background: #fff;
width: 94%;
border-radius: 12rpx;
overflow: hidden;
}
.couponStyle .item .ticket {
position: relative;
background-image: linear-gradient(to bottom right,
rgb(117, 174, 246),
rgb(56, 106, 244));
width: 125px;
height: 100px;
display: flex;
align-items: center;
color: #fff;
}
.couponStyle .item .ticket2 {
position: relative;
background: #c3c3c3;
width: 125px;
height: 100px;
display: flex;
align-items: center;
color: #fff;
}
.couponStyle .item .miane .money {
font-family: "oswald";
font-weight: bold;
size: 64px;
width: 125px;
text-align: center;
}
.couponStyle .item .miane .money .small {
font-size: 20px;
}
.couponStyle .item .miane .tiaojian {
font-size: 14px;
width: 125px;
text-align: center;
}
.couponStyle .item .detail {
width: 100%;
height: 100px;
background: #fff;
padding: 10px;
display: flex;
}
.couponStyle .item .detail .coupond {
flex: 1;
display: flex;
flex-direction: column;
justify-content: space-around;
}
.couponStyle .item .detail .coupond .name {
font-size: 16px;
font-weight: 600;
color: #000;
}
.couponStyle .loading { .couponStyle .item .detail .coupond .date {
width: 180rpx; font-family: "23";
height: 180rpx; margin-top: 5px;
background: #000000; font-size: 12px;
opacity: 0.7; color: #777;
border-radius: 10rpx; }
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
position: fixed;
left: 50%;
top: 30%;
margin-left: -100rpx;
z-index: 999;
}
.couponStyle .couponList {
width: 100%;
display: flex;
flex-direction: column;
align-items: center;
}
.couponStyle .couponitem {
width: 94%;
display: flex;
align-items: center;
height: 180rpx;
background: #f2ebe4;
margin-top: 20rpx;
}
.couponStyle .couponitem .couponitem_l {
width: 180rpx;
height: 180rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-around;
padding: 20rpx;
color: #fff;
}
.couponStyle .couponitem .couponitem_r {
width: calc(100vw - 220rpx);
height: 180rpx;
display: flex;
flex-direction: column;
padding: 20rpx;
justify-content: space-around;
}
.couponStyle .item { .couponStyle .item .detail .coupond .rule {
display: flex; font-size: 12px;
margin-top: 10px; color: #777;
align-items: flex-start; margin-top: 5 px;
background: #fff; }
width: 94%;
border-radius: 12rpx;
overflow: hidden;
}
.couponStyle .item .ticket {
position: relative;
background-image: linear-gradient(
to bottom right,
rgb(117, 174, 246),
rgb(56, 106, 244)
);
width: 125px;
height: 100px;
display: flex;
align-items: center;
color: #fff;
}
.couponStyle .item .ticket2 {
position: relative;
background: #c3c3c3;
width: 125px;
height: 100px;
display: flex;
align-items: center;
color: #fff;
}
.couponStyle .item .miane .money {
font-family: "oswald";
font-weight: bold;
size: 64px;
width: 125px;
text-align: center;
}
.couponStyle .item .miane .money .small {
font-size: 20px;
}
.couponStyle .item .miane .tiaojian {
font-size: 14px;
width: 125px;
text-align: center;
}
.couponStyle .item .detail { .couponStyle .item .detail .chosen {
width: 100%; width: 20px;
height: 100px; }
background: #fff;
padding: 10px;
display: flex;
}
.couponStyle .item .detail .coupond {
flex: 1;
display: flex;
flex-direction: column;
justify-content: space-around;
}
.couponStyle .item .detail .coupond .name {
font-size: 16px;
font-weight: 600;
color: #000;
}
.couponStyle .item .detail .coupond .date {
font-family: "23";
margin-top: 5px;
font-size: 12px;
color: #777;
}
.couponStyle .item .detail .coupond .rule {
font-size: 12px;
color: #777;
margin-top: 5 px;
}
.couponStyle .item .detail .chosen {
width: 20px;
}
</style> </style>
pages/index/index.vue
View file @ bf0c39da
...@@ -105,7 +105,9 @@ ...@@ -105,7 +105,9 @@
<view class="triangle-up" :style="{ top: pagePaddingBottom }"></view> <view class="triangle-up" :style="{ top: pagePaddingBottom }"></view>
</view> </view>
<coupon v-if="showCoupons" :coupon-message="couponMessage" :cform="ComeFrom" @goLook="goLook" @closeBtn="closeBtn"></coupon> <coupon v-if="showCoupons" :coupon-message="couponMessage" :cform="ComeFrom" @goLook="goLook" @closeBtn="closeBtn"></coupon>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth> <template v-show="setting&&setting.is_show_auth==1">
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
</template>
<!-- <official-account></official-account> --> <!-- <official-account></official-account> -->
<orderPopup v-if="showorder" :orderPopupdata="orderPopupdata" @gosalesvolume="gosalesvolume" @closeBtn="closeBtn_order"></orderPopup> <orderPopup v-if="showorder" :orderPopupdata="orderPopupdata" @gosalesvolume="gosalesvolume" @closeBtn="closeBtn_order"></orderPopup>
</view> </view>
...@@ -428,10 +430,11 @@ ...@@ -428,10 +430,11 @@
add_top_app_show: 1, add_top_app_show: 1,
}); });
} }
this.setting = set;
this.add_show = uni.getStorageSync("add_top_app") ? this.add_show = uni.getStorageSync("add_top_app") ?
uni.getStorageSync("add_top_app").add_top_app_show : uni.getStorageSync("add_top_app").add_top_app_show :
1; 1;
this.setting = set;
this.isShowBack(); this.isShowBack();
let now = new Date(); let now = new Date();
...@@ -901,7 +904,7 @@ ...@@ -901,7 +904,7 @@
"&cityId=" + "&cityId=" +
that.cityId, that.cityId,
}); });
} }
}, 500); }, 500);
}, },
updateuserinfo(msg) { updateuserinfo(msg) {
......
pages/jiuzhai/bind_Customer.vue
View file @ bf0c39da
...@@ -6,17 +6,17 @@ ...@@ -6,17 +6,17 @@
<view class="logo-text">旅小友</view> <view class="logo-text">旅小友</view>
</view> </view>
<view class="login-form"> <view class="login-form">
<view class="login-title">绑定同行</view> <view class="login-title">同行登录</view>
<view class="login-item"> <view class="login-item">
<input type="text" v-model="msg.account" placeholder="请输入你的同业账号" :class="{'focus':currentFocus=='account'}" @blur="changeCurrentFocus('')" <input type="text" v-model="msg.account" placeholder="请输入您的同业账号" :class="{'focus':currentFocus=='account'}" @blur="changeCurrentFocus('')"
@focus="changeCurrentFocus('account')"> @focus="changeCurrentFocus('account')">
</view> </view>
<view class="login-item"> <view class="login-item">
<input type="password" v-model="msg.password" placeholder="请输入你的登录密码" :class="{'focus':currentFocus=='pwd'}" @blur="changeCurrentFocus('')" <input type="password" v-model="msg.password" placeholder="请输入您的登录密码" :class="{'focus':currentFocus=='pwd'}" @blur="changeCurrentFocus('')"
@focus="changeCurrentFocus('pwd')"> @focus="changeCurrentFocus('pwd')">
</view> </view>
<view class="login-item"> <view class="login-item">
<view @click="loginByAccount" class="login-btn" :class="{'disable':msg.account==''||msg.password==''}">绑定</view> <view @click="loginByAccount" class="login-btn" :class="{'disable':msg.account==''||msg.password==''}">登录</view>
</view> </view>
</view> </view>
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
param.account = '' param.account = ''
param.password = '' param.password = ''
} }
this.apipost("b2b_post_LvXiaoYouBindCustomer", param, (res) => { this.apipost("b2b_post_LvXiaoYouBindCustomerInfo", param, (res) => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
//移除缓存=>跳转到首页重新登录 //移除缓存=>跳转到首页重新登录
uni.removeStorageSync('b2b_user') uni.removeStorageSync('b2b_user')
......
pages/user-center/user-center.vue
View file @ bf0c39da
...@@ -19,9 +19,7 @@ ...@@ -19,9 +19,7 @@
}" }"
class="imgbg" :class="{ class="imgbg" :class="{
miniHeadTop: meueData.user_center.is_foot_bar_status != 1 && meueData.user_center.is_account_status != 1, }"> miniHeadTop: meueData.user_center.is_foot_bar_status != 1 && meueData.user_center.is_account_status != 1, }">
<view class="titlenav" :style="{ paddingTop: nav }">{{ <view class="titlenav" :style="{ paddingTop: nav }">{{ pageTitle }}</view>
pageTitle
}}</view>
<view class="topheard" :style="{ <view class="topheard" :style="{
'margin-top': 'margin-top':
modelstype == 0 modelstype == 0
...@@ -34,29 +32,10 @@ ...@@ -34,29 +32,10 @@
}" }"
v-if="meueData.user_center.top_style == 1"> v-if="meueData.user_center.top_style == 1">
<u-avatar :src="user_info.avatar" size="140" shape="circle"></u-avatar> <u-avatar :src="user_info.avatar" size="140" shape="circle"></u-avatar>
<view style=" <view style=" display: flex;flex-direction: column; justify-content: center; height: 100rpx; margin-left: 20rpx; ">
display: flex; <Text class="nickname" style=" color: #fff; font-size: 40rpx;font-weight: 800; max-width: 400rpx; overflow: hidden; display: inline-block; white-space: nowrap;text-overflow: ellipsis; font-family:'microsoft yahei ui light'"
flex-direction: column;
justify-content: center;
height: 100rpx;
margin-left: 20rpx;
">
<Text class="nickname" style="
color: #fff;
font-size: 40rpx;
font-weight: 800;
max-width: 400rpx;
overflow: hidden;
display: inline-block;
white-space: nowrap;
text-overflow: ellipsis;
font-family:'microsoft yahei ui light'
"
@click="login(user_info)"> @click="login(user_info)">
<template v-if="customer_info&&customer_info.customerName"> <template v-if="b2b_user_info&&b2b_user_info.name">
{{customer_info.customerName}}
</template>
<template v-else-if="b2b_user_info&&b2b_user_info.name">
{{b2b_user_info.name}} {{b2b_user_info.name}}
</template> </template>
<template v-else-if="mall_UserInfo&&mall_UserInfo.Name"> <template v-else-if="mall_UserInfo&&mall_UserInfo.Name">
...@@ -67,98 +46,63 @@ ...@@ -67,98 +46,63 @@
</template> </template>
</Text> </Text>
<view style="font-size:12px; margin-top:5px;"> <view style="font-size:12px; margin-top:5px;">
{{b2b_user_info ? b2b_user_info.name : ""}} <template v-if="b2b_user_info&&b2b_user_info.customerName&&b2b_user_info.customerName!=''">
{{b2b_user_info.customerName}}
</template>
<template v-else>
{{b2b_user_info ? b2b_user_info.name : ""}}
</template>
</view> </view>
</view> </view>
</view> </view>
<view style=" <view style=" display: flex; flex-direction: column; align-items: center; margin-top: 23px;margin-bottom: 5px; "
display: flex;
flex-direction: column;
align-items: center;
margin-top: 23px;
margin-bottom: 5px;
"
v-if="meueData.user_center.top_style == 2"> v-if="meueData.user_center.top_style == 2">
<u-avatar :src="user_info.avatar" shape="circle" size="120"></u-avatar> <u-avatar :src="user_info.avatar" shape="circle" size="120"></u-avatar>
<Text style="color: #fff; font-size: 40rpx; font-weight: 800" class="nickname" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : "立即登录" }}</Text> <Text style="color: #fff; font-size: 40rpx; font-weight: 800" class="nickname" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : "立即登录" }}</Text>
<view class="member" v-if="is_icon_members_grade == 1 && user_info.nickname"> <view class="member" v-if="is_icon_members_grade == 1 && user_info.nickname">
<image :src="user_info.identity.level_icon" mode="aspectFill" style="width: 22px; height: 22px; border-radius: 11px"></image> <image :src="user_info.identity.level_icon" mode="aspectFill" style="width: 22px; height: 22px; border-radius: 11px"></image>
<Text style="margin-right: 10px">{{ <Text style="margin-right: 10px">{{ user_info.identity.level_name != null ? user_info.identity.level_name : "普通用户" }}</Text>
user_info.identity.level_name != null
? user_info.identity.level_name
: "普通用户"
}}</Text>
</view> </view>
</view> </view>
<view class="top_b"> <view class="top_b">
<!--我的收藏-->
<view class="top_b_item" v-if="meueData.user_center.is_foot_bar_status == 1" @click="goUrl('/pages/favorite/favorite')"> <view class="top_b_item" v-if="meueData.user_center.is_foot_bar_status == 1" @click="goUrl('/pages/favorite/favorite')">
<text style="font-size: 21px">{{ <text style="font-size: 21px">{{ user_info.favorite ? user_info.favorite : 0 }}</text>
user_info.favorite ? user_info.favorite : 0
}}</text>
<text>{{ meueData.user_center.foot_bar[0].name }}</text> <text>{{ meueData.user_center.foot_bar[0].name }}</text>
</view> </view>
<!--我的足迹-->
<view class="top_b_item" v-if="meueData.user_center.is_foot_bar_status == 1" @click="goUrl('/pages/foot/index/index')"> <view class="top_b_item" v-if="meueData.user_center.is_foot_bar_status == 1" @click="goUrl('/pages/foot/index/index')">
<text style="font-size: 21px">{{ <text style="font-size: 21px">{{ user_info.footprint ? user_info.footprint : 0 }}</text>
user_info.footprint ? user_info.footprint : 0
}}</text>
<text>{{ meueData.user_center.foot_bar[1].name }}</text> <text>{{ meueData.user_center.foot_bar[1].name }}</text>
</view> </view>
<view class="top_b_item" v-if=" <!--优惠劵-->
meueData.user_center && <view class="top_b_item" v-if=" meueData.user_center && meueData.user_center.is_account_status == 1" @click="goUrl(couponsObj.link_url)">
meueData.user_center.is_account_status == 1 <text style="font-size: 21px">{{ user_info.coupon ? user_info.coupon : 0 }}</text>
"
@click="goUrl(couponsObj.link_url)">
<text style="font-size: 21px">{{
user_info.coupon ? user_info.coupon : 0
}}</text>
<text>{{ couponsObj.name }}</text> <text>{{ couponsObj.name }}</text>
</view> </view>
</view> </view>
<view class="Receiptbalance" v-if=" <view class="Receiptbalance" v-if=" meueData.user_center && meueData.user_center.is_account_status == 1">
meueData.user_center && <!--余额-->
meueData.user_center.is_account_status == 1
">
<view class="Receiptbalance_item" v-for="(item, index) in meueData.user_center.account" :key="index" v-if="item.link_url == '/pages/balance/balance'" <view class="Receiptbalance_item" v-for="(item, index) in meueData.user_center.account" :key="index" v-if="item.link_url == '/pages/balance/balance'"
@click="goUrl(item.link_url)"> @click="goUrl(item.link_url)">
<image :src="item.icon_url" style="width: 22px; height: auto" mode="widthFix"></image> <image :src="item.icon_url" style="width: 22px; height: auto" mode="widthFix"></image>
<view style=" <view style="margin-left: 15px;display: flex;flex-direction: column;justify-content: space-between;">
margin-left: 15px; <span style="font-size: 21px; color: #0d0d0d; font-weight: 200">
display: flex; {{ user_info.balance ? user_info.balance > 10000? (user_info.balance / 10000).toFixed(1) + "w": user_info.balance: 0 }}
flex-direction: column; </span>
justify-content: space-between;
">
<span style="font-size: 21px; color: #0d0d0d; font-weight: 200">{{
user_info.balance
? user_info.balance > 10000
? (user_info.balance / 10000).toFixed(1) + "w"
: user_info.balance
: 0
}}</span>
<span style="">{{ item.name }}</span> <span style="">{{ item.name }}</span>
</view> </view>
</view> </view>
<view style="width: 1px; height: 34px; background: #e8e8e8"></view> <view style="width: 1px; height: 34px; background: #e8e8e8"></view>
<view class="Receiptbalance_item" v-for="(item, index) in meueData.user_center.account" :key="index" v-if=" <!--积分明细-->
item.link_url == <view class="Receiptbalance_item" v-for="(item, index) in meueData.user_center.account" :key="index" v-if="item.link_url =='/pages/user-center/integral-detail/integral-detail'"
'/pages/user-center/integral-detail/integral-detail'
"
@click="goUrl(item.link_url)"> @click="goUrl(item.link_url)">
<image :src="item.icon_url" style="width: 17px; height: auto" mode="widthFix"></image> <image :src="item.icon_url" style="width: 17px; height: auto" mode="widthFix"></image>
<view style=" <view style="margin-left: 15px; display: flex;flex-direction: column;justify-content: space-between;">
margin-left: 15px; <span style="font-size: 21px; color: #0d0d0d; font-weight: 200">
display: flex; {{user_info.integral? user_info.integral > 10000? (user_info.integral / 10000).toFixed(1) + "w": user_info.integral: 0}}
flex-direction: column; </span>
justify-content: space-between;
">
<span style="font-size: 21px; color: #0d0d0d; font-weight: 200">{{
user_info.integral
? user_info.integral > 10000
? (user_info.integral / 10000).toFixed(1) + "w"
: user_info.integral
: 0
}}</span>
<span>{{ item.name }}</span> <span>{{ item.name }}</span>
</view> </view>
</view> </view>
...@@ -167,9 +111,7 @@ ...@@ -167,9 +111,7 @@
<!-- 排课点数 --> <!-- 排课点数 -->
<view class="order_bar paike" style="" @click="gopointBalance" v-if="meueData.user_center.is_point_status == 1"> <view class="order_bar paike" style="" @click="gopointBalance" v-if="meueData.user_center.is_point_status == 1">
<span style="font-size: 14px; color: #111111">可用余额(点数)：</span> <span style="font-size: 14px; color: #111111">可用余额(点数)：</span>
<span style="font-size: 22px; color: #111111; font-family: aa">{{ <span style="font-size: 22px; color: #111111; font-family: aa">{{ PointNum }}</span>
PointNum
}}</span>
</view> </view>
<view class="order_bar" v-if="meueData.user_center.is_order_bar_status == 1"> <view class="order_bar" v-if="meueData.user_center.is_order_bar_status == 1">
<u-section title="我的订单" sub-title="查看更多" style="width: 100%; padding: 0px 0 10px" @click="goUrl('/pages/order/index/index?status=0')"></u-section> <u-section title="我的订单" sub-title="查看更多" style="width: 100%; padding: 0px 0 10px" @click="goUrl('/pages/order/index/index?status=0')"></u-section>
...@@ -179,43 +121,28 @@ ...@@ -179,43 +121,28 @@
<image :src="item.icon_url" style="width: 60rpx; height: auto" mode="widthFix"></image> <image :src="item.icon_url" style="width: 60rpx; height: auto" mode="widthFix"></image>
<Text style="margin-top: 10rpx">{{ item.name }}</Text> <Text style="margin-top: 10rpx">{{ item.name }}</Text>
<!-- 待付款 --> <!-- 待付款 -->
<view v-if=" <view v-if="item.link_url == '/pages/order/index/index?status=1' && user_info.MyOrder.NonPayment > 0" class="badge"
item.link_url == '/pages/order/index/index?status=1' && :style="{ background: mainColor }">
user_info.MyOrder.NonPayment > 0
"
class="badge" :style="{ background: mainColor }">
{{ user_info.MyOrder.NonPayment }} {{ user_info.MyOrder.NonPayment }}
</view> </view>
<!-- 待发货 --> <!-- 待发货 -->
<view v-if=" <view v-if="item.link_url == '/pages/order/index/index?status=2' &&user_info.MyOrder.WaitSendGoods > 0" class="badge"
item.link_url == '/pages/order/index/index?status=2' && :style="{ background: mainColor }">
user_info.MyOrder.WaitSendGoods > 0
"
class="badge" :style="{ background: mainColor }">
{{ user_info.MyOrder.WaitSendGoods }} {{ user_info.MyOrder.WaitSendGoods }}
</view> </view>
<!-- 待收货 --> <!-- 待收货 -->
<view v-if=" <view v-if="item.link_url == '/pages/order/index/index?status=3' &&user_info.MyOrder.WaitReceiving > 0" class="badge"
item.link_url == '/pages/order/index/index?status=3' && :style="{ background: mainColor }">
user_info.MyOrder.WaitReceiving > 0
"
class="badge" :style="{ background: mainColor }">
{{ user_info.MyOrder.WaitReceiving }} {{ user_info.MyOrder.WaitReceiving }}
</view> </view>
<!-- 待评价 --> <!-- 待评价 -->
<view v-if=" <view v-if="item.link_url == '/pages/order/order-commit' && user_info.MyOrder.WaitCommentNum > 0" class="badge"
item.link_url == '/pages/order/order-commit' && :style="{ background: mainColor }">
user_info.MyOrder.WaitCommentNum > 0
"
class="badge" :style="{ background: mainColor }">
{{ user_info.MyOrder.WaitCommentNum }} {{ user_info.MyOrder.WaitCommentNum }}
</view> </view>
<!-- 售后 --> <!-- 售后 -->
<view v-if=" <view v-if="item.link_url == '/pages/order/after-sale/refunds-list' && user_info.MyOrder.AfterSaleNum > 0" class="badge"
item.link_url == '/pages/order/after-sale/refunds-list' && :style="{ background: mainColor }">
user_info.MyOrder.AfterSaleNum > 0
"
class="badge" :style="{ background: mainColor }">
{{ user_info.MyOrder.AfterSaleNum }} {{ user_info.MyOrder.AfterSaleNum }}
</view> </view>
</view> </view>
...@@ -229,88 +156,50 @@ ...@@ -229,88 +156,50 @@
<image :src="item.icon_url" style="width: 60rpx; height: auto" mode="widthFix"></image> <image :src="item.icon_url" style="width: 60rpx; height: auto" mode="widthFix"></image>
<Text style="margin-top: 10rpx">{{ item.name }}</Text> <Text style="margin-top: 10rpx">{{ item.name }}</Text>
<!-- 待付款 --> <!-- 待付款 -->
<view v-if=" <view v-if="item.link_url == '/pages/guidecar/orderList?status=1' && user_info.MyGuideCarOrder.NonPayment>0"
item.link_url == '/pages/guidecar/orderList?status=1' &&
user_info.MyGuideCarOrder.NonPayment > 0
"
class="badge" :style="{ background: mainColor }"> class="badge" :style="{ background: mainColor }">
{{ user_info.MyGuideCarOrder.NonPayment }} {{ user_info.MyGuideCarOrder.NonPayment }}
</view> </view>
<!-- 待确认 --> <!-- 待确认 -->
<view v-if=" <view v-if="item.link_url == '/pages/guidecar/orderList?status=2' && user_info.MyGuideCarOrder.WaitSendGoods>0"
item.link_url == '/pages/guidecar/orderList?status=2' &&
user_info.MyGuideCarOrder.WaitSendGoods > 0
"
class="badge" :style="{ background: mainColor }"> class="badge" :style="{ background: mainColor }">
{{ user_info.MyGuideCarOrder.WaitSendGoods }} {{ user_info.MyGuideCarOrder.WaitSendGoods }}
</view> </view>
<!-- 待出行 --> <!-- 待出行 -->
<view v-if=" <view v-if="item.link_url == '/pages/guidecar/orderList?status=3' &&user_info.MyGuideCarOrder.WaitReceiving>0"
item.link_url == '/pages/guidecar/orderList?status=3' &&
user_info.MyGuideCarOrder.WaitReceiving > 0
"
class="badge" :style="{ background: mainColor }"> class="badge" :style="{ background: mainColor }">
{{ user_info.MyGuideCarOrder.WaitReceiving }} {{ user_info.MyGuideCarOrder.WaitReceiving }}
</view> </view>
<!-- 出行中 --> <!-- 出行中 -->
<view v-if=" <view v-if=" item.link_url == '/pages/guidecar/orderList?status=4' && user_info.MyGuideCarOrder.Completed>0 "
item.link_url == '/pages/guidecar/orderList?status=4' &&
user_info.MyGuideCarOrder.Completed > 0
"
class="badge" :style="{ background: mainColor }"> class="badge" :style="{ background: mainColor }">
{{ user_info.MyGuideCarOrder.Completed }} {{ user_info.MyGuideCarOrder.Completed }}
</view> </view>
<!-- 待评价 --> <!-- 待评价 -->
<view v-if=" <view v-if="item.link_url == '/pages/guidecar/order-commit' && user_info.MyGuideCarOrder.GuideCarWaitCommentNum>0"
item.link_url == '/pages/guidecar/order-commit' &&
user_info.MyGuideCarOrder.GuideCarWaitCommentNum > 0
"
class="badge" :style="{ background: mainColor }"> class="badge" :style="{ background: mainColor }">
{{ user_info.MyGuideCarOrder.GuideCarWaitCommentNum }} {{ user_info.MyGuideCarOrder.GuideCarWaitCommentNum }}
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<template v-if=" <template v-if=" meueData.user_center && meueData.user_center.nar_menus.length > 0 ">
meueData.user_center && meueData.user_center.nar_menus.length > 0 <view v-if=" meueData.user_center && meueData.user_center.is_menu_status == 1" v-for="(mItem, mIndex) in meueData.user_center.nar_menus"
"> :key="mIndex" :style="{ marginTop: mIndex == 0 && (meueData.user_center.is_foot_bar_status == 1 || meueData.user_center.is_account_status == 1)? '25px' : '', }"
<view v-if="
meueData.user_center && meueData.user_center.is_menu_status == 1
" v-for="(mItem, mIndex) in meueData.user_center.nar_menus"
:key="mIndex" :style="{
marginTop:
mIndex == 0 &&
(meueData.user_center.is_foot_bar_status == 1 ||
meueData.user_center.is_account_status == 1)
? '25px'
: '',
}"
class="headCommon"> class="headCommon">
<view style="margin: 10px">{{ mItem.MenuNavTitle }}</view> <view style="margin: 10px">{{ mItem.MenuNavTitle }}</view>
<view :class="mItem.MenuNavStyle == 1 ? 'menus' : 'menus2'" style="width: 100%"> <view :class="mItem.MenuNavStyle == 1 ? 'menus' : 'menus2'" style="width: 100%">
<view :class="mItem.MenuNavStyle == 1 ? 'menus_item' : 'menus_item2'" v-for="(item, index) in mItem.MeunList" <view :class="mItem.MenuNavStyle == 1 ? 'menus_item' : 'menus_item2'" v-for="(item, index) in mItem.MeunList"
:key="index" :name="item.name" @click="goUrl(item.link_url)" v-if="pandu(item)"> :key="index" :name="item.name" @click="goUrl(item.link_url)" v-if="pandu(item)">
<image :src="item.icon_url" :style="{ <image :src="item.icon_url" :style="{width: mItem.MenuNavStyle == 1 ? '20px' : '16px',height: 'auto',}" mode="widthFix"></image>
width: mItem.MenuNavStyle == 1 ? '20px' : '16px', <Text style="font-size: 26rpx" :style="{'margin-top': mItem.MenuNavStyle == 1 ? '10rpx' : '0rpx','margin-left': mItem.MenuNavStyle == 1 ? '0rpx' : '24rpx', }">
height: 'auto',
}"
mode="widthFix"></image>
<Text style="font-size: 26rpx" :style="{
'margin-top': mItem.MenuNavStyle == 1 ? '10rpx' : '0rpx',
'margin-left': mItem.MenuNavStyle == 1 ? '0rpx' : '24rpx',
}">
{{ item.name }} {{ item.name }}
</Text> </Text>
<!-- #ifdef MP-WEIXIN --> <!-- #ifdef MP-WEIXIN -->
<button open-type="contact" class="contButton" v-if="item.link_url == 'contact' && item.name == '客服'"></button> <button open-type="contact" class="contButton" v-if="item.link_url == 'contact' && item.name == '客服'"></button>
<!-- #endif --> <!-- #endif -->
<!-- #ifdef MP-ALIPAY --> <!-- #ifdef MP-ALIPAY -->
<view class="contButton" style=" <view class="contButton" style="display: flex;justify-content: center;align-items: center;" v-if="item.link_url == 'contact' && item.name == '客服'">
display: flex;
justify-content: center;
align-items: center;
"
v-if="item.link_url == 'contact' && item.name == '客服'">
<contact-button tnt-inst-id="QqR_ZV6m" scene="SCE01203509" :icon="item.icon_url" size="70rpx" :alipay-card-no="2088 + userId" <contact-button tnt-inst-id="QqR_ZV6m" scene="SCE01203509" :icon="item.icon_url" size="70rpx" :alipay-card-no="2088 + userId"
:ext-info="appid"> :ext-info="appid">
</contact-button> </contact-button>
...@@ -325,11 +214,7 @@ ...@@ -325,11 +214,7 @@
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth> <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
<tabbars></tabbars> <tabbars></tabbars>
</view> </view>
<view v-if=" <view v-if="meueData.user_center&& meueData.user_center.is_ppenmiai == 1 && isloading == true ">
meueData.user_center &&
meueData.user_center.is_ppenmiai == 1 &&
isloading == true
">
<!-- 修改 --> <!-- 修改 -->
<blinddate :meueData="meueData" :user_info="user_info" :scrollTop="scrollTop" :modelstype="modelstype" :bottommargin="bottommargin" <blinddate :meueData="meueData" :user_info="user_info" :scrollTop="scrollTop" :modelstype="modelstype" :bottommargin="bottommargin"
:PointNum="PointNum" @fatherMethod="login"> :PointNum="PointNum" @fatherMethod="login">
...@@ -337,7 +222,6 @@ ...@@ -337,7 +222,6 @@
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth> <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
<tabbars></tabbars> <tabbars></tabbars>
</view> </view>
</scroll-view> </scroll-view>
</template> </template>
...@@ -384,7 +268,7 @@ ...@@ -384,7 +268,7 @@
appId: "2021002181604459" appId: "2021002181604459"
})), })),
userId: uni.getStorageSync("mall_UserInfo").UserId, userId: uni.getStorageSync("mall_UserInfo").UserId,
customer_info: {}
}; };
}, },
components: { components: {
...@@ -412,7 +296,7 @@ ...@@ -412,7 +296,7 @@
basedata.user_info.isAttestationEdu : basedata.user_info.isAttestationEdu :
0; 0;
this.b2b_user_info = uni.getStorageSync('b2b_user') this.b2b_user_info = uni.getStorageSync('b2b_user')
this.getCustomerInfo()
}, },
onLoad() { onLoad() {
this.navHeight = this.$navHeight - 2; this.navHeight = this.$navHeight - 2;
...@@ -468,31 +352,14 @@ ...@@ -468,31 +352,14 @@
0; 0;
}, },
methods: { methods: {
getCustomerInfo() {
//b2b_user_info.customerType 同行菜获取同行资料
if (this.b2b_user_info && this.b2b_user_info.customerType == 2 && this.b2b_user_info.token) {
this.apipost("b2b_get_GetCustomerManagerInfo", {}, (res) => {
if (res.resultCode == 1) {
this.customer_info = res.data;
}
})
}
},
signOutHandler() { signOutHandler() {
uni.removeStorageSync('b2b_user') uni.removeStorageSync('b2b_user')
uni.removeStorageSync('mall_UserInfo') uni.removeStorageSync('mall_UserInfo')
// uni.redirectTo({
// url: '/pages/jiuzhai/login'
// })
uni.redirectTo({ uni.redirectTo({
url: '/pages/index/index' url: '/pages/index/index'
}) })
}, },
goHome() {
uni.redirectTo({
url: "/pages/index/main",
});
},
pandu(item) { pandu(item) {
let flag = true; let flag = true;
let IsOpen = let IsOpen =
...@@ -569,12 +436,14 @@ ...@@ -569,12 +436,14 @@
flag = false; flag = false;
} }
break; break;
//(旅小友)绑定同行
case "/pages/jiuzhai/bind_Customer": case "/pages/jiuzhai/bind_Customer":
if (this.b2b_user_info && this.b2b_user_info.customerType == 1) { if (this.b2b_user_info && this.b2b_user_info.customerType == 1) {
flag = true; flag = true;
} else { } else {
flag = false; flag = false;
} }
flag = true;
break; break;
case "/pages/jiuzhai/direct_Customer": case "/pages/jiuzhai/direct_Customer":
if (this.b2b_user_info && this.b2b_user_info.customerType == 1) { if (this.b2b_user_info && this.b2b_user_info.customerType == 1) {
...@@ -937,7 +806,6 @@ ...@@ -937,7 +806,6 @@
.userStyle .member { .userStyle .member {
background: #3b3641; background: #3b3641;
/* width: 80px; */
font-size: 10px; font-size: 10px;
color: #fff; color: #fff;
height: 18px; height: 18px;
...@@ -1089,7 +957,6 @@ ...@@ -1089,7 +957,6 @@
font-size: 26rpx; font-size: 26rpx;
font-weight: 500; font-weight: 500;
color: #888888; color: #888888;
/* background-color: #F6F6F6FF */
} }
.userBox .login-btn { .userBox .login-btn {
...@@ -1098,7 +965,6 @@ ...@@ -1098,7 +965,6 @@
text-align: center; text-align: center;
line-height: 80rpx; line-height: 80rpx;
color: #fff; color: #fff;
/* font-weight: 600; */
font-size: 28rpx; font-size: 28rpx;
border-radius: 16rpx; border-radius: 16rpx;
font-family: logo-font; font-family: logo-font;
......
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