From fdbbf272ebe318380ba9a2582d3a48154a15a7bf Mon Sep 17 00:00:00 2001 From: buffeyu Date: Wed, 19 Jan 2022 10:02:31 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E7=BA=B8=E5=95=86=E5=9F=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mall/index.vue | 93 ++++++++++++++++++---------------- pages/mall/no-data.vue | 71 ++++++++++++++++++++++++++ pages/switching-mall/index.vue | 20 ++++++-- 3 files changed, 137 insertions(+), 47 deletions(-) create mode 100644 pages/mall/no-data.vue diff --git a/pages/mall/index.vue b/pages/mall/index.vue index 1df8007..709ae7c 100644 --- a/pages/mall/index.vue +++ b/pages/mall/index.vue @@ -19,48 +19,51 @@ - - - - - - - {{item.brandName}} - - + + + + + + + + {{ item.brandName }} + + + + {{ item.categoryName }}/{{ item.name }}/{{ item.manufacturerName }} + 克重(价格)：200(3900) 235(3900) 255(390 0)255(390 - {{item.categoryName}}/{{item.name}}/{{item.manufacturerName}} - 克重(价格)：200(3900) 235(3900) 255(390 0)255(390 - - - {{item.updateTime}} - - 编辑 - - {{item.status=== '30111'?'下架':'上架'}} + + {{ item.updateTime }} + + 编辑 + + {{ item.status === '30111' ? '下架' : '上架' }} + + - - - + + - - - + + @@ -340,7 +347,7 @@ export default { z-index: 9999; right: 32rpx; bottom: 122rpx; - background-color: #007AFF; + background-color: #007aff; border-radius: 50%; padding: 10rpx; text-align: center; diff --git a/pages/mall/no-data.vue b/pages/mall/no-data.vue new file mode 100644 index 0000000..a22858c --- /dev/null +++ b/pages/mall/no-data.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/pages/switching-mall/index.vue b/pages/switching-mall/index.vue index 832acac..e9cbd37 100644 --- a/pages/switching-mall/index.vue +++ b/pages/switching-mall/index.vue @@ -7,17 +7,17 @@ - + - 东莞市隆兴纸业有限公司 + {{item.name}} 全部商品39 - + @@ -27,17 +27,29 @@ - - diff --git a/pages/my-offer/index.vue b/pages/my-offer/index.vue index 2667869..442287f 100644 --- a/pages/my-offer/index.vue +++ b/pages/my-offer/index.vue @@ -140,10 +140,7 @@ export default { //跳转我的报价详情 myPriceInfo(item) { - console.log(item) - uni.navigateTo({ - url: '/pages/quotation-details/index' - }) + go2('quotation-details',item) } } } diff --git a/pages/paper-detail/index.vue b/pages/paper-detail/index.vue index f7221f2..63aba38 100644 --- a/pages/paper-detail/index.vue +++ b/pages/paper-detail/index.vue @@ -32,19 +32,19 @@ - 克重 - 规格 + 克重 + 售价 库存 - 是否特价 + 是否特价 {{item.weight}} - 779*1092 + {{item.listPrice}}元 {{item.stock}}张 - {{item.isPromoting === ture ?'是':'否'}} + {{item.isPromoting === true ?'是':'否'}} @@ -99,10 +99,10 @@ export default { //获取详情 getDteailList(option) { var params = { - mallSupplierIds : option.id, - productId : null + mallSupplierIds : this.$store.state.supplierInfo.supplierId, + productId : option.id } - this.getSupplierDteail(params).then(res => { + getSupplierDteail(params).then(res => { if (res) { this.form = res this.skuList = res.skuList diff --git a/pages/quotation-details/index.vue b/pages/quotation-details/index.vue index db34eb0..f3eef36 100644 --- a/pages/quotation-details/index.vue +++ b/pages/quotation-details/index.vue @@ -28,12 +28,12 @@ - {{ items.brandName }}|{{ items.gramWeight }}|{{ items.length }}*{{ items.width }}|{{ items.quantity }} + {{ items.brandName }}|{{ items.gramWeight }}|{{ items.length }}*{{ items.width }}|{{ items.quantity }} 重量(吨)： - 1.6544 + {{ items.wight }} 单价(元/吨)： @@ -51,18 +51,18 @@ 其他费用： - ¥ 80.00 + ¥ {{ upDataObj.otherFee }} 合计： - ¥ 13800.32 + ¥ {{ upDataObj.totalAllPrice }} 有效时间： - 24小时 + {{ upDataObj.enquiryValidTime }} @@ -91,46 +91,36 @@ export default { value: '', visible: true, title: 'picker-view', - upDataObj:{ - belongEnterpriseName:'东莞市隆兴纸业有限公司', - deliveryArea:'广东省/广州市/天河区', - deliveryDay:'2021/12/29 12:30', - enquiryValidTime:[12,11,10], - itemList:[ - { - brandName:'丽品白卡', - categoryName:"", - gramWeight:'200g', - length:'787', - quantity:'5000张', - width:'1092', - unitFee:'1000', - totalPrice:'1202' - }, - { - brandName:'丽品白卡', - categoryName:"", - gramWeight:'200g', - length:'787', - quantity:'5000张', - width:'1092', - unitFee:'1000', - totalPrice:'1202' - } - ] - }, + upDataObj: { + belongEnterpriseName: '东莞市隆兴纸业有限公司', + deliveryArea: '广东省/广州市/天河区', + deliveryDay: '2021/12/29 12:30', + enquiryValidTime: [12, 11, 10], + itemList: [] + } } }, + onLoad(Option) { + this.getDetail(Option.id) + }, methods: { back, // 获取详情 - getDetail(id){ - this.enquiryReplyDetail(id) - .then(({ list, total }) => { - this.$refs.orderRef.loadSuccess({ list, total }) + getDetail(id) { + enquiryReplyDetail(id) + .then(res => { + if (res) { + this.upDataObj = res + var timeb = this.upDataObj.enquiryValidTime.split(' ') + var timeabs = timeb[1].split(':') + this.$set(this.upDataObj, 'enquiryValidTimeSplit', timeabs) + this.$set(this.upDataObj, 'otherFee', 0) + this.$set(this.upDataObj, 'totalAllPrice', 0) + this.priceFree() + } }) - .catch(() => { - this.$refs.orderRef.loadFail() + .catch(err => { + reject(err) }) }, // 商品操作按钮 @@ -150,6 +140,14 @@ export default { bindChange(e) { console.log(e.detail.value) }, + priceFree() { + for (let i = 0; i < this.upDataObj.itemList.length; i++) { + var totalAllPrice = parseFloat(this.upDataObj.totalAllPrice) + parseFloat(this.upDataObj.itemList[i].totalPrice) + this.upDataObj.totalAllPrice = totalAllPrice.toFixed(2) + var otherFee = parseFloat(this.upDataObj.otherFee) + parseFloat(this.upDataObj.itemList[i].otherFee) + this.upDataObj.otherFee = otherFee.toFixed(2) + } + }, close() { this.$refs.popup.close() this.$refs.popupPrice.close() @@ -168,13 +166,12 @@ export default { this.$refs.popupTime.close() }, // 修改报价按钮 - editPrice(){ - var params= { - title:"修改报价" + editPrice() { + var params = { + title: '修改报价' } - go2('submit-quotation', params) - }, - + go2('submit-quotation', params) + } } } @@ -557,16 +554,16 @@ export default { padding: 32rpx; line-height: 42rpx; } - .edit-price{ + .edit-price { font-size: 28rpx; - color: #007AFF; + color: #007aff; text-align: right; line-height: 40prx; font-weight: 500; } - .price-tips{ + .price-tips { font-size: 30rpx; - color: #FF5368; + color: #ff5368; letter-spacing: 0; text-align: right; font-weight: 500; diff --git a/pages/store-settings/index.vue b/pages/store-settings/index.vue index ba305a1..62e3d91 100644 --- a/pages/store-settings/index.vue +++ b/pages/store-settings/index.vue @@ -24,7 +24,7 @@ 店铺logo - + 建议尺寸：200*200像素，尺寸不匹配时，图片将被压缩或拉伸以铺满画面 @@ -45,7 +44,7 @@ 背景图片 - + 建议尺寸：750*370像素，尺寸不匹配时，图片将被压缩或拉伸以铺满画面 @@ -53,18 +52,21 @@ - + @@ -69,7 +79,7 @@ export default { .check-mall-image { width: 100rpx; height: 100rpx; - border-radius: 50rpx; + border-radius: 50%; } .check-mall-text { line-height: 60rpx; From e98b082344ef755597cc96318ae49ddcd01f00fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E9=98=81=E8=BE=89?= Date: Wed, 19 Jan 2022 13:57:20 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/add-paper/index.vue | 9 ++++++--- pages/mall/index.vue | 20 +++++++++++++------- pages/paper-detail/index.vue | 5 ++++- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/pages/add-paper/index.vue b/pages/add-paper/index.vue index d5cddc5..6b5eaf0 100644 --- a/pages/add-paper/index.vue +++ b/pages/add-paper/index.vue @@ -346,13 +346,16 @@ export default { this.title = option.title } this.option = option + this.getCategoryListQuery() this.eidtFor = 0 if (this.title === '编辑纸品') { - this.getDteailList() + setTimeout(()=>{ + this.getDteailList() + },200) + this.eidtFor = 1 } - console.log('this.$store.state.supplierInfo.id', this.$store.state.supplierInfo.id) - this.getCategoryListQuery() + }, watch: { ['form.name'](val) { diff --git a/pages/mall/index.vue b/pages/mall/index.vue index 65de39e..8c5ffcb 100644 --- a/pages/mall/index.vue +++ b/pages/mall/index.vue @@ -24,15 +24,18 @@ - + {{ item.brandName }} - + {{ item.categoryName }}/{{ item.name }}/{{ item.manufacturerName }} - 克重(价格)：200(3900) 235(3900) 255(390 0)255(390 + + 克重(价格)： + {{sku.weight}}({{sku.listPrice}}) + @@ -40,7 +43,7 @@ 编辑 - {{ item.status === '30111' ? '下架' : '上架' }} + {{ item.status === 30111 ? '下架' : '上架' }} @@ -169,7 +172,7 @@ export default { productStatusChange(item) { var params = { id: item.id, - status: item.status === '30111' ? '30112' : '30111' + status: item.status === 30111 ? 30112 : 30111 } productStatus(params).then(res => { if (res) { @@ -177,8 +180,11 @@ export default { title: '状态修改成功', icon: 'success' }) - this.orderPagination.pageNum = 1 - this.quertData() + setTimeout(()=>{ + this.orderPagination.pageNum = 1 + this.quertData() + },500) + } }) diff --git a/pages/paper-detail/index.vue b/pages/paper-detail/index.vue index 63aba38..3d449c9 100644 --- a/pages/paper-detail/index.vue +++ b/pages/paper-detail/index.vue @@ -88,11 +88,13 @@ export default { return { form:{}, skuList:[], - imgList:[] + imgList:[], + option:'' } }, onLoad(option) { this.getDteailList(option) + this.option = option }, methods: { back, @@ -107,6 +109,7 @@ export default { this.form = res this.skuList = res.skuList this.imgList = res.imgList + this.$set(this.form,'categoryName',this.option.categoryName) } }) }, From d34cbe6900f302a38dcc1b8cc55a22cd6e8a319e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E9=98=81=E8=BE=89?= Date: Wed, 19 Jan 2022 14:10:50 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/add-paper/index.vue | 5 +---- pages/mall/index.vue | 1 + pages/paper-detail/index.vue | 20 +++++++++++++++++++- pages/trade/quotationList.vue | 3 +++ 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/pages/add-paper/index.vue b/pages/add-paper/index.vue index 6b5eaf0..643de8b 100644 --- a/pages/add-paper/index.vue +++ b/pages/add-paper/index.vue @@ -358,10 +358,7 @@ export default { }, watch: { - ['form.name'](val) { - this.form.id = '' - console.log(111) - } + }, methods: { back, diff --git a/pages/mall/index.vue b/pages/mall/index.vue index 6c37007..f5ff52d 100644 --- a/pages/mall/index.vue +++ b/pages/mall/index.vue @@ -101,6 +101,7 @@ export default { supplierId: this.$store.state.supplierInfo.supplierId, name: this.$store.state.supplierInfo.name } + this.quertData() }, onLoad() { this.quertData() diff --git a/pages/paper-detail/index.vue b/pages/paper-detail/index.vue index 3d449c9..0090934 100644 --- a/pages/paper-detail/index.vue +++ b/pages/paper-detail/index.vue @@ -4,7 +4,7 @@ 纸品详情 - 分享 + 分享 @@ -113,6 +113,24 @@ export default { } }) }, + // 分享 + shareTap() { + uni.share({ + provider: "weixin", + scene: "WXSceneSession", + type: 0, + href: "http://uniapp.dcloud.io/", + title: "uni-app分享", + summary: "我正在使用HBuilderX开发uni-app，赶紧跟我一起来体验！", + imageUrl: "https://bjetxgzv.cdn.bspapp.com/VKCEYUGU-uni-app-doc/d8590190-4f28-11eb-b680-7980c8a877b8.png", + success: function (res) { + console.log("success:" + JSON.stringify(res)); + }, + fail: function (err) { + console.log("fail:" + JSON.stringify(err)); + } + }); + } } } diff --git a/pages/trade/quotationList.vue b/pages/trade/quotationList.vue index 8a83da8..91e730f 100644 --- a/pages/trade/quotationList.vue +++ b/pages/trade/quotationList.vue @@ -98,6 +98,9 @@ export default { list: [] } }, + onShow() { + this.getQuotationQurty() + }, onLoad(option) {}, filters: { replyStatusName(status) { From 53afe7bb5a177725a4c5431cb520eb649870c9ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E9=98=81=E8=BE=89?= Date: Wed, 19 Jan 2022 16:22:12 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE=20=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=90=8D=20=E5=85=B3?= =?UTF-8?q?=E4=BA=8E=E7=BA=B8=E6=8E=8C=E6=9F=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/setting.js | 8 +++ pages.json | 22 +++++++- pages/about/index.vue | 70 +++++++++++++++++++++++++ pages/setting/index.vue | 75 +++++++++++++++++++++++++-- pages/user-info/index.vue | 104 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 275 insertions(+), 4 deletions(-) create mode 100644 apis/setting.js create mode 100644 pages/about/index.vue create mode 100644 pages/user-info/index.vue diff --git a/apis/setting.js b/apis/setting.js new file mode 100644 index 0000000..4ea84ee --- /dev/null +++ b/apis/setting.js @@ -0,0 +1,8 @@ +import http from '../utils/http/index.js' +// 修改员工姓名 +export function employeeName(data) { + return http.post({ + url: '/yyt-uec/update/my/employee-name?userId='+data.userId +'&enterpriseId=' +data.enterpriseId, + data + }) +} diff --git a/pages.json b/pages.json index 37c7963..c043322 100644 --- a/pages.json +++ b/pages.json @@ -258,7 +258,27 @@ "enablePullDownRefresh": false } } - ], + ,{ + "path" : "pages/user-info/index", + "style" : + { + "navigationBarTitleText": "用户名", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/about/index", + "style" : + { + "navigationBarTitleText": "关于", + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + + } + ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "uni-app", diff --git a/pages/about/index.vue b/pages/about/index.vue new file mode 100644 index 0000000..c608e22 --- /dev/null +++ b/pages/about/index.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/pages/setting/index.vue b/pages/setting/index.vue index 41a80ac..ed871ec 100644 --- a/pages/setting/index.vue +++ b/pages/setting/index.vue @@ -1,9 +1,78 @@ - + diff --git a/pages/user-info/index.vue b/pages/user-info/index.vue new file mode 100644 index 0000000..33c32b3 --- /dev/null +++ b/pages/user-info/index.vue @@ -0,0 +1,104 @@ + + + + From bb4fec2ff8842160df29781f1f61995d6e0da8f7 Mon Sep 17 00:00:00 2001 From: buffeyu Date: Wed, 19 Jan 2022 17:17:24 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/client-detail/basic-information.vue | 4 ++-- pages/client-detail/equipment-information.vue | 3 ++- pages/mall/index.vue | 2 +- pages/trade/index.vue | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pages/client-detail/basic-information.vue b/pages/client-detail/basic-information.vue index 8a62c02..8421927 100644 --- a/pages/client-detail/basic-information.vue +++ b/pages/client-detail/basic-information.vue @@ -14,7 +14,7 @@ {{info.name}} @@ -38,7 +38,7 @@ - {{ info.locProvinceName }}{{ info.locCityName }} {{ info.locDetail }} + {{ info.locProvinceName }}{{ info.locCityName }}{{info.locDistrictName}}{{info.locStreetName}} {{ info.locDetail }} diff --git a/pages/client-detail/equipment-information.vue b/pages/client-detail/equipment-information.vue index 56b55e6..ddd4afb 100644 --- a/pages/client-detail/equipment-information.vue +++ b/pages/client-detail/equipment-information.vue @@ -131,7 +131,8 @@ export default { asc: '', desc: '', duration: '3', - enterpriseIds: [] + customerEnterpriseId: this.$store.state.supplierInfo.id || null, // 客户企业ID默认为空，传值时网关获取当前用户关联企业id失效、 + // customerEnterpriseId: '651107734133018624', }, pagination: { pageNum: 0, // 初始会执行一次下拉加载 diff --git a/pages/mall/index.vue b/pages/mall/index.vue index de1c005..c01fba0 100644 --- a/pages/mall/index.vue +++ b/pages/mall/index.vue @@ -1,6 +1,6 @@