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
Show whitespace changes
Inline Side-by-side
Showing with 448 additions and 227 deletions
pages.json
View file @ 70955046
...@@ -82,7 +82,11 @@ ...@@ -82,7 +82,11 @@
}, },
{ {
"path": "cash/cash" "path": "cash/cash"
},
{
"path": "level/level"
} }
] ]
}, },
{ {
......
pages/cash-detail/cash-detail.vue
View file @ 70955046
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
loadText: { loadText: {
loadmore: "轻轻上拉，加载更多", loadmore: "轻轻上拉，加载更多",
loading: "努力加载中", loading: "努力加载中",
nomore: "没有更多优惠券了", nomore: "没有更多了",
}, },
} }
}, },
...@@ -136,6 +136,8 @@ ...@@ -136,6 +136,8 @@
}, },
change(index){ change(index){
this.msg.AuditStatus = index; this.msg.AuditStatus = index;
this.msg.pageIndex=1;
this.g=[]
this.init() this.init()
}, },
lower(e) { lower(e) {
......
pages/coupon/index/index.vue
View file @ 70955046
...@@ -112,7 +112,7 @@ export default { ...@@ -112,7 +112,7 @@ export default {
loadText: { loadText: {
loadmore: "轻轻上拉，加载更多", loadmore: "轻轻上拉，加载更多",
loading: "努力加载中", loading: "努力加载中",
nomore: "没有更多优惠券了", nomore: "没有更多了",
}, },
}; };
}, },
......
pages/coupon/list/list.vue
View file @ 70955046
...@@ -86,7 +86,7 @@ export default { ...@@ -86,7 +86,7 @@ export default {
loadText: { loadText: {
loadmore: "轻轻上拉，加载更多", loadmore: "轻轻上拉，加载更多",
loading: "努力加载中", loading: "努力加载中",
nomore: "没有更多优惠券了", nomore: "没有更多了",
}, },
}; };
}, },
......
pages/favorite/favorite.vue
View file @ 70955046
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
loadText: { loadText: {
loadmore: "轻轻上拉，加载更多", loadmore: "轻轻上拉，加载更多",
loading: "努力加载中", loading: "努力加载中",
nomore: "没有更多优惠券了", nomore: "没有更多了",
}, },
} }
}, },
......
pages/foot/index/index.vue
View file @ 70955046
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
loadText: { loadText: {
loadmore: "轻轻上拉，加载更多", loadmore: "轻轻上拉，加载更多",
loading: "努力加载中", loading: "努力加载中",
nomore: "没有更多足迹了", nomore: "没有更多了",
}, },
} }
}, },
......
pages/order/index/index.vue
View file @ 70955046
...@@ -42,48 +42,48 @@ ...@@ -42,48 +42,48 @@
<view class="orderList"> <view class="orderList">
<view class="listBox" v-for="(item, index) in g" :key="index"> <view class="listBox" v-for="(item, index) in g" :key="index">
<view class="listBox_t"> <view class="listBox_t">
<Text>订单号：{{ item.order_no }}</Text> <Text>订单号：{{ item.OrderNo }}</Text>
<Text style="color: gray;">{{ item.status_text }}</Text> <Text style="color: gray;">{{ item.OrderStatusName }}</Text>
</view> </view>
<view class="listBox_c"> <view class="listBox_c">
<template v-if="item.detail.length == 1"> <template v-if="item.DetailList.length == 1">
<view <view
v-for="(cx, ci) in item.detail" v-for="(cx, ci) in item.DetailList"
:key="ci" :key="ci"
class="box_bottom" class="box_bottom"
@click="redirectToDetail(item.id)" @click="redirectToDetail(item.OrderId)"
> >
<image <image
:src="cx.goods_info.pic_url" :src="cx.CoverImagePath"
style="width: 80px; height: 80px; border-radius: 2px;" style="width: 80px; height: 80px; border-radius: 2px;"
mode="aspectFill" mode="aspectFill"
/> />
<view style="margin-left: 15px; flex: 1;"> <view style="margin-left: 15px; flex: 1;">
<Text class="topic_cont_text">{{ <Text class="topic_cont_text">{{
cx.goods_info.name cx.GoodsName
}}</Text> }}</Text>
</view> </view>
<view style="margin-left: 15px;"> <view style="margin-left: 15px;">
<text style="font-size: 10px;">￥</text> <text style="font-size: 10px;">￥</text>
<text style="font-size: 17px;">{{ <text style="font-size: 17px;">{{
item.total_price.toString().split(".")[0] cx.Final_Price.toString().split(".")[0]
}}</text> }}</text>
<text style="font-size: 11px;" <text style="font-size: 11px;"
>.{{ >.{{
item.total_price.toString().split(".")[1] || "00" cx.Final_Price.toString().split(".")[1] || "00"
}}</text }}</text
> >
</view> </view>
</view> </view>
</template> </template>
<template v-else> <template v-else>
<view class="goodboxmore" @click="redirectToDetail(item.id)"> <view class="goodboxmore" @click="redirectToDetail(item.OrderId)">
<view class="good-list"> <view class="good-list">
<view style="white-space: nowrap;"> <view style="white-space: nowrap;">
<image <image
v-for="(y, yi) in item.detail" v-for="(y, yi) in item.DetailList"
:key="yi" :key="yi"
:src="y.goods_info.pic_url" :src="y.CoverImagePath"
mode="aspectFill" mode="aspectFill"
class="item" class="item"
/> />
...@@ -93,15 +93,15 @@ ...@@ -93,15 +93,15 @@
<view> <view>
<text style="font-size: 10px;">￥</text> <text style="font-size: 10px;">￥</text>
<text style="font-size: 17px;">{{ <text style="font-size: 17px;">{{
item.total_price.toString().split(".")[0] item.Income.toString().split(".")[0]
}}</text> }}</text>
<text style="font-size: 11px;" <text style="font-size: 11px;"
>.{{ >.{{
item.total_price.toString().split(".")[1] || "00" item.Income.toString().split(".")[1] || "00"
}}</text }}</text
> >
</view> </view>
<view class="text">共{{ item.detail.length }}件</view> <view class="text">共{{ item.DetailList.length }}件</view>
</view> </view>
</view> </view>
</template> </template>
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
:custom-style="customStyle" :custom-style="customStyle"
v-on:click.stop="cancel(item, index)" v-on:click.stop="cancel(item, index)"
v-if=" v-if="
item.status_text == '待付款' || item.status_text == '待发货' item.OrderStatusName == '未付款' || item.OrderStatusName == '待发货'
" "
>取消订单</u-button >取消订单</u-button
> >
...@@ -123,30 +123,31 @@ ...@@ -123,30 +123,31 @@
size="medium" size="medium"
:custom-style="customStyle" :custom-style="customStyle"
@click.stop="cancel(item, index)" @click.stop="cancel(item, index)"
v-if="item.status_text == '待发货'" v-if="item.OrderStatusName == '待发货'"
>申请退货</u-button >申请退货</u-button
> --> > -->
<u-button <u-button
shape="circle" shape="circle"
size="medium" size="medium"
:custom-style="customStyle" :custom-style="customStyle"
v-if="item.status_text == '待评价'" v-if="item.OrderStatusName == '待评价'"
>评价晒单</u-button >评价晒单</u-button
> >
<u-button <u-button
shape="circle" shape="circle"
size="medium" size="medium"
:custom-style="themCustomStyle" :custom-style="themCustomStyle"
v-if="item.status_text == '待付款'" v-on:click.stop="payment(item)"
v-if="item.OrderStatusName == '未付款'"
>立即支付</u-button >立即支付</u-button
> >
<u-button <u-button
shape="circle" shape="circle"
size="medium" size="medium"
:custom-style=" :custom-style="
item.status_text == '待收货' ? customStyle : themCustomStyle item.OrderStatusName == '待收货' ? customStyle : themCustomStyle
" "
v-if="item.status_text != '待付款'" v-if="item.OrderStatusName != '未付款'"
@click.stop="buy(item)" @click.stop="buy(item)"
>再次购买</u-button >再次购买</u-button
> >
...@@ -154,14 +155,14 @@ ...@@ -154,14 +155,14 @@
shape="circle" shape="circle"
size="medium" size="medium"
:custom-style="customStyle" :custom-style="customStyle"
v-if="item.status_text == '待收货'" v-if="item.OrderStatusName == '待收货'"
>查看物流</u-button >查看物流</u-button
> >
<u-button <u-button
shape="circle" shape="circle"
size="medium" size="medium"
:custom-style="customStyle" :custom-style="customStyle"
v-if="item.status_text == '待收货'" v-if="item.OrderStatusName == '待收货'"
@click="shouhuoHandler(item.id)" @click="shouhuoHandler(item.id)"
>确认收货</u-button >确认收货</u-button
> >
...@@ -169,21 +170,17 @@ ...@@ -169,21 +170,17 @@
</view> </view>
</view> </view>
</view> </view>
<!-- <u-divider <u-loadmore
contentPosition="center" :status="status"
v-if="isover" :load-text="loadText"
:font-size="24"
:margin-top="20" :margin-top="20"
:margin-bottom="20" :margin-bottom="20"
bg-color="#f3f4f6" bg-color="#f3f4f6"
>没有更多订单了</u-divider />
> -->
</scroll-view> </scroll-view>
</view> </view>
<!-- 加载中 -->
<view class="loading" v-if="loading">
<u-loading mode="flower" size="48">></u-loading>
<Text style="color: #fff; margin-top: 10rpx;">加载中...</Text>
</view>
<!-- 取消提示 --> <!-- 取消提示 -->
<u-modal <u-modal
v-model="showModal" v-model="showModal"
...@@ -192,7 +189,8 @@ ...@@ -192,7 +189,8 @@
:show-title="false" :show-title="false"
@confirm="confirm" @confirm="confirm"
:border-radius="20" :border-radius="20"
></u-modal> >
</u-modal>
<u-modal <u-modal
v-model="showReviceModal" v-model="showReviceModal"
content="是否确认收货？" content="是否确认收货？"
...@@ -208,16 +206,28 @@ ...@@ -208,16 +206,28 @@
@close="closeGoodListHandler" @close="closeGoodListHandler"
></good-list> ></good-list>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'goback'></auth> <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'goback'></auth>
<payCom v-if="payBtn" :payInfo="payInfo" @closePay="closePay"></payCom>
<u-popup v-model="payExit" mode="center" :mask-close-able="false">
<view style="background:#fff;width:500rpx">
<view style="padding:10px 0 0 10px">提交失败</view>
<view style="text-align:center;padding-bottom:40rpx">
<view style="margin:80rpx 0">支付取消</view>
<span @click="exitPay" style="padding:10rpx 50rpx;color:#fff;background:#19be6b;border-radius: 12px;">确定</span>
</view>
</view>
</u-popup>
</view> </view>
</template> </template>
<script> <script>
import payCom from '@/components/pay/pay';
import goodList from "@/components/goods/order-good-list2"; import goodList from "@/components/goods/order-good-list2";
import auth from "../../../components/auth/index.vue"; import auth from "../../../components/auth/index.vue";
export default { export default {
components: { components: {
goodList, goodList,
auth auth,
payCom
}, },
data() { data() {
return { return {
...@@ -226,17 +236,18 @@ export default { ...@@ -226,17 +236,18 @@ export default {
list: [], list: [],
mainColor: "", mainColor: "",
contentHeight: 0, contentHeight: 0,
page: 1,
payBtn:false,
payExit:false,
page_count: 1, page_count: 1,
g: [], g: [],
loading: false,
showModal: false, showModal: false,
item: "", item: "",
index: 0, index: 0,
goodData: [], goodData: [],
showGoodList: false, showGoodList: false,
showReviceModal: false, showReviceModal: false,
isover: false,
showAuth:false, showAuth:false,
u: {}, u: {},
customStyle: { customStyle: {
...@@ -247,7 +258,6 @@ export default { ...@@ -247,7 +258,6 @@ export default {
marginLeft: "20px", marginLeft: "20px",
padding: "0 30rpx", padding: "0 30rpx",
}, },
template_message: [],
msg:{ msg:{
pageIndex:1, pageIndex:1,
pageSize:15, pageSize:15,
...@@ -259,6 +269,23 @@ export default { ...@@ -259,6 +269,23 @@ export default {
OrderStatus:0, OrderStatus:0,
OrderNo:'', OrderNo:'',
}, },
Cancelmsg:{
OrderId:0,
Type:1,
Remark:'',
},
payInfo: {
OpenId: '',
OrderId: '',
OrderPayType: 1,
GoodsName: ''
},
status: "loadmore",
loadText: {
loadmore: "轻轻上拉，加载更多",
loading: "努力加载中",
nomore: "没有更多了",
},
}; };
}, },
created() { created() {
...@@ -294,14 +321,14 @@ export default { ...@@ -294,14 +321,14 @@ export default {
}; };
this.showAuth = true; this.showAuth = true;
}else{ }else{
this.loading = true;
this.init();
this.getOrderStatus(); this.getOrderStatus();
} }
}, },
methods: { methods: {
getOrderStatus() { getOrderStatus() {
this.payInfo.OpenId=uni.getStorageSync('mall_UserInfo').OpenId;
this.request2( this.request2(
{ {
url: '/api/order/GetOrderStatusEnumList', url: '/api/order/GetOrderStatusEnumList',
...@@ -317,7 +344,8 @@ export default { ...@@ -317,7 +344,8 @@ export default {
Id:0, Id:0,
} }
this.list.unshift(obj) this.list.unshift(obj)
console.log("this.list",this.list) this.msg.OrderStatus=this.list[this.current].Id;
this.init();
} }
} }
); );
...@@ -359,81 +387,78 @@ export default { ...@@ -359,81 +387,78 @@ export default {
this.msg.OrderStatus=this.list[index].Id; this.msg.OrderStatus=this.list[index].Id;
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.g = []; this.g = [];
this.loading = true;
this.init(); this.init();
}, },
init() { init() {
this.isover = false;
let h = this.apiheader(); uni.showLoading({
title: '加载中'
});
this.request2( this.request2(
{ {
url: '/api/AppletOrder/GetAppletGoodsMyOrderPageList', url: '/api/AppletOrder/GetAppletGoodsMyOrderPageList',
data: this.msg data: this.msg
}, },
res => { res => {
uni.hideNavigationBarLoading(); uni.hideLoading();
if(res.resultCode==1){ if(res.resultCode==1){
this.loading = false;
this.g = this.g.concat(res.data.pageData); this.g = this.g.concat(res.data.pageData);
this.page_count = res.data.page_count; this.page_count = res.data.pageCount;
if (this.page_count == 1) { if (this.page_count == 1) {
this.isover = true; this.status = "nomore";
} }
} }
} }
); );
// this.request(
// {
// url: "",
// header: h,
// data: {
// r: "api/order/list",
// status: this.current,
// page: this.page,
// },
// },
// (res) => {
// this.loading = false;
// this.g = this.g.concat(res.data.list);
// this.template_message = res.data.template_message;
// this.page_count = res.data.pagination.page_count;
// if (this.page_count == 1) {
// this.isover = true;
// }
// }
// );
}, },
lower(e) { lower(e) {
if (this.msg.pageIndex < this.page_count) { if (this.msg.pageIndex < this.page_count) {
this.msg.pageIndex++; this.msg.pageIndex++;
this.status = "loading";
this.init(); this.init();
} else { } else {
this.isover = true; this.status = "nomore";
} }
}, },
cancel(e, index) { cancel(e, index) {
this.showModal = true; this.showModal = true;
this.index = index; this.index = index;
this.item = e; this.item = e;
this.Cancelmsg.OrderId = e.OrderId;
this.Cancelmsg.Type = e.OrderStatus==1?1:2;
},
payment(e){
this.payInfo.OrderId = e.OrderId;
this.payInfo.GoodsName = e.DetailList[0].GoodsName;
this.payInfo.PaymentWay = e.PaymentWay;
this.payInfo.total_price = e.Income;
this.payBtn=true
},
exitPay() {
this.payExit = false;
},
closePay() {
this.payBtn = false;
this.payExit = true;
}, },
confirm() { confirm() { //取消订单
this.showModal = false; this.showModal = false;
let h = this.apiheader(); this.request2(
// h['content-type']='application/x-www-form-urlencoded'
this.request(
{ {
url: "", url: '/api/AppletOrder/CancelAppletGoodsOrderInfo',
// method: "POST", data: this.Cancelmsg
header: h,
data: {
r: "api/order/cancel",
id: this.item.id,
},
}, },
(res) => { (res) => {
this.$refs.uToast.show({ title: res.msg }); uni.showToast({
//this.g.splice(this.index, 1); title:res.message,
icon:'none'
})
this.g.splice(this.index, 1);
} }
); );
}, },
...@@ -447,48 +472,33 @@ export default { ...@@ -447,48 +472,33 @@ export default {
this.showGoodList = true; this.showGoodList = true;
}, },
buy(y) { buy(y) {
let forms = { let ShoppingCartIdList=[];
list: [], let forms = {};
address_id: 0,
};
let good = { let good = {
mch_id: y.mch_id, // MallId: y.MallId,
goods_list: [], DetailList: [],
distance: 0, Use_Integral: 0,
remark: "", User_Coupon_Id: 0,
order_form: [], DeliveryMethod:0,
use_integral: 0, AddressId:0,
user_coupon_id: 0,
}; };
y.detail.forEach((x) => { y.DetailList.forEach((x) => {
if (x.checked) { ShoppingCartIdList.push(x.Id)
let g = { let g = {
id: x.goods_id, GoodsId: x.GoodsId,
num: x.num, Number: x.Number,
cart_id: 0, SpecificationSort: x.SpecificationSort,
goods_attr_id: 0,
attr: [],
}; };
x.goods_info.attr_list.forEach((x) => { good.DetailList.push(g);
g.attr.push({
attr_id: x.attr_id,
attr_group_id: x.attr_group_id,
});
});
good.goods_list.push(g);
}
}); });
forms.list.push(good); forms=good;
uni.navigateTo({ uni.navigateTo({
url: url: '/pages/order-submit/order-submit?formData=' + encodeURIComponent(JSON.stringify(forms))+'&IsFormShoppingCart=2&ShoppingCartIdList='+JSON.stringify(ShoppingCartIdList)
"/pages/order-submit/order-submit?formData=" +
encodeURIComponent(JSON.stringify(forms)),
}); });
}, },
reloadUserinfo() { reloadUserinfo() {
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
this.showAuth = false; this.showAuth = false;
this.loading = true;
this.init(); this.init();
this.getOrderStatus(); this.getOrderStatus();
}, },
...@@ -560,22 +570,7 @@ export default { ...@@ -560,22 +570,7 @@ export default {
border-radius: 25rpx; border-radius: 25rpx;
line-height: 50rpx; line-height: 50rpx;
} }
.orderindexStyle .loading {
width: 200rpx;
height: 200rpx;
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;
}
.listBox_c .goodboxmore { .listBox_c .goodboxmore {
margin-bottom: 20px; margin-bottom: 20px;
display: flex; display: flex;
......
pages/order/order-detail.vue
View file @ 70955046
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<view class="title" v-if="scrollTop > 50">订单详情</view> <view class="title" v-if="scrollTop > 50">订单详情</view>
</view> </view>
<view class="status" :style="[headStyle]"> <view class="status" :style="[headStyle]">
<view class="status-title">{{ orders.status_text }}</view> <view class="status-title">{{ orders.OrderStatusName }}</view>
<view class="sub-title"> <view class="sub-title">
<u-icon <u-icon
style="display: inline-block; vertical-align: middle;" style="display: inline-block; vertical-align: middle;"
...@@ -41,37 +41,37 @@ ...@@ -41,37 +41,37 @@
<view class="content"> <view class="content">
<view class="concat"> <view class="concat">
<text style="font-weight: 700; margin-right: 20px;">{{ <text style="font-weight: 700; margin-right: 20px;">{{
orders.name orders.Consignee
}}</text> }}</text>
<text>{{ orders.mobile }}</text> <text>{{ orders.Mobile }}</text>
</view> </view>
<view class="address">{{ orders.address }}</view> <view class="address">{{ orders.DistrictAddress }}{{orders.ShoppingAddress}}</view>
</view> </view>
</view> </view>
<view class="block goods"> <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;"> <view style="display: flex;">
<image <image
:src="x.goods_info.pic_url" :src="x.CoverImagePath"
class="img" class="img"
@click="redirectGoods(x.goods_id)" @click="redirectGoods(x.GoodsId)"
mode="aspectFill" mode="aspectFill"
/> />
<view class="good-info"> <view class="good-info">
<view class="good-name" @click="redirectGoods(x.goods_id)">{{ <view class="good-name" @click="redirectGoods(x.goods_id)">{{
x.goods_info.name x.GoodsName
}}</view> }}</view>
<view class="good-attr"> <view class="good-attr">
<text>数量：{{ x.num }}</text> <text>数量：{{ x.Number }}</text>
<text <text
v-for="(y, yi) in x.goods_info.attr_list" v-for="(y, yi) in x.SpecificationList"
:key="yi" :key="yi"
style="margin-right: 5px;" style="margin-right: 5px;"
> >
{{ y.attr_group_name }}：{{ y.attr_name }} {{y}}
</text> </text>
</view> </view>
<view class="good-price">￥{{ x.total_original_price }}</view> <view class="good-price">￥{{ x.Final_Price }}</view>
</view> </view>
</view> </view>
<template v-for="(e, ei) in orders.detailExpress"> <template v-for="(e, ei) in orders.detailExpress">
...@@ -130,54 +130,52 @@ ...@@ -130,54 +130,52 @@
<view class="order-info-item"> <view class="order-info-item">
<view class="field"> <view class="field">
<view class="label">订单编号：</view> <view class="label">订单编号：</view>
<view class="content">{{ orders.order_no }}</view> <view class="content">{{ orders.OrderNo }}</view>
</view> </view>
<view class="field"> <view class="field">
<view class="label">下单时间：</view> <view class="label">下单时间：</view>
<view class="content">{{ orders.created_at }}</view> <view class="content">{{ orders.CreateDate }}</view>
</view> </view>
</view> </view>
<view class="order-info-item"> <view class="order-info-item">
<view class="field"> <view class="field">
<view class="label">支付方式：</view> <view class="label">支付方式：</view>
<view class="content">{{ orders.pay_type_text }}</view> <view class="content">{{ orders.PaymentWayName }}</view>
</view> </view>
<view class="field"> <!-- <view class="field">
<view class="label">支付时间：</view> <view class="label">支付时间：</view>
<view class="content">{{ orders.pay_time }}</view> <view class="content">{{ orders.pay_time }}</view>
</view> -->
</view> </view>
</view> <view class="order-info-item" >
<!-- <view class="order-info-item" v-if="orders.detailExpress[0].">
<view class="field"> <view class="field">
<view class="label">配送方式：</view> <view class="label">配送方式：</view>
<view class="content">{{ <view class="content">{{orders.DeliveryMethodName}}</view>
orders.detailExpress[0].express_content </view>
}}</view>
</view> </view>
</view> -->
</view> </view>
<view class="block"> <view class="block">
<view class="order-info-item"> <view class="order-info-item">
<view class="field"> <view class="field">
<view class="label">商品总额</view> <view class="label">商品总额</view>
<view class="content right">￥{{ orders.total_goods_price }}</view> <view class="content right">￥{{ orders.PreferPrice }}</view>
</view> </view>
<view class="field"> <view class="field">
<view class="label">运费</view> <view class="label">运费</view>
<view class="content right">+￥{{ orders.express_price }}</view> <view class="content right">+￥{{ orders.FreightMoney }}</view>
</view> </view>
<view class="field"> <view class="field">
<view class="label">优惠</view> <view class="label">优惠</view>
<view class="content right" <view class="content right"
>-￥{{ orders.coupon_discount_price }}</view >-￥{{ orders.CouponMoney }}</view
> >
</view> </view>
<view class="field"> <!-- <view class="field">
<view class="label">积分抵扣</view> <view class="label">积分抵扣</view>
<view class="content right" <view class="content right"
>-￥{{ orders.integral_deduction_price }}</view >-￥{{ orders.integral_deduction_price }}</view
> >
</view> </view> -->
<view class="field"> <view class="field">
<view class="label">&nbsp;</view> <view class="label">&nbsp;</view>
<view class="content right"> <view class="content right">
...@@ -188,10 +186,11 @@ ...@@ -188,10 +186,11 @@
>￥</text >￥</text
> >
<text style="font-size: 17px;" :style="{ color: mc }">{{ <text style="font-size: 17px;" :style="{ color: mc }">{{
orders.total_pay_price.split(".")[0]
orders.Income.toString().split(".")[0]
}}</text> }}</text>
<text style="font-size: 12px;" :style="{ color: mc }" <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>
</view> </view>
...@@ -340,8 +339,10 @@ export default { ...@@ -340,8 +339,10 @@ export default {
this.headStyle.paddingTop = nav.top + "px"; this.headStyle.paddingTop = nav.top + "px";
this.contentStyle.paddingTop = nav.top + 44 + "px"; this.contentStyle.paddingTop = nav.top + 44 + "px";
let p = getCurrentPages(); let p = getCurrentPages();
console.log(p)
if (p.length > 1) { 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.themCustomStyle.background = this.mc;
this.init(); this.init();
...@@ -424,20 +425,16 @@ export default { ...@@ -424,20 +425,16 @@ export default {
this.showAfter = false; this.showAfter = false;
}, },
init() { init() {
let h = this.apiheader();
this.request( this.request2(
{ {
url: "", url: '/api/AppletOrder/GetAppletMyOrderInfo',
header: h, data: {OrderId:this.id}
data: {
r: "api/order/detail",
id: this.id,
},
}, },
(res) => { (res) => {
this.orders = res.data.detail; this.orders = res.data;
this.loading = false; 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 { ...@@ -472,6 +469,7 @@ export default {
}); });
}, },
redirectPrev() { redirectPrev() {
console.log('返回')
if (this.prevPage != "") { if (this.prevPage != "") {
uni.navigateBack({ uni.navigateBack({
delta: 1, delta: 1,
...@@ -624,7 +622,9 @@ export default { ...@@ -624,7 +622,9 @@ export default {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
color: gray; color: gray;
flex: 1;
display: flex;
flex-direction: column;
} }
.orderdetail .goods .item .good-info .good-price { .orderdetail .goods .item .good-info .good-price {
font-size: 16px; font-size: 16px;
......
pages/share-order/share-order.vue
View file @ 70955046
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
loadText: { loadText: {
loadmore: "轻轻上拉，加载更多", loadmore: "轻轻上拉，加载更多",
loading: "努力加载中", loading: "努力加载中",
nomore: "没有更多优惠券了", nomore: "没有更多了",
}, },
} }
}, },
...@@ -154,6 +154,8 @@ ...@@ -154,6 +154,8 @@
}, },
change(index){ change(index){
this.msg.DistrbutionOrderSelectStatus = index; this.msg.DistrbutionOrderSelectStatus = index;
this.msg.pageIndex=1;
this.g=[]
this.init() this.init()
}, },
isdetail(index){ isdetail(index){
......
pages/share-team/share-team.vue
View file @ 70955046
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
loadText: { loadText: {
loadmore: "轻轻上拉，加载更多", loadmore: "轻轻上拉，加载更多",
loading: "努力加载中", loading: "努力加载中",
nomore: "没有更多优惠券了", nomore: "没有更多了",
}, },
} }
...@@ -135,6 +135,8 @@ ...@@ -135,6 +135,8 @@
change(index){ change(index){
this.current = index this.current = index
this.msg.GradeId = index+1; this.msg.GradeId = index+1;
this.msg.pageIndex=1;
this.g=[]
this.init() this.init()
}, },
lower(e) { lower(e) {
......
pages/share/cash/cash.vue
View file @ 70955046
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<view class="tixian"> <view class="tixian">
<view style='display: flex;flex-direction: row;align-items: center;'> <view style='display: flex;flex-direction: row;align-items: center;'>
<Text :style="{'color':mainColor,'font-size':'18px'}">￥</Text> <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> </view>
<Text @click='allmoney'>全部</Text> <Text @click='allmoney'>全部</Text>
</view> </view>
...@@ -27,7 +27,35 @@ ...@@ -27,7 +27,35 @@
<Text>{{txmode}}</Text> <Text>{{txmode}}</Text>
<u-icon name="arrow" color='#9F9F9F'></u-icon> <u-icon name="arrow" color='#9F9F9F'></u-icon>
</view> </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>
<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'> <View class='getapply' :style="{background:mainColor}" @click='getapply'>
<Text>提交申请</Text> <Text>提交申请</Text>
</View> </View>
...@@ -91,7 +119,7 @@ ...@@ -91,7 +119,7 @@
secondary:'', secondary:'',
cash:{}, cash:{},
money:0, money:0,
txmoney:'',
txmode:'', txmode:'',
show:false, show:false,
show2:false, show2:false,
...@@ -105,8 +133,13 @@ ...@@ -105,8 +133,13 @@
], ],
value:'', value:'',
msg:{ msg:{
AppliedMoney:0, AppliedMoney:'',
Fee:0, Fee:0,
RemitMoney:0,
WithdrawalWay:'',
AccountName:'',
AccountNumber:'',
BankName:'',
} }
} }
...@@ -138,8 +171,6 @@ ...@@ -138,8 +171,6 @@
methods: { methods: {
init(){ init(){
uni.showNavigationBarLoading(); uni.showNavigationBarLoading();
let h = this.apiheader();
this.request2( this.request2(
{ {
url: '/api/AppletUser/GetUserDistrbutorWithdrawDepositBalance', url: '/api/AppletUser/GetUserDistrbutorWithdrawDepositBalance',
...@@ -159,16 +190,21 @@ ...@@ -159,16 +190,21 @@
); );
}, },
allmoney(){ allmoney(){
this.txmoney = Number(this.cash.CommissionWithdrawal) this.msg.AppliedMoney = Number(this.cash.CommissionWithdrawal)
}, },
radioChange(item){ radioChange(item){
this.txmode = item.Name; this.txmode = item.Name;
this.msg.WithdrawalWay = item.Id;
this.msg.AccountName = '';
this.msg.AccountNumber = '';
this.msg.BankName = '';
this.show=false this.show=false
}, },
getapply(){ getapply(){
// TODO 接口暂无 // TODO 接口暂无
if(this.txmoney==''){ if(this.msg.AppliedMoney==''){
uni.showToast({ uni.showToast({
title: "请输入提现金额", title: "请输入提现金额",
...@@ -183,6 +219,54 @@ ...@@ -183,6 +219,54 @@
}); });
return false 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 @@ ...@@ -276,4 +360,26 @@
justify-content: space-between; justify-content: space-between;
border-top:1px solid #f5f5f5 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> </style>
pages/share/index/index.vue
View file @ 70955046
...@@ -14,6 +14,13 @@ ...@@ -14,6 +14,13 @@
<u-button shape="circle" type="error" size="medium" @click='goshoping'>去商城逛逛</u-button> <u-button shape="circle" type="error" size="medium" @click='goshoping'>去商城逛逛</u-button>
</view> </view>
</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 style="width: 100%;height: 100%;" v-if="sharestatus.Status==3">
<view class="sharebox_top" :style="{background:mainColor}"> <view class="sharebox_top" :style="{background:mainColor}">
<view class="sharebox_top_t"> <view class="sharebox_top_t">
...@@ -205,6 +212,20 @@ ...@@ -205,6 +212,20 @@
uni.navigateTo({ uni.navigateTo({
url: "/pages/share/add/add", 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> <template>
<view :style="{'height':contentHeight}"> <view :style="{'height':contentHeight}" class="levelStyle">
<image :src="level_bg" v-if="level=='' " style="width: 100%;height: 100%;"> <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%"
</image> >
<view v-if="level!=''"> <view class="popup">
<!-- TODO暂不知道升级内容 --> <view class="popup_t">
<Text>等级说明</Text>
</view> </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> </view>
</template> </template>
...@@ -15,10 +42,12 @@ ...@@ -15,10 +42,12 @@
return { return {
pageTitle: "升级条件", pageTitle: "升级条件",
contentHeight:0, contentHeight:0,
show:false,
mainColor:'', mainColor:'',
secondary:'', secondary:'',
level:'', level:'',
level_bg:'', level_bg:'',
level_bg2:'',
} }
}, },
created(){ created(){
...@@ -36,6 +65,9 @@ ...@@ -36,6 +65,9 @@
this.level_bg = wx.getStorageSync("basedata") this.level_bg = wx.getStorageSync("basedata")
? wx.getStorageSync("basedata").__wxapp_img.share.no_level_bg ? 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) => { 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;
...@@ -50,19 +82,15 @@ ...@@ -50,19 +82,15 @@
uni.showNavigationBarLoading(); uni.showNavigationBarLoading();
let h = this.apiheader(); let h = this.apiheader();
this.request( this.request2(
{ {
url: "", url: '/api/AppletUser/GetUserDistrbutorUpgradeConditions',
header:h, data: {}
data: {
r: "api/share/level",
},
}, },
(res) => { (res) => {
uni.hideNavigationBarLoading() uni.hideNavigationBarLoading()
this.level = res.data.list this.level = res.data
} }
); );
}, },
...@@ -71,5 +99,66 @@ ...@@ -71,5 +99,66 @@
</script> </script>
<style> <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> </style>
pages/user-center/integral-detail/integral-detail.vue
View file @ 70955046
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
loadText: { loadText: {
loadmore: "轻轻上拉，加载更多", loadmore: "轻轻上拉，加载更多",
loading: "努力加载中", loading: "努力加载中",
nomore: "没有更多优惠券了", nomore: "没有更多了",
}, },
}; };
}, },
......
pages/user-center/user-center.vue
View file @ 70955046
...@@ -144,7 +144,7 @@ export default { ...@@ -144,7 +144,7 @@ export default {
this.bottommargin = c - 2 + 'px'; this.bottommargin = c - 2 + 'px';
this.listbottom = c - 2 + 50 + 'px'; this.listbottom = c - 2 + 50 + 'px';
this.contentHeight = this.$utils.calcContentHeight(c); this.contentHeight = this.$utils.calcContentHeight(c);
console.log(wx.getStorageSync('basedata'))
let u = '/' + currentPages[currentPages.length - 1].route; let u = '/' + currentPages[currentPages.length - 1].route;
let pages = wx.getStorageSync('basedata') ? wx.getStorageSync('basedata').bar_title : []; let pages = wx.getStorageSync('basedata') ? wx.getStorageSync('basedata').bar_title : [];
// pages.forEach(x => { // 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