yangjie
/
high-mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'youmengting-dev' of http://gitea.dctpay.com/yangjie/high-mini into new-dev

Browse Source
master
杨杰 2 years ago
parent bd9014a480 70c04adc5a
commit 4bcdb8c10e
3 changed files with 99 additions and 71 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      pages/tabBar/classify/classify.vue
  2. 161
      physical-merchants/classify/order/orderDetail.vue
  3. 2
      physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue

1
pages/tabBar/classify/classify.vue
Unescape View File

@ -264,6 +264,7 @@
pageNum:_this.pageData.pageStart,
pageSize:_this.pageData.pageNum,
price:price,
companyId:app.globalData.companyId
}
// uni.showLoading({

161
physical-merchants/classify/order/orderDetail.vue
Unescape View File

@ -40,30 +40,8 @@
<view class=" pd-main backcolorfff border-8r">
<!-- 商品信息 -->
<view v-for="(item,index) in goodsList" :key="index" class="paddbotm10 flex-center-sp">
<view class="">
<image class="st-img" :src="imageUrl+item.goodsImg" mode="aspectFill"></image>
</view>
<view class="flex-1 flex-center-sp">
<view class="width60 paddleft10">
<view class="marb10 font16 fontwig6">{{item.goodsName}}</view>
<view class="marb5 font13 fcor666">规格: {{item.goodsSpecName}}</view>
<view class="fcor666 font12">数量: {{item.saleCount}}</view>
</view>
<view class="font16 tr align-fs">
<view class="fontwig6" v-if="recinfo.memDiscountId">¥ {{item.goodsPrice}}</view>
<view class="fontwig6" v-if="!recinfo.memDiscountId">¥ {{item.goodsActualPrice}}</view>
</view>
</view>
</view>
<!-- 当商品超过3个的时候 -->
<view v-if="!moreThanThree&&isShow" class="goodsMore flex-center" @click="checkMore">
还有{{goodsList2.length}}种商品<text class="icon-ymt to-down"></text>
</view>
<block v-if="moreThanThree">
<view v-for="(item,index) in goodsList2" :key="index" class="paddbotm10 flex-center-sp">
<view v-for="(item,index) in goodsList" :key="index" class="paddtop10 border-b-666 ">
<view class="flex-center-sp">
<view class="">
<image class="st-img" :src="imageUrl+item.goodsImg" mode="aspectFill"></image>
</view>
@ -73,13 +51,51 @@
<view class="marb5 font13 fcor666">规格: {{item.goodsSpecName}}</view>
<view class="fcor666 font12">数量: {{item.saleCount}}</view>
</view>
<view class="font16 tr align-fs">
<view class="font16 tr align-fs">
<view class="fontwig6" v-if="recinfo.memDiscountId">¥ {{item.goodsPrice}}</view>
<view class="fontwig6" v-if="!recinfo.memDiscountId">¥ {{item.goodsActualPrice}}</view>
</view>
</view>
</view>
<view class="dis-flex flex-end paddtop10 paddbotm10 ">
<!-- 已支付 判断发货与否，申请退款，申请售后 -->
<!-- <view class="btn1" v-if="recinfo.orderStatus == 2" @click="applyRefund">申请退款</view> -->
<view class="btn1" v-if="recinfo.orderStatus != 1 && recinfo.orderStatus != 5" @click="checkWuliu(item.id,item.ext6)">查看物流</view>
</view>
</view>
<!-- 当商品超过3个的时候 -->
<view v-if="!moreThanThree&&isShow" class="goodsMore flex-center" @click="checkMore">
还有{{goodsList2.length}}种商品<text class="icon-ymt to-down"></text>
</view>
<block v-if="moreThanThree">
<view v-for="(item,index) in goodsList2" :key="index" class="paddtop10 border-b-666 ">
<view class="flex-center-sp">
<view class="">
<image class="st-img" :src="imageUrl+item.goodsImg" mode="aspectFill"></image>
</view>
<view class="flex-1 flex-center-sp">
<view class="width60 paddleft10">
<view class="marb10 font16 fontwig6">{{item.goodsName}}</view>
<view class="marb5 font13 fcor666">规格: {{item.goodsSpecName}}</view>
<view class="fcor666 font12">数量: {{item.saleCount}}</view>
</view>
<view class="font16 tr align-fs">
<view class="fontwig6" v-if="recinfo.memDiscountId">¥ {{item.goodsPrice}}</view>
<view class="fontwig6" v-if="!recinfo.memDiscountId">¥ {{item.goodsActualPrice}}</view>
</view>
</view>
</view>
<view class="dis-flex flex-end paddtop10 paddbotm10 ">
<!-- 已支付 判断发货与否，申请退款，申请售后 -->
<!-- <view class="btn1" v-if="recinfo.orderStatus == 2" @click="applyRefund">申请退款</view> -->
<view class="btn1" v-if="recinfo.orderStatus != 1 && recinfo.orderStatus != 5" @click="checkWuliu(item.id,item.ext6)">查看物流</view>
</view>
</view>
</block>
<view v-if="moreThanThree" class="goodsMore flex-center" @click="checkMore">
共{{recinfo.highChildOrderList.length}}种商品<text class="icon-ymt to-up"></text>
@ -137,26 +153,7 @@
</view>
<!-- 待支付时开始 -->
<!-- 订单编号 -->
<!-- <block v-if="recinfo.orderStatus == 1">
<view class="flex-center-sp pd-tb10 bordert">
<view class="fcor666 width80px">订单编号</view>
<view class=" flex-center-sp">
<text class="tr flex-1">{{orderId}}</text>
<text class=" margle10 font12 copy-num fcor666" @click="copyText(orderId)">复制</text>
</view>
</view>
<view class="flex-center-sp pd-tb10 ">
<view class="fcor666 width80px">下单时间</view>
<view class=" ">
{{recinfo.createTime | formatDate('-')}}
</view>
</view>
</block>
-->
</view>
<!-- 物流信息 -->
@ -173,12 +170,12 @@
</view>
</view>
<!-- 物流信息 -->
<view class="flex-center-sp pd-tb10 ">
<!-- <view class="flex-center-sp pd-tb10 ">
<view class="fontsize width80px">物流信息</view>
<view class="fcor666 font16 " @click="checkWuliu">
查看物流信息<text class="icon-ymt to-right fcor666 font16 paddleft5"></text>
</view>
</view>
</view> -->
<!-- 订单编号 -->
<view class="flex-center-sp pd-tb10 ">
<view class="fontsize width80px">订单编号</view>
@ -276,6 +273,7 @@
<!-- #endif -->
</view>
<wuliuPopup ref="wuliu"></wuliuPopup>
</view>
@ -442,10 +440,10 @@
this.moreThanThree = !this.moreThanThree
},
// 查看物流
checkWuliu() {
let logisticsNo = this.recinfo.goodsOrder.logisticsNo;
checkWuliu(id,status) {
// let logisticsNo = this.recinfo.goodsOrder.logisticsNo;
if (!logisticsNo) {
if (status == null) {
uni.showToast({
title: '暂无数据',
icon: 'none',
@ -454,7 +452,7 @@
return
}
this.$refs.wuliu.show(logisticsNo)
this.$refs.wuliu.show(id)
},
// 点击修改订单
@ -577,6 +575,21 @@
// #endif
},
// 申请退款
applyRefund(){
// 在这里需要判断商品是否已发货
// 如果已发货 ==>去选择退货类型
uni.navigateTo({
url:"/physical-merchants/applyRefund/selectApplyRefund?msg="+encodeURIComponent(JSON.stringify(this.recinfo))
})
//如果未发货 ==>直接跳到申请页面
// uni.navigateTo({
// url:"/physical-merchants/applyRefund/applyRefund?msg="+encodeURIComponent(JSON.stringify(this.recinfo))+"&refundType="+1
// })
}
}
}
@ -584,6 +597,8 @@
<style lang="scss" scoped>
.fontsize{
font-size: 16px;
}
@ -700,26 +715,38 @@
right: 0;
left: 0;
.btn {
height: 20px;
padding: 5px 10px;
border-radius: 15px;
margin-left: 15px;
border: 1px solid #666666;
color: #666666;
font-size: 16px;
&.bgred {
color: #ffffff;
background-color: #FF2342;
border: 1px solid #FF2342;
}
&.oneMore {
color: #FF2342;
border: 1px solid #FF2342;
}
}
.btn1{
height: 20px;
padding: 5px 10px;
border-radius: 15px;
margin-left: 15px;
border: 1px solid #f0f0f0;
color: #666666;
font-size: 16px;
}
.btn {
height: 20px;
padding: 5px 10px;
border-radius: 15px;
margin-left: 15px;
border: 1px solid #666666;
color: #666666;
font-size: 16px;
&.bgred {
color: #ffffff;
background-color: #FF2342;
border: 1px solid #FF2342;
}
&.oneMore {
color: #FF2342;
border: 1px solid #FF2342;
}
}
</style>

2
physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
Unescape View File

@ -147,7 +147,7 @@
//查询物流信息
getLogisticsMsg(num){
let params ={
num:num
orderId:num
}
uni.showLoading({
title: '加载中',

Write Preview
Loading…
Cancel
Save