Skip to content

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

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

parents c535a095 91cd0889
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1079 additions and 437 deletions
components/pay/pay.vue
View file @ 0996b060
...@@ -31,7 +31,9 @@ export default { ...@@ -31,7 +31,9 @@ export default {
data() { data() {
return { return {
show: true, show: true,
orderInfo: {} orderInfo: {},
}; };
}, },
created() { created() {
...@@ -64,6 +66,7 @@ export default { ...@@ -64,6 +66,7 @@ export default {
); );
}, },
Pay() { Pay() {
let that=this;
let orderInfo = this.orderInfo; let orderInfo = this.orderInfo;
uni.requestPayment({ uni.requestPayment({
provider: 'wxpay', provider: 'wxpay',
...@@ -75,7 +78,7 @@ export default { ...@@ -75,7 +78,7 @@ export default {
success: function(res) { success: function(res) {
console.log('success', res); console.log('success', res);
uni.navigateTo({ uni.navigateTo({
url: '/pages/order-submit/pay-success' url: '/pages/order-submit/pay-success?payInfo='+JSON.stringify(that.payInfo)
}); });
}, },
fail: function(err) { fail: function(err) {
......
components/rubik/index.vue
View file @ 0996b060
...@@ -28,8 +28,7 @@ export default { ...@@ -28,8 +28,7 @@ export default {
backgroundImage: x.backgroundImage, backgroundImage: x.backgroundImage,
backgroundRepeat: x.backgroundRepeat, backgroundRepeat: x.backgroundRepeat,
backgroundSize: x.backgroundSize, backgroundSize: x.backgroundSize,
backgroundPosition: x.backgroundPosition, backgroundPosition: x.backgroundPosition
border:'1px solid red'
}; };
if (this.ad.height == "auto") { if (this.ad.height == "auto") {
x.formatStyle.position = "unset"; x.formatStyle.position = "unset";
......
components/swiper/index.vue
View file @ 0996b060
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
:interval="5000" :interval="5000"
name="picUrl" name="picUrl"
:border-radius="0" :border-radius="0"
@click="clickHandler"
></u-swiper> ></u-swiper>
</template> </template>
...@@ -46,9 +47,9 @@ export default { ...@@ -46,9 +47,9 @@ export default {
}, },
methods: { methods: {
clickHandler(i) { clickHandler(i) {
if (banners[i].url && banners[i].url.length > 0) { if (this.banners[i].url && this.banners[i].url.length > 0) {
uni.navigateTo({ uni.navigateTo({
url: banners[i].url, url: this.banners[i].url,
}); });
} }
}, },
......
components/userorder/after-sale.vue
View file @ 0996b060
...@@ -23,40 +23,38 @@ ...@@ -23,40 +23,38 @@
<view class="tips">共{{ list.length }}件</view> <view class="tips">共{{ list.length }}件</view>
</view> </view>
<view class="goodbox update-goodbox" v-for="(y, i) in list" :key="i"> <view class="goodbox update-goodbox" v-for="(y, i) in list" :key="i">
<image :src="y.goods_info.pic_url" mode="aspectFill" class="image" /> <image :src="y.CoverImagePath" mode="aspectFill" class="image" />
<view class="goodinfo"> <view class="goodinfo">
<view class="name">{{ y.goods_info.name }}</view> <view class="name">{{ y.GoodsName }}</view>
<view class="attr"> <view class="attr">
<text>已选择 </text> <text>已选择 </text>
<text <text
v-for="(x, xi) in y.goods_info.attr_list" v-for="(x, xi) in y.SpecificationList"
:key="xi" :key="xi"
style="margin:0 5px;" style="margin:0 5px;"
> >
{{ x.attr_group_name }}：{{ x.attr_name }} {{ x }}
</text> </text>
</view> </view>
<view class="price"> <view class="price">
<view class="left" :style="{ color: mc }"> <view class="left" :style="{ color: mc }">
<text class="small">￥</text> <text class="small">￥</text>
<text>{{ y.total_original_price.split(".")[0] }}</text> <text>{{ y.Final_Price }}</text>
<text class="small"
>.{{ y.total_original_price.split(".")[1] || "00" }}</text
>
</view> </view>
<view class="right">x{{ y.num }}</view> <view class="right">x{{ y.Number }}</view>
</view> </view>
<view style="display: flex; flex-direction: row-reverse;margin-top:10px;"> <view style="display: flex; flex-direction: row-reverse;margin-top:10px;">
<u-button <u-button
shape="circle" shape="circle"
size="medium" size="medium"
:custom-style="customStyle" :custom-style="customStyle"
@click="goService(y.id)" @click="goService(y.DetailId)"
v-if="y.refund_status==0" v-if="y.IsApplyForAfterSale==2"
>申请售后</u-button >申请售后</u-button
> >
<text v-if="y.refund_status!=0" style="font-size:28rpx;color:gray;"> <text v-if="y.IsApplyForAfterSale!=2" style="font-size:28rpx;color:gray;">
已申请售后（{{y.refund.status_text}}） 已申请售后
</text> </text>
</view> </view>
</view> </view>
......
pages.json
View file @ 0996b060
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
{ {
"path": "pages/webbox/webbox" "path": "pages/webbox/webbox"
} }
], ],
"subPackages": [{ "subPackages": [{
"root": "pages/goods", "root": "pages/goods",
...@@ -47,6 +48,16 @@ ...@@ -47,6 +48,16 @@
} }
] ]
}, },
{
"root": "pages/member",
"pages": [{
"path": "index/index"
},
{
"path": "privilege"
}
]
},
{ {
"root": "pages/balance", "root": "pages/balance",
"pages": [{ "pages": [{
...@@ -85,6 +96,9 @@ ...@@ -85,6 +96,9 @@
}, },
{ {
"path": "level/level" "path": "level/level"
},
{
"path": "examine"
} }
] ]
...@@ -177,7 +191,10 @@ ...@@ -177,7 +191,10 @@
}, },
{ {
"path": "express" "path": "express"
} },
{
"path": "expressdetail"
}
] ]
} }
], ],
......
pages/balance/balance.vue
View file @ 0996b060
...@@ -30,27 +30,31 @@ ...@@ -30,27 +30,31 @@
@scrolltolower="lower" @scrolltolower="lower"
:style="{ height: '100%' }"> :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 logsList" :key="index" class='logsList' @click="godetail(item.id)"> <view v-for="(item, index) in logsList" :key="index" class='logsList' @click="godetail(item)">
<view class="logsList_l"> <view class="logsList_l">
<Text class='l_name'>{{item.desc}}</Text> <Text class='l_name'>{{item.Description}}</Text>
<Text style='font-size: 13px;color: #666;'>{{item.created_at}}</Text> <Text style='font-size: 13px;color: #666;'>{{item.CreateDate}}</Text>
</view> </view>
<view class="logsList_r"> <view class="logsList_r">
<Text :style="{color:item.type==1 ? mainColor:'#6ABE60'}">{{item.type==1 ? '+':'-'}}{{item.money}}</Text> <Text :style="{color:item.Type==1 ? mainColor:'#6ABE60'}">{{item.Type==1 ? '+':'-'}}{{item.Balance}}</Text>
</view> </view>
</view> </view>
</view> </view>
<u-loadmore
:status="status"
:load-text="loadText"
:font-size="24"
:margin-top="20"
:margin-bottom="20"
bg-color="#f3f4f6"
/>
</scroll-view> </scroll-view>
</view> </view>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'goback'></auth> <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth= 'goback'></auth>
<view class="loading" v-if="load">
<u-loading mode="flower" size="48"></u-loading>
<Text style='color: #fff;margin-top: 10rpx;'>加载中...</Text>
</view>
</view> </view>
</template> </template>
...@@ -60,7 +64,7 @@ ...@@ -60,7 +64,7 @@
data() { data() {
return { return {
pageTitle:"余额记录", pageTitle:"余额记录",
load:false,
showAuth:false, showAuth:false,
contentHeight:0, contentHeight:0,
mainColor: "", mainColor: "",
...@@ -69,6 +73,18 @@ ...@@ -69,6 +73,18 @@
date:'', date:'',
date2:'', date2:'',
logsList:[], logsList:[],
msg:{
pageIndex: 1,
pageSize:10,
CreateDate:''
},
page_count:1,
status: "loadmore",
loadText: {
loadmore: "轻轻上拉，加载更多",
loading: "努力加载中",
nomore: "没有更多了",
},
} }
}, },
components:{ components:{
...@@ -114,7 +130,7 @@ ...@@ -114,7 +130,7 @@
let time2 = date1.getFullYear() + "-" + (date1.getMonth() + 1) let time2 = date1.getFullYear() + "-" + (date1.getMonth() + 1)
this.date = time1 this.date = time1
this.date2 = time2 this.msg.CreateDate = time2
this.balancedata() this.balancedata()
this.getlogs() this.getlogs()
}, },
...@@ -147,31 +163,36 @@ ...@@ -147,31 +163,36 @@
getlogs(){ getlogs(){
this.load=true
uni.showNavigationBarLoading(); uni.showLoading({
let h=this.apiheader() title: '加载中'
this.request( });
this.request2(
{ {
url: "", url: '/api/AppletUser/GetMemberBalancePageList',
header:h, data: this.msg
data: {
r: "api/balance/logs",
date:this.date2,
}
}, },
res => { res => {
this.load=false
this.logsList = res.data.list
uni.hideNavigationBarLoading() uni.hideLoading();
if(res.resultCode==1){
this.logsList = this.logsList.concat(res.data.pageData);
this.page_count = res.data.pageCount;
if (this.page_count == 1) {
this.status = "nomore";
}
}
} }
); );
}, },
fun_date(num){ fun_date(num){
let date = this.date; let date = this.date;
let date2 = this.date2; let date2 = this.msg.CreateDate;
let currentDate = new Date(date2); let currentDate = new Date(date2);
this.msg.pageIndex=1;
this.logsList=[];
if(num==-1){ if(num==-1){
let lastDate = currentDate.setMonth(currentDate.getMonth() - 1); // 输出日期格式为毫秒形式1551398400000 let lastDate = currentDate.setMonth(currentDate.getMonth() - 1); // 输出日期格式为毫秒形式1551398400000
...@@ -183,7 +204,7 @@ ...@@ -183,7 +204,7 @@
lastDate = lastYear + '年' + lastMonth +'月'; lastDate = lastYear + '年' + lastMonth +'月';
let lastDate2 = lastYear + '-' + lastMonth; let lastDate2 = lastYear + '-' + lastMonth;
this.date = lastDate; this.date = lastDate;
this.date2 = lastDate2; this.msg.CreateDate = lastDate2;
this.getlogs() this.getlogs()
}else if(num==1){ }else if(num==1){
...@@ -196,7 +217,7 @@ ...@@ -196,7 +217,7 @@
nextDate = nextYear + '年' + nextMonth+'月'; nextDate = nextYear + '年' + nextMonth+'月';
let nextDate2 = nextYear + '-' + nextMonth; let nextDate2 = nextYear + '-' + nextMonth;
this.date = nextDate; this.date = nextDate;
this.date2 = nextDate2; this.msg.CreateDate = nextDate2;
this.getlogs() this.getlogs()
} }
...@@ -213,11 +234,20 @@ ...@@ -213,11 +234,20 @@
url: url url: url
}) })
}, },
godetail(id){ godetail(item){
uni.navigateTo({ uni.navigateTo({
url: '/pages/balance/detail?id='+id url: '/pages/balance/detail?item='+ encodeURIComponent(JSON.stringify(item))
}) })
} },
lower(e) {
if (this.msg.pageIndex < this.page_count) {
this.msg.pageIndex++;
this.status = "loading";
this.getlogs();
} else {
this.status = "nomore";
}
},
} }
} }
</script> </script>
......
pages/balance/detail.vue
View file @ 0996b060
...@@ -5,24 +5,31 @@ ...@@ -5,24 +5,31 @@
<Text>交易金额</Text> <Text>交易金额</Text>
</view> </view>
<Text class='bd_r' :style="{color:g.type==1 ? mainColor:'#6ABE60',}">{{g.type==1 ? '+':'-'}}{{g.money}}</Text> <Text class='bd_r' :style="{color:g.Type==1 ? mainColor:'#6ABE60',}">{{g.Type==1 ? '+':'-'}}{{g.Balance}}</Text>
</view> </view>
<view class="bd_box" > <view class="bd_box" >
<view class='bd_box_l'> <view class='bd_box_l'>
<Text>交易时间</Text> <Text>交易时间</Text>
</view> </view>
<Text >{{g.created_at}}</Text> <Text >{{g.CreateDate}}</Text>
</view> </view>
<view class="bd_box" style="align-items: flex-start;"> <view class="bd_box" style="align-items: flex-start;">
<view class='bd_box_l'> <view class='bd_box_l'>
<Text>交易详情</Text> <Text>交易详情</Text>
</view> </view>
<view style='width: calc(100vw - 20px - 80px);'> <view style='width: calc(100vw - 20px - 80px);'>
<Text >{{g.desc}}</Text> <Text >{{g.Description}}</Text>
</view> </view>
</view> </view>
<view class="bd_box" >
<view class='bd_box_l'>
<Text>备注</Text>
</view>
<Text >{{g.Remarks}}</Text>
</view>
</view> </view>
</template> </template>
...@@ -54,7 +61,11 @@ ...@@ -54,7 +61,11 @@
}, },
onLoad(option){ onLoad(option){
this.getlogdetail(option.id)
if (option.item) {
this.g = JSON.parse(decodeURIComponent(option.item));
}
}, },
created(){ created(){
this.contentHeight = this.$utils.calcContentHeight(-40)+'px'; this.contentHeight = this.$utils.calcContentHeight(-40)+'px';
...@@ -65,24 +76,7 @@ ...@@ -65,24 +76,7 @@
methods: { methods: {
getlogdetail(id){
uni.showNavigationBarLoading();
let h=this.apiheader()
this.request(
{
url: "",
header:h,
data: {
r: "api/balance/log-detail",
id:id
}
},
res => {
uni.hideNavigationBarLoading()
this.g = res.data.detail;
}
);
},
} }
......
pages/cash-detail/cash-detail.vue
View file @ 0996b060
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="cdetailStyle" :style="{'height':contentHeight}"> <view class="cdetailStyle" :style="{'height':contentHeight}">
<view style="width: 100%;height: 100%;"> <view style="width: 100%;height: 100%;">
<u-tabs :list="list" :is-scroll="false" :current="msg.AuditStatus" @change="change" :active-color='mainColor' bg-color='#f3f4f6'></u-tabs> <u-tabs :list="list" :is-scroll="false" :current="msg.AuditStatus" @change="change" :active-color='mainColor' bg-color='#f3f4f6'></u-tabs>
<u-empty v-if="g==''" 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=" style="
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
contentHeight:0, contentHeight:0,
mainColor:'', mainColor:'',
secondary:'', secondary:'',
g:'', g:[],
list:[ list:[
{name: '全部'}, {name: '全部'},
...@@ -125,7 +125,10 @@ ...@@ -125,7 +125,10 @@
(res) => { (res) => {
uni.hideLoading(); uni.hideLoading();
this.g = this.g.concat(res.data.pageData); this.g = this.g.concat(res.data.pageData);
console.log(res.data.pageData)
console.log(this.g)
this.page_count = res.data.pageCount; this.page_count = res.data.pageCount;
if (this.page_count == 1) { if (this.page_count == 1) {
this.status = "nomore"; this.status = "nomore";
......
pages/index/index.vue
View file @ 0996b060
...@@ -98,6 +98,7 @@ export default { ...@@ -98,6 +98,7 @@ export default {
mainColor: "", mainColor: "",
active: 0, active: 0,
contentHeight: 0, contentHeight: 0,
pageId:0
}; };
}, },
components: { components: {
...@@ -120,7 +121,11 @@ export default { ...@@ -120,7 +121,11 @@ export default {
addialog, addialog,
quicknav quicknav
}, },
onLoad() { onLoad(options) {
console.log(options,'option');
if(options&&options.page_id){
this.pageId=options.page_id
}
let c = this.$uiConfig.is_bang ? 78 : 50; let c = this.$uiConfig.is_bang ? 78 : 50;
this.contentHeight = this.$utils.calcContentHeight(c); this.contentHeight = this.$utils.calcContentHeight(c);
this.init(); this.init();
...@@ -138,6 +143,7 @@ export default { ...@@ -138,6 +143,7 @@ export default {
{ {
url: '/api/Mall/GetHome', url: '/api/Mall/GetHome',
data: { data: {
page_id:this.pageId
}, },
}, },
(res) => { (res) => {
......
pages/member/index/index.vue 0 → 100644
View file @ 0996b060
<template>
<view class="memberStyle" :style="{'height':contentHeight}">
<view class='memberTop'>
<view class="memberT_box">
<view style='display: flex;flex-direction: row;align-items: center;margin-top: 10px;'>
<u-avatar src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/user_default.jpg" size="100"></u-avatar>
<view style='margin-left: 30px;display: flex;flex-direction: column;justify-content: space-around;height: 50px;color: #fff;'>
<Text>哈哈</Text>
<view class="member">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/user_cardmember-0.png" mode='aspectFill' style="width: 24px;height: 24px;border-radius: 12px;"></image>
<Text style='margin-right: 10px;'>普通用户</Text>
</view>
</view>
</view>
<view class='balance'>
<view class='balance_l'>
<Text style='font-size: 10px;'>账号余额</Text>
<Text style='font-size: 22px;'>￥0.5</Text>
</view>
<view class='balance_r' @click="gobalance()">
<Text>去充值</Text>
</view>
</view>
<view style="width: 100%;height: 200px;border-radius: 10px;overflow: hidden;margin-top: 10px;">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/user_cardmember-0.png" mode='aspectFill' style="width: 100%;height: 100%;"></image>
</view>
<image src="../../../static/images/icon/card-bottom.png" mode='widthFix' style="width: 100%;position: absolute;left: 0;bottom: 0;" ></image>
</view>
</view>
<view class="memberC">
<image src="../../../static/images/icon/banner.png" mode='widthFix' style="width: 100%;margin-top: 5px;" ></image>
<view class="mc_box" @click="goUrl()">
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
contentHeight:0,
mainColor:'',
}
},
created(){
this.contentHeight = this.$utils.calcContentHeight(-40)+'px';
this.mainColor = this.$uiConfig.mainColor;
uni.setNavigationBarTitle({
title: '会员中心',
});
},
methods: {
goUrl(){
uni.navigateTo({
url: '/pages/member/privilege'
});
},
gobalance(){
uni.navigateTo({
url: '/pages/balance/recharge'
});
}
}
}
</script>
<style>
.memberStyle{
background: #fff;
}
.memberStyle .memberTop{
width: 100%;
height: 350px;
display: flex;
flex-direction: column;
align-items: center;
background: #292A30;
position: relative;
overflow: hidden;
}
.memberStyle .memberTop .memberT_box{
width: 90%;
display: flex;
flex-direction: column;
}
.memberStyle .memberTop .member{
background: #3B3641;
width: 80px;
font-size: 10px;
color:#fff;
height: 18px;
border-radius: 9px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.memberStyle .balance{
width: 100%;
height: 80px;
background: #464954;
border-radius: 10px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
padding: 0 15px;
margin-top: 10px;
}
.memberStyle .balance_l{
display: flex;
flex-direction: column;
color: #fff;
}
.memberStyle .balance_r{
display: flex;
align-items: center;
justify-content: center;
width: 80px;
height: 30px;
border-radius: 15px;
border: 1px solid #fff;
color: #fff;
}
.memberStyle .memberC{
width: 100%;
display: flex;
flex-direction: column;
align-items: center;
}
.mc_box{
width: 94%;
height: 100px;
border-radius: 10px;
border: 1px solid #D6C8AB;
margin-top: 10px;
}
</style>
pages/member/privilege.vue 0 → 100644
View file @ 0996b060
<template>
<view class="privilegeStyle" :style="{'height':contentHeight}">
<view class="privilege_t">
<image src="../../static/images/icon/privilegebg.jpeg" mode='aspectFit' style="width: 100%;height: 250px;" ></image>
</view>
</view>
</template>
<script>
export default {
data() {
return {
contentHeight:0,
mainColor:'',
}
},
created(){
this.contentHeight = this.$utils.calcContentHeight(-40)+'px';
this.mainColor = this.$uiConfig.mainColor;
uni.setNavigationBarTitle({
title: '会员特权说明',
});
},
methods: {
}
}
</script>
<style>
.privilegeStyle{
background: #fff;
}
.privilegeStyle .privilege_t{
width: 100%;
height: 250px;
}
</style>
pages/order-submit/order-submit.vue
View file @ 0996b060
...@@ -42,6 +42,9 @@ ...@@ -42,6 +42,9 @@
</view> </view>
<view class="right">x{{ y.num }}</view> <view class="right">x{{ y.num }}</view>
</view> </view>
<view v-if="y.address_disabled">
<u-tag size="mini" text="不在配送范围内" type="warning" />
</view>
</view> </view>
</view> </view>
</template> </template>
...@@ -123,6 +126,7 @@ ...@@ -123,6 +126,7 @@
</view> </view>
<view class="right"> <view class="right">
<u-button <u-button
:disabled="mchs[0].address_enable"
size="80" size="80"
:ripple="true" :ripple="true"
shape="circle" shape="circle"
...@@ -270,7 +274,7 @@ export default { ...@@ -270,7 +274,7 @@ export default {
exitPay() { exitPay() {
this.payExit = false; this.payExit = false;
uni.redirectTo({ uni.redirectTo({
url: "/pages/order/index/index", url: "/pages/order/index/index?status=0",
}); });
}, },
closePay() { closePay() {
...@@ -593,6 +597,11 @@ export default { ...@@ -593,6 +597,11 @@ export default {
</script> </script>
<style> <style>
button[disabled]{
color: rgba(0,0,0,.3)!important;
background-color: #f7f7f7!important;
}
/* @font-face { /* @font-face {
font-family: "oswald"; font-family: "oswald";
src: url("https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/smallapp/Oswald-Regular.ttf"); src: url("https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/smallapp/Oswald-Regular.ttf");
......
pages/order-submit/pay-success.vue
View file @ 0996b060
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<img src="/static/images/icon/pay-success.png" class="img" /> <img src="/static/images/icon/pay-success.png" class="img" />
</view> </view>
<view class="title">订单支付成功</view> <view class="title">订单支付成功</view>
<view class="price">实付 ￥119.00</view> <view class="price">实付 ￥{{payInfo.total_price}}</view>
<view class="btn-box"> <view class="btn-box">
<u-button <u-button
style="display: inline-block;" style="display: inline-block;"
...@@ -53,9 +53,13 @@ export default { ...@@ -53,9 +53,13 @@ export default {
}, },
mainColor: "", mainColor: "",
recommend: [], recommend: [],
payInfo:{},
}; };
}, },
onLoad(option) { onLoad(option) {
if (option.payInfo) {
this.payInfo=JSON.parse(option.payInfo)
}
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: "支付成功", title: "支付成功",
}); });
...@@ -82,7 +86,7 @@ export default { ...@@ -82,7 +86,7 @@ export default {
}, },
redictToOrders() { redictToOrders() {
uni.redirectTo({ uni.redirectTo({
url: "/pages/order/index/index", url: "/pages/order/index/index?status=2",
}); });
}, },
goHome() { goHome() {
......
pages/order/after-sale/index.vue
View file @ 0996b060
...@@ -2,25 +2,25 @@ ...@@ -2,25 +2,25 @@
<view class="applyrefund" v-if="!loading"> <view class="applyrefund" v-if="!loading">
<view class="head"> <view class="head">
<view class="goods"> <view class="goods">
<image :src="good.goods_info.pic_url" mode="aspectFill" class="image" /> <image :src="good.CoverImagePath" mode="aspectFill" class="image" />
<view class="good-info"> <view class="good-info">
<view class="name-box"> <view class="name-box">
<view class="name">{{ good.goods_info.name }}</view> <view class="name">{{ good.GoodsName }}</view>
</view> </view>
<view class="price"> <view class="price">
<text>单价：</text> <text>单价：</text>
<text style="color: #222; margin-right: 30rpx;">{{ <text style="color: #222; margin-right: 30rpx;">{{
good.unit_price good.Final_Price
}}</text> }}</text>
<text>购买数量：</text> <text>购买数量：</text>
<text style="color: #222;">{{ good.num }}</text> <text style="color: #222;">{{ good.Number }}</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="apply"> <view class="apply">
<view class="item" @click="refundsHandler"> <view class="item" @click="refundsHandler(1)">
<image <image
src="@/static/images/icon/tui.png" src="@/static/images/icon/tui.png"
mode="aspectFill" mode="aspectFill"
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<u-icon name="arrow" size="32" color="#333"></u-icon> <u-icon name="arrow" size="32" color="#333"></u-icon>
</view> </view>
</view> </view>
<view class="item"> <view class="item" @click="refundsHandler(2)">
<image <image
src="@/static/images/icon/huan.png" src="@/static/images/icon/huan.png"
mode="aspectFill" mode="aspectFill"
...@@ -72,25 +72,23 @@ export default { ...@@ -72,25 +72,23 @@ export default {
methods: { methods: {
init() { init() {
let h = this.apiheader(); let h = this.apiheader();
this.request( this.request2(
{ {
url: "", url: '/api/AppletOrder/GetAppletMyOrderAfterSaleInfo',
header: h, data: {
data: { OrderDetailId: this.id
r: "api/order/apply-refund", }
id: this.id,
},
}, },
(res) => { (res) => {
this.good = res.data.detail; this.good = res.data;
this.loading = false; this.loading = false;
uni.hideNavigationBarLoading(); uni.hideNavigationBarLoading();
} }
); );
}, },
refundsHandler() { refundsHandler(type) {
uni.navigateTo({ uni.navigateTo({
url: "/pages/order/after-sale/refunds?id=" + this.id, url: "/pages/order/after-sale/refunds?id=" + this.id +'&type=' +type,
}); });
}, },
}, },
......
pages/order/after-sale/refunds-detail.vue
View file @ 0996b060
...@@ -4,50 +4,51 @@ ...@@ -4,50 +4,51 @@
<view class="head" :style="[headStyle]"> <view class="head" :style="[headStyle]">
<view class="detail"> <view class="detail">
<view class="status">{{ <view class="status">{{
d.status_text == "已退款" ? "已完成" : d.status_text d.ReOrderStatusName
}}</view> }}</view>
<view style="margin: 0 -40rpx;" v-if="d.status!=3"> <view style="margin: 0 -40rpx;" v-if="d.ReOrderStatus!=3">
<u-steps <u-steps
:list="d.type==1?statusList:statusHuanList" :list="d.Type==1?statusList:statusHuanList"
:current="currentStatus" :current="currentStatus"
active-color="#FFF" active-color="#FFF"
un-active-color="#eee" un-active-color="#eee"
:dot-color="mc" :dot-color="mc"
></u-steps> ></u-steps>
</view> </view>
<!-- <view style="height:45px" v-if="d.status==3">&nbsp;</view> --> <!-- <view style="height:45px" v-if="d.ReOrderStatus==3">&nbsp;</view> -->
</view> </view>
</view> </view>
<view class="block shenhe"> <view class="block shenhe">
<view class="title" v-if="d.status == 1">商家正在审核</view> <view class="title" v-if="d.ReOrderStatus == 1">商家正在审核</view>
<view class="title" v-else-if="d.status == 2">商家审核通过</view> <view class="title" v-else-if="d.ReOrderStatus == 2">商家审核通过</view>
<view class="title" v-else>商家拒绝退货</view> <view class="title" v-else>商家拒绝退货</view>
<view class="content" v-if="d.status == 1" <view class="content" v-if="d.ReOrderStatus == 1"
>商家已经收到了您的申请，会尽快和您取得联系，处理本次申请，请您耐心等待</view >商家已经收到了您的申请，会尽快和您取得联系，处理本次申请，请您耐心等待</view
> >
<view class="content" v-else-if="d.status == 2"> <view class="content" v-else-if="d.ReOrderStatus == 2">
尊敬的客户，让您久等了，很抱歉出现了让您不满意的情况，我们将配合您尽快完成本次售后申请 尊敬的客户，让您久等了，很抱歉出现了让您不满意的情况，我们将配合您尽快完成本次售后申请
</view> </view>
<!-- TODO字段没有 -->
<view class="content" v-else> <view class="content" v-else>
审核留言：{{d.merchant_remark}} 审核留言：{{d.Remark}}
</view> </view>
</view> </view>
<view <view
style="margin-top: 40rpx;" style="margin-top: 40rpx;"
class="block" class="block"
v-if="d.status_text=='已换货'" v-if="d.ReOrderStatusName=='已换货'"
> >
<view class="good-title">换货物流</view> <view class="good-title">换货物流</view>
<view class="filed"> <view class="filed">
<view class="key">快递公司</view> <view class="key">快递公司</view>
<view class="val"> <view class="val">
{{ d.merchant_express }} {{ d.TExpressList[0].ExpressName }}
</view> </view>
</view> </view>
<view class="filed"> <view class="filed">
<view class="key">快递单号</view> <view class="key">快递单号</view>
<view class="val"> <view class="val">
{{ d.merchant_express_no }} {{ d.TExpressList[0].ExpressNumber }}
</view> </view>
</view> </view>
<view class="filed"> <view class="filed">
...@@ -59,24 +60,25 @@ ...@@ -59,24 +60,25 @@
</view> </view>
<view style="margin-top: 40rpx; padding-bottom: 16rpx;" class="block"> <view style="margin-top: 40rpx; padding-bottom: 16rpx;" class="block">
<view class="good-title">商品信息</view> <view class="good-title">商品信息</view>
<view class="good-info" @click="reditrectToGoodHandler(d.detail[0].goods_info.id)"> <view class="good-info" @click="reditrectToGoodHandler(d.OrderInfo.OrderId)">
<image <image
:src="d.detail[0].goods_info.pic_url" :src="d.OrderInfo.CoverImagePath"
class="img" class="img"
mode="aspectFill" mode="aspectFill"
/> />
<view class="detail"> <view class="detail">
<view class="name-box"> <view class="name-box">
<view class="name">{{ d.detail[0].goods_info.name }}</view> <view class="name">{{ d.OrderInfo.GoodsName }}</view>
</view> </view>
<view> <view>
<text>单价：</text> <!-- <text>单价：</text> -->
<text>总价：</text>
<text style="font-size: 30rpx; color: #000; margin-right: 40rpx;" <text style="font-size: 30rpx; color: #000; margin-right: 40rpx;"
>￥{{ d.detail[0].unit_price }}</text >￥{{ d.OrderInfo.Final_Price }}</text
> >
<text>数量：</text> <text>数量：</text>
<text style="font-size: 30rpx; color: #000; margin-right: 40rpx;" <text style="font-size: 30rpx; color: #000; margin-right: 40rpx;"
>￥{{ d.detail[0].num }}</text >￥{{ d.OrderInfo.Number }}</text
> >
</view> </view>
</view> </view>
...@@ -84,9 +86,9 @@ ...@@ -84,9 +86,9 @@
<view class="customer"> <view class="customer">
<button <button
open-type="contact" open-type="contact"
:send-message-title="d.detail[0].goods_info.name" :send-message-title="d.OrderInfo.GoodsName"
:send-message-path="path" :send-message-path="path"
:send-message-img="d.detail[0].goods_info.pic_url" :send-message-img="d.OrderInfo.Final_Price"
:show-message-card="true" :show-message-card="true"
> >
<u-icon <u-icon
...@@ -129,9 +131,9 @@ ...@@ -129,9 +131,9 @@
</view> </view>
<view class="filed split"> <view class="filed split">
<view class="key">服务类型</view> <view class="key">服务类型</view>
<view class="val">{{ d.type == 1 ? "退货" : "换货" }}</view> <view class="val">{{ d.Type == 1 ? "退货" : "换货" }}</view>
</view> </view>
<template v-if="d.status == 2"> <template v-if="d.ReOrderStatus == 2">
<view class="filed"> <view class="filed">
<view class="key">商品退回</view> <view class="key">商品退回</view>
<view class="val">快递返回</view> <view class="val">快递返回</view>
...@@ -157,7 +159,7 @@ ...@@ -157,7 +159,7 @@
<view <view
style="margin-top: 40rpx;" style="margin-top: 40rpx;"
class="block" class="block"
v-if="d.status == 2 && (!d.express || d.express == '')" v-if="d.ReOrderStatus == 2 && (!d.express || d.express == '')"
> >
<view class="good-title">商品寄回</view> <view class="good-title">商品寄回</view>
<view class="filed"> <view class="filed">
...@@ -208,7 +210,7 @@ ...@@ -208,7 +210,7 @@
<view <view
style="margin-top: 40rpx;" style="margin-top: 40rpx;"
class="block" class="block"
v-if="d.status == 2 && d.express && d.express != ''" v-if="d.ReOrderStatus == 2 && d.express && d.express != ''"
> >
<view class="good-title">商品寄回</view> <view class="good-title">商品寄回</view>
<view class="filed"> <view class="filed">
...@@ -411,27 +413,26 @@ export default { ...@@ -411,27 +413,26 @@ export default {
init() { init() {
this.isover = false; this.isover = false;
let h = this.apiheader(); let h = this.apiheader();
this.request( this.request2(
{ {
url: "", url: '/api/AppletOrder/GetAppletOrderAfterSaleInfo',
header: h, data: {
data: { ReOrderId:this.id
r: "api/order/refund-detail", }
id: this.id, },
},
},
(res) => { (res) => {
this.d = res.data.detail; this.d = res.data;
this.expressList = res.data.express_list; this.expressList = res.data.OrderInfo;
this.loading = false; this.loading = false;
this.currentStatus = this.d.status - 1; this.currentStatus = this.d.ReOrderStatus - 1;
if (this.d.status_text == "已发货,待商家处理") {
this.currentStatus += 1; // if (this.d.ReOrderStatusName == 1) {
} else if (this.d.status_text == "待退款" || this.d.status_text == "已换货") { // this.currentStatus += 1;
this.currentStatus += 2; // } else if (this.d.ReOrderStatusName == "待退款" || this.d.status_text == "已换货") {
} else if (this.d.status_text == "已退款") { // this.currentStatus += 2;
this.currentStatus += 3; // } else if (this.d.status_text == "已退款") {
} // this.currentStatus += 3;
// }
} }
); );
}, },
......
pages/order/after-sale/refunds-list.vue
View file @ 0996b060
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
:style="{ :style="{
height: contentHeight, height: contentHeight,
}" }"
v-if="!loading"
> >
<view <view
style="height: calc(100vh - 50px); background: #fff;" style="height: calc(100vh - 50px); background: #fff;"
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<view class="orderList"> <view class="orderList">
<view <view
class="listBox" class="listBox"
@click="redirectToDetail(item.id)" @click="redirectToDetail(item.ReOrderId)"
v-for="(item, index) in g" v-for="(item, index) in g"
:key="index" :key="index"
> >
...@@ -44,33 +44,32 @@ ...@@ -44,33 +44,32 @@
flex: 1; flex: 1;
width: 1rpx; width: 1rpx;
" "
>单号：{{ item.order_no }}</Text >单号：{{ item.ReOrderNo }}</Text
> >
<view class="viewtype"> <view class="viewtype">
<image <image
class="img" class="img"
v-if="item.type == 1" v-if="item.Type == 1"
src="/static/images/icon/tui.png" src="/static/images/icon/tui.png"
mode="aspectFill" mode="aspectFill"
/> />
<image <image
class="img" class="img"
v-if="item.type == 2" v-if="item.Type == 2"
src="/static/images/icon/huan.png" src="/static/images/icon/huan.png"
mode="aspectFill" mode="aspectFill"
/> />
<text>{{ item.type == 1 ? "退货" : "换货" }}</text> <text>{{ item.Type == 1 ? "退货退款" : "换货" }}</text>
</view> </view>
</view> </view>
<view class="listBox_c"> <view class="listBox_c">
<template v-if="item.detail.length == 1"> <template >
<!-- <template v-if="item.OrderDetailModel.length == 1"> -->
<view <view
v-for="(cx, ci) in item.detail"
:key="ci"
class="box_bottom" class="box_bottom"
> >
<image <image
:src="cx.goods_info.pic_url" :src="item.OrderDetailModel.CoverImagePath"
style="width: 140rpx; height: 140rpx; border-radius: 8rpx;" style="width: 140rpx; height: 140rpx; border-radius: 8rpx;"
mode="aspectFill" mode="aspectFill"
/> />
...@@ -86,7 +85,7 @@ ...@@ -86,7 +85,7 @@
> >
<view style="height: 1rpx; flex: 1;"> <view style="height: 1rpx; flex: 1;">
<view class="topic_cont_text">{{ <view class="topic_cont_text">{{
cx.goods_info.name item.OrderDetailModel.GoodsName
}}</view> }}</view>
</view> </view>
<view> <view>
...@@ -94,15 +93,15 @@ ...@@ -94,15 +93,15 @@
>申请数量：</text >申请数量：</text
> >
<text style="font-size: 26rpx; color: #000;">{{ <text style="font-size: 26rpx; color: #000;">{{
cx.goods_info.num item.OrderDetailModel.Number
}}</text> }}</text>
</view> </view>
</view> </view>
</view> </view>
<view class="progress"> <view class="progress">
<view class="status-text">{{ item.status_text=='已退款'?'已完成':item.status_text }}</view> <view class="status-text">{{ item.ReOrderStatusName }}</view>
<view class="status-tips"> <view class="status-tips">
<text v-if="item.status == 1" <text v-if="item.ReOrderStatus == 1"
>请您耐心等待商家审核</text >请您耐心等待商家审核</text
> >
</view> </view>
...@@ -114,6 +113,14 @@ ...@@ -114,6 +113,14 @@
</view> </view>
</view> </view>
</view> </view>
<u-loadmore
:status="status"
:load-text="loadText"
:font-size="24"
:margin-top="20"
:margin-bottom="20"
bg-color="#f3f4f6"
/>
</scroll-view> </scroll-view>
</view> </view>
</view> </view>
...@@ -135,15 +142,24 @@ export default { ...@@ -135,15 +142,24 @@ export default {
g: [], g: [],
loading: true, loading: true,
showModal: false, showModal: false,
item: "",
index: 0,
goodData: [],
showGoodList: false,
isover: false,
customStyle: { customStyle: {
marginLeft: "20px", marginLeft: "20px",
padding: "0 30rpx", padding: "0 30rpx",
}, },
msg:{
pageIndex: 1,
pageSize:10,
OrderId:'',
ReOrderStatus:'',
ReOrderNo:'',
},
status: "loadmore",
loadText: {
loadmore: "轻轻上拉，加载更多",
loading: "努力加载中",
nomore: "没有更多了",
},
themCustomStyle: { themCustomStyle: {
marginLeft: "20px", marginLeft: "20px",
padding: "0 30rpx", padding: "0 30rpx",
...@@ -177,34 +193,33 @@ export default { ...@@ -177,34 +193,33 @@ export default {
}); });
}, },
init() { init() {
this.isover = false; uni.showLoading({
let h = this.apiheader(); title: '加载中'
this.request( });
{ this.request2(
url: "", {
header: h, url: '/api/AppletOrder/GetAppletOrderAfterPageList',
data: { data: this.msg
r: "api/order/list", },
status: 5,
page: this.page,
},
},
(res) => { (res) => {
this.loading = false; uni.hideLoading();
this.g = this.g.concat(res.data.list); this.g = this.g.concat(res.data.pageData);
this.page_count = res.data.pagination.page_count; this.page_count = res.data.pageCount;
if (this.page_count == 1) { if (this.page_count == 1) {
this.isover = true; this.status = "nomore";
} }
} }
); );
}, },
lower(e) { lower(e) {
if (this.page < this.page_count) { if (this.msg.pageIndex < this.page_count) {
this.page++; this.msg.pageIndex++;
this.init(); this.status = "loading";
this.init();
} else { } else {
this.isover = true; this.status = "nomore";
} }
}, },
}, },
......
pages/order/after-sale/refunds.vue
View file @ 0996b060
...@@ -3,25 +3,25 @@ ...@@ -3,25 +3,25 @@
<u-top-tips ref="uTips"></u-top-tips> <u-top-tips ref="uTips"></u-top-tips>
<view class="head"> <view class="head">
<view class="goods"> <view class="goods">
<image :src="good.goods_info.pic_url" mode="aspectFill" class="image" /> <image :src="good.CoverImagePath" mode="aspectFill" class="image" />
<view class="good-info"> <view class="good-info">
<view class="name-box"> <view class="name-box">
<view class="name">{{ good.goods_info.name }}</view> <view class="name">{{ good.GoodsName }}</view>
</view> </view>
<view class="price"> <view class="price">
<text>单价：</text> <text>单价：</text>
<text style="color: #222; margin-right: 30rpx;">{{ <text style="color: #222; margin-right: 30rpx;">{{
good.unit_price good.Final_Price
}}</text> }}</text>
<text>购买数量：</text> <text>购买数量：</text>
<text style="color: #222;">{{ good.num }}</text> <text style="color: #222;">{{ good.Number }}</text>
</view> </view>
</view> </view>
</view> </view>
<view class="num-box"> <view class="num-box">
<view class="left">申请数量</view> <view class="left">申请数量</view>
<view class="right"> <view class="right">
<u-number-box :disabled="forms.type==1" :min="1" :max="good.num" v-model="good.num"></u-number-box> <u-number-box :disabled="forms.Type==1" :min="1" :max="good.Number" v-model="forms.ReNumber" @change="valChange"></u-number-box>
</view> </view>
</view> </view>
</view> </view>
...@@ -35,10 +35,10 @@ ...@@ -35,10 +35,10 @@
placeholder="请描述申请售后服务的具体原因" placeholder="请描述申请售后服务的具体原因"
maxlength="150" maxlength="150"
placeholder-style="font-size:13px" placeholder-style="font-size:13px"
:value="forms.remark" :value="forms.Remark"
@input="inputremarkHandler" @input="inputremarkHandler"
/> />
<view class="maxnum">{{ forms.remark.length }}/150</view> <view class="maxnum">{{ forms.Remark.length }}/150</view>
</view> </view>
<view class="upload"> <view class="upload">
<u-upload <u-upload
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
>为了帮您更好的解决问题，请务必上传照片凭证</view >为了帮您更好的解决问题，请务必上传照片凭证</view
> >
</view> </view>
<view class="apply" v-if="forms.type==1"> <view class="apply" v-if="forms.Type==1">
<view class="title"> <view class="title">
<view class="left">退款方式</view> <view class="left">退款方式</view>
<view class="right active">原支付返回</view> <view class="right active">原支付返回</view>
...@@ -82,6 +82,7 @@ ...@@ -82,6 +82,7 @@
class="user-item" class="user-item"
style="padding-bottom: 40rpx; border-bottom: 2rpx solid #f5f5f5;" style="padding-bottom: 40rpx; border-bottom: 2rpx solid #f5f5f5;"
> >
<!-- TODO暂无字段 -->
<view class="icon"> <view class="icon">
<u-icon name="user-circle-o" size="32" color="#000"></u-icon> <u-icon name="user-circle-o" size="32" color="#000"></u-icon>
</view> </view>
...@@ -122,11 +123,12 @@ export default { ...@@ -122,11 +123,12 @@ export default {
good: {}, good: {},
loading: false, loading: false,
forms: { forms: {
id: 0, OrderDetialId: 0,
type: 1, Type: 1,
pic_list: [], ReNumber:0,
refund_price: 0, VoucherList: [],
remark: "", Refund: 0,
Remark: "",
}, },
submitStatus: false, submitStatus: false,
fileList: [], fileList: [],
...@@ -147,31 +149,30 @@ export default { ...@@ -147,31 +149,30 @@ export default {
console.log("jump in"); console.log("jump in");
uni.showNavigationBarLoading(); uni.showNavigationBarLoading();
this.id = option.id || 98180; this.id = option.id || 98180;
this.forms.type = option.type || 1; this.forms.Type = option.type || 1;
this.forms.id = this.id; this.forms.OrderDetialId = this.id;
this.chosenId = option.chosenId; // this.chosenId = option.chosenId;
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: "退货", title: option.type==1?"退货":'换货',
}); });
this.btn2.background = this.$uiConfig.mainColor; this.btn2.background = this.$uiConfig.mainColor;
this.init(); this.init();
}, },
methods: { methods: {
init() { init() {
let h = this.apiheader(); this.request2(
this.request( {
{ url: '/api/AppletOrder/GetAppletMyOrderAfterSaleInfo',
url: "", data: {
header: h, OrderDetailId: this.id
data: { },
r: "api/order/apply-refund", },
id: this.id,
},
},
(res) => { (res) => {
this.good = res.data.detail; this.good = res.data;
if (this.forms.type == 1) { this.forms.ReNumber = res.data.Number;
this.forms.refund_price = this.good.total_price;
if (this.forms.Type == 1) {
this.forms.Refund = res.data.Final_Price;
} }
this.loading = false; this.loading = false;
uni.hideNavigationBarLoading(); uni.hideNavigationBarLoading();
...@@ -179,13 +180,16 @@ export default { ...@@ -179,13 +180,16 @@ export default {
); );
}, },
inputremarkHandler(e) { inputremarkHandler(e) {
this.forms.remark = e.detail.value; this.forms.Remark = e.detail.value;
}, },
uploadSuccessHandler(data, index, lists) { uploadSuccessHandler(data, index, lists) {
console.log(JSON.parse(data)); console.log(JSON.parse(data));
let r = JSON.parse(data); let r = JSON.parse(data);
this.forms.pic_list.push(r.data.url); this.forms.VoucherList.push(r.data.url);
}, },
valChange(val){
this.forms.ReNumber = Number(val.value) ;
},
submitHandler() { submitHandler() {
let that = this; let that = this;
uni.requestSubscribeMessage({ uni.requestSubscribeMessage({
...@@ -194,26 +198,21 @@ export default { ...@@ -194,26 +198,21 @@ export default {
if (!that.submitStatus) { if (!that.submitStatus) {
that.submitStatus = true; that.submitStatus = true;
let msg = ""; let msg = "";
if (that.forms.remark == "") { if (that.forms.Remark == "") {
msg = "亲，请描述一下你遇到的问题吧"; msg = "亲，请描述一下你遇到的问题吧";
} else if (that.forms.pic_list.length == 0) { } else if (that.forms.VoucherList.length == 0) {
msg = "亲，请上传一张说明截图吧"; msg = "亲，请上传一张说明截图吧";
} }
if (msg == "") { if (msg == "") {
let h = that.apiheader();
h["content-type"] = "application/x-www-form-urlencoded"; that.request2(
that.forms["r"] = "api/order/refund-submit";
that.request(
{ {
url: "", url: '/api/AppletOrder/SetAppletMyOrderAfterSale',
header: h, data: that.forms
data: that.forms,
method: "POST",
}, },
(res) => { (res) => {
console.log(res); console.log(res);
if (res.code == 0) { if (res.resultCode == 1) {
uni.showModal({ uni.showModal({
content: "提交售后申请成功，稍后客服专员将与您取得联系。", content: "提交售后申请成功，稍后客服专员将与您取得联系。",
showCancel: false, showCancel: false,
......
pages/order/express.vue
View file @ 0996b060
...@@ -3,16 +3,16 @@ ...@@ -3,16 +3,16 @@
<view class="status-box"> <view class="status-box">
<view class="item"> <view class="item">
<view class="name">快递公司：</view> <view class="name">快递公司：</view>
<view class="val">{{ express }}</view> <view class="val">{{ expressInfo.ExpressName }}</view>
</view> </view>
<view class="item"> <view class="item">
<view class="name">运单号：</view> <view class="name">运单号：</view>
<view class="val">{{ express_no }}</view> <view class="val">{{ expressInfo.ExpressNumber }}</view>
</view> </view>
<view class="item"> <view class="item">
<view class="name">运送状态：</view> <view class="name">运送状态：</view>
<view class="val" :style="{ color: mainColor }">{{ <view class="val" :style="{ color: mainColor }">{{
d.status_text expressInfo.Remark
}}</view> }}</view>
</view> </view>
</view> </view>
...@@ -81,12 +81,12 @@ export default { ...@@ -81,12 +81,12 @@ export default {
data() { data() {
return { return {
mainColor: "", mainColor: "",
express: "",
express_no: "",
d: {}, d: {},
loading: false, loading: false,
address: "", OrderId:0,
last: {}, last: {},
expressInfo:{},
address:'',
}; };
}, },
onLoad(option) { onLoad(option) {
...@@ -94,33 +94,24 @@ export default { ...@@ -94,33 +94,24 @@ export default {
title: "物流信息", title: "物流信息",
}); });
this.mainColor = this.$uiConfig.mainColor; this.mainColor = this.$uiConfig.mainColor;
this.express = option.express || "圆通速递"; this.OrderId = option.OrderId
this.express_no = option.no || "YT2042624009816"; // this.express = option.express || "圆通速递";
// this.express_no = option.no || "YT2042624009816";
this.address = option.address || "四川成都市高新西区万景峰二期"; this.address = option.address || "四川成都市高新西区万景峰二期";
this.init(); this.init();
}, },
methods: { methods: {
init() { init() {
let h = this.apiheader();
this.request( this.request2(
{ {
url: "", url: '/api/AppletOrder/GetAppletMyOrderExpressInfo',
header: h, data: {
data: { OrderId: this.OrderId
r: "api/order/express-detail", }
express: this.express, },
express_no: this.express_no,
customer_name: "",
},
},
(res) => { (res) => {
this.loading = false; this.expressInfo = res.data
this.d = res.data.express;
this.d.list = this.d.list.reverse();
if (this.d.status == 3) {
this.last = this.d.list[0];
this.d.list.splice(0, 1);
}
} }
); );
}, },
......
pages/order/index/index.vue
View file @ 0996b060
...@@ -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.OrderStatusName == '未付款' || item.OrderStatusName == '待发货' item.OrderStatus == '1' || item.OrderStatus == '2'
" "
>取消订单</u-button >取消订单</u-button
> >
...@@ -126,44 +126,52 @@ ...@@ -126,44 +126,52 @@
v-if="item.OrderStatusName == '待发货'" 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.OrderStatusName == '待评价'" v-if="item.OrderStatus == '4'"
>评价晒单</u-button >评价晒单</u-button
> > -->
<u-button
shape="circle"
size="medium"
:custom-style="customStyle"
v-if="item.OrderStatus == '6'"
>待处理</u-button
>
<u-button <u-button
shape="circle" shape="circle"
size="medium" size="medium"
:custom-style="themCustomStyle" :custom-style="themCustomStyle"
v-on:click.stop="payment(item)" v-on:click.stop="payment(item)"
v-if="item.OrderStatusName == '未付款'" v-if="item.OrderStatus == '1'"
>立即支付</u-button >立即支付</u-button
> >
<u-button <u-button
shape="circle" shape="circle"
size="medium" size="medium"
:custom-style=" :custom-style="
item.OrderStatusName == '待收货' ? customStyle : themCustomStyle item.OrderStatus == '3' ? customStyle : themCustomStyle
" "
v-if="item.OrderStatusName != '未付款'" v-if="item.OrderStatus != '1'"
@click.stop="buy(item)" @click.stop="buy(item)"
>再次购买</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.OrderStatusName == '待收货'" v-if="item.OrderStatus == '3'"
@click="goExpressHandler(orders)"
>查看物流</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.OrderStatusName == '待收货'" v-if="item.OrderStatus == '3'"
@click="shouhuoHandler(item.id)" @click="shouhuoHandler(item.OrderId)"
>确认收货</u-button >确认收货</u-button
> >
</view> </view>
...@@ -182,7 +190,7 @@ ...@@ -182,7 +190,7 @@
</view> </view>
<!-- 取消提示 --> <!-- 取消提示 -->
<u-modal <!-- <u-modal
v-model="showModal" v-model="showModal"
content="是否取消订单？" content="是否取消订单？"
:show-cancel-button="true" :show-cancel-button="true"
...@@ -190,7 +198,29 @@ ...@@ -190,7 +198,29 @@
@confirm="confirm" @confirm="confirm"
:border-radius="20" :border-radius="20"
> >
</u-modal> </u-modal> -->
<u-popup v-model="showModal"
mode="center"
length="80%">
<view style='display: flex;flex-direction: column;align-items: center;background: #fff;'>
<view style="display: flex;align-items: center;justify-content: center;height:70px ;">
<Text>是否取消订单？</Text>
</view>
<view style="display: flex;flex-direction: column;height:80px ;margin-left: 15px;width: 100%;" v-if='msg.OrderStatus==2'>
<Text style='margin-left: 10px;margin-top: 5px;'>备注</Text>
<input class="uni-input inputM" style='margin-left: 10px;margin-top: 5px;' v-model="Cancelmsg.Remark" placeholder="输入备注"/>
</view>
<view style="display: flex;flex-direction: row;align-items: center;height: 50px;border-top: 1px solid #F5F5F5;width: 100%;">
<view style="width: 50%;display: flex;align-items: center;justify-content: center" @click="showModal=false">
<Text>取消</Text>
</view>
<view style="width: 50%;color: #a0cfff;display: flex;align-items: center;justify-content: center" @click="confirm">
<Text>确定</Text>
</view>
</view>
</view>
</u-popup>
<u-modal <u-modal
v-model="showReviceModal" v-model="showReviceModal"
content="是否确认收货？" content="是否确认收货？"
...@@ -199,7 +229,7 @@ ...@@ -199,7 +229,7 @@
@confirm="submitReviceGoodHandler" @confirm="submitReviceGoodHandler"
:border-radius="20" :border-radius="20"
></u-modal> ></u-modal>
<u-toast ref="uToast" />
<good-list <good-list
:list="goodData" :list="goodData"
v-if="showGoodList" v-if="showGoodList"
...@@ -241,7 +271,7 @@ export default { ...@@ -241,7 +271,7 @@ export default {
payExit:false, payExit:false,
page_count: 1, page_count: 1,
g: [], g: [],
submitId:0,
showModal: false, showModal: false,
item: "", item: "",
index: 0, index: 0,
...@@ -358,24 +388,24 @@ export default { ...@@ -358,24 +388,24 @@ export default {
shouhuoHandler(id) { shouhuoHandler(id) {
this.showReviceModal = true; this.showReviceModal = true;
this.submitId = id; this.submitId = id;
}, },
submitReviceGoodHandler() { submitReviceGoodHandler() { //确认收货
let that = this; let that = this
let h = this.apiheader();
uni.requestSubscribeMessage({ uni.requestSubscribeMessage({
tmplIds: that.template_message_list, tmplIds: that.template_message_list,
complete(res) { complete(res) {
that.request( that.request2(
{ {
url: "", url: '/api/AppletOrder/SetAppletOrderGoodsReceiving',
header: h, data: {
data: { OrderId: that.submitId
r: "api/order/confirm", }
id: that.submitId,
},
}, },
(res) => { (res) => {
that.$refs.uToast.show({ title: res.msg }); uni.showToast({
title:res.message
})
that.change(4); that.change(4);
} }
); );
...@@ -425,6 +455,7 @@ export default { ...@@ -425,6 +455,7 @@ export default {
}, },
cancel(e, index) { cancel(e, index) {
this.showModal = true; this.showModal = true;
this.Cancelmsg.Remark= '',
this.index = index; this.index = index;
this.item = e; this.item = e;
this.Cancelmsg.OrderId = e.OrderId; this.Cancelmsg.OrderId = e.OrderId;
...@@ -454,11 +485,25 @@ export default { ...@@ -454,11 +485,25 @@ export default {
data: this.Cancelmsg data: this.Cancelmsg
}, },
(res) => { (res) => {
uni.showToast({ if(this.Cancelmsg.Type==1){
title:res.message, uni.showToast({
icon:'none' title:res.message,
}) icon:'none'
this.g.splice(this.index, 1); })
this.g.splice(this.index, 1);
}else{
uni.showToast({
title: "取消成功，请等待审核",
position: "bottom",
icon: "none",
duration: 2000,
});
this.msg.pageIndex = 1;
this.g = [];
this.init();
}
} }
); );
}, },
...@@ -499,7 +544,6 @@ export default { ...@@ -499,7 +544,6 @@ export default {
reloadUserinfo() { reloadUserinfo() {
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
this.showAuth = false; this.showAuth = false;
this.init();
this.getOrderStatus(); this.getOrderStatus();
}, },
goback(){ goback(){
......
pages/order/order-detail.vue
View file @ 0996b060
This diff is collapsed.
pages/share-order/share-order.vue
View file @ 0996b060
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
</view> </view>
<view class="box_center" @click="isdetail(index)"> <view class="box_center" @click="isdetail(index)">
<view class="center_l" > <view class="center_l" >
<!-- TODO暂不确定头像字段字段的名字 -->
<u-avatar :src="item.Photo" mode="square" size="70"></u-avatar> <u-avatar :src="item.Photo" mode="square" size="70"></u-avatar>
<view class="box_ltext"> <view class="box_ltext">
<Text class='l_name'>{{item.nickname}}</Text> <Text class='l_name'>{{item.UserName}}</Text>
</view> </view>
<Text v-if='item.Grade==0'>自购返佣</Text> <Text v-if='item.Grade==0'>自购返佣</Text>
<Text v-if='item.Grade==1'>一级分销</Text> <Text v-if='item.Grade==1'>一级分销</Text>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</view> </view>
<view class="center_l"> <view class="center_l">
<!-- TODO返佣金额 --> <!-- TODO返佣金额 -->
<Text>预计佣金：<Text :style="{color:mainColor}">{{item.share_money}}</Text>元 </Text> <Text>预计佣金：<Text :style="{color:mainColor}">0</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>
......
pages/share/examine.vue 0 → 100644
View file @ 0996b060
<template>
<view class="examineStyle" :style="{'height':contentHeight}">
<view style="width: 100%;height: 100%;">
<u-empty v-if="g.length==0" text="暂无数据" mode="data"></u-empty>
<template v-if="g.length > 0">
<view
style="
height: calc(100vh - 50px);
width: calc(100vw);
overflow: hidden;
">
<scroll-view
:scroll-y="true"
:enable-back-to-top="true"
:enable-flex="true"
@scrolltolower="lower"
:style="{ height: '100%' }">
<view style="display: flex;flex-direction: column;align-items: center;">
<view v-for="(item, index) in g" :key="index" class="listbox">
<view class="box_top">
<u-avatar :src="item.Photo" size="110"></u-avatar>
<view class="box_r">
<view style="width: 100%;display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
<view style="width: 190px;">
<Text class='l_name'>{{item.UserName}}</Text>
</view>
<Text style='font-size: 12px;'>来源：{{item.SourceName}}</Text>
</view>
<Text style='font-size: 12px;'>申请时间：{{item.CreateDate}}</Text>
</view>
</view>
<view class="box_b">
<Text >分销商名称：{{item.Name}}</Text>
<Text >分销商电话：{{item.Mobile}}</Text>
</view>
<view class="box_bootom">
<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>
<!-- <view class="box_bo_item" style="margin-right: 15px;">
<Text style='color: #19be6b;'>同意</Text>
</view>
<view class="box_bo_item">
<Text style='color: #fa3534;'>拒绝</Text>
</view> -->
</view>
</view>
</view>
<u-loadmore
:status="status"
:load-text="loadText"
:font-size="24"
:margin-top="20"
:margin-bottom="20"
bg-color="#f3f4f6"
/>
</scroll-view>
</view>
</template>
</view>
<u-modal
v-model="showModal"
:content="timsg.Type==1?'通过审核':'拒绝通过'"
:show-cancel-button="true"
:show-title="false"
@confirm="confirm"
:border-radius="20"
></u-modal>
</view>
</template>
<script>
export default {
data() {
return {
pageTitle: "分销商审核",
contentHeight:0,
mainColor:'',
secondary:'',
current:0,
g:[],
timsg:{
UserId:0,
Type:0,
},
showModal:false,
msg:{
pageIndex: 1,
pageSize:10,
Name:'',
Source:'',
NickName:'',
Mobile:'',
},
page_count:1,
status: "loadmore",
loadText: {
loadmore: "轻轻上拉，加载更多",
loading: "努力加载中",
nomore: "没有更多了",
},
}
},
created(){
this.contentHeight = this.$utils.calcContentHeight(-40)+'px';
this.mainColor = this.$uiConfig.mainColor;
this.secondary = this.$uiConfig.secondary;
this.init()
},
mounted() {
let currentPages = getCurrentPages();
let u = "/" + currentPages[currentPages.length-1].route;
let pages = wx.getStorageSync("basedata")
? wx.getStorageSync("basedata").bar_title
: [];
pages.forEach((x) => {
if (x.value == u) {
this.pageTitle = x.new_name ? x.new_name : x.name;
}
});
uni.setNavigationBarTitle({
title: this.pageTitle,
});
},
methods: {
init(){
uni.showLoading({
title: '加载中'
});
this.request2(
{
url: '/api/AppletUser/GetHpUserReferralsAuditList',
data: this.msg
},
(res) => {
uni.hideLoading();
this.g = this.g.concat(res.data.pageData);
this.page_count = res.data.pageCount;
if (this.page_count == 1) {
this.status = "nomore";
}
}
);
},
lower(e) {
if (this.msg.pageIndex < this.page_count) {
this.msg.pageIndex++;
this.status = "loading";
this.init();
} else {
this.status = "nomore";
}
},
handle(type,UserId){
this.timsg.Type = type;
this.timsg.UserId = UserId;
this.showModal=true;
},
confirm(){
uni.showLoading({
title: '加载中'
});
this.request2(
{
url: '/api/AppletUser/SetHpUserReferralsAudit',
data: this.timsg
},
(res) => {
uni.hideLoading();
this.g=[];
this.msg.pageIndex=1;
this.init();
}
);
}
}
}
</script>
<style>
.examineStyle{
background: #f3f4f6;
}
.examineStyle .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;
}
.examineStyle .listbox{
width: 100%;
background: #fff;
padding: 0 15px;
margin-bottom: 15px;
display: flex;
flex-direction: column;
align-items: center;
}
.examineStyle .box_top{
width:100% ;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
padding: 10px 0 ;
border-bottom: 1px solid #f5f5f5;
}
.examineStyle .box_r{
width: calc(100vw - 30px - 55px - 20px);
height: 55px;
display: flex;
flex-direction: column;
justify-content: space-between;
}
.box_r .l_name{
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
}
.examineStyle .box_b{
width: 100%;
padding: 15px 0;
display: flex;
flex-direction: column;
}
.examineStyle .box_bootom{
width: 100%;
height: 60px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: flex-end;
}
.examineStyle .box_bootom .box_bo_item{
width: 50px;
height: 30px;
border-radius: 15px;
display: flex;
align-items: center;
justify-content: center;
border: 1px solid #c8c9cc;
}
</style>
pages/share/index/index.vue
View file @ 0996b060
...@@ -92,6 +92,11 @@ ...@@ -92,6 +92,11 @@
<Text class='item_text'>{{sharedata.CustomModel.PromoteQRCodeName}}</Text> <Text class='item_text'>{{sharedata.CustomModel.PromoteQRCodeName}}</Text>
</view> </view>
<view class="menus_item" @click="goUrl('/pages/share/examine')" v-if='sharedata.UserInfo.HpReferralsGradeAudit==1'>
<!-- <image :src="sharedata.CustomModel.PromoteQRCodeImage" style="width: 30px;height: 30px" mode='widthFix'></image> -->
<Text class='item_text'>分销商审核</Text>
</view>
</view> </view>
</view> </view>
......
pages/share/level/level.vue
View file @ 0996b060
...@@ -4,15 +4,15 @@ ...@@ -4,15 +4,15 @@
<view :style="{ 'background-image': 'url(' + level_bg2 + ')', backgroundSize: '100%' }" v-if='level_bg2!="" ' class="imgbg"> <view :style="{ 'background-image': 'url(' + level_bg2 + ')', backgroundSize: '100%' }" v-if='level_bg2!="" ' class="imgbg">
<Text class='leveltop'>满足以下条件即可升级</Text> <Text class='leveltop'>满足以下条件即可升级</Text>
<view class='levelc'> <view class='levelc'>
<Text>{{level.GradeInfo.UpGradeConditionName}}</Text> <Text>{{level.GradeInfo.UpGradeConditionName}}{{level.GradeInfo.ReferralsNumber}}人</Text>
<view style="display: flex;flex-direction: row;align-items: center;" @click="show=true"> <view style="display: flex;flex-direction: row;align-items: center;" @click="show=true">
<Text style='font-size: 14px;color:#c8c9cc ;'>等级说明</Text> <Text style='font-size: 14px;color:#c8c9cc ;'>等级说明</Text>
<u-icon name="arrow" color='#c8c9cc'></u-icon> <u-icon name="arrow" color='#c8c9cc'></u-icon>
</view> </view>
</view> </view>
<view class="level_b"> <view class="level_b" @click="Upgrade">
<!-- TODO接口暂无 -->
<Text>立即升级</Text> <Text>立即升级</Text>
</view> </view>
</view> </view>
...@@ -80,7 +80,6 @@ ...@@ -80,7 +80,6 @@
methods: { methods: {
init(){ init(){
uni.showNavigationBarLoading(); uni.showNavigationBarLoading();
let h = this.apiheader();
this.request2( this.request2(
{ {
...@@ -92,8 +91,29 @@ ...@@ -92,8 +91,29 @@
uni.hideNavigationBarLoading() uni.hideNavigationBarLoading()
this.level = res.data this.level = res.data
} }
); );
}, },
Upgrade(){
uni.showNavigationBarLoading();
this.request2(
{
url: '/api/AppletUser/SetUserDistrbutorUpgrade',
data: {
Id:this.level.GradeInfo.Id
}
},
(res) => {
uni.hideNavigationBarLoading()
uni.showToast({
title:res.message,
icon:'none'
})
}
);
}
} }
} }
</script> </script>
......
pages/user-center/user-center.vue
View file @ 0996b060
<template> <template>
<view class="userStyle"> <view class="userStyle">
<view class="userBox" :style="{ 'margin-bottom': bottommargin }"> <view class="userBox" :style="{ 'margin-bottom': bottommargin }">
<view :style="{ 'background-image': 'url(' + meueData.user_center.top_pic_url + ')', backgroundSize: '100% 330rpx' }" class="imgbg"> <view :style="{ 'background-image': 'url(' + (meueData.user_center.top_pic_url?meueData.user_center.top_pic_url:'') + ')', backgroundSize: '100% 330rpx' }" class="imgbg">
<view style="display: flex;flex-direction: row;align-items: center;width: 100%;" v-if="meueData.user_center.top_style == 1"> <view style="display: flex;flex-direction: row;align-items: center;width: 100%;" v-if="meueData.user_center.top_style == 1">
<u-avatar :src="user_info.avatar" size="140" style="margin-left: 50rpx;"></u-avatar> <u-avatar :src="user_info.avatar" size="140" style="margin-left: 50rpx;"></u-avatar>
<Text style="color: #FFF;margin-left: 20rpx;font-size: 36rpx;" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text> <view style="display: flex;flex-direction: column;justify-content: center;">
<Text style="color: #FFF;margin-left: 20rpx;font-size: 36rpx;" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text>
<view class="member" @click="goUrl('/pages/member/index/index')">
<image :src="meueData.user_center.top_pic_url" mode='aspectFill' style="width: 26px;height: 26px;border-radius: 13px;"></image>
<Text style='margin-right: 10px;'>{{user_info.identity.level_name!=null ?user_info.identity.level_name:'普通用户' }}</Text>
</view>
</view>
</view> </view>
<view style="display: flex;flex-direction: column;align-items: center;" v-if="meueData.user_center.top_style == 2"> <view style="display: flex;flex-direction: column;align-items: center;" v-if="meueData.user_center.top_style == 2">
<u-avatar :src="user_info.avatar" size="140"></u-avatar> <u-avatar :src="user_info.avatar" size="140"></u-avatar>
<Text style="color: #FFF;margin-left: 20rpx;font-size: 36rpx;" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text> <Text style="color: #FFF;margin-left: 20rpx;font-size: 36rpx;" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text>
<view class="member" @click="goUrl('/pages/member/index/index')">
<image :src="meueData.user_center.top_pic_url" mode='aspectFill' style="width: 26px;height: 26px;border-radius: 13px;"></image>
<Text style='margin-right: 10px;'>{{user_info.identity.level_name!=null ?user_info.identity.level_name:'普通用户' }}</Text>
</view>
</view> </view>
<view class="ReceiptAdder" @click="goUrl('/pages/address/address')" :style="{ background: mainColor }"> <view class="ReceiptAdder" @click="goUrl('/pages/address/address')" :style="{ background: mainColor }">
<u-icon name="location" color="#fff" size="40"></u-icon> <u-icon name="location" color="#fff" size="40"></u-icon>
...@@ -66,7 +77,7 @@ ...@@ -66,7 +77,7 @@
<!-- 待评价 --> <!-- 待评价 -->
<view v-if="item.link_url =='/pages/order/index/index?status=4'&&user_info.MyOrder.WaitCommentNum>0" class="badge" :style="{ background: mainColor }">{{ user_info.MyOrder.WaitCommentNum }}</view> <view v-if="item.link_url =='/pages/order/index/index?status=4'&&user_info.MyOrder.WaitCommentNum>0" class="badge" :style="{ background: mainColor }">{{ user_info.MyOrder.WaitCommentNum }}</view>
<!-- 售后 --> <!-- 售后 -->
<view v-if="item.link_url =='/pages/order/index/index?status=5'&&user_info.MyOrder.AfterSaleNum>0" class="badge" :style="{ background: mainColor }">{{ user_info.MyOrder.AfterSaleNum }}</view> <view v-if="item.link_url =='/pages/order/refund/index'&&user_info.MyOrder.AfterSaleNum>0" class="badge" :style="{ background: mainColor }">{{ user_info.MyOrder.AfterSaleNum }}</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -181,9 +192,16 @@ console.log(wx.getStorageSync('basedata')) ...@@ -181,9 +192,16 @@ console.log(wx.getStorageSync('basedata'))
); );
}, },
goUrl(url) { goUrl(url) {
uni.navigateTo({ if(url =='/pages/order/refund/index'){
url: url uni.navigateTo({
}); url: '/pages/order/after-sale/refunds-list'
});
}else{
uni.navigateTo({
url: url
});
}
}, },
reloadUserinfo() { reloadUserinfo() {
this.userinfo(); this.userinfo();
...@@ -363,4 +381,16 @@ console.log(wx.getStorageSync('basedata')) ...@@ -363,4 +381,16 @@ console.log(wx.getStorageSync('basedata'))
align-items: center; align-items: center;
padding: 0 20rpx; padding: 0 20rpx;
} }
.userStyle .member{
background: #3B3641;
width: 80px;
font-size: 10px;
color:#fff;
height: 18px;
border-radius: 9px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
</style> </style>
plugin/api.js
View file @ 0996b060
export default { export default {
install(Vue, options) { install(Vue, options) {
Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285" //Vue.prototype.host2 = "http://192.168.0.110:8200"
Vue.prototype.host2 = "https://mallApi.oytour.com" Vue.prototype.host2 = "https://mallApi.oytour.com"
//Vue.prototype.host2 = "https://mallApi.oytour.com"
//Vue.prototype.host2 = "http://mallapi.oytour.com"
Vue.prototype.request = function(param, success, failed) {
//网络请求
uni.request({
url: this.host + "&r=" + param.data.r,
method: param.method || "GET",
header: param.header || {
'content-type': "application/json"
},
data: param.data,
success: res => {
if (res.data.code != 0 && res.data.msg != "商品未上架") {
}
typeof success == "function" && success(res.data);
},
fail: (e) => {
console.log("网络请求fail:" + JSON.stringify(e));
uni.showModal({
content: "" + res.errMsg
});
typeof failed == "function" && failed(res.data);
}
});
}
Vue.prototype.request2 = function(param, success, failed) { Vue.prototype.request2 = function(param, success, failed) {
//网络请求 //网络请求
uni.request({ uni.request({
......
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