From 0c4f3965996d84ab31a7617a292a25d6a047b00e Mon Sep 17 00:00:00 2001 From: "3321822538@qq.com" <3321822538@qq.com> Date: Sat, 27 Jan 2024 17:03:34 +0800 Subject: [PATCH] =?UTF-8?q?'=E6=9B=B4=E6=96=B0=E4=BA=86'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 10 +- api/user.js | 2 +- components/orderGoods/index.vue | 4 +- config/app.js | 4 +- manifest.json | 3 +- .../activity/goods_bargain_details/index.vue | 4 +- .../activity/goods_seckill_details/index.vue | 14 +- pages/order_addcart/order_addcart.vue | 8 +- pages/order_details/index.vue | 25 +- pages/user/index.vue | 20 +- pages/users/installment/index.vue | 18 +- pages/users/order_confirm/index.vue | 75 ++-- pages/users/order_improves/index.vue | 345 ++++++++++-------- pages/users/order_list/index.vue | 2 +- pages/users/pay_success/index.vue | 205 +++++++---- static/html/pc.html | 6 +- 16 files changed, 445 insertions(+), 300 deletions(-) diff --git a/App.vue b/App.vue index f26b4ba..c4a890f 100644 --- a/App.vue +++ b/App.vue @@ -24,7 +24,7 @@ export default { globalData: { spread: 0, //推广人id - channelId:0, + channelId:0, //通道id code: 0, isLogin: false, userInfo: {}, @@ -116,13 +116,15 @@ case 1001: //直接进入小程序 let value = this.$util.getUrlParams(decodeURIComponent(option.query.scene)); that.globalData.spread = value.spread?value.spread:''; - // that.globalData.channelId = value.channelId?value.channelId:''; + // 通道id + that.globalData.channelId = value.channelId?value.channelId:''; that.globalData = this.$util.formatMpQrCodeData(value); break; } } if (option.spread) that.globalData.spread = option.spread; - // if (option.channelId) that.globalData.channelId = option.channelId; + // 通道id + if (option.channelId) that.globalData.channelId = option.channelId; // #endif // 获取导航高度； uni.getSystemInfo({ @@ -157,6 +159,8 @@ // 存储静默授权code uni.setStorageSync('snsapiCode', code); let spread = that.globalData.spread ? that.globalData.spread : 0; + // 通道id + let channelId = that.globalData.channelId ? that.globalData.channelId : 0; Auth.auth(code, that.$Cache.get('SPREAD')) .then(res => { uni.setStorageSync('snRouter', decodeURIComponent(decodeURIComponent(option.query diff --git a/api/user.js b/api/user.js index 79c9860..4a71f76 100644 --- a/api/user.js +++ b/api/user.js @@ -382,7 +382,7 @@ export function spread(puid) return request.get("user/bindSpread?spreadPid="+ puid); } /** -// * 静默绑定推广人@description +// * 静默绑定推广人 // * @param {Object} channelId // */ export function channel(channelId) diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue index d041264..1394133 100644 --- a/components/orderGoods/index.vue +++ b/components/orderGoods/index.vue @@ -83,10 +83,10 @@ }) }, jumpCon: function(id) { - let type = this.productType==0?'normal':'video' + // let type = this.productType==0?'normal':'video' if (this.jump) { uni.navigateTo({ - url: `/pages/goods_details/index?id=${id}&type=${type}` + url: `/pages/goods_details/index?id=${id}&type=${'normal'}` }) } } diff --git a/config/app.js b/config/app.js index 211ce2f..a7a2179 100644 --- a/config/app.js +++ b/config/app.js @@ -2,13 +2,15 @@ // let domain = 'http://117.50.163.143:20410' // let domain = 'http://117.50.215.20:20410' let domain = 'http://192.168.2.14:8081' +// let domain = 'http://106.75.49.247:20410' + module.exports = { // 请求域名 格式： https://您的域名 // #ifdef MP || APP-PLUS // HTTP_REQUEST_URL:'', HTTP_REQUEST_URL: domain, // H5商城地址 - // HTTP_H5_URL: 'http://117.50.215.20:20410', + // HTTP_H5_URL: 'http://106.75.49.247:20410', HTTP_H5_URL: 'http://192.168.2.14:8081', // #endif // #ifdef H5 diff --git a/manifest.json b/manifest.json index 6ca047a..0cd85f5 100644 --- a/manifest.json +++ b/manifest.json @@ -219,7 +219,8 @@ "async" : { "timeout" : 200000 }, - "title" : "先享后付" + "title" : "先享后付", + "template" : "template.html" }, "plus" : { "statusbar" : { diff --git a/pages/activity/goods_bargain_details/index.vue b/pages/activity/goods_bargain_details/index.vue index 88f3d79..53d96de 100644 --- a/pages/activity/goods_bargain_details/index.vue +++ b/pages/activity/goods_bargain_details/index.vue @@ -494,6 +494,8 @@ // 链接进入获取绑定关系id if(options.spread) app.globalData.spread = options.spread; + // 通道id + // if(options.channelId) app.globalData.channelId = options.channelId; var pages = getCurrentPages(); if (pages.length <= 1) { @@ -509,7 +511,7 @@ this.id = app.globalData.id }else{ this.id = options.id; - } + } } options.startBargainUid == 'undefined' ? that.startBargainUid = 0 : that.startBargainUid = Number(options .startBargainUid); diff --git a/pages/activity/goods_seckill_details/index.vue b/pages/activity/goods_seckill_details/index.vue index 87abeaf..477da32 100644 --- a/pages/activity/goods_seckill_details/index.vue +++ b/pages/activity/goods_seckill_details/index.vue @@ -272,13 +272,13 @@ } from '@/libs/login.js'; import { silenceBindingSpread } from "@/utils"; import { spread } from "@/api/user"; - export default { - data() { - return { - showSkeleton: true, //骨架屏显示隐藏 - isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取 - bgColor: { - 'bgColor': '#333333', + export default{ + data() { + return{ + showSkeleton: true, //骨架屏显示隐藏 + isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取 + bgColor:{ + 'bgColor': '#333333', 'Color': '#fff', 'isDay': true, 'width': '44rpx', diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue index 1c42283..e8ff2c4 100644 --- a/pages/order_addcart/order_addcart.vue +++ b/pages/order_addcart/order_addcart.vue @@ -393,7 +393,7 @@ let that = this; that.cartId = item.id; that.product_id = item.productId; - getProductDetail(item.productId).then(res => { + getProductDetail(item.productId).then(res => { uni.hideLoading(); that.attr.cartAttr = true; let productInfo = res.data.productInfo; @@ -504,8 +504,7 @@ } }, attrVal(val) { - this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attrValues[val - .indexn]); + this.$set(this.attr.productAttr[val.indexw], 'index', this.attr.productAttr[val.indexw].attrValues[val.indexn]); }, /** * 购物车数量加和数量减 @@ -966,8 +965,7 @@ link: location.href, imgUrl: data.img }; - that.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData"], - configAppMessage); + that.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData"],configAppMessage); } }, returns: function() { diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index bd65014..980428d 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -3,10 +3,10 @@ - - + + {{orderInfo.orderStatusMsg}} {{orderInfo.refundReasonTime}} @@ -107,8 +107,10 @@ {{orderInfo.systemStore?orderInfo.systemStore.address + orderInfo.systemStore.detailedAddress:''}} - + + + +
联系客服 @@ -420,7 +422,8 @@ if(this.$wechat.isWeixin()) this.payMode.pop(); // #endif }, - methods: { + methods: { + // 点击立即签约 lijiqys(id, ids) { this.$Cache.set('qyids', id) @@ -553,8 +556,7 @@ if (res.data.refundStatus != 0) { that.isGoodsReturn = true; }; - if (that.orderInfo.shippingType == 2 && that.orderInfo.paid) that.markCode(res.data - .verifyCode); + if (that.orderInfo.shippingType == 2 && that.orderInfo.paid) that.markCode(res.data.verifyCode); if(that.orderInfo.refundStatus>0){ uni.setNavigationBarColor({ frontColor: '#fff', @@ -778,7 +780,12 @@ transform: translateX(-50%); } - + #boxss{ + display: block; + text-align: center; + padding-top: 50rpx; + box-sizing: border-box; + } .qs-btn { width: auto; diff --git a/pages/user/index.vue b/pages/user/index.vue index df82049..fa70eef 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -29,7 +29,7 @@ - + {{realname}} @@ -247,7 +247,8 @@ telephone_service_switch: '0' }, //客服配置 userInfo: {}, - copyImage: '' //版权图片 + copyImage: '', //版权图片 + identification:{} } }, onLoad() { @@ -315,6 +316,7 @@ // #endif }, methods: { + // 查询是否进行过身份保存 getidentityq:function(){ let data = { @@ -323,10 +325,16 @@ getidentity(data).then(res=>{ if (res.message == '操作成功') { this.realname = '已实名' + this.identification = res.data } }) }, - + // 点击跳转到身份信息 + btnreal(){ + uni.navigateTo({ + url: '/pages/users/order_improves/index?identification=' + JSON.stringify(this.identification), + }) + }, //校验token是否有效,true为有效，false为无效 getTokenIsExist() { tokenIsExistApi().then(res => { @@ -555,6 +563,9 @@ border-radius: 20rpx; font-size: 12px; color: #fff; + position: absolute; + top: -10rpx; + right: 0; } page, body { @@ -672,7 +683,7 @@ align-items: center; font-size: 26rpx; color: rgba(255, 255, 255, 0.6); - + position: relative; image { width: 22rpx; height: 23rpx; @@ -698,6 +709,7 @@ .num { font-size: 42rpx; font-weight: bold; + } .txt { diff --git a/pages/users/installment/index.vue b/pages/users/installment/index.vue index 556e1cc..304ad40 100644 --- a/pages/users/installment/index.vue +++ b/pages/users/installment/index.vue @@ -29,16 +29,16 @@ 首期租金 - + ￥{{sum}} - 销售金额 + 总金额 @@ -48,10 +48,10 @@ 分期方式 间隔：{{fenqiobj.cycle}}天 - 期数 租期 每期租金 + 期数 还款日期 还款金额 - 第{{item.installmentNumber}}期 间隔：{{fenqiobj.cycle}}天 {{item.repaymentAmount}} + 第{{item.installmentNumber}}/{{installmentlist.length}}期 日期：{{item.repaymentDeadlineStr}} ￥{{item.repaymentAmount}} @@ -70,7 +70,7 @@ cart:[], hireshou: '', //首期租金 sum:0, - num:0, //总租期 + num:0, //总金额 fenqiobj:{} } }, @@ -78,9 +78,9 @@ this.fenqiobj = JSON.parse((option.fenqiobj)) this.cart = JSON.parse(option.cart) this.installmentlist = JSON.parse(option.list) + console.log(this.installmentlist) this.hireshou = this.installmentlist[0].repaymentAmount - }, methods: { // 返回上一页 @@ -232,7 +232,9 @@ height: 140rpx; padding-top: 36rpx; box-sizing: border-box; - + position: fixed; + bottom: 0; + left: 0; a { text-decoration: none; color: #fff; diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index 48bc8b8..53a0b47 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -67,13 +67,13 @@ 填写资料 加速审核 - + - + @@ -96,7 +96,7 @@ + :disabled="orderInfoVo.userIntegral==0 && !useIntegral" @click="btnjf" /> @@ -144,7 +144,7 @@ value="" name="mark" placeholder='请添加备注（150字以内）'> - + @@ -402,7 +402,9 @@ installmentobj: {}, downPaymentAmount: 0, totalAmount: 0, - identification:{} //获取是否存有身份信息 + identification:{}, //获取是否存有身份信息 + zongmey:'', + }; }, @@ -454,15 +456,14 @@ // this.installmentid = JSON.parse(localStorage.getItem('installments')).id // this.fenqiname = JSON.parse(localStorage.getItem('installments')).name this.installmentobj = JSON.parse(this.$Cache.get('installments')) - this.getinstallmentpost() - this.getidentityq() + }, /** * 生命周期函数--监听页面显示 */ onShow: function() { // console.log(this.$Cache.get('improvescode')) - + this.getidentityq() let _this = this // wx.getLaunchOptionsSync this.textareaStatus = true; @@ -479,12 +480,11 @@ }, methods: { - // 页面加载请求分期计划 getinstallmentpost: function() { let data = { - preOrderNo: this.preOrderNo, - uid: this.$store.getters.uid, + payFee: this.zongmey, + // uid: this.$store.getters.uid, comboId: this.installmentobj.id } getinstallment(data).then(res => { @@ -496,6 +496,13 @@ this.totalAmount = parseFloat(this.totalAmount).toFixed(2) }) }, + // 点击积分重新请求 + btnjf(){ + // this.zongmey = this.orderInfoVo.payFee + this.getinstallmentpost() + }, + + // 跳转到分期计划 btnment() { uni.navigateTo({ @@ -517,6 +524,11 @@ getloadPreOrder: function() { loadPreOrderApi(this.preOrderNo).then(res => { let orderInfoVo = res.data.orderInfoVo; + this.zongmey = orderInfoVo.payFee + // console.log(this.zongmey,11) + this.getinstallmentpost() + + this.orderInfoVo = orderInfoVo; this.shopmey = this.orderInfoVo.proTotalFee //商品金额 if (orderInfoVo.addressId && this.addressChangeId === 0) { @@ -596,7 +608,10 @@ this.orderInfoVo.useIntegral = data.useIntegral; this.orderInfoVo.usedIntegral = data.usedIntegral; this.orderInfoVo.surplusIntegral = data.surplusIntegral; - //this.orderInfoVo.userIntegral = data.userIntegral; + // console.log(this.orderInfoVo.payFee,11) + this.zongmey = this.orderInfoVo.payFee + this.getinstallmentpost() + }).catch(err => { return this.$util.Tips({ title: err @@ -712,6 +727,12 @@ that.car(); }, 500); }, + // 点击优惠卷 + btnyhq(){ + this.zongmey = this.orderInfoVo.payFee + console.log(111) + this.getinstallmentpost() + }, couponTap: function() { this.coupon.coupon = true; if (!this.coupon.list.length) this.getCouponList(); @@ -1074,9 +1095,6 @@ // 点击选中 btncheaced() { - // uni.navigateTo({ - // url:'/pages/users/signin/index' - // }) if (this.checkeds) { this.checkeds = false } else { @@ -1102,15 +1120,7 @@ let that = this, data = {}; var aqq = /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/ - if (this.emitext == '') { - return this.$util.Tips({ - title: '邮箱不能为空' - }); - } else if (!aqq.test(this.emitext)) { - return this.$util.Tips({ - title: '请填写正确的邮箱' - }); - } else if (this.checkeds == false) { + if (this.checkeds == false) { return this.$util.Tips({ title: '请勾选并同意政策' }); @@ -1118,7 +1128,11 @@ return this.$util.Tips({ title: '请填写身份信息' }); - } else { + } else if(!that.addressId && !that.shippingType){ + return that.$util.Tips({ + title: '请选择收货地址' + }); + }else{ data = { realName: that.contacts, phone: that.contactsTel, @@ -1150,17 +1164,18 @@ // #ifndef MP that.payment(data); // #endif - + + // 获取当前时间 let now = new Date(); let year = now.getFullYear(); // 获取年份 let month = now.getMonth() + 1; // 获取月份（注意，月份从0开始计数，所以需要加1） let day = now.getDate(); // 获取日期 let shi = now.toLocaleTimeString(); // 获取本地时间字符串 this.timeString = year + '-' + month + '-' + day + ' ' + shi - this.shopobj.shopmey = this.shopmey + this.shopobj.shopmey = this.orderInfoVo.payFee this.shopobj.date = this.timeString this.shopobj.orderNo = this.preOrderNo - + console.log(this.shopobj) uni.navigateTo({ url: '/pages/users/pay_success/index?shopobj=' + JSON.stringify(this.shopobj) }) @@ -1587,7 +1602,7 @@ .identity { width: 100%; display: flex; - padding: 0 13px; + padding: 0 26rpx; border-bottom: 1px solid #F5F5F5; height: 120rpx; // line-height: 120rpx; diff --git a/pages/users/order_improves/index.vue b/pages/users/order_improves/index.vue index 8fd5f6f..c7493c7 100644 --- a/pages/users/order_improves/index.vue +++ b/pages/users/order_improves/index.vue @@ -7,16 +7,16 @@ 真实姓名 - 身份证号 + 身份证号 - 手机号码 + 手机号码 - 请上传本人真实有效的身份证原件 未带身份证原件 + 请上传本人真实有效的身份证原件 上传身份证原件 @@ -89,7 +89,7 @@ - + @@ -105,15 +105,15 @@ 联系人手机 - - + - 继续添加(有助于提高审核成功率) - + + + + 继续添加(有助于提高审核成功率) + + - - - - + + + - + 确定 @@ -174,69 +174,69 @@ telone: '', teltwo: '', telthre: '', - lxrarr: ['父母', '子女', '兄弟', '姐妹','亲戚','朋友','配偶','同事'], + lxrarr: ['父母', '子女', '兄弟', '姐妹', '亲戚', '朋友', '配偶', '同事'], lxrmoren: '请选择您与联系人的关系 ', lxrmorens: '请选择您与联系人的关系 ', emitext: '', //邮箱 shenfenpic: '', //身份证正面的base64格式 shenfenpics: '', //身份证反面的base64格式 - flaglxr:false, - flaglxrs:false, - flags:true, - lxrmorenadd:'请选择您与联系人的关系 ', - lxrmorenadds:'请选择您与联系人的关系', - teladd:'', - teladds:'', - realNameadd:'', - realNameadds:'', - flaga:false, - personflag:false, - personflaga:false, - personflagb:false, - identification:{}, - lxindex:'',//紧急联系人关系 - lxindexs:'', + flaglxr: false, + flaglxrs: false, + flags: true, + lxrmorenadd: '请选择您与联系人的关系 ', + lxrmorenadds: '请选择您与联系人的关系', + teladd: '', + teladds: '', + realNameadd: '', + realNameadds: '', + flaga: false, + personflag: false, + personflaga: false, + personflagb: false, + identification: {}, + lxindex: '', //紧急联系人关系 + lxindexs: '', } }, onLoad(option) { // 进来判断是否有无保存过身份信息 - if(JSON.parse(option.identification)){ + if (JSON.parse(option.identification)) { this.identification = JSON.parse(option.identification) this.realName = this.identification.realName - this.idcard = this.identification.idCardNumber + this.idcard = this.identification.idCardNumber this.tel = this.identification.commonPhoneNumber - this.upLoadPositiveImg = this.identification.idCardBackPhoto.slice(21) - this.upLoadReverseImg = this.identification.idCardFrontPhoto + this.upLoadReverseImg = this.identification.idCardBackPhoto.slice(21) + this.upLoadPositiveImg = this.identification.idCardFrontPhoto.slice(21) this.emitext = this.identification.email - this.telthre = this.identification.phoneNumber + // this.telthre = this.identification.phoneNumber this.lxindex = this.identification.userEmergencyContactsList[0].relationship this.realNameone = this.identification.userEmergencyContactsList[0].contactName this.telone = this.identification.userEmergencyContactsList[0].phoneNumber this.lxindexs = this.identification.userEmergencyContactsList[1].relationship this.realNametwo = this.identification.userEmergencyContactsList[1].contactName this.teltwo = this.identification.userEmergencyContactsList[1].phoneNumber - if(this.lxindex == 0 || this.lxindexs == 0){ + if (this.lxindex == 0 || this.lxindexs == 0) { this.lxrmoren = '父母' this.lxrmorens = '父母' - }else if(this.lxindex == 1 || this.lxindexs == 1){ + } else if (this.lxindex == 1 || this.lxindexs == 1) { this.lxrmoren = '子女' this.lxrmorens = '子女' - }else if(this.lxindex == 2 || this.lxindexs == 2){ + } else if (this.lxindex == 2 || this.lxindexs == 2) { this.lxrmoren = '兄弟' this.lxrmorens = '兄弟' - }else if(this.lxindex == 3 || this.lxindexs == 3){ + } else if (this.lxindex == 3 || this.lxindexs == 3) { this.lxrmoren = '姐妹' this.lxrmorens = '姐妹' - }else if(this.lxindex == 4 || this.lxindexs == 4){ + } else if (this.lxindex == 4 || this.lxindexs == 4) { this.lxrmoren = '亲戚' this.lxrmorens = '亲戚' - }else if(this.lxindex == 5 || this.lxindexs == 5){ + } else if (this.lxindex == 5 || this.lxindexs == 5) { this.lxrmoren = '朋友' this.lxrmorens = '朋友' - }else if(this.lxindex == 6 || this.lxindexs == 6){ + } else if (this.lxindex == 6 || this.lxindexs == 6) { this.lxrmoren = '配偶' this.lxrmorens = '配偶' - }else if(this.lxindex == 7 || this.lxindexs == 7){ + } else if (this.lxindex == 7 || this.lxindexs == 7) { this.lxrmoren = '同事' this.lxrmorens = '同事' } @@ -291,21 +291,21 @@ }); } }, - telinpadd(){ + telinpadd() { let photopatten = /^1[3456789]\d{9}$/ if (this.teladd == '') { return this.$util.Tips({ title: '手机号不能为空' }); } else if (photopatten.test(this.teladd)) { - + } else { return this.$util.Tips({ title: '请填写正确的手机号' }); } }, - realNameinpadd(){ + realNameinpadd() { let that = this let namepatten = /^[\u4e00-\u9fa5a-zA-Z\s\-]+$/ if (this.realNameadd == '') { @@ -313,7 +313,7 @@ title: '姓名不能为空' }); } else if (namepatten.test(this.realNameadd)) { - + } else { return that.$util.Tips({ title: '请填写正确的姓名' @@ -321,7 +321,7 @@ } }, // 4 - realNameinpadds(){ + realNameinpadds() { let that = this let namepatten = /^[\u4e00-\u9fa5a-zA-Z\s\-]+$/ if (this.realNameadds == '') { @@ -329,21 +329,21 @@ title: '姓名不能为空' }); } else if (namepatten.test(this.realNameadds)) { - + } else { return that.$util.Tips({ title: '请填写正确的姓名' }); } }, - telinpadds(){ + telinpadds() { let photopatten = /^1[3456789]\d{9}$/ if (this.teladds == '') { return this.$util.Tips({ title: '手机号不能为空' }); } else if (photopatten.test(this.teladds)) { - + } else { return this.$util.Tips({ title: '请填写正确的手机号' @@ -351,20 +351,20 @@ } }, // 判断身份证 - idcardinp() { - let result = /^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}([0-9]|X)$/ - if (this.idcard == '') { - return this.$util.Tips({ - title: '身份证不能为空' - }); - } else if (result.test(this.idcard)) { + // idcardinp() { + // let result = /^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}([0-9]|X)$/ + // if (this.idcard == '') { + // return this.$util.Tips({ + // title: '身份证不能为空' + // }); + // } else if (result.test(this.idcard)) { - } else { - return this.$util.Tips({ - title: '请填写正确的身份证' - }); - } - }, + // } else { + // return this.$util.Tips({ + // title: '请填写正确的身份证' + // }); + // } + // }, // 判断手机号 telinp() { let photopatten = /^1[3456789]\d{9}$/ @@ -408,20 +408,20 @@ }); } }, - telinpthre() { - let photopatten = /^1[3456789]\d{9}$/ - if (this.telthre == '') { - return this.$util.Tips({ - title: '常用手机号不能为空' - }); - } else if (photopatten.test(this.telthre)) { + // telinpthre() { + // let photopatten = /^1[3456789]\d{9}$/ + // if (this.telthre == '') { + // return this.$util.Tips({ + // title: '常用手机号不能为空' + // }); + // } else if (photopatten.test(this.telthre)) { - } else { - return this.$util.Tips({ - title: '请填写正确的手机号' - }); - } - }, + // } else { + // return this.$util.Tips({ + // title: '请填写正确的手机号' + // }); + // } + // }, // 点击显示联系人关系 openPopup(e) { this.$refs[e].open(); @@ -431,50 +431,44 @@ this.$refs[e].open(); this.personflaga = true }, - openPopupadd(e){ + openPopupadd(e) { this.$refs[e].open(); this.personflagb = true }, - + // 选择联系人关系 - btnlxr(val,index) { + btnlxr(val, index) { this.lxindex = index this.lxrmoren = val - if(this.lxrmoren == this.lxrmorens ||this.lxrmoren == this.lxrmorenadd || this.lxrmorens == this.lxrmorenadd){ - return this.$util.Tips({ - title: '紧急联系人关系重复' - }); - }else{ - this.personflag = false - } + this.personflag = false }, - btnlxrs(val,index) { + btnlxrs(val, index) { this.lxindexs = index this.lxrmorens = val this.personflaga = false }, - btnlxradd(val){ + btnlxradd(val) { this.lxrmorenadd = val this.personflagb = false }, // 判断邮箱 - emitextinp() { - let aqq = /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/ - if (this.emitext == '') { - return this.$util.Tips({ - title: '常用邮箱不能为空' - }); - } else if (!aqq.test(this.emitext)) { - return this.$util.Tips({ - title: '请填写正确的邮箱' - }); - } - }, + // emitextinp() { + // let aqq = /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/ + // if (this.emitext == '') { + // return this.$util.Tips({ + // title: '常用邮箱不能为空' + // }); + // } else if (!aqq.test(this.emitext)) { + // return this.$util.Tips({ + // title: '请填写正确的邮箱' + // }); + // } + // }, // 点击确定调用判断 btnclick() { let namepatten = /^[\u4e00-\u9fa5a-zA-Z\s\-]+$/ //姓名正则 - let result = /^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}([0-9]|X)$/ //身份证正则 + let result = /^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dX]$/ //身份证正则 let photopatten = /^1[3456789]\d{9}$/ //手机号正则 let aqq = /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/ //邮箱正则 if (this.realName == '') { @@ -489,10 +483,6 @@ return this.$util.Tips({ title: '身份证不能为空' }) - } else if (!result.test(this.idcard)) { - return this.$util.Tips({ - title: '请填写正确的身份证' - }); } else if (this.tel == '') { return this.$util.Tips({ title: '手机号不能为空' @@ -556,69 +546,109 @@ return this.$util.Tips({ title: '请填写正确的邮箱' }); - } else if (this.telthre == '') { - return this.$util.Tips({ - title: '常用手机号不能为空' - }); - } else if (!photopatten.test(this.telthre)) { - return this.$util.Tips({ - title: '请填写正确的手机号' - }); - }else if(this.lxrmoren == '' || this.lxrmorens == ''){ + }else if (this.lxrmoren == '' || this.lxrmorens == '') { return this.$util.Tips({ title: '紧急联系人关系不能为空' }) - }else{ - this.getList() + } else if (this.idcard == '') { return this.$util.Tips({ - title: '申请成功', + title: '身份证不能为空' + }); + } else if (!result.test(this.idcard)) { + return this.$util.Tips({ + title: '请填写正确的身份证' + }); + }else if(this.flaglxr == true){ + if(this.realNameadd == ''){ + return this.$util.Tips({ + title: '紧急联系人姓名不能为空' + }); + }else if(!namepatten.test(this.realNameadd)){ + return this.$util.Tips({ + title: '请输入紧急联系人正确姓名' + }); + }else if(this.teladd == ''){ + return this.$util.Tips({ + title: '紧急联系人手机号不能为空' + }); + }else if(!photopatten.test(this.teladd)){ + return this.$util.Tips({ + title: '请输入正确紧急联系人手机号' + }); + }else if(this.lxrmorenadd == '请选择您与联系人的关系 '){ + return this.$util.Tips({ + title: '请选择紧急联系人与您的关系' + }); + }else{ + let data = { + realName: this.realName, + idCardNumber: this.idcard, + phoneNumber: this.tel, + idCardFrontPhoto: this.upLoadPositiveImg, + idCardBackPhoto: this.upLoadReverseImg, + email: this.emitext, + commonPhoneNumber: this.tel, + uid: this.$store.getters.uid, + userEmergencyContactsList: [{ + relationship: this.lxindex, //与紧急联系人关系 + contactName: this.realNameone, //紧急联系人姓名 + phoneNumber: this.telone, //紧急联系人手机号 + }, + { + relationship: this.lxindexs, //与紧急联系人关系 + contactName: this.realNametwo, //紧急联系人姓名 + phoneNumber: this.teltwo, //紧急联系人手机号 + } + ] + } + getInformation(data).then(res => { + let data = res.data + uni.navigateBack() + }) + } + }else{ + // 请求保存个人信息 + let data = { + realName: this.realName, + idCardNumber: this.idcard, + phoneNumber: this.tel, + idCardFrontPhoto: this.upLoadPositiveImg, + idCardBackPhoto: this.upLoadReverseImg, + email: this.emitext, + commonPhoneNumber: this.tel, + uid: this.$store.getters.uid, + userEmergencyContactsList: [{ + relationship: this.lxindex, //与紧急联系人关系 + contactName: this.realNameone, //紧急联系人姓名 + phoneNumber: this.telone, //紧急联系人手机号 + }, + { + relationship: this.lxindexs, //与紧急联系人关系 + contactName: this.realNametwo, //紧急联系人姓名 + phoneNumber: this.teltwo, //紧急联系人手机号 + } + ] + } + getInformation(data).then(res => { + let data = res.data + uni.navigateBack() }) } }, - // 请求保存个人信息 - getList: function() { - let data = { - realName: this.realName, - idCardNumber: this.idcard, - phoneNumber: this.tel, - idCardFrontPhoto: this.upLoadPositiveImg, - idCardBackPhoto: this.upLoadReverseImg, - email: this.emitext, - commonPhoneNumber: this.telthre, - uid: this.$store.getters.uid, - userEmergencyContactsList:[ - { - relationship:this.lxindex ,//与紧急联系人关系 - contactName: this.realNameone,//紧急联系人姓名 - phoneNumber: this.telone,//紧急联系人手机号 - }, - { - relationship:this.lxindexs ,//与紧急联系人关系 - contactName: this.realNametwo,//紧急联系人姓名 - phoneNumber: this.teltwo,//紧急联系人手机号 - } - ] - } - getInformation(data).then(res => { - let data = res.data; - // 身份认证成功存储 - // this.$Cache.set('improvescode', res.message); - uni.navigateBack() - }) - }, + // 点击继续添加联系人 btnadd() { - this.flaglxr = true - this.flags = false - this.flaga = true + this.flaglxr = true + this.flags = false + this.flaga = true }, // 点击继续添加联系人 btnadds() { - this.flaga = false - this.flaglxrs = true + this.flaga = false + this.flaglxrs = true }, - + @@ -698,6 +728,7 @@ padding: 20rpx 30rpx !important; box-sizing: border-box; color: gray; + view:hover { background-color: aqua; color: #000; @@ -854,7 +885,7 @@ border-bottom: 1px solid #ccc; .jinj { - width:320rpx; + width: 320rpx; } input { diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue index 71209f6..5284071 100644 --- a/pages/users/order_list/index.vue +++ b/pages/users/order_list/index.vue @@ -35,7 +35,7 @@ 使用中 - {{orderData.evaluatedCount || 0}} + {{orderData.inUseCount || 0}} 已完成 diff --git a/pages/users/pay_success/index.vue b/pages/users/pay_success/index.vue index 872db20..d35e8d0 100644 --- a/pages/users/pay_success/index.vue +++ b/pages/users/pay_success/index.vue @@ -3,7 +3,7 @@ - 申请成功，请等待审核 + 申请成功，请等待审核 @@ -22,6 +22,12 @@ 查看订单 返回首页 + + + + + 正在生成订单中，请稍等... + @@ -29,86 +35,149 @@ export default { data() { return { - shopobj:{}, - ordermo:'' + shopobj: {}, + ordermo: '', + logoflag:true, + logoicon: 'https://www.bing.com/th/id/OGC.2a900b3c36d322151e95758438f7969c?pid=1.7&rurl=http%3a%2f%2fimg.zcool.cn%2fcommunity%2f014d8456df99c332f875520fefa07d.gif&ehk=UeVN2KesER9OKAkq%2fTigaUKsvSNK%2bndZDjePMEecfmQ%3d', + } }, onLoad(option) { this.shopobj = JSON.parse(option.shopobj) + this.timer = setInterval(() => { + this.ordermo = this.$Cache.get('ordernobh') + this.logoflag = false + console.log(this.ordermo) + }, 3000); // 定时器时间设置为1秒 }, onShow() { - this.ordermo = this.$Cache.get('ordernobh') + + }, + onUnload() { + // 页面卸载时清除定时器 + clearTimeout(this.timer); + }, + onBeforeUnload() { + // 页面跳转前清除定时器 + clearInterval(this.timer); + }, + created() { + }, methods: { - + }, mounted() { - + } } - - \ No newline at end of file diff --git a/static/html/pc.html b/static/html/pc.html index 148189d..d3d9929 100644 --- a/static/html/pc.html +++ b/static/html/pc.html @@ -4,9 +4,11 @@ - CRMEB + 益瑞宝 - + + +