diff --git a/pages/copyright/createBuy/createBuy.wxml b/pages/copyright/createBuy/createBuy.wxml index d0d964a..afd3f4d 100644 --- a/pages/copyright/createBuy/createBuy.wxml +++ b/pages/copyright/createBuy/createBuy.wxml @@ -1,13 +1,10 @@ - + - + - - - - + diff --git a/pages/copyright/createProjectInfo/createProjectInfo.js b/pages/copyright/createProjectInfo/createProjectInfo.js index 0cd11ed..e258651 100644 --- a/pages/copyright/createProjectInfo/createProjectInfo.js +++ b/pages/copyright/createProjectInfo/createProjectInfo.js @@ -17,8 +17,24 @@ Page({ isShowContact: false, //是否显示联系人 currentLanguage: 'JAVA', //当前选中的语言 price: 0, - packageList: [], //套餐包 - couponsList: [], //优惠卷 + packageList: [{ + id: 1 + }, { + id: 2 + }, { + id: 3 + }], //套餐包 + tempPackage: {}, //临时选中的优惠卷,没有点击确定按钮前 + selectPackage: {}, //选中的套餐包 + couponsList: [{ + id: 1 + }, { + id: 2 + }, { + id: 3 + }], //优惠卷 + selectCoupons: {}, //选中的优惠卷 + tempCoupons: {}, //临时选中的优惠卷,没有点击确定按钮 contactList: [], //联系人 selectContact: {}, //当前选中的联系人 showCreateContact: false, //显示创建联系人 @@ -34,6 +50,10 @@ Page({ projectName: '', projectNameList: [], isUrgent: false, //是否加急 + showCoupons: false, //显示优惠卷 + showPackage: false, //显示套餐包 + canSelCoupons: true, //是否可以使用优惠卷 + canSelPackage: true, //是否可以使用套餐包 }, onLoad(options) { wx.setNavigationBarTitle({ @@ -111,6 +131,23 @@ Page({ contactEmail: e.detail.value }) }, + //选中优惠卷 + selectCoupons(e) { + this.setData({ + tempCoupons: e.currentTarget.dataset.value + }) + }, + //确定使用选中的优惠卷 + confirmSelCoupons() { + this.setData({ + selectCoupons: this.data.tempCoupons, + showCoupons: false, + tempCoupons: {}, + canSelPackage: false, + selectPackage: {}, + tempPackage: {} + }) + }, //监听项目名称 inputProjectName(e) { this.setData({ @@ -153,13 +190,82 @@ Page({ }, //获取优惠卷 doGetCoupons() { - ProjectService.doGetCouponseList() + const _self = this + const data = { + page: 1, + rows: 100, + isEffective: 1, + isUsed: 0 + } + ProjectService.doGetCouponseList(data) .then(res => { - + console.log('优惠卷') + console.log(res) + // _self.setData({ + // couponsList: res.rows + // }) }, err => { - + console.log(err) }) }, + //显示优惠卷 + doShowCoupons() { + if (this.data.couponsList.length <= 0) { + this.setData({ + showError: true, + errorHint: '您没有可以使用的优惠卷' + }) + } else { + this.setData({ + tempCoupons: this.data.selectCoupons, + showCoupons: !this.data.showCoupons + }) + } + }, + //显示套餐包 + doShowPackage() { + const _self = this + if (_self.data.packageList.length > 0) { + _self.setData({ + tempPackage: _self.data.selectPackage, + showPackage: true + }) + } else { + _self.setData({ + errorHint: '您暂时没有可以使用的套餐包', + showError: true + }) + } + }, + //确定套餐包 + confirmSelectPackage() { + this.setData({ + selectPackage: this.data.tempPackage, + showPackage: false, + tempPackage: {}, + canSelCoupons: false, + selectCoupons: {}, + tempCoupons: {} + }) + }, + //取消选中的套餐包或优惠卷 + clearSelectPackageOrCoupons() { + this.setData({ + selectCoupons: {}, + selectPackage: {}, + tempCoupons: {}, + tempPackage: {}, + canSelCoupons: true, + canSelPackage: true + }) + }, + //点击选择套餐包 + selectPackage(e) { + console.log(e) + this.setData({ + tempPackage: e.currentTarget.dataset.value + }) + }, //获取客服NO doGetCsaNo(isShow) { const _self = this diff --git a/pages/copyright/createProjectInfo/createProjectInfo.wxml b/pages/copyright/createProjectInfo/createProjectInfo.wxml index bdf2b1c..e09af2e 100644 --- a/pages/copyright/createProjectInfo/createProjectInfo.wxml +++ b/pages/copyright/createProjectInfo/createProjectInfo.wxml @@ -1,78 +1,78 @@ - - - - - - - - - - - - - 项目信息 - - 推荐 - - - - - - 产权联系人 - - - {{selectContact.name}} - - - - 新建 - - - - 系统版本 - - - - 系统语言 - + + + + + + + + + + + 项目信息 + + 推荐 + + + + + + 产权联系人 + - {{currentLanguage}} - + {{selectContact.name}} + - - - {{item}} + + 新建 + + + + 系统版本 + + + + 系统语言 + + + {{currentLanguage}} + + + + + {{item}} + + + 开发完成时间 + + + {{completeDate}} + + + + - - 开发完成时间 - - - {{completeDate}} - - - - - - - - - 套餐包 - 暂无套餐包 - - - 优惠券 - 请选择优惠券 - 选择 + + + + 套餐包 + {{selectPackage.id?selectPackage.id:'请选择套餐包'}} + 取消 + + + 优惠券 + {{selectCoupons.id? selectCoupons.id : '请选择优惠券'}} + 取消 + 选择 + - 金额: {{price/100}}元 @@ -80,6 +80,7 @@ 保存并付款 + 创建联系人 @@ -93,7 +94,7 @@ - 联系邮箱 + 联系邮箱 @@ -102,7 +103,7 @@ - + 推荐系统全称 @@ -118,6 +119,67 @@ - + + + 优惠卷 + + + + + + + + + + + 优惠卷 + + 减5元 + + 5元优惠卷 + 有效期:2025-02-07至2025-04-30 + + + + + + + + + + + + + + + + 套餐包 + + + + + + + + 套餐包 + 剩余13件 + + 60元一件撰写材料包 + 平均全托管一件220元 + + + + + + + + + + + + + - \ No newline at end of file + + + \ No newline at end of file diff --git a/pages/copyright/createProjectInfo/createProjectInfo.wxss b/pages/copyright/createProjectInfo/createProjectInfo.wxss index bf13454..2d481d2 100644 --- a/pages/copyright/createProjectInfo/createProjectInfo.wxss +++ b/pages/copyright/createProjectInfo/createProjectInfo.wxss @@ -2,7 +2,13 @@ display: flex; flex-direction: column; justify-content: flex-start; - padding: 20rpx; +} + +.container-box { + display: flex; + flex-direction: column; + justify-content: flex-start; + padding: 15px; } .create-title { @@ -70,6 +76,7 @@ display: flex; flex-direction: row; justify-content: space-between; + padding-right: 10px; } .desc .icon { @@ -79,6 +86,7 @@ .value { color: #666; + padding-right: 10px; } .language-sel { @@ -129,10 +137,9 @@ left: 0; bottom: 0; text-align: center; - width: 94vw; + width: 100vw; line-height: 100rpx; border-radius: 20rpx; - margin: 20rpx; background-color: white; display: flex; flex-direction: column; @@ -180,6 +187,18 @@ .form-item-title { flex: .3; + font-size: 14px; + color: black; + font-weight: 500; + text-align: left; +} + +.form-item-title:not(.no-after)::after { + content: "*"; + color: red; + font-size: 14px; + margin-left: 1px; + text-align: center; } .form-item-content { @@ -197,4 +216,194 @@ margin: 10px; padding: 10px; text-align: center; +} + +.confirm-btn { + background-color: green; + color: white; + font-size: 16px; + height: 40px; + border-radius: 10px; + text-align: center; +} + +.coupons-list-box { + display: flex; + flex-direction: column; + justify-content: center; + align-items: flex-start; +} + +.tickets { + display: flex; + padding: 5px; + width: 88vw; + box-sizing: border-box; +} + +.l-tickets { + width: 60vw; + position: relative; + padding: 10px; + background: radial-gradient(circle at right top, transparent 16rpx, #ffaa0017 0) right top / 100% 51% no-repeat, + radial-gradient(circle at right bottom, transparent 16rpx, #ffaa0017 0) right bottom / 100% 50% no-repeat; +} + + +.l-tickets::after { + content: ''; + position: absolute; + height: 100%; + width: 8rpx; + top: 0; + left: -8rpx; + background: radial-gradient(circle at left center, transparent 8rpx, #ffaa0017 0) left center / 8rpx 20rpx; +} + + + +.r-tickets { + flex: 1; + position: relative; + background: radial-gradient(circle at left top, transparent 16rpx, #ffaa0017 0, #ffaa0017 100%) right top / 100% 50% no-repeat, + radial-gradient(circle at left bottom, transparent 16rpx, #ffaa0017 0, #ffaa0017 100%) right bottom / 100% 50% no-repeat; + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + font-size: 14px; + font-weight: 500; + color: #5D3900; +} + +.r-tickets::after { + content: ''; + position: absolute; + height: 100%; + width: 8rpx; + top: 0; + right: -8rpx; + background: radial-gradient(circle at right center, transparent 8rpx, #ffaa0017 0) right center / 8rpx 20rpx; +} + +.r-tickets::before { + content: ''; + width: 1rpx; + background: linear-gradient(to top, #fff 0%, #fff 50%, transparent 50%) top left / 1rpx 20rpx repeat-y; + position: absolute; + left: 0; + top: 16rpx; + bottom: 16rpx; +} + +.ticket-container:nth-last-of-type(n+1) { + margin-top: 10px; +} + + +.ticket-title { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + font-size: 14px; + color: #5D3900; + font-weight: 400; +} + +.ticket-content { + font-size: 18px; + color: #5D3900; + text-align: center; + margin-top: 5px; + font-weight: 800; +} + +.ticket-desc { + font-size: 12px; + color: #5D3900; + margin-top: 10px; + font-weight: 400; +} + + +.coupons-item { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: center; + background-color: #ffaa0017; + border-radius: 10px; + width: 85vw; + padding: 10px 5px; +} + +.coupons-item:nth-last-of-type(n+1) { + margin-top: 10px; +} + +.coupons-item-content { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + flex: 1; +} + +.coupons-desc { + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: flex-start; + margin-left: 7px; +} + +.coupons-desc .title { + font-size: 16px; + color: red; +} + +.coupons-desc .dd { + font-size: 12px; + color: red; +} + +.counpons-check { + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; +} + +.counpons-check .txt { + font-size: 16px; + color: red; + font-weight: 600; +} + +.coupons-icon { + background-image: url('data:image/png;base64,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'); + background-size: contain; + background-repeat: no-repeat; +} + +/* 未选中状态 */ +.custom-radio .wx-radio-input { + border-color: #FFA900; + /* 自定义未选中时的边框颜色 */ + background-color: transparent; +} + +/* 选中状态 */ +.custom-radio .wx-radio-input.wx-radio-input-checked { + border-color: #FFA900; + /* 自定义选中时的边框颜色 */ + background: linear-gradient(to right, #FFA900, #ffaa007e); + /* 自定义选中时的背景颜色 */ +} + +/* 选中状态下的内部圆圈 */ +.custom-radio .wx-radio-input.wx-radio-input-checked::before { + color: #fff; + /* 自定义选中时内部圆圈的颜色 */ } \ No newline at end of file diff --git a/pages/copyright/payment/payment.wxml b/pages/copyright/payment/payment.wxml index 92f45ce..9e4bac6 100644 --- a/pages/copyright/payment/payment.wxml +++ b/pages/copyright/payment/payment.wxml @@ -1,13 +1,10 @@ - + - + - - - - + diff --git a/pages/login/login.js b/pages/login/login.js index 14bb4c7..6ca00ee 100644 --- a/pages/login/login.js +++ b/pages/login/login.js @@ -18,6 +18,12 @@ Page({ csaNo: '', isAgree: false, //是否同意协议 contactName: '', //联系人姓名 + errorHint: '', + showError: false, + successHint: '', + showSuccess: false, + infoHint: '', + showInfo: false, }, /** @@ -47,10 +53,9 @@ Page({ }) //1未绑定 0绑定 if (res.isNew == 1) { - wx.showToast({ - title: '为了给您带来更便捷、个性化的服务,需要您提供手机号,完成注册流程,请点击授权登录', - icon: 'none', - duration: 3000, + _self.setData({ + infoHint: '为了给您带来更便捷、个性化的服务,需要您提供手机号,完成注册流程,请点击授权登录', + showInfo: true }) } else { //保存token @@ -76,7 +81,7 @@ Page({ doShowExit() { wx.showModal({ title: '提示', - content: '您未授权,请重新打开小程序,进行授权', + content: '应用需授权才能运行,因未授权将退出.重新打开完成授权,就能继续体验.', showCancel: false, complete: (res) => { if (res.confirm) { @@ -185,9 +190,9 @@ Page({ //判断名称是否为空 const _self = this if (_self.data.contactName == '') { - wx.showToast({ - title: '请输入联系人姓名', - icon: 'error' + _self.setData({ + errorHint:'请输入联系人姓名', + showError:true }) return } diff --git a/pages/login/login.json b/pages/login/login.json index 1547c64..12cc79b 100644 --- a/pages/login/login.json +++ b/pages/login/login.json @@ -1,5 +1,6 @@ { "usingComponents": { - "mp-half-screen-dialog": "weui-miniprogram/half-screen-dialog/half-screen-dialog" + "mp-half-screen-dialog": "weui-miniprogram/half-screen-dialog/half-screen-dialog", + "mp-toptips": "weui-miniprogram/toptips/toptips" } } \ No newline at end of file diff --git a/pages/login/login.wxml b/pages/login/login.wxml index d22a067..6ec8beb 100644 --- a/pages/login/login.wxml +++ b/pages/login/login.wxml @@ -28,4 +28,7 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/static/images/banner_1.png b/static/images/banner_1.png new file mode 100755 index 0000000..27467e8 Binary files /dev/null and b/static/images/banner_1.png differ diff --git a/static/images/banner_2.png b/static/images/banner_2.png new file mode 100755 index 0000000..ca99d00 Binary files /dev/null and b/static/images/banner_2.png differ diff --git a/utils/comm.wxs b/utils/comm.wxs new file mode 100644 index 0000000..0a1758d --- /dev/null +++ b/utils/comm.wxs @@ -0,0 +1,9 @@ +var isEmpty = function (obj) { + if (obj == null) return true; + if (typeof obj !== 'object') return false; + return JSON.stringify(obj) === '{}'; +}; + +module.exports = { + isEmpty: isEmpty +}; \ No newline at end of file