diff --git a/README.md b/README.md index e93df0a..e090fe5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 移动端 文件列表 +# 移动端 文件列表 ~~~ . ├── App.vue 文件主入口 diff --git a/components/productWindow/index.vue b/components/productWindow/index.vue index dbb7c9e..b5e2fb7 100644 --- a/components/productWindow/index.vue +++ b/components/productWindow/index.vue @@ -151,14 +151,14 @@ getfenqilist(data).then(res => { this.fenqlist = res.data.list this.installments = res.data.list[0] //刚开始就赋值 - localStorage.setItem('installments',JSON.stringify(this.installments)) + this.$Cache.set('installments', this.installments); }) }, // 点击切换高亮 btnone(item, index) { this.indexs = index this.installments = item //点击后将内容赋值 - localStorage.setItem('installments',JSON.stringify(this.installments)) + this.$Cache.set('installments', this.installments); }, goCat: function() { diff --git a/config/app.js b/config/app.js index 34beea3..472b3a2 100644 --- a/config/app.js +++ b/config/app.js @@ -8,7 +8,7 @@ module.exports = { // HTTP_REQUEST_URL:'', HTTP_REQUEST_URL: domain, // H5商城地址 - HTTP_H5_URL: 'http://117.50.215.20:20410', + HTTP_H5_URL: 'http://117.50.215.20:20410/', // #endif // #ifdef H5 HTTP_REQUEST_URL:domain, diff --git a/manifest.json b/manifest.json index d894717..3f06f8f 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { - "name" : "crmeb", - "appid" : "__UNI__BF308B6", + "name" : "先享后付", + "appid" : "wx46c3a73d8c4f7051", //wxb74514b47a2f29d4 wx46c3a73d8c4f7051 __UNI__EB8A7B "description" : "crmeb商城", "versionName" : "2.1", "versionCode" : 2, @@ -47,34 +47,7 @@ "distribute" : { /* android打包配置 */ "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], + "permissions" : [], "abiFilters" : [ "armeabi-v7a" ], "permissionExternalStorage" : { "request" : "none", @@ -176,7 +149,13 @@ } }, "splashscreen" : { - "useOriginalMsgbox" : true + "useOriginalMsgbox" : true, + "androidStyle" : "default", + "android" : { + "hdpi" : "unpackage/res/icons/480.png", + "xhdpi" : "unpackage/res/icons/1242.png", + "xxhdpi" : "unpackage/res/icons/1082.png" + } } } }, @@ -184,7 +163,8 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wxcda5a2b1b98b6a95", + "appid" : "wx46c3a73d8c4f7051", + "libVersion" : "latest", "setting" : { "urlCheck" : false, "minified" : true, @@ -239,7 +219,7 @@ "async" : { "timeout" : 200000 }, - "title" : "CRMEB" + "title" : "先享后付" }, "plus" : { "statusbar" : { diff --git a/pages.json b/pages.json index fef231a..f727e09 100644 --- a/pages.json +++ b/pages.json @@ -645,6 +645,20 @@ } } }, + { + "path": "pay_success/index", + "style": { + "navigationBarTitleText": "支付成功", + "navigationStyle": "custom", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + }, { "path": "goods_logistics/index", "style": { diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index bd451d5..0b374f8 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -248,11 +248,11 @@ @showShare="showShare"> + @ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" id='product-window' + @getImg="showImg" @installments="installments"> @@ -657,6 +657,11 @@ uni.$emit('scroll'); }, methods: { + // + + + + // 请求分期列表 // getfqList: function() { // let data = { diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index 280d2d5..fe1cba2 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -376,6 +376,7 @@ this.getOrderInfo(); this.payMode[1].number = this.userInfo.nowMoney; this.$set(this, 'payMode', this.payMode); + } else { toLogin(); } @@ -504,6 +505,7 @@ that.$set(that, 'system_store', res.data.systemStore); that.$set(that, 'id', res.data.id); that.$set(that, 'cartInfo', res.data.orderInfoList); + console.log(this.orderInfo) if (res.data.refundStatus != 0) { that.isGoodsReturn = true; }; diff --git a/pages/users/installment/index.vue b/pages/users/installment/index.vue index a61c223..af619fa 100644 --- a/pages/users/installment/index.vue +++ b/pages/users/installment/index.vue @@ -3,12 +3,12 @@ - + - iPhone 14 Pro Max 现货 支持移动联通电信5q 双卡双待手... + {{cart[0].productName}} - 套餐: 256G 深空灰 到期买断 + 套餐: {{cart[0].sku}} 租期: {{num}}期 @@ -17,7 +17,7 @@ 间隔: 30天 - 数量: 1 + 数量: {{cart[0].payNum}} @@ -67,15 +67,17 @@ data() { return { installmentlist: [], + cart:[], hireshou: '', //首期租金 sum:0, num:0, //总租期 } }, onLoad(option) { + this.cart = JSON.parse(option.cart) this.installmentlist = JSON.parse(option.list) this.hireshou = this.installmentlist[0].repaymentAmount - // console.log(this.installmentlist) + }, methods: { // 返回上一页 @@ -117,6 +119,7 @@ image { width: 220rpx; height: 165rpx; + border-radius: 20rpx; } } diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index dcc5ee9..11ca29c 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -63,7 +63,7 @@ - 完善身份信息 + 完善身份信息   {{sfxx}} 填写资料 加速审核 @@ -149,29 +149,29 @@ 分期计划 - {{fenqiname}}{{installmentobj.name}} 首付金额 - ¥256.00 + ¥{{fenqiobj.downPaymentAmount}} 还款周期(间隔) - 7天 + {{fenqiobj.cycle}}天 还款期数 - 12 + {{fenqiobj.downPaymentNumber}} 每期还款 - ¥256.00 + ¥{{fenqiobj.repaymentAmount}} 合计付款 - ¥2561 + ¥{{fenqiobj.totalAmount}} + + + 紧急联系人 + {{lxrmorenadd}} + + + 联系人姓名 + + + 联系人手机 + + + + + + {{item}} + + @@ -128,6 +149,12 @@ emitext: '', //邮箱 shenfenpic: '', //身份证正面的base64格式 shenfenpics: '', //身份证反面的base64格式 + flaglxr:false, + flags:true, + lxrmorenadd:'请选择您与联系人的关系', + teladd:'', + realNameadd:'' + } }, onLoad() { @@ -180,6 +207,35 @@ }); } }, + 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(){ + let that = this + let namepatten = /^[\u4e00-\u9fa5a-zA-Z\s\-]+$/ + if (this.realNameadd == '') { + return that.$util.Tips({ + title: '姓名不能为空' + }); + } else if (namepatten.test(this.realNameadd)) { + + } else { + return that.$util.Tips({ + title: '请填写正确的姓名' + }); + } + }, // 判断身份证 idcardinp() { let result = /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)$/ @@ -259,6 +315,9 @@ openPopups(e) { this.$refs[e].open(); }, + openPopupadd(e){ + this.$refs[e].open(); + }, // 选择联系人关系 btnlxr(val) { this.lxrmoren = val @@ -266,7 +325,9 @@ btnlxrs(val) { this.lxrmorens = val }, - + btnlxradd(val){ + this.lxrmorenadd = val + }, // 判断邮箱 emitextinp() { let aqq = /^[1-9][0-9]{4,10}@qq.com$/ @@ -395,13 +456,18 @@ } getInformation(data).then(res => { let data = res.data; - console.log(data) + // 身份认证成功存储 + this.$Cache.set('improvescode', res.message); + uni.navigateBack({ + delta: 1 + }) }) }, // 点击继续添加联系人 btnadd() { - // console.log(this.$store.getters.uid) + this.flaglxr = true + this.flags = false }, @@ -482,7 +548,6 @@ padding: 20rpx 30rpx !important; box-sizing: border-box; color: gray; - view:hover { background-color: aqua; color: #000; @@ -521,7 +586,7 @@ background-color: rgb(228, 228, 228); padding: 20rpx; box-sizing: border-box; - font-size: 11px !important; + font-size: 12px !important; // 身份姓名手机号信息 .nameshenfen { @@ -639,7 +704,7 @@ border-bottom: 1px solid #ccc; .jinj { - width: 160rpx; + width:320rpx; } input { @@ -647,14 +712,14 @@ line-height: 80rpx; font-size: 11px; width: 45%; - margin-left: 80rpx; + margin-left: 100rpx; } .lianx { width: 100%; display: flex; justify-content: space-between; - margin-left: 80rpx; + // margin-left: 20rpx; text { margin-right: 80rpx; @@ -697,7 +762,7 @@ line-height: 80rpx; font-size: 11px; width: 45%; - margin-left: 80rpx; + margin-left: 100rpx; } .lianx { diff --git a/pages/users/pay_success/index.vue b/pages/users/pay_success/index.vue new file mode 100644 index 0000000..478f436 --- /dev/null +++ b/pages/users/pay_success/index.vue @@ -0,0 +1,110 @@ + + + + + \ No newline at end of file diff --git a/pages/users/repayment/index.vue b/pages/users/repayment/index.vue index 0b0b9da..7252842 100644 --- a/pages/users/repayment/index.vue +++ b/pages/users/repayment/index.vue @@ -1,8 +1,8 @@ @@ -84,7 +88,8 @@ box-sizing: border-box; padding-top: 108rpx; padding-bottom: 16rpx; - display: flex; + display: flex; + a { text-decoration: none; color: rgba(166, 166, 166, 1); @@ -109,7 +114,6 @@ color: rgba(33, 37, 41, 0.6); .yuqi { - // width: 80rpx; padding: 0 10rpx; box-sizing: border-box; height: 40rpx; @@ -128,10 +132,12 @@ color: rgba(33, 37, 41, 0.6); } - .rq {} + .rq { + line-height: 50rpx; + color: rgba(33, 37, 41, 0.6); + } + - line-height: 50rpx; - color: rgba(33, 37, 41, 0.6); } .rt { diff --git a/pages/users/user_info/index.vue b/pages/users/user_info/index.vue index 8a0aec2..ce51e11 100644 --- a/pages/users/user_info/index.vue +++ b/pages/users/user_info/index.vue @@ -198,6 +198,8 @@ outLogin: function() { let that = this; if (that.loginType == 'h5') { + // 点击退出登录替换身份验证,需要重新身份验证 + this.$Cache.set('improvescode', '操作失败'); uni.showModal({ title: '提示', content: '确认退出登录?', @@ -218,7 +220,7 @@ uni.hideLoading(); }); } else if (res.cancel) { - console.log('用户点击取消'); + // console.log('用户点击取消'); } } }); diff --git a/project.config.json b/project.config.json index 79069d1..cbf7736 100644 --- a/project.config.json +++ b/project.config.json @@ -1,5 +1,5 @@ { - "appid": "wxb74514b47a2f29d4", + "appid": "wx46c3a73d8c4f7051", //wx46c3a73d8c4f7051 wxb74514b47a2f29d4 "compileType": "miniprogram", "libVersion": "3.3.1", "packOptions": { diff --git a/static/images/succeed.png b/static/images/succeed.png new file mode 100644 index 0000000..7fb7bd9 Binary files /dev/null and b/static/images/succeed.png differ diff --git a/static/images/success.png b/static/images/success.png new file mode 100644 index 0000000..013d225 Binary files /dev/null and b/static/images/success.png differ