diff --git a/components/order/order.vue b/components/order/order.vue index b84b183..15505c5 100644 --- a/components/order/order.vue +++ b/components/order/order.vue @@ -16,7 +16,7 @@ {{ item.prodName }} - ￥{{ item.price }} + {{ item.price ? '￥' + item.price : '面议' }} {{ item.skuName }} diff --git a/other/addGoods/addGoods.vue b/other/addGoods/addGoods.vue index 7f51474..9ef706f 100644 --- a/other/addGoods/addGoods.vue +++ b/other/addGoods/addGoods.vue @@ -13,7 +13,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -116,7 +116,7 @@ showPopup: false, } }, - onShow() { + onLoad() { const pages = getCurrentPages() const { options } = pages[pages.length - 1] this.prodId = options.prodId @@ -162,24 +162,38 @@ }, // 上传主图 uploadPic(e){ - OSS(e.tempFilePaths[0], (res) => { - this.pic.push({ - name: res.name, - extname: res.ext, - url: res.url, + e.tempFilePaths.forEach(n => { + OSS(n, (res) => { + this.pic.push({ + name: res.name, + extname: res.ext, + url: res.url, + }) }) }) }, - // 上传主图 + // 删除主图 + delPic(e) { + const i = this.pic.findIndex(n => n.url === e.tempFilePath) + if (i !== -1) this.pic.splice(i, 1) + }, + // 上传详情图 uploadImgs(e){ - OSS(e.tempFilePaths[0], (res) => { - this.imgs.push({ - name: res.name, - extname: res.ext, - url: res.url, + e.tempFilePaths.forEach(n => { + OSS(n, (res) => { + this.imgs.push({ + name: res.name, + extname: res.ext, + url: res.url, + }) }) }) }, + // 删除详情图 + delImgs(e) { + const i = this.imgs.findIndex(n => n.url === e.tempFilePath) + if (i !== -1) this.imgs.splice(i, 1) + }, // 显示价格弹框 showPrice(item) { this.curSku = item @@ -194,7 +208,7 @@ }, // 新增sku addSku() { - this.form.skuList.push(this.originSku) + this.form.skuList.push(JSON.parse(JSON.stringify(this.originSku))) }, // 提交 async submit(status) { @@ -230,7 +244,6 @@ this.submiting = true form.pic = this.pic.map(e => e.url).join() form.imgs = this.imgs.map(e => e.url).join() - form.oriPrice = form.skuList[0].oriPrice form.price = form.skuList[0].price let stocks = 0 diff --git a/other/goodsDetail/goodsDetail.vue b/other/goodsDetail/goodsDetail.vue index 6bcd459..bf35835 100644 --- a/other/goodsDetail/goodsDetail.vue +++ b/other/goodsDetail/goodsDetail.vue @@ -1,5 +1,5 @@ @@ -102,13 +115,17 @@ }, // 描述图片切换 picChange(e) { - this.curBanner = e.detail.current; + this.curPic = e.detail.current; }, } } diff --git a/other/procureDetail/procureDetail.vue b/other/procureDetail/procureDetail.vue index 9fa3788..b513e93 100644 --- a/other/procureDetail/procureDetail.vue +++ b/other/procureDetail/procureDetail.vue @@ -45,7 +45,7 @@ {{ info.orderType === 1 ? '个人' : '组织' }} - 所属幼儿园 + 所属组织 {{ info.shopName }} diff --git a/other/supplierDetail/supplierDetail.vue b/other/supplierDetail/supplierDetail.vue index 9e60952..81a40f5 100644 --- a/other/supplierDetail/supplierDetail.vue +++ b/other/supplierDetail/supplierDetail.vue @@ -1,8 +1,11 @@ @@ -201,6 +211,17 @@ this.getInfo() } }, + // 跳转商品详情 + toGoods(item) { + this.$util.to(`/other/goodsDetail/goodsDetail?prodId=${item.prodId}`) + }, + // 我想采购 + toOrder() { + const el = this.$refs.order + el.remarks = '' + el.getGoods(this.teamId) + el.$refs.popup.open() + }, } } @@ -214,22 +235,27 @@ } .top { position: relative; + display: flex; + flex-direction: column; + justify-content: center; min-height: 300rpx; padding: 40rpx; background: url(http://124.71.79.122/images/miniProgram/supplier-bg.jpg) 0 0/100% 100% no-repeat; box-sizing: border-box; + .name-wrap { + display: flex; + align-items: center; + } .name { font-size: 38rpx; font-weight: 600; color: #000; } .logo { - position: absolute; - top: 20rpx; - right: 20rpx; width: 80rpx; min-width: 80rpx; height: 80rpx; + margin-right: 20rpx; border-radius: 50%; } .slogan { @@ -256,7 +282,7 @@ margin: 20rpx 0; .pic { width: 100%; - height: 300rpx; + height: 500rpx; } } .des { @@ -268,7 +294,7 @@ .info { display: flex; align-items: center; - font-size: 28rpx; + font-size: 26rpx; color: #333; &.address { margin: 30rpx 0 20rpx; @@ -323,4 +349,25 @@ color: #ff0047; } } +.order { + position: fixed; + bottom: 200rpx; + right: 40rpx; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + width: 150rpx; + padding: 20rpx 0 30rpx; + color: #fff; + background-color: #4876f9; + border-radius: 50%; + .icon { + width: 60rpx; + margin-bottom: 10rpx; + } + .text { + font-size: 24rpx; + } +} diff --git a/pages/login/login.vue b/pages/login/login.vue index 110b5be..c9d7311 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -23,11 +23,12 @@ + 请选择注册类型 - + @@ -52,15 +53,29 @@ + + + + + + 请选择头像 + 下一步 + + @@ -414,4 +452,41 @@ } } } +.avatar-wrap { + padding: 30rpx 0; + .avatar-btn { + padding: 0; + line-height: 0; + border: 0 !important; + background-color: transparent; + outline: none; + border-radius: 50%; + &:after { + display: none; + } + } + .avatar { + width: 120rpx; + height: 120rpx; + border: 0; + border-radius: 50%; + } + .text { + margin-top: 10rpx; + font-size: 26rpx; + text-align: center; + color: #7d7d7d; + } + + .btn { + width: 300rpx; + padding: 20rpx 0; + margin: 30rpx auto 0; + font-size: 28rpx; + color: #fff; + text-align: center; + background-color: $uni-primary; + border-radius: 20px; + } +} diff --git a/pages/person/person.vue b/pages/person/person.vue index cc1ed69..a2dbe58 100644 --- a/pages/person/person.vue +++ b/pages/person/person.vue @@ -13,7 +13,7 @@ + {{ info.userName || userName }} @@ -64,7 +64,7 @@ - + 我是供应商 @@ -75,7 +75,7 @@ - + 我是幼儿园 @@ -90,9 +90,9 @@ 我是{{ platformName }} {{ platformName }}负责人 - + {{ auditStatus }} - + @@ -403,6 +403,9 @@ background-color: transparent; outline: none; border-radius: 50%; + &:after { + display: none; + } } .avatar { width: 120rpx; @@ -492,12 +495,12 @@ padding: 4rpx 16rpx; margin-left: 20rpx; font-size: 24rpx; - color: $uni-primary; + color: #fd9413; white-space: nowrap; - border: 1px solid #8ca5eb; + border: 1px solid #ffb23e; border-radius: 20px; .icon { - color: $uni-primary; + color: #fd9413; } } } diff --git a/pages/supplier/supplier.vue b/pages/supplier/supplier.vue index cb13990..6ad5098 100644 --- a/pages/supplier/supplier.vue +++ b/pages/supplier/supplier.vue @@ -13,7 +13,7 @@ - {{ item.companyName }} + {{ item.companyName }} @@ -241,6 +241,7 @@ font-weight: 600; color: #333; border-bottom: 1px solid #E6E8ED; + .icon { width: 80rpx; min-width: 80rpx; @@ -271,7 +272,7 @@ font-size: 26rpx; color: #3c3c3c; .text { - max-width: 49%; + max-width: 86%; } } .meta { @@ -296,14 +297,14 @@ } .actions { display: flex; - justify-content: flex-end; + justify-content: space-between; align-items: center; } .star { display: inline-flex; align-items: center; margin-right: 20rpx; - font-size: 28rpx; + font-size: 26rpx; color: #333; .star-icon { margin-right: 10rpx; diff --git a/styles/common.scss b/styles/common.scss index 98ab076..7f9dc8d 100644 --- a/styles/common.scss +++ b/styles/common.scss @@ -25,6 +25,13 @@ ul { text-overflow: ellipsis; overflow: hidden; } +.ell2 { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + text-overflow: ellipsis; + overflow: hidden; +} .l-title { display: flex; align-items: center; diff --git a/team/info/info.vue b/team/info/info.vue index 22c972b..3987897 100644 --- a/team/info/info.vue +++ b/team/info/info.vue @@ -98,6 +98,7 @@ }, }, onShow() { + this.pictureUrl = [] this.getEnterInfo() this.getInfo() }, diff --git a/team/infoEdit/infoEdit.vue b/team/infoEdit/infoEdit.vue index f7350a0..62e4961 100644 --- a/team/infoEdit/infoEdit.vue +++ b/team/infoEdit/infoEdit.vue @@ -235,11 +235,13 @@ }, // 上传描述图片 uploadDes(e){ - OSS(e.tempFilePaths[0], (res) => { - this.desPics.push({ - name: res.name, - extname: res.ext, - url: res.url, + e.tempFilePaths.forEach(n => { + OSS(n, (res) => { + this.desPics.push({ + name: res.name, + extname: res.ext, + url: res.url, + }) }) }) },