This commit is contained in:
parent
e3d544ae13
commit
53d6500dc7
|
|
@ -262,3 +262,9 @@ export function spuTopList(data) {
|
|||
noAuth: true
|
||||
});
|
||||
}
|
||||
|
||||
// 补贴余额统计
|
||||
export function storeActivityTotal(data) {
|
||||
return request.get(`storeActivity/total`, data);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@
|
|||
},
|
||||
onLoad(options) {
|
||||
this.order_id = options.id
|
||||
this.mer_id = options.merId
|
||||
this.mer_id = options.merId;
|
||||
Promise.all([this.getOrderInfo()])
|
||||
},
|
||||
methods:{
|
||||
|
|
@ -137,7 +137,14 @@
|
|||
res => {
|
||||
res.data.pics4 = res.data.pics.slice(0,4);
|
||||
that.orderInfo = res.data;
|
||||
that.refundInfo = res.data.refund_info
|
||||
that.refundInfo = res.data.refund_info;
|
||||
|
||||
let user = that.$store.state.app.userInfo;
|
||||
if(user) {
|
||||
that.refundInfo.mer_delivery_user ? null : that.refundInfo.mer_delivery_user = user.mer_info.mer_name
|
||||
that.refundInfo.mer_delivery_address ? null : that.refundInfo.mer_delivery_address = user.mer_info.mer_address
|
||||
that.refundInfo.phone ? null : that.refundInfo.phone = user.mer_info.service_phone
|
||||
}
|
||||
},
|
||||
err => {
|
||||
that.$util.Tips({title: err});
|
||||
|
|
|
|||
|
|
@ -45,8 +45,10 @@
|
|||
<view class="content-middlea-two">
|
||||
{{item.value}}
|
||||
</view>
|
||||
<view class="content-middlea-one" style="font-size: 22rpx;color: #7f7f7f;">
|
||||
<text v-if="index==1">(次日18点后可提现)</text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<!-- <view class="content-open" v-if='!isshow' @click="open">
|
||||
<image src="@/static/images/zk.png" mode="aspectFit"></image>
|
||||
|
|
@ -423,6 +425,9 @@
|
|||
import ordertime from './component/timelist.vue'
|
||||
import retuntop from '@/components/content-top/index.vue';
|
||||
import activePopup from '@/components/activePopup.vue';
|
||||
import {
|
||||
storeActivityTotal
|
||||
} from "@/api/activity.js"
|
||||
import {
|
||||
|
||||
setAdminOrderRemark
|
||||
|
|
@ -469,13 +474,16 @@
|
|||
}, {
|
||||
name: '暂存金额',
|
||||
value: 0
|
||||
}, {
|
||||
name: '补贴金额',
|
||||
value: 0
|
||||
}, {
|
||||
},{
|
||||
name: '本月订单数',
|
||||
value: 0
|
||||
}, {
|
||||
name: '抵扣补贴',
|
||||
value: 0
|
||||
}, {
|
||||
name: '无门槛补贴',
|
||||
value: 0
|
||||
}, {
|
||||
name: '今日订单数',
|
||||
value: 0
|
||||
}, ],
|
||||
|
|
@ -1216,7 +1224,8 @@
|
|||
this.order[2].value = res.data.order.untake
|
||||
this.order[3].value = res.data.order.unevaluate
|
||||
this.order[4].value = res.data.order.refund
|
||||
this.list[3].value = res.data.data.month.orderNum
|
||||
this.list[2].value = res.data.data.month.orderNum
|
||||
this.list[5].value = res.data.data.today.orderNum
|
||||
},
|
||||
err => {
|
||||
that.$util.Tips({
|
||||
|
|
@ -1292,6 +1301,13 @@
|
|||
// 暂存金额
|
||||
this.list[1].value = res.data.lock_money;
|
||||
})
|
||||
|
||||
storeActivityTotal().then(res=>{
|
||||
res.data.forEach(item=>{
|
||||
if(item.type==1) this.list[4].value = item.total_amount;
|
||||
if(item.type==2) this.list[3].value = item.total_amount;
|
||||
})
|
||||
})
|
||||
}
|
||||
merstreet({
|
||||
street_code: res.data.mer_info.street_id
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
<view class='picTxt acea-row row-between-wrapper'>
|
||||
<view class='iconfont icon-wuliu'></view>
|
||||
<view class='text'>
|
||||
<view><text class='name line1'>物流公司：</text> {{orderInfo.delivery_name ? orderInfo.delivery_name : ''}}</view>
|
||||
<view><text class='name line1'>物流公司：</text> {{orderInfo.delivery_name ? orderInfo.delivery_name : orderInfo.delivery_type || ''}}</view>
|
||||
<view class='express line1'><text class='name'>快递单号：</text> {{orderInfo.delivery_id ? orderInfo.delivery_id : ''}}</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -29,13 +29,15 @@
|
|||
<view class='copy copy-data' :data-clipboard-text="orderInfo.delivery_id">复制单号</view>
|
||||
<!-- #endif -->
|
||||
</view>
|
||||
<view class='item' v-for="(item,index) in expressList" :key="index">
|
||||
<view class='circular' :class='index === 0 ? "on":""'></view>
|
||||
<view class='text' :class='index===0 ? "on-font on":""'>
|
||||
<view>{{item.status}}</view>
|
||||
<view class='data' :class='index===0 ? "on-font on":""'>{{item.time}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<block v-if="expressList.length>0">
|
||||
<view class='item' v-for="(item,index) in expressList" :key="index">
|
||||
<view class='circular' :class='index === 0 ? "on":""'></view>
|
||||
<view class='text' :class='index===0 ? "on-font on":""'>
|
||||
<view>{{item.status}}</view>
|
||||
<view class='data' :class='index===0 ? "on-font on":""'>{{item.time}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
<recommend v-if="recommend_switch == 1" :hostProduct='hostProduct' :isLogin="isLogin"></recommend>
|
||||
</view>
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
</view>
|
||||
<view class='item' :class='orderStatus==5 ? "on": ""' @click="statusClick(5)">
|
||||
<view>售后/退款</view>
|
||||
<view class='num'>{{len || 0}}</view>
|
||||
<view class='num'>{{orderData.refund || 0}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<!--定金预售订单-->
|
||||
|
|
@ -496,17 +496,15 @@
|
|||
},
|
||||
onReady() {},
|
||||
mounted: function() {
|
||||
this.arrlist()
|
||||
// this.arrlist()
|
||||
},
|
||||
methods: {
|
||||
arrlist() {
|
||||
|
||||
refundList({
|
||||
product_type: this.product_type,
|
||||
type: 0,
|
||||
page: 1,
|
||||
limit: 1500
|
||||
|
||||
}).then(res => {
|
||||
this.len = res.data.list.length
|
||||
})
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ const state = {
|
|||
location: Cache.get('LOCATION_DATA', true) || {},
|
||||
token: Cache.get(LOGIN_STATUS) || null,
|
||||
backgroundColor: "#fff",
|
||||
userInfo: Cache.get(USER_INFO)||null,
|
||||
userInfo: (typeof Cache.get(USER_INFO)=='string'?JSON.parse(Cache.get(USER_INFO)):Cache.get(USER_INFO))||null,
|
||||
uid: Cache.get(UID) || null,
|
||||
globalData: uni.getStorageSync('GLOBAL_DATA') || {},
|
||||
homeActive: false,
|
||||
|
|
|
|||
Loading…
Reference in New Issue