|
|
@@ -91,7 +91,7 @@
|
|
|
<view class="btn_" @click.stop="duanxinOrder(item)" style="width: 90px;">送达并发短信</view>
|
|
|
</view>
|
|
|
<view class="flex"
|
|
|
- v-if="item.status == 3&&item.orderType==2 &&item.deliveryImgs==null">
|
|
|
+ v-if="item.status == 3&&item.orderType==2&&item.autoSendOrder ==1 &&item.deliveryImgs==null">
|
|
|
<view class="btn_pai" @click.stop="paiOrder(item)">拍照</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -153,11 +153,11 @@
|
|
|
<view class="phone_title2">请上传外卖送达情况</view>
|
|
|
<view>
|
|
|
<view class="flex" style="overflow: hidden;flex-wrap: wrap;">
|
|
|
- <view v-if="goodsPicture.length">
|
|
|
+ <view v-if="goodsPicture1.length">
|
|
|
<view class="margin-top flex margin-right-sm flex-wrap">
|
|
|
<view class="flex"
|
|
|
style="width: 200rpx;height: 200rpx;margin-right: 2rpx;position: relative;"
|
|
|
- v-for="(image,index) in goodsPicture" :key="index">
|
|
|
+ v-for="(image,index) in goodsPicture1" :key="index">
|
|
|
<image :src="image" style="width: 100%;height: 100%;"></image>
|
|
|
<view style="z-index: 9;position: absolute;top: -15rpx;right: -15rpx;"
|
|
|
@click="removeImg(index,'lb')">
|
|
|
@@ -167,7 +167,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="margin-top" @click="addImages(1)" v-if="goodsPicture.length<=1">
|
|
|
+ <view class="margin-top" @click="addImages(1)" v-if="goodsPicture1.length<=1">
|
|
|
<view style="width: 200rpx;height: 200rpx;background: #f4f5f6;"
|
|
|
class="flex justify-center align-center">
|
|
|
<view>
|
|
|
@@ -185,7 +185,7 @@
|
|
|
</view>
|
|
|
</u-popup>
|
|
|
<!-- 确认收货短信弹出框 -->
|
|
|
- <u-popup v-model="alertduanxin" mode="center" border-radius="18" :closeable="closeable" close-icon="close-circle"
|
|
|
+ <u-popup v-model="alertduanxin" v-if="alertduanxin" mode="center" border-radius="18" :closeable="closeable" close-icon="close-circle"
|
|
|
close-icon-size="45" width="680rpx" height="700rpx" @close="onclose2">
|
|
|
<view class="receipt_code">
|
|
|
<view class="receipt_code">
|
|
|
@@ -316,7 +316,7 @@
|
|
|
show1: true,
|
|
|
alertPhone:false,
|
|
|
alertduanxin:false,
|
|
|
- goodsPicture: [],//拍照图片
|
|
|
+ goodsPicture1: [],//拍照图片
|
|
|
count: 3,
|
|
|
orderId:'',
|
|
|
duanxin:[],//发送的短信
|
|
|
@@ -515,7 +515,7 @@
|
|
|
// 图片上传
|
|
|
addImages(e) {
|
|
|
if (e == 1) {
|
|
|
- var num = this.goodsPicture.length
|
|
|
+ var num = this.goodsPicture1.length
|
|
|
this.count = 2 - num
|
|
|
}
|
|
|
|
|
|
@@ -534,8 +534,8 @@
|
|
|
name: 'file',
|
|
|
success: (uploadFileRes) => {
|
|
|
if (e == 1) {
|
|
|
- if (that.goodsPicture.length < 2) {
|
|
|
- that.goodsPicture.push(JSON.parse(uploadFileRes.data)
|
|
|
+ if (that.goodsPicture1.length < 2) {
|
|
|
+ that.goodsPicture1.push(JSON.parse(uploadFileRes.data)
|
|
|
.data)
|
|
|
}
|
|
|
}
|
|
|
@@ -550,7 +550,7 @@
|
|
|
// 图片删除
|
|
|
removeImg(index, texts) {
|
|
|
if (texts == 'lb') {
|
|
|
- this.goodsPicture.splice(index, 1)
|
|
|
+ this.goodsPicture1.splice(index, 1)
|
|
|
}
|
|
|
},
|
|
|
config: function(name) {
|
|
|
@@ -578,11 +578,11 @@
|
|
|
// 监听拍照框关闭
|
|
|
onclose(){
|
|
|
this.alertPhone=false
|
|
|
- this.goodsPicture=[]
|
|
|
+ this.goodsPicture1=[]
|
|
|
},
|
|
|
//确认上传图片
|
|
|
querenduanxin(){
|
|
|
- var tupian=this.goodsPicture.toString()
|
|
|
+ var tupian=this.goodsPicture1.toString()
|
|
|
var orderId=this.orderId
|
|
|
this.$Request.postJson(`/admin/order/add-receive-img/${orderId}?img=`+tupian, {
|
|
|
|
