From dc5b8bcaeb4765bc04a59e8a11f46a0d34dc9cd4 Mon Sep 17 00:00:00 2001 From: buffeyu Date: Wed, 26 Jan 2022 09:19:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/client-detail/basic-information.vue | 6 ++++-- pages/mall/index.vue | 16 ++++++++++------ pages/my-offer/index.vue | 6 +++--- pages/quotation-details/index.vue | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/pages/client-detail/basic-information.vue b/pages/client-detail/basic-information.vue index 524bc3a..4ea7829 100644 --- a/pages/client-detail/basic-information.vue +++ b/pages/client-detail/basic-information.vue @@ -89,13 +89,15 @@ 产房面积: - {{ info.plantArea }}m² + {{ info.plantArea }} + 年营业额: - {{ info.annualTurnover }}万 + {{ info.annualTurnover }} + diff --git a/pages/mall/index.vue b/pages/mall/index.vue index 098de0b..afc3aa8 100644 --- a/pages/mall/index.vue +++ b/pages/mall/index.vue @@ -140,6 +140,9 @@ export default { this.getSupplier(this.$store.state.supplierInfo.supplierId) } }, + onShow() { + this.downCallback() + }, methods: { back, // 获取上新商品数量 @@ -155,11 +158,11 @@ export default { } else { this.logo = res.logo } - if (res.backgroundImg === '') { - this.backgroundStyle = 'background: url("/static/imgs/mall/zsc-bg-icon.png") no-repeat;' - } else { - this.backgroundStyle = 'background: url(' + res.backgroundImg + ') no-repeat;' - } + // if (res.backgroundImg === '') { + // this.backgroundStyle = 'background: url("/static/imgs/mall/zsc-bg-icon.png") no-repeat;' + // } else { + // this.backgroundStyle = 'background: url(' + res.backgroundImg + ') no-repeat;' + // } } }) .catch((err) => { @@ -423,7 +426,7 @@ export default { z-index: 9999; right: 32rpx; bottom: 122rpx; - background-color: #007aff; + background-color: #007AFF; border-radius: 50%; padding: 10rpx; text-align: center; @@ -439,6 +442,7 @@ export default { .my-image { width: 100rpx; height: 100rpx; + } } diff --git a/pages/my-offer/index.vue b/pages/my-offer/index.vue index 442287f..8abe502 100644 --- a/pages/my-offer/index.vue +++ b/pages/my-offer/index.vue @@ -13,9 +13,9 @@ {{items.belongEnterpriseName}} {{ controlItems[items.orderStatus - 1] }} - - - + + + {{ item.brandName }}{{ item.categoryName }} diff --git a/pages/quotation-details/index.vue b/pages/quotation-details/index.vue index d7ef22e..b63c5bf 100644 --- a/pages/quotation-details/index.vue +++ b/pages/quotation-details/index.vue @@ -192,7 +192,7 @@ export default { // 修改报价按钮 editPrice() { var params = { - title: '修改报价' + title: '修改报价', } go2('submit-quotation', params) } From aa8f66823519a0f346cae7f07074140d3a2bc0ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E9=98=81=E8=BE=89?= Date: Wed, 26 Jan 2022 10:03:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/add-paper/index.vue | 38 +- pages/mall/index.vue | 2 +- pages/message/system-message.vue | 204 ++-- pages/submit-quotation/index.vue | 1658 +++++++++++++++--------------- static/imgs/mall/edit.png | Bin 0 -> 1030 bytes 5 files changed, 994 insertions(+), 908 deletions(-) create mode 100644 static/imgs/mall/edit.png diff --git a/pages/add-paper/index.vue b/pages/add-paper/index.vue index 8eb31c0..624bd5c 100644 --- a/pages/add-paper/index.vue +++ b/pages/add-paper/index.vue @@ -96,7 +96,7 @@ 纸品售价{{ index + 1 }} - 删除 + 删除 @@ -128,7 +128,7 @@ 库存单位: - {{ item.stockUnit === '1' ? '张' : '吨' }} + {{ item.stockUnit === 1 ? '张' : '吨' }} @@ -146,7 +146,7 @@ text="right" placeholder="请输入账期售价" > - 元/{{ item.stockUnit === '1' ? '张' : '吨' }} + 元/{{ item.stockUnit === 1 ? '张' : '吨' }} @@ -163,7 +163,7 @@ text="right" placeholder="请输入纸品库存" > - {{ item.stockUnit === '1' ? '张' : '吨' }} + {{ item.stockUnit === 1 ? '张' : '吨' }} @@ -181,7 +181,7 @@ :maxlength="9999999999" placeholder="请输入最低起送量" > - {{ item.stockUnit === '1' ? '张' : '吨' }} + {{ item.stockUnit === 1 ? '张' : '吨' }} @@ -334,15 +334,25 @@ export default { searchList: [ { name: '张', - id: '1' + id: 1 }, { name: '吨', - id: '2' + id: 2 } ], paperList: [], - skuList: [], + skuList: [ + { + isPromoting: 1, + listPrice: null, + minimum: null, + stock: null, + stockUnit: 2, + weight: null, + categoryName: null + } + ], imgList: [], priceIndex: 0, eidtFor: 0, @@ -418,7 +428,8 @@ export default { var params = { name: 'text', extname: 'text', - url: res.imgList[i] + url: res.imgList[i], + pathUrl: res.imgList[i], } this.imgList.push(params) } @@ -433,7 +444,7 @@ export default { listPrice: null, minimum: null, stock: null, - stockUnit: '2', + stockUnit: 2, weight: null, categoryName: null }) @@ -473,6 +484,13 @@ export default { console.log(this.imgList) }, uploadPrice() { + if(this.skuList.length === 0){ + uni.showToast({ + title: '请添加纸品售价', + icon: 'none' + }) + return + } for (let i = 0; i < validateFields.length; i++) { if (this.form[validateFields[i]] === null || this.form[validateFields[i]] === '') { uni.showToast({ diff --git a/pages/mall/index.vue b/pages/mall/index.vue index 098de0b..ffa6620 100644 --- a/pages/mall/index.vue +++ b/pages/mall/index.vue @@ -117,7 +117,7 @@ export default { pageSize: 10, storeId: null, name: null, - supplierId: this.$store.state.supplierInfo.supplierId + supplierId: this.$store.state.supplierInfo.supplierId, }, listData: [], logo: 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif', diff --git a/pages/message/system-message.vue b/pages/message/system-message.vue index 673b363..ae813be 100644 --- a/pages/message/system-message.vue +++ b/pages/message/system-message.vue @@ -1,116 +1,144 @@ + diff --git a/static/imgs/mall/edit.png b/static/imgs/mall/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..d080a1279fe3fd5d7830025f97ec5342db60b9a1 GIT binary patch literal 1030 zcmV+h1o``kP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91AfN*P1ONa40RR91AOHXW0IY^$^8f$?a7jc#R9Fe+S4(IVK@fetNj8Bb zCZLgk3Vtwtau5YC5k$eyK@XznK@mj|&x%171I{5J__=uVrUpesCEhd#MFc?v6D3gy z1Vu0eF(Htc&*oFUp4o1DXLgsJxEIMl?^N}t-m9vv?pa{5KdNK_@T3OQ*awAmY(l#O zs7DuC)$c+Wr6G`#1|)Ebur(pDF(h#pp86H)w`#&l3l*Z^(4=^tnRom`Pvcm#~+VQ^1P_<65q=oNnY1axZBIEhFdtV!Uz~}lXK&_1~-r1d@c!~j&ydIVe^hppcrstU6ZK5L!)wUtg>=Oh({nF_!KIU zk|rFLvM>NcztZWOa%5jDoiSp|qBL$4D%2Qt$~^)zkO{JW0~WGX!t+7rWrbnkTDC z;sn*e`+34ERI%w35q$S?i#X||;V z+{@mLK28B}Jzki=9JbTo2Hy}ciFw?|4esn*kEgzK?pqFNVC}m;j`DhLOq3fT^1d$B zJk567{sbPQT@713Ea(jf>?G(%f;aO0CSTayrTGbrVh;^f`I8m82|nO1%#s6ev*E@W z*Js6mYa6*!pf3->Rv$!Rf?4g#0(6y>Y^G|!3vM`fnUQlxU>4iV1m^u6E~rVXyTWB@ zAyK{If^se*=k9VXM+rRQY1V@+nTazz