wangmingchuan
/
yanzong_qianduan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_qianduan

Browse Source 
# Conflicts:
#	pages/news3/shopOrder.vue
version/0412
liudan 9 months ago
parent b4a4457e6f 7930db36ce
commit 3ba4ad9ced
4 changed files with 69 additions and 41 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. 32
      pages/news3/shopOrder.vue
  2. 59
      pages/news3/shopOrderDetails.vue
  3. 3
      pages/news3/updatePrice.vue
  4. 2
      pages/order/detail.vue

32
pages/news3/shopOrder.vue
Unescape View File

@ -29,6 +29,8 @@
<view class="shopItemInfo" v-for="(p,i) in item.goods" :key="i"
@click="goJump('/pages/news3/shopOrderDetails',item,0)">
<image :src="p.goods_image"></image>
<view class="priceName">
<view class="title">{{p.goods_name}}</view>
<view class="priceCon">
<text class="num">x{{p.total_num}}</text>
<view class="priceText">
@ -37,6 +39,7 @@
</view>
</view>
</view>
</view>
<view class="totalNum">
<text>含运费¥{{item.express_price}}</text>
<text>共计：</text>
@ -44,7 +47,7 @@
</view>
<view class="remark">
<view class="remarkTitle">
收件人姓名 {{item.address?item.address.name:''}}
收件人姓名 {{item.address?item.address.name:''}} {{item.address?item.address.phone:''}}
</view>
<view class="remarkContent">
{{item.remark}}
@ -52,7 +55,7 @@
</view>
<view class="btnGroup">
<view class="btn info"
v-show="(!item.order_refund_id&&item.order_status==10&&item.pay_status==10) || (!item.order_refund_id&& item.order_status==10&&item.pay_status==20&&item.delivery_status==30)"
v-show="!item.order_refund_id&& item.order_status==10&&item.pay_status==20&&item.delivery_status==30"
@click="goJump('/pages/news3/updateAddr',item,0)">修改地址</view>
<view class="btn primary" v-show="!item.order_refund_id&&item.order_status==10&&item.pay_status==10"
@click="goJump('/pages/news3/updatePrice',item)">修改价格</view>
@ -83,11 +86,11 @@
下单时间
</view>
<view class="timeContainer">
<view class="selectTime" type="select" @click="onTime()">
<view class="selectTime" @click="onTime()">
{{startTime?startTime:'起始时间'}}
</view>
<text>-</text>
<view class="selectTime" type="select" @click="onTime()">
<view class="selectTime" @click="onTime()">
{{endTime?endTime:'终止时间'}}
</view>
</view>
@ -134,7 +137,7 @@
{{audit_status==20?'拒绝':'同意'}}转移至售后
</view>
<view class="filterItem c">
<view class="itemTitle">
<!-- <view class="itemTitle">
上传照片 <text style="color:#FF5042">*</text><text>最多可传5张图片</text>
</view>
<u-upload :action="action" :header="header" @on-uploaded="refundSuccess" @on-remove="refundRemove"
@ -145,7 +148,7 @@
<view class="1">上传图片</view>
</view>
</template>
</u-upload>
</u-upload> -->
<view class="filterItemContent">
<view class="itemTitle">
备注
@ -159,7 +162,8 @@
</view>
</view>
</u-popup>
<u-modal v-model="deleteShow" :show-cancel-button="true" :closable='false' @cancel="deleteShow=false" @confirm="handleOk" title="确认删除订单？" confirm-color="#F55349">
<u-modal v-model="deleteShow" :show-cancel-button="true" :closable='false' @cancel="deleteShow=false"
@confirm="handleOk" title="确认删除订单？" confirm-color="#F55349">
<view class="slot-content order-modal">
<view class="content">删除之后订单无法恢复，无法处理您的售后问题 ，请慎重考虑</view>
<view class="desc" @click="toggleImage()">
@ -639,6 +643,7 @@
.shopItemInfo {
display: flex;
margin-top: 40upx;
align-items: center;
image {
width: 180upx;
@ -646,12 +651,23 @@
flex-shrink: 0;
}
.priceName {
margin-left: 40upx;
.title {
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
overflow: hidden;
}
}
.priceCon {
flex: 1;
display: flex;
align-items: flex-end;
justify-content: space-between;
margin-left: 40upx;
margin-top: 30rpx;
.num {
font-size: 28upx;

59
pages/news3/shopOrderDetails.vue
Unescape View File

@ -1,5 +1,5 @@
<template>
<view>
<view style="padding-bottom: 160rpx;">
<view class="park-navbar">
<u-navbar title="确认订单" :border-bottom="false" :background="background"></u-navbar>
</view>
@ -8,12 +8,23 @@
<!-- 订单状态 -->
<view class="order-status">
<view class="status">
<image :src="$picUrl+'/static/news3/time.png'" mode="widthFix"></image>
<!-- 待支付 -->
<image src="/static/order/status/wait_pay.png" mode="widthFix"
v-if="orderInfo.order_status == 10&&orderInfo.delivery_status==10"></image>
<!-- 待发货 -->
<image src="/static/order/status/wait_deliver.png" mode="widthFix"
v-else-if="orderInfo.order_status == 10 &&orderInfo.delivery_status==30"></image>
<!-- 待收货 -->
<image src="/static/order/status/wait_receipt.png" mode="widthFix"
v-else-if="orderInfo.order_status == 10 &&orderInfo.delivery_status==20 && orderInfo.receipt_status==10">
</image>
<!-- 已 -->
<image src="/static/order/status/received.png" mode="widthFix" v-else></image>
<text>{{orderInfo.state_text}}</text>
</view>
<view class="reason"
v-if="(!orderInfo.order_refund_id&&orderInfo.order_status==10&&orderInfo.pay_status==10)||(!orderInfo.order_refund_id&&orderInfo.delivery_status==20&&orderInfo.order_status==10&&orderInfo.pay_status==20 && orderInfo.receipt_status==10)">
<u-count-down :timestamp="timestamp"></u-count-down>
v-if="(orderInfo.time_text>0&&!orderInfo.order_refund_id&&orderInfo.order_status==10&&orderInfo.pay_status==10)||(orderInfo.time_text>0&&!orderInfo.order_refund_id&&orderInfo.delivery_status==20&&orderInfo.order_status==10&&orderInfo.pay_status==20 && orderInfo.receipt_status==10)">
<u-count-down :timestamp="orderInfo.time_text" :show-days="false"></u-count-down>
<text style="color:#666666">后
<text
v-if="!orderInfo.order_refund_id&&orderInfo.order_status==10&&orderInfo.pay_status==10">自动取消</text>
@ -94,7 +105,7 @@
<text>联系客户</text>
</view>
<view class="btnItem" style="border-left:1px solid #F4F4F4"
@click="callStore(order.storeInfo.phone)">
@click="callStore(order.storeInfo.store_phone)">
<image :src="$picUrl+'/static/news3/kefu.png'" mode="widthFix"></image>
<text>联系商家</text>
</view>
@ -106,20 +117,19 @@
<view class="remarkTitle">售后信息</view>
<view class="list">
<view class="title">退货类型:</view>
<view class="content">{{orderInfo.order_no}}</view>
<view class="content">{{orderInfo.refund_type_text}}</view>
</view>
<view class="list">
<view class="title">申请原因:</view>
<view class="content">{{orderInfo.apply_desc}}</view>
<view class="content">{{orderInfo.apply_desc||'-'}}</view>
</view>
<view class="list">
<view class="list" v-if="orderInfo.refuse_desc">
<view class="title">申请备注:</view>
<view class="content">{{orderInfo.order_no}}</view>
<view class="content">{{orderInfo.refuse_desc||'-'}}</view>
</view>
<view class="remarkText">申请图片</view>
<view class="img">
<image :src="$picUrl+'/static/news3/filter.png'" mode=""></image>
<image :src="$picUrl+'/static/news3/filter.png'" mode=""></image>
<view class="remarkText" v-if="orderInfo.images.length>0">申请图片</view>
<view class="img" v-if="orderInfo.images.length>0">
<image v-for="(item,index) in orderInfo.images" :src="item.image_url" mode=""></image>
</view>
</view>
<!-- 订单信息 -->
@ -160,7 +170,7 @@
<!-- 底部按钮 -->
<view class="footer-btn">
<view class="del"
v-show="(!orderInfo.order_refund_id&&orderInfo.order_status==10&&orderInfo.pay_status==10) || (!orderInfo.order_refund_id&&orderInfo.order_status==10&&orderInfo.pay_status==20&&orderInfo.delivery_status==30)"
v-show="!orderInfo.order_refund_id&&orderInfo.order_status==10&&orderInfo.pay_status==20&&orderInfo.delivery_status==30"
@click="goJump('/pages/news3/updateAddr',orderInfo,0)">修改地址</view>
<view class="btn"
v-show="!orderInfo.order_refund_id&&orderInfo.order_status==10&&orderInfo.pay_status==10"
@ -181,13 +191,13 @@
<u-popup v-model=" afterSale" width="80%" border-radius="10" :closeable="true" mode="center">
<view class="afterSales">
<view class="filterTitle">
{{audit_status==20?'拒绝':'同意'}}
{{audit_status==20?'拒绝':'同意'}}转移至售后
</view>
<view class="filterItem c">
<view class="itemTitle">
<!-- <view class="itemTitle">
上传照片 <text style="color:#FF5042">*</text><text>最多可传5张图片</text>
</view>
<u-upload :action="action" :header="header" @on-uploaded="refundSuccess" @on-remove="refundRemove"
</view> -->
<!-- <u-upload :action="action" :header="header" @on-uploaded="refundSuccess" @on-remove="refundRemove"
width="180" height="180" :file-list="transferList" :custom-btn="true" max-count="5">
<template v-slot:addBtn>
<view class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
@ -195,7 +205,7 @@
<view class="1">上传图片</view>
</view>
</template>
</u-upload>
</u-upload> -->
<view class="filterItemContent">
<view class="itemTitle">
审核备注
@ -339,14 +349,15 @@
page {
background-color: #F7F8FA;
min-height: 100%;
padding-bottom: 140upx;
padding-bottom: 140rpx;
}
.orderInfo {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 10rpx;
margin-bottom: 120rpx;
text {
font-size: 28upx;
color: #707070;
@ -367,7 +378,7 @@
position: relative;
z-index: 2;
margin: 0upx 26upx;
padding-top: 30upx;
padding-top: 20upx;
}
.navBarContent {
@ -406,8 +417,8 @@
width: 100%;
image {
width: 54upx;
height: auto;
width: 89upx;
height: 89upx;
}
text {

3
pages/news3/updatePrice.vue
Unescape View File

@ -23,7 +23,7 @@
</view>
</view>
</view>
<view class="selectContent" style="padding:36upx 0 10upx 0;" @click="setPrice(item)">
<view class="selectContent" style="padding:36rpx 0 10rpx 0;margin-top: 30rpx;" @click="setPrice(item)">
<view class="left">
修改单个商品价格
</view>
@ -142,6 +142,7 @@
::v-deep .u-input {
width: 300rpx !important;
text-align: right !important;
}
.updatePrice {

2
pages/order/detail.vue
Unescape View File

@ -160,7 +160,7 @@
支付方式：
</view>
<view class="price">
{{order.pay_method}}
{{order.pay_method_text}}
</view>
</view>
<view class="orderTitle">

Write Preview
Loading…
Cancel
Save