root
/
school_uni
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1

master
wangfukang 1 week ago
parent
2576b2da9f
commit
4c95741076
4 changed files with 254 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      components/tab-bar/delivery.vue
  2. 5
      components/tab-bar/myCenter.vue
  3. 244
      package2/partTimeJob/partTimeJobCenter.vue

11
components/tab-bar/delivery.vue
View File

@ -116,6 +116,10 @@
<view class="">
{{item.shopName}}
</view>
<view @tap="productDetail(item)"
style="width: 32rpx;height: 30rpx;font-weight: 700;font-size: 20rpx;color: #fff;text-align: center;background: #00BFFF;border-radius: 10rpx;margin: 20rpx 0 0 10rpx;line-height: 30rpx;">
祥
</view>
<view style="color: #777;">
{{item.shopAddress}}
</view>
@ -274,7 +278,7 @@
<uni-popup ref="productPopup" background-color="#fff">
<view class="popup-area-content" style="height: 1200rpx;overflow: scroll;">
<view class="popup-area-title">
<text>订单详情 商家退款中 不能操作</text>
<text>订单详情</text>
</view>
<view class="popup-area-container" v-for="(item,index) in productData" :key="index">
<text style="display: inline-block">{{item.productName}} {{item.specs}} * {{item.quantity}}</text>
@ -298,6 +302,7 @@
tab1Checked: 'daiqu',
menuButtonInfo: {},
isArea: false,
productData:{},
searchForm:{
status: 1,
pageNum:1,
@ -419,6 +424,10 @@
this.paotuiRuleList[index].isChecked = !this.paotuiRuleList[index].isChecked
}
},
productDetail(item){
this.productData = item.goodsList;
this.$refs.productPopup.open()
},
selectRule(item) {
//TODO 这里应该改成 复选，选中的遍历再放进来
// let rule = {

5
components/tab-bar/myCenter.vue
View File

@ -4,7 +4,7 @@
<view style="margin-top: 100px;" @click="navigatorTo('merchant')">商家入驻</view>
<view style="margin-top: 100px;" @click="navigatorTo('merchantCenter')">商家中心</view>
<view style="margin-top: 100px;" @click="navigatorTo('jianzhizhuce')">兼职注册</view>
<view style="margin-top: 100px;" @click="navigatorTo('jianzhizhuye')">兼职主页</view>
<view style="margin-top: 100px;" v-if="worker" @click="navigatorTo('jianzhizhuye')">兼职主页</view>
<!-- 未注册兼职弹窗 -->
<uni-popup ref="jianzhiPopup" background-color="rgba(2, 171, 255, 1)" borderRadius="40px 40px 40px 40px">
<view class="jianzhi-content" @tap="navigatorTo('partTimeReg')">
@ -32,7 +32,8 @@
export default {
data() {
return {
schoolShop:[]
schoolShop:[],
worker:uni.getStorageSync('worker')
}
},
props:{

244
package2/partTimeJob/partTimeJobCenter.vue
View File

@ -13,24 +13,173 @@
<view class="content">
<view class="box1" style="display: flex;">
<view class="">
待退款
待退款/售后{{returnCount}}
</view>
</view>
<view class="box1" style="display: flex;">
<view class="">
<view class="box1" v-for="(item,index) in returnData" :key="index">
<view class="ziqu-xuanfu" v-if="item.status == 0" style="background:red">
待退款
</view>
<view class="ziqu-xuanfu" v-if="item.status == 3" style="background:red">
待售后
</view>
<view class="ziqu-xuanfu" v-if="item.refundType == 1" style="background:red">
退商品
</view>
<view class="box1" style="display: flex;">
<view class="">
已退款
<view class="ziqu-xuanfu" v-if="item.refundType == 2" style="background:red">
退配送费
</view>
<view class="ziqu-xuanfu" v-if="item.refundType == 3" style="background:red">
全额退款
</view>
<view class="ziqu-xuanfu" v-if="item.refundTypeStatus == 1" style="background:red">
商家原因
</view>
<view class="ziqu-xuanfu" v-if="item.refundTypeStatus == 2" style="background:red">
配送原因
</view>
<view class="ziqu-xuanfu" v-if="item.refundTypeStatus == 3" style="background:red">
商家/配送都有原因（需要退配送费）
</view>
<view class="ziqu-xuanfu" v-if="item.refundTypeStatus == 4" style="background:red">
平台退款
</view>
<view style="height: 100rpx;border-bottom: 1px solid #F5F5F5;display: flex;line-height: 100rpx;">
<view style="font-size: 24rpx;font-weight: 700;">
金额<text style="color: red;">￥{{item.refundAmount}}</text>
</view>
</view>
<view class="bottom-btn">
<view class="btn1" @tap="orderDetailOpen(item)">
查看订单
</view>
<view class="btn1" @tap="returnAmountAllow(item,0)"
style="background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));color: #000;">
不同意
</view>
<view class="btn1" @tap="returnAmountAllow(item,1)"
style="background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));color: #000;">
同意
</view>
<!-- <view class="btn1">
删除订单
</view> -->
</view>
</view>
<uni-popup ref="orderPopup" background-color="#fff">
<view class="popup-area-content" style="height: 1200rpx;overflow: scroll;">
<view class="popup-area-title">
<text>订单详情</text>
</view>
<view class="box1">
<view style="width: 100%;line-height: 70rpx;font-size: 28rpx;font-weight: 700;">
{{orderDetail.shopName}}
<img @tap="makeCall(orderDetail.shopPhone)"
src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/869a7af6a1c24bf3a0d523c4a18b55c6.png"
alt="" style="width: 60rpx;height: 60rpx;" />
</view>
<view v-for="(item1,index1) in goodsList" :key="index1" v-if="goodsList != null && goodsList.length > 0" style="display: flex;padding: 20rpx;background: #eee;border-radius: 20rpx;">
<view class="goods-img">
<img :src="item1.productPicture" alt="">
</view>
<view class="goods-content">
<view class="goods-name">
{{item1.productName}}
</view>
<view class="goods-content-center">
<view class="goods-deal1">
{{item1.specs}}
</view>
</view>
<view class="goods-content-bottom">
<view style="width: 50%;">
X{{item1.quantity}}
</view>
<view class="pintuan-left-price">
￥{{item1.price}}
</view>
</view>
</view>
</view>
<view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="orderDetail.packageFee != null && orderDetail.packageFee > 0">
<view style="flex: 1;color: #777;font-weight: 700;">
打包费
</view>
<view style="color: #000;font-weight:700;">
￥{{orderDetail.packageFee}}
</view>
</view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="orderDetail.deliveryType == 1">
<view style="flex: 1;color: #777;font-weight: 700;">
配送费
</view>
<view style="color: #000;font-weight:700;">
￥{{orderDetail.deliveryFee}}
</view>
</view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;">
<view style="flex: 1;color: #777;font-weight: 700;">
优惠券
</view>
<view style="color: #000;font-weight:700;">
-￥1 <uni-icons type="right" size="12"></uni-icons>
</view>
</view>
</view>
<view style="display: flex;height: 80rpx;line-height: 100rpx;border-top: 1px solid #eee;font-size: 32rpx;font-weight: 700;">
<view style="flex: 1;">
实付
</view>
<view class="box1" style="display: flex;">
<view class="">
已售后
￥{{orderDetail.totalAmount}}
</view>
</view>
</view>
<view class="box1">
<view>
<!-- <view style="height: 80rpx;line-height: 80rpx;display: flex;">
<view style="flex: 1;color: #777;font-weight: 700;">
收件地址
</view>
<view style="color: #000;font-weight: 700;">
北校区1号宿舍楼5楼512(0702)
</view>
</view> -->
<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="orderDetail.numberCode != null">
<view style="flex: 1;color: #777;font-weight: 700;">
订单号
</view>
<view style="color: #000;font-weight: 700;">
{{orderDetail.numberCode}}
</view>
</view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;">
<view style="flex: 1;color: #777;font-weight: 700;">
下单时间
</view>
<view style="color: #000;font-weight: 700;">
{{orderDetail.createTime | formatISOTime}}
</view>
</view>
<view style="height: 80rpx;line-height: 80rpx;display: flex;" v-if="orderDetail.shopMakeTime != null">
<view style="flex: 1;color: #777;font-weight: 700;">
商家出餐时间
</view>
<view style="color: #000;font-weight: 700;">
{{orderDetail.shopMakeTime ? orderDetail.shopMakeTime : '' | formatISOTime}}
</view>
</view>
</view>
</view>
<view class="popup-area-container" v-for="(item,index) in productData" :key="index">
<text style="display: inline-block">{{item.productName}} {{item.specs}} * {{item.quantity}}</text>
</view>
</view>
</uni-popup>
</view>
</view>
</template>
@ -40,6 +189,17 @@
data() {
return {
menuButtonInfo: {},
searchCountForm:{
linkId:uni.getStorageSync('worker').workerId,
pageNum:1,
pageSize:100,
statusList:[0,3]
},
returnFormData:{},
goodsList:[],
orderDetail:{},
returnData:[],
returnCount:0
}
},
filters:{
@ -58,9 +218,77 @@
this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
},
onLoad() {
this.getReturnCount()
},
methods: {
orderDetailOpen(item){
this.returnFormData.id = item.id;
this.returnFormData.orderId = item.orderId;
this.returnFormData.deliveryType = item.mallOrder.deliveryType;
this.returnFormData.refundAmount = item.refundAmount;
this.returnFormData.refundType = item.refundType;
this.returnFormData.refundTypeStatus = item.refundTypeStatus;
this.orderDetail = item.mallOrder;
this.goodsList = item.items;
this.$refs.orderPopup.open();
},
makeCall(phone){
uni.makePhoneCall({
phoneNumber: phone
});
},
getReturnCount(){
let that = this
this.tui.request("/mall/refund/page", "POST", this.searchCountForm, false, false).then((res) => {
if (res.code == 200 && res.result != null) {
that.returnCount = res.result.records.length;
that.returnData = res.result.records
that.$forceUpdate();
} else {
that.tui.toast(res.message);
return;
}
uni.hideLoading();
}).catch((res) => {});
},
returnAmountAllow(item,status){
let url = ''
//退款
if(item.status == 0){
//不同意
if(status == 0){
this.returnFormData.status = 2
}else{
this.returnFormData.status = 1
}
}else if(item.status == 3){
//售后
if(status == 0){
this.returnFormData.status = 5
}else{
this.returnFormData.status = 4
}
}
this.returnFormData.id = item.id;
this.returnFormData.orderId = item.orderId;
this.returnFormData.deliveryType = item.mallOrder.deliveryType;
this.returnFormData.refundAmount = item.refundAmount;
this.returnFormData.refundType = item.refundType;
this.returnFormData.refundTypeStatus = item.refundTypeStatus;
let that = this
this.tui.request("/mall/refund/allowOrReject", "POST", this.returnFormData, false, false).then((res) => {
if (res.code == 200) {
that.tui.toast(res.message);
this.getReturnCount()
that.$forceUpdate();
} else {
that.tui.toast(res.message);
return;
}
uni.hideLoading();
}).catch((res) => {});
},
back() {
uni.navigateBack()
},

Write Preview
Loading…
Cancel
Save