|
|
@@ -24,7 +24,7 @@
|
|
|
<view class="content-box" v-if="Number(detailInfo.sendStatus)>-1">
|
|
|
<view class="order-msg-blo" style="padding: 20upx;">
|
|
|
<view class="msg-list">
|
|
|
- <view class="label">配送平台：</view>
|
|
|
+ <view class="label"><text @click="showMySimPop">配</text>送平台：</view>
|
|
|
<view class="value">{{getExpressPlatformText(detailInfo.deliveryId)}}</view>
|
|
|
</view>
|
|
|
<view class="msg-list express-progress-row">
|
|
|
@@ -490,6 +490,30 @@
|
|
|
|
|
|
<mx-date-picker :show="showPicker" format="yyyy-mm-dd" type="date" :value="defaultPickerDate" :show-tips="true" @confirm="confirmPicker" @cancel="showPicker = false" />
|
|
|
|
|
|
+ <!-- 模拟接口使用 -->
|
|
|
+ <view class="goods-modal-mask" v-if="simModal" @click="hideMnPop">
|
|
|
+ <view class="goods-modal" @click.stop>
|
|
|
+ <view class="modal-header">
|
|
|
+ <text class="modal-title">请选择</text>
|
|
|
+ <text class="modal-close" @click="hideMnPop">×</text>
|
|
|
+ </view>
|
|
|
+ <view class="modal-body">
|
|
|
+ <button class="admin-button-com middle" @click="setMnNum(10000)">订单创建成功</button>
|
|
|
+ <button class="admin-button-com middle" @click="setMnNum(20000)">商家取消订单</button>
|
|
|
+ <button class="admin-button-com middle" @click="setMnNum(20001)">配送方取消订单</button>
|
|
|
+ <button class="admin-button-com middle" @click="setMnNum(30000)">配送员接单</button>
|
|
|
+ <button class="admin-button-com middle" @click="setMnNum(40000)">配送员到店</button>
|
|
|
+ <button class="admin-button-com middle" @click="setMnNum(50000)">配送中</button>
|
|
|
+ <button class="admin-button-com middle" @click="setMnNum(60000)">配送员撤单</button>
|
|
|
+ <button class="admin-button-com middle" @click="setMnNum(70000)">配送完成</button>
|
|
|
+ <button class="admin-button-com middle" @click="setMnNum(90000)">配送异常</button>
|
|
|
+ </view>
|
|
|
+ <view class="modal-footer">
|
|
|
+ <button class="modal-btn cancel-btn" @click="hideMnPop">取消</button>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
</view>
|
|
|
</template>
|
|
|
<script>
|
|
|
@@ -510,8 +534,8 @@ import { delItem,updateRemarkItemFn } from "@/api/order-item";
|
|
|
import { getAllStaff } from "@/api/shop-admin"
|
|
|
import ModalModule from "@/components/plugin/modal"
|
|
|
import MxDatePicker from '@/components/mx-datepicker/mx-datepicker.vue';
|
|
|
-import { getCgExpressTrack } from "@/api/express"
|
|
|
-import { cancelExpressOrder } from '@/api/shop/shop-express'
|
|
|
+import { getCgExpressTrack,expressDetail } from "@/api/express"
|
|
|
+import { cancelExpressOrder,mockNotify } from '@/api/shop/shop-express'
|
|
|
export default {
|
|
|
name: "orderDetail",
|
|
|
components: {
|
|
|
@@ -553,7 +577,9 @@ export default {
|
|
|
payDate:'',
|
|
|
currentItem:[],
|
|
|
staffListData:[],
|
|
|
- trackList:[]
|
|
|
+ trackList:[],
|
|
|
+ simModal: false,
|
|
|
+ simNum:0
|
|
|
};
|
|
|
},
|
|
|
onPullDownRefresh() {
|
|
|
@@ -597,6 +623,26 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ showMySimPop() {
|
|
|
+ this.simModal = true
|
|
|
+ },
|
|
|
+ setMnNum(num){
|
|
|
+ this.hideMnPop()
|
|
|
+ this.simNum = num
|
|
|
+ this.confirmSimData()
|
|
|
+ },
|
|
|
+ hideMnPop() {
|
|
|
+ this.simModal = false
|
|
|
+ },
|
|
|
+ confirmSimData() {
|
|
|
+ let that = this
|
|
|
+ this.hideMnPop()
|
|
|
+ expressDetail({ orderId: this.option.id }).then(res => {
|
|
|
+ mockNotify({orderStatus:this.simNum,wxOrderId:res.data.wxOrderId}).then(ret=>{
|
|
|
+ that.init()
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
//取消跑腿
|
|
|
cancelMyExpress(orderId) {
|
|
|
this.$util.confirmModal({content: '确认取消？(若配送员接单1分钟后取消，扣2元违约金)'}, async () => {
|
|
|
@@ -609,7 +655,7 @@ export default {
|
|
|
},
|
|
|
//呼叫跑腿
|
|
|
openExpressPage() {
|
|
|
- this.$msg('请到列表页操作')
|
|
|
+ this.$msg('开发中，请先到列表页操作')
|
|
|
},
|
|
|
//获取配送平台
|
|
|
getExpressPlatformText(platform) {
|
|
|
@@ -1538,4 +1584,105 @@ export default {
|
|
|
align-items: center;
|
|
|
justify-content: space-around;
|
|
|
}
|
|
|
+/* 模拟信息弹框样式 */
|
|
|
+.goods-modal-mask {
|
|
|
+ position: fixed;
|
|
|
+ top: 0;
|
|
|
+ left: 0;
|
|
|
+ width: 100%;
|
|
|
+ height: 100%;
|
|
|
+ background-color: rgba(0, 0, 0, 0.5);
|
|
|
+ z-index: 9999;
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: center;
|
|
|
+}
|
|
|
+
|
|
|
+.goods-modal {
|
|
|
+ width: 80%;
|
|
|
+ max-width: 600upx;
|
|
|
+ background-color: #fff;
|
|
|
+ border-radius: 12upx;
|
|
|
+ overflow: hidden;
|
|
|
+ box-shadow: 0 10upx 30upx rgba(0, 0, 0, 0.3);
|
|
|
+}
|
|
|
+
|
|
|
+.modal-header {
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: space-between;
|
|
|
+ padding: 30upx 40upx;
|
|
|
+ background-color: #f8f9fa;
|
|
|
+ border-bottom: 1px solid #e9ecef;
|
|
|
+}
|
|
|
+
|
|
|
+.modal-title {
|
|
|
+ font-size: 32upx;
|
|
|
+ font-weight: 600;
|
|
|
+ color: #333;
|
|
|
+}
|
|
|
+
|
|
|
+.modal-close {
|
|
|
+ font-size: 40upx;
|
|
|
+ color: #999;
|
|
|
+ cursor: pointer;
|
|
|
+ line-height: 1;
|
|
|
+ padding: 10upx;
|
|
|
+}
|
|
|
+
|
|
|
+.modal-body {
|
|
|
+ padding: 40upx;
|
|
|
+}
|
|
|
+
|
|
|
+.modal-input {
|
|
|
+ width: 100%;
|
|
|
+ height: 80upx;
|
|
|
+ border: 1px solid #ddd;
|
|
|
+ border-radius: 8upx;
|
|
|
+ padding: 0 20upx;
|
|
|
+ font-size: 28upx;
|
|
|
+ box-sizing: border-box;
|
|
|
+
|
|
|
+ &:focus {
|
|
|
+ border-color: #3385ff;
|
|
|
+ outline: none;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+.modal-footer {
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: flex-end;
|
|
|
+ gap: 20upx;
|
|
|
+ padding: 30upx 40upx;
|
|
|
+ background-color: #f8f9fa;
|
|
|
+ border-top: 1px solid #e9ecef;
|
|
|
+}
|
|
|
+
|
|
|
+.modal-btn {
|
|
|
+ padding: 20upx 40upx;
|
|
|
+ border-radius: 8upx;
|
|
|
+ font-size: 28upx;
|
|
|
+ border: none;
|
|
|
+ cursor: pointer;
|
|
|
+ min-width: 120upx;
|
|
|
+
|
|
|
+ &.cancel-btn {
|
|
|
+ background-color: #f5f5f5;
|
|
|
+ color: #666;
|
|
|
+
|
|
|
+ &:hover {
|
|
|
+ background-color: #e9ecef;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ &.confirm-btn {
|
|
|
+ background-color: #3385ff;
|
|
|
+ color: #fff;
|
|
|
+
|
|
|
+ &:hover {
|
|
|
+ background-color: #2d74e7;
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
|
|
</style>
|
