Skip to content

M
mallapp
Commit 70955046 authored by 罗超's avatar 罗超
Browse files
Options

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

parents 59c91087 e68a26c9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 448 additions and 227 deletions
pages.json
View file @ 70955046
......@@ -82,7 +82,11 @@
},
{
"path": "cash/cash"
}
},
{
"path": "level/level"
}
]
},
{
......
pages/cash-detail/cash-detail.vue
View file @ 70955046
......@@ -84,7 +84,7 @@
loadText: {
loadmore: "轻轻上拉，加载更多",
loading: "努力加载中",
nomore: "没有更多优惠券了",
nomore: "没有更多了",
},
}
},
......@@ -136,6 +136,8 @@
},
change(index){
this.msg.AuditStatus = index;
this.msg.pageIndex=1;
this.g=[]
this.init()
},
lower(e) {
......
pages/coupon/index/index.vue
View file @ 70955046
......@@ -112,7 +112,7 @@ export default {
loadText: {
loadmore: "轻轻上拉，加载更多",
loading: "努力加载中",
nomore: "没有更多优惠券了",
nomore: "没有更多了",
},
};
},
......
pages/coupon/list/list.vue
View file @ 70955046
......@@ -86,7 +86,7 @@ export default {
loadText: {
loadmore: "轻轻上拉，加载更多",
loading: "努力加载中",
nomore: "没有更多优惠券了",
nomore: "没有更多了",
},
};
},
......
pages/favorite/favorite.vue
View file @ 70955046
......@@ -99,7 +99,7 @@
loadText: {
loadmore: "轻轻上拉，加载更多",
loading: "努力加载中",
nomore: "没有更多优惠券了",
nomore: "没有更多了",
},
}
},
......
pages/foot/index/index.vue
View file @ 70955046
......@@ -171,7 +171,7 @@
loadText: {
loadmore: "轻轻上拉，加载更多",
loading: "努力加载中",
nomore: "没有更多足迹了",
nomore: "没有更多了",
},
}
},
......
pages/order/index/index.vue
View file @ 70955046
This diff is collapsed.
pages/order/order-detail.vue
View file @ 70955046
......@@ -22,7 +22,7 @@
<view class="title" v-if="scrollTop > 50">订单详情</view>
</view>
<view class="status" :style="[headStyle]">
<view class="status-title">{{ orders.status_text }}</view>
<view class="status-title">{{ orders.OrderStatusName }}</view>
<view class="sub-title">
<u-icon
style="display: inline-block; vertical-align: middle;"
......@@ -41,37 +41,37 @@
<view class="content">
<view class="concat">
<text style="font-weight: 700; margin-right: 20px;">{{
orders.name
orders.Consignee
}}</text>
<text>{{ orders.mobile }}</text>
<text>{{ orders.Mobile }}</text>
</view>
<view class="address">{{ orders.address }}</view>
<view class="address">{{ orders.DistrictAddress }}{{orders.ShoppingAddress}}</view>
</view>
</view>
<view class="block goods">
<view class="item" v-for="(x, i) in orders.detail" :key="i">
<view class="item" v-for="(x, i) in orders.DetailList" :key="i">
<view style="display: flex;">
<image
:src="x.goods_info.pic_url"
:src="x.CoverImagePath"
class="img"
@click="redirectGoods(x.goods_id)"
@click="redirectGoods(x.GoodsId)"
mode="aspectFill"
/>
<view class="good-info">
<view class="good-name" @click="redirectGoods(x.goods_id)">{{
x.goods_info.name
x.GoodsName
}}</view>
<view class="good-attr">
<text>数量：{{ x.num }}</text>
<text>数量：{{ x.Number }}</text>
<text
v-for="(y, yi) in x.goods_info.attr_list"
v-for="(y, yi) in x.SpecificationList"
:key="yi"
style="margin-right: 5px;"
>
{{ y.attr_group_name }}：{{ y.attr_name }}
{{y}}
</text>
</view>
<view class="good-price">￥{{ x.total_original_price }}</view>
<view class="good-price">￥{{ x.Final_Price }}</view>
</view>
</view>
<template v-for="(e, ei) in orders.detailExpress">
......@@ -130,54 +130,52 @@
<view class="order-info-item">
<view class="field">
<view class="label">订单编号：</view>
<view class="content">{{ orders.order_no }}</view>
<view class="content">{{ orders.OrderNo }}</view>
</view>
<view class="field">
<view class="label">下单时间：</view>
<view class="content">{{ orders.created_at }}</view>
<view class="content">{{ orders.CreateDate }}</view>
</view>
</view>
<view class="order-info-item">
<view class="field">
<view class="label">支付方式：</view>
<view class="content">{{ orders.pay_type_text }}</view>
<view class="content">{{ orders.PaymentWayName }}</view>
</view>
<view class="field">
<!-- <view class="field">
<view class="label">支付时间：</view>
<view class="content">{{ orders.pay_time }}</view>
</view>
</view> -->
</view>
<!-- <view class="order-info-item" v-if="orders.detailExpress[0].">
<view class="field">
<view class="order-info-item" >
<view class="field">
<view class="label">配送方式：</view>
<view class="content">{{
orders.detailExpress[0].express_content
}}</view>
<view class="content">{{orders.DeliveryMethodName}}</view>
</view>
</view> -->
</view>
</view>
<view class="block">
<view class="order-info-item">
<view class="field">
<view class="label">商品总额</view>
<view class="content right">￥{{ orders.total_goods_price }}</view>
<view class="content right">￥{{ orders.PreferPrice }}</view>
</view>
<view class="field">
<view class="label">运费</view>
<view class="content right">+￥{{ orders.express_price }}</view>
<view class="content right">+￥{{ orders.FreightMoney }}</view>
</view>
<view class="field">
<view class="label">优惠</view>
<view class="content right"
>-￥{{ orders.coupon_discount_price }}</view
>-￥{{ orders.CouponMoney }}</view
>
</view>
<view class="field">
<!-- <view class="field">
<view class="label">积分抵扣</view>
<view class="content right"
>-￥{{ orders.integral_deduction_price }}</view
>
</view>
</view> -->
<view class="field">
<view class="label">&nbsp;</view>
<view class="content right">
......@@ -188,10 +186,11 @@
>￥</text
>
<text style="font-size: 17px;" :style="{ color: mc }">{{
orders.total_pay_price.split(".")[0]
orders.Income.toString().split(".")[0]
}}</text>
<text style="font-size: 12px;" :style="{ color: mc }"
>.{{ orders.total_pay_price.split(".")[1] || "00" }}</text
>.{{ orders.Income.toString().split(".")[1] || "00" }}</text
>
</view>
</view>
......@@ -340,8 +339,10 @@ export default {
this.headStyle.paddingTop = nav.top + "px";
this.contentStyle.paddingTop = nav.top + 44 + "px";
let p = getCurrentPages();
console.log(p)
if (p.length > 1) {
this.prevPage = p[p.length - 2].rou;
this.prevPage = p[p.length - 2].route;
console.log(p[p.length - 2].route)
}
this.themCustomStyle.background = this.mc;
this.init();
......@@ -424,20 +425,16 @@ export default {
this.showAfter = false;
},
init() {
let h = this.apiheader();
this.request(
{
url: "",
header: h,
data: {
r: "api/order/detail",
id: this.id,
},
},
this.request2(
{
url: '/api/AppletOrder/GetAppletMyOrderInfo',
data: {OrderId:this.id}
},
(res) => {
this.orders = res.data.detail;
this.orders = res.data;
this.loading = false;
this.initRecommend(this.orders.detail[0].goods_id);
// this.initRecommend(this.orders.detail[0].goods_id);
}
);
},
......@@ -472,6 +469,7 @@ export default {
});
},
redirectPrev() {
console.log('返回')
if (this.prevPage != "") {
uni.navigateBack({
delta: 1,
......@@ -624,7 +622,9 @@ export default {
text-overflow: ellipsis;
white-space: nowrap;
color: gray;
flex: 1;
display: flex;
flex-direction: column;
}
.orderdetail .goods .item .good-info .good-price {
font-size: 16px;
......
pages/share-order/share-order.vue
View file @ 70955046
......@@ -100,7 +100,7 @@
loadText: {
loadmore: "轻轻上拉，加载更多",
loading: "努力加载中",
nomore: "没有更多优惠券了",
nomore: "没有更多了",
},
}
},
......@@ -154,11 +154,13 @@
},
change(index){
this.msg.DistrbutionOrderSelectStatus = index;
this.msg.pageIndex=1;
this.g=[]
this.init()
},
isdetail(index){
this.g[index].showdetail = !this.g[index].showdetail
},
},
lower(e) {
if (this.msg.pageIndex < this.page_count) {
this.msg.pageIndex++;
......
pages/share-team/share-team.vue
View file @ 70955046
......@@ -82,7 +82,7 @@
loadText: {
loadmore: "轻轻上拉，加载更多",
loading: "努力加载中",
nomore: "没有更多优惠券了",
nomore: "没有更多了",
},
}
......@@ -135,6 +135,8 @@
change(index){
this.current = index
this.msg.GradeId = index+1;
this.msg.pageIndex=1;
this.g=[]
this.init()
},
lower(e) {
......
pages/share/cash/cash.vue
View file @ 70955046
......@@ -16,7 +16,7 @@
<view class="tixian">
<view style='display: flex;flex-direction: row;align-items: center;'>
<Text :style="{'color':mainColor,'font-size':'18px'}">￥</Text>
<input class="uni-input" v-model="txmoney" placeholder="请输入提现金额" style="font-size: 16px;margin-left: 5px;"/>
<input class="uni-input" v-model="msg.AppliedMoney" placeholder="请输入提现金额" style="font-size: 16px;margin-left: 5px;"/>
</view>
<Text @click='allmoney'>全部</Text>
</view>
......@@ -27,7 +27,35 @@
<Text>{{txmode}}</Text>
<u-icon name="arrow" color='#9F9F9F'></u-icon>
</view>
</view>
<view class='inputbox' v-if='txmode!="" && (msg.WithdrawalWay==2 || msg.WithdrawalWay==3 || msg.WithdrawalWay==4)'>
<view class="inputItem">
<!-- <Text v-if='msg.WithdrawalWay==1'>账户名称</Text> -->
<Text v-if='msg.WithdrawalWay==2'>微信名称</Text>
<Text v-if='msg.WithdrawalWay==3'>支付宝名称</Text>
<Text v-if='msg.WithdrawalWay==4'>账户名称</Text>
<!-- <Text v-if='msg.WithdrawalWay==5'>账户名称</Text> -->
<input class="uni-input inputM" v-model="msg.AccountName" />
</view>
<view class="inputItem">
<!-- <Text v-if='msg.WithdrawalWay==1'>账户名称</Text> -->
<Text v-if='msg.WithdrawalWay==2'>微信账号</Text>
<Text v-if='msg.WithdrawalWay==3'>支付宝账号</Text>
<Text v-if='msg.WithdrawalWay==4'>账户号</Text>
<!-- <Text v-if='msg.WithdrawalWay==5'>账户名称</Text> -->
<input class="uni-input inputM" v-model="msg.AccountNumber" />
</view>
<view class="inputItem" v-if="msg.WithdrawalWay==4">
<Text>银行名称</Text>
<input class="uni-input inputM" v-model="msg.BankName" />
</view>
</view>
<View class='getapply' :style="{background:mainColor}" @click='getapply'>
<Text>提交申请</Text>
</View>
......@@ -91,7 +119,7 @@
secondary:'',
cash:{},
money:0,
txmoney:'',
txmode:'',
show:false,
show2:false,
......@@ -105,8 +133,13 @@
],
value:'',
msg:{
AppliedMoney:0,
AppliedMoney:'',
Fee:0,
RemitMoney:0,
WithdrawalWay:'',
AccountName:'',
AccountNumber:'',
BankName:'',
}
}
......@@ -138,8 +171,6 @@
methods: {
init(){
uni.showNavigationBarLoading();
let h = this.apiheader();
this.request2(
{
url: '/api/AppletUser/GetUserDistrbutorWithdrawDepositBalance',
......@@ -159,16 +190,21 @@
);
},
allmoney(){
this.txmoney = Number(this.cash.CommissionWithdrawal)
this.msg.AppliedMoney = Number(this.cash.CommissionWithdrawal)
},
radioChange(item){
this.txmode = item.Name;
this.msg.WithdrawalWay = item.Id;
this.msg.AccountName = '';
this.msg.AccountNumber = '';
this.msg.BankName = '';
this.show=false
},
getapply(){
// TODO 接口暂无
if(this.txmoney==''){
if(this.msg.AppliedMoney==''){
uni.showToast({
title: "请输入提现金额",
......@@ -183,6 +219,54 @@
});
return false
}
if(this.msg.WithdrawalWay==2|| this.msg.WithdrawalWay==3 || this.msg.WithdrawalWay==4){
if(this.msg.AccountName==''){
uni.showToast({
title: "账户名称不能为空",
icon: "none"
});
return false
}
if(this.msg.AccountNumber==''){
uni.showToast({
title: "账户号不能为空",
icon: "none"
});
return false
}
if(this.msg.BankName=='' && this.msg.WithdrawalWay==4){
uni.showToast({
title: "银行名称不能为空",
icon: "none"
});
return false
}
}
if(this.msg.AppliedMoney<this.cash.MinimumWithdrawalLimit){
uni.showToast({
title: "提现金额大于等于"+this.cash.MinimumWithdrawalLimit,
icon: "none"
});
return false
}
this.msg.Fee = this.cash.Fee;
uni.showNavigationBarLoading();
this.request2(
{
url: '/api/AppletUser/SetUserDistrbutorWithdrawDeposit',
data: this.msg
},
(res) => {
uni.hideNavigationBarLoading()
uni.showToast({
title: res.message,
icon: "none"
});
this.init()
}
);
}
}
}
......@@ -276,4 +360,26 @@
justify-content: space-between;
border-top:1px solid #f5f5f5
}
.cashStyle .inputbox{
width: 100%;
background: #fff;
display: flex;
flex-direction: column;
align-items: center;
margin-top: 10px;
padding:0 15px ;
}
.cashStyle .inputItem{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
align-items: center;
padding: 15px 0;
border-bottom: 1px solid #f5f5f5;
}
.cashStyle .inputM{
text-align: right;
}
</style>
pages/share/index/index.vue
View file @ 70955046
......@@ -14,6 +14,13 @@
<u-button shape="circle" type="error" size="medium" @click='goshoping'>去商城逛逛</u-button>
</view>
</view>
<view v-if="sharestatus.Status==4" style="width: 100%;display: flex;flex-direction: column;align-items: center;">
<image :src="bg_img" style="width: 100%;height: 165px;"></image>
<Text style='margin-top: 70px;'>{{sharestatus.Msg}}</Text>
<!-- <view style="display: flex;align-items: center;justify-content: center;margin-top: 60rpx;">
<u-button shape="circle" type="error" size="medium" @click='goshoping'>去商城逛逛</u-button>
</view> -->
</view>
<view style="width: 100%;height: 100%;" v-if="sharestatus.Status==3">
<view class="sharebox_top" :style="{background:mainColor}">
<view class="sharebox_top_t">
......@@ -205,6 +212,20 @@
uni.navigateTo({
url: "/pages/share/add/add",
});
}else if(this.sharestatus.Status==1 && (this.sharestatus.ApplyFor==3 || this.sharestatus.ApplyFor==4)){
this.request2(
{
url: '/api/AppletUser/SetUserApplyForBeDistrbutor',
data: {
Name:'',
Mobile:'',
}
},
(res) => {
this.init()
}
);
}
},
......
pages/share/level/level.vue
View file @ 70955046
<template>
<view :style="{'height':contentHeight}">
<image :src="level_bg" v-if="level=='' " style="width: 100%;height: 100%;">
</image>
<view v-if="level!=''">
<!-- TODO暂不知道升级内容 -->
<view :style="{'height':contentHeight}" class="levelStyle">
<image :src="level_bg" v-if="level=='' " style="width: 100%;height: 100%;"></image>
<view :style="{ 'background-image': 'url(' + level_bg2 + ')', backgroundSize: '100%' }" v-if='level_bg2!="" ' class="imgbg">
<Text class='leveltop'>满足以下条件即可升级</Text>
<view class='levelc'>
<Text>{{level.GradeInfo.UpGradeConditionName}}</Text>
<view style="display: flex;flex-direction: row;align-items: center;" @click="show=true">
<Text style='font-size: 14px;color:#c8c9cc ;'>等级说明</Text>
<u-icon name="arrow" color='#c8c9cc'></u-icon>
</view>
</view>
<view class="level_b">
<!-- TODO接口暂无 -->
<Text>立即升级</Text>
</view>
</view>
<u-popup v-model="show"
mode="center"
length="80%"
>
<view class="popup">
<view class="popup_t">
<Text>等级说明</Text>
</view>
<view class="popup_c">
<Text>{{level.GradeInfo.GradeExplain}}</Text>
</view>
<view class="popup_t" style="border-top: 1px solid #f5f5f5;" @click="show=false">
<Text>我知道了</Text>
</view>
</view>
</u-popup>
</view>
</template>
......@@ -15,10 +42,12 @@
return {
pageTitle: "升级条件",
contentHeight:0,
show:false,
mainColor:'',
secondary:'',
level:'',
level_bg:'',
level_bg2:'',
}
},
created(){
......@@ -36,6 +65,9 @@
this.level_bg = wx.getStorageSync("basedata")
? wx.getStorageSync("basedata").__wxapp_img.share.no_level_bg
: '';
this.level_bg2 = wx.getStorageSync("basedata")
? wx.getStorageSync("basedata").__wxapp_img.share.sharebg
: '';
pages.forEach((x) => {
if (x.value == u) {
this.pageTitle = x.new_name ? x.new_name : x.name;
......@@ -50,20 +82,16 @@
uni.showNavigationBarLoading();
let h = this.apiheader();
this.request(
this.request2(
{
url: "",
header:h,
data: {
r: "api/share/level",
},
},
url: '/api/AppletUser/GetUserDistrbutorUpgradeConditions',
data: {}
},
(res) => {
uni.hideNavigationBarLoading()
this.level = res.data.list
}
(res) => {
uni.hideNavigationBarLoading()
this.level = res.data
}
);
},
}
......@@ -71,5 +99,66 @@
</script>
<style>
.levelStyle .imgbg{
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
align-items: center;
}
.levelStyle .leveltop{
font-size: 26px;
color: #fff;
margin-top: 50px;
}
.levelStyle .levelc{
width: 94%;
height:70px ;
border-radius: 8px;
background: #fff;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
padding: 0 15px;
margin-top:50px ;
}
.levelStyle .popup{
width: 100%;
height: 285px;
background: #fff;
display: flex;
flex-direction: column;
align-items: center;
border-radius: 8px;
overflow: hidden;
justify-content: space-between;
}
.levelStyle .popup_c{
width: 94%;
height: 160px;
padding: 10px;
border-radius: 5px;
border: 1px solid #f5f5f5;
}
.levelStyle .popup_t{
width: 100%;
height:50px ;
display: flex;
align-items: center;
justify-content: center;
}
.levelStyle .level_b{
width: 70%;
height: 50px;
border-radius: 25px;
display: flex;
align-items: center;
justify-content: center;
background: #F8DBAF;
color: #825E4F;
font-size: 18px;
margin-top: 40px;
font-weight: 500;
}
</style>
pages/user-center/integral-detail/integral-detail.vue
View file @ 70955046
......@@ -90,7 +90,7 @@ export default {
loadText: {
loadmore: "轻轻上拉，加载更多",
loading: "努力加载中",
nomore: "没有更多优惠券了",
nomore: "没有更多了",
},
};
},
......
pages/user-center/user-center.vue
View file @ 70955046
......@@ -144,7 +144,7 @@ export default {
this.bottommargin = c - 2 + 'px';
this.listbottom = c - 2 + 50 + 'px';
this.contentHeight = this.$utils.calcContentHeight(c);
console.log(wx.getStorageSync('basedata'))
let u = '/' + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync('basedata') ? wx.getStorageSync('basedata').bar_title : [];
// pages.forEach(x => {
......
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