tianyi 2 months ago
parent
commit
72dbb35edb
  1. 5
      src/views/Main.vue
  2. 1
      src/views/app/bill/current/current.vue
  3. 3
      src/views/app/business/bus/addEdit.vue
  4. 2
      src/views/app/business/bus/bus.vue
  5. 12
      src/views/app/business/courier/courier.vue
  6. 2
      src/views/app/business/courier/logisticsAddress.vue
  7. 1
      src/views/app/business/deliverytruck/deliveryTruck.vue
  8. 7
      src/views/app/business/deposit/deposit.vue
  9. 1
      src/views/app/business/expressCompany/expressCompany.vue
  10. 5
      src/views/app/business/lineManage/addEdit.vue
  11. 1
      src/views/app/business/lineManage/dictManage.vue
  12. 2
      src/views/app/business/lineManage/lineManage.vue
  13. 3
      src/views/app/business/lineManage/logisticsAddress.vue
  14. 1
      src/views/app/business/lineManage/transferStation.vue
  15. 8
      src/views/app/business/logistics/logistics.vue
  16. 2
      src/views/app/business/logistics/logisticsAddress.vue
  17. 3
      src/views/app/business/logiticsCompany/lineBinding.vue
  18. 40
      src/views/app/business/luckey/luckey.vue
  19. 1
      src/views/app/business/recharge/recharge.vue
  20. 2
      src/views/app/business/recharge/rechargeOne.vue
  21. 2
      src/views/app/company/logisticsAddress.vue
  22. 2
      src/views/app/marketing-management/marketing-management.vue
  23. 1
      src/views/app/shop/addEdit.vue
  24. 7
      src/views/app/shop/dictManage.vue
  25. 3
      src/views/app/shop/logisticsAddress.vue
  26. 2
      src/views/app/shop/mernage.vue
  27. 3
      src/views/main-components/message-tip.vue
  28. 1
      src/views/my-components/hiver/map.vue
  29. 1
      src/views/my-components/hiver/mapLocate.vue
  30. 3
      src/views/sys/dict-manage/chlidrenList.vue
  31. 1
      src/views/sys/dict-manage/dictManage.vue
  32. 6
      src/views/sys/order-manage/logisticsAddress.vue
  33. 2
      src/views/sys/order-manage/orderManage.vue
  34. 2
      src/views/sys/upApp/upApp.vue

5
src/views/Main.vue

@ -350,14 +350,13 @@ export default {
}
},
handleSubmenuChange(val) {
// console.log(val)
},
beforePush(name) {
// console.log(name)
return true;
},
fullscreenChange(isFullScreen) {
// console.log(isFullScreen);
},
resize() {
let currWidth = document.body.clientWidth;

1
src/views/app/bill/current/current.vue

@ -144,7 +144,6 @@
this.getDataList();
},
changeDate(v){
console.log(v)
this.searchForm.settlementDate = v
},
getTime() {

3
src/views/app/business/bus/addEdit.vue

@ -174,7 +174,6 @@
},
changeDate(v){
console.log(v)
this.form.validStartTime = v[0]
this.form.validEndTime = v[1]
},
@ -233,7 +232,7 @@
this.form.applyScene = JSON.stringify(this.form.applyScene)
this.form.type = JSON.stringify(this.form.type)
this.form.validType = JSON.stringify(this.form.validType)
console.log('优惠券',this.form)
}
this.visible = value;
},

2
src/views/app/business/bus/bus.vue

