Lee
/
mall-laonong
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

反馈修改-0802

master
Lee1203 2022-08-02 20:01:54 +08:00
parent c0849dfb6e
commit 1317df72c7
34 changed files with 150 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/status-nav/status-nav.vue
View File

@ -82,9 +82,9 @@
default: '20rpx'
},
// 是否返回我的页面
ifBackMy: {
type: Boolean,
default: false
backTag: {
type: String,
default: ''
}
},
data() {
@ -125,11 +125,16 @@
},
//返回事件
backEv() {
if(this.ifBackMy){
if(this.backTag == 'backmy'){
uni.reLaunch({
url:`/pages/my/my`
})
}else{
}else if(this.backTag == 'backindex'){
uni.reLaunch({
url:`/pages/index/index`
})
}
else{
uni.navigateBack({
delta: 1,
fail: () => {

44
pages/cart/settlement.vue
View File

@ -69,8 +69,8 @@
<view class="title">积分抵扣</view>
<view class="section-list font30">
<view class="item flex">
<label class="radio" @tap="chooseEv('score')">
<radio :checked="scoreCheck" color="#febf00" :disabled="orderInfo.available_score>0?false:true"/>
<label class="radio">
<radio :checked="scoreCheck" @tap="chooseEv('score')" color="#febf00" :disabled="!checkedYes"/>
<text>可用积分</text>
</label>
<view class="txt flex">
@ -154,8 +154,10 @@
preferential_options:'coupon',//优惠选择
totalPrice:'',//总价
discountPrice:'', //优惠价格
discountNum:0, //优惠价格数字
isLoading:false,
score_rule: 1, //多少积分抵扣
checkedYes:true,
}
},
onShow() {
@ -190,43 +192,51 @@
// 只有会员则扣
if(this.vipCheck && !this.scoreCheck){
this.discountNum = vipNum;
this.discountPrice = vipPrice;
}
// 只有优惠券
if(this.couponCheck && !this.scoreCheck){
this.discountNum = couponNum;
this.discountPrice = couponPrice;
}
// 只有积分
if(!this.vipCheck && !this.couponCheck && this.scoreCheck){
if(scoreNum >= totalNum){
this.discountNum = totalNum;
this.discountPrice = totalPrice;
}else{
this.discountNum = scoreNum;
this.discountPrice = scorePrice;
}
}
// 会员折扣+积分
if(this.vipCheck && this.scoreCheck){
if(scoreNum + vipNum >= totalNum){
this.discountNum = totalNum;
this.discountPrice = totalPrice;
}else{
this.discountPrice = scorePrice + vipPrice;
this.discountNum = scoreNum + vipNum;
this.discountPrice = this.$toolAll.tools.addXiaoShu(scoreNum + vipNum);
}
}
// 优惠券+积分
if(this.couponCheck && this.scoreCheck){
if(scoreNum + couponNum >= totalNum){
this.discountNum = totalNum;
this.discountPrice = totalPrice;
}else{
this.discountPrice = scorePrice + couponPrice;
this.discountNum = scoreNum + couponNum;
this.discountPrice = this.$toolAll.tools.addXiaoShu(scoreNum + couponNum);
}
}
// 都不选择
if(!this.vipCheck && !this.couponCheck && !this.scoreCheck){
this.discountNum = 0;
this.discountPrice = 0;
this.totalPrice = totalPrice;
}
// 计算支付价格
this.totalPrice = totalPrice - this.discountPrice;
this.totalPrice = this.$toolAll.tools.addXiaoShu(totalNum - this.discountNum);
},
// 获取订单准备信息
@ -261,6 +271,14 @@
let score_value = res.data.integral_rule.deduction_points_score_value;
this.score_rule = parseFloat(score_value)/parseFloat(score_num);
// 积分是否可选
let scoreA = this.orderInfo.available_score*this.score_rule;
let scoreB = parseFloat(this.$toolAll.tools.addXiaoShu(scoreA));
if(scoreB<1){
this.checkedYes = false;
}
console.log(this.checkedYes,1212121212)
// 地址信息
let addr_id = uni.getStorageSync('addr_id');
if(addr_id){
@ -342,12 +360,16 @@
this.computePrice();
}
if(type == 'score' && this.orderInfo.available_score>0){
if(this.scoreCheck){
this.scoreCheck = false;
if(this.checkedYes){
if(this.scoreCheck){
this.scoreCheck = false;
}else{
this.scoreCheck = true;
}
this.computePrice();
}else{
this.scoreCheck = true;
this.$toolAll.tools.showToast('当前积分无法抵扣');
}
this.computePrice();
}
},
@ -429,7 +451,7 @@
setTimeout(()=>{
// 页面跳转
uni.navigateTo({
url:`/pagesA/order/order?index=1&backTag=nopay`
url:`/pagesA/order/order?index=1&backTag=backmy`
})
},1000)
}

7
pagesA/distribution/distribution.vue
View File

@ -49,11 +49,11 @@
<view class="record-item border-box pad-sx40 flex" v-for="(item,index) in recordList" :key="index">
<view class="left flex">
<view class="img radius30" v-if="item.cover">
<image :src="item.cover" mode="widthFix"></image>
<view class="img radius30" v-if="navIndex!==2">
<image :src="item.cover==''?logoSrc:item.cover" mode="widthFix"></image>
</view>
<view class="txt">
<view class="font36 mar-x10"><text class="font26" v-if="navIndex==2">￥</text>{{item.name}}</view>
<view class="font36 mar-x10"><text class="font26" v-if="navIndex==2">￥</text>{{item.name==''?'系统':item.name}}</view>
<view class="font24 color-99">{{item.created_at}}</view>
</view>
</view>
@ -128,6 +128,7 @@
export default {
data() {
return {
logoSrc:'/static/img/logo.png', //商城logo
isShow:false, //分销码弹窗
withdrawal:false, //提现弹窗
navList:['返利记录','我的团队','提现记录'], //导航数据

2
pagesA/integral/integral.vue
View File

@ -23,7 +23,7 @@
<view class="name mar-x10">{{item.name}}</view>
<view class="time font24 color-99">{{item.created_at}}</view>
</view>
<view class="price" style="margin-right: 10rpx;" :class="item.num<0?'color-red':''">{{item.num}}</view>
<view class="price" style="margin-right: 10rpx;" :class="item.num<0?'color-red':''"><text v-if="item.num>0">+</text>{{parseInt(item.num)}}</view>
</view>
</view>
</view>

6
pagesA/order/detail.vue
View File

@ -1,6 +1,6 @@
<template>
<view class="pad-x170" v-if="isLoading">
<status-nav :ifReturn="true" navBarTitle="订单详情" :marginBottom="0" :ifBackMy="ifBackMy"></status-nav>
<status-nav :ifReturn="true" navBarTitle="订单详情" :marginBottom="0" :backTag="backTag"></status-nav>
<!-- 收件人信息 -->
<view class="settlement-content pad-zy20 border-box">
<!-- 订单简介 -->
@ -105,12 +105,12 @@
isLoading:false,
id:0, //订单id
priceAll:'', //实际付款
ifBackMy:false,
backTag:'',
}
},
onLoad(op) {
if(op.id){this.id = op.id;}
if(op.backTag){this.ifBackMy = true;}
if(op.backTag){this.backTag = op.backTag;}
this.getOrderDetail();
},
// 分享到微信

7
pagesA/order/order.vue
View File

@ -1,6 +1,6 @@
<template>
<view v-if="isLoading">
<status-nav :ifReturn="true" navBarTitle="订单管理" :ifBackMy="ifBackMy" :marginBottom="0"></status-nav>
<status-nav :ifReturn="true" navBarTitle="订单管理" :backTag="backTag" :marginBottom="0"></status-nav>
<!-- 订单搜索 -->
<view class="order-search">
<input class="input font30 pad-zy40 color-66 radius20 border-box" v-model="order_coding" type="text" placeholder="请输入订单编号" confirm-type="search" @confirm="doSearch" placeholder-style="color:#666666">
@ -74,6 +74,7 @@
{title:'已下单',tag:'paid'},
{title:'已发货',tag:'shipped'},
{title:'已完成',tag:'completed'},
{title:'已取消',tag:'closed'},
],
activeIndex:0,
scrollLeft:0,
@ -88,13 +89,13 @@
size: 10,
tag: 'all',
order_coding:'', //订单号
ifBackMy:false,
backTag:'',
}
},
onLoad(op) {
if(op.tag){this.tag = op.tag;}
if(op.index){this.activeIndex = op.index;}
if(op.backTag){this.ifBackMy = true;}
if(op.backTag){this.backTag = op.backTag;}
this.navWidth = this.orderNav.length*150 - 20 + 'rpx';
// 分类切换效果
this.setTabList();

3
pagesB/distributor/distributor.vue
View File

@ -1,6 +1,6 @@
<template>
<view>
<status-nav :ifReturn="true" navBarTitle="经销商申请" :marginBottom="0"></status-nav>
<status-nav :ifReturn="true" navBarTitle="经销商申请" :marginBottom="0" :backTag="backTag"></status-nav>
<!-- 内容 -->
<view class="distributor border-box" :style="{'min-height':disclaimersHeight}">
<view class="tags font24" style="text-align: center;color: #ff0000;">请认真填写相关信息，此信息将用于分销提现使用！</view>
@ -47,6 +47,7 @@
deposit_bank:'',
bank_account:'',
flag:true,
backTag:'backindex',
}
},
onLoad(op) {

2
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/nothing/nothing-page.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/share-coupon/share-coupon.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/shopping-carts/cart-slide.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/status-nav/status-nav.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/components/tabbar/tabbar.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cart/finish.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cart/settlement.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/distribution/distribution.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/integral/integral.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/order/detail.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pagesA/order/order.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/dev/.sourcemap/mp-weixin/pagesB/distributor/distributor.js.map vendored
View File

File diff suppressed because one or more lines are too long

15
unpackage/dist/dev/mp-weixin/components/status-nav/status-nav.js vendored
View File

@ -198,9 +198,9 @@ var _default =
default: '20rpx' },
// 是否返回我的页面
ifBackMy: {
type: Boolean,
default: false } },
backTag: {
type: String,
default: '' } },
data: function data() {
@ -241,11 +241,16 @@ var _default =
},
//返回事件
backEv: function backEv() {
if (this.ifBackMy) {
if (this.backTag == 'backmy') {
uni.reLaunch({
url: "/pages/my/my" });
} else {
} else if (this.backTag == 'backindex') {
uni.reLaunch({
url: "/pages/index/index" });
} else
{
uni.navigateBack({
delta: 1,
fail: function fail() {

4
unpackage/dist/dev/mp-weixin/components/status-nav/status-nav.json vendored
View File

@ -1,4 +1,4 @@
{
"usingComponents": {},
"component": true
"component": true,
"usingComponents": {}
}

44
unpackage/dist/dev/mp-weixin/pages/cart/settlement.js vendored
View File

@ -345,9 +345,11 @@ var _default =
preferential_options: 'coupon', //优惠选择
totalPrice: '', //总价
discountPrice: '', //优惠价格
discountNum: 0, //优惠价格数字
isLoading: false,
score_rule: 1 //多少积分抵扣
};
score_rule: 1, //多少积分抵扣
checkedYes: true };
},
onShow: function onShow() {
this.getOrderInfo();
@ -381,43 +383,51 @@ var _default =
// 只有会员则扣
if (this.vipCheck && !this.scoreCheck) {
this.discountNum = vipNum;
this.discountPrice = vipPrice;
}
// 只有优惠券
if (this.couponCheck && !this.scoreCheck) {
this.discountNum = couponNum;
this.discountPrice = couponPrice;
}
// 只有积分
if (!this.vipCheck && !this.couponCheck && this.scoreCheck) {
if (scoreNum >= totalNum) {
this.discountNum = totalNum;
this.discountPrice = totalPrice;
} else {
this.discountNum = scoreNum;
this.discountPrice = scorePrice;
}
}
// 会员折扣+积分
if (this.vipCheck && this.scoreCheck) {
if (scoreNum + vipNum >= totalNum) {
this.discountNum = totalNum;
this.discountPrice = totalPrice;
} else {
this.discountPrice = scorePrice + vipPrice;
this.discountNum = scoreNum + vipNum;
this.discountPrice = this.$toolAll.tools.addXiaoShu(scoreNum + vipNum);
}
}
// 优惠券+积分
if (this.couponCheck && this.scoreCheck) {
if (scoreNum + couponNum >= totalNum) {
this.discountNum = totalNum;
this.discountPrice = totalPrice;
} else {
this.discountPrice = scorePrice + couponPrice;
this.discountNum = scoreNum + couponNum;
this.discountPrice = this.$toolAll.tools.addXiaoShu(scoreNum + couponNum);
}
}
// 都不选择
if (!this.vipCheck && !this.couponCheck && !this.scoreCheck) {
this.discountNum = 0;
this.discountPrice = 0;
this.totalPrice = totalPrice;
}
// 计算支付价格
this.totalPrice = totalPrice - this.discountPrice;
this.totalPrice = this.$toolAll.tools.addXiaoShu(totalNum - this.discountNum);
},
// 获取订单准备信息
@ -452,6 +462,14 @@ var _default =
var score_value = res.data.integral_rule.deduction_points_score_value;
_this.score_rule = parseFloat(score_value) / parseFloat(score_num);
// 积分是否可选
var scoreA = _this.orderInfo.available_score * _this.score_rule;
var scoreB = parseFloat(_this.$toolAll.tools.addXiaoShu(scoreA));
if (scoreB < 1) {
_this.checkedYes = false;
}
console.log(_this.checkedYes, 1212121212);
// 地址信息
var addr_id = uni.getStorageSync('addr_id');
if (addr_id) {
@ -533,12 +551,16 @@ var _default =
this.computePrice();
}
if (type == 'score' && this.orderInfo.available_score > 0) {
if (this.scoreCheck) {
this.scoreCheck = false;
if (this.checkedYes) {
if (this.scoreCheck) {
this.scoreCheck = false;
} else {
this.scoreCheck = true;
}
this.computePrice();
} else {
this.scoreCheck = true;
this.$toolAll.tools.showToast('当前积分无法抵扣');
}
this.computePrice();
}
},
@ -620,7 +642,7 @@ var _default =
setTimeout(function () {
// 页面跳转
uni.navigateTo({
url: "/pagesA/order/order?index=1&backTag=nopay" });
url: "/pagesA/order/order?index=1&backTag=backmy" });
}, 1000);
} });

