zm/nuttyreading-master-html
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 修复+收货地址的修改

Browse Source
This commit is contained in:
@fawn-nine
2023-10-17 17:43:33 +08:00
parent f34427518d
commit efcf6d45db
4 changed files with 174 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/modules/order/buyorder.vue
View File

@@ -233,22 +233,22 @@
v-loading="dataListLoading" @selection-change="selectionChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50">
</el-table-column>
<el-table-column label="序号" width="70" align="center">
<!-- <el-table-column label="序号" width="70" align="center">
<template slot-scope="scope">
{{ (pageIndex - 1) * pageSize + scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column prop="orderSn" header-align="center" align="center" label="订单编号">
</el-table-column> -->
<el-table-column prop="orderSn" header-align="center" align="center" label="订单编号" width="300">
</el-table-column>
<!-- <el-table-column prop="userName" header-align="center" align="center" label="下单人姓名">
</el-table-column> -->
<!-- <el-table-column
<el-table-column
prop="shippingUser"
header-align="center"
align="center"
label="收货人姓名">
</el-table-column>
<el-table-column
<!--<el-table-column
prop="province"
header-align="center"
align="center"
@@ -272,15 +272,19 @@
align="center"
label="地址">
</el-table-column> -->
<el-table-column prop="paymentMethod" header-align="center" align="center" label="支付方式" width="80">
<el-table-column prop="paymentMethod" header-align="center" align="center" label="支付方式" width="100">
<template slot-scope="scope">
<el-tag v-if="scope.row.paymentMethod == 1" type="success">支付宝</el-tag>
<el-tag v-if="scope.row.paymentMethod == 2" type="danger">微信</el-tag>
<el-tag v-if="scope.row.paymentMethod == 1" type="success">微信</el-tag>
<el-tag v-if="scope.row.paymentMethod == 2" type="danger">支付宝</el-tag>
<el-tag v-if="scope.row.paymentMethod == 3" type="warning">ios内购</el-tag>
<el-tag v-if="scope.row.paymentMethod == 4" type="warnning">疯币支付</el-tag>
</template>
</el-table-column>
<!-- 1 支付宝 2 微信 3 ios内购-->
<el-table-column prop="orderMoney" header-align="center" align="center" label="订单金额" width="80">
<template slot-scope="scope">
<span>￥{{scope.row.orderMoney}}</span>
</template>
</el-table-column>
<!-- <el-table-column prop="districtMoney" header-align="center" align="center" label="优惠金额">
</el-table-column> -->

160
src/views/modules/order/buyorderdetail.vue
View File

@@ -2,12 +2,12 @@
<div class="mod-config">
<!-- 订单详细更新 -->
<div>
<ul>
<ul class="list">
<div class="liName">用户信息</div>
<li><span class="infoTitle">用户名：</span><span>{{orderDetails.userName}}</span></li>
<li><span class="infoTitle">用户ID：</span><span>{{orderDetails.userId}}</span></li>
<li><span class="infoTitle">联系电话：</span><span>{{orderDetails.userPhone}}</span></li>
<li><span class="infoTitle">收货地址：</span><span>{{orderDetails.province}}-{{orderDetails.city}}-{{orderDetails.district}}-{{orderDetails.address}}</span></li>
<li><br/></li>
<!-- <li><span class="infoTitle">电 话：</span><span>187898544875</span></li> -->
<!-- <li><span class="infoTitle">地 址：</span><span>天津市天津市天津市天津市天津市天津市</span></li> -->
<li class="line"></li>
@@ -21,7 +21,7 @@
<el-button v-if="orderDetails.orderStatus == 1" @click="godeliver" class="text_button" size="mini" type="text">去发货</el-button>
</li>
<!-- <li><span class="infoTitle">商品总数：</span><span>{{orderDetails.}}</span></li> -->
<li><span class="infoTitle">订单金额：</span><span>{{orderDetails.orderMoney}}</span></li>
<li><span class="infoTitle">订单金额：</span><span>￥{{orderDetails.orderMoney}}</span></li>
<li><span class="infoTitle">交付邮费：</span><span>￥{{orderDetails.shippingMoney}}</span></li>
<li><span class="infoTitle">优惠金额：</span><span></span></li>
<li><span class="infoTitle">会员商品优惠：</span><span></span></li>
@@ -30,8 +30,8 @@
<li><span class="infoTitle">创建时间：</span><span>{{orderDetails.createTime}}</span></li>
<li><span class="infoTitle">支付时间：</span><span>{{orderDetails.paymentDate}}</span></li>
<li style="width: 100%;"><span class="infoTitle">支付方式：</span>
<span v-if="orderDetails.paymentMethod == 1"><icon-svg name="zhifubao"></icon-svg> <span>支付宝支付</span></span>
<span v-if="orderDetails.paymentMethod == 2"><icon-svg name="weixin"></icon-svg> <span>微信支付</span></span>
<span v-if="orderDetails.paymentMethod == 2"><icon-svg name="zhifubao"></icon-svg> <span>支付宝支付</span></span>
<span v-if="orderDetails.paymentMethod == 1"><icon-svg name="weixin"></icon-svg> <span>微信支付</span></span>
<span v-if="orderDetails.paymentMethod == 4"><img src="../../../../static/img/oder_chong.png" width="22px" height="22px"> <span>疯币支付</span></span>
<span v-if="orderDetails.paymentMethod == 3">
<!-- <icon-svg name="zhifubao"></icon-svg> -->
@@ -40,7 +40,10 @@
</li>
<li class="line"></li>
<br>
<div class="liName">物流信息</div>
<div class="liName">物流信息 <a href="#" @click="changeAddressShow"><i class="el-icon-edit"></i>修改收货信息</a></div>
<li><span class="infoTitle">收货人：</span><span>{{orderDetails.shippingUser}}</span>&nbsp;&nbsp;&nbsp;<span>{{orderDetails.userPhone}}</span></li>
<li><span class="infoTitle">收货地址：</span><span>{{orderDetails.province}}-{{orderDetails.city}}-{{orderDetails.district}}-{{orderDetails.address}}</span></li>
<!-- <el-alert title="`该订单下共有 2 条物流信息`" type="info">
</el-alert> -->
<li class="flexbox deliverBox" style="width: 100%;">
@@ -97,6 +100,66 @@
</el-table>
</ul>
</div>
<el-dialog
title="提示"
:visible.sync="changeAddVisible"
width="500"
:close="changeAddHandleClose">
<div>
<el-form ref="addressFormRef" :model="addressForm" label-width="120px">
<el-form-item label="收货人:">
<el-input v-model="addressForm.name"></el-input>
</el-form-item>
<el-form-item label="收货联系电话:">
<el-input v-model="addressForm.tel"></el-input>
</el-form-item>
<el-form-item label="收货地址:">
<!-- <el-input v-model="addressForm.address"></el-input> -->
<!-- 省市区-->
<!-- 省 -->
<el-select v-model="addressForm.province" placeholder="请选择省份" style="width:200px" @change="provinceChange">
<el-option
v-for="item in provinceEntity"
:key="item.regionCode"
:label="item.provName"
:value="item.regionCode">
</el-option>
</el-select>
<el-select v-model="addressForm.city" placeholder="请选择市" @change="cityChange">
<el-option
v-for="item in cityEntity.cityList"
:key="item.regionCode"
:label="item.cityName"
:value="item.regionCode">
</el-option>
</el-select>
<el-select v-model="addressForm.county" placeholder="请选择区">
<el-option
v-for="item in countyEntity.countyList"
:key="item.regionCode"
:label="item.countyName"
:value="item.regionCode">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="详细地址:">
<el-input type="textarea" v-model="addressForm.addressXX"></el-input>
</el-form-item>
</el-form>
<!-- <div class="block">
<span class="demonstration"></span>
<el-cascader
v-model="value"
:props="optionProps"
:options="provinceEntity"
@change="provinceHandleChange"></el-cascader>
</div> -->
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="changeAddHandleClose">取 消</el-button>
<el-button type="primary" @click="changeAddress">确 定</el-button>
</span>
</el-dialog>
<!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> -->
<setDeliverDialog ref="setDeliverDialog" :visible="setDeliverVisible" :selectData="orderList"
@closeDeliverDialog='closeDeliverDialog'></setDeliverDialog>
@@ -125,8 +188,25 @@ export default {
orderId: 0,
ordertype:null
},
orderDetails:{}
changeAddVisible: false,
orderDetails:{},
addressForm:{
province:null,
city:null,
county:null,
name:'',
tel:'',
addressXX:''
},
provinceEntity:[], // 城市列表
cityEntity:[], // 市
countyEntity:[], // 区
optionProps: {
checkStrictly: true,
value: "regionCode",
label: "provName",
children: "children"
},
}
},
components: {
@@ -139,6 +219,63 @@ export default {
this.getData()
},
methods: {
cityChange(e){
// console.log('修改了市',e)
this.addressForm.county = null
this.countyEntity = this.cityEntity.cityList.find((val,index,arr)=>{
return val.regionCode == e
})
// console.log('对应的city数组',this.countyEntity)
},
provinceChange(e){
// console.log('修改了省份',e)
this.addressForm.city = null;
this.addressForm.county = null
this.cityEntity = this.provinceEntity.find((val,index,arr)=>{
return val.regionCode == e
})
// console.log('对应的city数组',this.cityEntity)
},
changeAddHandleClose(){
this.changeAddVisible = false
this.addressForm.province = null
this.addressForm.city = null;
this.addressForm.county = null
this.provinceEntity = []
this.cityEntity = []
this.countyEntity = []
this.$nextTick(() => {
this.addressForm.name = ''
this.addressForm.tel = ''
this.addressForm.addressXX = ''
// this.$refs['addressFormRef'].resetFields();
})
// $refs[formName].resetFields()
console.log('关闭了', this.addressForm)
},
changeAddressShow(){
this.$http({
url: this.$http.adornUrl('/api/province/getProvince'),
method: 'post',
// params: this.$http.adornParams({
// 'orderId': this.query.orderId
// })
}).then(({ data }) => {
console.log('获取地址三级列表', data)
if(data.code == 0){
this.provinceEntity = data.provinceEntity
}
}).catch( e => {
console.log(e,'e')
})
// this.changeAddVisible = true
console.log('显示修改收货地址')
},
// 修改收货信息
changeAddress(){
console.log('修改收货地址')
},
// 获取地址数据三级联动
// 获取 物流
getdeliverDetails(){
let loading = this.$loading({
@@ -234,7 +371,7 @@ export default {
display: inline;
}
ul {
ul.list {
overflow: hidden;
color: #515a6e;
@@ -330,6 +467,11 @@ ul {
font-size: 14px;
;
}
/deep/ .el-select-dropdown{width: 200px !important;}
:deep(.el-select-dropdown__list) {
width: 200px !important;
}
/deep/ .el-select-dropdown__list{width: 200px !important;}
</style>

10
src/views/modules/shop/shopproduct-add-or-update.vue
View File

@@ -685,14 +685,14 @@
.el-uploadfeng {
.el-upload-list__item {
width: 120px;
height: 120px;
width: 95px;
height: 95px;
}
.el-upload--picture-card {
width: 120px;
height: 120px;
line-height: 120px;
width: 95px;
height: 95px;
line-height: 95px;
}
}

6
src/views/modules/shop/shopproduct.vue
View File

@@ -22,10 +22,10 @@
align="center"
width="50">
</el-table-column>
<el-table-column label="序号" width="70" align="center">
<template slot-scope="scope">
<el-table-column label="商品ID" width="70" align="center" prop="productId">
<!-- <template slot-scope="scope">
{{ (pageIndex - 1) * pageSize + scope.$index + 1 }}
</template>
</template> -->
</el-table-column>
<el-table-column
prop="productName"