Skip to content

M
mallapp
Commit 9f0b0bf4 authored by Mac's avatar Mac
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

parents 37edee7d d4ccb07b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4227 additions and 4692 deletions
pages/pintuan/index.vue
View file @ 9f0b0bf4
<template> <template>
<view> <view>
<view :style="{ height: contentHeight + 'px' }" style="voerflow: hidden; overflow-y: auto;"> <view :style="{ height: contentHeight + 'px' }" style="voerflow: hidden; overflow-y: auto;">
<view class="head-pin-box"> <view class="head-pin-box">
<view class="left"> <view class="left">
<image <image src="../../static/images/icon/search.png" mode="widthfix" style="width:20px;height:20px;" />
src="../../static/images/icon/search.png" </view>
mode="widthfix" <view class="middle"></view>
style="width:20px;height:20px;" <view class="right">
/> <u-tabs name="name" :list="myPageData.home_pages.navs" :is-scroll="true" :active-color="mainColor" :current="active"
</view> :bar-width="80" :font-size="32" :bold="false" @change="changeHandler"></u-tabs>
<view class="middle"></view> </view>
<view class="right"> </view>
<u-tabs </view>
name="name" <tabbars></tabbars>
:list="myPageData.home_pages.navs" </view>
:is-scroll="true"
:active-color="mainColor"
:current="active"
:bar-width="80"
:font-size="32"
:bold="false"
@change="changeHandler"
></u-tabs>
</view>
</view>
</view>
<tabbars></tabbars>
</view>
</template> </template>
<script> <script>
import tabbars from "@/components/tabbar/index"; import tabbars from "@/components/tabbar/index";
export default { export default {
components: { components: {
tabbars, tabbars,
}, },
data() { data() {
return { return {
contentHeight: 0, contentHeight: 0,
pageTitle: "拼团", pageTitle: "拼团",
advertisement:{}, advertisement: {},
banners:[] banners: []
}; };
}, },
mounted() { mounted() {
let currentPages = getCurrentPages(); let currentPages = getCurrentPages();
let c = this.$uiConfig.is_bang ? 80 : 52; let c = this.$uiConfig.is_bang ? 80 : 52;
this.contentHeight = this.$utils.calcContentHeight(c); this.contentHeight = this.$utils.calcContentHeight(c);
console.log(this.contentHeight); console.log(this.contentHeight);
let u = "/" + currentPages[currentPages.length - 1].route; let u = "/" + currentPages[currentPages.length - 1].route;
let pages = uni.getStorageSync("basedata") let pages = uni.getStorageSync("basedata") ?
? uni.getStorageSync("basedata").bar_title uni.getStorageSync("basedata").bar_title :
: []; [];
pages.forEach((x) => { pages.forEach((x) => {
if (x.value == u) { if (x.value == u) {
this.pageTitle = x.new_name ? x.new_name : x.name; this.pageTitle = x.new_name ? x.new_name : x.name;
} }
}); });
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: this.pageTitle, title: this.pageTitle,
}); });
// this.init(); uni.showNavigationBarLoading();
// this.getStyle(); },
uni.showNavigationBarLoading(); methods: {
}, init() {
methods: { let h = this.apiheader();
init() { this.request({
let h = this.apiheader(); url: "",
this.request( header: h,
{ data: {
url: "", r: "plugin/pintuan/api/v2/index/index",
header: h, status: this.current + 1,
data: { page: this.page,
r: "plugin/pintuan/api/v2/index/index", },
status: this.current + 1, },
page: this.page, (res) => {
}, this.loading = false;
}, if (res.data.list.length > 0) {
(res) => { this.g = this.g.concat(res.data.list);
this.loading = false; }
if (res.data.list.length > 0) { }
this.g = this.g.concat(res.data.list); );
} },
} },
); };
},
},
};
</script> </script>
<style> <style>
.head-pin-box { .head-pin-box {
height: 80rpx; height: 80rpx;
display: flex; display: flex;
align-items: center; align-items: center;
padding: 0 20rpx; padding: 0 20rpx;
} }
.head-pin-box .left {
height: 100%;
width: 90rpx;
display: flex; .head-pin-box .left {
align-items: center; height: 100%;
justify-content: center; width: 90rpx;
} display: flex;
.head-pin-box .middle { align-items: center;
width: 2rpx; justify-content: center;
background: #ddd; }
height: 45rpx;
margin: 0 20rpx; .head-pin-box .middle {
} width: 2rpx;
.head-pin-box .right { background: #ddd;
height: 100%; height: 45rpx;
flex: 1; margin: 0 20rpx;
} }
</style>
\ No newline at end of file .head-pin-box .right {
height: 100%;
flex: 1;
}
</style>
pages/pintuan/tuangood.vue
View file @ 9f0b0bf4
This diff is collapsed.
pages/search/search.vue
View file @ 9f0b0bf4
This diff is collapsed.
pages/share-money/share-money.vue
View file @ 9f0b0bf4
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
<view class="kti" style="height: 50px;"> <view class="kti" style="height: 50px;">
<Text>可提现金佣金</Text> <Text>可提现金佣金</Text>
<Text class='moneytext'>{{money.CommissionInfo.CommissionWithdrawal}}元</Text> <Text class='moneytext'>{{money.CommissionInfo.CommissionWithdrawal}}元</Text>
</view> </view>
<view class="ofmoney"> <view class="ofmoney">
<view class="ofmoneyitem" style="border-bottom: 1px solid #f5f5f5;"> <view class="ofmoneyitem" style="border-bottom: 1px solid #f5f5f5;">
...@@ -28,17 +27,15 @@ ...@@ -28,17 +27,15 @@
<view class="kti" style="margin-top: 15px"> <view class="kti" style="margin-top: 15px">
<!-- <Text>用户须知</Text> --> <!-- <Text>用户须知</Text> -->
<u-collapse style='width: 100%;'> <u-collapse style='width: 100%;'>
<u-collapse-item :title="money.CustomModel.UserNotesName" > <u-collapse-item :title="money.CustomModel.UserNotesName">
<Text>{{money.CustomModel.UserNotes}} </Text> <Text>{{money.CustomModel.UserNotes}} </Text>
</u-collapse-item> </u-collapse-item>
</u-collapse> </u-collapse>
</view> </view>
<View class='getapply' :style="{background:mainColor}" @click='tixian'> <View class='getapply' :style="{background:mainColor}" @click='tixian'>
<Text>{{money.CustomModel.IWantToWithdrawName}}</Text> <Text>{{money.CustomModel.IWantToWithdrawName}}</Text>
</View> </View>
</view> </view>
</view> </view>
</template> </template>
...@@ -47,60 +44,55 @@ ...@@ -47,60 +44,55 @@
data() { data() {
return { return {
pageTitle: "分销佣金", pageTitle: "分销佣金",
contentHeight:0, contentHeight: 0,
mainColor:'', mainColor: '',
secondary:'', secondary: '',
money:{}, money: {},
} }
}, },
created(){ created() {
this.contentHeight = this.$utils.calcContentHeight(-40)+'px'; this.contentHeight = this.$utils.calcContentHeight(-40) + 'px';
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary; this.secondary = this.$uiConfig.secondary;
this.init() this.init()
}, },
mounted() { mounted() {
let currentPages = getCurrentPages(); let currentPages = getCurrentPages();
let u = "/" + currentPages[currentPages.length-1].route; let u = "/" + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync("basedata") let pages = wx.getStorageSync("basedata") ?
? wx.getStorageSync("basedata").bar_title wx.getStorageSync("basedata").bar_title :
: []; [];
pages.forEach((x) => { pages.forEach((x) => {
if (x.value == u) { if (x.value == u) {
this.pageTitle = x.new_name ? x.new_name : x.name; this.pageTitle = x.new_name ? x.new_name : x.name;
} }
}); });
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: this.pageTitle, title: this.pageTitle,
}); });
}, },
methods: { methods: {
init(){ init() {
uni.showNavigationBarLoading(); uni.showNavigationBarLoading();
this.request2({
this.request2( url: '/api/AppletUser/GetUserDistrbutorCommissionInfo',
{ data: {}
url: '/api/AppletUser/GetUserDistrbutorCommissionInfo', },
data: {} (res) => {
}, uni.hideNavigationBarLoading()
(res) => { this.money = res.data
uni.hideNavigationBarLoading() }
this.money = res.data
}
); );
}, },
tixian() {
tixian(){
let amount = this.money.money let amount = this.money.money
uni.navigateTo({ uni.navigateTo({
url: '/pages/share/cash/cash?u='+ amount url: '/pages/share/cash/cash?u=' + amount
}); });
}, },
gocash(){ gocash() {
uni.navigateTo({ uni.navigateTo({
url: '/pages/cash-detail/cash-detail' url: '/pages/cash-detail/cash-detail'
}); });
} }
} }
...@@ -108,79 +100,84 @@ ...@@ -108,79 +100,84 @@
</script> </script>
<style> <style>
.shareMoneyStyle{ .shareMoneyStyle {
background: #f3f4f6; background: #f3f4f6;
}
}
.shareMoneyStyle .box{ .shareMoneyStyle .box {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
.shareMoneyStyle .getapply {
width: 94%;
height: 45px;
border-radius: 22.5px;
display: flex;
align-items: center;
justify-content: center;
color: #fff;
margin-top: 20px;
}
.shareMoneyStyle .box_top {
width: 100%;
padding: 15px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.shareMoneyStyle .box_top .box_tl {
display: flex;
flex-direction: column;
justify-content: space-between;
height: 60px;
color: #fff;
}
.shareMoneyStyle .box_top .box_tr {
width: 90px;
height: 26px;
border: 1px solid #fff;
color: #fff;
border-radius: 13px;
display: flex;
align-items: center;
justify-content: center;
}
.shareMoneyStyle .kti {
background: #fff;
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
padding: 0 15px;
}
.shareMoneyStyle .getapply{ .shareMoneyStyle .moneytext {
width: 94%; font-size: 16px;
height: 45px; color: #666666;
border-radius: 22.5px; }
display: flex;
align-items: center; .shareMoneyStyle .ofmoney {
justify-content: center; width: 100%;
color: #fff; padding: 0 15px;
margin-top: 20px; background: #fff;
} margin-top: 15px;
.shareMoneyStyle .box_top{ }
width: 100%;
padding: 15px; .shareMoneyStyle .ofmoneyitem {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; width: 100%;
} height: 50px;
.shareMoneyStyle .box_top .box_tl{ justify-content: space-between;
display: flex; }
flex-direction: column; </style>
justify-content: space-between; \ No newline at end of file
height: 60px;
color: #fff;
}
.shareMoneyStyle .box_top .box_tr{
width: 90px;
height: 26px;
border: 1px solid #fff;
color: #fff;
border-radius: 13px;
display: flex;
align-items: center;
justify-content: center;
}
.shareMoneyStyle .kti{
background: #fff;
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
padding: 0 15px;
}
.shareMoneyStyle .moneytext{
font-size: 16px;
color: #666666;
}
.shareMoneyStyle .ofmoney{
width: 100%;
padding: 0 15px;
background: #fff;
margin-top: 15px;
}
.shareMoneyStyle .ofmoneyitem{
display: flex;
flex-direction: row;
align-items: center;
width: 100%;
height:50px;
justify-content: space-between;
}
</style>
pages/share-order/share-order.vue
View file @ 9f0b0bf4
<template> <template>
<view class="corderStyle" :style="{'height':contentHeight}"> <view class="corderStyle" :style="{'height':contentHeight}">
<view style="width: 100%;height: 100%;"> <view style="width: 100%;height: 100%;">
<u-tabs :list="list" :is-scroll="false" :current="msg.DistrbutionOrderSelectStatus" @change="change" :active-color='mainColor' ></u-tabs> <u-tabs :list="list" :is-scroll="false" :current="msg.DistrbutionOrderSelectStatus" @change="change" :active-color='mainColor'></u-tabs>
<u-empty v-if="g.length==0" text="暂无数据" mode="data"></u-empty> <u-empty v-if="g.length==0" text="暂无数据" mode="data"></u-empty>
<template v-if="g.length > 0"> <template v-if="g.length > 0">
<view <view style="height: calc(100vh - 50px);width: calc(100vw);overflow: hidden;padding: 10px 0;">
style=" <scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
height: calc(100vh - 50px);
width: calc(100vw);
overflow: hidden;
padding: 10px 0;
">
<scroll-view
:scroll-y="true"
:enable-back-to-top="true"
:enable-flex="true"
@scrolltolower="lower"
:style="{ height: '100%' }">
<view style="display: flex;flex-direction: column;align-items: center;"> <view style="display: flex;flex-direction: column;align-items: center;">
<view v-for="(item, index) in g" :key="index" class="listbox"> <view v-for="(item, index) in g" :key="index" class="listbox">
<view class="box_top" @click="redirectToDetail(item)"> <view class="box_top" @click="redirectToDetail(item)">
...@@ -24,8 +13,7 @@ ...@@ -24,8 +13,7 @@
<Text :style="{'font-size':'14px','color':mainColor}">{{item.StatusName}}</Text> <Text :style="{'font-size':'14px','color':mainColor}">{{item.StatusName}}</Text>
</view> </view>
<view class="box_center" @click="isdetail(index)"> <view class="box_center" @click="isdetail(index)">
<view class="center_l" > <view class="center_l">
<u-avatar :src="item.Photo" mode="square" size="70" @click.native.stop='gopeopleinfo(item.UserId)'></u-avatar> <u-avatar :src="item.Photo" mode="square" size="70" @click.native.stop='gopeopleinfo(item.UserId)'></u-avatar>
<view class="box_ltext"> <view class="box_ltext">
<Text class='l_name'>{{item.UserName}}</Text> <Text class='l_name'>{{item.UserName}}</Text>
...@@ -36,8 +24,8 @@ ...@@ -36,8 +24,8 @@
<text style="margin-left: 15px;">{{item.GradeDescription}}</text> <text style="margin-left: 15px;">{{item.GradeDescription}}</text>
</view> </view>
<view class="center_l"> <view class="center_l">
<Text>{{item.CommissionState==1? '待返佣':'已返佣'}}：<Text :style="{color:pricecolor}">{{item.Commission}}</Text>元
<Text>{{item.CommissionState==1? '待返佣':'已返佣'}}：<Text :style="{color:pricecolor}">{{item.Commission}}</Text>元 </Text> </Text>
<u-icon name="arrow" v-if='item.showdetail==false'></u-icon> <u-icon name="arrow" v-if='item.showdetail==false'></u-icon>
<u-icon name="arrow-down" v-if='item.showdetail==true'></u-icon> <u-icon name="arrow-down" v-if='item.showdetail==true'></u-icon>
</view> </view>
...@@ -54,30 +42,16 @@ ...@@ -54,30 +42,16 @@
<Text style='margin-left: 5px;'>x{{c.Number}}</Text> <Text style='margin-left: 5px;'>x{{c.Number}}</Text>
<Text :style="{color:pricecolor}">￥{{c.Final_Price}}</Text> <Text :style="{color:pricecolor}">￥{{c.Final_Price}}</Text>
</view> </view>
</view> </view>
</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"
:load-text="loadText"
:font-size="24"
:margin-top="20"
:margin-bottom="20"
bg-color="#f3f4f6"
/>
</scroll-view> </scroll-view>
</view> </view>
</template> </template>
</view> </view>
</view> </view>
</template> </template>
...@@ -86,131 +60,132 @@ ...@@ -86,131 +60,132 @@
data() { data() {
return { return {
pageTitle: "分销订单", pageTitle: "分销订单",
contentHeight:0, contentHeight: 0,
mainColor:'', mainColor: '',
secondary:'', secondary: '',
pricecolor:'', pricecolor: '',
g:[], g: [],
list:[ list: [{
{name: '全部'}, name: '全部'
{name: '待付款'}, },
{name: '已付款'}, {
{name: '已完成'}, name: '待付款'
},
{
name: '已付款'
},
{
name: '已完成'
},
], ],
msg:{ msg: {
pageIndex: 1, pageIndex: 1,
pageSize:10, pageSize: 10,
DistrbutionOrderSelectStatus:0 DistrbutionOrderSelectStatus: 0
}, },
page_count:1, page_count: 1,
status: "loadmore", status: "loadmore",
loadText: { loadText: {
loadmore: "轻轻上拉，加载更多", loadmore: "轻轻上拉，加载更多",
loading: "努力加载中", loading: "努力加载中",
nomore: "没有更多了", nomore: "没有更多了",
}, },
} }
}, },
created() {
created(){ this.contentHeight = this.$utils.calcContentHeight(-40) + 'px';
this.contentHeight = this.$utils.calcContentHeight(-40)+'px'; this.mainColor = this.$uiConfig.mainColor;
this.mainColor = this.$uiConfig.mainColor; this.secondary = this.$uiConfig.secondary;
this.secondary = this.$uiConfig.secondary; this.pricecolor = this.$uiConfig.pricecolor;
this.pricecolor = this.$uiConfig.pricecolor; this.init()
this.init()
}, },
mounted() { mounted() {
let currentPages = getCurrentPages(); let currentPages = getCurrentPages();
let u = "/" + currentPages[currentPages.length-1].route; let u = "/" + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync("basedata") let pages = wx.getStorageSync("basedata") ?
? wx.getStorageSync("basedata").bar_title wx.getStorageSync("basedata").bar_title :
: []; [];
pages.forEach((x) => { pages.forEach((x) => {
if (x.value == u) { if (x.value == u) {
this.pageTitle = x.new_name ? x.new_name : x.name; this.pageTitle = x.new_name ? x.new_name : x.name;
} }
}); });
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: this.pageTitle, title: this.pageTitle,
}); });
}, },
methods: { methods: {
init(){ init() {
uni.showLoading({ uni.showLoading({
title: '加载中' title: '加载中'
}); });
this.request2( this.request2({
{ url: '/api/AppletOrder/GetUserDistributionOrdersPageList',
url: '/api/AppletOrder/GetUserDistributionOrdersPageList', data: this.msg
data: this.msg },
}, (res) => {
uni.hideLoading();
(res) => { let list = res.data.pageData;
uni.hideLoading(); list.forEach((x) => {
let list = res.data.pageData; x.showdetail = false
list.forEach((x)=>{ })
x.showdetail = false this.g = this.g.concat(list);
}) this.page_count = res.data.pageCount;
this.g = this.g.concat(list); if (this.page_count == 1) {
this.page_count = res.data.pageCount; this.status = "nomore";
if (this.page_count == 1) { }
this.status = "nomore";
} }
} );
);
}, },
change(index){ change(index) {
this.msg.DistrbutionOrderSelectStatus = index; this.msg.DistrbutionOrderSelectStatus = index;
this.msg.pageIndex=1; this.msg.pageIndex = 1;
this.g=[] this.g = []
this.init() this.init()
}, },
isdetail(index){ isdetail(index) {
this.g[index].showdetail = !this.g[index].showdetail this.g[index].showdetail = !this.g[index].showdetail
}, },
gopeopleinfo(UserId){ gopeopleinfo(UserId) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/share-team/share-detail?UserId=' + UserId url: '/pages/share-team/share-detail?UserId=' + UserId
}); });
}, },
lower(e) { lower(e) {
if (this.msg.pageIndex < this.page_count) { if (this.msg.pageIndex < this.page_count) {
this.msg.pageIndex++; this.msg.pageIndex++;
this.status = "loading"; this.status = "loading";
this.init(); this.init();
} else { } else {
this.status = "nomore"; this.status = "nomore";
} }
}, },
redirectToDetail(item) { redirectToDetail(item) {
// OrderClassify 0商品 1司导 2网课 // OrderClassify 0商品 1司导 2网课
if(item.OrderClassify==0){ if (item.OrderClassify == 0) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/order/order-detail?id=" + item.OrderId+'&NewUserId='+item.UserId, url: "/pages/order/order-detail?id=" + item.OrderId + '&NewUserId=' + item.UserId,
}); });
}else if(item.OrderClassify==1){ } else if (item.OrderClassify == 1) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/guidecar/orderDetail?OrderId=" + item.OrderId+'&NewUserId='+item.UserId, url: "/pages/guidecar/orderDetail?OrderId=" + item.OrderId + '&NewUserId=' + item.UserId,
}); });
}else if(item.OrderClassify==2){ } else if (item.OrderClassify == 2) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/school/personal/orderDetail?OrderId=" + item.OrderId+'&NewUserId='+item.UserId, url: "/pages/school/personal/orderDetail?OrderId=" + item.OrderId + '&NewUserId=' + item.UserId,
}); });
} }
}, },
} }
} }
</script> </script>
<style> <style>
.corderStyle{ .corderStyle {
background: #f3f4f6; background: #f3f4f6;
}
}
.corderStyle .listbox{ .corderStyle .listbox {
width: 100%; width: 100%;
background: #fff; background: #fff;
padding: 0 15px; padding: 0 15px;
...@@ -218,9 +193,9 @@ ...@@ -218,9 +193,9 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
.corderStyle .listbox .box_top{
.corderStyle .listbox .box_top {
width: 100%; width: 100%;
height: 45px; height: 45px;
display: flex; display: flex;
...@@ -229,7 +204,8 @@ ...@@ -229,7 +204,8 @@
justify-content: space-between; justify-content: space-between;
border-bottom: 1px solid #f5f5f5; border-bottom: 1px solid #f5f5f5;
} }
.corderStyle .listbox .box_center{
.corderStyle .listbox .box_center {
width: 100%; width: 100%;
height: 45px; height: 45px;
display: flex; display: flex;
...@@ -238,21 +214,27 @@ ...@@ -238,21 +214,27 @@
justify-content: space-between; justify-content: space-between;
font-size: 13px; font-size: 13px;
} }
.corderStyle .center_l{
display: flex;flex-direction: row;align-items: center; .corderStyle .center_l {
display: flex;
flex-direction: row;
align-items: center;
} }
.corderStyle .listbox .box_ltext{
.corderStyle .listbox .box_ltext {
width: 90px; width: 90px;
margin-left: 5px; margin-left: 5px;
} }
.corderStyle .listbox .l_name{
.corderStyle .listbox .l_name {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 1; -webkit-line-clamp: 1;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
.corderStyle .listbox .box_bottom{
.corderStyle .listbox .box_bottom {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
...@@ -262,11 +244,11 @@ ...@@ -262,11 +244,11 @@
border-top: 1px solid #f5f5f5; border-top: 1px solid #f5f5f5;
font-size: 13px; font-size: 13px;
} }
.box_bottom .b_r{
.box_bottom .b_r {
width: calc(100vw - 30px - 50px - 20px); width: calc(100vw - 30px - 50px - 20px);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
} }
</style> </style>
\ No newline at end of file
pages/share-qrcode/share-qrcode.vue
View file @ 9f0b0bf4
This diff is collapsed.
pages/share-team/share-detail.vue
View file @ 9f0b0bf4
...@@ -59,7 +59,6 @@ ...@@ -59,7 +59,6 @@
width: 100%; width: 100%;
background: #fff; background: #fff;
padding: 0 15px; padding: 0 15px;
/* margin-top: 15px; */
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
...@@ -106,7 +105,7 @@ ...@@ -106,7 +105,7 @@
justify-content: space-between; justify-content: space-between;
border-radius: 6px; border-radius: 6px;
margin: 10px 0; margin: 10px 0;
font-size:13px; font-size: 13px;
color: #878787; color: #878787;
} }
...@@ -179,7 +178,6 @@ ...@@ -179,7 +178,6 @@
border-radius: 10rpx; border-radius: 10rpx;
overflow: hidden; overflow: hidden;
padding-bottom: 10rpx; padding-bottom: 10rpx;
} }
.cdetailStyle .view_imgbox { .cdetailStyle .view_imgbox {
...@@ -234,7 +232,8 @@ ...@@ -234,7 +232,8 @@
-webkit-line-clamp: 1; -webkit-line-clamp: 1;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
.cdetailStyle .popupbox_t{
.cdetailStyle .popupbox_t {
width: 100%; width: 100%;
border-radius: 10px; border-radius: 10px;
background: #FFF; background: #FFF;
...@@ -244,10 +243,9 @@ ...@@ -244,10 +243,9 @@
padding: 10px; padding: 10px;
position: relative; position: relative;
font-family: aa; font-family: aa;
/* overflow: auto; */
} }
.cdetailStyle .time-l{
.cdetailStyle .time-l {
width: 96%; width: 96%;
height: 60px; height: 60px;
border-radius: 10px; border-radius: 10px;
...@@ -256,21 +254,22 @@ ...@@ -256,21 +254,22 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
} }
.cdetailStyle .u-node { .cdetailStyle .u-node {
width: 24rpx; width: 24rpx;
height: 24rpx; height: 24rpx;
border-radius: 100rpx; border-radius: 100rpx;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
}
}
.cdetailStyle .u-time-axis-node.data-v-dba4c432{
top:35rpx
}
.cdetailStyle .u-time-axis.data-v-bd98783e:before{
top: 32rpx;
.cdetailStyle .u-time-axis-node.data-v-dba4c432 {
top: 35rpx
}
.cdetailStyle .u-time-axis.data-v-bd98783e:before {
top: 32rpx;
} }
</style> </style>
<template> <template>
...@@ -298,9 +297,7 @@ ...@@ -298,9 +297,7 @@
<Text style="font-size: 12px;margin-top: 5px;height:19px;font-family:'cuIcon'">{{headData.createDateStr}}</Text> <Text style="font-size: 12px;margin-top: 5px;height:19px;font-family:'cuIcon'">{{headData.createDateStr}}</Text>
</view> </view>
</view> </view>
<image mode="widthFix" @click="godiagram" src="../../static/images/useRrelationship.png" style="width:75px;height:24px;"></image> <image mode="widthFix" @click="godiagram" src="../../static/images/useRrelationship.png" style="width:75px;height:24px;"></image>
</view> </view>
<view class="sharebox_topc"> <view class="sharebox_topc">
<view class="center_item" style="font-size: 12px;color: #FFFFFF;justify-content: space-between;"> <view class="center_item" style="font-size: 12px;color: #FFFFFF;justify-content: space-between;">
...@@ -316,7 +313,6 @@ ...@@ -316,7 +313,6 @@
</view> </view>
<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>
</view> </view>
<view style="background-color: #fff;" :style="{ 'height': `calc(100% - ${scrollHeight})`}"> <view style="background-color: #fff;" :style="{ 'height': `calc(100% - ${scrollHeight})`}">
<scroll-view v-if="current==0" :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" <scroll-view v-if="current==0" :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower"
:style="{ height: '100%' }"> :style="{ height: '100%' }">
...@@ -348,7 +344,7 @@ ...@@ -348,7 +344,7 @@
<u-loadmore :status="status" :load-text="loadText" :font-size="24" :margin-top="20" :margin-bottom="20" /> <u-loadmore :status="status" :load-text="loadText" :font-size="24" :margin-top="20" :margin-bottom="20" />
</template> </template>
</scroll-view> </scroll-view>
<!-- 订单列表 --> <!-- 订单列表-->
<scroll-view v-if="current==1" :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" <scroll-view v-if="current==1" :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower"
:style="{ height: '100%' }"> :style="{ height: '100%' }">
<template v-if="orderData.length==0"> <template v-if="orderData.length==0">
...@@ -360,8 +356,7 @@ ...@@ -360,8 +356,7 @@
<view class="box_top"> <view class="box_top">
<u-avatar :src="item.Photo" size="64"></u-avatar> <u-avatar :src="item.Photo" size="64"></u-avatar>
<view class="box_r" style="margin-left:10px;display:flex;align-items: center;"> <view class="box_r" style="margin-left:10px;display:flex;align-items: center;">
<view style="width: 100%;display: flex;flex-direction: row;align-items: center; <view style="width: 100%;display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
justify-content: space-between;">
<view style="display:flex;"> <view style="display:flex;">
<Text class='order_userName'>{{item.UserName}}</Text> <Text class='order_userName'>{{item.UserName}}</Text>
<img :src="item.Icon" style="width:67px;height:22px;margin-left:5px;" alt="" /> <img :src="item.Icon" style="width:67px;height:22px;margin-left:5px;" alt="" />
...@@ -429,58 +424,44 @@ ...@@ -429,58 +424,44 @@
</scroll-view> </scroll-view>
</view> </view>
</view> </view>
<u-popup v-model="ISpopup" <u-popup v-model="ISpopup" mode="center" length="90%">
mode="center" <view class="popupbox_t" :style="{'height':'423px'}">
length="90%" <view style="padding: 10px 0;">
> 用户关系
<view class="popupbox_t" :style="{'height':'423px'}"> </view>
<view style="padding: 10px 0;"> <view style="width: 100%;overflow-y: auto;">
用户关系 <view style="width: 100%;margin-left: 10px;">
</view> <u-time-line>
<view style="width: 100%;overflow-y: auto;"> <u-time-line-item v-for="(x, i) in RelationList" :key="i">
<view style="width: 100%;margin-left: 10px;"> <!-- 此处没有自定义左边的内容，会默认显示一个点 -->
<u-time-line>
<u-time-line-item v-for="(x, i) in RelationList" :key="i" >
<!-- 此处没有自定义左边的内容，会默认显示一个点 -->
<template v-slot:node> <template v-slot:node>
<view <view class="u-node" :style="{ background: mainColor, }"></view>
class="u-node"
:style="{ background: mainColor, }"
></view
>
</template> </template>
<template v-slot:content> <template v-slot:content>
<view class="time-l"> <view class="time-l">
<u-avatar :src="x.UserInfo.Photo" size="80" style='margin-left: 10px;'></u-avatar> <u-avatar :src="x.UserInfo.Photo" size="80" style='margin-left: 10px;'></u-avatar>
<view style="display: flex;flex-direction: column;margin-left: 10px;height: 35px;justify-content: space-between;">
<view style="display: flex;flex-direction: column;margin-left: 10px;height: 35px;justify-content: space-between;"> <text style="font-size: 12px;color: #111111;font-weight: bold;max-width: 200px;
<text style="font-size: 12px;color: #111111;font-weight: bold;max-width: 200px;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
font-weight: bold; font-weight: bold;
font-family: aa; font-family: aa;
">{{x.MySelf==true?'(我自己)':''}}{{x.UserInfo.Name}}</text> ">{{x.MySelf==true?'(我自己)':''}}{{x.UserInfo.Name}}</text>
<text style="font-size: 11px;color: #999999;">{{x.UserInfo.CreateDate}}</text> <text style="font-size: 11px;color: #999999;">{{x.UserInfo.CreateDate}}</text>
</view> </view>
</view> </view>
</template> </template>
</u-time-line-item>
</u-time-line-item> </u-time-line>
</u-time-line>
</view>
</view>
<view style="position: absolute;right: 0;top: 0;width: 50px;height: 50px;display: flex;align-items: center;justify-content: center;" @click="ISpopup= false">
<u-icon name="cross" size="24" color="#000" ></u-icon>
</view> </view>
</view> </view>
<view style="position: absolute;right: 0;top: 0;width: 50px;height: 50px;display: flex;align-items: center;justify-content: center;"
@click="ISpopup= false">
<u-icon name="cross" size="24" color="#000"></u-icon>
</view>
</view>
</u-popup> </u-popup>
</view> </view>
</template> </template>
...@@ -548,16 +529,15 @@ ...@@ -548,16 +529,15 @@
}, },
viewData: [], viewData: [],
scrollHeight: 0, scrollHeight: 0,
ISpopup:false, ISpopup: false,
RelationList:[], RelationList: [],
} }
}, },
mounted() { mounted() {
let currentPages = getCurrentPages(); let currentPages = getCurrentPages();
let u = "/" + currentPages[currentPages.length - 1].route; let u = "/" + currentPages[currentPages.length - 1].route;
let pages = uni.getStorageSync("basedata") ? let pages = uni.getStorageSync("basedata") ?
uni.getStorageSync("basedata").bar_title : uni.getStorageSync("basedata").bar_title : [];
[];
pages.forEach((x) => { pages.forEach((x) => {
if (x.value == u) { if (x.value == u) {
this.pageTitle = x.new_name ? x.new_name : x.name; this.pageTitle = x.new_name ? x.new_name : x.name;
...@@ -583,21 +563,18 @@ ...@@ -583,21 +563,18 @@
methods: { methods: {
//跳转至订单详情 //跳转至订单详情
redirectToDetail(item) { redirectToDetail(item) {
// uni.navigateTo({
// url: "/pages/order/order-detail?id=" + item.OrderId + '&NewUserId=' + this.headMsg.UserId
// });
// OrderClassify 0商品 1司导 2网课 // OrderClassify 0商品 1司导 2网课
if(item.OrderClassify==0){ if (item.OrderClassify == 0) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/order/order-detail?id=" + item.OrderId+'&NewUserId='+item.UserId, url: "/pages/order/order-detail?id=" + item.OrderId + '&NewUserId=' + item.UserId,
}); });
}else if(item.OrderClassify==1){ } else if (item.OrderClassify == 1) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/guidecar/orderDetail?OrderId=" + item.OrderId+'&NewUserId='+item.UserId, url: "/pages/guidecar/orderDetail?OrderId=" + item.OrderId + '&NewUserId=' + item.UserId,
}); });
}else if(item.OrderClassify==2){ } else if (item.OrderClassify == 2) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/school/personal/orderDetail?OrderId=" + item.OrderId+'&NewUserId='+item.UserId, url: "/pages/school/personal/orderDetail?OrderId=" + item.OrderId + '&NewUserId=' + item.UserId,
}); });
} }
}, },
...@@ -619,9 +596,9 @@ ...@@ -619,9 +596,9 @@
}, },
//复制文字 //复制文字
copyHandler(OrderNo) { copyHandler(OrderNo) {
uni.setClipboardData({ uni.setClipboardData({
data: OrderNo data: OrderNo
}); });
}, },
change(index) { change(index) {
this.current = index; this.current = index;
...@@ -782,7 +759,7 @@ ...@@ -782,7 +759,7 @@
} }
} }
}, },
godiagram(){//打开关系图 godiagram() { //打开关系图
this.ISpopup = true; this.ISpopup = true;
this.request2({ this.request2({
url: '/api/AppletUser/GetMyUserHierarchicalRelationList', url: '/api/AppletUser/GetMyUserHierarchicalRelationList',
...@@ -790,12 +767,11 @@ ...@@ -790,12 +767,11 @@
}, },
res => { res => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
this.RelationList = res.data this.RelationList = res.data
} }
} }
); );
} }
}, },
created() { created() {
...@@ -811,4 +787,4 @@ ...@@ -811,4 +787,4 @@
.cdetailStyle { .cdetailStyle {
background: #f3f4f6; background: #f3f4f6;
} }
</style> </style>
\ No newline at end of file
pages/share/add/add.vue
View file @ 9f0b0bf4
...@@ -11,38 +11,34 @@ ...@@ -11,38 +11,34 @@
<view class="addTbox_l"> <view class="addTbox_l">
<Text>邀请人</Text> <Text>邀请人</Text>
</view> </view>
<Text :style="{color:mainColor}">{{userinfo.ApplyForInfo.SuperiorName}} <Text style='color: #6F6666;'>(请核对)</Text> </Text> <Text :style="{color:mainColor}">{{userinfo.ApplyForInfo.SuperiorName}} <Text style='color: #6F6666;'>(请核对)</Text>
</Text>
</view> </view>
<view class='addTbox'> <view class='addTbox'>
<view class="addTbox_l"> <view class="addTbox_l">
<Text>姓名</Text> <Text>姓名</Text>
</view> </view>
<input class="uni-input" v-model="msg.Name" placeholder="请输入真实姓名" /> <input class="uni-input" v-model="msg.Name" placeholder="请输入真实姓名" />
</view> </view>
<view class='addTbox'> <view class='addTbox'>
<view class="addTbox_l"> <view class="addTbox_l">
<Text>手机号码</Text> <Text>手机号码</Text>
</view> </view>
<input class="uni-input" type="number" v-model="msg.Mobile" placeholder="请填写手机号码" /> <input class="uni-input" type="number" v-model="msg.Mobile" placeholder="请填写手机号码" />
</view> </view>
<view class='addTbox'> <view class='addTbox'>
<u-checkbox-group @change="Select"> <u-checkbox-group @change="Select">
<u-checkbox v-model="checked" shape="circle" :active-color="mainColor" label-size='24' <u-checkbox v-model="checked" shape="circle" :active-color="mainColor" label-size='24'>我已经阅读并了解</u-checkbox>
>我已经阅读并了解</u-checkbox
>
</u-checkbox-group> </u-checkbox-group>
<Text style='font-size: 12px;color: #1F4C87;' @click='showagreement'>【{{userinfo.CustomModel.ApplicationAgreement}}】</Text> <Text style='font-size: 12px;color: #1F4C87;' @click='showagreement'>【{{userinfo.CustomModel.ApplicationAgreement}}】</Text>
</view> </view>
</view> </view>
<view style="width: 100%;height:70px ;background: #F7F7F7;display: flex;align-items: center;justify-content: center;"> <view style="width: 100%;height:70px ;background: #F7F7F7;display: flex;align-items: center;justify-content: center;">
<view :style="{background:userinfo.CustomModel.ButtonColor,'border-radius':userinfo.CustomModel.ButtonFilletPX+'px'}" class="apply" @click="apply"> <view :style="{background:userinfo.CustomModel.ButtonColor,'border-radius':userinfo.CustomModel.ButtonFilletPX+'px'}"
class="apply" @click="apply">
<Text :style="{color:userinfo.CustomModel.ButtonTextColor}">{{userinfo.CustomModel.ButtonText}}</Text> <Text :style="{color:userinfo.CustomModel.ButtonTextColor}">{{userinfo.CustomModel.ButtonText}}</Text>
</view> </view>
</view> </view>
<image :src="userinfo.CustomModel.BottomImage" style="width: 100%;height: 165px;"></image> <image :src="userinfo.CustomModel.BottomImage" style="width: 100%;height: 165px;"></image>
<view class="agreementbox" v-if='isshowagreement==true'></view> <view class="agreementbox" v-if='isshowagreement==true'></view>
<view class="agreementbox_t" v-if='isshowagreement==true'> <view class="agreementbox_t" v-if='isshowagreement==true'>
...@@ -66,197 +62,188 @@ ...@@ -66,197 +62,188 @@
data() { data() {
return { return {
pageTitle: "分销申请", pageTitle: "分销申请",
contentHeight:0, contentHeight: 0,
mainColor:'', mainColor: '',
secondary:'', secondary: '',
bg_img:'', bg_img: '',
userinfo:{}, userinfo: {},
topname:'', topname: '',
checked:false, checked: false,
isshowagreement:false, isshowagreement: false,
msg:{ msg: {
Name:'', Name: '',
Mobile:'', Mobile: '',
} }
} }
}, },
created() {
created(){ this.contentHeight = this.$utils.calcContentHeight(-40) + 'px';
this.contentHeight = this.$utils.calcContentHeight(-40)+'px'; this.mainColor = this.$uiConfig.mainColor;
this.mainColor = this.$uiConfig.mainColor; this.secondary = this.$uiConfig.secondary;
this.secondary = this.$uiConfig.secondary; this.getUserInfo()
this.getUserInfo()
}, },
mounted() { mounted() {
let currentPages = getCurrentPages(); let currentPages = getCurrentPages();
let u = "/" + currentPages[currentPages.length-1].route; let u = "/" + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync("basedata") let pages = wx.getStorageSync("basedata") ?
? wx.getStorageSync("basedata").bar_title wx.getStorageSync("basedata").bar_title :
: []; [];
pages.forEach((x) => { pages.forEach((x) => {
if (x.value == u) { if (x.value == u) {
this.pageTitle = x.new_name ? x.new_name : x.name; this.pageTitle = x.new_name ? x.new_name : x.name;
} }
}); });
this.topname = wx.getStorageSync("basedata") this.topname = wx.getStorageSync("basedata") ?
? wx.getStorageSync("basedata").mall.name wx.getStorageSync("basedata").mall.name :
: ''; '';
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: this.pageTitle, title: this.pageTitle,
}); });
}, },
methods: { methods: {
getUserInfo(){ getUserInfo() {
uni.showNavigationBarLoading(); uni.showNavigationBarLoading();
this.request2({
this.request2( url: '/api/AppletUser/GetUserApplyForDistrbutorInfo',
{ data: {}
url: '/api/AppletUser/GetUserApplyForDistrbutorInfo', },
data: {} (res) => {
}, uni.hideNavigationBarLoading()
(res) => { this.userinfo = res.data;
uni.hideNavigationBarLoading() this.pageTitle = res.data.CustomModel.DistributionApplication
this.userinfo = res.data; }
this.pageTitle = res.data.CustomModel.DistributionApplication
// if(res.data.is_can_apply==false && res.data.status==1){
// this.getorder()
// }
}
); );
}, },
Select(){ Select() {
console.log(this.checked) console.log(this.checked)
}, },
showagreement(){ showagreement() {
this.isshowagreement = true this.isshowagreement = true
}, },
read(){ read() {
this.checked = true; this.checked = true;
this.isshowagreement = false this.isshowagreement = false
}, },
apply(){ apply() {
let that = this let that = this
uni.requestSubscribeMessage({ uni.requestSubscribeMessage({
tmplIds: that.userinfo.template_message_list, tmplIds: that.userinfo.template_message_list,
complete (res) { complete(res) {
if(that.checked==false){ if (that.checked == false) {
uni.showToast({ uni.showToast({
title: "请先查看分销协议并同意", title: "请先查看分销协议并同意",
icon: "none" icon: "none"
}); });
return false return false
} }
if(that.name==''){ if (that.name == '') {
uni.showToast({ uni.showToast({
title: "请输入真实姓名", title: "请输入真实姓名",
icon: "none" icon: "none"
}); });
return false return false
} }
if (that.mobile == '') {
if(that.mobile==''){ uni.showToast({
title: "请填写手机号码",
uni.showToast({ icon: "none"
title: "请填写手机号码", });
icon: "none" return false
}); }
return false uni.showLoading({
} title: '加载中...'
uni.showLoading({ });
title: '加载中...' let pages = getCurrentPages(); // 当前页面
}); let beforePage = pages[pages.length - 2]; // 前一个页面
that.request2({
let pages = getCurrentPages(); // 当前页面 url: '/api/AppletUser/SetUserApplyForBeDistrbutor',
let beforePage = pages[pages.length - 2]; // 前一个页面 data: that.msg
that.request2( },
{ (res) => {
url: '/api/AppletUser/SetUserApplyForBeDistrbutor', uni.hideLoading();
data: that.msg setTimeout(() => {
}, uni.navigateBack({
(res) => { success: function() {
uni.hideLoading(); beforePage.onLoad(); // 执行前一个页面的created方法
setTimeout(()=>{ }
uni.navigateBack({ });
success: function() { }, 1000)
beforePage.onLoad(); // 执行前一个页面的created方法 }
} );
}); }
},1000)
}
);
}
}) })
} }
} }
} }
</script> </script>
<style> <style>
.s_addStyle{ .s_addStyle {
background: #fff; background: #fff;
position: relative; position: relative;
} }
.s_addStyle .addTbox{
width: 100%;
border-bottom: 1px solid #f5f5f5;
display: flex;
flex-direction: row;
align-items: center;
height: 50px;
}
.addTbox .addTbox_l{
width:180rpx ;
}
.s_addStyle .apply{
width: 93%;
height: 45px;
border-radius: 22.5px;
display: flex;
align-items: center;
justify-content: center;
}
.s_addStyle .agreementbox{ .s_addStyle .addTbox {
position: fixed; width: 100%;
left: 0; border-bottom: 1px solid #f5f5f5;
top: 0; display: flex;
width: 100%; flex-direction: row;
height: 100%; align-items: center;
background: #333333; height: 50px;
opacity: 0.3; }
z-index: 888;
} .addTbox .addTbox_l {
.s_addStyle .agreementbox_t{ width: 180rpx;
position: fixed; }
left: 0;
top: 0; .s_addStyle .apply {
width: 100%; width: 93%;
height: 100%; height: 45px;
z-index: 999; border-radius: 22.5px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.s_addStyle .agreementbox_t .agreement_b{
width:80% ; .s_addStyle .agreementbox {
border-radius: 10px; position: fixed;
background: #fff; left: 0;
display: flex; top: 0;
flex-direction: column; width: 100%;
align-items: center; height: 100%;
overflow: hidden; background: #333333;
} opacity: 0.3;
.s_addStyle .agreementbox_t .agreement_bottom{ z-index: 888;
width: 100%; }
height: 50px;
display: flex; .s_addStyle .agreementbox_t {
align-items: center; position: fixed;
justify-content: center; left: 0;
} top: 0;
</style> width: 100%;
height: 100%;
z-index: 999;
display: flex;
align-items: center;
justify-content: center;
}
.s_addStyle .agreementbox_t .agreement_b {
width: 80%;
border-radius: 10px;
background: #fff;
display: flex;
flex-direction: column;
align-items: center;
overflow: hidden;
}
.s_addStyle .agreementbox_t .agreement_bottom {
width: 100%;
height: 50px;
display: flex;
align-items: center;
justify-content: center;
}
</style>
\ No newline at end of file
pages/share/buyInterest/index.vue
View file @ 9f0b0bf4
This diff is collapsed.
pages/share/buyRecord/index.vue
View file @ 9f0b0bf4
<template> <template>
<view class="recordlistStyle" :style="{ height: contentHeight }"> <view class="recordlistStyle" :style="{ height: contentHeight }">
<u-empty v-if="g.length == 0" text="暂无相关购买记录" mode="list"></u-empty> <u-empty v-if="g.length == 0" text="暂无相关购买记录" mode="list"></u-empty>
<view <view v-if="g.length > 0" style="height:calc(100vh);width:calc(100vw);overflow:hidden;">
v-if="g.length > 0"
style="
height: calc(100vh );
width: calc(100vw);
overflow: hidden;
"
>
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }"> <scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
<view class="recordList"> <view class="recordList">
<view class="r_list_item" v-for="(x, i) in g" :key="i"> <view class="r_list_item" v-for="(x, i) in g" :key="i">
<view class="list_top"> <view class="list_top">
<text>支付金额：{{x.Money}}</text> <text>支付金额：{{x.Money}}</text>
<text>支付时间：{{x.PayTimeStr}}</text> <text>支付时间：{{x.PayTimeStr}}</text>
</view> </view>
<view class="list_top"> <view class="list_top">
<text>等级名称：{{x.GradeName}}</text> <text>等级名称：{{x.GradeName}}</text>
<text>过期时间：{{x.ExpiryDateStr}}</text> <text>过期时间：{{x.ExpiryDateStr}}</text>
</view> </view>
<view class="list_top" style="border-bottom:1px dashed #d1d1d1;padding-bottom:10px;"> <view class="list_top" style="border-bottom:1px dashed #d1d1d1;padding-bottom:10px;">
<text> <text>
支付状态：<text v-if="x.PayState==1">已支付</text><text v-if="x.PayState==0">未支付</text> 支付状态：<text v-if="x.PayState==1">已支付</text><text v-if="x.PayState==0">未支付</text>
</text> </text>
</view> </view>
<view class="list_top_last"> <view class="list_top_last">
<view style="width:13%;"> <view style="width:13%;">
备注： 备注：
</view> </view>
<view style="width:86%"> <view style="width:86%">
{{x.Remark}} {{x.Remark}}
</view> </view>
...@@ -38,7 +31,6 @@ ...@@ -38,7 +31,6 @@
<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> </scroll-view>
</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>
...@@ -47,147 +39,150 @@ ...@@ -47,147 +39,150 @@
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
pageTitle: '购买记录', pageTitle: '购买记录',
mainColor: '', mainColor: '',
contentHeight: 0, contentHeight: 0,
g: [], g: [],
loading: false, loading: false,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 10 pageSize: 10
},
page_count: 1,
status: 'loadmore',
loadText: {
loadmore: '轻轻上拉，加载更多',
loading: '努力加载中',
nomore: '没有更多了'
}
};
},
created() {
this.contentHeight = this.$utils.calcContentHeight(-40) + 'px';
this.mainColor = this.$uiConfig.mainColor;
},
mounted() {
let currentPages = getCurrentPages();
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: this.pageTitle
});
},
onLoad: function(option) {
//option为object类型，会序列化上个页面传递的参数
this.loading = true;
this.init();
},
methods: {
init() {
this.request2(
{
url: '/api/AppletUser/GetVipBuyPageList',
data: this.msg
}, },
res => { page_count: 1,
if (res.resultCode == 1) { status: 'loadmore',
this.loading = false; loadText: {
this.g = this.g.concat(res.data.pageData); loadmore: '轻轻上拉，加载更多',
this.page_count = res.data.pageCount; loading: '努力加载中',
if (this.page_count == 1) { nomore: '没有更多了'
this.status = 'nomore'; }
};
},
created() {
this.contentHeight = this.$utils.calcContentHeight(-40) + 'px';
this.mainColor = this.$uiConfig.mainColor;
},
mounted() {
let currentPages = getCurrentPages();
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: this.pageTitle
});
},
onLoad: function(option) {
//option为object类型，会序列化上个页面传递的参数
this.loading = true;
this.init();
},
methods: {
init() {
this.request2({
url: '/api/AppletUser/GetVipBuyPageList',
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;
if (this.page_count == 1) {
this.status = 'nomore';
}
} }
} }
);
},
lower(e) {
if (this.msg.pageIndex < this.page_count) {
this.msg.pageIndex++;
this.status = 'loading';
this.init();
} else {
this.status = 'nomore';
} }
);
},
lower(e) {
if (this.msg.pageIndex < this.page_count) {
this.msg.pageIndex++;
this.status = 'loading';
this.init();
} else {
this.status = 'nomore';
} }
} }
} };
};
</script> </script>
<style> <style>
.recordlistStyle { .recordlistStyle {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #f3f4f6; background: #f3f4f6;
} }
.recordlistStyle .recordList{
width: 100%; .recordlistStyle .recordList {
display: flex; width: 100%;
flex-direction: column; display: flex;
align-items: center; flex-direction: column;
margin-top:10px; align-items: center;
} margin-top: 10px;
.recordlistStyle .r_list_item{ }
width: 94%;
height: auto; .recordlistStyle .r_list_item {
border-radius: 6px; width: 94%;
background-repeat: no-repeat; height: auto;
background-size: 100% 100%; border-radius: 6px;
display: flex; background-repeat: no-repeat;
margin-bottom:15px; background-size: 100% 100%;
-webkit-box-orient: vertical; display: flex;
-webkit-box-direction: normal; margin-bottom: 15px;
-webkit-flex-direction: column; -webkit-box-orient: vertical;
flex-direction: column; -webkit-box-direction: normal;
padding: 10px; -webkit-flex-direction: column;
color: #FFFFFF; flex-direction: column;
background-image: url(https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/shareTop.png); padding: 10px;
} color: #FFFFFF;
.recordlistStyle .loading { background-image: url(https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/shareTop.png);
width: 180rpx; }
height: 180rpx;
background: #000000; .recordlistStyle .loading {
opacity: 0.7; width: 180rpx;
border-radius: 10rpx; height: 180rpx;
display: flex; background: #000000;
flex-direction: column; opacity: 0.7;
align-items: center; border-radius: 10rpx;
justify-content: center; display: flex;
position: fixed; flex-direction: column;
left: 50%; align-items: center;
top: 30%; justify-content: center;
margin-left: -100rpx; position: fixed;
z-index: 999; left: 50%;
} top: 30%;
.recordlistStyle .list_top{ margin-left: -100rpx;
width: 100%; z-index: 999;
display: flex; }
-webkit-box-orient: horizontal;
-webkit-box-direction: normal; .recordlistStyle .list_top {
-webkit-flex-direction: row; width: 100%;
flex-direction: row; display: flex;
-webkit-box-align: center; -webkit-box-orient: horizontal;
-webkit-align-items: center; -webkit-box-direction: normal;
align-items: center; -webkit-flex-direction: row;
-webkit-box-pack: justify; flex-direction: row;
justify-content: space-between; -webkit-box-align: center;
margin-bottom: 6px; -webkit-align-items: center;
} align-items: center;
.list_top_last{ -webkit-box-pack: justify;
padding-top: 3px; justify-content: space-between;
justify-content: flex-start; margin-bottom: 6px;
width: 100%; }
display: flex;
flex-direction: wrap; .list_top_last {
margin-bottom: 6px; padding-top: 3px;
align-items: top; justify-content: flex-start;
} width: 100%;
</style> display: flex;
flex-direction: wrap;
margin-bottom: 6px;
align-items: top;
}
</style>
\ No newline at end of file
pages/share/buyVip/index.vue
View file @ 9f0b0bf4
This diff is collapsed.
pages/share/cash/cash.vue
View file @ 9f0b0bf4
This diff is collapsed.
pages/share/examine.vue
View file @ 9f0b0bf4
This diff is collapsed.
pages/share/index/index.vue
View file @ 9f0b0bf4
This diff is collapsed.
pages/share/level/level.vue
View file @ 9f0b0bf4
This diff is collapsed.
pages/share/level/level_t.vue
View file @ 9f0b0bf4
This diff is collapsed.
pages/user-center/user-center.vue
View file @ 9f0b0bf4
This diff is collapsed.
pages/video/index.vue
View file @ 9f0b0bf4
...@@ -197,7 +197,7 @@ ...@@ -197,7 +197,7 @@
return { return {
vlist: [], vlist: [],
videoIndex: 0, videoIndex: 0,
swiperHeight: 0,//高度 swiperHeight: 0, //高度
GoodsId: 0, //商品id GoodsId: 0, //商品id
nav: 0, nav: 0,
goodObj: {}, //商品对象 goodObj: {}, //商品对象
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
comGoodImg: '', //商品缩小图 comGoodImg: '', //商品缩小图
comGoodTitle: '', //商品名称 comGoodTitle: '', //商品名称
comGoodPrice: '', //商品价格 comGoodPrice: '', //商品价格
showSku: false,//是否显示商品SKU showSku: false, //是否显示商品SKU
sku: {}, sku: {},
showAuth: false, showAuth: false,
u: {}, u: {},
...@@ -234,23 +234,20 @@ ...@@ -234,23 +234,20 @@
this.GoodsId = option.GoodsId; this.GoodsId = option.GoodsId;
this.sysheight = uni.getSystemInfoSync().windowHeight; this.sysheight = uni.getSystemInfoSync().windowHeight;
this.swiperHeight = `${this.sysheight}px`; this.swiperHeight = `${this.sysheight}px`;
this.videoIndex = 0; //默认加载第一条
this.videoIndex=0; //默认加载第一条
this.vlist = []; this.vlist = [];
wx.showShareMenu({ wx.showShareMenu({
withShareTicket: true, withShareTicket: true,
menus: ["shareAppMessage", "shareTimeline"], menus: ["shareAppMessage", "shareTimeline"],
}); });
}, },
methods: { methods: {
//获取商品视频 //获取商品视频
getVideoHeight(type) getVideoHeight(type) {
{
//视频填充方式(0默认，1-填充) //视频填充方式(0默认，1-填充)
if(type==0){ if (type == 0) {
return 'contain' return 'contain'
}else{ } else {
return 'fill' return 'fill'
} }
}, },
...@@ -273,14 +270,11 @@ ...@@ -273,14 +270,11 @@
this.videoContextList[curIndex].seek(0) this.videoContextList[curIndex].seek(0)
this.isPlay = true this.isPlay = true
this.videoIndex = curIndex; this.videoIndex = curIndex;
this.comGoodImg = this.vlist[curIndex].picUrl; this.comGoodImg = this.vlist[curIndex].picUrl;
this.comGoodTitle = this.vlist[curIndex].name; this.comGoodTitle = this.vlist[curIndex].name;
this.comGoodPrice = this.vlist[curIndex].price; this.comGoodPrice = this.vlist[curIndex].price;
this.GoodsId = this.vlist[curIndex].id; this.GoodsId = this.vlist[curIndex].id;
this.sku = this.vlist[curIndex]; this.sku = this.vlist[curIndex];
let xz = this.vlist.length - e.detail.current; let xz = this.vlist.length - e.detail.current;
if (xz == 1) { if (xz == 1) {
this.msg.pageIndex++; this.msg.pageIndex++;
...@@ -355,7 +349,7 @@ ...@@ -355,7 +349,7 @@
picUrl: data[0].cover_pic, picUrl: data[0].cover_pic,
price: this.goodObj.price, price: this.goodObj.price,
video_url: data[0].video_url, video_url: data[0].video_url,
VideoType:data[0].video_type VideoType: data[0].video_type
} }
this.vlist.push(obj); this.vlist.push(obj);
this.videoContextList = [] this.videoContextList = []
...@@ -402,43 +396,37 @@ ...@@ -402,43 +396,37 @@
}; };
}, },
onShareTimeline() { onShareTimeline() {
setTimeout(() => { setTimeout(() => {
this.getReceive(); this.getReceive();
}, 2500); }, 2500);
let uid = uni.getStorageSync("mall_UserInfo") let uid = uni.getStorageSync("mall_UserInfo") ?
? uni.getStorageSync("mall_UserInfo").UserId uni.getStorageSync("mall_UserInfo").UserId :
: 0; 0;
if(uid==0){ if (uid == 0) {
uid = uni.getStorageSync("pid")?uni.getStorageSync("pid").pid: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 { let SmallShopId = uni.getStorageSync("mall_UserInfo") ?
title: this.comGoodTitle, uni.getStorageSync("mall_UserInfo").SmallShopId :
query: "GoodsId=" + this.GoodsId + "&user_id=" + uid+ "&SmallShopId=" + SmallShopId, 0;
imageUrl: this.comGoodImg, 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,
imageUrl: this.comGoodImg,
};
}, },
//点击商品 //点击商品
getShowInfo() { getShowInfo() {
this.isShowInfo = !this.isShowInfo; this.isShowInfo = !this.isShowInfo;
} }
}, },
mounted() {}, mounted() {},
created() { created() {
this.nav = uni.getMenuButtonBoundingClientRect().top; this.nav = uni.getMenuButtonBoundingClientRect().top;
}, },
} }
</script> </script>
\ No newline at end of file
<style>
</style>
pages/webbox/webbox.vue
View file @ 9f0b0bf4
This diff is collapsed.
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