Skip to content

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

页面修改

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