价格修改 返回bug修改
This commit is contained in:
parent
fc96dceea9
commit
8eb4c1f97d
|
|
@ -23,52 +23,52 @@
|
|||
<view class="tab">
|
||||
<view class="item active" style="margin: 0;">{{merchant_Data.margin}}元</view>
|
||||
</view>
|
||||
<button class="btn" :class="{'btn-d': merchant_Data.is_margin != 1}" @click="paydecimal">{{merchant_Data.is_margin != 1?"无需缴纳":"缴纳"}}</button>
|
||||
<button class="btn" :class="{'btn-d': merchant_Data.is_margin != 1}"
|
||||
@click="paydecimal">{{merchant_Data.is_margin != 1?"无需缴纳":"缴纳"}}</button>
|
||||
</view>
|
||||
<!-- <view class="tip">
|
||||
<view class="title">注意事项</view>
|
||||
<view class="text">充值后帐户的金额不能提现，可用于商城消费使用佣金导入账户之后不能再次导出、不可提现账户充值出现问题可联系商城客服，也可拨打商城客服热线<text @click="copyPhone('4008888888')">4008888888</text>
|
||||
</view>
|
||||
</view> -->
|
||||
|
||||
<u-tabs :list="[{name: '订单补缴记录'},{name: '充值记录'}]" @click="changeCurrent" lineColor="#f56c6c" :activeStyle="{
|
||||
|
||||
<u-tabs :list="[{name: '订单补缴记录'},{name: '充值记录'}]" @click="changeCurrent" lineColor="#f56c6c" :activeStyle="{
|
||||
color: '#333',
|
||||
fontWeight: 'bold',
|
||||
transform: 'scale(1.05)'
|
||||
}"
|
||||
:inactiveStyle="{
|
||||
}" :inactiveStyle="{
|
||||
color: '#333',
|
||||
transform: 'scale(1)'
|
||||
}"></u-tabs>
|
||||
<block v-if="current==0">
|
||||
<view class="content-order" v-for="(item,i ) in deductList">
|
||||
<view class="deduct">扣除编号：{{item.financial_record_sn}}</view>
|
||||
<view class="deduct">扣除金额：<text style="color: #ff5c2d;">{{item.number}}元</text></view>
|
||||
<view class="deduct">扣费方式：{{item.financial_type=='auto_margin'? '订单自动补缴': '其他扣除'}}</view>
|
||||
<view class="deduct">订单编号：{{item.order_sn}}</view>
|
||||
<view class="deduct">扣除时间：{{item.create_time}}</view>
|
||||
</view>
|
||||
<view class='loadingicon acea-row row-center-wrapper' v-if='deductList.length > 0'>
|
||||
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle2}}
|
||||
</view>
|
||||
<view class='loadingicon acea-row row-center-wrapper' v-else>
|
||||
没有更多了
|
||||
</view>
|
||||
</block>
|
||||
<block v-if="current==1">
|
||||
<view class="content-order" v-for="(item,i ) in productList">
|
||||
<view class="view">订单编号：{{item.order_sn}}</view>
|
||||
<view class="view">支付金额：{{item.total_price}}</view>
|
||||
<view class="view">支付状态：{{item.pay_type==1?'已支付':'待支付'}}</view>
|
||||
<view class="view">支付时间：{{item.pay_time}}</view>
|
||||
</view>
|
||||
<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
|
||||
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
|
||||
</view>
|
||||
<view class='loadingicon acea-row row-center-wrapper' v-else>
|
||||
没有更多了
|
||||
</view>
|
||||
</block>
|
||||
<view class="content-order" v-for="(item,i ) in deductList">
|
||||
<view class="deduct">扣除编号：{{item.financial_record_sn}}</view>
|
||||
<view class="deduct">扣除金额：<text style="color: #ff5c2d;">{{item.number}}元</text></view>
|
||||
<view class="deduct">扣费方式：{{item.financial_type=='auto_margin'? '订单自动补缴': '其他扣除'}}</view>
|
||||
<view class="deduct">订单编号：{{item.order_sn}}</view>
|
||||
<view class="deduct">扣除时间：{{item.create_time}}</view>
|
||||
</view>
|
||||
<view class='loadingicon acea-row row-center-wrapper' v-if='deductList.length > 0'>
|
||||
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle2}}
|
||||
</view>
|
||||
<view class='loadingicon acea-row row-center-wrapper' v-else>
|
||||
没有更多了
|
||||
</view>
|
||||
</block>
|
||||
<block v-if="current==1">
|
||||
<view class="content-order" v-for="(item,i ) in productList">
|
||||
<view class="view">订单编号：{{item.order_sn}}</view>
|
||||
<view class="view">支付金额：{{item.total_price}}</view>
|
||||
<view class="view">支付状态：{{item.pay_type==1?'已支付':'待支付'}}</view>
|
||||
<view class="view">支付时间：{{item.pay_time}}</view>
|
||||
</view>
|
||||
<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
|
||||
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
|
||||
</view>
|
||||
<view class='loadingicon acea-row row-center-wrapper' v-else>
|
||||
没有更多了
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
|
@ -77,9 +77,11 @@
|
|||
merchant,
|
||||
paymerchant,
|
||||
marginlist,
|
||||
autoMarginlist
|
||||
autoMarginlist
|
||||
} from '@/api/api.js'
|
||||
import { Toast } from '../../libs/uniApi'
|
||||
import {
|
||||
Toast
|
||||
} from '../../libs/uniApi'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
|
|
@ -89,66 +91,40 @@
|
|||
page: 1,
|
||||
limit: 10
|
||||
},
|
||||
where2: {
|
||||
page: 1,
|
||||
limit: 10
|
||||
},
|
||||
where2: {
|
||||
page: 1,
|
||||
limit: 10
|
||||
},
|
||||
productList: [],
|
||||
deductList: [],
|
||||
deductList: [],
|
||||
loadend: false,
|
||||
loading: false,
|
||||
loadTitle: '加载更多',
|
||||
loadend2: false,
|
||||
loading2: false,
|
||||
loadTitle2: '加载更多',
|
||||
current: 0
|
||||
loadend2: false,
|
||||
loading2: false,
|
||||
loadTitle2: '加载更多',
|
||||
current: 0
|
||||
}
|
||||
},
|
||||
onLoad(e) {
|
||||
this.mer_id = e.mer_id
|
||||
this.decimal()
|
||||
// this.list(true);
|
||||
this.autoList(true);
|
||||
this.autoList(true);
|
||||
},
|
||||
onReachBottom() {
|
||||
if(this.current==0){
|
||||
this.loadend2 = false;
|
||||
this.loading2 = false;
|
||||
this.autoList(false);
|
||||
}else {
|
||||
this.loadend = false;
|
||||
this.loading = false;
|
||||
this.list(false);
|
||||
if (this.current == 0) {
|
||||
this.loadend2 = false;
|
||||
this.loading2 = false;
|
||||
this.autoList(false);
|
||||
} else {
|
||||
this.loadend = false;
|
||||
this.loading = false;
|
||||
this.list(false);
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
list(isPage) {
|
||||
let that = this;
|
||||
if (that.loadend) return;
|
||||
if (that.loading) return;
|
||||
if (isPage === true) that.$set(that, 'productList', []);
|
||||
that.loading = true;
|
||||
that.loadTitle = '';
|
||||
marginlist(that.where).then(res => {
|
||||
let list = res.data.list;
|
||||
let productList = that.$util.SplitArray(list, that.productList);
|
||||
let loadend = list.length < that.where.limit;
|
||||
that.loadend = loadend;
|
||||
that.loading = false;
|
||||
that.loadTitle = loadend ? '已全部加载' : '加载更多';
|
||||
setTimeout(() => {
|
||||
that.$set(that, 'productList', productList);
|
||||
}, 500)
|
||||
|
||||
|
||||
that.$set(that.where, 'page', that.where.page + 1);
|
||||
if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
|
||||
}).catch(err => {
|
||||
that.loading = false;
|
||||
that.loadTitle = '加载更多';
|
||||
});
|
||||
|
||||
},
|
||||
//获取押金信息
|
||||
decimal() {
|
||||
merchant({
|
||||
|
|
@ -172,28 +148,28 @@
|
|||
if (res.confirm) {
|
||||
// console.log('用户点击确定');
|
||||
paymerchant().then((res) => {
|
||||
try{
|
||||
uni.requestPayment({
|
||||
provider: 'wxpay',
|
||||
orderInfo: res.data
|
||||
.config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
|
||||
success: (res) => {
|
||||
this.$util.Tips({
|
||||
title: '支付成功'
|
||||
});
|
||||
this.decimal()
|
||||
this.list(true)
|
||||
},
|
||||
fail: (err) => {
|
||||
this.$util.Tips({
|
||||
title: '支付失败'
|
||||
});
|
||||
console.log('fail:' + JSON.stringify(err));
|
||||
}
|
||||
});
|
||||
}catch(err){
|
||||
Toast('请前往小程序中支付')
|
||||
}
|
||||
try {
|
||||
uni.requestPayment({
|
||||
provider: 'wxpay',
|
||||
orderInfo: res.data
|
||||
.config, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
|
||||
success: (res) => {
|
||||
this.$util.Tips({
|
||||
title: '支付成功'
|
||||
});
|
||||
this.decimal()
|
||||
this.list(true)
|
||||
},
|
||||
fail: (err) => {
|
||||
this.$util.Tips({
|
||||
title: '支付失败'
|
||||
});
|
||||
console.log('fail:' + JSON.stringify(err));
|
||||
}
|
||||
});
|
||||
} catch (err) {
|
||||
Toast('请前往小程序中支付')
|
||||
}
|
||||
}).catch((err) => {
|
||||
this.$util.Tips({
|
||||
title: err
|
||||
|
|
@ -204,47 +180,74 @@
|
|||
}
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
},
|
||||
changeCurrent(e){
|
||||
this.current = e.index;
|
||||
if(e.index==0){
|
||||
this.loadend = false;
|
||||
this.loading = false;
|
||||
this.autoList(true);
|
||||
}else {
|
||||
this.loadend = false;
|
||||
this.loading = false;
|
||||
this.list(true)
|
||||
}
|
||||
},
|
||||
autoList(isPage){
|
||||
let that = this;
|
||||
if (that.loadend2) return;
|
||||
if (that.loading2) return;
|
||||
if (isPage === true) that.$set(that, 'deductList', []);
|
||||
that.loading2 = true;
|
||||
that.loadTitle2 = '';
|
||||
autoMarginlist(this.mer_id, that.where2).then(res=>{
|
||||
let list = res.data;
|
||||
let deductList = that.$util.SplitArray(list, that.deductList);
|
||||
let loadend = list.length < that.where2.limit;
|
||||
that.loadend2 = loadend;
|
||||
that.loading2 = false;
|
||||
that.loadTitle2 = loadend ? '已全部加载' : '加载更多';
|
||||
setTimeout(() => {
|
||||
that.$set(that, 'deductList', deductList);
|
||||
}, 500);
|
||||
that.$set(that.where2, 'page', that.where2.page + 1);
|
||||
if (that.where2.page == 1 && res.data.length <= 0) that.emptyShow = true
|
||||
}).catch(err=>{
|
||||
console.log(err);
|
||||
changeCurrent(e) {
|
||||
this.current = e.index;
|
||||
if (e.index == 0) {
|
||||
this.loadend = false;
|
||||
this.loading = false;
|
||||
this.autoList(true);
|
||||
} else {
|
||||
this.loadend = false;
|
||||
this.loading = false;
|
||||
this.list(true)
|
||||
}
|
||||
},
|
||||
|
||||
list(isPage) {
|
||||
let that = this;
|
||||
if (that.loadend) return;
|
||||
if (that.loading) return;
|
||||
if (isPage === true) that.$set(that, 'productList', []);
|
||||
that.loading = true;
|
||||
that.loadTitle = '';
|
||||
marginlist(that.where).then(res => {
|
||||
let list = res.data.list;
|
||||
let productList = that.$util.SplitArray(list, that.productList);
|
||||
let loadend = list.length < that.where.limit;
|
||||
that.loadend = loadend;
|
||||
that.loading = false;
|
||||
that.loadTitle = loadend ? '已全部加载' : '加载更多';
|
||||
setTimeout(() => {
|
||||
that.$set(that, 'productList', productList);
|
||||
}, 500)
|
||||
|
||||
if (isPage) that.where.page = 1;
|
||||
else that.$set(that.where, 'page', that.where.page + 1);
|
||||
|
||||
if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
|
||||
}).catch(err => {
|
||||
that.loading = false;
|
||||
that.loadTitle = '加载更多';
|
||||
});
|
||||
},
|
||||
|
||||
autoList(isPage) {
|
||||
let that = this;
|
||||
if (that.loadend2) return;
|
||||
if (that.loading2) return;
|
||||
if (isPage === true) that.$set(that, 'deductList', []);
|
||||
that.loading2 = true;
|
||||
that.loadTitle2 = '';
|
||||
autoMarginlist(this.mer_id, that.where2).then(res => {
|
||||
let list = res.data;
|
||||
let deductList = that.$util.SplitArray(list, that.deductList);
|
||||
let loadend = list.length < that.where2.limit;
|
||||
that.loadend2 = loadend;
|
||||
that.loading2 = false;
|
||||
that.loadTitle2 = loadend ? '已全部加载' : '加载更多';
|
||||
setTimeout(() => {
|
||||
that.$set(that, 'deductList', deductList);
|
||||
}, 500);
|
||||
that.$set(that.where2, 'page', that.where2.page + 1);
|
||||
if (that.where2.page == 1 && res.data.length <= 0) that.emptyShow = true
|
||||
}).catch(err => {
|
||||
console.log(err);
|
||||
that.loading2 = false;
|
||||
that.loadTitle2 = '加载更多';
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
@ -260,10 +263,10 @@
|
|||
.content-order {
|
||||
background: #fff;
|
||||
border-radius: 21rpx 21rpx;
|
||||
margin: 0 28rpx;
|
||||
margin: 0 28rpx;
|
||||
margin-top: 30rpx;
|
||||
padding: 28rpx;
|
||||
box-shadow: 0 0 10rpx 2rpx rgba(0, 0, 0, 0.1);
|
||||
box-shadow: 0 0 10rpx 2rpx rgba(0, 0, 0, 0.1);
|
||||
|
||||
.view {
|
||||
font-size: 30rpx;
|
||||
|
|
@ -271,9 +274,8 @@
|
|||
font-weight: 400;
|
||||
color: #333333;
|
||||
}
|
||||
|
||||
.deduct{
|
||||
}
|
||||
|
||||
.deduct {}
|
||||
}
|
||||
|
||||
.info {
|
||||
|
|
@ -302,13 +304,12 @@
|
|||
border-radius: 14rpx 14rpx 14rpx 14rpx;
|
||||
opacity: 1;
|
||||
padding: 31.5rpx 28rpx;
|
||||
font-size: 30rpx;
|
||||
font-size: 30rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
|
||||
|
||||
.title {
|
||||
font-size: 32rpx;
|
||||
|
|
@ -328,12 +329,13 @@
|
|||
flex-shrink: 0;
|
||||
margin-right: 18rpx;
|
||||
}
|
||||
.text{
|
||||
display: -webkit-box;
|
||||
-webkit-line-clamp: 2;
|
||||
-webkit-box-orient: vertical;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.text {
|
||||
display: -webkit-box;
|
||||
-webkit-line-clamp: 2;
|
||||
-webkit-box-orient: vertical;
|
||||
overflow: hidden;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -407,9 +409,10 @@
|
|||
font-weight: 400;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
.btn-d{
|
||||
background-color: #999;
|
||||
}
|
||||
|
||||
.btn-d {
|
||||
background-color: #999;
|
||||
}
|
||||
}
|
||||
|
||||
.tip {
|
||||
|
|
|
|||
|
|
@ -205,6 +205,7 @@
|
|||
style="background-color: #F9F9F9;height: 166rpx;" :maxlength='300'></u--textarea>
|
||||
|
||||
<u-line color="#F3F3F3" style="margin: 30rpx 0;"></u-line>
|
||||
|
||||
<u-form-item label="送货方式" labelPosition="left" prop='delivery_way' required>
|
||||
<u-checkbox-group v-model="formData.delivery_way" placement="row" slot="right">
|
||||
<u-checkbox shape="circle" v-for="(item, index) in checkboxList1" :key="index"
|
||||
|
|
@ -425,8 +426,7 @@
|
|||
{
|
||||
name: '快递配送',
|
||||
value: '2',
|
||||
},
|
||||
|
||||
}
|
||||
],
|
||||
attrRules: {
|
||||
price: '单价不能为空',
|
||||
|
|
@ -767,11 +767,19 @@
|
|||
this.initFormData(option)
|
||||
this.showSet = option.showSet ? JSON.parse(option.showSet) : this.showSet
|
||||
this.isSet2()
|
||||
this.formData.delivery_way = this.$store.state.app.userInfo?.mer_info.delivery_way.split(',')
|
||||
this.formData.delivery_way = this.$store.state.app.userInfo?.mer_info.delivery_way.split(',');
|
||||
|
||||
if (this.formData.delivery_way.length == 1) {
|
||||
this.checkboxList1 = this.checkboxList1.filter(item => {
|
||||
return item.value == this.formData.delivery_free[0]
|
||||
})
|
||||
|
||||
let checkboxList1 = uni.getStorageSync('checkboxList1');
|
||||
if (checkboxList1 && checkboxList1.length > 0) {
|
||||
this.checkboxList1 = checkboxList1;
|
||||
} else {
|
||||
this.checkboxList1 = this.checkboxList1.filter(item => {
|
||||
return item.value == this.formData.delivery_free[0]
|
||||
});
|
||||
uni.setStorageSync('checkboxList1', this.checkboxList1)
|
||||
}
|
||||
}
|
||||
if (option.product_id) {
|
||||
this.formData.product_id = option.product_id
|
||||
|
|
|
|||
|
|
@ -295,7 +295,11 @@
|
|||
uni.redirectTo({
|
||||
url: `/pages/product/addGoodDetail/addGoodDetail?mer_id=${that.mer_id}&&formData=${JSON.stringify(that.formData) }&&showSet=${true}`,
|
||||
success(res) {
|
||||
uni.setStorageSync('delta', 2);
|
||||
|
||||
let delta = uni.getStorageSync('delta');
|
||||
if (delta) delta += 1;
|
||||
else delta = 2;
|
||||
uni.setStorageSync('delta', delta);
|
||||
}
|
||||
})
|
||||
},
|
||||
|
|
|
|||
|
|
@ -37,13 +37,13 @@
|
|||
|
||||
<view class="" style="color: #FC452F;font-size: 24rpx;">
|
||||
<text style="color:#989898" v-if='isWholeSale'>零售：</text> <text
|
||||
style="font-size: 22rpx;">￥</text><text>{{item.attrValue[0].price}}</text><text
|
||||
style="color: #828282;">/{{item.attrValue[0].unit_name}}</text>
|
||||
style="font-size: 22rpx;">￥</text><text>{{item.price}}</text><text
|
||||
style="color: #828282;">/{{item.unit_name}}</text>
|
||||
</view>
|
||||
|
||||
<view class="" style="color: #FC452F;font-size: 24rpx;" v-if='isWholeSale'>
|
||||
<text style="color:#989898">批发：</text> <text
|
||||
style="font-size: 22rpx;">￥</text><text>{{item.attrValue[0].wholesale_price}}</text><text
|
||||
style="font-size: 22rpx;">￥</text><text>{{item.price}}</text><text
|
||||
style="color: #828282;">/{{item.attrValue[0].wholesale_unit_name}}</text>
|
||||
</view>
|
||||
</view>
|
||||
|
|
|
|||
Loading…
Reference in New Issue