Skip to content

M
mallapp
Commit 3cad308c authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 13f10982
Hide whitespace changes
Inline Side-by-side
Showing with 730 additions and 1001 deletions
pages/order/order-detail.vue
View file @ 3cad308c
......@@ -15,10 +15,8 @@
</view>
<view class="status" :style="[headStyle]">
<view class="status-title">{{ orders.OrderStatusName }}</view>
<view class="sub-title"
v-if='orders.OrderStatus==1 || orders.OrderStatus==2 ||orders.OrderStatus==3||orders.OrderStatus==4 '>
<u-icon style="display: inline-block; vertical-align: middle;" name="warning-o" color="#FFF"
size="28"></u-icon>
<view class="sub-title" v-if='orders.OrderStatus==1 || orders.OrderStatus==2 ||orders.OrderStatus==3||orders.OrderStatus==4 '>
<u-icon style="display: inline-block; vertical-align: middle;" name="warning-o" color="#FFF" size="28"></u-icon>
<!-- TODO返回字段 不能写死 -->
<text style="margin-left: 5px;">交易成功{{delivery_time}}天，系统自动确认完成</text>
<!-- TODO 交易情况说明 -->
......@@ -39,8 +37,7 @@
<view class="block goods">
<view class="item" v-for="(x, i) in orders.DetailList" :key="i">
<view style="display: flex;">
<image :src="x.CoverImagePath" class="img" @click="redirectGoods(x.GoodsId)"
mode="aspectFill" />
<image :src="x.CoverImagePath" class="img" @click="redirectGoods(x.GoodsId)" mode="aspectFill" />
<view class="good-info">
<view class="good-name" @click="redirectGoods(x.GoodsId)">{{x.GoodsName}}</view>
<view class="good-attr">
......@@ -53,9 +50,8 @@
<view v-if="x.EduData.ClassTime&&u.TenantId==27">上课时间:{{x.EduData.ClassTime}}</view>
<text v-if="x.EduData.ClassNum &&u.TenantId==27">课程数量:{{x.EduData.ClassNum}}</text>
</view>
<view style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;margin-top: 2px;"
@click.native.stop="goUrl(x.FreeShippingUrl)"
v-if="x.FreeShippingRemarks !=null && x.FreeShippingRemarks!='' ">
<view style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;margin-top: 2px;" @click.native.stop="goUrl(x.FreeShippingUrl)"
v-if="x.FreeShippingRemarks !=null && x.FreeShippingRemarks!='' ">
<view style="color: #FF4048;background: #fdf6ec;padding: 0 5px;display: inline-block;">
<Text style="font-size: 20rpx;margin-right: 5rpx;">
{{x.FreeShippingRemarks}}
......@@ -63,21 +59,19 @@
</view>
</view>
<view class="good-price">￥{{ x.Final_Price }}</view>
<view v-if="x.GoodsRelevanceList&&x.GoodsRelevanceList.length>0&&u.TenantId==27" class="bindingg" v-for="(attr2, inde4x) in x.GoodsRelevanceList" >已选物品:{{attr2.RelevanceName}}</view>
<view v-if="x.GoodsRelevanceList&&x.GoodsRelevanceList.length>0&&u.TenantId==27" v-for="(attr2, inde4x) in x.GoodsRelevanceList" class="good-price">￥{{ attr2.RelevancePrice }}</view>
<view v-if="x.GoodsRelevanceList&&x.GoodsRelevanceList.length>0&&u.TenantId==27" class="bindingg" v-for="(attr2, inde4x) in x.GoodsRelevanceList">已选物品:{{attr2.RelevanceName}}</view>
<view v-if="x.GoodsRelevanceList&&x.GoodsRelevanceList.length>0&&u.TenantId==27" v-for="(attr2, inde4x) in x.GoodsRelevanceList"
class="good-price">￥{{ attr2.RelevancePrice }}</view>
</view>
</view>
<template v-for="(e, ei) in expressInfo">
<view :key="ei" class="order-info-item peisong" v-for="(ec, eci) in e.GoodsList"
v-if=" ec.Id == x.DetailId">
<view :key="ei" class="order-info-item peisong" v-for="(ec, eci) in e.GoodsList" v-if=" ec.Id == x.DetailId">
<template>
<view class="field" :key="eci" v-if="e.Type == '2' && ec.Id == x.DetailId">
<view class="label">配送方式</view>
<view class="content">{{ e.Remark }}</view>
</view>
<view class="field" :key="eci"
@click="goExpressHandler(e.ExpressName, e.ExpressNumber,e.ExpressId)"
v-if="e.Type == '1' && ec.Id == x.DetailId">
<view class="field" :key="eci" @click="goExpressHandler(e.ExpressName, e.ExpressNumber,e.ExpressId)" v-if="e.Type == '1' && ec.Id == x.DetailId">
<view class="label">配送方式</view>
<view class="content">{{ e.ExpressName }} {{ e.ExpressNumber }}</view>
<view style="margin-left: 10px;">
......@@ -95,11 +89,9 @@
</view>
</view>
<view class="customer">
<button open-type="contact" :send-message-title="x.GoodsName"
:send-message-path="'/pages/index/index?id=' + x.GoodsId + '&user_id=' + uid+'&JumpType=1'"
:send-message-img=" x.CoverImagePath " :show-message-card="true">
<u-icon style="display: inline-block; vertical-align: middle;" size="36" color="#111"
name="chat-o"></u-icon>
<button open-type="contact" :send-message-title="x.GoodsName" :send-message-path="'/pages/index/index?id=' + x.GoodsId + '&user_id=' + uid+'&JumpType=1'"
:send-message-img=" x.CoverImagePath " :show-message-card="true">
<u-icon style="display: inline-block; vertical-align: middle;" size="36" color="#111" name="chat-o"></u-icon>
<text style="margin-left: 10rpx;">联系客服</text>
</button>
</view>
......@@ -130,6 +122,16 @@
</view>
</view>
</view>
<view class="block" v-if="orders.CustomFormInfo&&orders.CustomFormInfo.length>0">
<view class="order-info-item">
<template v-for="(subItem,subIndex) in orders.CustomFormInfo">
<view class="field" v-if="(subItem.CompKey=='SingleLineText'||subItem.CompKey=='MultiLineText')&&subItem.CompData.TextValue!=''">
<view class="label">{{subItem.CompData.Name}}：</view>
<view class="content">{{ subItem.CompData.TextValue }}</view>
</view>
</template>
</view>
</view>
<view class="block">
<view class="order-info-item">
<view class="field">
......@@ -158,10 +160,8 @@
<view class="content right">
<text style="margin-right: 10px;">实付款：</text>
<text style="font-size: 11px; font-weight: 700;" :style="{ color: mc }">￥</text>
<text style="font-size: 17px;"
:style="{ color: mc }">{{String(orders.Income).split(".")[0]}}</text>
<text style="font-size: 12px;"
:style="{ color: mc }">.{{String(orders.Income).split(".")[1] || "00" }}</text>
<text style="font-size: 17px;" :style="{ color: mc }">{{String(orders.Income).split(".")[0]}}</text>
<text style="font-size: 12px;" :style="{ color: mc }">.{{String(orders.Income).split(".")[1] || "00" }}</text>
</view>
</view>
</view>
......@@ -181,15 +181,13 @@
</u-button>
</view>
<view class="item" v-if="orders.OrderStatus == '1'">
<u-button shape="circle" size="medium" :custom-style="themCustomStyle"
v-on:click.stop="payment(orders)">立即支付</u-button>
<u-button shape="circle" size="medium" :custom-style="themCustomStyle" v-on:click.stop="payment(orders)">立即支付</u-button>
</view>
<view class="item" v-if="orders.OrderStatus == '1' && orders.Income >0">
<u-button shape="circle" size="medium" :custom-style="themCustomStyle" open-type="share">找人代付
</u-button>
</view>
<view class="item"
v-if="orders.OrderStatus == '3'&& orders.PresentFXGrade!=1&&orders.OrderEduType === 0 ">
<view class="item" v-if="orders.OrderStatus == '3'&& orders.PresentFXGrade!=1&&orders.OrderEduType === 0 ">
<u-button shape="circle" size="medium" :custom-style="customStyle" @click="openAfterHandler">申请售后
</u-button>
</view>
......@@ -198,8 +196,7 @@
<u-button shape="circle" size="medium" :custom-style="customStyle" @click="cancel">取消订单
</u-button>
</view>
<view class="item"
v-if="(orders.OrderStatus == '1'&&u.TenantId!=27 || (orders.OrderStatus == '2' && orders.PresentFXGrade!=1&&u.TenantId!=27))&&orders.OrderEduType === 0 &&u.TenantId!=27">
<view class="item" v-if="(orders.OrderStatus == '1'&&u.TenantId!=27 || (orders.OrderStatus == '2' && orders.PresentFXGrade!=1&&u.TenantId!=27))&&orders.OrderEduType === 0 &&u.TenantId!=27">
<u-button shape="circle" size="medium" :custom-style="customStyle" @click="cancel">取消订单
</u-button>
</view>
......@@ -207,8 +204,7 @@
<view class="item" style="line-height: 34px;" v-if="orders.OrderStatus == 6">
待处理
</view>
<view class="item" style="line-height: 34px;font-size: 16px;color: gray;font-weight: 600;"
v-if="orders.OrderStatus == 7">
<view class="item" style="line-height: 34px;font-size: 16px;color: gray;font-weight: 600;" v-if="orders.OrderStatus == 7">
已取消
</view>
</view>
......@@ -219,27 +215,22 @@
<view style="display: flex;align-items: center;justify-content: center;height:70px ;">
<Text>是否取消订单？</Text>
</view>
<view style="display: flex;flex-direction: column;height:80px ;margin-left: 15px;width: 100%;"
v-if='orders.OrderStatus==2'>
<view style="display: flex;flex-direction: column;height:80px ;margin-left: 15px;width: 100%;" v-if='orders.OrderStatus==2'>
<Text style='margin-left: 10px;margin-top: 5px;'>备注</Text>
<input class="uni-input inputM" style='margin-left: 10px;margin-top: 5px;'
v-model="Cancelmsg.Remark" placeholder="输入备注" />
<input class="uni-input inputM" style='margin-left: 10px;margin-top: 5px;' v-model="Cancelmsg.Remark" placeholder="输入备注" />
</view>
<view
style="display: flex;flex-direction: row;align-items: center;height: 50px;border-top: 1px solid #F5F5F5;width: 100%;">
<view style="width: 50%;display: flex;align-items: center;justify-content: center"
@click="showModal=false">
<view style="display: flex;flex-direction: row;align-items: center;height: 50px;border-top: 1px solid #F5F5F5;width: 100%;">
<view style="width: 50%;display: flex;align-items: center;justify-content: center" @click="showModal=false">
<Text>取消</Text>
</view>
<view style="width: 50%;color: #a0cfff;display: flex;align-items: center;justify-content: center"
@click="confirm">
<view style="width: 50%;color: #a0cfff;display: flex;align-items: center;justify-content: center" @click="confirm">
<Text>确定</Text>
</view>
</view>
</view>
</u-popup>
<u-modal v-model="showReviceModal" content="是否确认收货？" :show-cancel-button="true" :show-title="false"
@confirm="submitReviceGoodHandler" :border-radius="20"></u-modal>
<u-modal v-model="showReviceModal" content="是否确认收货？" :show-cancel-button="true" :show-title="false" @confirm="submitReviceGoodHandler"
:border-radius="20"></u-modal>
<u-toast ref="uToast" />
<payCom v-if="payBtn&&u.TenantId!=27" :payInfo="payInfo" @closePay="closePay"></payCom>
<submit2PayCom v-if="payBtn&&u.TenantId==27" :payInfo="payInfo" :isAlipay="isAlipay" @closePay="closePay"></submit2PayCom>
......@@ -248,8 +239,7 @@
<view style="padding:10px 0 0 10px">提交失败</view>
<view style="text-align:center;padding-bottom:40rpx">
<view style="margin:80rpx 0">支付取消</view>
<span @click="exitPay"
style="padding:10rpx 50rpx;color:#fff;background:#19be6b;border-radius: 12px;">确定</span>
<span @click="exitPay" style="padding:10rpx 50rpx;color:#fff;background:#19be6b;border-radius: 12px;">确定</span>
</view>
</view>
</u-popup>
......@@ -270,8 +260,8 @@
},
data() {
return {
isAlipay:2,//1微信 2微信支付宝
u:{},
isAlipay: 2, //1微信 2微信支付宝
u: {},
mc: "",
secondary: "",
headStyle: {},
......@@ -383,7 +373,6 @@
);
},
cancel() {
this.showModal = true;
this.Cancelmsg.OrderId = this.orders.OrderId;
this.Cancelmsg.Type = this.orders.OrderStatus;
......@@ -511,7 +500,6 @@
}
},
payment(e) {
console.log(e.OrderId)
this.payInfo.OrderId = e.OrderId;
this.payInfo.GoodsName = e.DetailList[0].GoodsName.slice(0, 10);
this.payInfo.PaymentWay = e.PaymentWay;
......@@ -553,17 +541,18 @@
</script>
<style>
.good-attr22{
.good-attr22 {
font-size: 13px;
font-weight: 500;
font-weight: 500;
}
.bindingg{
.bindingg {
color: gray;
font-size: 26rpx;
margin-top: 20rpx;
margin-bottom: 10rpx;
font-size: 26rpx;
margin-top: 20rpx;
margin-bottom: 10rpx;
}
.orderdetail {
overflow: hidden;
background: #f3f4f6;
......
pages/user-center/user-center.vue
View file @ 3cad308c
<template>
<scroll-view
:scroll-y="true"
@scroll="scrollHandler"
@scrolltoupper="scrollTopHandler"
style="width: 100%; height: 100vh; background: #f3f4f6"
>
<view
class="userStyle"
v-if="meueData.user_center && meueData.user_center.is_ppenmiai == 0"
:class="{ dark: isCompany }"
><!-- 修改 -->
<view
class="headStatus"
v-if="scrollTop > 50"
:style="[
<scroll-view :scroll-y="true" @scroll="scrollHandler" @scrolltoupper="scrollTopHandler" style="width: 100%; height: 100vh; background: #f3f4f6">
<view class="userStyle" v-if="meueData.user_center && meueData.user_center.is_ppenmiai == 0" :class="{ dark: isCompany }">
<!-- 修改 -->
<view class="headStatus" v-if="scrollTop > 50" :style="[
headStyle,
{
zIndex: scrollTop < 10 ? 'unset' : 2,
opacity: scrollTop < 10 ? '100' : scrollTop,
},
]"
>
<view class="title" v-if="scrollTop > 50">{{ pageTitle }}</view>
</view>
<view class="userBox" :style="{ 'padding-bottom': bottommargin }">
<view
:style="{
]">
<view class="title" v-if="scrollTop > 50">{{ pageTitle }}</view>
</view>
<view class="userBox" :style="{ 'padding-bottom': bottommargin }">
<view :style="{
'background-image':
'url(' +
(meueData.user_center.top_pic_url
......@@ -34,25 +21,21 @@
')',
backgroundSize: '100% 310px',
}"
class="imgbg"
:class="{
class="imgbg" :class="{
miniHeadTop:
meueData.user_center.is_foot_bar_status != 1 &&
meueData.user_center.is_account_status != 1,
}"
>
<!-- 咖啡扫码 -->
<view style="position: absolute;top:250rpx;right:50rpx" v-if="user_info.IsCoffee_Verification" @click="scanCodeByCoffee">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/coffee/ScanCode.png"
mode="widthFix" style="width: 40rpx;height: auto;"></image>
<coffeeConfirmDialog :show="showCoffeeVerification" @close="showCoffeeVerification=false" :dataObj="coffeeVerificationData"></coffeeConfirmDialog>
</view>
<view class="titlenav" :style="{ paddingTop: nav }">{{
}">
<!-- 咖啡扫码 -->
<view style="position: absolute;top:250rpx;right:50rpx" v-if="user_info.IsCoffee_Verification" @click="scanCodeByCoffee">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/coffee/ScanCode.png" mode="widthFix"
style="width: 40rpx;height: auto;"></image>
<coffeeConfirmDialog :show="showCoffeeVerification" @close="showCoffeeVerification=false" :dataObj="coffeeVerificationData"></coffeeConfirmDialog>
</view>
<view class="titlenav" :style="{ paddingTop: nav }">{{
pageTitle
}}</view>
<view
class="topheard"
:style="{
<view class="topheard" :style="{
'margin-top':
modelstype == 0
? '52px'
......@@ -62,27 +45,17 @@
? '33px'
: 0,
}"
v-if="meueData.user_center.top_style == 1"
>
<u-avatar
:src="user_info.avatar"
size="140"
shape="circle"
style="margin-left: 50rpx"
></u-avatar>
<view
style="
v-if="meueData.user_center.top_style == 1">
<u-avatar :src="user_info.avatar" size="140" shape="circle" style="margin-left: 50rpx"></u-avatar>
<view style="
display: flex;
flex-direction: column;
justify-content: center;
height: 60px;
margin-left: 20rpx;
"
>
<view style="display: flex; align-items: center">
<Text
class="nickname"
style="
">
<view style="display: flex; align-items: center">
<Text class="nickname" style="
color: #fff;
font-size: 40rpx;
font-weight: 800;
......@@ -92,95 +65,53 @@
white-space: nowrap;
text-overflow: ellipsis;
"
@click="login(user_info)"
>{{
@click="login(user_info)">{{
user_info.nickname ? user_info.nickname : "立即登录"
}}</Text
>
<view v-if="companyStatus == 5" style="margin-left: 10rpx">
<image
v-if="FirstShopType == 1"
style="width: 140rpx; height: 44rpx"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pinpaivip.png"
></image>
<image
v-if="FirstShopType == 2"
style="width: 140rpx; height: 44rpx"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/zaitivip.png"
></image>
</view>
</view>
}}</Text>
<view v-if="companyStatus == 5" style="margin-left: 10rpx">
<image v-if="FirstShopType == 1" style="width: 140rpx; height: 44rpx" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pinpaivip.png"></image>
<image v-if="FirstShopType == 2" style="width: 140rpx; height: 44rpx" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/zaitivip.png"></image>
</view>
</view>
<!-- 判断是甲鹤小程序 -->
<view v-if="AppletID == 5 && isAttestationEdu == 1">
<u-tag
text="甲鹤学员"
bg-color="#40766E"
color="#FFF"
size="mini"
border-color="#40766E"
/>
</view>
<view style="display: flex; align-items: center">
<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>
<Text style="margin-right: 10px">{{
<!-- 判断是甲鹤小程序 -->
<view v-if="AppletID == 5 && isAttestationEdu == 1">
<u-tag text="甲鹤学员" bg-color="#40766E" color="#FFF" size="mini" border-color="#40766E" />
</view>
<view style="display: flex; align-items: center">
<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>
<Text style="margin-right: 10px">{{
user_info.identity.level_name != null
? user_info.identity.level_name
: "普通用户"
}}</Text>
<!-- 公司认证状态 -->
</view>
<view
class="componyStatusBox"
@click="goIdentification"
v-if="is_show_korea == 1 && user_info.nickname"
>
<view class="renzhen" v-if="companyStatus == 1">
未认证
</view>
<view
class="renzhen"
v-if="companyStatus == 2"
style="border: 1px solid #ffa800; color: #ffa800"
>
认证未完善
</view>
<!-- 公司认证状态 -->
</view>
<view class="componyStatusBox" @click="goIdentification" v-if="is_show_korea == 1 && user_info.nickname">
<view class="renzhen" v-if="companyStatus == 1">
未认证
</view>
<view class="renzhen" v-if="companyStatus == 2" style="border: 1px solid #ffa800; color: #ffa800">
认证未完善
</view>
<view
class="renzhen"
v-if="companyStatus == 3"
style="border: 1px solid #2961fe; color: #2961fe"
>
认证审核中
</view>
<view
class="renzhen"
v-if="companyStatus == 4"
:style="{
<view class="renzhen" v-if="companyStatus == 3" style="border: 1px solid #2961fe; color: #2961fe">
认证审核中
</view>
<view class="renzhen" v-if="companyStatus == 4" :style="{
border: '1px solid ' + mainColor,
color: mainColor,
}"
>
未通过
</view>
<view
style="
}">
未通过
</view>
<view style="
margin-top: 10px;
display: flex;
align-items: flex-start;
"
v-if="companyStatus == 5"
>
<view
style="
v-if="companyStatus == 5">
<view style="
font-weight: 500;
font-size: 13px;
max-width: 360rpx;
......@@ -189,101 +120,57 @@
display: inline-block;
white-space: nowrap;
text-overflow: ellipsis;
"
>
{{ companyName }}
</view>
</view>
</view>
</view>
</view>
</view>
<view
style="
">
{{ companyName }}
</view>
</view>
</view>
</view>
</view>
</view>
<view style="
display: flex;
flex-direction: column;
align-items: center;
margin-top: 23px;
margin-bottom: 5px;
"
v-if="meueData.user_center.top_style == 2"
>
<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
>
<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>
<view
style="
v-if="meueData.user_center.top_style == 2">
<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>
<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>
<view style="
display: flex;
align-items: center;
justify-content: center;
"
>
<Text style="margin-right: 10px">{{
">
<Text style="margin-right: 10px">{{
user_info.identity.level_name != null
? user_info.identity.level_name
: "普通用户"
}}</Text>
<view v-if="companyStatus == 5" style="margin-left: 10rpx">
<image
v-if="FirstShopType == 1"
style="width: 140rpx; height: 44rpx"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pinpaivip.png"
></image>
<image
v-if="FirstShopType == 2"
style="width: 140rpx; height: 44rpx"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/zaitivip.png"
></image>
</view>
</view>
</view>
<view v-if="AppletID == 5 && isAttestationEdu == 1">
<u-tag
text="甲鹤学员"
bg-color="#40766E"
color="#FFF"
size="mini"
border-color="#40766E"
/>
</view>
<view
class="componyStatusBox"
@click="goIdentification"
v-if="is_show_korea == 1 && user_info.nickname"
>
<view class="renzhen" v-if="companyStatus == 1"> 未认证 </view>
<view class="renzhen" v-if="companyStatus == 2">
认证未完善
</view>
<view v-if="companyStatus == 5" style="margin-left: 10rpx">
<image v-if="FirstShopType == 1" style="width: 140rpx; height: 44rpx" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pinpaivip.png"></image>
<image v-if="FirstShopType == 2" style="width: 140rpx; height: 44rpx" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/zaitivip.png"></image>
</view>
</view>
</view>
<view v-if="AppletID == 5 && isAttestationEdu == 1">
<u-tag text="甲鹤学员" bg-color="#40766E" color="#FFF" size="mini" border-color="#40766E" />
</view>
<view class="componyStatusBox" @click="goIdentification" v-if="is_show_korea == 1 && user_info.nickname">
<view class="renzhen" v-if="companyStatus == 1"> 未认证 </view>
<view class="renzhen" v-if="companyStatus == 2">
认证未完善
</view>
<view
class="renzhen"
v-if="companyStatus == 3"
:style="{ border: '1px solid ' + mainColor, color: mainColor }"
>
认证审核中
</view>
<view class="renzhen" v-if="companyStatus == 4"> 未通过 </view>
<view style="margin-top: 10px" v-if="companyStatus == 5">
<view
style="
<view class="renzhen" v-if="companyStatus == 3" :style="{ border: '1px solid ' + mainColor, color: mainColor }">
认证审核中
</view>
<view class="renzhen" v-if="companyStatus == 4"> 未通过 </view>
<view style="margin-top: 10px" v-if="companyStatus == 5">
<view style="
font-weight: 500;
font-size: 13px;
max-width: 360rpx;
......@@ -292,338 +179,214 @@
display: inline-block;
white-space: nowrap;
text-overflow: ellipsis;
"
>
{{ companyName }}
</view>
</view>
</view>
</view>
<view class="top_b">
<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">{{
">
{{ companyName }}
</view>
</view>
</view>
</view>
<view class="top_b">
<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">{{
user_info.favorite ? user_info.favorite : 0
}}</text>
<text>{{ meueData.user_center.foot_bar[0].name }}</text>
</view>
<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>{{ meueData.user_center.foot_bar[0].name }}</text>
</view>
<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">{{
user_info.footprint ? user_info.footprint : 0
}}</text>
<text>{{ meueData.user_center.foot_bar[1].name }}</text>
</view>
<view
class="top_b_item"
v-if="
<text>{{ meueData.user_center.foot_bar[1].name }}</text>
</view>
<view class="top_b_item" v-if="
meueData.user_center &&
meueData.user_center.is_account_status == 1
"
@click="goUrl(couponsObj.link_url)"
>
<text style="font-size: 21px">{{
@click="goUrl(couponsObj.link_url)">
<text style="font-size: 21px">{{
user_info.coupon ? user_info.coupon : 0
}}</text>
<text>{{ couponsObj.name }}</text>
</view>
</view>
<view
class="ReceiptAdder"
v-if="
<text>{{ couponsObj.name }}</text>
</view>
</view>
<view class="ReceiptAdder" v-if="
IsEducation != 1 &&
setting.is_show_korea != undefined &&
setting.is_show_korea == 0
"
@click="goUrl('/pages/address/address')"
:style="{
@click="goUrl('/pages/address/address')" :style="{
top:
modelstype == 0
? '160rpx'
: modelstype == 1
? '180rpx'
: '160rpx',
}"
>
<u-icon name="location" color="#fff" size="23"></u-icon>
<Text style="color: #fff; font-size: 12px; margin-left: 20rpx"
>收货地址</Text
>
</view>
<view
class="Receiptbalance"
v-if="
}">
<u-icon name="location" color="#fff" size="23"></u-icon>
<Text style="color: #fff; font-size: 12px; margin-left: 20rpx">收货地址</Text>
</view>
<view class="Receiptbalance" v-if="
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'"
@click="goUrl(item.link_url)"
>
<image
:src="item.icon_url"
style="width: 22px; height: auto"
mode="widthFix"
></image>
<view
style="
">
<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)">
<image :src="item.icon_url" style="width: 22px; height: auto" mode="widthFix"></image>
<view style="
margin-left: 15px;
display: flex;
flex-direction: column;
justify-content: space-between;
"
>
<span
style="font-size: 21px; color: #0d0d0d; font-weight: 200"
>{{
">
<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>
</view>
</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="
}}</span>
<span style="">{{ item.name }}</span>
</view>
</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 ==
'/pages/user-center/integral-detail/integral-detail'
"
@click="goUrl(item.link_url)"
>
<image
:src="item.icon_url"
style="width: 17px; height: auto"
mode="widthFix"
></image>
<view
style="
@click="goUrl(item.link_url)">
<image :src="item.icon_url" style="width: 17px; height: auto" mode="widthFix"></image>
<view style="
margin-left: 15px;
display: flex;
flex-direction: column;
justify-content: space-between;
"
>
<span
style="font-size: 21px; color: #0d0d0d; font-weight: 200"
>{{
">
<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>
</view>
</view>
</view>
</view>
<!-- 排课点数 -->
<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: 22px; color: #111111; font-family: aa">{{
}}</span>
<span>{{ item.name }}</span>
</view>
</view>
</view>
</view>
<!-- 排课点数 -->
<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: 22px; color: #111111; font-family: aa">{{
PointNum
}}</span>
</view>
<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>
<view class="order_bar_list">
<view
class="order_bar_item"
v-for="(item, index) in meueData.user_center.order_bar"
:key="index"
:name="item.name"
@click="goUrl(item.link_url)"
>
<image
:src="item.icon_url"
style="width: 60rpx; height: auto"
mode="widthFix"
></image>
<Text style="margin-top: 10rpx">{{ item.name }}</Text>
<!-- 待付款 -->
<view
v-if="
</view>
<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>
<view class="order_bar_list">
<view class="order_bar_item" v-for="(item, index) in meueData.user_center.order_bar" :key="index" :name="item.name"
@click="goUrl(item.link_url)">
<image :src="item.icon_url" style="width: 60rpx; height: auto" mode="widthFix"></image>
<Text style="margin-top: 10rpx">{{ item.name }}</Text>
<!-- 待付款 -->
<view v-if="
item.link_url == '/pages/order/index/index?status=1' &&
user_info.MyOrder.NonPayment > 0
"
class="badge"
:style="{ background: mainColor }"
>
{{ user_info.MyOrder.NonPayment }}
</view>
<!-- 待发货 -->
<view
v-if="
class="badge" :style="{ background: mainColor }">
{{ user_info.MyOrder.NonPayment }}
</view>
<!-- 待发货 -->
<view v-if="
item.link_url == '/pages/order/index/index?status=2' &&
user_info.MyOrder.WaitSendGoods > 0
"
class="badge"
:style="{ background: mainColor }"
>
{{ user_info.MyOrder.WaitSendGoods }}
</view>
<!-- 待收货 -->
<view
v-if="
class="badge" :style="{ background: mainColor }">
{{ user_info.MyOrder.WaitSendGoods }}
</view>
<!-- 待收货 -->
<view v-if="
item.link_url == '/pages/order/index/index?status=3' &&
user_info.MyOrder.WaitReceiving > 0
"
class="badge"
:style="{ background: mainColor }"
>
{{ user_info.MyOrder.WaitReceiving }}
</view>
<!-- 待评价 -->
<view
v-if="
class="badge" :style="{ background: mainColor }">
{{ user_info.MyOrder.WaitReceiving }}
</view>
<!-- 待评价 -->
<view v-if="
item.link_url == '/pages/order/order-commit' &&
user_info.MyOrder.WaitCommentNum > 0
"
class="badge"
:style="{ background: mainColor }"
>
{{ user_info.MyOrder.WaitCommentNum }}
</view>
<!-- 售后 -->
<view
v-if="
class="badge" :style="{ background: mainColor }">
{{ user_info.MyOrder.WaitCommentNum }}
</view>
<!-- 售后 -->
<view v-if="
item.link_url == '/pages/order/after-sale/refunds-list' &&
user_info.MyOrder.AfterSaleNum > 0
"
class="badge"
:style="{ background: mainColor }"
>
{{ user_info.MyOrder.AfterSaleNum }}
</view>
</view>
</view>
</view>
<view
class="order_bar"
style="margin-top: 20rpx"
v-if="meueData.user_center.is_sdorder_bar_status == 1"
>
<u-section
title="司导订单"
sub-title="查看更多"
style="width: 100%; padding: 0px 0 10px"
@click="goUrl('/pages/guidecar/orderList?status=0')"
></u-section>
<view class="order_bar_list">
<view
class="order_bar_item"
v-for="(item, index) in meueData.user_center.sdorder_bar"
:key="index"
:name="item.name"
@click="goUrl(item.link_url)"
>
<image
:src="item.icon_url"
style="width: 60rpx; height: auto"
mode="widthFix"
></image>
<Text style="margin-top: 10rpx">{{ item.name }}</Text>
<!-- 待付款 -->
<view
v-if="
class="badge" :style="{ background: mainColor }">
{{ user_info.MyOrder.AfterSaleNum }}
</view>
</view>
</view>
</view>
<view class="order_bar" style="margin-top: 20rpx" v-if="meueData.user_center.is_sdorder_bar_status == 1">
<u-section title="司导订单" sub-title="查看更多" style="width: 100%; padding: 0px 0 10px" @click="goUrl('/pages/guidecar/orderList?status=0')"></u-section>
<view class="order_bar_list">
<view class="order_bar_item" v-for="(item, index) in meueData.user_center.sdorder_bar" :key="index" :name="item.name"
@click="goUrl(item.link_url)">
<image :src="item.icon_url" style="width: 60rpx; height: auto" mode="widthFix"></image>
<Text style="margin-top: 10rpx">{{ item.name }}</Text>
<!-- 待付款 -->
<view v-if="
item.link_url == '/pages/guidecar/orderList?status=1' &&
user_info.MyGuideCarOrder.NonPayment > 0
"
class="badge"
:style="{ background: mainColor }"
>
{{ user_info.MyGuideCarOrder.NonPayment }}
</view>
<!-- 待确认 -->
<view
v-if="
class="badge" :style="{ background: mainColor }">
{{ user_info.MyGuideCarOrder.NonPayment }}
</view>
<!-- 待确认 -->
<view v-if="
item.link_url == '/pages/guidecar/orderList?status=2' &&
user_info.MyGuideCarOrder.WaitSendGoods > 0
"
class="badge"
:style="{ background: mainColor }"
>
{{ user_info.MyGuideCarOrder.WaitSendGoods }}
</view>
<!-- 待出行 -->
<view
v-if="
class="badge" :style="{ background: mainColor }">
{{ user_info.MyGuideCarOrder.WaitSendGoods }}
</view>
<!-- 待出行 -->
<view v-if="
item.link_url == '/pages/guidecar/orderList?status=3' &&
user_info.MyGuideCarOrder.WaitReceiving > 0
"
class="badge"
:style="{ background: mainColor }"
>
{{ user_info.MyGuideCarOrder.WaitReceiving }}
</view>
<!-- 出行中 -->
<view
v-if="
class="badge" :style="{ background: mainColor }">
{{ user_info.MyGuideCarOrder.WaitReceiving }}
</view>
<!-- 出行中 -->
<view v-if="
item.link_url == '/pages/guidecar/orderList?status=4' &&
user_info.MyGuideCarOrder.Completed > 0
"
class="badge"
:style="{ background: mainColor }"
>
{{ user_info.MyGuideCarOrder.Completed }}
</view>
<!-- 待评价 -->
<view
v-if="
class="badge" :style="{ background: mainColor }">
{{ user_info.MyGuideCarOrder.Completed }}
</view>
<!-- 待评价 -->
<view v-if="
item.link_url == '/pages/guidecar/order-commit' &&
user_info.MyGuideCarOrder.GuideCarWaitCommentNum > 0
"
class="badge"
:style="{ background: mainColor }"
>
{{ user_info.MyGuideCarOrder.GuideCarWaitCommentNum }}
</view>
</view>
</view>
</view>
<template
v-if="
class="badge" :style="{ background: mainColor }">
{{ user_info.MyGuideCarOrder.GuideCarWaitCommentNum }}
</view>
</view>
</view>
</view>
<template v-if="
meueData.user_center && meueData.user_center.nar_menus.length > 0
"
>
<view
v-if="
">
<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="{
" v-for="(mItem, mIndex) in meueData.user_center.nar_menus"
:key="mIndex" :style="{
marginTop:
mIndex == 0 &&
(meueData.user_center.is_foot_bar_status == 1 ||
......@@ -631,89 +394,52 @@
? '25px'
: '',
}"
class="headCommon"
>
<view style="margin: 10px">{{ mItem.MenuNavTitle }}</view>
<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"
:key="index"
:name="item.name"
@click="goUrl(item.link_url)"
v-if="pandu(item)"
>
<image
:src="item.icon_url"
:style="{
class="headCommon">
<view style="margin: 10px">{{ mItem.MenuNavTitle }}</view>
<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"
:key="index" :name="item.name" @click="goUrl(item.link_url)" v-if="pandu(item)">
<image :src="item.icon_url" :style="{
width: mItem.MenuNavStyle == 1 ? '20px' : '16px',
height: 'auto',
}"
mode="widthFix"
></image>
<Text
style="font-size: 26rpx"
:style="{
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 }}
</Text>
<button
open-type="contact"
class="contButton"
v-if="item.link_url == 'contact' && item.name == '客服'"
></button>
</view>
</view>
</view>
</template>
</view>
<auth
v-if="showAuth"
@changeuserinfo="reloadUserinfo"
@gbAuth="gbAuth"
></auth>
<tabbars></tabbars>
</view>
<view
v-if="
}">
{{ item.name }}
</Text>
<button open-type="contact" class="contButton" v-if="item.link_url == 'contact' && item.name == '客服'"></button>
</view>
</view>
</view>
</template>
</view>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
<tabbars></tabbars>
</view>
<view v-if="
meueData.user_center &&
meueData.user_center.is_ppenmiai == 1 &&
isloading == true
"
><!-- 修改 -->
<blinddate
:meueData="meueData"
:user_info="user_info"
:scrollTop="scrollTop"
:modelstype="modelstype"
:bottommargin="bottommargin"
:PointNum="PointNum"
@fatherMethod="login"
>
</blinddate>
<auth
v-if="showAuth"
@changeuserinfo="reloadUserinfo"
@gbAuth="gbAuth"
></auth>
<tabbars></tabbars>
</view>
</scroll-view>
">
<!-- 修改 -->
<blinddate :meueData="meueData" :user_info="user_info" :scrollTop="scrollTop" :modelstype="modelstype" :bottommargin="bottommargin"
:PointNum="PointNum" @fatherMethod="login">
</blinddate>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
<tabbars></tabbars>
</view>
</scroll-view>
</template>
<script>
import tabbars from '@/components/tabbar/index';
import auth from '../../components/auth/index.vue';
import blinddate from './components/blinddate-user.vue';
import coffeeConfirmDialog from "./components/coffeeConfirmDialog.vue";//咖啡核验成功
import coffeeConfirmDialog from "./components/coffeeConfirmDialog.vue"; //咖啡核验成功
export default {
data() {
return {
......@@ -739,19 +465,19 @@
shopBasics: {},
mall_UserInfo: {},
IsEducation: 0, //1是0否是网课模式
PointNum:0,
PointNum: 0,
setting: {},
isCompany:true, //TODO 完成动态加载系统所属类型
companyStatus:2,
companyName:"",
FirstShopType:0,
is_show_korea:0,//是否显示认证标识
IsDeposit:0,//是否开启储蓄卡功能
AppletID:0,//小程序id 5-8日 判断是否是甲鹤
isAttestationEdu:0,//学员是否认证了 0否1是
isMallAdmin:0,//是否是饭粒汪商城管理员 0否1是
showCoffeeVerification:false,//是否显示咖啡核验成功弹窗
coffeeVerificationData:{},//咖啡核验成功弹窗参数
isCompany: true, //TODO 完成动态加载系统所属类型
companyStatus: 2,
companyName: "",
FirstShopType: 0,
is_show_korea: 0, //是否显示认证标识
IsDeposit: 0, //是否开启储蓄卡功能
AppletID: 0, //小程序id 5-8日 判断是否是甲鹤
isAttestationEdu: 0, //学员是否认证了 0否1是
isMallAdmin: 0, //是否是饭粒汪商城管理员 0否1是
showCoffeeVerification: false, //是否显示咖啡核验成功弹窗
coffeeVerificationData: {}, //咖啡核验成功弹窗参数
};
},
components: {
......@@ -769,10 +495,10 @@
0;
this.userinfo();
this.setting = uni.getStorageSync("basedata").mall.setting;
this.isCompany=uni.getStorageSync("user_type")?uni.getStorageSync("user_type")=="company":true; //完成动态加载系统所属类型
let basedata =uni.getStorageSync("basedata")?uni.getStorageSync("basedata"):'';
this.AppletID = basedata.home_pages.id?basedata.home_pages.id:0;
this.isAttestationEdu = basedata.user_info.isAttestationEdu ? basedata.user_info.isAttestationEdu:0
this.isCompany = uni.getStorageSync("user_type") ? uni.getStorageSync("user_type") == "company" : true; //完成动态加载系统所属类型
let basedata = uni.getStorageSync("basedata") ? uni.getStorageSync("basedata") : '';
this.AppletID = basedata.home_pages.id ? basedata.home_pages.id : 0;
this.isAttestationEdu = basedata.user_info.isAttestationEdu ? basedata.user_info.isAttestationEdu : 0
},
onLoad() {
this.navHeight = this.$navHeight - 2;
......@@ -784,7 +510,7 @@
if (!this.mall_UserInfo) {
this.showAuth = true;
}
this.isMallAdmin = this.mall_UserInfo.AdminId&&this.mall_UserInfo.AdminToken ? 1:0
this.isMallAdmin = this.mall_UserInfo.AdminId && this.mall_UserInfo.AdminToken ? 1 : 0
},
mounted() {
this.getComponyStatus()
......@@ -799,38 +525,39 @@
this.modelstype = 2
}
this.is_icon_members_grade = uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').mall.setting.is_icon_members_grade :0;
this.is_show_korea= uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').mall.setting.is_show_korea :0;
this.IsDeposit = uni.getStorageSync('basedata')?uni.getStorageSync('basedata').mall.setting.IsDeposit:0
this.is_icon_members_grade = uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').mall.setting.is_icon_members_grade :
0;
this.is_show_korea = uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').mall.setting.is_show_korea : 0;
this.IsDeposit = uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').mall.setting.IsDeposit : 0
let u = '/' + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync('basedata') ? wx.getStorageSync('basedata').bar_title : [];
uni.setNavigationBarTitle({
title: '用户中心'
});
let that=this
wx.getSystemInfo({
success(res) {
let lift=res.screenHeight-res.safeArea.bottom
that.bottommargin = (Number(lift)+80)+'px'
console.log(lift)
}
})
let that = this
wx.getSystemInfo({
success(res) {
let lift = res.screenHeight - res.safeArea.bottom
that.bottommargin = (Number(lift) + 80) + 'px'
console.log(lift)
}
})
},
onShow() {
if(this.AppletID>0){
if (this.AppletID > 0) {
this.userinfo(2);
if (this.mall_UserInfo) {
this.getUserPoint()
}
}
if(this.AppletID>0 && this.AppletID==8){//只有首店小程序的时候调取
this.getComponyStatus()//首店获取认证状态
if (this.AppletID > 0 && this.AppletID == 8) { //只有首店小程序的时候调取
this.getComponyStatus() //首店获取认证状态
}
let basedata =uni.getStorageSync("basedata")?uni.getStorageSync("basedata"):'';
this.isAttestationEdu = basedata.user_info.isAttestationEdu ? basedata.user_info.isAttestationEdu:0
let basedata = uni.getStorageSync("basedata") ? uni.getStorageSync("basedata") : '';
this.isAttestationEdu = basedata.user_info.isAttestationEdu ? basedata.user_info.isAttestationEdu : 0
},
methods: {
goHome() {
......@@ -874,54 +601,54 @@
}
break;
case "/pages/appointment/personal/studentAppointmentList":
if(this.meueData.user_center.is_point_status==1){
if (this.meueData.user_center.is_point_status == 1) {
flag = true;
}else{
} else {
flag = false;
}
break;
case "/pages/appointment/personal/teacherOrderList":
if(this.meueData.user_center.is_point_status==1 && this.mall_UserInfo.UserTeacher>0){
if (this.meueData.user_center.is_point_status == 1 && this.mall_UserInfo.UserTeacher > 0) {
flag = true;
}else{
} else {
flag = false;
}
break;
case "/pages/appointment/appointment?teacher=1":
if(this.meueData.user_center.is_point_status==1 && this.mall_UserInfo.UserTeacher>0){
if (this.meueData.user_center.is_point_status == 1 && this.mall_UserInfo.UserTeacher > 0) {
flag = true;
}else{
} else {
flag = false;
}
break;
case "/pages/coupon/cards/purchase":
if(this.IsDeposit == 1){
if (this.IsDeposit == 1) {
flag = true;
}else{
} else {
flag = false;
}
break;
break;
case "/pages/kotra/wish/list":
if(this.FirstShopType == 1 && this.companyStatus == 5){
if (this.FirstShopType == 1 && this.companyStatus == 5) {
flag = true;
}else{
} else {
flag = false;
}
break;
break;
case "/pages/kotra/enterpriseCertificationList":
if(IsAdmin == 1 ){
if (IsAdmin == 1) {
flag = true;
}else{
} else {
flag = false;
}
break;
break;
case "/pages/MallMange/index":
if(this.isMallAdmin == 1 ){
if (this.isMallAdmin == 1) {
flag = true;
}else{
} else {
flag = false;
}
break;
break;
}
return flag;
},
......@@ -934,18 +661,20 @@
},
res => {
uni.hideNavigationBarLoading();
console.log("res", res);
this.meueData = res.data.config;
this.user_info = res.data.user_info;
this.meueData.user_center.account.forEach(x => {
if (x.link_url == "/pages/coupon/index/index") {
this.couponsObj = x
}
})
if (this.meueData && this.meueData.user_center && this.meueData.user_center.account) {
this.meueData.user_center.account.forEach(x => {
if (x.link_url == "/pages/coupon/index/index") {
this.couponsObj = x
}
})
}
if (this.mall_UserInfo && type == 1) {
this.getLogin()
}
this.isloading= true
this.isloading = true
}
);
let u = uni.getStorageSync("mall_UserInfo");
......@@ -958,10 +687,11 @@
let pid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0;
let Up = uni.getStorageSync("Up") ? uni.getStorageSync("Up").Up : 0;
let SmallShopId = uni.getStorageSync("SmallShopId") ? uni.getStorageSync("SmallShopId").SmallShopId : 0;
let CounponPassword = uni.getStorageSync("CounponPassword") ? uni.getStorageSync("CounponPassword").CounponPassword : 0;
let CounponPassword = uni.getStorageSync("CounponPassword") ? uni.getStorageSync("CounponPassword").CounponPassword :
0;
let KeyWord = uni.getStorageSync("KeyWord") ? uni.getStorageSync("KeyWord").KeyWord : '';
let EduSchoolId = uni.getStorageSync("EduSchoolId") ? uni.getStorageSync("EduSchoolId").EduSchoolId : 0;
let EduId = uni.getStorageSync("jxhData")? uni.getStorageSync("jxhData").Id: 0;
let EduId = uni.getStorageSync("jxhData") ? uni.getStorageSync("jxhData").Id : 0;
that.request2({
url: '/api/AppletLogin/Login',
data: {
......@@ -973,10 +703,10 @@
SuperiorId: pid,
SmallShopId: SmallShopId,
UserPageType: Up,
CounponPassword:CounponPassword,
KeyWord:KeyWord,
EduSchoolId:EduSchoolId,
EduId:EduId,
CounponPassword: CounponPassword,
KeyWord: KeyWord,
EduSchoolId: EduSchoolId,
EduId: EduId,
}
},
res => {
......@@ -1002,10 +732,14 @@
}
);
},
getUserPoint(){
getUserPoint() {
this.request2({
url: '/api/AppletPoint/GetAppletUserPointDetailPageList',
data: {pageIndex:1,pageSize:10,Type:0}
data: {
pageIndex: 1,
pageSize: 10,
Type: 0
}
},
(res) => {
this.PointNum = res.data.pageData.PointNum;
......@@ -1044,73 +778,73 @@
scrollTopHandler() {
this.scrollTop = 0;
},
gopointBalance(){//跳转点数余额
gopointBalance() { //跳转点数余额
uni.navigateTo({
url: '/pages/appointment/personal/pointBalance'
});
},
// 获取公司认证信息
getComponyStatus(){
getComponyStatus() {
let that = this
let parms = {
url: "/api/AppletTrade/GetCommpanyStatus",
}
this.request2(parms, (res) => {
if (res.resultCode == 1&&res.data!=null) {
if (res.resultCode == 1 && res.data != null) {
// 获取公司名字和认证状态
that.companyStatus=res.data.CompanyStatus
that.companyName=res.data.CompanyName
that.companyStatus = res.data.CompanyStatus
that.companyName = res.data.CompanyName
this.FirstShopType = res.data.FirstShopType
}
})
},
//去认证页
goIdentification(){
goIdentification() {
uni.navigateTo({
url: '/pages/kotra/identification?editType=1'
url: '/pages/kotra/identification?editType=1'
})
},
scanCodeByCoffee(){
let that=this
scanCodeByCoffee() {
let that = this
uni.scanCode({
scanType: ['qrCode'],
success: function (res) {
let qrdata=JSON.parse(decodeURIComponent(res.result))
success: function(res) {
let qrdata = JSON.parse(decodeURIComponent(res.result))
console.log('条码类型：', qrdata)
that.setAdminVerificationCoffee(qrdata.UserId,qrdata.timestamp)
that.setAdminVerificationCoffee(qrdata.UserId, qrdata.timestamp)
},
fail:err=>{
fail: err => {
uni.showToast({
title:'扫码失败',
icon:'none',
duration:2000
title: '扫码失败',
icon: 'none',
duration: 2000
})
}
});
},
//核验咖啡券
setAdminVerificationCoffee(id,code){
setAdminVerificationCoffee(id, code) {
this.request2({
url: '/api/AppletCoffee/SetAdminVerificationCoffee',
data: {
UserId:id,
Code:code
UserId: id,
Code: code
}
},
res => {
if (res.resultCode == 1) {
if(res.data.State==1){
this.coffeeVerificationData=res.data
if (res.data.State == 1) {
this.coffeeVerificationData = res.data
console.log(this.coffeeVerificationData)
this.showCoffeeVerification=true
}else{
this.showCoffeeVerification = true
} else {
uni.showToast({
title:res.data.Msg,
icon:'none',
duration:2000
title: res.data.Msg,
icon: 'none',
duration: 2000
})
}
}
}
);
......@@ -1120,349 +854,355 @@
</script>
<style>
.body {
background: #f3f4f6;
height: 100vh;
}
.body {
background: #f3f4f6;
height: 100vh;
}
.userStyle .userBox {
display: flex;
flex-direction: column;
align-items: center;
background: #f3f4f6;
height: 100%;
}
.userStyle .inner-container::-webkit-scrollbar {
display: none;
}
.userStyle .imgbg {
width: 100%;
height: 310px;
display: flex;
flex-direction: column;
align-items: center;
position: relative;
}
.userStyle .headimg {
width: 140rpx;
height: 140rpx;
border-radius: 50%;
margin-left: 60rpx;
}
.userStyle .footprint {
width: 80%;
height: 140rpx;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-around;
}
.userStyle .footprint_item {
width: 200rpx;
height: 90rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
}
.userStyle .userBox {
display: flex;
flex-direction: column;
align-items: center;
background: #f3f4f6;
height: 100%;
}
.userStyle .inner-container::-webkit-scrollbar {
display: none;
}
.userStyle .footprint_item_bottom {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
}
.userStyle .imgbg {
width: 100%;
height: 310px;
display: flex;
flex-direction: column;
align-items: center;
position: relative;
}
.userStyle .account_bar {
width: 94%;
height: 110rpx;
border-radius: 10rpx;
background: #fff;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-around;
padding: 0 20rpx;
}
.userStyle .headimg {
width: 140rpx;
height: 140rpx;
border-radius: 50%;
margin-left: 60rpx;
}
.userStyle .account_bar_item {
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
border-right: 1px solid #d1d1d1;
width: 25%;
}
.userStyle .footprint {
width: 80%;
height: 140rpx;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-around;
}
.userStyle .account_bar_item:last-child {
border-right: 0;
}
.userStyle .footprint_item {
width: 200rpx;
height: 90rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
}
.userStyle .order_bar {
width: 94%;
border-radius: 10rpx;
background: #fff;
display: flex;
flex-direction: column;
align-items: center;
padding: 30rpx;
margin-top: 80rpx;
}
.userStyle .footprint_item_bottom {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
}
.userStyle .order_bar .order_bar_list {
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.userStyle .account_bar {
width: 94%;
height: 110rpx;
border-radius: 10rpx;
background: #fff;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-around;
padding: 0 20rpx;
}
.userStyle .order_bar_item {
display: flex;
flex-direction: column;
align-items: center;
margin-top: 20rpx;
position: relative;
}
.userStyle .account_bar_item {
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
border-right: 1px solid #d1d1d1;
width: 25%;
}
.userStyle .badge {
position: absolute;
right: -10rpx;
top: -10rpx;
padding: 0 12rpx;
display: flex;
align-items: center;
justify-content: center;
font-size: 20rpx;
color: #fff;
height: 30rpx;
border-radius: 15rpx;
}
.userStyle .account_bar_item:last-child {
border-right: 0;
}
.userStyle .menus {
width: 94%;
border-radius: 10rpx;
background: #fff;
display: flex;
flex-direction: row;
flex-wrap: wrap;
align-items: center;
margin-top: 30rpx;
}
.userStyle .order_bar {
width: 94%;
border-radius: 10rpx;
background: #fff;
display: flex;
flex-direction: column;
align-items: center;
padding: 30rpx;
margin-top: 80rpx;
}
.userStyle .menus2 {
width: 94%;
border-radius: 10rpx;
background: #fff;
display: flex;
flex-direction: column;
margin-top: 20rpx;
}
.userStyle .order_bar .order_bar_list {
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.userStyle .menus .menus_item {
width: 25%;
height: 110rpx;
margin: 20rpx 0 10rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-around;
position: relative;
}
.userStyle .order_bar_item {
display: flex;
flex-direction: column;
align-items: center;
margin-top: 20rpx;
position: relative;
}
.menus_item2 .contButton,
.menus_item .contButton {
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
opacity: 0;
}
.userStyle .badge {
position: absolute;
right: -10rpx;
top: -10rpx;
padding: 0 12rpx;
display: flex;
align-items: center;
justify-content: center;
font-size: 20rpx;
color: #fff;
height: 30rpx;
border-radius: 15rpx;
}
.userStyle .menus2 .menus_item2 {
width: 100%;
height: 90rpx;
display: flex;
flex-direction: row;
align-items: center;
margin-left: 30rpx;
position: relative;
}
.userStyle .menus {
width: 94%;
border-radius: 10rpx;
background: #fff;
display: flex;
flex-direction: row;
flex-wrap: wrap;
align-items: center;
margin-top: 30rpx;
}
.userStyle .copyright {
padding: 70rpx 0;
display: flex;
flex-direction: column;
align-items: center;
}
.userStyle .menus2 {
width: 94%;
border-radius: 10rpx;
background: #fff;
display: flex;
flex-direction: column;
margin-top: 20rpx;
}
.userStyle .ReceiptAdder {
position: absolute;
right: 0;
top: 160rpx;
width: 100px;
height: 24px;
border-top-left-radius: 12px;
border-bottom-left-radius: 12px;
display: flex;
flex-direction: row;
align-items: center;
padding: 0 20rpx;
background: rgba(55, 55, 55, 0.15);
}
.userStyle .menus .menus_item {
width: 25%;
height: 110rpx;
margin: 20rpx 0 10rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-around;
position: relative;
}
.userStyle .member {
background: #3b3641;
/* width: 80px; */
font-size: 10px;
color: #fff;
height: 18px;
border-radius: 9px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
margin-top: 10px;
}
.menus_item2 .contButton,
.menus_item .contButton {
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
opacity: 0;
}
.userStyle .titlenav {
width: 100%;
text-align: center;
font-size: 16px;
color: #ffffff;
}
.userStyle .menus2 .menus_item2 {
width: 100%;
height: 90rpx;
display: flex;
flex-direction: row;
align-items: center;
margin-left: 30rpx;
position: relative;
}
.userStyle .top_b {
width: 86%;
height: 65px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.userStyle .copyright {
padding: 70rpx 0;
display: flex;
flex-direction: column;
align-items: center;
}
.userStyle .top_b_item {
width: 26%;
height: 50px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
color: #ffffff;
font-size: 12px;
}
.userStyle .ReceiptAdder {
position: absolute;
right: 0;
top: 160rpx;
width: 100px;
height: 24px;
border-top-left-radius: 12px;
border-bottom-left-radius: 12px;
display: flex;
flex-direction: row;
align-items: center;
padding: 0 20rpx;
background: rgba(55, 55, 55, 0.15);
}
.userStyle .Receiptbalance {
width: 94%;
height: 62px;
position: absolute;
left: 3%;
bottom: -20px;
background: #ffffff;
border-radius: 6px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-around;
padding: 0 10px;
}
.userStyle .member {
background: #3b3641;
/* width: 80px; */
font-size: 10px;
color: #fff;
height: 18px;
border-radius: 9px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
margin-top: 10px;
}
.userStyle .Receiptbalance_item {
width: 40%;
height: 50px;
display: flex;
flex-direction: row;
align-items: center;
font-size: 12px;
color: #534d62;
}
.userStyle .titlenav {
width: 100%;
text-align: center;
font-size: 16px;
color: #ffffff;
}
.userStyle .headStatus {
overflow: hidden;
position: relative;
width: 140vw;
padding-right: 40vw;
padding-bottom: 10px;
position: fixed;
left: 0;
right: 0;
top: 0;
display: flex;
background-image: linear-gradient(to right, #6e75ea, #b984ec);
}
.userStyle .top_b {
width: 86%;
height: 65px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.userStyle .headStatus .arrow {
height: 24px;
margin: 5px 10px;
width: 24px;
}
.userStyle .top_b_item {
width: 26%;
height: 50px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
color: #ffffff;
font-size: 12px;
}
.userStyle .headStatus .title {
font-size: 18px;
color: #fff;
flex: 1;
width: 1px;
line-height: 34px;
text-align: center;
}
.userStyle .Receiptbalance {
width: 94%;
height: 62px;
position: absolute;
left: 3%;
bottom: -20px;
background: #ffffff;
border-radius: 6px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-around;
padding: 0 10px;
}
.dark .userStyle .headStatus .title {
color: #111 !important;
}
.userStyle .Receiptbalance_item {
width: 40%;
height: 50px;
display: flex;
flex-direction: row;
align-items: center;
font-size: 12px;
color: #534d62;
}
.dark .nickname {
color: #111 !important;
}
.userStyle .headStatus {
overflow: hidden;
position: relative;
width: 140vw;
padding-right: 40vw;
padding-bottom: 10px;
position: fixed;
left: 0;
right: 0;
top: 0;
display: flex;
background-image: linear-gradient(to right, #6e75ea, #b984ec);
}
.userStyle .topheard {
display: flex;
flex-direction: row;
align-items: center;
width: 100%;
margin-bottom: 20px;
}
.userStyle .headStatus .arrow {
height: 24px;
margin: 5px 10px;
width: 24px;
}
.userStyle .miniHeadTop {
height: 200px;
}
.userStyle .headStatus .title {
font-size: 18px;
color: #fff;
flex: 1;
width: 1px;
line-height: 34px;
text-align: center;
}
.userBox .headCommon {
width: 94%;
margin-top: 25px;
border-radius: 10px;
background-color: #fff;
}
.dark .userStyle .headStatus .title {
color: #111 !important;
}
.dark .nickname {
color: #111 !important;
}
.userStyle .topheard {
display: flex;
flex-direction: row;
align-items: center;
width: 100%;
margin-bottom: 20px;
}
.userBox .headHasTOP {
margin-top: 25px;
}
.userStyle .miniHeadTop {
height: 200px;
}
.userBox .paike {
margin-top: 15px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.userBox .headCommon {
width: 94%;
margin-top: 25px;
border-radius: 10px;
background-color: #fff;
}
.componyStatusBox .renzhen {
height: 15px;
font-size: 10px;
margin-top: 10px;
color: #555555;
border-radius: 7px;
border: 1px solid #999999;
display: flex;
align-items: center;
justify-content: center;
padding: 0 10rpx;
margin-left: 10rpx;
}
.userBox .headHasTOP {
margin-top: 25px;
}
.userBox .paike {
margin-top: 15px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.componyStatusBox .renzhen {
height: 15px;
font-size: 10px;
margin-top: 10px;
color: #555555;
border-radius: 7px;
border: 1px solid #999999;
display: flex;
align-items: center;
justify-content: center;
padding: 0 10rpx;
margin-left: 10rpx;
}
.componyStatusBox .companyName {
font-size: 26rpx;
font-weight: 500;
color: #888888;
/* background-color: #F6F6F6FF */
}
</style>
\ No newline at end of file
.componyStatusBox .companyName {
font-size: 26rpx;
font-weight: 500;
color: #888888;
/* background-color: #F6F6F6FF */
}
</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