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 1/3] =?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 2/3] =?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 3/3] =?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 @@ + + + +