2
unpackage/dist/dev/mp-weixin/pages/cart/settlement.wxml vendored
View File

File diff suppressed because one or more lines are too long

3
unpackage/dist/dev/mp-weixin/pagesA/distribution/distribution.js vendored
View File

@ -404,7 +404,8 @@ var _base64Src = __webpack_require__(/*! @/jsFile/base64-src.js */ 79); //
//
//
//
var _default = { data: function data() {return { isShow: false, //分销码弹窗
var _default = { data: function data() {return { logoSrc: '/static/img/logo.png', //商城logo
isShow: false, //分销码弹窗
withdrawal: false, //提现弹窗
navList: ['返利记录', '我的团队', '提现记录'], //导航数据
navIndex: 0, //导航当前

2
unpackage/dist/dev/mp-weixin/pagesA/distribution/distribution.wxml vendored
View File

File diff suppressed because one or more lines are too long

19
unpackage/dist/dev/mp-weixin/pagesA/integral/integral.js vendored
View File

@ -120,6 +120,25 @@ var render = function() {
var _vm = this
var _h = _vm.$createElement
var _c = _vm._self._c || _h
var l0 = _vm.isLoading
? _vm.__map(_vm.detailedList, function(item, index) {
var $orig = _vm.__get_orig(item)
var m0 = parseInt(item.num)
return {
$orig: $orig,
m0: m0
}
})
: null
_vm.$mp.data = Object.assign(
{},
{
$root: {
l0: l0
}
}
)
}
var recyclableRender = false
var staticRenderFns = []

2
unpackage/dist/dev/mp-weixin/pagesA/integral/integral.wxml vendored
View File

@ -1 +1 @@
<block wx:if="{{isLoading}}"><view><status-nav vue-id="24b6013b-1" ifReturn="{{true}}" navBarTitle="我的积分" marginBottom="{{0}}" bind:__l="__l"></status-nav><view class="recharge border-box"><view class="recharge-msg radius30 border-box"><view class="txt flex"><text class="font30">我的积分</text><text data-event-opts="{{[['tap',[['goIntegralRule',['$event']]]]]}}" class="font24" bindtap="__e">积分规则</text></view><view class="price font60">{{score}}</view></view></view><view class="recharge-detailed border-box pad-all20 mar-s20"><view class="recharge-title font30 flex"><view class="line background-orange"></view><text>积分明细</text></view><view class="detailed-list"><block wx:for="{{detailedList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="detailed-item font30 border-box pad-sx20 flex"><view class="txt"><view class="name mar-x10">{{item.name}}</view><view class="time font24 color-99">{{item.created_at}}</view></view><view class="{{['price',item.num<0?'color-red':'']}}" style="margin-right:10rpx;">{{item.num}}</view></view></block></view></view><block wx:if="{{noMore}}"><view class="no-more pad-sx25 font24" style="margin:0;"><text>—— 到底啦 ——</text></view></block></view></block>
<block wx:if="{{isLoading}}"><view><status-nav vue-id="24b6013b-1" ifReturn="{{true}}" navBarTitle="我的积分" marginBottom="{{0}}" bind:__l="__l"></status-nav><view class="recharge border-box"><view class="recharge-msg radius30 border-box"><view class="txt flex"><text class="font30">我的积分</text><text data-event-opts="{{[['tap',[['goIntegralRule',['$event']]]]]}}" class="font24" bindtap="__e">积分规则</text></view><view class="price font60">{{score}}</view></view></view><view class="recharge-detailed border-box pad-all20 mar-s20"><view class="recharge-title font30 flex"><view class="line background-orange"></view><text>积分明细</text></view><view class="detailed-list"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="detailed-item font30 border-box pad-sx20 flex"><view class="txt"><view class="name mar-x10">{{item.$orig.name}}</view><view class="time font24 color-99">{{item.$orig.created_at}}</view></view><view class="{{['price',item.$orig.num<0?'color-red':'']}}" style="margin-right:10rpx;"><block wx:if="{{item.$orig.num>0}}"><text>+</text></block>{{item.m0}}</view></view></block></view></view><block wx:if="{{noMore}}"><view class="no-more pad-sx25 font24" style="margin:0;"><text>—— 到底啦 ——</text></view></block></view></block>

2
unpackage/dist/dev/mp-weixin/pagesA/order/detail.js vendored
View File

@ -351,7 +351,7 @@ var _vuex = __webpack_require__(/*! vuex */ 13); //
var _default = { data: function data() {return { orderDetail: {}, //订单详情
flag: true, isLoading: false, id: 0, //订单id
priceAll: '', //实际付款
ifBackMy: false };}, onLoad: function onLoad(op) {if (op.id) {this.id = op.id;}if (op.backTag) {this.ifBackMy = true;}this.getOrderDetail();}, // 分享到微信
backTag: '' };}, onLoad: function onLoad(op) {if (op.id) {this.id = op.id;}if (op.backTag) {this.backTag = op.backTag;}this.getOrderDetail();}, // 分享到微信
onShareAppMessage: function onShareAppMessage() {}, // 分享到朋友圈
onShareTimeline: function onShareTimeline(res) {}, methods: { // 查询订单详情
getOrderDetail: function getOrderDetail() {var _this = this;uni.showLoading({ title: '加载中' });this.$requst.get('/api/user/order-detail', { id: this.id }).then(function (res) {if (res.code == 0) {console.log(res, '订单详情');_this.orderDetail = res.data;_this.priceAll = _this.$toolAll.tools.addXiaoShu(parseFloat(res.data.balance) + parseFloat(res.data.wechat));}uni.hideLoading();_this.isLoading = true;});}, // 取消订单

2
unpackage/dist/dev/mp-weixin/pagesA/order/detail.wxml vendored
View File

File diff suppressed because one or more lines are too long

7
unpackage/dist/dev/mp-weixin/pagesA/order/order.js vendored
View File

@ -282,15 +282,16 @@ var _vuex = __webpack_require__(/*! vuex */ 13); //
//
//
//引入mapState
var _default = { data: function data() {return { newTop: uni.getSystemInfoSync().statusBarHeight + 50, orderNav: [{ title: '全部', tag: 'all' }, { title: '待付款', tag: 'waiting' }, { title: '已下单', tag: 'paid' }, { title: '已发货', tag: 'shipped' }, { title: '已完成', tag: 'completed' }], activeIndex: 0, scrollLeft: 0, tabsScrollLeft: 0, navWidth: '', //导航宽度
var _default = { data: function data() {return { newTop: uni.getSystemInfoSync().statusBarHeight + 50, orderNav: [{ title: '全部', tag: 'all' }, { title: '待付款', tag: 'waiting' }, { title: '已下单', tag: 'paid' }, { title: '已发货', tag: 'shipped' }, { title: '已完成', tag: 'completed' }, { title: '已取消', tag: 'closed' }], activeIndex: 0, scrollLeft: 0, tabsScrollLeft: 0, navWidth: '', //导航宽度
orderList: [], flag: true, isLoading: false, total: 0, totalAll: -1, page: 1, size: 10, tag: 'all', order_coding: '', //订单号
ifBackMy: false };}, onLoad: function onLoad(op) {if (op.tag) {this.tag = op.tag;}if (op.index) {this.activeIndex = op.index;}if (op.backTag) {this.ifBackMy = true;}this.navWidth = this.orderNav.length * 150 - 20 + 'rpx'; // 分类切换效果
backTag: '' };}, onLoad: function onLoad(op) {if (op.tag) {this.tag = op.tag;}if (op.index) {this.activeIndex = op.index;}if (op.backTag) {this.backTag = op.backTag;}this.navWidth = this.orderNav.length * 150 - 20 + 'rpx'; // 分类切换效果
this.setTabList();}, onShow: function onShow() {this.orderList = [];this.getOrderList();}, onReachBottom: function onReachBottom(e) {if (this.orderList.length < this.total) {this.page++;this.getOrderList();}}, // 分享到微信
onShareAppMessage: function onShareAppMessage() {}, // 分享到朋友圈
onShareTimeline: function onShareTimeline(res) {}, methods: { // 导航切换
changeNav: function changeNav(index, tag) {this.total = 0;this.totalAll = -1;this.activeIndex = index;this.tag = tag;this.orderList = [];this.page = 1;this.order_coding = '';this.getOrderList(); // 分类切换效果
this.setTabList();}, // 搜索订单
doSearch: function doSearch() {this.orderList = [];this.activeIndex = 0;this.tag = 'all';
doSearch: function doSearch() {this.orderList = [];this.activeIndex = 0;
this.tag = 'all';
// 获取订单列表
this.getOrderList();
},

2
unpackage/dist/dev/mp-weixin/pagesA/order/order.wxml vendored
View File

@ -1 +1 @@
<block wx:if="{{isLoading}}"><view class="data-v-0d5a9fc9"><status-nav vue-id="c40c4b46-1" ifReturn="{{true}}" navBarTitle="订单管理" ifBackMy="{{ifBackMy}}" marginBottom="{{0}}" class="data-v-0d5a9fc9" bind:__l="__l"></status-nav><view class="order-search data-v-0d5a9fc9"><input class="input font30 pad-zy40 color-66 radius20 border-box data-v-0d5a9fc9" type="text" placeholder="请输入订单编号" confirm-type="search" placeholder-style="color:#666666" data-event-opts="{{[['confirm',[['doSearch',['$event']]]],['input',[['__set_model',['','order_coding','$event',[]]]]]]}}" value="{{order_coding}}" bindconfirm="__e" bindinput="__e"/></view><view class="order-nav-bg mar-s30 data-v-0d5a9fc9" style="{{'top:'+(newTop+'px')+';'}}"><scroll-view scroll-x="true" scroll-left="{{tabsScrollLeft}}" data-event-opts="{{[['scroll',[['scroll',['$event']]]]]}}" bindscroll="__e" class="data-v-0d5a9fc9"><view class="order-nav flex data-v-0d5a9fc9" style="{{'width:'+(navWidth)+';'}}" id="tab_list"><block wx:for="{{orderNav}}" wx:for-item="item" wx:for-index="index"><view class="{{['item','font30','color-8c','radius20','data-v-0d5a9fc9',activeIndex==index?'cur':'']}}" id="tab_item" data-event-opts="{{[['tap',[['changeNav',[index,'$0'],[[['orderNav','',index,'tag']]]]]]]}}" bindtap="__e">{{item.title}}</view></block></view></scroll-view></view><view class="order-list data-v-0d5a9fc9"><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['toDetail',['$0'],[[['orderList','',index,'id']]]]]]]}}" class="order-item data-v-0d5a9fc9" catchtap="__e"><view class="order-code flex data-v-0d5a9fc9"><text class="data-v-0d5a9fc9">{{"订单号："+item.coding}}</text><block wx:if="{{item.status=='waiting'}}"><text class="status color-red data-v-0d5a9fc9">{{item.status_text}}</text></block><block wx:if="{{item.status=='paid'||item.status=='shipped'}}"><text class="status data-v-0d5a9fc9" style="color:#02d20b;">{{item.status_text}}</text></block><block wx:if="{{item.status=='completed'||item.status=='closed'}}"><text class="status color-99 data-v-0d5a9fc9">{{item.status_text}}</text></block></view><view class="item-bg data-v-0d5a9fc9"><block wx:for="{{item.skus}}" wx:for-item="item1" wx:for-index="index1" wx:key="index1"><view class="item flex data-v-0d5a9fc9"><view class="img data-v-0d5a9fc9"><image src="{{item1.spu_cover}}" mode="widthFix" class="data-v-0d5a9fc9"></image></view><view class="txt data-v-0d5a9fc9"><view class="title clips1 data-v-0d5a9fc9">{{item1.spu_name}}</view><view class="specs clips2 data-v-0d5a9fc9">{{"规格："+item1.sku_name}}</view><view class="price flex data-v-0d5a9fc9"><text class="data-v-0d5a9fc9">{{"￥"+item1.price}}</text><view class="data-v-0d5a9fc9"><text class="data-v-0d5a9fc9">x</text>{{item1.num}}</view></view></view></view></block></view><view class="total-price flex data-v-0d5a9fc9"><text class="data-v-0d5a9fc9">{{"合计：￥"+item.price}}</text><block wx:if="{{item.status=='waiting'}}"><view class="btns flex data-v-0d5a9fc9"><view data-event-opts="{{[['tap',[['cancleEv',['$0'],[[['orderList','',index,'coding']]]]]]]}}" class="btn border-box data-v-0d5a9fc9" catchtap="__e">取消订单</view><view data-event-opts="{{[['tap',[['payEv',['$0'],[[['orderList','',index,'coding']]]]]]]}}" class="btn btn-01 border-box data-v-0d5a9fc9" catchtap="__e">立即支付</view></view></block><block wx:if="{{item.status=='paid'}}"><view class="btns flex data-v-0d5a9fc9"><view data-event-opts="{{[['tap',[['cancleEv',['$0'],[[['orderList','',index,'coding']]]]]]]}}" class="btn border-box data-v-0d5a9fc9" catchtap="__e">取消订单</view></view></block><block wx:if="{{item.status=='shipped'}}"><view class="btns flex data-v-0d5a9fc9"><view data-event-opts="{{[['tap',[['affirmEv',['$0'],[[['orderList','',index,'id']]]]]]]}}" class="btn btn-02 border-box background-orange data-v-0d5a9fc9" catchtap="__e">确认收货</view></view></block><block wx:if="{{item.status=='completed'||item.status=='closed'}}"><view class="btns flex data-v-0d5a9fc9"><view data-event-opts="{{[['tap',[['buyAgain',[index]]]]]}}" class="btn border-box data-v-0d5a9fc9" catchtap="__e">再次购买</view></view></block></view></view></block></view><block wx:if="{{total!==0&&totalAll==total}}"><view class="no-more font24 data-v-0d5a9fc9" style="margin:0;padding:25rpx 0;"><text class="data-v-0d5a9fc9">—— 到底啦 ——</text></view></block><block wx:if="{{total==0&&totalAll==total}}"><nothing-page vue-id="c40c4b46-2" content="还没有相关订单哟(*^▽^*)" class="data-v-0d5a9fc9" bind:__l="__l"></nothing-page></block></view></block>
<block wx:if="{{isLoading}}"><view class="data-v-0d5a9fc9"><status-nav vue-id="c40c4b46-1" ifReturn="{{true}}" navBarTitle="订单管理" backTag="{{backTag}}" marginBottom="{{0}}" class="data-v-0d5a9fc9" bind:__l="__l"></status-nav><view class="order-search data-v-0d5a9fc9"><input class="input font30 pad-zy40 color-66 radius20 border-box data-v-0d5a9fc9" type="text" placeholder="请输入订单编号" confirm-type="search" placeholder-style="color:#666666" data-event-opts="{{[['confirm',[['doSearch',['$event']]]],['input',[['__set_model',['','order_coding','$event',[]]]]]]}}" value="{{order_coding}}" bindconfirm="__e" bindinput="__e"/></view><view class="order-nav-bg mar-s30 data-v-0d5a9fc9" style="{{'top:'+(newTop+'px')+';'}}"><scroll-view scroll-x="true" scroll-left="{{tabsScrollLeft}}" data-event-opts="{{[['scroll',[['scroll',['$event']]]]]}}" bindscroll="__e" class="data-v-0d5a9fc9"><view class="order-nav flex data-v-0d5a9fc9" style="{{'width:'+(navWidth)+';'}}" id="tab_list"><block wx:for="{{orderNav}}" wx:for-item="item" wx:for-index="index"><view class="{{['item','font30','color-8c','radius20','data-v-0d5a9fc9',activeIndex==index?'cur':'']}}" id="tab_item" data-event-opts="{{[['tap',[['changeNav',[index,'$0'],[[['orderNav','',index,'tag']]]]]]]}}" bindtap="__e">{{item.title}}</view></block></view></scroll-view></view><view class="order-list data-v-0d5a9fc9"><block wx:for="{{orderList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['toDetail',['$0'],[[['orderList','',index,'id']]]]]]]}}" class="order-item data-v-0d5a9fc9" catchtap="__e"><view class="order-code flex data-v-0d5a9fc9"><text class="data-v-0d5a9fc9">{{"订单号："+item.coding}}</text><block wx:if="{{item.status=='waiting'}}"><text class="status color-red data-v-0d5a9fc9">{{item.status_text}}</text></block><block wx:if="{{item.status=='paid'||item.status=='shipped'}}"><text class="status data-v-0d5a9fc9" style="color:#02d20b;">{{item.status_text}}</text></block><block wx:if="{{item.status=='completed'||item.status=='closed'}}"><text class="status color-99 data-v-0d5a9fc9">{{item.status_text}}</text></block></view><view class="item-bg data-v-0d5a9fc9"><block wx:for="{{item.skus}}" wx:for-item="item1" wx:for-index="index1" wx:key="index1"><view class="item flex data-v-0d5a9fc9"><view class="img data-v-0d5a9fc9"><image src="{{item1.spu_cover}}" mode="widthFix" class="data-v-0d5a9fc9"></image></view><view class="txt data-v-0d5a9fc9"><view class="title clips1 data-v-0d5a9fc9">{{item1.spu_name}}</view><view class="specs clips2 data-v-0d5a9fc9">{{"规格："+item1.sku_name}}</view><view class="price flex data-v-0d5a9fc9"><text class="data-v-0d5a9fc9">{{"￥"+item1.price}}</text><view class="data-v-0d5a9fc9"><text class="data-v-0d5a9fc9">x</text>{{item1.num}}</view></view></view></view></block></view><view class="total-price flex data-v-0d5a9fc9"><text class="data-v-0d5a9fc9">{{"合计：￥"+item.price}}</text><block wx:if="{{item.status=='waiting'}}"><view class="btns flex data-v-0d5a9fc9"><view data-event-opts="{{[['tap',[['cancleEv',['$0'],[[['orderList','',index,'coding']]]]]]]}}" class="btn border-box data-v-0d5a9fc9" catchtap="__e">取消订单</view><view data-event-opts="{{[['tap',[['payEv',['$0'],[[['orderList','',index,'coding']]]]]]]}}" class="btn btn-01 border-box data-v-0d5a9fc9" catchtap="__e">立即支付</view></view></block><block wx:if="{{item.status=='paid'}}"><view class="btns flex data-v-0d5a9fc9"><view data-event-opts="{{[['tap',[['cancleEv',['$0'],[[['orderList','',index,'coding']]]]]]]}}" class="btn border-box data-v-0d5a9fc9" catchtap="__e">取消订单</view></view></block><block wx:if="{{item.status=='shipped'}}"><view class="btns flex data-v-0d5a9fc9"><view data-event-opts="{{[['tap',[['affirmEv',['$0'],[[['orderList','',index,'id']]]]]]]}}" class="btn btn-02 border-box background-orange data-v-0d5a9fc9" catchtap="__e">确认收货</view></view></block><block wx:if="{{item.status=='completed'||item.status=='closed'}}"><view class="btns flex data-v-0d5a9fc9"><view data-event-opts="{{[['tap',[['buyAgain',[index]]]]]}}" class="btn border-box data-v-0d5a9fc9" catchtap="__e">再次购买</view></view></block></view></view></block></view><block wx:if="{{total!==0&&totalAll==total}}"><view class="no-more font24 data-v-0d5a9fc9" style="margin:0;padding:25rpx 0;"><text class="data-v-0d5a9fc9">—— 到底啦 ——</text></view></block><block wx:if="{{total==0&&totalAll==total}}"><nothing-page vue-id="c40c4b46-2" content="还没有相关订单哟(*^▽^*)" class="data-v-0d5a9fc9" bind:__l="__l"></nothing-page></block></view></block>

5
unpackage/dist/dev/mp-weixin/pagesB/distributor/distributor.js vendored
View File

@ -225,9 +225,10 @@ var _vuex = __webpack_require__(/*! vuex */ 13); //
//
//
//引入mapState
var _default = { data: function data() {return { disclaimersHeight: "calc(100vh - ".concat(uni.getSystemInfoSync().statusBarHeight + 50, "px)"), disclaimers: '', invite_code: '', invite_name: '', real_name: '', phone: '', deposit_bank: '', bank_account: '', flag: true };}, onLoad: function onLoad(op) {if (op.invite_code) {// 缓存invite_code
var _default = { data: function data() {return { disclaimersHeight: "calc(100vh - ".concat(uni.getSystemInfoSync().statusBarHeight + 50, "px)"), disclaimers: '', invite_code: '', invite_name: '', real_name: '', phone: '', deposit_bank: '', bank_account: '', flag: true, backTag: 'backindex' };}, onLoad: function onLoad(op) {if (op.invite_code) {// 缓存invite_code
uni.setStorageSync('inviteCode', op.invite_code);this.invite_code = op.invite_code;}if (op.invite_name) {this.invite_name = op.invite_name;}}, methods: { // 提交申请
submitEv: function submitEv() {var _this = this;if (this.checkEmpty() && this.flag) {var params = { invite_code: this.invite_code, invite_name: this.invite_name, real_name: this.real_name, phone: this.phone, deposit_bank: this.deposit_bank, bank_account: this.bank_account };this.$requst.post('/api/user/distributor-apply', params).then(function (res) {if (res.code == 0) {
submitEv: function submitEv() {var _this = this;if (this.checkEmpty() && this.flag) {var params = { invite_code: this.invite_code, invite_name: this.invite_name, real_name: this.real_name, phone: this.phone, deposit_bank: this.deposit_bank, bank_account: this.bank_account };this.$requst.post('/api/user/distributor-apply', params).then(function (res) {
if (res.code == 0) {
_this.$toolAll.tools.showToast('恭喜您申请成功o(╥﹏╥)o');
setTimeout(function () {
uni.reLaunch({

2
unpackage/dist/dev/mp-weixin/pagesB/distributor/distributor.wxml vendored
View File

@ -1 +1 @@
<view><status-nav vue-id="66be6aca-1" ifReturn="{{true}}" navBarTitle="经销商申请" marginBottom="{{0}}" bind:__l="__l"></status-nav><view class="distributor border-box" style="{{'min-height:'+(disclaimersHeight)+';'}}"><view class="tags font24" style="text-align:center;color:#ff0000;">请认真填写相关信息，此信息将用于分销提现使用！</view><view class="distributor-list font30"><view class="distributor-item color-99 mar-s40"><view class="tips">我的邀请人</view><input class="input" type="text" disabled="true" value="{{invite_name}}"/></view><view class="distributor-item mar-s40"><view class="tips color-99">姓名</view><input class="input" type="text" placeholder="请输入您的真实姓名" placeholder-style="color:#000000" data-event-opts="{{[['input',[['__set_model',['','real_name','$event',[]]]]]]}}" value="{{real_name}}" bindinput="__e"/></view><view class="distributor-item mar-s40"><view class="tips color-99">电话</view><input class="input" type="number" placeholder="请输入您的手机号" placeholder-style="color:#000000" data-event-opts="{{[['input',[['__set_model',['','phone','$event',[]]]]]]}}" value="{{phone}}" bindinput="__e"/></view><view class="distributor-item mar-s40"><view class="tips color-99">开户行</view><input class="input" type="text" placeholder="请填写开户行(如:中国银行)" placeholder-style="color:#000000" data-event-opts="{{[['input',[['__set_model',['','deposit_bank','$event',[]]]]]]}}" value="{{deposit_bank}}" bindinput="__e"/></view><view class="distributor-item mar-s40"><view class="tips color-99">银行卡号</view><input class="input" type="number" placeholder="请填写银行卡号" placeholder-style="color:#000000" data-event-opts="{{[['input',[['__set_model',['','bank_account','$event',[]]]]]]}}" value="{{bank_account}}" bindinput="__e"/></view></view></view><view data-event-opts="{{[['tap',[['submitEv',['$event']]]]]}}" class="distributor-btn background-white border-box" bindtap="__e"><view class="btn font36 background-orange color-48 radius30 flex">立即提交</view></view></view>
<view><status-nav vue-id="66be6aca-1" ifReturn="{{true}}" navBarTitle="经销商申请" marginBottom="{{0}}" backTag="{{backTag}}" bind:__l="__l"></status-nav><view class="distributor border-box" style="{{'min-height:'+(disclaimersHeight)+';'}}"><view class="tags font24" style="text-align:center;color:#ff0000;">请认真填写相关信息，此信息将用于分销提现使用！</view><view class="distributor-list font30"><view class="distributor-item color-99 mar-s40"><view class="tips">我的邀请人</view><input class="input" type="text" disabled="true" value="{{invite_name}}"/></view><view class="distributor-item mar-s40"><view class="tips color-99">姓名</view><input class="input" type="text" placeholder="请输入您的真实姓名" placeholder-style="color:#000000" data-event-opts="{{[['input',[['__set_model',['','real_name','$event',[]]]]]]}}" value="{{real_name}}" bindinput="__e"/></view><view class="distributor-item mar-s40"><view class="tips color-99">电话</view><input class="input" type="number" placeholder="请输入您的手机号" placeholder-style="color:#000000" data-event-opts="{{[['input',[['__set_model',['','phone','$event',[]]]]]]}}" value="{{phone}}" bindinput="__e"/></view><view class="distributor-item mar-s40"><view class="tips color-99">开户行</view><input class="input" type="text" placeholder="请填写开户行(如:中国银行)" placeholder-style="color:#000000" data-event-opts="{{[['input',[['__set_model',['','deposit_bank','$event',[]]]]]]}}" value="{{deposit_bank}}" bindinput="__e"/></view><view class="distributor-item mar-s40"><view class="tips color-99">银行卡号</view><input class="input" type="number" placeholder="请填写银行卡号" placeholder-style="color:#000000" data-event-opts="{{[['input',[['__set_model',['','bank_account','$event',[]]]]]]}}" value="{{bank_account}}" bindinput="__e"/></view></view></view><view data-event-opts="{{[['tap',[['submitEv',['$event']]]]]}}" class="distributor-btn background-white border-box" bindtap="__e"><view class="btn font36 background-orange color-48 radius30 flex">立即提交</view></view></view>