diff --git a/components/user/productList.vue b/components/user/productList.vue index 09fd209..ad16f79 100644 --- a/components/user/productList.vue +++ b/components/user/productList.vue @@ -2,6 +2,7 @@ - + diff --git a/pages_order/components/product/submit.vue b/pages_order/components/product/submit.vue new file mode 100644 index 0000000..e874e59 --- /dev/null +++ b/pages_order/components/product/submit.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/pages_order/components/product/submitUnitSelect.vue b/pages_order/components/product/submitUnitSelect.vue new file mode 100644 index 0000000..8c085dc --- /dev/null +++ b/pages_order/components/product/submitUnitSelect.vue @@ -0,0 +1,248 @@ + + + + + diff --git a/pages_order/mine/address.vue b/pages_order/mine/address.vue index dd1486e..c5f9ba8 100644 --- a/pages_order/mine/address.vue +++ b/pages_order/mine/address.vue @@ -4,7 +4,7 @@ - + 编辑 - 删除 - + --> + import redactAddress from '../components/address/redactAddress.vue' - + import addressList from '../components/address/addressList.vue' import Position from '@/utils/position.js' export default { components: { - redactAddress + redactAddress, + addressList }, data() { return { @@ -351,114 +356,114 @@ .address-list { padding: 40rpx 20rpx 120rpx 20rpx; - .address-item { - background: white; - border-radius: 20rpx; - overflow: hidden; - margin-bottom: 20rpx; - padding: 15rpx 15rpx 0rpx 15rpx; - width: 680rpx; - - .address-item-top { - border-bottom: 1px dashed #D3D1D1; - display: flex; - align-items: center; - padding: 0rpx 0rpx 15rpx 0rpx; - - .img-box { - width: 120rpx; - height: 120rpx; - - image { - width: 75%; - height: 75%; - display: block; - margin: 12.5% auto; - } - } - - .address-info { - width: calc(100% - 120rpx); - height: 100%; - display: flex; - flex-direction: column; - justify-content: space-between; - - .user-info { - display: flex; - align-items: center; - - text { - display: block; - line-height: 40rpx; - margin-right: 20rpx; - } - - .user-name, - .user-phone { - font-size: 30rpx; - } - - .is-default { - display: flex; - align-items: center; - justify-content: center; - background: #FEB773; - color: white; - width: 80rpx; - height: 35rpx; - border-radius: 20rpx; - font-size: 22rpx; - } - } - - .address-detail { - color: #4a4a4a; - font-size: 26rpx; - overflow: hidden; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 2; - text-overflow: ellipsis; - } - } - } - - .controls { - display: flex; - align-items: center; - justify-content: space-between; - align-items: center; - font-size: 26rpx; - padding: 15rpx 15rpx 25rpx 15rpx; - - .default-checkbox { - display: flex; - - text { - margin-left: 8rpx; - } - } - - .control-title { - height: 30rpx; - line-height: 30rpx; - color: #666666; - } - - view { - display: flex; - align-items: center; - } - - image { - width: 23rpx; - height: 23rpx; - vertical-align: middle; - margin-right: 8rpx; - } - } - } + // .address-item { + // background: white; + // border-radius: 20rpx; + // overflow: hidden; + // margin-bottom: 20rpx; + // padding: 15rpx 15rpx 0rpx 15rpx; + // width: 680rpx; + + // .address-item-top { + // border-bottom: 1px dashed #D3D1D1; + // display: flex; + // align-items: center; + // padding: 0rpx 0rpx 15rpx 0rpx; + + // .img-box { + // width: 120rpx; + // height: 120rpx; + + // image { + // width: 75%; + // height: 75%; + // display: block; + // margin: 12.5% auto; + // } + // } + + // .address-info { + // width: calc(100% - 120rpx); + // height: 100%; + // display: flex; + // flex-direction: column; + // justify-content: space-between; + + // .user-info { + // display: flex; + // align-items: center; + + // text { + // display: block; + // line-height: 40rpx; + // margin-right: 20rpx; + // } + + // .user-name, + // .user-phone { + // font-size: 30rpx; + // } + + // .is-default { + // display: flex; + // align-items: center; + // justify-content: center; + // background: #FEB773; + // color: white; + // width: 80rpx; + // height: 35rpx; + // border-radius: 20rpx; + // font-size: 22rpx; + // } + // } + + // .address-detail { + // color: #4a4a4a; + // font-size: 26rpx; + // overflow: hidden; + // display: -webkit-box; + // -webkit-box-orient: vertical; + // -webkit-line-clamp: 2; + // text-overflow: ellipsis; + // } + // } + // } + + // .controls { + // display: flex; + // align-items: center; + // justify-content: space-between; + // align-items: center; + // font-size: 26rpx; + // padding: 15rpx 15rpx 25rpx 15rpx; + + // .default-checkbox { + // display: flex; + + // text { + // margin-left: 8rpx; + // } + // } + + // .control-title { + // height: 30rpx; + // line-height: 30rpx; + // color: #666666; + // } + + // view { + // display: flex; + // align-items: center; + // } + + // image { + // width: 23rpx; + // height: 23rpx; + // vertical-align: middle; + // margin-right: 8rpx; + // } + // } + // } } .add-btn { diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue new file mode 100644 index 0000000..f973027 --- /dev/null +++ b/pages_order/product/productDetail.vue @@ -0,0 +1,150 @@ + + + + + diff --git a/pages_order/static/product/like.png b/pages_order/static/product/like.png new file mode 100644 index 0000000..fecdaef Binary files /dev/null and b/pages_order/static/product/like.png differ diff --git a/store/store.js b/store/store.js index 1aae314..8218f65 100644 --- a/store/store.js +++ b/store/store.js @@ -9,7 +9,7 @@ import api from '@/api/api.js' const store = new Vuex.Store({ state: { configList: [], //配置列表 - shop : true + shop : false }, getters: { // 角色 true为水洗店 false为酒店