diff --git a/apis/modules/user.js b/apis/modules/user.js index f59a58b..278114e 100644 --- a/apis/modules/user.js +++ b/apis/modules/user.js @@ -43,6 +43,9 @@ export const enterpriseCertificationStatus = (openId) => { export const saveCertification = (data) => { return post(`nakadai/enterprise/certification/save`, data) } +export const updateCertification = (data) => { + return post(`nakadai/enterprise/certification/update`, data) +} diff --git a/components/order/order.vue b/components/order/order.vue index 15505c5..6a714e3 100644 --- a/components/order/order.vue +++ b/components/order/order.vue @@ -29,7 +29,6 @@ - 个人采购 组织采购 @@ -50,11 +49,6 @@ import { list } from '@/apis/modules/goods.js' export default { name:"order", - // props: { - // prodId: { - // type: Number, - // }, - // }, data() { return { platformId: uni.getStorageSync('platformId'), @@ -101,41 +95,50 @@ }, // 采购 async procure(type) { - const { goods } = this - const hadOrder = goods.find(e => e.prodCount) // 是否有输入采购数量（采购数量或者留言至少需要输一个才能采购） - if (!hadOrder && !this.remarks) return this.$util.errMsg(`请输入采购数量或者留言信息！`) - try { - // 如果是采购，需要调两个接口，下面这个是采购的接口，第二个接口是需要传留言的接口；如果是留言的话就只需要调第二个接口 - if (hadOrder) { - const data = goods.filter(e => e.prodCount).map(e => { - return { - prodCount: e.prodCount, - prodId: e.prodId, - shopId: this.shopId, - skuId: e.skuId, - } - }) - - await orderConfirm({ - orderItem: data - }) + const that = this + uni.showModal({ + title: '提示', + content: '是否提交采购咨询？', + async success(res) { + if (res.confirm) { + const { goods } = that + const hadOrder = goods.find(e => e.prodCount) // 是否有输入采购数量（采购数量或者留言至少需要输一个才能采购） + if (!hadOrder && !that.remarks) return that.$util.errMsg(`请输入采购数量或者留言信息！`) + try { + // 如果是采购，需要调两个接口，下面这个是采购的接口，第二个接口是需要传留言的接口；如果是留言的话就只需要调第二个接口 + if (hadOrder) { + const data = goods.filter(e => e.prodCount).map(e => { + return { + prodCount: e.prodCount, + prodId: e.prodId, + shopId: that.shopId, + skuId: e.skuId, + } + }) + + await orderConfirm({ + orderItem: data + }) + } + + // 留言 + const res = await orderSubmit({ + leaveAMessage: hadOrder ? false : true, + orderShopParam: [ + { + remarks: that.remarks, + shopId: that.shopId + } + ], + orderType: type + }) + that.orderNumbers = res.data.orderNumbers + that.$refs.popup.close() + that.$refs.successDia.open() + } catch (e) {} + } } - - // 留言 - const res = await orderSubmit({ - leaveAMessage: hadOrder ? false : true, - orderShopParam: [ - { - remarks: this.remarks, - shopId: this.shopId - } - ], - orderType: type - }) - this.orderNumbers = res.data.orderNumbers - this.$refs.popup.close() - this.$refs.successDia.open() - } catch (e) {} + }) }, // 提示成功确认 dialogConfirm() { diff --git a/libs/share.js b/libs/share.js index f8dc185..8c87eaa 100644 --- a/libs/share.js +++ b/libs/share.js @@ -1,10 +1,12 @@ export default{ // 监听用户点击右上角菜单的「转发」按钮时触发的事件 - onShareAppMessage() { + onShareAppMessage(e) { + const pages = getCurrentPages() + const { route, $page } = pages[pages.length - 1] // 设置转发的参数 return { title: "GPAC", - // path: '', + path: route === 'other/activityDetail/activityDetail' ? $page : '', imageUrl: "", success: function(res) { if (res.errMsg == 'shareAppMessage:ok') { diff --git a/libs/util.js b/libs/util.js index 30944cf..19483a2 100644 --- a/libs/util.js +++ b/libs/util.js @@ -3,9 +3,6 @@ import { getCurrentTime } from '@/apis/modules/activity.js' const files = [ 'https://huorantech.cn/%E7%94%A8%E6%88%B7%E6%9C%8D%E5%8A%A1%E5%8D%8F%E8%AE%AE.docx', // 用户服务协议 'https://huorantech.cn/%E7%94%A8%E6%88%B7%E9%9A%90%E7%A7%81%E5%8D%8F%E8%AE%AE.docx', // 用户隐私协议 - 'https://huorantech.cn/%E4%BA%BA%E5%B7%A5%E6%99%BA%E8%83%BD%E5%AE%9E%E9%AA%8C%E5%AE%A4%E5%BB%BA%E8%AE%BE%E6%96%B9%E6%A1%88-2020.1.docx', // 人工智能 - 'https://huorantech.cn/%E5%A4%A7%E6%95%B0%E6%8D%AE%E7%AE%A1%E7%90%86%E4%B8%8E%E5%BA%94%E7%94%A8%E4%B8%93%E4%B8%9A%E5%BB%BA%E8%AE%BE%E6%96%B9%E6%A1%88.docx', // 大数据 - 'https://huorantech.cn/%E9%87%91%E8%9E%8D%E7%A7%91%E6%8A%80%E5%AE%9E%E9%AA%8C%E5%AE%A4%E5%BB%BA%E8%AE%BE%E6%96%B9%E6%A1%88V2.0.docx', // 金融科技 ] const docExts = ['doc', 'xls', 'ppt', 'pdf', 'docx', 'xlsx', 'pptx'] export default { diff --git a/other/activityDetail/activityDetail.vue b/other/activityDetail/activityDetail.vue index fb70d28..5ea781e 100644 --- a/other/activityDetail/activityDetail.vue +++ b/other/activityDetail/activityDetail.vue @@ -43,6 +43,16 @@ + + @@ -58,7 +68,7 @@ {{ stopSign ? (signed ? '已报名' : '已截止报名') : comStatus === 1 ? (signed ? '取消报名' : '立刻报名') : statusList[comStatus] }} - + @@ -103,6 +113,7 @@ now: '', invitationCode: '', submiting: false, + popupShow: false, } }, // 下拉刷新 @@ -126,6 +137,10 @@ this.stopSign = 0 this.id = options.id this.getInfo() + this.focus = false + }, + onLoad() { + this.focus = false }, methods: { // 获取详情 @@ -223,7 +238,14 @@ } else { // 报名 this.invitationCode = '' // 需要输入验证码就弹出邀请码弹框，否则直接报名 - this.form.isNeedCode ? this.$refs.popup.open() : this.sign() + if (this.form.isNeedCode) { + this.popupShow = true + this.$nextTick(() => { + this.$refs.popup.open() + }) + } else { + this.sign() + } } }, // 取消报名 @@ -267,6 +289,62 @@ this.invitationCode = value this.sign() }, + download(item) { + uni.showLoading({ + title: '加载中', + mask: true + }) + // 下载文件资源到本地 + uni.downloadFile({ + url: item.filePath, + success: function(res) { + console.log('result:', res) + // uni.hideLoading(); + + if (res.statusCode === 200) { + uni.getFileSystemManager().saveFile({ + tempFilePath: res.tempFilePath, + success(res) { + console.log('saveFile:',res.savedFilePath) + uni.openDocument({ + filePath: res.savedFilePath, + showMenu: true, //是否可以分享 + success: (res) => { + uni.hideLoading() + console.log(res); + }, + fail: (e) => { + uni.showToast({ + title: '打开失败', + icon: "error" + }) + } + }) + } + }) + } + // uni.showLoading({ + // title: '正在打开', + // mask: true + // }) + // 新开页面打开文档，支持格式：doc, xls, ppt, pdf, docx, xlsx, pptx。 + // uni.openDocument({ + // filePath: res.tempFilePath, + // fileType: 'docx', // 文件类型，指定文件类型打开文件，有效值 doc, xls, ppt, pdf, docx, xlsx, pptx + // showMenu: true, // 允许出现分享功能 + // success: res => { + // uni.hideLoading() + // }, + // fail: openError => { + // uni.hideLoading() + // } + // }) + }, + fail: function(err) { + uni.hideLoading() + } + }) + }, } } @@ -311,6 +389,24 @@ margin: 20rpx; border-radius: 20px; background-color: #fff; + .file-title { + margin: 40rpx 0 20rpx; + font-size: 26rpx; + color: $uni-primary; + } + .file { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 15rpx; + font-size: 24rpx; + } + .file-name { + color: #333; + } + .download { + color: $uni-primary; + } } .list { margin: 0 30rpx; diff --git a/other/addGoods/addGoods.vue b/other/addGoods/addGoods.vue index 8843683..f7418f4 100644 --- a/other/addGoods/addGoods.vue +++ b/other/addGoods/addGoods.vue @@ -15,7 +15,6 @@ - @@ -35,7 +34,7 @@ 规格名称 - + 价格 @@ -62,11 +61,11 @@ - + 售价： - + 市场价： @@ -211,6 +210,17 @@ addSku() { this.form.skuList.push(JSON.parse(JSON.stringify(this.originSku))) }, + // sku名称离开焦点 + skuNameChange(e) { + console.log(3, e) + this.form.skuList.filter(n => n.skuName === e.detail.value).length > 1 && this.$util.errMsg(`规格名称不能重复！`) + }, + priceChange(e) { + const { value } = e.detail + if (value && isNaN(+value)) { + this.$util.errMsg(`价格请输入数字！`) + } + }, // 提交 async submit(status) { if (this.submiting) return false @@ -227,14 +237,14 @@ this.$util.errMsg(`请输入规格名称！`) invalid = 1 } - // if (!e.price) { - // this.$util.errMsg(`请输入售价！`) - // invalid = 1 - // } - // if (!e.oriPrice) { - // this.$util.errMsg(`请输入市场价！`) - // invalid = 1 - // } + if (e.price && isNaN(+e.price)) { + this.$util.errMsg(`售价请输入数字！`) + invalid = 1 + } + if (e.oriPrice && isNaN(+e.oriPrice)) { + this.$util.errMsg(`市场价请输入数字！`) + invalid = 1 + } if (!e.stocks) { this.$util.errMsg(`请输入库存！`) invalid = 1 @@ -339,4 +349,7 @@ background-color: $uni-primary; } } +.popup-block { + padding: 40rpx 30rpx; +} diff --git a/other/goodsDetail/goodsDetail.vue b/other/goodsDetail/goodsDetail.vue index a8cd1ed..6144802 100644 --- a/other/goodsDetail/goodsDetail.vue +++ b/other/goodsDetail/goodsDetail.vue @@ -12,19 +12,23 @@ - 售价 {{ info.price ? '￥ ' + info.price + '起' : '面议' }} + + 售价 + {{ info.price ? '￥ ' + info.price + '起' : '面议' }} + 市场价 ￥{{ info.oriPrice }} {{ info.prodName }} - + 规格 - - {{ item.skuName }} - {{ item.price ? '￥ ' + item.price : '面议' }} - 库存{{ item.stocks }} + + + {{ item.skuName }} + {{ item.price ? '￥' + item.price : '面议' }} + @@ -40,6 +44,15 @@ 编辑 + + @@ -49,6 +62,7 @@ export default { data() { return { + teamId: uni.getStorageSync('teamId'), isTeam: uni.getStorageSync('team').isTeam == 1, // 队长 prodId: '', curPic: 0, @@ -118,6 +132,13 @@ picChange(e) { this.curPic = e.detail.current; }, + // 我想采购 + toOrder() { + const el = this.$refs.order + el.remarks = '' + el.getGoods(this.teamId) + el.$refs.popup.open() + }, } } @@ -152,7 +173,11 @@ display: flex; justify-content: space-between; align-items: center; + .price-wrap { + color: #000; + } .price { + margin-left: 10rpx; font-size: 38rpx; font-weight: 600; color: #f70000; @@ -164,17 +189,15 @@ } } .name { + padding: 20rpx 0; margin: 20rpx 0; font-size: 32rpx; font-weight: 600; color: #333; + border-top: 1px dashed #e6e6e6; + border-bottom: 1px dashed #e6e6e6; } - .sku { - .item { - display: flex; - justify-content: space-between; - align-items: center; - } + .sku-wrap { .sku-title { display: flex; align-items: center; @@ -187,18 +210,32 @@ margin-right: 10rpx; } } + .skus { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + margin-top: 20rpx; + } + .item { + display: inline-flex; + justify-content: space-between; + align-items: center; + width: 48%; + padding: 15rpx; + margin-bottom: 20rpx; + background-color: #f2f5ff; + box-sizing: border-box; + border-radius: 8px; + } .sku-name { font-size: 28rpx; - color: #333; + font-weight: 600; + color: $uni-primary; } .sku-price { - margin: 10rpx 0; font-size: 28rpx; - color: #ff3313; - } - .sku-stocks { - font-size: 26rpx; - color: #868686; + font-weight: 600; + color: $uni-primary; } } .img-wrap { diff --git a/other/procureDetail/procureDetail.vue b/other/procureDetail/procureDetail.vue index c407974..5e4007c 100644 --- a/other/procureDetail/procureDetail.vue +++ b/other/procureDetail/procureDetail.vue @@ -44,7 +44,7 @@ 采购类型 {{ info.orderType === 1 ? '个人' : '组织' }} - + 所属组织 {{ info.shopName }} diff --git a/other/supplierDetail/supplierDetail.vue b/other/supplierDetail/supplierDetail.vue index c48f411..a053c97 100644 --- a/other/supplierDetail/supplierDetail.vue +++ b/other/supplierDetail/supplierDetail.vue @@ -60,12 +60,15 @@ {{ item.prodName }} - {{ item.price ? '￥' + item.price : '面议' }} + + {{ item.price ? '￥' + item.price : '面议' }} + ￥{{ item.oriPrice }} + - + 我想采购 @@ -256,11 +259,12 @@ color: #000; } .logo { - width: 100rpx; - min-width: 100rpx; - height: 100rpx; + width: 120rpx; + min-width: 120rpx; + height: 120rpx; margin-right: 20rpx; border-radius: 50%; + object-fit: cover; } .slogan { margin-top: 40rpx; @@ -297,7 +301,7 @@ } .info { display: flex; - align-items: center; + align-items: flex-start; font-size: 26rpx; color: #333; &.address { @@ -305,6 +309,7 @@ } .icon { width: 40rpx; + min-width: 40rpx; margin-right: 10rpx; } } @@ -348,30 +353,18 @@ font-size: 30rpx; font-weight: 600; } + .prices { + display: flex; + justify-content: space-between; + } .price { - font-size: 26rpx; + font-size: 34rpx; 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 { + .ori { font-size: 24rpx; + text-decoration: line-through; + color: #666; } } diff --git a/pages/person/person.vue b/pages/person/person.vue index da181a8..7217a12 100644 --- a/pages/person/person.vue +++ b/pages/person/person.vue @@ -48,7 +48,8 @@ 我的发票 --> -
  • + +
  • 我的采购
    • diff --git a/pages/supplier/supplier.vue b/pages/supplier/supplier.vue index 6ad5098..280c0e8 100644 --- a/pages/supplier/supplier.vue +++ b/pages/supplier/supplier.vue @@ -100,6 +100,7 @@ } }, onShow() { + this.$refs.order.platformId = uni.getStorageSync('platformId') this.active = '' this.keyword = '' this.typeVisible = false diff --git a/styles/common.scss b/styles/common.scss index 7f9dc8d..65ba4fb 100644 --- a/styles/common.scss +++ b/styles/common.scss @@ -350,4 +350,28 @@ ul { padding-bottom: 0 !important; overflow: hidden; filter: blur(10px); +} + + +.order-btn { + 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%; + box-shadow: 0 0 8px rgba(74, 121, 255, .8); + .icon { + width: 60rpx; + margin-bottom: 10rpx; + } + .text { + font-size: 24rpx; + } } \ No newline at end of file diff --git a/team/certified/certified.vue b/team/certified/certified.vue index 8e0228d..6b8e997 100644 --- a/team/certified/certified.vue +++ b/team/certified/certified.vue @@ -22,16 +22,19 @@     - 确定 + + 取消认证 + 确定