From 68855df7e54f6e56e9fc8e8d334527158e2770cf Mon Sep 17 00:00:00 2001 From: huliyong <2783385703@qq.com> Date: Mon, 16 Dec 2024 10:32:10 +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 | 30 +++++-- pages_order/center/addressListManage.vue | 2 + pages_order/order/offerOrBillLading.vue | 98 +++++++++++++++++++--- pages_order/tradingPlatform/nowOrder.vue | 39 ++++++++- uni.scss | 22 +++++ .../components/uv-number-box/props.js | 4 +- utils/oss-upload/oss/index.js | 7 ++ 7 files changed, 178 insertions(+), 24 deletions(-) diff --git a/api/api.js b/api/api.js index 9cba56f..dac0f26 100644 --- a/api/api.js +++ b/api/api.js @@ -45,28 +45,36 @@ const config = { loginUser: { url: '/alUser/login', method: 'POST', + limit: 500, + showLoading: true, }, //用户注册 registerUser: { url: '/alUser/regUesr', method: 'POST', + limit: 500, + showLoading: true, }, // 发送短信接口 sendSms: { url: '/alUser/sendSms', method: 'POST', + limit: 500, + showLoading: true, }, // 选择身份 roleOption: { url: '/alUser/role', method: 'POST', limit : 1000, + showLoading: true, }, // 忘记密码 newPassword: { url: '/alUser/newPassword', method: 'POST', limit : 1000, + showLoading: true, }, // ========================产品报价=============================== @@ -75,21 +83,28 @@ const config = { url: '/product/addCustoms', method: 'POST', limit : 1000, + showLoading: true, }, // 产品报价 addProduct: { url: '/product/addProduct', method: 'POST', + limit: 500, + showLoading: true, }, // 下订单 addProductOrder: { url: '/product/addProductOrder', method: 'POST', + limit: 500, + showLoading: true, }, // 确认-取消订单 updateOrder: { url: '/product/updateOrder', method: 'POST', + limit: 500, + showLoading: true, }, // 我的挂单列表 getMyProductlist: { @@ -100,6 +115,8 @@ const config = { noShow: { url: '/product/noShow', method: 'GET', + limit: 500, + showLoading: true, }, // 现货/期货列表 productList: { @@ -116,16 +133,22 @@ const config = { addAddress: { url: '/address/add', method: 'POST', + limit: 500, + showLoading: true, }, // 用户地址表-编辑 editAddress: { url: '/address/edit', method: 'POST', + limit: 500, + showLoading: true, }, // 用户地址表-删除 deleteAddress: { url: '/address/edit', method: 'POST', + limit: 500, + showLoading: true, }, // 用户地址表-分页列表查询 addressList: { @@ -137,6 +160,8 @@ const config = { addSuggest: { url: '/index/addSuggest', method: 'POST', + limit: 500, + showLoading: true, }, // 铝价接口 getAlPrice: { @@ -147,31 +172,26 @@ const config = { getImagePhoneOther: { url: '/index/index', method: 'POST', - limit: 500, }, // 我的订单列表 myOrderlist: { url: '/product/myOrderlist', method: 'GET', - limit: 500, }, // 采购商根据订单id查询订单信息 getMyOrderInfo: { url: '/product/myOrderlist', method: 'GET', - limit: 500, }, // 供应商根据挂单id查询挂单详情的接口 getProductInfo: { url: '/product/myOrderlist', method: 'GET', - limit: 500, }, // 获取banner列表 bannerList: { url: '/index/bannerList', method: 'POST', - limit: 500, }, diff --git a/pages_order/center/addressListManage.vue b/pages_order/center/addressListManage.vue index ae17d1d..9d32431 100644 --- a/pages_order/center/addressListManage.vue +++ b/pages_order/center/addressListManage.vue @@ -82,6 +82,8 @@ if (addressDetail.id) { data.id = addressDetail.id + }else{ + // data.defaultFlag = 1 } this.$api(data.id ? 'editAddress' : 'addAddress', data, res => { diff --git a/pages_order/order/offerOrBillLading.vue b/pages_order/order/offerOrBillLading.vue index 56a9e23..f200315 100644 --- a/pages_order/order/offerOrBillLading.vue +++ b/pages_order/order/offerOrBillLading.vue @@ -37,7 +37,7 @@ - 商品内容 + 详情图片 + + 详情视频 + + + + - + {{ $t('components.deliveryDate') }} {{ form.transactionTime }} @@ -132,7 +149,9 @@ {{ $t('components.unitPrice') }} - + @@ -152,6 +171,22 @@ :previewFullImage="true"> + + 检测视频 + + + + @@ -174,6 +209,10 @@ + + 添加地址 + { + this.$api('addressList', { + pageNo: 1, + pageSize: 1, + }, res => { + if (res.code == 200) { + this.address = res.result.records[0]; + } + }) + }) + }, // 查询规格 getUnitList(){ @@ -244,24 +301,28 @@ pageSize : 9999999, }, res => { if(res.code == 200){ - this.unitList.push(res.result.records) + this.unitList = [res.result.records] } }) }, //获取地址列表 - getAddressListA() { + getAddressList() { this.$refs.addressList .getAddressList() .then(res => { if (res.total == 0) { - this.$refs.addressPopup.close() - return uni.navigateTo({ - url: '/pages_order/center/addressListManage?type=back' - }) + this.toAddress() } }) }, + // 跳转到添加地址页面 + toAddress(){ + this.$refs.addressPopup.close() + return uni.navigateTo({ + url: '/pages_order/center/addressListManage?type=back' + }) + }, // 提交报价/提交审核 confirmBtn() { @@ -270,13 +331,20 @@ this.form.addressId = this.address.id this.form.specsId = this.unit.id + // 商品主图 this.form.pic = this.fileList.map(n => n.url).join(',') + // 检测报告 this.form.report = this.reportFileList.map(n => n.url).join(',') + // 检测视频 + this.form.reportVideo = this.reportFileVideoList.map(n => n.url).join(',') + // 商品内容-详情图片 this.form.picDetail = this.contentFileList.map(n => n.url).join(',') + // 商品内容-详情视频 + this.form.video = this.contentFileVideoList.map(n => n.url).join(',') if (this.$utils.verificationAll(this.form, { "pic": '请上传主图', - "picDetail": '请上传内容图片', + // "picDetail": '请上传内容图片', specsId : "请选择规格", "addressId": '请选择提货地点', "num": '请选择吨数', @@ -311,7 +379,7 @@ // this.getAddressList() this.$nextTick(() => { - this.getAddressListA() + this.getAddressList() }) }, // 选择地址 @@ -521,7 +589,7 @@ border-radius: 10rpx; overflow: hidden; input { - background-color: #FFF; + background-color: #00000011; font-size: 28rpx; padding: 16rpx 8rpx 16rpx 15rpx; } @@ -530,5 +598,9 @@ } } + // .input-color{ + // padding: 20rpx; + // border-radius: 20rpx; + // } } \ No newline at end of file diff --git a/pages_order/tradingPlatform/nowOrder.vue b/pages_order/tradingPlatform/nowOrder.vue index 84e83ec..7b53ccc 100644 --- a/pages_order/tradingPlatform/nowOrder.vue +++ b/pages_order/tradingPlatform/nowOrder.vue @@ -23,8 +23,19 @@ v-if="fatherData.picDetail"> 详情图 - + + + + + + 详情视频 + + + + @@ -33,8 +44,19 @@ v-if="fatherData.report"> 检测报告 - + + + + + + 检测视频 + + + + @@ -471,6 +493,15 @@ padding: 16rpx 8rpx 16rpx 15rpx; } } + + .list-video{ + display: flex; + flex-wrap: wrap; + video{ + width: 480rpx; + height: 270rpx; + } + } } .performanceBond { diff --git a/uni.scss b/uni.scss index 719ad77..01f6999 100644 --- a/uni.scss +++ b/uni.scss @@ -74,3 +74,25 @@ $uni-color-subtitle: #555555; // 二级标题颜色 $uni-font-size-subtitle:26px; $uni-color-paragraph: #3F536E; // 文章段落颜色 $uni-font-size-paragraph:15px; + + + + +.uni-color-btn{ + border-radius: 40rpx; + padding: 20rpx; + margin: 40rpx; + background: $uni-color; + color: #fff; + text-align: center; + font-size: 28rpx; +} +.uni-uncolor-btn{ + border-radius: 40rpx; + padding: 20rpx; + margin: 40rpx; + border: 1px solid $uni-color; + color: $uni-color; + text-align: center; + font-size: 28rpx; +} \ No newline at end of file diff --git a/uni_modules/uv-number-box/components/uv-number-box/props.js b/uni_modules/uv-number-box/components/uv-number-box/props.js index 64b633b..f0e1cba 100644 --- a/uni_modules/uv-number-box/components/uv-number-box/props.js +++ b/uni_modules/uv-number-box/components/uv-number-box/props.js @@ -51,7 +51,7 @@ export default { // 输入框宽度，单位为px inputWidth: { type: [String, Number], - default: 35 + default: 160 }, // 是否显示减少按钮 showMinus: { @@ -81,7 +81,7 @@ export default { // 按钮大小，宽高等于此值，单位px，输入框高度和此值保持一致 buttonSize: { type: [String, Number], - default: 30 + default: 60 }, // 输入框和按钮的背景颜色 bgColor: { diff --git a/utils/oss-upload/oss/index.js b/utils/oss-upload/oss/index.js index 024eb80..c013e5e 100644 --- a/utils/oss-upload/oss/index.js +++ b/utils/oss-upload/oss/index.js @@ -44,6 +44,11 @@ function storeFolder() { */ export function ossUpload(filePath, key = storeKey(), folder = storeFolder()) { return new Promise((resolve, reject) => { + + uni.showLoading({ + title: '上传中...' + }) + if (folder && folder?.length > 0) { if (folder[0] == "/") folder = folder.slice(1, folder.length) if (folder[folder.length - 1] != "/") folder += "/" @@ -63,6 +68,7 @@ export function ossUpload(filePath, key = storeKey(), folder = storeFolder()) { signature: OSSConfig.signature, }, success(res) { + uni.hideLoading() if (res.errMsg.includes("uploadFile:ok")) { resolve(ossConfig.aliOss.url + key) } else { @@ -70,6 +76,7 @@ export function ossUpload(filePath, key = storeKey(), folder = storeFolder()) { } }, fail(err) { + uni.hideLoading() reject(err) } }