Skip to content

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

页面修改

parent 0c84d628
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3448 additions and 3828 deletions
pages/pintuan/index.vue
View file @ d4ccb07b
...@@ -3,25 +3,12 @@ ...@@ -3,25 +3,12 @@
<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"
mode="widthfix"
style="width:20px;height:20px;"
/>
</view> </view>
<view class="middle"></view> <view class="middle"></view>
<view class="right"> <view class="right">
<u-tabs <u-tabs name="name" :list="myPageData.home_pages.navs" :is-scroll="true" :active-color="mainColor" :current="active"
name="name" :bar-width="80" :font-size="32" :bold="false" @change="changeHandler"></u-tabs>
: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> </view>
</view> </view>
...@@ -30,8 +17,8 @@ ...@@ -30,8 +17,8 @@
</template> </template>
<script> <script>
import tabbars from "@/components/tabbar/index"; import tabbars from "@/components/tabbar/index";
export default { export default {
components: { components: {
tabbars, tabbars,
}, },
...@@ -39,8 +26,8 @@ export default { ...@@ -39,8 +26,8 @@ export default {
return { return {
contentHeight: 0, contentHeight: 0,
pageTitle: "拼团", pageTitle: "拼团",
advertisement:{}, advertisement: {},
banners:[] banners: []
}; };
}, },
mounted() { mounted() {
...@@ -49,9 +36,9 @@ export default { ...@@ -49,9 +36,9 @@ export default {
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;
...@@ -60,15 +47,12 @@ export default { ...@@ -60,15 +47,12 @@ export default {
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: this.pageTitle, title: this.pageTitle,
}); });
// this.init();
// this.getStyle();
uni.showNavigationBarLoading(); uni.showNavigationBarLoading();
}, },
methods: { methods: {
init() { init() {
let h = this.apiheader(); let h = this.apiheader();
this.request( this.request({
{
url: "", url: "",
header: h, header: h,
data: { data: {
...@@ -86,32 +70,34 @@ export default { ...@@ -86,32 +70,34 @@ export default {
); );
}, },
}, },
}; };
</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 {
.head-pin-box .left {
height: 100%; height: 100%;
width: 90rpx; width: 90rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.head-pin-box .middle {
.head-pin-box .middle {
width: 2rpx; width: 2rpx;
background: #ddd; background: #ddd;
height: 45rpx; height: 45rpx;
margin: 0 20rpx; margin: 0 20rpx;
} }
.head-pin-box .right {
.head-pin-box .right {
height: 100%; height: 100%;
flex: 1; flex: 1;
} }
</style> </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 @@ ...@@ -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,25 +44,24 @@ ...@@ -47,25 +44,24 @@
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;
...@@ -76,29 +72,25 @@ ...@@ -76,29 +72,25 @@
}); });
}, },
methods: { methods: {
init(){ init() {
uni.showNavigationBarLoading(); uni.showNavigationBarLoading();
this.request2({
this.request2(
{
url: '/api/AppletUser/GetUserDistrbutorCommissionInfo', url: '/api/AppletUser/GetUserDistrbutorCommissionInfo',
data: {} data: {}
}, },
(res) => { (res) => {
uni.hideNavigationBarLoading() uni.hideNavigationBarLoading()
this.money = res.data 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,18 +100,18 @@ ...@@ -108,18 +100,18 @@
</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{ .shareMoneyStyle .getapply {
width: 94%; width: 94%;
height: 45px; height: 45px;
border-radius: 22.5px; border-radius: 22.5px;
...@@ -128,23 +120,26 @@ ...@@ -128,23 +120,26 @@
justify-content: center; justify-content: center;
color: #fff; color: #fff;
margin-top: 20px; margin-top: 20px;
} }
.shareMoneyStyle .box_top{
.shareMoneyStyle .box_top {
width: 100%; width: 100%;
padding: 15px; padding: 15px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.shareMoneyStyle .box_top .box_tl{
.shareMoneyStyle .box_top .box_tl {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
height: 60px; height: 60px;
color: #fff; color: #fff;
} }
.shareMoneyStyle .box_top .box_tr{
.shareMoneyStyle .box_top .box_tr {
width: 90px; width: 90px;
height: 26px; height: 26px;
border: 1px solid #fff; border: 1px solid #fff;
...@@ -153,34 +148,36 @@ ...@@ -153,34 +148,36 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.shareMoneyStyle .kti{
.shareMoneyStyle .kti {
background: #fff; background: #fff;
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 0 15px; padding: 0 15px;
} }
.shareMoneyStyle .moneytext{
.shareMoneyStyle .moneytext {
font-size: 16px; font-size: 16px;
color: #666666; color: #666666;
} }
.shareMoneyStyle .ofmoney{
.shareMoneyStyle .ofmoney {
width: 100%; width: 100%;
padding: 0 15px; padding: 0 15px;
background: #fff; background: #fff;
margin-top: 15px; margin-top: 15px;
}
} .shareMoneyStyle .ofmoneyitem {
.shareMoneyStyle .ofmoneyitem{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
width: 100%; width: 100%;
height:50px; height: 50px;
justify-content: space-between; justify-content: space-between;
} }
</style> </style>
\ No newline at end of file
pages/share-order/share-order.vue
View file @ d4ccb07b
<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,23 +60,30 @@ ...@@ -86,23 +60,30 @@
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: "轻轻上拉，加载更多",
...@@ -111,9 +92,8 @@ ...@@ -111,9 +92,8 @@
}, },
} }
}, },
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;
...@@ -121,10 +101,10 @@ ...@@ -121,10 +101,10 @@
}, },
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;
...@@ -135,21 +115,18 @@ ...@@ -135,21 +115,18 @@
}); });
}, },
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) => { (res) => {
uni.hideLoading(); uni.hideLoading();
let list = res.data.pageData; let list = res.data.pageData;
list.forEach((x)=>{ list.forEach((x) => {
x.showdetail = false x.showdetail = false
}) })
this.g = this.g.concat(list); this.g = this.g.concat(list);
...@@ -160,16 +137,16 @@ ...@@ -160,16 +137,16 @@
} }
); );
}, },
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
}); });
...@@ -185,32 +162,30 @@ ...@@ -185,32 +162,30 @@
}, },
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 @ d4ccb07b
This diff is collapsed.
pages/share-team/share-detail.vue
View file @ d4ccb07b
...@@ -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,6 +254,7 @@ ...@@ -256,6 +254,7 @@
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;
...@@ -263,14 +262,14 @@ ...@@ -263,14 +262,14 @@
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-node.data-v-dba4c432 {
top: 35rpx
} }
.cdetailStyle .u-time-axis.data-v-bd98783e:before{
top: 32rpx;
.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,10 +424,7 @@ ...@@ -429,10 +424,7 @@
</scroll-view> </scroll-view>
</view> </view>
</view> </view>
<u-popup v-model="ISpopup" <u-popup v-model="ISpopup" mode="center" length="90%">
mode="center"
length="90%"
>
<view class="popupbox_t" :style="{'height':'423px'}"> <view class="popupbox_t" :style="{'height':'423px'}">
<view style="padding: 10px 0;"> <view style="padding: 10px 0;">
用户关系 用户关系
...@@ -440,19 +432,14 @@ ...@@ -440,19 +432,14 @@
<view style="width: 100%;overflow-y: auto;"> <view style="width: 100%;overflow-y: auto;">
<view style="width: 100%;margin-left: 10px;"> <view style="width: 100%;margin-left: 10px;">
<u-time-line> <u-time-line>
<u-time-line-item v-for="(x, i) in RelationList" :key="i" > <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;
...@@ -465,22 +452,16 @@ ...@@ -465,22 +452,16 @@
</view> </view>
</view> </view>
</template> </template>
</u-time-line-item> </u-time-line-item>
</u-time-line> </u-time-line>
</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 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>
</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,
}); });
} }
}, },
...@@ -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',
...@@ -795,7 +772,6 @@ ...@@ -795,7 +772,6 @@
} }
} }
); );
} }
}, },
created() { created() {
......
pages/share/add/add.vue
View file @ d4ccb07b
...@@ -11,16 +11,15 @@ ...@@ -11,16 +11,15 @@
<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>
...@@ -29,20 +28,17 @@ ...@@ -29,20 +28,17 @@
</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,53 +62,49 @@ ...@@ -66,53 +62,49 @@
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', url: '/api/AppletUser/GetUserApplyForDistrbutorInfo',
data: {} data: {}
}, },
...@@ -120,44 +112,39 @@ ...@@ -120,44 +112,39 @@
uni.hideNavigationBarLoading() uni.hideNavigationBarLoading()
this.userinfo = res.data; this.userinfo = res.data;
this.pageTitle = res.data.CustomModel.DistributionApplication 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({ uni.showToast({
title: "请填写手机号码", title: "请填写手机号码",
icon: "none" icon: "none"
...@@ -167,62 +154,59 @@ ...@@ -167,62 +154,59 @@
uni.showLoading({ uni.showLoading({
title: '加载中...' title: '加载中...'
}); });
let pages = getCurrentPages(); // 当前页面 let pages = getCurrentPages(); // 当前页面
let beforePage = pages[pages.length - 2]; // 前一个页面 let beforePage = pages[pages.length - 2]; // 前一个页面
that.request2( that.request2({
{
url: '/api/AppletUser/SetUserApplyForBeDistrbutor', url: '/api/AppletUser/SetUserApplyForBeDistrbutor',
data: that.msg data: that.msg
}, },
(res) => { (res) => {
uni.hideLoading(); uni.hideLoading();
setTimeout(()=>{ setTimeout(() => {
uni.navigateBack({ uni.navigateBack({
success: function() { success: function() {
beforePage.onLoad(); // 执行前一个页面的created方法 beforePage.onLoad(); // 执行前一个页面的created方法
} }
}); });
},1000) }, 1000)
} }
); );
} }
}) })
} }
} }
} }
</script> </script>
<style> <style>
.s_addStyle{ .s_addStyle {
background: #fff; background: #fff;
position: relative; position: relative;
} }
.s_addStyle .addTbox{
.s_addStyle .addTbox {
width: 100%; width: 100%;
border-bottom: 1px solid #f5f5f5; border-bottom: 1px solid #f5f5f5;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
height: 50px; height: 50px;
} }
.addTbox .addTbox_l{
width:180rpx ;
} .addTbox .addTbox_l {
.s_addStyle .apply{ width: 180rpx;
}
.s_addStyle .apply {
width: 93%; width: 93%;
height: 45px; height: 45px;
border-radius: 22.5px; border-radius: 22.5px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.s_addStyle .agreementbox{ .s_addStyle .agreementbox {
position: fixed; position: fixed;
left: 0; left: 0;
top: 0; top: 0;
...@@ -231,8 +215,9 @@ ...@@ -231,8 +215,9 @@
background: #333333; background: #333333;
opacity: 0.3; opacity: 0.3;
z-index: 888; z-index: 888;
} }
.s_addStyle .agreementbox_t{
.s_addStyle .agreementbox_t {
position: fixed; position: fixed;
left: 0; left: 0;
top: 0; top: 0;
...@@ -242,21 +227,23 @@ ...@@ -242,21 +227,23 @@
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_t .agreement_b {
width: 80%;
border-radius: 10px; border-radius: 10px;
background: #fff; background: #fff;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
overflow: hidden; overflow: hidden;
} }
.s_addStyle .agreementbox_t .agreement_bottom{
.s_addStyle .agreementbox_t .agreement_bottom {
width: 100%; width: 100%;
height: 50px; height: 50px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
</style> </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> <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">
...@@ -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,7 +39,7 @@ ...@@ -47,7 +39,7 @@
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
pageTitle: '购买记录', pageTitle: '购买记录',
...@@ -87,14 +79,12 @@ export default { ...@@ -87,14 +79,12 @@ export default {
}, },
onLoad: function(option) { onLoad: function(option) {
//option为object类型，会序列化上个页面传递的参数 //option为object类型，会序列化上个页面传递的参数
this.loading = true; this.loading = true;
this.init(); this.init();
}, },
methods: { methods: {
init() { init() {
this.request2( this.request2({
{
url: '/api/AppletUser/GetVipBuyPageList', url: '/api/AppletUser/GetVipBuyPageList',
data: this.msg data: this.msg
}, },
...@@ -120,29 +110,31 @@ export default { ...@@ -120,29 +110,31 @@ export default {
} }
} }
} }
}; };
</script> </script>
<style> <style>
.recordlistStyle { .recordlistStyle {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #f3f4f6; background: #f3f4f6;
} }
.recordlistStyle .recordList{
.recordlistStyle .recordList {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
margin-top:10px; margin-top: 10px;
} }
.recordlistStyle .r_list_item{
.recordlistStyle .r_list_item {
width: 94%; width: 94%;
height: auto; height: auto;
border-radius: 6px; border-radius: 6px;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
display: flex; display: flex;
margin-bottom:15px; margin-bottom: 15px;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: column; -webkit-flex-direction: column;
...@@ -150,8 +142,9 @@ export default { ...@@ -150,8 +142,9 @@ export default {
padding: 10px; padding: 10px;
color: #FFFFFF; color: #FFFFFF;
background-image: url(https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/shareTop.png); background-image: url(https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/shareTop.png);
} }
.recordlistStyle .loading {
.recordlistStyle .loading {
width: 180rpx; width: 180rpx;
height: 180rpx; height: 180rpx;
background: #000000; background: #000000;
...@@ -166,8 +159,9 @@ export default { ...@@ -166,8 +159,9 @@ export default {
top: 30%; top: 30%;
margin-left: -100rpx; margin-left: -100rpx;
z-index: 999; z-index: 999;
} }
.recordlistStyle .list_top{
.recordlistStyle .list_top {
width: 100%; width: 100%;
display: flex; display: flex;
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
...@@ -180,8 +174,9 @@ export default { ...@@ -180,8 +174,9 @@ export default {
-webkit-box-pack: justify; -webkit-box-pack: justify;
justify-content: space-between; justify-content: space-between;
margin-bottom: 6px; margin-bottom: 6px;
} }
.list_top_last{
.list_top_last {
padding-top: 3px; padding-top: 3px;
justify-content: flex-start; justify-content: flex-start;
width: 100%; width: 100%;
...@@ -189,5 +184,5 @@ export default { ...@@ -189,5 +184,5 @@ export default {
flex-direction: wrap; flex-direction: wrap;
margin-bottom: 6px; margin-bottom: 6px;
align-items: top; align-items: top;
} }
</style> </style>
\ No newline at end of file
pages/share/buyVip/index.vue
View file @ d4ccb07b
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
pageTitle: 'vip购买', pageTitle: 'vip购买',
...@@ -69,8 +69,7 @@ export default { ...@@ -69,8 +69,7 @@ export default {
//初始化信息 //初始化信息
init() { init() {
uni.showNavigationBarLoading(); uni.showNavigationBarLoading();
this.request2( this.request2({
{
url: '/api/AppletUser/GetUserVipSettings', url: '/api/AppletUser/GetUserVipSettings',
data: {} data: {}
}, },
...@@ -88,7 +87,7 @@ export default { ...@@ -88,7 +87,7 @@ export default {
}, },
//点击立即开通 //点击立即开通
openImediate() { openImediate() {
if(this.month>0){ if (this.month > 0) {
var Myobj = this.dataList.fxGrade[0]; var Myobj = this.dataList.fxGrade[0];
uni.navigateTo({ uni.navigateTo({
url: '/pages/share/buyInterest/index' + '?GradeId=' + Myobj.Id + '&Money=' + Myobj.BuyMoney url: '/pages/share/buyInterest/index' + '?GradeId=' + Myobj.Id + '&Money=' + Myobj.BuyMoney
...@@ -102,23 +101,26 @@ export default { ...@@ -102,23 +101,26 @@ export default {
}); });
} }
} }
}; };
</script> </script>
<style> <style>
.vipMain { .vipMain {
background: #f3f4f6; background: #f3f4f6;
} }
.vip_buyRule {
.vip_buyRule {
word-break: break-all; word-break: break-all;
white-space: normal; white-space: normal;
} }
.vipContent {
.vipContent {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: relative; position: relative;
} }
.vipInner {
.vipInner {
width: 90%; width: 90%;
height: 170px; height: 170px;
position: absolute; position: absolute;
...@@ -126,8 +128,9 @@ export default { ...@@ -126,8 +128,9 @@ export default {
left: 50%; left: 50%;
margin-left: -45%; margin-left: -45%;
border-radius: 4px; border-radius: 4px;
} }
.vipMain .vip_yue {
.vipMain .vip_yue {
width: 78%; width: 78%;
margin: 20px auto 10px; margin: 20px auto 10px;
vertical-align: top; vertical-align: top;
...@@ -135,29 +138,35 @@ export default { ...@@ -135,29 +138,35 @@ export default {
justify-content: space-around; justify-content: space-around;
flex-wrap: nowrap; flex-wrap: nowrap;
color: #fff; color: #fff;
} }
.vipMain .vipIcon {
.vipMain .vipIcon {
width: 50px; width: 50px;
height: 50px; height: 50px;
} }
.vipMain .vipIcon img {
.vipMain .vipIcon img {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.vipMain .vip_Month {
.vipMain .vip_Month {
font-size: 26px; font-size: 26px;
color: #fff; color: #fff;
} }
.vipMain .vip_yellow {
.vipMain .vip_yellow {
color: #fff100; color: #fff100;
font-size: 36px; font-size: 36px;
margin: 0 5px; margin: 0 5px;
} }
.vipMain .vip_lastDiv {
.vipMain .vip_lastDiv {
font-size: 12px; font-size: 12px;
color: #fff; color: #fff;
} }
.vipMain .my_VipBtn {
.vipMain .my_VipBtn {
width: 85%; width: 85%;
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
...@@ -167,15 +176,17 @@ export default { ...@@ -167,15 +176,17 @@ export default {
color: #510a63; color: #510a63;
text-align: center; text-align: center;
border-radius: 20px; border-radius: 20px;
} }
.vip_activeRule {
.vip_activeRule {
width: 100%; width: 100%;
position: absolute; position: absolute;
bottom: 25px; bottom: 25px;
text-align: center; text-align: center;
color: #dd6ada; color: #dd6ada;
} }
.vipMain .agreementbox_t {
.vipMain .agreementbox_t {
position: fixed; position: fixed;
left: 0; left: 0;
top: 0; top: 0;
...@@ -186,8 +197,9 @@ export default { ...@@ -186,8 +197,9 @@ export default {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background: rgba(0, 0, 0, 0.6); background: rgba(0, 0, 0, 0.6);
} }
.vipMain .agreementbox_t .agreement_b {
.vipMain .agreementbox_t .agreement_b {
width: 80%; width: 80%;
border-radius: 10px; border-radius: 10px;
background: #fff; background: #fff;
...@@ -195,31 +207,35 @@ export default { ...@@ -195,31 +207,35 @@ export default {
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
overflow: hidden; overflow: hidden;
} }
.vipMain .agreementbox_t .agreement_bottom {
.vipMain .agreementbox_t .agreement_bottom {
width: 100%; width: 100%;
height: 50px; height: 50px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.vipMain .buyVipClose {
.vipMain .buyVipClose {
width: 40px; width: 40px;
height: 40px; height: 40px;
position: absolute; position: absolute;
right: 7px; right: 7px;
top: 0; top: 0;
font-size: 25px; font-size: 25px;
} }
.vipMain .my_buyRecord {
.vipMain .my_buyRecord {
width: 100%; width: 100%;
text-align: right; text-align: right;
padding-right: 30px; padding-right: 30px;
margin-top: 15px; margin-top: 15px;
color: #fff100; color: #fff100;
} }
.disBtn{
background-color:gray!important; .disBtn {
color:#fff!important; background-color: gray !important;
} color: #fff !important;
}
</style> </style>
\ No newline at end of file
pages/share/cash/cash.vue
View file @ d4ccb07b
This diff is collapsed.
pages/share/examine.vue
View file @ d4ccb07b
<template> <template>
<view class="examineStyle" :style="{'height':contentHeight}"> <view class="examineStyle" :style="{'height':contentHeight}">
<view style="width: 100%;height: 100%;"> <view style="width: 100%;height: 100%;">
<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;">
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;
">
<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"> <view class="box_top">
<u-avatar :src="item.Photo" size="110"></u-avatar> <u-avatar :src="item.Photo" size="110"></u-avatar>
<view class="box_r"> <view class="box_r">
<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;">
...@@ -37,40 +24,18 @@ ...@@ -37,40 +24,18 @@
<Text style='font-size: 13px;'>分销商电话：{{item.Mobile}}</Text> <Text style='font-size: 13px;'>分销商电话：{{item.Mobile}}</Text>
</view> </view>
<view class="box_bootom"> <view class="box_bootom">
<u-button type="error"size="mini" style='margin-right: 15px;' @click='handle(2,item.UserId)'>拒绝</u-button> <u-button type="error" size="mini" style='margin-right: 15px;' @click='handle(2,item.UserId)'>拒绝</u-button>
<u-button type="success" size="mini" @click='handle(1,item.UserId)'>同意</u-button> <u-button type="success" size="mini" @click='handle(1,item.UserId)'>同意</u-button>
<!-- <view class="box_bo_item" style="margin-right: 15px;">
<Text style='color: #19be6b;'>同意</Text>
</view> </view>
<view class="box_bo_item">
<Text style='color: #fa3534;'>拒绝</Text>
</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>
<u-modal v-model="showModal" :content="timsg.Type==1?'通过审核':'拒绝通过'" :show-cancel-button="true" :show-title="false"
<u-modal @confirm="confirm" :border-radius="20"></u-modal>
v-model="showModal"
:content="timsg.Type==1?'通过审核':'拒绝通过'"
:show-cancel-button="true"
:show-title="false"
@confirm="confirm"
:border-radius="20"
></u-modal>
</view> </view>
</template> </template>
...@@ -79,48 +44,44 @@ ...@@ -79,48 +44,44 @@
data() { data() {
return { return {
pageTitle: "分销商审核", pageTitle: "分销商审核",
contentHeight:0, contentHeight: 0,
mainColor:'', mainColor: '',
secondary:'', secondary: '',
current:0, current: 0,
g:[], g: [],
timsg: {
timsg:{ UserId: 0,
UserId:0, Type: 0,
Type:0,
}, },
showModal:false, showModal: false,
msg:{ msg: {
pageIndex: 1, pageIndex: 1,
pageSize:10, pageSize: 10,
Name:'', Name: '',
Source:'', Source: '',
NickName:'', NickName: '',
Mobile:'', Mobile: '',
}, },
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.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;
...@@ -131,17 +92,14 @@ ...@@ -131,17 +92,14 @@
}); });
}, },
methods: { methods: {
init(){ init() {
uni.showLoading({ uni.showLoading({
title: '加载中' title: '加载中'
}); });
this.request2( this.request2({
{
url: '/api/AppletUser/GetHpUserReferralsAuditList', url: '/api/AppletUser/GetHpUserReferralsAuditList',
data: this.msg data: this.msg
}, },
(res) => { (res) => {
uni.hideLoading(); uni.hideLoading();
this.g = this.g.concat(res.data.pageData); this.g = this.g.concat(res.data.pageData);
...@@ -149,7 +107,6 @@ ...@@ -149,7 +107,6 @@
if (this.page_count == 1) { if (this.page_count == 1) {
this.status = "nomore"; this.status = "nomore";
} }
} }
); );
}, },
...@@ -162,25 +119,23 @@ ...@@ -162,25 +119,23 @@
this.status = "nomore"; this.status = "nomore";
} }
}, },
handle(type,UserId){ handle(type, UserId) {
this.timsg.Type = type; this.timsg.Type = type;
this.timsg.UserId = UserId; this.timsg.UserId = UserId;
this.showModal=true; this.showModal = true;
}, },
confirm(){ confirm() {
uni.showLoading({ uni.showLoading({
title: '加载中' title: '加载中'
}); });
this.request2( this.request2({
{
url: '/api/AppletUser/SetHpUserReferralsAudit', url: '/api/AppletUser/SetHpUserReferralsAudit',
data: this.timsg data: this.timsg
}, },
(res) => { (res) => {
uni.hideLoading(); uni.hideLoading();
this.g=[]; this.g = [];
this.msg.pageIndex=1; this.msg.pageIndex = 1;
this.init(); this.init();
} }
); );
...@@ -190,11 +145,11 @@ ...@@ -190,11 +145,11 @@
</script> </script>
<style> <style>
.examineStyle{ .examineStyle {
background: #f3f4f6; background: #f3f4f6;
}
} .examineStyle .loading {
.examineStyle .loading{
width: 200rpx; width: 200rpx;
height: 200rpx; height: 200rpx;
background: #000000; background: #000000;
...@@ -206,11 +161,12 @@ ...@@ -206,11 +161,12 @@
justify-content: center; justify-content: center;
position: fixed; position: fixed;
left: 50%; left: 50%;
top:30%; top: 30%;
margin-left: -100rpx; margin-left: -100rpx;
z-index: 999; z-index: 999;
} }
.examineStyle .listbox{
.examineStyle .listbox {
width: 100%; width: 100%;
background: #fff; background: #fff;
padding: 0 15px; padding: 0 15px;
...@@ -218,48 +174,51 @@ ...@@ -218,48 +174,51 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
.examineStyle .box_top{
width:100% ; .examineStyle .box_top {
width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 10px 0 ; padding: 10px 0;
border-bottom: 1px solid #f5f5f5; border-bottom: 1px solid #f5f5f5;
} }
.examineStyle .box_r{
.examineStyle .box_r {
width: calc(100vw - 30px - 55px - 20px); width: calc(100vw - 30px - 55px - 20px);
height: 55px; height: 55px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
} }
.box_r .l_name{
.box_r .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;
} }
.examineStyle .box_b{
.examineStyle .box_b {
width: 100%; width: 100%;
padding: 15px 0; padding: 15px 0;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.examineStyle .box_bootom{
.examineStyle .box_bootom {
width: 100%; width: 100%;
height: 60px; height: 60px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
} }
.examineStyle .box_bootom .box_bo_item{
.examineStyle .box_bootom .box_bo_item {
width: 50px; width: 50px;
height: 30px; height: 30px;
border-radius: 15px; border-radius: 15px;
......
pages/share/index/index.vue
View file @ d4ccb07b
This diff is collapsed.
pages/share/level/level.vue
View file @ d4ccb07b
...@@ -14,12 +14,7 @@ ...@@ -14,12 +14,7 @@
<Text>立即升级</Text> <Text>立即升级</Text>
</view> </view>
</view> </view>
<u-popup v-model="show" mode="center" length="80%">
<u-popup v-model="show"
mode="center"
length="80%"
>
<view class="popup"> <view class="popup">
<view class="popup_t"> <view class="popup_t">
<Text>等级说明</Text> <Text>等级说明</Text>
...@@ -40,64 +35,57 @@ ...@@ -40,64 +35,57 @@
data() { data() {
return { return {
pageTitle: "升级条件", pageTitle: "升级条件",
contentHeight:0, contentHeight: 0,
show:false, show: false,
mainColor:'', mainColor: '',
secondary:'', secondary: '',
level:'', level: '',
level_bg:'', level_bg: '',
level_bg2:'', level_bg2: '',
} }
}, },
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 :
: []; [];
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/GetUserDistrbutorUpgradeConditions', url: '/api/AppletUser/GetUserDistrbutorUpgradeConditions',
data: {} data: {}
}, },
(res) => { (res) => {
uni.hideNavigationBarLoading() uni.hideNavigationBarLoading()
this.level = res.data this.level = res.data
} }
); );
}, },
Upgrade(){ Upgrade() {
uni.showNavigationBarLoading(); uni.showNavigationBarLoading();
this.request2({
this.request2(
{
url: '/api/AppletUser/SetUserDistrbutorUpgrade', url: '/api/AppletUser/SetUserDistrbutorUpgrade',
data: { data: {
Id:this.level.GradeInfo.Id Id: this.level.GradeInfo.Id
} }
}, },
(res) => { (res) => {
uni.hideNavigationBarLoading() uni.hideNavigationBarLoading()
uni.showToast({ uni.showToast({
title:res.message, title: res.message,
icon:'none' icon: 'none'
}) })
this.init() this.init()
} }
...@@ -108,21 +96,22 @@ ...@@ -108,21 +96,22 @@
</script> </script>
<style> <style>
.levelStyle .imgbg{ .levelStyle .imgbg {
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
.levelStyle .leveltop{
font-size: 26px;
.levelStyle .leveltop {
font-size: 26px;
margin-top: 50px; margin-top: 50px;
} }
.levelStyle .levelc{
.levelStyle .levelc {
width: 94%; width: 94%;
height:70px ; height: 70px;
border-radius: 8px; border-radius: 8px;
background: #fff; background: #fff;
display: flex; display: flex;
...@@ -130,9 +119,10 @@ ...@@ -130,9 +119,10 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 0 15px; padding: 0 15px;
margin-top:50px ; margin-top: 50px;
} }
.levelStyle .popup{
.levelStyle .popup {
width: 100%; width: 100%;
height: 285px; height: 285px;
background: #fff; background: #fff;
...@@ -143,21 +133,24 @@ ...@@ -143,21 +133,24 @@
overflow: hidden; overflow: hidden;
justify-content: space-between; justify-content: space-between;
} }
.levelStyle .popup_c{
.levelStyle .popup_c {
width: 94%; width: 94%;
height: 160px; height: 160px;
padding: 10px; padding: 10px;
border-radius: 5px; border-radius: 5px;
border: 1px solid #f5f5f5; border: 1px solid #f5f5f5;
} }
.levelStyle .popup_t{
.levelStyle .popup_t {
width: 100%; width: 100%;
height:50px ; height: 50px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.levelStyle .level_b{
.levelStyle .level_b {
width: 70%; width: 70%;
height: 50px; height: 50px;
border-radius: 25px; border-radius: 25px;
......
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