Skip to content

M
mallapp
Commit 0c84d628 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent b2887f7f
Show whitespace changes
Inline Side-by-side
Showing with 779 additions and 864 deletions
pages/user-center/integral-detail/integral-detail.vue
View file @ 0c84d628
<template>
<view class="integralDStyle" :style="{ height: contentHeight }">
<u-tabs
:list="list"
:is-scroll="false"
:current="current"
@change="change"
:active-color="mainColor"
></u-tabs>
<u-tabs :list="list" :is-scroll="false" :current="current" @change="change" :active-color="mainColor"></u-tabs>
<u-empty v-if="g.length == 0" text="暂无积分明细" mode="list"></u-empty>
<view
v-if="g.length > 0"
style="
height: calc(100vh - 50px);
width: calc(100vw);
overflow: hidden;
"
>
<scroll-view
:scroll-y="true"
:enable-back-to-top="true"
:enable-flex="true"
@scrolltolower="lower"
:style="{ height: '100%' }"
>
<view v-if="g.length > 0" style="height: calc(100vh - 50px);width: calc(100vw);overflow: hidden; ">
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
<view class="interDList" v-for="(x, i) in g" :key="i">
<Text>{{x.Description}}</Text>
<view style="display: flex;align-items: center;justify-content: space-between;width: 100%;margin-top: 5px;">
......@@ -33,16 +11,8 @@
<Text style='font-size: 12px; color: #B5B5B5;'>时间：{{x.CreateDate}}</Text>
</view>
</view>
<u-loadmore
:status="status"
:load-text="loadText"
:font-size="24"
:margin-top="20"
:margin-bottom="20"
bg-color="#f3f4f6"
/>
<u-loadmore :status="status" :load-text="loadText" :font-size="24" :margin-top="20" :margin-bottom="20" bg-color="#f3f4f6" />
</scroll-view>
</view>
<!-- 加载中 -->
<view class="loading" v-if="loading">
......@@ -50,16 +20,14 @@
<Text style="color: #fff; margin-top: 10rpx;">加载中...</Text>
</view>
<!-- 取消提示 -->
<u-toast ref="uToast" />
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'gbAuth'></auth>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth='gbAuth'></auth>
</view>
</template>
<script>
import auth from "../../../components/auth/index.vue";
export default {
import auth from "../../../components/auth/index.vue";
export default {
components: {
auth
},
......@@ -67,19 +35,21 @@ export default {
return {
pageTitle: "积分明细",
current: 0,
list: [
{ name: "收入" },
{ name: "支出" },
list: [{
name: "收入"
},
{
name: "支出"
},
],
showAuth:false,
msg:{
showAuth: false,
msg: {
pageIndex: 1,
pageSize:10,
Type:0
pageSize: 10,
Type: 0
},
mainColor: "",
secondary:'',
secondary: '',
contentHeight: 0,
page: 1,
page_count: 1,
......@@ -102,9 +72,9 @@ export default {
mounted() {
let currentPages = getCurrentPages();
let u = "/" + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync("basedata")
? wx.getStorageSync("basedata").bar_title
: [];
let pages = wx.getStorageSync("basedata") ?
wx.getStorageSync("basedata").bar_title :
[];
pages.forEach((x) => {
if (x.value == u) {
this.pageTitle = x.new_name ? x.new_name : x.name;
......@@ -113,9 +83,8 @@ export default {
uni.setNavigationBarTitle({
title: this.pageTitle,
});
},
onLoad(){
onLoad() {
this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) {
this.u = {
......@@ -123,15 +92,13 @@ export default {
avatarUrl: ""
};
this.showAuth = true;
} else{
} else {
this.init();
}
},
methods: {
change(index) {
this.current = index;
this.msg.pageIndex = 1;
this.g = [];
this.loading = true;
......@@ -139,15 +106,13 @@ export default {
},
init() {
this.loading = true;
this.msg.Type = this.current+1
this.request2(
{
this.msg.Type = this.current + 1
this.request2({
url: '/api/AppletUser/GetMemberIntegralPageList',
data: this.msg
},
res => {
if(res.resultCode==1){
if (res.resultCode == 1) {
this.loading = false;
this.g = this.g.concat(res.data.pageData);
this.page_count = res.data.pageCount;
......@@ -164,30 +129,28 @@ export default {
this.status = "loading";
this.init();
} else {
this.status = "nomore";
}
},
reloadUserinfo() {
this.u = uni.getStorageSync("mall_UserInfo");
// this.showAuth=false;
this.init();
},
//关闭登录窗口
gbAuth(){
gbAuth() {
uni.navigateBack()
}
},
};
};
</script>
<style>
.integralDStyle {
.integralDStyle {
width: 100%;
height: 100%;
background: #f3f4f6;
}
}
.integralDStyle .loading {
.integralDStyle .loading {
width: 200rpx;
height: 200rpx;
background: #000000;
......@@ -202,14 +165,14 @@ export default {
top: 30%;
margin-left: -100rpx;
z-index: 999;
}
.integralDStyle .interDList{
width:100% ;
}
.integralDStyle .interDList {
width: 100%;
padding: 20px 15px;
display: flex;
flex-direction: column;
background: #fff;
border-top: 1px solid #f5f5f5;
}
}
</style>
pages/user-center/user-center.vue
View file @ 0c84d628
<template>
<scroll-view
:scroll-y="true"
@scroll="scrollHandler"
@scrolltoupper="scrollTopHandler"
style="height: 100vh;">
<scroll-view :scroll-y="true" @scroll="scrollHandler" @scrolltoupper="scrollTopHandler" style="height: 100vh;">
<view class="userStyle">
<view
class="headStatus"
v-if="scrollTop > 50"
:style="[
headStyle,
<view class="headStatus" v-if="scrollTop > 50" :style="[headStyle,
{
zIndex: scrollTop < 10 ? 'unset' : 2,
opacity: scrollTop < 10 ? '100' : scrollTop,
},
]"
>
<!-- <view class="arrow" >
<u-icon name="arrow-left" size="48" color="#FFF"></u-icon>
</view> -->
]">
<view class="title" v-if="scrollTop > 50">{{pageTitle}}</view>
</view>
<view class="userBox" :style="{ 'margin-bottom': bottommargin }">
<view
:style="{ 'background-image': 'url(' + (meueData.user_center.top_pic_url ? meueData.user_center.top_pic_url : '') + ')', backgroundSize: '100% 310px' }"
class="imgbg" :class="{'miniHeadTop':meueData.user_center.is_foot_bar_status!=1&&meueData.user_center.is_account_status!=1}"
>
<view :style="{ 'background-image': 'url(' + (meueData.user_center.top_pic_url ? meueData.user_center.top_pic_url : '') + ')', backgroundSize: '100% 310px' }"
class="imgbg" :class="{'miniHeadTop':meueData.user_center.is_foot_bar_status!=1&&meueData.user_center.is_account_status!=1}">
<view class="titlenav" :style="{paddingTop:nav}">{{pageTitle}}</view>
<view class='topheard' :style="{'margin-top':modelstype==0?'52px':(modelstype==1?'37px':(modelstype==2)?'33px':0) }" v-if="meueData.user_center.top_style == 1">
<view class='topheard' :style="{'margin-top':modelstype==0?'52px':(modelstype==1?'37px':(modelstype==2)?'33px':0) }"
v-if="meueData.user_center.top_style == 1">
<u-avatar :src="user_info.avatar" size="140" style="margin-left: 50rpx;"></u-avatar>
<view style="display: flex;flex-direction: column;justify-content: center;height: 50px;margin-left: 20rpx">
<Text style="color: #FFF;font-size: 36rpx;max-width: 200px;overflow: hidden;display: inline-block;white-space: nowrap; text-overflow:ellipsis;"
......@@ -37,9 +24,7 @@
<Text style="margin-right: 10px;">{{ user_info.identity.level_name != null ? user_info.identity.level_name : '普通用户' }}</Text>
</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" size="120"></u-avatar>
<Text style="color: #FFF;font-size: 36rpx;" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text>
......@@ -61,25 +46,24 @@
<text style="font-size: 21px;">{{user_info.coupon?user_info.coupon:0}}</text>
<text>{{couponsObj.name}}</text>
</view>
</view>
<view class="ReceiptAdder" v-if="IsEducation!=1" @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="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 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;'>{{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="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 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="margin-left: 15px;display: flex;flex-direction: column;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>
......@@ -87,85 +71,86 @@
</view>
</view>
</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>
<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 }">
<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="item.link_url == '/pages/order/index/index?status=2' && user_info.MyOrder.WaitSendGoods > 0" class="badge" :style="{ background: mainColor }">
<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="item.link_url == '/pages/order/index/index?status=3' && user_info.MyOrder.WaitReceiving > 0" class="badge" :style="{ background: mainColor }">
<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="item.link_url == '/pages/order/order-commit' && user_info.MyOrder.WaitCommentNum > 0" class="badge" :style="{ background: mainColor }">
<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="item.link_url == '/pages/order/after-sale/refunds-list' && user_info.MyOrder.AfterSaleNum > 0" class="badge" :style="{ background: mainColor }">
<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>
<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 }">
<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="item.link_url == '/pages/guidecar/orderList?status=2' && user_info.MyGuideCarOrder.WaitSendGoods > 0" class="badge" :style="{ background: mainColor }">
<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="item.link_url == '/pages/guidecar/orderList?status=3' && user_info.MyGuideCarOrder.WaitReceiving > 0" class="badge" :style="{ background: mainColor }">
<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="item.link_url == '/pages/guidecar/orderList?status=4' && user_info.MyGuideCarOrder.Completed > 0" class="badge" :style="{ background: mainColor }">
<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="item.link_url == '/pages/guidecar/order-commit' && user_info.MyGuideCarOrder.GuideCarWaitCommentNum > 0" class="badge" :style="{ background: mainColor }">
<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="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':''}" class="headCommon">
<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">
<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':'12px',height: 'auto'}" mode="widthFix"
></image>
<Text
:style="{ 'margin-top': mItem.MenuNavStyle == 1 ? '10rpx' : '0rpx', 'margin-left': mItem.MenuNavStyle == 1 ? '0rpx' : '10rpx' }"
>
<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':'12px',height: 'auto'}" mode="widthFix"></image>
<Text :style="{ 'margin-top': mItem.MenuNavStyle == 1 ? '10rpx' : '0rpx', 'margin-left': mItem.MenuNavStyle == 1 ? '0rpx' : '10rpx' }">
{{ item.name }}
</Text>
<button open-type="contact" class="contButton" v-if="item.link_url == 'contact' && item.name == '客服'"></button>
......@@ -173,32 +158,6 @@
</view>
</view>
</template>
<!-- <view :class="meueData.user_center.menu_style == 1 ? 'menus2' : 'menus'" v-if="meueData.user_center&& meueData.user_center.is_menu_status == 1" style="margin-bottom: 50px;">
<view
:class="meueData.user_center.menu_style == 1 ? 'menus_item2' : 'menus_item'"
v-for="(item, index) in meueData.user_center.menus"
:key="index"
:name="item.name"
@click="goUrl(item.link_url)"
v-if="pandu(item)"
>
<image :src="item.icon_url" :style="{width:meueData.user_center.menu_style == 1 ?'12px':'20px',height: 'auto'}" mode="widthFix"
></image>
<Text
:style="{ 'margin-top': meueData.user_center.menu_style == 1 ? '0rpx' : '10rpx', 'margin-left': meueData.user_center.menu_style == 1 ? '10rpx' : '0rpx' }"
>
{{ item.name }}
</Text>
<button open-type="contact" class="contButton" v-if="item.link_url == 'contact' && item.name == '客服'"></button>
</view>
</view> -->
<!-- <view class="copyright">
<image :src="meueData.user_center.copyright.pic_url" mode="widthFix" style="width: 95px;"></image>
<Text style="margin-top: 10rpx;color: #666666;">{{ meueData.user_center.copyright.description }}</Text>
</view> -->
</view>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
<tabbars></tabbars>
......@@ -207,10 +166,9 @@
</template>
<script>
import tabbars from '@/components/tabbar/index';
import auth from '../../components/auth/index.vue';
export default {
import tabbars from '@/components/tabbar/index';
import auth from '../../components/auth/index.vue';
export default {
data() {
return {
isloading: true,
......@@ -228,13 +186,13 @@ export default {
secondary: '',
u: {},
is_icon_members_grade: 0,
nav:0,
scrollTop:0,
couponsObj:{},
modelstype:0,//机型类型
shopBasics:{},
mall_UserInfo:{},
IsEducation:0,//1是0否是网课模式
nav: 0,
scrollTop: 0,
couponsObj: {},
modelstype: 0, //机型类型
shopBasics: {},
mall_UserInfo: {},
IsEducation: 0, //1是0否是网课模式
};
},
components: {
......@@ -244,18 +202,19 @@ export default {
created() {
this.mainColor = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary;
this.IsEducation = uni.getStorageSync('basedata')
? (uni.getStorageSync('basedata').mall.setting.mallStyle.IsEducation?uni.getStorageSync('basedata').mall.setting.mallStyle.IsEducation:0)
:0;
this.IsEducation = uni.getStorageSync('basedata') ?
(uni.getStorageSync('basedata').mall.setting.mallStyle.IsEducation ? uni.getStorageSync('basedata').mall.setting.mallStyle
.IsEducation : 0) :
0;
this.userinfo();
},
onLoad() {
this.navHeight = this.$navHeight - 2;
this.u = wx.getStorageSync('basedata').user_info;
this.mall_UserInfo = uni.getStorageSync("mall_UserInfo");
this.nav = uni.getMenuButtonBoundingClientRect().top+'px';
this.nav = uni.getMenuButtonBoundingClientRect().top + 'px';
this.headStyle.background = `linear-gradient(to right, '#6E75EA',80%, '#B984EC')`;
this.headStyle.paddingTop = this.nav ;
this.headStyle.paddingTop = this.nav;
if (!this.mall_UserInfo) {
this.showAuth = true;
}
......@@ -266,82 +225,63 @@ export default {
this.bottommargin = c - 2 + 'px';
this.listbottom = c - 2 + 50 + 'px';
this.contentHeight = this.$utils.calcContentHeight(c);
if(this.contentHeight>690 && this.contentHeight<776){
this.modelstype=1
}else if(this.contentHeight>=776){
this.modelstype=2
if (this.contentHeight > 690 && this.contentHeight < 776) {
this.modelstype = 1
} else if (this.contentHeight >= 776) {
this.modelstype = 2
}
this.is_icon_members_grade = uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').mall.setting.is_icon_members_grade : 0;
this.is_icon_members_grade = uni.getStorageSync('basedata') ? uni.getStorageSync('basedata').mall.setting.is_icon_members_grade :
0;
let u = '/' + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync('basedata') ? wx.getStorageSync('basedata').bar_title : [];
// pages.forEach(x => {
// if (x.value == u) {
// this.pageTitle = x.new_name ? x.new_name : x.name;
// }
// });
uni.setNavigationBarTitle({
title: '用户中心'
});
},
onShow() {
this.userinfo(2);
},
methods: {
goHome() {
uni.redirectTo({ url: '/pages/index/main' });
uni.redirectTo({
url: '/pages/index/main'
});
},
pandu(item){
let flag=true;
let IsOpen = this.shopBasics.model&&this.shopBasics.model.IsOpen?this.shopBasics.model.IsOpen:1;
let SmallShopId = this.mall_UserInfo.SmallShopId?this.mall_UserInfo.SmallShopId:0;
let UserSmallShopId = this.mall_UserInfo.UserSmallShopId?this.mall_UserInfo.UserSmallShopId:0;
switch(item.link_url)
{
case "/pages/share/index/index" :
if(this.user_info.isShowDistributionCenter == 1)
{
flag=true;
}
else{
flag=false;
pandu(item) {
let flag = true;
let IsOpen = this.shopBasics.model && this.shopBasics.model.IsOpen ? this.shopBasics.model.IsOpen : 1;
let SmallShopId = this.mall_UserInfo.SmallShopId ? this.mall_UserInfo.SmallShopId : 0;
let UserSmallShopId = this.mall_UserInfo.UserSmallShopId ? this.mall_UserInfo.UserSmallShopId : 0;
switch (item.link_url) {
case "/pages/share/index/index":
if (this.user_info.isShowDistributionCenter == 1) {
flag = true;
} else {
flag = false;
}
break;
case "/pages/microShop/index/index":
//开启
if(IsOpen==2)
{
// if(SmallShopId==0 && UserSmallShopId!=0)
// {
// flag=false;
// }
// else{
// flag=true;
// }
flag=true;
if (IsOpen == 2) {
flag = true;
}
//关闭
else{
if(SmallShopId!=0 || UserSmallShopId!=0 )
{
flag=true;
}
else{
flag=false;
else {
if (SmallShopId != 0 || UserSmallShopId != 0) {
flag = true;
} else {
flag = false;
}
}
break;
}
return flag;
},
//获取菜单配置
userinfo(type=1) {
userinfo(type = 1) {
uni.showNavigationBarLoading();
this.request2(
{
this.request2({
url: '/api/Mall/GetUserCenter',
data: {}
},
......@@ -349,30 +289,27 @@ export default {
uni.hideNavigationBarLoading();
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.meueData.user_center.account.forEach(x => {
if (x.link_url == "/pages/coupon/index/index") {
this.couponsObj = x
}
})
if(this.mall_UserInfo&& type==1){
if (this.mall_UserInfo && type == 1) {
this.getLogin()
}
}
);
let u = uni.getStorageSync("mall_UserInfo");
if(u&& type==1){
if (u && type == 1) {
this.getMicroShopBasics()
}
},
getLogin() {
var that = this;
let pid = uni.getStorageSync("pid")?uni.getStorageSync("pid").pid:0;
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;
that.request2(
{
let SmallShopId = uni.getStorageSync("SmallShopId") ? uni.getStorageSync("SmallShopId").SmallShopId : 0;
that.request2({
url: '/api/AppletLogin/Login',
data: {
Source: 1,
......@@ -381,7 +318,7 @@ export default {
Photo: this.mall_UserInfo.Photo,
Moblie: '',
SuperiorId: pid,
SmallShopId:SmallShopId,
SmallShopId: SmallShopId,
UserPageType: Up,
}
},
......@@ -395,16 +332,13 @@ export default {
}
);
},
getMicroShopBasics(){
this.request2(
{
getMicroShopBasics() {
this.request2({
url: '/api/AppletUser/GetMicroShopBasics',
data: {}
},
(res) => {
this.shopBasics = res.data;
}
);
},
......@@ -422,8 +356,7 @@ export default {
reloadUserinfo() {
this.userinfo();
this.u = this.user_info;
this.mall_UserInfo = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo"):{};
// this.showAuth = false;
this.mall_UserInfo = uni.getStorageSync("mall_UserInfo") ? uni.getStorageSync("mall_UserInfo") : {};
},
login(name) {
if ((name && name.nickname == '') || !name || !name.nickname) {
......@@ -436,29 +369,29 @@ export default {
},
scrollHandler(e) {
this.scrollTop = e.detail.scrollTop;
//this.$forceUpdate();
},
scrollTopHandler() {
this.scrollTop = 0;
},
}
};
};
</script>
<style>
.body {
.body {
background: #f3f4f6;
}
.userStyle .userBox {
}
.userStyle .userBox {
height: 100%;
display: flex;
flex-direction: column;
align-items: center;
background: #f3f4f6;
min-height: 100vh;
}
.userStyle .imgbg {
}
.userStyle .imgbg {
width: 100%;
height: 310px;
display: flex;
......@@ -466,36 +399,41 @@ export default {
align-items: center;
position: relative;
}
.userStyle .headimg {
}
.userStyle .headimg {
width: 140rpx;
height: 140rpx;
border-radius: 50%;
margin-left: 60rpx;
}
.userStyle .footprint {
}
.userStyle .footprint {
width: 80%;
height: 140rpx;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-around;
}
.userStyle .footprint_item {
}
.userStyle .footprint_item {
width: 200rpx;
height: 90rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
}
.userStyle .footprint_item_bottom {
}
.userStyle .footprint_item_bottom {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
}
.userStyle .account_bar {
}
.userStyle .account_bar {
width: 94%;
height: 110rpx;
border-radius: 10rpx;
......@@ -505,19 +443,22 @@ export default {
align-items: center;
justify-content: space-around;
padding: 0 20rpx;
}
.userStyle .account_bar_item {
}
.userStyle .account_bar_item {
display: flex;
flex-direction: column;
align-items: center;
justify-content: space-between;
border-right: 1px solid #d1d1d1;
width: 25%;
}
.userStyle .account_bar_item:last-child {
}
.userStyle .account_bar_item:last-child {
border-right: 0;
}
.userStyle .order_bar {
}
.userStyle .order_bar {
width: 94%;
border-radius: 10rpx;
background: #fff;
......@@ -526,22 +467,25 @@ export default {
align-items: center;
padding: 30rpx;
margin-top: 80rpx;
}
.userStyle .order_bar .order_bar_list {
}
.userStyle .order_bar .order_bar_list {
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.userStyle .order_bar_item {
}
.userStyle .order_bar_item {
display: flex;
flex-direction: column;
align-items: center;
margin-top: 20rpx;
position: relative;
}
.userStyle .badge {
}
.userStyle .badge {
position: absolute;
right: -10rpx;
top: -10rpx;
......@@ -553,8 +497,9 @@ export default {
color: #fff;
height: 30rpx;
border-radius: 15rpx;
}
.userStyle .menus {
}
.userStyle .menus {
width: 94%;
border-radius: 10rpx;
background: #fff;
......@@ -563,17 +508,18 @@ export default {
flex-wrap: wrap;
align-items: center;
margin-top: 30rpx;
}
.userStyle .menus2 {
}
.userStyle .menus2 {
width: 94%;
border-radius: 10rpx;
background: #fff;
display: flex;
flex-direction: column;
margin-top: 20rpx;
/* margin-bottom: 20px; */
}
.userStyle .menus .menus_item {
}
.userStyle .menus .menus_item {
width: 25%;
height: 110rpx;
margin: 20rpx 0 10rpx;
......@@ -582,17 +528,19 @@ export default {
align-items: center;
justify-content: space-around;
position: relative;
}
.menus_item2 .contButton,
.menus_item .contButton {
}
.menus_item2 .contButton,
.menus_item .contButton {
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
opacity: 0;
}
.userStyle .menus2 .menus_item2 {
}
.userStyle .menus2 .menus_item2 {
width: 100%;
height: 90rpx;
display: flex;
......@@ -600,14 +548,16 @@ export default {
align-items: center;
margin-left: 30rpx;
position: relative;
}
.userStyle .copyright {
}
.userStyle .copyright {
padding: 70rpx 0;
display: flex;
flex-direction: column;
align-items: center;
}
.userStyle .ReceiptAdder {
}
.userStyle .ReceiptAdder {
position: absolute;
right: 0;
top: 160rpx;
......@@ -620,8 +570,9 @@ export default {
align-items: center;
padding: 0 20rpx;
background: rgba(55, 55, 55, 0.15)
}
.userStyle .member {
}
.userStyle .member {
background: #3b3641;
width: 80px;
font-size: 10px;
......@@ -633,20 +584,25 @@ export default {
align-items: center;
justify-content: space-between;
margin-top: 10px;
}
.userStyle .titlenav{
width: 100%;text-align: center;font-size: 16px;color: #FFFFFF;
}
.userStyle .top_b{
}
.userStyle .titlenav {
width: 100%;
text-align: center;
font-size: 16px;
color: #FFFFFF;
}
.userStyle .top_b {
width: 86%;
height: 65px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
/* margin-top: 20px; */
}
.userStyle .top_b_item{
}
.userStyle .top_b_item {
width: 26%;
height: 50px;
display: flex;
......@@ -655,8 +611,9 @@ export default {
justify-content: space-between;
color: #FFFFFF;
font-size: 12px;
}
.userStyle .Receiptbalance{
}
.userStyle .Receiptbalance {
width: 94%;
height: 62px;
position: absolute;
......@@ -669,8 +626,9 @@ export default {
align-items: center;
justify-content: space-around;
padding: 0 10px;
}
.userStyle .Receiptbalance_item{
}
.userStyle .Receiptbalance_item {
width: 40%;
height: 50px;
display: flex;
......@@ -679,8 +637,9 @@ export default {
font-size: 12px;
color: #534D62;
}
.userStyle .headStatus {
}
.userStyle .headStatus {
overflow: hidden;
position: relative;
width: 140vw;
......@@ -691,41 +650,47 @@ export default {
right: 0;
top: 0;
display: flex;
background-image: linear-gradient(
to right,
background-image: linear-gradient(to right,
#6E75EA,
#B984EC
);
#B984EC);
}
}
.userStyle .headStatus .arrow {
.userStyle .headStatus .arrow {
height: 24px;
margin: 5px 10px;
width: 24px;
}
.userStyle .headStatus .title {
}
.userStyle .headStatus .title {
font-size: 18px;
color: #fff;
flex: 1;
width: 1px;
/* margin-left: 10px; */
line-height: 34px;
text-align: center;
}
.userStyle .topheard{
display: flex;flex-direction: row;align-items: center;width: 100%;
}
.userStyle .topheard {
display: flex;
flex-direction: row;
align-items: center;
width: 100%;
margin-bottom: 20px;
}
.userStyle .miniHeadTop{
height:200px;
}
.userBox .headCommon{
width:94%;
margin-top:25px;
}
.userStyle .miniHeadTop {
height: 200px;
}
.userBox .headCommon {
width: 94%;
margin-top: 25px;
border-radius: 10px;
background-color: #fff;
}
.userBox .headHasTOP{
margin-top:25px;
}
}
.userBox .headHasTOP {
margin-top: 25px;
}
</style>
\ No newline at end of file
pages/video/index.vue
View file @ 0c84d628
......@@ -197,7 +197,7 @@
return {
vlist: [],
videoIndex: 0,
swiperHeight: 0,//高度
swiperHeight: 0, //高度
GoodsId: 0, //商品id
nav: 0,
goodObj: {}, //商品对象
......@@ -214,7 +214,7 @@
comGoodImg: '', //商品缩小图
comGoodTitle: '', //商品名称
comGoodPrice: '', //商品价格
showSku: false,//是否显示商品SKU
showSku: false, //是否显示商品SKU
sku: {},
showAuth: false,
u: {},
......@@ -234,10 +234,8 @@
this.GoodsId = option.GoodsId;
this.sysheight = uni.getSystemInfoSync().windowHeight;
this.swiperHeight = `${this.sysheight}px`;
this.videoIndex=0; //默认加载第一条
this.videoIndex = 0; //默认加载第一条
this.vlist = [];
wx.showShareMenu({
withShareTicket: true,
menus: ["shareAppMessage", "shareTimeline"],
......@@ -245,12 +243,11 @@
},
methods: {
//获取商品视频
getVideoHeight(type)
{
getVideoHeight(type) {
//视频填充方式(0默认，1-填充)
if(type==0){
if (type == 0) {
return 'contain'
}else{
} else {
return 'fill'
}
},
......@@ -273,14 +270,11 @@
this.videoContextList[curIndex].seek(0)
this.isPlay = true
this.videoIndex = curIndex;
this.comGoodImg = this.vlist[curIndex].picUrl;
this.comGoodTitle = this.vlist[curIndex].name;
this.comGoodPrice = this.vlist[curIndex].price;
this.GoodsId = this.vlist[curIndex].id;
this.sku = this.vlist[curIndex];
let xz = this.vlist.length - e.detail.current;
if (xz == 1) {
this.msg.pageIndex++;
......@@ -355,7 +349,7 @@
picUrl: data[0].cover_pic,
price: this.goodObj.price,
video_url: data[0].video_url,
VideoType:data[0].video_type
VideoType: data[0].video_type
}
this.vlist.push(obj);
this.videoContextList = []
......@@ -405,32 +399,30 @@
setTimeout(() => {
this.getReceive();
}, 2500);
let uid = uni.getStorageSync("mall_UserInfo")
? uni.getStorageSync("mall_UserInfo").UserId
: 0;
if(uid==0){
uid = uni.getStorageSync("pid")?uni.getStorageSync("pid").pid:0
}
let SmallShopId = uni.getStorageSync("mall_UserInfo")
? uni.getStorageSync("mall_UserInfo").SmallShopId
: 0;
if(SmallShopId == 0){//如果微店id为0 去找所属微店id
SmallShopId = uni.getStorageSync("mall_UserInfo")
? uni.getStorageSync("mall_UserInfo").UserSmallShopId
: 0;
let uid = uni.getStorageSync("mall_UserInfo") ?
uni.getStorageSync("mall_UserInfo").UserId :
0;
if (uid == 0) {
uid = uni.getStorageSync("pid") ? uni.getStorageSync("pid").pid : 0
}
let SmallShopId = uni.getStorageSync("mall_UserInfo") ?
uni.getStorageSync("mall_UserInfo").SmallShopId :
0;
if (SmallShopId == 0) { //如果微店id为0 去找所属微店id
SmallShopId = uni.getStorageSync("mall_UserInfo") ?
uni.getStorageSync("mall_UserInfo").UserSmallShopId :
0;
}
return {
title: this.comGoodTitle,
query: "GoodsId=" + this.GoodsId + "&user_id=" + uid+ "&SmallShopId=" + SmallShopId,
query: "GoodsId=" + this.GoodsId + "&user_id=" + uid + "&SmallShopId=" + SmallShopId,
imageUrl: this.comGoodImg,
};
},
//点击商品
getShowInfo() {
this.isShowInfo = !this.isShowInfo;
}
},
mounted() {},
created() {
......@@ -438,7 +430,3 @@
},
}
</script>
\ No newline at end of file
<style>
</style>
pages/webbox/webbox.vue
View file @ 0c84d628
<template>
<web-view :src="url"></web-view>
</template>
<script>
export default {
export default {
data() {
return {
url:""
url: ""
}
},
onLoad: function (option) { //option为object类型，会序列化上个页面传递的参数
this.url=decodeURIComponent(option.u)
onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
this.url = decodeURIComponent(option.u)
}
}
}
</script>
<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