@ -404,7 +404,7 @@
},
checkStatus(v){
this.searchForm.applyScene = v
console.log(v)
},
changePage(v) {
this.searchForm.pageNum = v;

12
src/views/app/business/courier/courier.vue

@ -288,6 +288,15 @@
title: "是否接指派",
key: "getPushOrder",
width: 180,
render: (h, params) => {
let re = ""
if (params.row.getPushOrder == 1) {
re = "接指派";
} else if (params.row.getPushOrder == 0) {
re = "不接";
}
return h("div", re);
}
},
{
title: "评分",
@ -452,7 +461,6 @@
},
checkStatusLine(v){
this.searchForm.isOnLine = v
console.log(v)
},
showPic(v) {
let image = new Image();
@ -466,7 +474,6 @@
},
checkStatus(v){
this.searchForm.getPushOrder = v
console.log(v)
},
selectDateRange(v) {
if (v) {
@ -495,7 +502,6 @@
},
findAllRecord(v) {
this.Visiable = true;
console.log(v)
this.$nextTick(() => {
this.$refs.dialog.initRecharge(v);
});

2
src/views/app/business/courier/logisticsAddress.vue

@ -122,8 +122,6 @@
},
methods: {
initRecharge(data) {
//data
console.log(data);
this.searchForm.shopId = data.workerId;
this.getDataList();
},

1
src/views/app/business/deliverytruck/deliveryTruck.vue

@ -651,7 +651,6 @@ export default {
});
},findRechargeLog(v) {
this.rechargeVisiable=true;
console.log(v)
this.$nextTick(()=>{
this.$refs.rechargelog.initRecharge(v);
});

7
src/views/app/business/deposit/deposit.vue

@ -72,13 +72,10 @@
let re = ""
if (params.row.linkType == 0) {
re = "用户";
} else if (params.row.type == 1) {
} else if (params.row.linkType == 1) {
re = "配送员";
}
return h(
"div",
re
);
return h("div", re);
}
},
{

1
src/views/app/business/expressCompany/expressCompany.vue

@ -431,7 +431,6 @@
},
findRechargeLog(v) {
this.rechargeVisiable = true;
console.log(v)
this.$nextTick(() => {
this.$refs.rechargelog.initRecharge(v);
});

5
src/views/app/business/lineManage/addEdit.vue

@ -308,10 +308,8 @@
this.visible = false
},
getGoods(v) {
console.log('11111', v)
this.form.productList1.productImage = v.productPicture
this.form.productList1.productName = v.productName
console.log('22222', this.form)
this.aaVisiable = false
},
sreachShop(v) {
@ -331,7 +329,6 @@
});
},
checkShop(v) {
console.log("数据1", v)
for (let i = 0; i < this.shopList.length; i++) {
if (this.shopList[i].id == v) {
let data = {
@ -385,7 +382,6 @@
},
checkStatusLine(v) {
this.form.position = v
console.log(v)
},
handleSelectRegion(v) {
this.form.region = v;
@ -411,7 +407,6 @@
if (this.type == "0" || this.type == "1") {
//
let data = this.data;
console.log('回显数据', data)
//
this.form = data;

1
src/views/app/business/lineManage/dictManage.vue

@ -104,7 +104,6 @@
},
methods: {
init(v) {
console.log(v)
this.searchForm.shopId = JSON.parse(v).id
this.getDataList()
},

2
src/views/app/business/lineManage/lineManage.vue

@ -348,8 +348,6 @@
this.showCompany = true;
},
edit(v) {
// null""
console.log(v)
for (let attr in v) {
if (v[attr] == null) {
v[attr] = "";

3
src/views/app/business/lineManage/logisticsAddress.vue

@ -186,8 +186,6 @@
},
methods: {
initRecharge(data) {
//data
console.log(data);
this.searchForm.circuitId = data.id;
this.getDataList();
},
@ -250,7 +248,6 @@
},
findAllRecords(v) {
this.tranVisiable = true;
console.log(v)
this.$nextTick(() => {
this.$refs.dialog.initRecharges(v);
});

1
src/views/app/business/lineManage/transferStation.vue

@ -158,7 +158,6 @@
},
initRecharges(data) {
this.detailVisible = true;
console.log(data);
this.searchForm.stationId = data.id;
this.form.stationId = data.id;
this.getDataList();

8
src/views/app/business/logistics/logistics.vue

@ -221,6 +221,11 @@
key: "status",
width: 100,
align: "center",
}, {
title: "商家名",
key: "shopName",
width: 200,
align: "center",
}, {
title: "取货地址",
key: "shopAddress",
@ -403,7 +408,6 @@
},
//-->
goTransferOrder(item) {
console.log('订单', item)
runshOrder({
deliveryId: this.orderId,
@ -606,7 +610,6 @@
orderDetail(v) {
let that = this;
this.Visiable = true;
console.log(v)
this.$nextTick(() => {
that.$refs.dialog.initRecharge(v);
});
@ -617,7 +620,6 @@
this.searchWorker.getAreaId = v.getAreaId
this.searchWorker.putAreaId = v.putAreaId
this.orderId = v.id
console.log(v)
this.getWorker(v)
},
//

2
src/views/app/business/logistics/logisticsAddress.vue

@ -164,8 +164,6 @@
this.orderDetail(data.orderId)
},
getMinutesDiff(time1, time2) {
console.log('time1',time1)
console.log('time2',time2)
// Date 1
const date1 = time1 === 1 ? new Date() : new Date(time1);
const date2 = time2 === 1 ? new Date() : new Date(time2);

3
src/views/app/business/logiticsCompany/lineBinding.vue

@ -116,7 +116,6 @@
},
initRecharge(data) {
this.detailVisible = true;
console.log(data);
this.searchForm.companyId = data.id;
this.searchForm.companyName = data.companyName;
this.getDataList();
@ -152,7 +151,6 @@
},
getBinding(){
this.loading = true;
console.log('this.searchForm',this.searchForm)
let data = {
pageNum:this.searchForm.pageNum,
pageSize:this.searchForm.pageSize,
@ -171,7 +169,6 @@
},
//
binding(){
console.log('this.selectList',this.selectList)
for(let i=0;i<this.selectList.length;i++){
let data = {
companyId:this.searchForm.companyId,

40
src/views/app/business/luckey/luckey.vue

@ -2,7 +2,7 @@
<div class="luckey">
<Card>
<Row class="region-bar">
<span class="region-tip">当前校区<b>{{ regionId || '未识别(请确认账号已绑定校区)' }}</b></span>
<span class="region-tip" style="margin-right:20px;">当前校区<b>{{ regionName || '未识别(请确认账号已绑定校区)' }}</b></span>
<Button type="primary" icon="ios-refresh" @click="reloadActive" :disabled="!regionId">刷新</Button>
</Row>
@ -179,7 +179,7 @@
<!-- 奖池编辑 -->
<Modal v-model="poolModal" :title="poolForm.id ? '编辑奖池' : '新建奖池'" :mask-closable="false">
<Form :label-width="90">
<FormItem label="所属校区"><Input v-model="poolForm.regionId" disabled placeholder="自动取自登录校区" /></FormItem>
<FormItem label="所属校区"><Input v-model="regionName" disabled placeholder="自动取自登录校区" /></FormItem>
<FormItem label="期号"><Input v-model="poolForm.periodNo" /></FormItem>
<FormItem label="标题"><Input v-model="poolForm.title" /></FormItem>
<FormItem label="奖池金额"><InputNumber v-model="poolForm.poolAmount" :min="0" style="width:100%" /></FormItem>
@ -239,7 +239,7 @@
<!-- 任务编辑 -->
<Modal v-model="taskModal" :title="taskForm.id ? '编辑任务' : '新增任务'" :mask-closable="false">
<Form :label-width="90">
<FormItem label="所属校区"><Input v-model="taskForm.regionId" disabled placeholder="自动取自登录校区" /></FormItem>
<FormItem label="所属校区"><Input v-model="regionName" disabled placeholder="自动取自登录校区" /></FormItem>
<FormItem label="任务编码">
<Select v-model="taskForm.code">
<Option value="waimai">外卖订单</Option>
@ -266,7 +266,7 @@
<!-- BUFF编辑 -->
<Modal v-model="buffModal" :title="buffForm.id ? '编辑BUFF' : '新增BUFF'" :mask-closable="false">
<Form :label-width="90">
<FormItem label="所属校区"><Input v-model="buffForm.regionId" disabled placeholder="自动取自登录校区" /></FormItem>
<FormItem label="所属校区"><Input v-model="regionName" disabled placeholder="自动取自登录校区" /></FormItem>
<FormItem label="类型">
<Select v-model="buffForm.type">
<Option value="double">双倍能量</Option>
@ -295,7 +295,7 @@
<!-- 快讯编辑 -->
<Modal v-model="newsModal" :title="newsForm.id ? '编辑快讯' : '新增快讯'" :mask-closable="false">
<Form :label-width="90">
<FormItem label="所属校区"><Input v-model="newsForm.regionId" disabled placeholder="自动取自登录校区" /></FormItem>
<FormItem label="所属校区"><Input v-model="regionName" disabled placeholder="自动取自登录校区" /></FormItem>
<FormItem label="类型">
<Select v-model="newsForm.type">
<Option value="sys">系统</Option>
@ -322,7 +322,7 @@
<!-- 经营配置编辑 -->
<Modal v-model="operateModal" :title="operateTitle" width="620" :mask-closable="false">
<Form :label-width="120">
<FormItem label="所属校区"><Input v-model="operateForm.regionId" disabled placeholder="自动取自登录校区" /></FormItem>
<FormItem label="所属校区"><Input v-model="regionName" disabled placeholder="自动取自登录校区" /></FormItem>
<FormItem v-for="f in operateFields" :key="f.key" :label="f.label">
<i-switch v-if="f.type==='switch'" v-model="operateForm[f.key]" :true-value="1" :false-value="0" />
<Select v-else-if="f.type==='select'" v-model="operateForm[f.key]">
@ -340,7 +340,7 @@
<Modal v-model="adventureEventModal" :title="adventureEventForm.id ? '编辑每日宇宙事件' : '新增每日宇宙事件'" :mask-closable="false">
<Form :label-width="110">
<FormItem label="所属校区"><Input v-model="adventureEventForm.regionId" disabled /></FormItem>
<FormItem label="所属校区"><Input v-model="regionName" disabled /></FormItem>
<FormItem label="事件日期"><DatePicker type="date" v-model="adventureEventForm.eventDate" format="yyyy-MM-dd" style="width:100%" /></FormItem>
<FormItem label="事件类型">
<Select v-model="adventureEventForm.eventType">
@ -390,6 +390,7 @@
return {
activeTab: 'pool',
regionId: '',
regionName:'',
pool: { loading: false, data: [], total: 0, pageNumber: 1, pageSize: 10 },
task: { loading: false, data: [], total: 0, pageNumber: 1, pageSize: 10 },
buff: { loading: false, data: [], total: 0, pageNumber: 1, pageSize: 10 },
@ -511,7 +512,7 @@
return [
{ title: '期号', key: 'periodNo', minWidth: 120 },
{ title: '标题', key: 'title', minWidth: 120 },
{ title: '商圈', key: 'regionId', width: 100 },
// { title: '', key: 'regionId', width: 100 },
{ title: '奖池金额', key: 'poolAmount', width: 100 },
{ title: '开奖时间', key: 'drawTime', minWidth: 160 },
{ title: '参与', key: 'joinCount', width: 70 },
@ -559,8 +560,8 @@
{ title: '名称', key: 'name', minWidth: 120 },
{ title: '描述', key: 'description', minWidth: 180 },
{ title: '奖励券', key: 'rewardTickets', width: 80 },
{ title: '每日上限', key: 'dailyLimit', width: 90 },
{ title: '商圈', key: 'regionId', width: 90 },
{ title: '每日上限', key: 'dailyLimit', minWidth: 90 },
// { title: '', key: 'regionId', width: 90 },
{ title: '启用', minWidth: 70, render: (h, p) => h('Tag', { props: { color: p.row.enabled === 1 ? 'green' : 'default' } }, p.row.enabled === 1 ? '是' : '否') },
{
title: '操作', width: 150, align: 'center', render: (h, params) => {
@ -578,7 +579,7 @@
{ title: '名称', key: 'name', minWidth: 120 },
{ title: '描述', key: 'description', minWidth: 180 },
{ title: '消耗券', key: 'costTickets', width: 80 },
{ title: '时长(h)', key: 'durationHours', width: 80 },
{ title: '时长(h)', key: 'durationHours', minWidth: 80 },
{ title: '效果值', key: 'effectValue', width: 80 },
{ title: '启用', minWidth: 70, render: (h, p) => h('Tag', { props: { color: p.row.enabled === 1 ? 'green' : 'default' } }, p.row.enabled === 1 ? '是' : '否') },
{
@ -595,7 +596,7 @@
return [
{ title: '类型', key: 'type', width: 90 },
{ title: '内容', key: 'content', minWidth: 260 },
{ title: '商圈', key: 'regionId', minWidth: 90 },
// { title: '', key: 'regionId', minWidth: 90 },
{ title: '置顶', width: 70, render: (h, p) => h('span', p.row.isTop === 1 ? '是' : '否') },
{ title: '展示', width: 70, render: (h, p) => h('span', p.row.enabled === 1 ? '是' : '否') },
{ title: '时间', key: 'createTime', minWidth: 160 },
@ -613,7 +614,7 @@
return [
{ title: '用户id', key: 'userId', minWidth: 120 },
{ title: '昵称', key: 'nickname', minWidth: 120 },
{ title: '商圈', key: 'regionId', minWidth: 100 },
// { title: '', key: 'regionId', minWidth: 100 },
{ title: '当前券', key: 'ticketCount', width: 90 },
{ title: '累计券', key: 'totalTicket', width: 90 },
{ title: '连续签到', key: 'consecutiveSignDays', minWidth: 90 },
@ -634,7 +635,7 @@
drawColumns() {
return [
{ title: '期号', key: 'periodNo', minWidth: 130 },
{ title: '商圈', key: 'regionId', minWidth: 100 },
// { title: '', key: 'regionId', minWidth: 100 },
{ title: '奖池金额', key: 'poolAmount', minWidth: 100 },
{ title: '参与人数', key: 'joinCount', minWidth: 90 },
{ title: '券总数', key: 'ticketTotal', minWidth: 90 },
@ -657,7 +658,7 @@
{ title: '周期(h)', key: 'cycleHours', width: 90 },
{ title: '收益率', key: 'rate', width: 90 },
{ title: '投入范围', minWidth: 140, render: (h, p) => h('span', `${p.row.minInvest || 0} - ${p.row.maxInvest || '不限'}`) },
{ title: '单次收益上限', key: 'maxProfit', width: 120 },
{ title: '单次收益上限', key: 'maxProfit', minWidth: 120 },
{ title: '日收益上限', key: 'dailyProfitLimit', width: 110 },
{ title: '启用', minWidth: 70, render: (h, p) => this.enabledTag(h, p.row.enabled) },
this.operateActionColumn('tree')
@ -685,11 +686,11 @@
},
searchColumns() {
return [
{ title: '每日次数', key: 'dailyLimit', width: 90 },
{ title: '体力消耗', key: 'staminaCost', width: 90 },
{ title: '每日次数', key: 'dailyLimit', minWidth: 90 },
{ title: '体力消耗', key: 'staminaCost', minWidth: 90 },
{ title: '获得范围', minWidth: 120, render: (h, p) => h('span', `${p.row.minGain || 0} - ${p.row.maxGain || 0}`) },
{ title: '目标比例', key: 'targetBalanceRate', width: 90 },
{ title: '日获得上限', key: 'dailyGainLimit', width: 110 },
{ title: '目标比例', key: 'targetBalanceRate', minWidth: 90 },
{ title: '日获得上限', key: 'dailyGainLimit', minWidth: 110 },
{ title: '启用', minWidth: 70, render: (h, p) => this.enabledTag(h, p.row.enabled) },
this.operateActionColumn('search')
]
@ -783,6 +784,7 @@
mounted() {
// regionId departmentId
this.regionId = this.resolveRegionId()
this.regionName = JSON.parse(this.getStore('user')).departmentTitle
if (this.regionId) {
this.loadPool()
} else {

1
src/views/app/business/recharge/recharge.vue

@ -244,7 +244,6 @@
},
//
getOrder(v){
console.log(v)
this.Visiable = true
this.$nextTick(() => {
this.$refs.dialog.initRecharge(v);

2
src/views/app/business/recharge/rechargeOne.vue

@ -125,8 +125,6 @@
},
initRecharge(data) {
this.detailVisible = true;
//data
console.log(data);
this.getDataList1(data);
},
changePage(v) {

2
src/views/app/company/logisticsAddress.vue

@ -166,8 +166,6 @@ export default {
},
initRecharge(data) {
this.detailVisible=true;
//data
console.log(data);
this.searchForm.shippingMethodId = data.id;
this.getDataList();
},

2
src/views/app/marketing-management/marketing-management.vue

@ -518,8 +518,6 @@
checkOrderStatus(v, status) {
let listStr = ''
if (v == '') {
console.log('selectList', this.selectList)
for (let i = 0; i < this.selectList.length; i++) {
if (this.selectList.length != (i + 1)) {
listStr += this.selectList[i].id + ','

1
src/views/app/shop/addEdit.vue

@ -197,7 +197,6 @@
},
methods: {
init(v) {
console.log("111")
this.getRoleList(v);
},
getRoleList(v) {

7
src/views/app/shop/dictManage.vue

@ -625,10 +625,6 @@
this.shopId = v.id
this.searchForm.shopId = v.id
this.addGoodsForm.shopId = v.id
// if(this.addGoodsForm.productGroupBuyPrices == null){
// this.addGoodsForm.productGroupBuyPrices = []
// }
console.log('aaa',this.addGoodsForm)
this.screenWidth = window.screen.width;
//
this.getGoodsType();
@ -735,7 +731,6 @@
if(this.specValueArr[m].id == this.addGoodsForm.attributeListPrice[index].id){
this.specValueArr.splice(m,1)
this.addGoodsForm.attributeListPrice.splice(index,1)
console.log("11",this.addGoodsForm.attributeListPrice)
if(this.addGoodsForm.attributeListPrice.length == 1){
this.addGoodsForm.attributeListPrice = []
this.addGoodsForm.attributeListPrice.push({
@ -897,7 +892,6 @@
}else{
//guige
let message = []
console.log("this.specValueArr",this.specValueArr)
for(let i=0;i<this.specValueArr.length;i++){
for(let m=0;m<this.addGoodsForm.attributeListPrice.length;m++){
if(this.specValueArr[i].id == this.addGoodsForm.attributeListPrice[m].id){
@ -1150,7 +1144,6 @@
}
let str = JSON.stringify(v);
let data = JSON.parse(str);
console.log('111111',data)
this.addGoodsForm = data;
if(this.addGoodsForm.productGroupBuyPrices == ''){
this.addGoodsForm.productGroupBuyPrices = []

3
src/views/app/shop/logisticsAddress.vue

@ -123,10 +123,7 @@
},
methods: {
initRecharge(data) {
//data
console.log('djdjdjd1',data);
this.searchForm.shopId = data.id;
console.log('djdjdjd1',this.searchForm.shopId);
this.getDataList();
},
changePage(v) {

2
src/views/app/shop/mernage.vue

@ -193,7 +193,6 @@
"shopId": data.id
}).then((res) => {
if (res.success) {
console.log("res", res);
if (res.result == null) {
this.form = {}
this.form.shopId = data.id
@ -276,7 +275,6 @@
}
});
} else {
console.log("22222", this.isAdd)
//
delete this.form.updateTime
this.submitLoading = true;

3
src/views/main-components/message-tip.vue

@ -158,7 +158,6 @@ export default {
this.client.connect(headers, this.onConnected, this.onFailed);
},
onConnected(frame) {
console.log("连接ws成功: " + frame);
let topicSubscription = this.client.subscribe(
"/topic/subscribe",
this.responseCallback
@ -169,10 +168,8 @@ export default {
);
},
onFailed(frame) {
console.log("连接ws失败: " + JSON.stringify(frame));
},
responseCallback(frame) {
console.log("收到消息:" + frame.body);
this.getData();
},
messageDetail(v) {

1
src/views/my-components/hiver/map.vue

@ -440,7 +440,6 @@ export default {
essential: true,
});
} catch (error) {
console.log(error)
this.$Message.error("您输入的坐标不合法");
}
} else {

1
src/views/my-components/hiver/mapLocate.vue

@ -459,7 +459,6 @@ export default {
essential: true,
});
} catch (error) {
console.log(error);
this.$Message.error("您输入的坐标不合法");
}
} else {

3
src/views/sys/dict-manage/chlidrenList.vue

@ -60,8 +60,6 @@
this.stationModalVisible = true
},
initRecharge(data) {
//data
console.log(data);
this.searchForm.dictId = data.id;
this.form.dictId = data.id;
this.getDataList();
@ -102,7 +100,6 @@
this.loading = false;
if (res.code == 200) {
this.data = res.result.content;
console.log(this.data[0].title)
}
});
},

1
src/views/sys/dict-manage/dictManage.vue

@ -557,7 +557,6 @@
},
getChildren(v){
this.Visiable = true;
console.log(v)
this.$nextTick(() => {
this.$refs.dialog.initRecharge(v);
});

6
src/views/sys/order-manage/logisticsAddress.vue

@ -127,7 +127,6 @@
},
methods: {
initRecharge(data) {
console.log('111112222', data);
if(data.status == 7 || data.status == 11){
this.orderData = data
this.orderData.goodsList = this.orderData.items
@ -136,7 +135,6 @@
this.orderData.deliveryFee = this.orderData.deliveryInfo.deliveryFee
this.orderData.packageFee = data.mallOrder.packageFee
this.orderData.numberCode = this.orderData.mallDeliveryOrder.numberCode
console.log('88888', this.orderData);
}else{
getByShopId({
"shopId": data.shopId
@ -217,7 +215,6 @@
this.returnFormData.status = 4
}
}
console.log('12121212',item)
this.returnFormData.id = item.id;
this.returnFormData.linkId = item.linkId;
this.returnFormData.orderId = item.orderId;
@ -237,8 +234,6 @@
});
},
getMinutesDiff(time1, time2) {
console.log('time1',time1)
console.log('time2',time2)
// Date 1
const date1 = time1 === 1 ? new Date() : new Date(time1);
const date2 = time2 === 1 ? new Date() : new Date(time2);
@ -250,7 +245,6 @@
return diffMinutes;
},
returnOrder(){
console.log('好的',this.orderData)
let returnFormData = {}
this.returnFormData.status = 4

2
src/views/sys/order-manage/orderManage.vue

@ -301,13 +301,11 @@
},
//1
changeOrderTab(v){
console.log(v)
this.searchForm.pageNum = 1;
this.searchForm.searchType = v
this.getLogisticsInfo()
},
checkStatus(v) {
console.log('下拉框选择', v)
this.searchForm.orderStatus = v
},
changePage(v) {

2
src/views/sys/upApp/upApp.vue

@ -89,7 +89,7 @@
this.$Message.error(error.toString());
},
handelSubmit() {
console.log(this.form)
}
},
mounted() {

Loading…
Cancel
Save