{{ productitem.productName }}
@@ -149,11 +149,14 @@ export default {
// 获取快递公司列表
getExpressList() {
this.$http({
- url: this.$http.adornUrl('/book/sysdictdata/selectByType/express_name'),
+ // url: this.$http.adornUrl('/book/sysdictdata/selectByType/express_name'),
+ url: this.$http.adornUrl('/express/getExpressCompanyList'),
method: 'get',
}).then(({ data }) => {
// console.log(data, '快递列表')
- this.expressList = data.dataList
+ this.expressList = data.result
+ }).catch(({ e }) => {
+ console.log(e,'e')
})
},
// 获取可合并订单
@@ -165,7 +168,7 @@ export default {
background: 'rgba(0, 0, 0, 0.7)'
});
this.$http({
- url: this.$http.adornUrl(`/book/buyorder/checkOrder`),
+ url: this.$http.adornUrl(`/book/buyOrder/checkOrder`),
method: 'post',
params: this.$http.adornParams({
'page': this.pageIndex,
diff --git a/src/views/modules/order/buyorder.vue b/src/views/modules/order/buyorder.vue
index dcf9cb8..ec12102 100644
--- a/src/views/modules/order/buyorder.vue
+++ b/src/views/modules/order/buyorder.vue
@@ -1,14 +1,11 @@
-
-
-
-
+
全部
待付款
@@ -19,15 +16,30 @@
已发货订单
- 可打印面单
+ 打印面单
-
+
+
-
+
@@ -44,28 +56,28 @@
@@ -117,16 +129,20 @@
+ 订单详情
+
+
- 订单详情
-
+
@@ -135,7 +151,7 @@
@@ -355,8 +377,60 @@
+
+
@@ -433,7 +507,8 @@ export default {
tabChange: {
tabActiveName: '1', // tab筛选默认all全部 0：待付款 1：待发货 2：已发货 3：已完成
isPrint: '0', // 已发货列表筛选 0：显示订单 1：显示可打印列表,
- orderName: '0' //订单名称筛选 all:全部 0:健康超市 1:电子书 2:充值订单
+ orderName: '0', //订单名称筛选 all:全部 0:健康超市 1:电子书 2:充值订单
+ sheetCode:0, // 面单状态0 未打印，1 已打印
},
editBeizhudialogVisible: false, // 修改备注按钮
editBeizhuform: {
@@ -474,7 +549,33 @@ export default {
}
}]
},
- setDeliverVisible: false
+ setDeliverVisible: false,
+ addressForm:{
+ province:null,
+ city:null,
+ county:null,
+ name:'',
+ tel:'',
+ addressXX:''
+ },
+ provinceEntity:[], // 城市列表
+ cityEntity:[], // 市
+ countyEntity:[], // 区
+ changeAddVisible: false,
+ addressFormRule:{
+ name: [
+ { required: true, message: '请输入收货人信息', trigger: 'blur' }
+ ],
+ tel: [
+ { required: true, message: '请输入收货联系电话信息', trigger: 'blur' }
+ ],
+ county: [
+ { required: true, message: '请选择收货地址', trigger: 'blur' }
+ ],
+ addressXX: [
+ { required: true, message: '请输入详细地址信息', trigger: 'blur' }
+ ],
+ }
}
},
components: {
@@ -489,6 +590,69 @@ export default {
}
},
methods: {
+ changeAddress(){
+ this.$refs['addressFormRef'].validate((valid) => {
+ if (valid) {
+ console.log('修改收货地址')
+ } else {
+ return false;
+ }
+ });
+
+ },
+ 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.$refs['addressFormRef'].clearValidate()
+ 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('显示修改收货地址')
+ },
// 混合发货
showAnyDialog(item) {
this.anyDialogContent = item.fmsHtml
@@ -500,7 +664,7 @@ export default {
// 查询可打印面单
getNotPrintSheetList() {
this.$http({
- url: this.$http.adornUrl('/book/buyorderdetail/querySheetPage'),
+ url: this.$http.adornUrl('/book/buyOrderdetail/querySheetPage'),
method: 'post',
/// data: {}
}).then(({ data }) => {
@@ -560,7 +724,7 @@ export default {
getDataList() {
this.dataListLoading = true
this.$http({
- url: this.$http.adornUrl('/book/buyorder/list'),
+ url: this.$http.adornUrl('/book/buyOrder/list'),
method: 'get',
params: this.$http.adornParams({
'page': this.pageIndex,
@@ -623,7 +787,7 @@ export default {
type: 'warning'
}).then(() => {
this.$http({
- url: this.$http.adornUrl('/book/buyorder/delete'),
+ url: this.$http.adornUrl('/book/buyOrder/delete'),
method: 'post',
data: this.$http.adornData(ids, false)
}).then(({ data }) => {
@@ -774,7 +938,7 @@ export default {
let orderType = order.orderStatus
this.dataListLoading = true
this.$http({
- url: this.$http.adornUrl('/book/buyorder/appGetOrderInfo/'+orderType),
+ url: this.$http.adornUrl('/book/buyOrder/appGetOrderInfo/'+orderType),
method: 'get',
params: this.$http.adornParams({
'orderId': orderid,
@@ -927,7 +1091,7 @@ export default {
}
.productItem {
- overflow: hidden;
+ overflow: hidden;
.flexbox {
align-items: center;
diff --git a/src/views/modules/order/buyorderdetail.vue b/src/views/modules/order/buyorderdetail.vue
index ce2df93..93b3e79 100644
--- a/src/views/modules/order/buyorderdetail.vue
+++ b/src/views/modules/order/buyorderdetail.vue
@@ -1,10 +1,16 @@
-
+ 未打印
+ 已打印
+
+
+
+
+
+
+ 查询
+
+
+
+
+ 该订单已被拆分发货
-
+ v-for="(children, index2) in fitem.products" :key="children.id" style="width: 50%;" >
@@ -144,7 +160,7 @@
![]()
-
+
{{ children.productName }}
￥{{ children.productPrice }} × {{ children.quantity }}
@@ -184,7 +200,14 @@
- 发货
-
+ >发货
买家信息：{{ fitem.shippingUser }}
+ 收货信息：
+
{{ fitem.shippingUser }} {{ fitem.userPhone }}
+ {{ fitem.province }}-{{ fitem.city }}-{{ fitem.district }}-{{ fitem.address }}
+
+ 修改收货信息
+
+
+
@@ -199,8 +222,7 @@
-->
支付时间：2023-02-09 14:16:08
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 待付款
+ 待发货
+ 已发货
+ 已完成
+
- 用户名：{{orderDetails.userName}} +
- 用户名：{{orderDetails.userName ? orderDetails.userName : '暂无'}}
- 用户ID：{{orderDetails.userId}}
- 联系电话：{{orderDetails.userPhone}}
- 订单金额：￥{{orderDetails.orderMoney}}
- 交付邮费：￥{{orderDetails.shippingMoney}} -
- 优惠金额： -
- 会员商品优惠： -
- 积分抵扣： -
- 实际支付金额：￥{{orderDetails.realMoney}} + +
- 实际支付金额：￥{{orderDetails.realMoney}}
- 创建时间：{{orderDetails.createTime}} -
- 支付时间：{{orderDetails.paymentDate}} -
- 支付方式： +
- 支付时间：{{orderDetails.paymentDate}} +
- 支付方式：
支付宝支付 微信支付 
疯币支付
@@ -37,10 +41,18 @@
IOS内购
-
+
- - 优惠金额：0 +
- 会员商品优惠：0 +
- 积分抵扣：0 + +
- 收货人：{{orderDetails.shippingUser}} {{orderDetails.userPhone}}
- 收货地址：{{orderDetails.province}}-{{orderDetails.city}}-{{orderDetails.district}}-{{orderDetails.address}} @@ -83,7 +95,7 @@ width="280">
用户信息
- -
物流信息 修改收货信息
+
+
+
+
+ 优惠信息
+ 物流信息 修改收货信息
- ![]()
+ ![]()
@@ -101,59 +113,51 @@
{{ scope.row.productName}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+