-
+
用户信息
- 用户名：{{orderDetails.userName}}
- 用户ID：{{orderDetails.userId}}
- - 联系电话：{{orderDetails.userPhone}}
- - 收货地址：{{orderDetails.province}}-{{orderDetails.city}}-{{orderDetails.district}}-{{orderDetails.address}}
+ - 联系电话：{{orderDetails.userPhone}}
+
- 订单金额：{{orderDetails.orderMoney}}
+ - 订单金额：￥{{orderDetails.orderMoney}}
- 交付邮费：￥{{orderDetails.shippingMoney}}
- 优惠金额：
- 会员商品优惠：
@@ -30,8 +30,8 @@
- 创建时间：{{orderDetails.createTime}}
- 支付时间：{{orderDetails.paymentDate}}
- 支付方式：
- 支付宝支付
- 微信支付
+ 支付宝支付
+ 微信支付
疯币支付
@@ -40,7 +40,10 @@
- 物流信息
+
+ - 收货人：{{orderDetails.shippingUser}} {{orderDetails.userPhone}}
+ - 收货地址：{{orderDetails.province}}-{{orderDetails.city}}-{{orderDetails.district}}-{{orderDetails.address}}
+
-
@@ -97,6 +100,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -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;}
diff --git a/src/views/modules/shop/shopproduct-add-or-update.vue b/src/views/modules/shop/shopproduct-add-or-update.vue
index 314731b..e993735 100644
--- a/src/views/modules/shop/shopproduct-add-or-update.vue
+++ b/src/views/modules/shop/shopproduct-add-or-update.vue
@@ -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;
}
}
diff --git a/src/views/modules/shop/shopproduct.vue b/src/views/modules/shop/shopproduct.vue
index c58c13c..b639f27 100644
--- a/src/views/modules/shop/shopproduct.vue
+++ b/src/views/modules/shop/shopproduct.vue
@@ -22,10 +22,10 @@
align="center"
width="50">
-
-
+
+