diff --git a/api/api.js b/api/api.js index 0374464..84094f2 100644 --- a/api/api.js +++ b/api/api.js @@ -357,4 +357,11 @@ export function getinstallment(data) { return request.get('order/getPreInstallmentBill', data, { noAuth: true }); -} \ No newline at end of file +} + + // 查询签约是否成功 +// export function getqytrue(data) { +// return request.get('order/getSignResult/',data,{ +// noAuth: true +// }) +// } \ No newline at end of file diff --git a/api/order.js b/api/order.js index 209d682..0c445ba 100644 --- a/api/order.js +++ b/api/order.js @@ -140,6 +140,19 @@ export function orderTake(uni) { id: uni }, {}, 1); } +/** + * 订单收货 + * @param string uni + * + */ +// 立即签约请求 +export function getnowqy(uni) { + return request.post('order/signContract/' + uni, { + // id:uni + }); +} + + /** * 订单查询物流信息 @@ -225,6 +238,14 @@ export function wechatQueryPayResult(data) { return request.get('pay/queryPayResult?orderNo=' + data); } +/** + * 签约查询 + * @param object data + */ +export function getqianyue(data) { + return request.get('order/getSignResult/' + data); +} + /** * 支付宝查询支付结果 * @param object data diff --git a/config/app.js b/config/app.js index 472b3a2..4ba4d10 100644 --- a/config/app.js +++ b/config/app.js @@ -1,14 +1,15 @@ //移动端商城API // let domain = 'http://117.50.163.143:20410' -let domain = 'http://117.50.215.20:20410' - +let domain = 'http://117.50.215.20:20410' +// let domain = 'http://192.168.2.14:8081' 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://117.50.215.20:20410', + // HTTP_H5_URL: 'http://192.168.2.14:8081', // #endif // #ifdef H5 HTTP_REQUEST_URL:domain, diff --git a/manifest.json b/manifest.json index 3f06f8f..6ca047a 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "先享后付", - "appid" : "wx46c3a73d8c4f7051", //wxb74514b47a2f29d4 wx46c3a73d8c4f7051 __UNI__EB8A7B + "appid" : "__UNI__C7D69AA", //wxb74514b47a2f29d4 wx46c3a73d8c4f7051 __UNI__EB8A7B "description" : "crmeb商城", "versionName" : "2.1", "versionCode" : 2, @@ -201,7 +201,7 @@ }, "router" : { "mode" : "history", - "base" : "" + "base" : "./" }, "domain" : "", "sdkConfigs" : { diff --git a/pages.json b/pages.json index f727e09..52ed79f 100644 --- a/pages.json +++ b/pages.json @@ -605,6 +605,19 @@ } } }, + { + "path": "inbound/index", + "style": { + "navigationBarTitleText": "签署", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + }, { "path": "promoter_rank/index", "style": { @@ -648,7 +661,21 @@ { "path": "pay_success/index", "style": { - "navigationBarTitleText": "支付成功", + "navigationBarTitleText": "申请成功", + "navigationStyle": "custom", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + }, + { + "path": "signin/index", + "style": { + "navigationBarTitleText": "签约成功", "navigationStyle": "custom", "app-plus": { // #ifdef APP-PLUS diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue index 0b374f8..0ed7579 100644 --- a/pages/goods_details/index.vue +++ b/pages/goods_details/index.vue @@ -230,7 +230,7 @@ form-type="submit">
-
+ 11.2/ + height: calc(120rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ + height: calc(120rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/ } .product-con .footer .item { @@ -2120,7 +2120,7 @@ } .product-con .footer .bnt .bnts { - width: 222rpx; + width: 444rpx; text-align: center; line-height: 76rpx; color: #fff; diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index fe1cba2..de169a0 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -18,14 +18,18 @@ - 待付款 + 待审核 + 待签约 {{orderInfo.shippingType==1 ? '待发货':'待核销'}} - 待收货 - 待评价 - 已完成 + + 待评价 + 已完成 + + + @@ -39,6 +43,8 @@ :class='(orderInfo.status == 1 ? "icon-webicon318":"icon-yuandianxiao") + " " +(orderInfo.status >= 1 ? "font_color":"")' v-if="orderInfo.shippingType == 1"> + + @@ -120,7 +126,13 @@ - + + + + + + + + 返回 + 立即签约 申请退款 + class='bnt cancel' v-else-if="orderInfo.status == 4">申请退款 - 查看拼团 + + + 确认收货 + + 再次购买 @@ -276,7 +290,8 @@ orderTake, orderDel, orderCancel, - qrcodeApi + qrcodeApi, + getnowqy } from '@/api/order.js'; import payment from '@/components/payment'; import orderGoods from "@/components/orderGoods"; @@ -299,6 +314,7 @@ codeImg: '', qrcodeSize: 100, order_id: '', + logoicon: 'https://ts1.cn.mm.bing.net/th/id/R-C.0487c86c6682d50cc4b580efe6847a4b?rik=XNQG6TVi70UVGw&riu=http%3a%2f%2fi0.wp.com%2fwww.weblees.com%2fwp-content%2fuploads%2f2015%2f08%2fPreload1.gif%3fresize%3d800%2c600&ehk=y0zbwQBlSlAxOWZXCa9qEtjWeKNhOD%2bARVxhx4cF2fU%3d&risl=&pid=ImgRaw&r=0', evaluate: 0, cartInfo: [], //购物车产品 orderInfo: { @@ -347,6 +363,8 @@ isShow:true, theme:app.globalData.theme, bgColor:'#e93323', + logoflag: false, + https: '', chatConfig:{ consumer_hotline:'', telephone_service_switch:'0' @@ -403,6 +421,33 @@ // #endif }, methods: { + // 点击立即签约 + lijiqys(id, ids) { + this.$Cache.set('qyids', id) + // 跳转到签署页面 + // uni.navigateTo({ + // url:'/pages/users/signin/index' + // }) + this.logoflag = true //logo显示 + getnowqy(id).then(res => { + this.logoflag = false //logo隐藏 + this.https = res.data.url + uni.navigateTo({ + url: '/pages/users/inbound/index?http=' + this.https + }) + // #ifdef H5 + window.location.href=this.https + // #endif + }) + }, + // 返回上一页 + btnback(){ + uni.navigateBack({ + delta: 1 + }) + }, + + onClickService() { if(this.chatConfig.telephone_service_switch === '1'){ uni.makePhoneCall({ @@ -505,7 +550,6 @@ 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; }; @@ -695,6 +739,38 @@ \ No newline at end of file diff --git a/pages/users/installment/index.vue b/pages/users/installment/index.vue index af619fa..3f1feed 100644 --- a/pages/users/installment/index.vue +++ b/pages/users/installment/index.vue @@ -36,7 +36,7 @@ - ￥6680 + ￥{{sum}} 销售金额 @@ -45,13 +45,13 @@ - 分期方式 间隔：30天 + 分期方式 间隔：{{fenqiobj.cycle}}天 期数 租期 每期租金 - 第{{item.installmentNumber}}期 间隔：30天 {{item.repaymentAmount}} + 第{{item.installmentNumber}}期 间隔：{{fenqiobj.cycle}}天 {{item.repaymentAmount}} @@ -71,12 +71,15 @@ hireshou: '', //首期租金 sum:0, num:0, //总租期 + fenqiobj:{} } }, onLoad(option) { + this.fenqiobj = JSON.parse((option.fenqiobj)) this.cart = JSON.parse(option.cart) this.installmentlist = JSON.parse(option.list) this.hireshou = this.installmentlist[0].repaymentAmount + }, methods: { @@ -91,8 +94,9 @@ // 计算总金额 this.installmentlist.forEach((item, index) => { this.num++ - this.sum += parseFloat(item.repaymentAmount) + this.sum += parseFloat(item.repaymentAmount) }) + this.sum = parseFloat(this.sum).toFixed(2) } } diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index 11ca29c..c81f184 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -155,7 +155,7 @@ 首付金额 - ￥{{fenqiobj.downPaymentAmount}} + ￥{{downPaymentAmount}} 还款周期(间隔) @@ -171,7 +171,7 @@ 合计付款 - ￥{{fenqiobj.totalAmount}} + ￥{{totalAmount}} + + + 紧急联系人 + {{lxrmorenadds}} + + + 联系人姓名 + + + 联系人手机 + + + + + + 继续添加(有助于提高审核成功率) + + + + + + - 订单编号 {{shopobj.preOrderNo.length > 30 ? shopobj.preOrderNo.slice(0, 30) + '...' : shopobj.preOrderNo}} + 订单编号 {{ordermo}} 下单时间 {{shopobj.date}} @@ -29,12 +29,16 @@ export default { data() { return { - shopobj:{} + shopobj:{}, + ordermo:'' } }, onLoad(option) { this.shopobj = JSON.parse(option.shopobj) }, + onShow() { + this.ordermo = this.$Cache.get('ordernobh') + }, methods: { }, diff --git a/pages/users/repayment/index.vue b/pages/users/repayment/index.vue index 7252842..d2d7be8 100644 --- a/pages/users/repayment/index.vue +++ b/pages/users/repayment/index.vue @@ -40,6 +40,7 @@ }, onLoad() { this.getData() + // console.log(this.$Cache.get('orderno')) }, methods: { btnhk() { @@ -55,7 +56,7 @@ // 请求分期还款 getData: function() { let data = { - uid: this.$store.getters.uid, + uid:this.$Cache.get('ordernobh'), type: this.index } getreceivable(data).then(res => { @@ -86,8 +87,8 @@ background-color: #fff; padding-left: 36rpx; box-sizing: border-box; - padding-top: 108rpx; - padding-bottom: 16rpx; + padding-top: 30rpx; + padding-bottom: 20rpx; display: flex; a { diff --git a/pages/users/signin/index.vue b/pages/users/signin/index.vue new file mode 100644 index 0000000..c47e429 --- /dev/null +++ b/pages/users/signin/index.vue @@ -0,0 +1,149 @@ + + + + + \ No newline at end of file diff --git a/pages/users/wechat_login/index.vue b/pages/users/wechat_login/index.vue index a83bd9e..3b52e03 100644 --- a/pages/users/wechat_login/index.vue +++ b/pages/users/wechat_login/index.vue @@ -74,7 +74,7 @@ data() { return { isUp: false, // 绑定手机号手动输入弹窗 - phone: '', + phone: '', statusBarHeight: statusBarHeight, isHome: false, isPhoneBox: false, //授权手机号弹窗