From 74fe218502141c1e3dbd83b792767e22c3167365 Mon Sep 17 00:00:00 2001 From: huliyong <2783385703@qq.com> Date: Sat, 14 Dec 2024 22:19:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/api.js | 5 + components/user/productList.vue | 248 +++--- locale/zh-Hans.json | 2 +- pages.json | 3 - pages/index/center2.vue | 379 +++++---- pages/index/tradingPlatform.vue | 5 +- .../auth/loginAndRegisterAndForgetPassword.vue | 4 +- pages_order/auth/registerShop.vue | 4 +- pages_order/center/addressListManage.vue | 7 +- pages_order/components/order/myOrderList.vue | 249 +++--- pages_order/components/order/orderList.vue | 11 +- pages_order/mine/address.vue | 16 +- pages_order/order/myOrderDetail.vue | 18 +- pages_order/order/offerOrBillLading.vue | 376 ++++----- pages_order/order/orderDetail2.vue | 872 ++++++++++----------- pages_order/order/pendingOrder.vue | 72 +- pages_order/tradingPlatform/confirmOrder.vue | 4 +- pages_order/tradingPlatform/nowOrder.vue | 192 ++--- store/store.js | 1 + 19 files changed, 1211 insertions(+), 1257 deletions(-) diff --git a/api/api.js b/api/api.js index c04fea3..9cba56f 100644 --- a/api/api.js +++ b/api/api.js @@ -175,6 +175,11 @@ const config = { }, + // 规格分页列表查询 + specsList: { + url: '/product/specsList', + method: 'GET', + }, } diff --git a/components/user/productList.vue b/components/user/productList.vue index e040847..aa97e4a 100644 --- a/components/user/productList.vue +++ b/components/user/productList.vue @@ -1,146 +1,142 @@ \ No newline at end of file diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json index bd30fd3..e7f0550 100644 --- a/locale/zh-Hans.json +++ b/locale/zh-Hans.json @@ -155,7 +155,7 @@ "enterOpeningBank": "请输入开开户行", "bankAccount": "银行账号", "enterBankAccount": "请输入银行账号", - "paymentNotice": "提示:请于下单成功后30分钟内支付。(自动倒计时)", + "paymentNotice": "提示:请于下单成功后30分钟内支付。", "confirmOrder": "确认下单", "cancelOrder": "取消订单", "systemSettings": "系统设置", diff --git a/pages.json b/pages.json index 4ca9ce1..4dc320b 100644 --- a/pages.json +++ b/pages.json @@ -93,9 +93,6 @@ { "path": "mine/runningWater" }, - { - "path": "mine/address" - }, { "path": "product/productDetail" }, diff --git a/pages/index/center2.vue b/pages/index/center2.vue index 5ebfa31..5b52281 100644 --- a/pages/index/center2.vue +++ b/pages/index/center2.vue @@ -1,180 +1,233 @@ \ No newline at end of file diff --git a/pages/index/tradingPlatform.vue b/pages/index/tradingPlatform.vue index 202a7bc..87288fc 100644 --- a/pages/index/tradingPlatform.vue +++ b/pages/index/tradingPlatform.vue @@ -16,7 +16,10 @@ - {{ $t('other.orderList') }} + + + {{ item.name }} diff --git a/pages_order/auth/loginAndRegisterAndForgetPassword.vue b/pages_order/auth/loginAndRegisterAndForgetPassword.vue index 734d222..4930ccb 100644 --- a/pages_order/auth/loginAndRegisterAndForgetPassword.vue +++ b/pages_order/auth/loginAndRegisterAndForgetPassword.vue @@ -174,8 +174,8 @@ titleList: ['注册', '登录', '重置密码'], checkboxValue: [], form: { - username: '19330214982', - password: '1234567', + username: '',//19330214982 + password: '',//1234567 loginModel: 0, captcha: '', }, diff --git a/pages_order/auth/registerShop.vue b/pages_order/auth/registerShop.vue index 46e7557..cc8242d 100644 --- a/pages_order/auth/registerShop.vue +++ b/pages_order/auth/registerShop.vue @@ -212,7 +212,7 @@ } - if (!this.$utils.verificationPhone(this.form.userName)) { + if (!this.$utils.verificationPhone(data.userName)) { return uni.showToast({ title: '请输入合法的手机号', icon: 'none' @@ -222,7 +222,7 @@ this.$api(this.titleIndex == 2 ? 'addCustoms' - : 'roleOption', this.form, res => { + : 'roleOption', data, res => { if (res.code == 200) { // uni.removeStorageSync('token') // this.$store.state.userInfo = {} diff --git a/pages_order/center/addressListManage.vue b/pages_order/center/addressListManage.vue index e4a44da..ae17d1d 100644 --- a/pages_order/center/addressListManage.vue +++ b/pages_order/center/addressListManage.vue @@ -40,7 +40,9 @@ this.type = args.type if (this.type == 'back') { - this.addBtn() + this.$nextTick(() => { + this.addBtn() + }) } }, mounted() { @@ -179,7 +181,6 @@ left: 0; bottom: 0; width: 750rpx; - height: 100rpx; background: white; .btn { @@ -187,11 +188,11 @@ align-items: center; justify-content: center; width: 85%; - height: 80rpx; border-radius: 40rpx; color: white; text-align: center; font-size: 28rpx; + padding: 30rpx; background: $uni-color; } } diff --git a/pages_order/components/order/myOrderList.vue b/pages_order/components/order/myOrderList.vue index 5e74adb..eb9b88b 100644 --- a/pages_order/components/order/myOrderList.vue +++ b/pages_order/components/order/myOrderList.vue @@ -1,133 +1,134 @@ \ No newline at end of file diff --git a/pages_order/components/order/orderList.vue b/pages_order/components/order/orderList.vue index 024d3c1..71a1e84 100644 --- a/pages_order/components/order/orderList.vue +++ b/pages_order/components/order/orderList.vue @@ -14,7 +14,8 @@ - + @@ -22,7 +23,13 @@ {{ $t('components.customerName') }} ：{{ item.userName }} - 客户电话：{{ item.phone }} + 客户电话：{{ item.phone }} + + + 库存数量：{{ item.num }} + + + 规格：{{ item.specsName }} {{ $t('other.pickupAddress') }}：{{ item.address }} diff --git a/pages_order/mine/address.vue b/pages_order/mine/address.vue index a504338..0ea8101 100644 --- a/pages_order/mine/address.vue +++ b/pages_order/mine/address.vue @@ -15,7 +15,6 @@ @@ -47,11 +46,15 @@ this.type = args.type if(this.type == 'back'){ - this.addBtn() + this.$nextTick(() => { + this.addBtn() + }) } }, onShow() { - this.getAddressList() + this.$nextTick(() => { + this.getAddressList() + }) }, methods: { @@ -87,7 +90,7 @@ data.id = addressDetail.id } - this.$api(data.id ? 'addressEdit' : 'addressAdd', data, res => { + this.$api(data.id ? 'editAddress' : 'addAddress', data, res => { if (res.code == 200) { this.$refs.addressPopup.close() this.getAddressList() @@ -128,8 +131,9 @@ content: '确认删除此地址?删除后数据不可恢复', success(e) { if(e.confirm){ - self.$api('addressDelete', { - id + self.$api('deleteAddress', { + id, + isDisable : 1, }, res => { if (res.code == 200) { uni.showToast({ diff --git a/pages_order/order/myOrderDetail.vue b/pages_order/order/myOrderDetail.vue index 8c6e635..b85b2b9 100644 --- a/pages_order/order/myOrderDetail.vue +++ b/pages_order/order/myOrderDetail.vue @@ -10,17 +10,18 @@ - + - {{ $t('other.aluminumProducts') }} + {{ $t('components.productSpecification') }}： - {{ $t('other.specification') }} + {{ orderInfo.specsName }} @@ -37,8 +38,9 @@ 提货地址 - + @@ -187,14 +189,10 @@ customerServicePopup }, onLoad(options) { - if (options.orderInfo) { - this.orderInfo = JSON.parse(decodeURIComponent(options.orderInfo)); - console.log(this.orderInfo, "解析后的订单数据"); // 解析后的订单数据 - } + this.orderInfo = this.$store.state.orderDetail }, data() { return { - orderInfo: {}, } }, diff --git a/pages_order/order/offerOrBillLading.vue b/pages_order/order/offerOrBillLading.vue index 81a738b..56a9e23 100644 --- a/pages_order/order/offerOrBillLading.vue +++ b/pages_order/order/offerOrBillLading.vue @@ -18,10 +18,50 @@ 华南铝业有限公司 --> - + + + 商品主图 + + + + + + + 商品内容 + + + + + + + {{ $t('components.productSpe') }} - 铝制品(Al>96%) + + {{ unit.specsName }} + + + + @@ -53,40 +93,37 @@ - - - {{ $t('components.detailedAddress') }} - - - {{ address.address + ' ' + address.addressDetail }} - - - - - - - - - - {{ $t('components.deliveryDate') }} - - - - {{ form.transactionTime }} - - - - > - + + + {{ $t('components.detailedAddress') }} + + + {{ address.address + ' ' + address.addressDetail }} + + + + + + {{ $t('components.deliveryDate') }} + + {{ form.transactionTime }} + + + + + + - - {{ $t('other.tentativeQuantity') }} - + + {{ $t('other.tentativeQuantity') }} + @@ -98,6 +135,23 @@ + + + + 检测报告 + + + + @@ -107,7 +161,7 @@ {{ $t('components.contactUs') }} - 如有疑问请联系我们 + 如有疑问请联系我们 @@ -121,19 +175,25 @@ + + @@ -291,14 +401,11 @@ export default { //margin-top: 20rpx; padding: 20rpx 20rpx 20rpx 20rpx; - .addressA { display: flex; align-items: center; background-color: #FFF; height: 80rpx; - // margin: 10rpx 0 0 0; - //padding: 10rpx 0 0 20rpx; .title { display: flex; @@ -338,81 +445,6 @@ export default { } - .delivery-date { - display: flex; - align-items: center; - background-color: #FFF; - height: 80rpx; - // margin: 10rpx 0 0 0; - padding: 10rpx 0 0 20rpx; - - >view:nth-of-type(1) { - width: 30%; - // font-weight: 700; - } - - - .value { - width: 70%; - border-radius: 10rpx; - overflow: hidden; - - .dateTimeCls { - display: flex; - align-items: center; - justify-content: space-between; - width: 100%; - height: 80%; - //border: 1px solid #b0b2b3; - padding: 5rpx; - border-radius: 20rpx; - - .date { - font-size: 30rpx; - display: flex; - align-items: center; - width: 80%; - height: 100%; - color: #000; - - } - - .img { - display: flex; - justify-content: center; - align-items: center; - //margin-left: 50rpx; - width: 20%; - //height: 100%; - } - } - - } - - - } - - .tentativeQuantity { - display: flex; - align-items: center; - background-color: #FFF; - height: 80rpx; - // margin: 10rpx 0 0 0; - padding: 10rpx 0 0 20rpx; - - .key { - width: 30%; - } - - .value { - width: 70%; - border-radius: 10rpx; - overflow: hidden; - } - - } - - .Tip { display: flex; align-items: center; @@ -476,9 +508,8 @@ export default { display: flex; align-items: center; background-color: #FFF; - height: 80rpx; - // margin: 10rpx 0 0 0; - padding: 10rpx 0 0 20rpx; + margin: 10rpx 0 0 0; + padding: 10rpx 20rpx; >view:nth-of-type(1) { width: 30%; @@ -486,11 +517,9 @@ export default { } >view:nth-of-type(2) { - width: 70%; + flex: 1; border-radius: 10rpx; overflow: hidden; - - input { background-color: #FFF; font-size: 28rpx; @@ -499,73 +528,6 @@ export default { } } - .performanceBond { - display: flex; - align-items: center; - background-color: #FFF; - height: 80rpx; - // margin: 10rpx 0 0 0; - padding: 10rpx 0 0 20rpx; - - .key { - width: 30%; - // font-weight: 700; - } - - .value { - width: 70%; - border-radius: 10rpx; - overflow: hidden; - - - input { - background-color: #FFF; - font-size: 28rpx; - padding: 16rpx 8rpx 16rpx 15rpx; - } - } - } - - .currentRegion { - display: flex; - align-items: center; - background-color: #FFF; - height: 80rpx; - // margin: 10rpx 0 0 0; - padding: 10rpx 0 0 20rpx; - - >view:nth-of-type(1) { - width: 30%; - // font-weight: 700; - } - - >view:nth-of-type(2) { - width: 70%; - padding: 0 20rpx 0 0; - display: flex; - - .input { - background-color: #f5f5f5; - // color: #a4a4a4; - font-size: 28rpx; - padding: 8rpx 8rpx 8rpx 15rpx; - width: 350rpx; - } - - .orientation { - display: flex; - padding: 10rpx 10rpx 10rpx 20rpx; - font-size: 30rpx; - color: #FBAB32; - flex-direction: column; - justify-content: center; - align-items: center; - } - - - } - } - } } } diff --git a/pages_order/order/orderDetail2.vue b/pages_order/order/orderDetail2.vue index ca50bcf..65f32a7 100644 --- a/pages_order/order/orderDetail2.vue +++ b/pages_order/order/orderDetail2.vue @@ -1,445 +1,443 @@ \ No newline at end of file diff --git a/pages_order/order/pendingOrder.vue b/pages_order/order/pendingOrder.vue index 1386192..c0ec836 100644 --- a/pages_order/order/pendingOrder.vue +++ b/pages_order/order/pendingOrder.vue @@ -1,49 +1,53 @@ \ No newline at end of file diff --git a/pages_order/tradingPlatform/confirmOrder.vue b/pages_order/tradingPlatform/confirmOrder.vue index 5e1d515..0e0642a 100644 --- a/pages_order/tradingPlatform/confirmOrder.vue +++ b/pages_order/tradingPlatform/confirmOrder.vue @@ -41,9 +41,9 @@ - + diff --git a/pages_order/tradingPlatform/nowOrder.vue b/pages_order/tradingPlatform/nowOrder.vue index bc28d99..84e83ec 100644 --- a/pages_order/tradingPlatform/nowOrder.vue +++ b/pages_order/tradingPlatform/nowOrder.vue @@ -14,7 +14,27 @@ {{ $t('components.productSpe') }} - {{$t('other.aluminumProducts') }} + {{ fatherData.specsName }} + + + + + + 详情图 + + + + + + + + 检测报告 + + @@ -59,9 +79,9 @@ --> - - 提货地点 - + + 提货地点 + {{ fatherData.address }} @@ -78,7 +98,7 @@ - + - + --> + + + {{ $t('components.deliveryDate') }} + + {{ form.takeTime }} + + + + + - - {{ $t('other.tentativeQuantity') }} - - + + {{ $t('other.tentativeQuantity') }} + + + + + + + + 库存 + + {{ fatherData.num }} @@ -114,9 +155,9 @@ - - {{ $t('other.performanceDeposit') }} - + + {{ $t('other.performanceDeposit') }} + {{ deposit }} @@ -137,7 +178,6 @@ {{ $t('components.contactUsIfAnyProblems') }} - @@ -347,80 +387,6 @@ //margin-top: 20rpx; padding: 20rpx 20rpx 20rpx 20rpx; - .delivery-date { - display: flex; - align-items: center; - background-color: #FFF; - height: 80rpx; - // margin: 10rpx 0 0 0; - padding: 10rpx 0 0 20rpx; - - >view:nth-of-type(1) { - width: 30%; - // font-weight: 700; - } - - - .value { - width: 70%; - border-radius: 10rpx; - overflow: hidden; - - .dateTimeCls { - display: flex; - align-items: center; - justify-content: space-between; - width: 100%; - height: 80%; - //border: 1px solid #b0b2b3; - padding: 5rpx; - border-radius: 20rpx; - - .date { - font-size: 30rpx; - display: flex; - align-items: center; - width: 80%; - height: 100%; - color: #000; - - } - - .img { - display: flex; - justify-content: center; - align-items: center; - //margin-left: 50rpx; - width: 20%; - //height: 100%; - } - } - - } - - - } - - .tentativeQuantity { - display: flex; - align-items: center; - background-color: #FFF; - height: 80rpx; - // margin: 10rpx 0 0 0; - padding: 10rpx 0 0 20rpx; - - .key { - width: 30%; - } - - .value { - width: 70%; - border-radius: 10rpx; - overflow: hidden; - } - - } - .Tip { display: flex; @@ -485,9 +451,8 @@ display: flex; align-items: center; background-color: #FFF; - height: 80rpx; - // margin: 10rpx 0 0 0; - padding: 10rpx 0 0 20rpx; + margin: 10rpx 0; + padding: 10rpx 20rpx; >view:nth-of-type(1) { width: 30%; @@ -495,7 +460,7 @@ } >view:nth-of-type(2) { - width: 70%; + flex: 1; border-radius: 10rpx; overflow: hidden; @@ -564,7 +529,6 @@ } view { - //margin: 20rpx; overflow: hidden; //超出的文本隐藏 text-overflow: ellipsis; //溢出用省略号显示 @@ -580,46 +544,6 @@ } } - .currentRegion { - display: flex; - align-items: center; - background-color: #FFF; - height: 80rpx; - // margin: 10rpx 0 0 0; - padding: 10rpx 0 0 20rpx; - - >view:nth-of-type(1) { - width: 30%; - // font-weight: 700; - } - - >view:nth-of-type(2) { - width: 70%; - padding: 0 20rpx 0 0; - display: flex; - - .input { - background-color: #f5f5f5; - // color: #a4a4a4; - font-size: 28rpx; - padding: 8rpx 8rpx 8rpx 15rpx; - width: 350rpx; - } - - .orientation { - display: flex; - padding: 10rpx 10rpx 10rpx 20rpx; - font-size: 30rpx; - color: #FBAB32; - flex-direction: column; - justify-content: center; - align-items: center; - } - - - } - } - } } } diff --git a/store/store.js b/store/store.js index 7d1f4e2..48f4b69 100644 --- a/store/store.js +++ b/store/store.js @@ -16,6 +16,7 @@ const store = new Vuex.Store({ buy : {}, customerPhone : '',//客服电话 productDetail : {},//商品详情用于中转 + orderDetail : {},//订单详情用于中转 cartInfo : {},//采购商下单的时候供应商开户行信息 pic : '',//清关服务图片 },