|
|
@@ -87,8 +87,8 @@
|
|
|
<view class="pictrue">
|
|
|
<image :src="codeSrc" mode=""></image>
|
|
|
<zb-code ref="qrcode" :show="codeShow" :cid="cid" :val="val" :size="size" :unit="unit"
|
|
|
- :background="background" :foreground="foreground" :pdground="pdground" :icon="icon"
|
|
|
- :iconSize="iconsize" :onval="onval" :loadMake="loadMake" @result="qrR" />
|
|
|
+ :background="background" :foreground="foreground" :pdground="pdground" :icon="icon" :iconSize="iconsize"
|
|
|
+ :onval="onval" :loadMake="loadMake" @result="qrR" />
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="gear">
|
|
|
@@ -155,8 +155,8 @@
|
|
|
:delivery_type="item.delivery_type" @confirmOrder="confirmOrder" @openSubcribe="openSubcribe">
|
|
|
</orderGoods>
|
|
|
<orderGoods :evaluate='evaluate' :deliveryType="orderInfo.shipping_type" :statusType="status.type"
|
|
|
- :sendType="orderInfo.delivery_type" :orderId="order_id" :oid="orderInfo.id" :cartInfo="cartInfo"
|
|
|
- :pid="pid" :jump="true" :refund_status="orderInfo.refund_status" :paid="orderInfo.paid"
|
|
|
+ :sendType="orderInfo.delivery_type" :orderId="order_id" :oid="orderInfo.id" :cartInfo="cartInfo" :pid="pid"
|
|
|
+ :jump="true" :refund_status="orderInfo.refund_status" :paid="orderInfo.paid"
|
|
|
:virtualType="orderInfo.virtual_type" @openSubcribe="openSubcribe">
|
|
|
</orderGoods>
|
|
|
<!-- #ifdef H5 || APP-PLUS -->
|
|
|
@@ -176,6 +176,22 @@
|
|
|
</button>
|
|
|
</div>
|
|
|
<!-- #endif -->
|
|
|
+ <view class='wrapper'>
|
|
|
+ <view class='item acea-row row-between'>
|
|
|
+ <view>{{$t(`申请理由`)}}:</view>
|
|
|
+ <view class='conter'>{{(orderInfo.add_time_y || '') +' '+(orderInfo.add_time_h || 0)}}</view>
|
|
|
+ </view>
|
|
|
+ <view class='item acea-row row-between'>
|
|
|
+ <view>{{$t(`申请图片`)}}:</view>
|
|
|
+ <view class='upload acea-row row-middle'>
|
|
|
+ <view class='conter'>
|
|
|
+ <view class='pictrue' v-for="(item,index) in orderInfo.refund_img" :key="index">
|
|
|
+ <image :src='item'></image>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
<view class='wrapper'>
|
|
|
<view class='item acea-row row-between'>
|
|
|
<view>{{$t(`订单号`)}}:</view>
|
|
|
@@ -215,8 +231,9 @@
|
|
|
</view>
|
|
|
<!-- #endif -->
|
|
|
<!-- #ifdef H5 -->
|
|
|
- <view v-if="orderInfo.virtual_type == 1" class='copy copy-data'
|
|
|
- :data-clipboard-text="orderInfo.remark">{{$t(`复制`)}}</view>
|
|
|
+ <view v-if="orderInfo.virtual_type == 1" class='copy copy-data' :data-clipboard-text="orderInfo.remark">
|
|
|
+ {{$t(`复制`)}}
|
|
|
+ </view>
|
|
|
<!-- #endif -->
|
|
|
</view>
|
|
|
|
|
|
@@ -275,8 +292,8 @@
|
|
|
</view>
|
|
|
<view class='item acea-row row-between'>
|
|
|
<view>{{$t(`送货人电话`)}}:</view>
|
|
|
- <view class='conter acea-row row-middle row-right'>{{orderInfo.delivery_id || ''}}<text
|
|
|
- class='copy' @tap='goTel'>{{$t(`拨打`)}}</text></view>
|
|
|
+ <view class='conter acea-row row-middle row-right'>{{orderInfo.delivery_id || ''}}<text class='copy'
|
|
|
+ @tap='goTel'>{{$t(`拨打`)}}</text></view>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class='wrapper' v-else-if='orderInfo.delivery_type=="fictitious"'>
|
|
|
@@ -326,8 +343,7 @@
|
|
|
{{orderInfo.help_info.pay_nickname || ''}}
|
|
|
</view>
|
|
|
</view>
|
|
|
- {{$t(`总代付`)}}:<text
|
|
|
- class='money font-color'>{{$t(`¥`)}}{{parseFloat(orderInfo.pay_price).toFixed(2)}}</text>
|
|
|
+ {{$t(`总代付`)}}:<text class='money font-color'>{{$t(`¥`)}}{{parseFloat(orderInfo.pay_price).toFixed(2)}}</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view style='height:120rpx;'></view>
|
|
|
@@ -359,8 +375,8 @@
|
|
|
hover-class='none' :url="'/pages/goods/goods_logistics/index?orderId='+ orderInfo.order_id">
|
|
|
{{$t(`查看物流`)}}
|
|
|
</navigator>
|
|
|
- <view class='bnt bg-color'
|
|
|
- v-if="orderInfo.type == 3 && orderInfo.refund_type == 0 && orderInfo.paid" @tap='goJoinPink'>
|
|
|
+ <view class='bnt bg-color' v-if="orderInfo.type == 3 && orderInfo.refund_type == 0 && orderInfo.paid"
|
|
|
+ @tap='goJoinPink'>
|
|
|
{{$t(`查看拼团`)}}
|
|
|
</view>
|
|
|
<view class='bnt bg-color' v-if="status.class_status==3 && !split.length" @click='confirmOrder()'>
|
|
|
@@ -380,8 +396,7 @@
|
|
|
:url="'/pages/goods/goods_logistics/index?orderId='+ orderInfo.order_id + '&type=refund'">
|
|
|
{{$t(`查看退货物流`)}}
|
|
|
</navigator>
|
|
|
- <view class='bnt cancel' v-if="status.type==4 && !split.length || status.type == -2"
|
|
|
- @tap='delOrder'>
|
|
|
+ <view class='bnt cancel' v-if="status.type==4 && !split.length || status.type == -2" @tap='delOrder'>
|
|
|
{{$t(`删除订单`)}}
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -410,9 +425,9 @@
|
|
|
</invoiceModal>
|
|
|
<view class="mask invoice-mask" v-if="aleartStatus" @click="aleartStatus = false"></view>
|
|
|
<view class="mask more-mask" v-if="moreBtn" @click="moreBtn = false"></view>
|
|
|
- <invoice-picker :inv-show="invShow" :is-special="special_invoice" :url-query="urlQuery"
|
|
|
- :inv-checked="invChecked" :order-id='order_id' :inv-list="invList" :is-order="1" @inv-close="invClose"
|
|
|
- @inv-change="invSub" @inv-cancel="invCancel">
|
|
|
+ <invoice-picker :inv-show="invShow" :is-special="special_invoice" :url-query="urlQuery" :inv-checked="invChecked"
|
|
|
+ :order-id='order_id' :inv-list="invList" :is-order="1" @inv-close="invClose" @inv-change="invSub"
|
|
|
+ @inv-cancel="invCancel">
|
|
|
</invoice-picker>
|
|
|
</view>
|
|
|
</template>
|
|
|
@@ -1438,7 +1453,7 @@
|
|
|
|
|
|
.order-details .wrapper .item .conter {
|
|
|
color: #868686;
|
|
|
- width: 380srpx;
|
|
|
+ width: 480srpx;
|
|
|
display: flex;
|
|
|
flex-wrap: nowrap;
|
|
|
justify-content: flex-end;
|
|
|
@@ -1914,10 +1929,23 @@
|
|
|
|
|
|
.order-details .wrapper .item .conter {
|
|
|
color: #868686;
|
|
|
- width: 380rpx;
|
|
|
+ // width: 380rpx;
|
|
|
text-align: justify;
|
|
|
}
|
|
|
|
|
|
+ .order-details .wrapper .item .conter .upload {
|
|
|
+ padding-bottom: 36rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+ .order-details .wrapper .item .conter .upload .pictrue {
|
|
|
+ margin: 22rpx 23rpx 0 0;
|
|
|
+ width: 156rpx;
|
|
|
+ height: 156rpx;
|
|
|
+ position: relative;
|
|
|
+ font-size: 24rpx;
|
|
|
+ color: #bbb;
|
|
|
+ }
|
|
|
+
|
|
|
.order-details .wrapper .item .conter .copy {
|
|
|
font-size: 20rpx;
|
|
|
color: #333;
|
|
|
@@ -2158,4 +2186,4 @@
|
|
|
width: 100%;
|
|
|
height: 100%;
|
|
|
}
|
|
|
-</style>
|
|
|
+</style>
|