提交了
This commit is contained in:
parent
53c5afe0ab
commit
1f8cdbb270
|
@ -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() {
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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" : [
|
||||
"<uses-feature android:name=\"android.hardware.camera\"/>",
|
||||
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
|
||||
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
|
||||
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
|
||||
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
|
||||
"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
|
||||
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.CAMERA\"/>",
|
||||
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
|
||||
"<uses-permission android:name=\"android.permission.INTERNET\"/>",
|
||||
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
|
||||
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
|
||||
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
|
||||
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
|
||||
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
|
||||
"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
|
||||
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
|
||||
"<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
|
||||
"<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
|
||||
],
|
||||
"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" : {
|
||||
|
|
14
pages.json
14
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": {
|
||||
|
|
|
@ -248,11 +248,11 @@
|
|||
@showShare="showShare"></shareRedPackets>
|
||||
<!-- 组件 -->
|
||||
<productWindow :attr="attr" :isShow='1' :iSplus='1' @myevent="onMyEvent" @ChangeAttr="ChangeAttr"
|
||||
@ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" id='product-window'
|
||||
@getImg="showImg">
|
||||
@ChangeCartNum="ChangeCartNum" @attrVal="attrVal" @iptCartNum="iptCartNum" id='product-window'
|
||||
@getImg="showImg" @installments="installments">
|
||||
</productWindow>
|
||||
<couponListWindow :coupon='coupon' :typeNum="couponDeaultType[0].useType"
|
||||
@ChangCouponsClone="ChangCouponsClone" @ChangCoupons="ChangCoupons"
|
||||
@ChangCouponsClone="ChangCouponsClone" @ChangCoupons="ChangCoupons"
|
||||
@ChangCouponsUseState="ChangCouponsUseState" @tabCouponType="tabCouponType"></couponListWindow>
|
||||
<!-- 分享按钮 -->
|
||||
<view class="generate-posters" :class="posters ? 'on' : ''">
|
||||
|
@ -657,6 +657,11 @@
|
|||
uni.$emit('scroll');
|
||||
},
|
||||
methods: {
|
||||
//
|
||||
|
||||
|
||||
|
||||
|
||||
// 请求分期列表
|
||||
// getfqList: function() {
|
||||
// let data = {
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
|
|
|
@ -3,12 +3,12 @@
|
|||
<!-- 产品信息 -->
|
||||
<view class="mobile">
|
||||
<view class="ltpic">
|
||||
<image src="../../../static/images/sj1.png" mode=""></image>
|
||||
<image :src="cart[0].image" mode=""></image>
|
||||
</view>
|
||||
<view class="rtcan">
|
||||
<text class="title">iPhone 14 Pro Max 现货 支持移动联通电信5q 双卡双待手...</text>
|
||||
<text class="title">{{cart[0].productName}}</text>
|
||||
<view class="combination">
|
||||
<text>套餐:</text> <text>256G</text> <text>深空灰</text> <text>到期买断</text>
|
||||
<text>套餐:</text> <text>{{cart[0].sku}}</text>
|
||||
</view>
|
||||
<view class="tenancy">
|
||||
<text>租期:</text> <text>{{num}}期</text>
|
||||
|
@ -17,7 +17,7 @@
|
|||
<text>间隔:</text> <text>30天</text>
|
||||
</view>
|
||||
<view class="tenancy">
|
||||
<text>数量:</text> <text>1</text>
|
||||
<text>数量:</text> <text>{{cart[0].payNum}}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -63,7 +63,7 @@
|
|||
</image>
|
||||
</view>
|
||||
<view class="cen">
|
||||
<text>完善身份信息</text>
|
||||
<text>完善身份信息 {{sfxx}}</text>
|
||||
<text>填写资料 加速审核</text>
|
||||
</view>
|
||||
<view class="rt">
|
||||
|
@ -149,29 +149,29 @@
|
|||
<a @click="btnment">
|
||||
<view class="planjh">
|
||||
<text>分期计划</text>
|
||||
<view class="datejt"><text class="detewz">{{fenqiname}}</text><uni-view
|
||||
<view class="datejt"><text class="detewz">{{installmentobj.name}}</text><uni-view
|
||||
data-v-064d693c="" class="iconfont icon-jiantou"></uni-view></view>
|
||||
</view>
|
||||
</a>
|
||||
<view class="planjh">
|
||||
<text>首付金额</text>
|
||||
<view class="datejt"><text class="detewzs">¥256.00</text></view>
|
||||
<view class="datejt"><text class="detewzs">¥{{fenqiobj.downPaymentAmount}}</text></view>
|
||||
</view>
|
||||
<view class="planjh">
|
||||
<text>还款周期(间隔)</text>
|
||||
<view class="datejt"><text class="detewzs">7天</text></view>
|
||||
<view class="datejt"><text class="detewzs">{{fenqiobj.cycle}}天</text></view>
|
||||
</view>
|
||||
<view class="planjh">
|
||||
<text>还款期数</text>
|
||||
<view class="datejt"><text class="detewzs">12</text></view>
|
||||
<view class="datejt"><text class="detewzs">{{fenqiobj.downPaymentNumber}}</text></view>
|
||||
</view>
|
||||
<view class="planjh">
|
||||
<text>每期还款</text>
|
||||
<view class="datejt"><text class="detewzs">¥256.00</text></view>
|
||||
<view class="datejt"><text class="detewzs">¥{{fenqiobj.repaymentAmount}}</text></view>
|
||||
</view>
|
||||
<view class="planjh">
|
||||
<text>合计付款</text>
|
||||
<view class="datejt"><text class="detewzs">¥2561</text></view>
|
||||
<view class="datejt"><text class="detewzs">¥{{fenqiobj.totalAmount}}</text></view>
|
||||
</view>
|
||||
<!-- 支付方式 -->
|
||||
<!-- <view>支付方式</view>
|
||||
|
@ -382,6 +382,7 @@
|
|||
addressList: [], //地址列表数据
|
||||
orderProNum: 0,
|
||||
preOrderNo: '', //预下单订单号
|
||||
shopobj: {},
|
||||
theme: app.globalData.theme,
|
||||
formContent: '',
|
||||
addressChangeId: 0,
|
||||
|
@ -389,7 +390,13 @@
|
|||
installmentid: '', //分期id
|
||||
fenqiname: '',
|
||||
installmentarr: [],
|
||||
checkeds: false
|
||||
checkeds: false,
|
||||
timeString: '',
|
||||
shopmey: 0,
|
||||
orderNo: '',
|
||||
sfxx: '未完成',
|
||||
fenqiobj: {} ,//分期还款信息
|
||||
installmentobj:{}
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
|
@ -436,14 +443,20 @@
|
|||
} else {
|
||||
toLogin();
|
||||
}
|
||||
this.installmentid = JSON.parse(localStorage.getItem('installments')).id
|
||||
this.fenqiname = JSON.parse(localStorage.getItem('installments')).name
|
||||
|
||||
// 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()
|
||||
},
|
||||
/**
|
||||
* 生命周期函数--监听页面显示
|
||||
*/
|
||||
onShow: function() {
|
||||
// console.log(this.$Cache.get('improvescode'))
|
||||
if(this.$Cache.get('improvescode') == '操作成功'){
|
||||
this.sfxx = '已完成'
|
||||
}
|
||||
let _this = this
|
||||
// wx.getLaunchOptionsSync
|
||||
this.textareaStatus = true;
|
||||
|
@ -462,32 +475,22 @@
|
|||
let data = {
|
||||
preOrderNo: this.preOrderNo,
|
||||
uid: this.$store.getters.uid,
|
||||
comboId: this.installmentid
|
||||
comboId: this.installmentobj.id
|
||||
}
|
||||
getinstallment(data).then(res => {
|
||||
this.installmentarr = res.data
|
||||
this.fenqiobj = res.data
|
||||
this.installmentarr = res.data.userInstallmentBills
|
||||
|
||||
})
|
||||
},
|
||||
// 跳转到分期计划
|
||||
btnment() {
|
||||
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/installment/index?list=' + JSON.stringify(this.installmentarr)
|
||||
url: '/pages/users/installment/index?list=' + JSON.stringify(this.installmentarr) + '&cart=' +
|
||||
JSON.stringify(this.cartInfo)
|
||||
})
|
||||
},
|
||||
|
||||
// 邮箱失焦事件
|
||||
// inpblurs() {
|
||||
// var aqq = /^[1-9][0-9]{4,10}@qq.com$/
|
||||
// if (!aqq.test(this.emitext)) {
|
||||
// return this.$util.Tips({
|
||||
// title: '请填写正确的邮箱'
|
||||
// });
|
||||
// } else if (this.emitext == '') {
|
||||
// return this.$util.Tips({
|
||||
// title: '邮箱不能为空'
|
||||
// });
|
||||
// }
|
||||
// },
|
||||
// 点击跳转到完善信息页面
|
||||
btnimprovess() {
|
||||
uni.navigateTo({
|
||||
|
@ -501,9 +504,9 @@
|
|||
// 订单详情
|
||||
getloadPreOrder: function() {
|
||||
loadPreOrderApi(this.preOrderNo).then(res => {
|
||||
|
||||
let orderInfoVo = res.data.orderInfoVo;
|
||||
this.orderInfoVo = orderInfoVo;
|
||||
this.shopmey = this.orderInfoVo.proTotalFee //商品金额
|
||||
if (orderInfoVo.addressId && this.addressChangeId === 0) {
|
||||
this.addressId = orderInfoVo.addressId;
|
||||
} else {
|
||||
|
@ -523,9 +526,9 @@
|
|||
.productType ===
|
||||
'normal' ? true : false;
|
||||
}).catch(err => {
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/order_list/index'
|
||||
});
|
||||
// uni.navigateTo({
|
||||
// url: '/pages/users/pay_success/index'
|
||||
// });
|
||||
})
|
||||
},
|
||||
/**
|
||||
|
@ -744,110 +747,110 @@
|
|||
uni.hideLoading();
|
||||
return that.$util.Tips({
|
||||
title: err
|
||||
}, '/pages/users/order_list/index');
|
||||
});
|
||||
},
|
||||
getOrderPay: function(orderNo, message) {
|
||||
let that = this;
|
||||
let goPages = '/pages/order_pay_status/index?order_id=' + orderNo;
|
||||
orderPay({
|
||||
orderNo: orderNo,
|
||||
payChannel: that.payChannel,
|
||||
payType: that.payType,
|
||||
scene: that.productType === 'normal' ? 0 : 1177 //下单时小程序的场景值
|
||||
}).then(res => {
|
||||
let jsConfig = res.data.jsConfig;
|
||||
switch (res.data.payType) {
|
||||
case 'weixin':
|
||||
that.weixinPay(jsConfig, orderNo, goPages);
|
||||
break;
|
||||
case 'yue':
|
||||
uni.hideLoading();
|
||||
return that.$util.Tips({
|
||||
title: message
|
||||
}, {
|
||||
tab: 5,
|
||||
url: goPages + '&status=1'
|
||||
});
|
||||
break;
|
||||
case 'weixinh5':
|
||||
uni.hideLoading();
|
||||
setTimeout(() => {
|
||||
location.href = jsConfig.mwebUrl + '&redirect_url=' +
|
||||
window.location
|
||||
.protocol + '//' + window.location.host + goPages +
|
||||
'&status=1';
|
||||
}, 100)
|
||||
break;
|
||||
case 'alipay':
|
||||
//#ifdef H5
|
||||
if (this.$wechat.isWeixin()) {
|
||||
uni.redirectTo({
|
||||
url: `/pages/users/alipay_invoke/index?id=${orderNo}&type=order`
|
||||
});
|
||||
} else {
|
||||
//h5支付
|
||||
uni.hideLoading();
|
||||
that.formContent = res.data.alipayRequest;
|
||||
uni.setStorage({
|
||||
key: 'orderNo',
|
||||
data: orderNo
|
||||
});
|
||||
that.$nextTick(() => {
|
||||
document.forms['punchout_form'].submit();
|
||||
})
|
||||
}
|
||||
//#endif
|
||||
// #ifdef APP-PLUS
|
||||
let alipayRequest = res.data.alipayRequest;
|
||||
uni.requestPayment({
|
||||
provider: 'alipay',
|
||||
orderInfo: alipayRequest,
|
||||
success: (e) => {
|
||||
uni.showToast({
|
||||
title: "支付成功"
|
||||
})
|
||||
setTimeout(res => {
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/alipay_return/alipay_return?out_trade_no=' +
|
||||
orderNo +
|
||||
'&payChannel=' +
|
||||
'appAlipay'
|
||||
})
|
||||
}, 1000)
|
||||
},
|
||||
fail: (e) => {
|
||||
console.log(e, '失败');
|
||||
uni.showModal({
|
||||
content: "支付失败",
|
||||
showCancel: false,
|
||||
success: function(res) {
|
||||
if (res.confirm) {
|
||||
//点击确认的操作
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/alipay_return/alipay_return?out_trade_no=' +
|
||||
orderNo +
|
||||
'&payChannel=' +
|
||||
'appAlipay'
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
complete: () => {
|
||||
uni.hideLoading();
|
||||
},
|
||||
});
|
||||
// #endif
|
||||
break;
|
||||
}
|
||||
}).catch(err => {
|
||||
uni.hideLoading();
|
||||
return that.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
}, );
|
||||
});
|
||||
},
|
||||
// getOrderPay: function(orderNo, message) {
|
||||
// let that = this;
|
||||
// let goPages = '/pages/order_pay_status/index?order_id=' + orderNo;
|
||||
// orderPay({
|
||||
// orderNo: orderNo,
|
||||
// payChannel: that.payChannel,
|
||||
// payType: that.payType,
|
||||
// scene: that.productType === 'normal' ? 0 : 1177 //下单时小程序的场景值
|
||||
// }).then(res => {
|
||||
// let jsConfig = res.data.jsConfig;
|
||||
// switch (res.data.payType) {
|
||||
// case 'weixin':
|
||||
// that.weixinPay(jsConfig, orderNo, goPages);
|
||||
// break;
|
||||
// case 'yue':
|
||||
// uni.hideLoading();
|
||||
// return that.$util.Tips({
|
||||
// title: message
|
||||
// }, {
|
||||
// tab: 5,
|
||||
// url: goPages + '&status=1'
|
||||
// });
|
||||
// break;
|
||||
// case 'weixinh5':
|
||||
// uni.hideLoading();
|
||||
// setTimeout(() => {
|
||||
// location.href = jsConfig.mwebUrl + '&redirect_url=' +
|
||||
// window.location
|
||||
// .protocol + '//' + window.location.host + goPages +
|
||||
// '&status=1';
|
||||
// }, 100)
|
||||
// break;
|
||||
// case 'alipay':
|
||||
// //#ifdef H5
|
||||
// if (this.$wechat.isWeixin()) {
|
||||
// uni.redirectTo({
|
||||
// url: `/pages/users/alipay_invoke/index?id=${orderNo}&type=order`
|
||||
// });
|
||||
// } else {
|
||||
// //h5支付
|
||||
// uni.hideLoading();
|
||||
// that.formContent = res.data.alipayRequest;
|
||||
// uni.setStorage({
|
||||
// key: 'orderNo',
|
||||
// data: orderNo
|
||||
// });
|
||||
// that.$nextTick(() => {
|
||||
// document.forms['punchout_form'].submit();
|
||||
// })
|
||||
// }
|
||||
// //#endif
|
||||
// // #ifdef APP-PLUS
|
||||
// let alipayRequest = res.data.alipayRequest;
|
||||
// uni.requestPayment({
|
||||
// provider: 'alipay',
|
||||
// orderInfo: alipayRequest,
|
||||
// success: (e) => {
|
||||
// uni.showToast({
|
||||
// title: "支付成功"
|
||||
// })
|
||||
// setTimeout(res => {
|
||||
// uni.navigateTo({
|
||||
// url: '/pages/users/alipay_return/alipay_return?out_trade_no=' +
|
||||
// orderNo +
|
||||
// '&payChannel=' +
|
||||
// 'appAlipay'
|
||||
// })
|
||||
// }, 1000)
|
||||
// },
|
||||
// fail: (e) => {
|
||||
// console.log(e, '失败');
|
||||
// uni.showModal({
|
||||
// content: "支付失败",
|
||||
// showCancel: false,
|
||||
// success: function(res) {
|
||||
// if (res.confirm) {
|
||||
// //点击确认的操作
|
||||
// uni.navigateTo({
|
||||
// url: '/pages/users/alipay_return/alipay_return?out_trade_no=' +
|
||||
// orderNo +
|
||||
// '&payChannel=' +
|
||||
// 'appAlipay'
|
||||
// })
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
// },
|
||||
// complete: () => {
|
||||
// uni.hideLoading();
|
||||
// },
|
||||
// });
|
||||
// // #endif
|
||||
// break;
|
||||
// }
|
||||
// }).catch(err => {
|
||||
// uni.hideLoading();
|
||||
// return that.$util.Tips({
|
||||
// title: err
|
||||
// });
|
||||
// });
|
||||
// },
|
||||
weixinPay(jsConfig, orderNo, goPages) {
|
||||
let that = this;
|
||||
// #ifdef MP
|
||||
|
@ -883,7 +886,6 @@
|
|||
})
|
||||
},
|
||||
fail: function(e) {
|
||||
console.log(e)
|
||||
uni.hideLoading();
|
||||
return that.$util.Tips({
|
||||
title: '取消支付'
|
||||
|
@ -935,7 +937,6 @@
|
|||
})
|
||||
},
|
||||
fail: function(e) {
|
||||
console.log(e)
|
||||
uni.hideLoading();
|
||||
return that.$util.Tips({
|
||||
title: '取消支付'
|
||||
|
@ -1083,6 +1084,10 @@
|
|||
return this.$util.Tips({
|
||||
title: '请勾选并同意政策'
|
||||
});
|
||||
} else if (this.sfxx == '未完成') {
|
||||
return this.$util.Tips({
|
||||
title: '请填写身份信息'
|
||||
});
|
||||
} else {
|
||||
data = {
|
||||
realName: that.contacts,
|
||||
|
@ -1097,8 +1102,8 @@
|
|||
shippingType: that.$util.$h.Add(that.shippingType, 1),
|
||||
payChannel: that.payChannel,
|
||||
uid: this.$store.getters.uid,
|
||||
systemInstallmentsComboId:this.installmentid,
|
||||
type:2,
|
||||
systemInstallmentsComboId:this.installmentobj.id,
|
||||
type: 2,
|
||||
};
|
||||
if (data.payType == 'yue' && parseFloat(that.userInfo.nowMoney) < parseFloat(that.totalPrice))
|
||||
return that.$util.Tips({
|
||||
|
@ -1115,8 +1120,27 @@
|
|||
// #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.date = this.timeString
|
||||
this.shopobj.preOrderNo = this.preOrderNo
|
||||
|
||||
|
||||
|
||||
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/pay_success/index?shopobj=' + JSON.stringify(this.shopobj)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// uni.navigateTo({
|
||||
// url: '/pages/users/purchase_succeed/index'
|
||||
// })
|
||||
|
|
|
@ -61,13 +61,28 @@
|
|||
<view class="names">
|
||||
<text>联系人手机</text> <input type="text" v-model="teltwo" @blur="telinptwo" placeholder="请输入联系人手机" />
|
||||
</view>
|
||||
<view class="addname">
|
||||
<view class="addname" v-if="flags">
|
||||
<a href="javascript:;" @click="btnadd">
|
||||
<view class="add">+</view>
|
||||
<text>继续添加(有助于提高审核成功率)</text>
|
||||
</a>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 隐藏 -->
|
||||
<view class="emergency_contact" v-if="flaglxr">
|
||||
<view class="name" @click="openPopupadd('bottomadd')">
|
||||
<view class="jinj">紧急联系人</view>
|
||||
<view class="lianx"><text>{{lxrmorenadd}}</text> <uni-view data-v-064d693c=""
|
||||
class="iconfont icon-jiantou"></uni-view></view>
|
||||
</view>
|
||||
<view class="name">
|
||||
<text>联系人姓名</text> <input type="text" v-model="realNameadd" @blur="realNameinpadd"
|
||||
placeholder="请输入联系人姓名" />
|
||||
</view>
|
||||
<view class="name">
|
||||
<text>联系人手机</text> <input type="text" v-model="teladd" @blur="telinpadd" placeholder="请输入联系人手机" />
|
||||
</view>
|
||||
</view>
|
||||
<!-- 常用邮箱 -->
|
||||
<view class="cye_mail">
|
||||
<view class="email">
|
||||
|
@ -98,6 +113,12 @@
|
|||
<view @click="btnlxrs(item)" v-for="(item,index) in lxrarr" :key="index">{{item}}</view>
|
||||
</view>
|
||||
</liu-popup>
|
||||
<!-- 多次添加 -->
|
||||
<liu-popup type="bottom" ref="bottomadd" class="boxlist">
|
||||
<view class="lxrlist">
|
||||
<view @click="btnlxradd(item)" v-for="(item,index) in lxrarr" :key="index">{{item}}</view>
|
||||
</view>
|
||||
</liu-popup>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
@ -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 {
|
||||
|
|
110
pages/users/pay_success/index.vue
Normal file
110
pages/users/pay_success/index.vue
Normal file
|
@ -0,0 +1,110 @@
|
|||
<template>
|
||||
<view class="Pay_success">
|
||||
<view class="successbox">
|
||||
<image src="../../../static/images/success.png" mode=""></image>
|
||||
<view class="title">
|
||||
申请成功,请等待审核
|
||||
</view>
|
||||
<view class="content">
|
||||
<view class="bd">
|
||||
<view class="">订单编号</view> <text>{{shopobj.preOrderNo.length > 30 ? shopobj.preOrderNo.slice(0, 30) + '...' : shopobj.preOrderNo}}</text>
|
||||
</view>
|
||||
<view class="bd">
|
||||
<view class="">下单时间</view> <text>{{shopobj.date}}</text>
|
||||
</view>
|
||||
<view class="bd">
|
||||
<view class="">支付方式</view> <text>分期支付</text>
|
||||
</view>
|
||||
<view class="bd">
|
||||
<view class="">支付金额</view> <text>{{shopobj.shopmey}}</text>
|
||||
</view>
|
||||
</view>
|
||||
<navigator url="../../../pages/users/order_list/index" class="ckdj">查看订单</navigator>
|
||||
<navigator url="../../../pages/index/index" open-type="switchTab" class="fhsy">返回首页</navigator>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
shopobj:{}
|
||||
}
|
||||
},
|
||||
onLoad(option) {
|
||||
this.shopobj = JSON.parse(option.shopobj)
|
||||
},
|
||||
methods: {
|
||||
|
||||
},
|
||||
mounted() {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<style lang="less">
|
||||
.Pay_success{
|
||||
width: 100%;
|
||||
margin-top: 200rpx;
|
||||
background-color: #fff;
|
||||
padding-bottom: 80rpx;
|
||||
.successbox{
|
||||
position: relative;
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
padding: 0 40rpx;
|
||||
image{
|
||||
position: absolute;
|
||||
top: -65rpx;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
width: 138rpx;
|
||||
height: 138rpx;
|
||||
}
|
||||
.title{
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
padding-top: 100rpx;
|
||||
box-sizing: border-box;
|
||||
font-weight: 700;
|
||||
line-height: 120rpx;
|
||||
border-bottom: 1px solid #ccc;
|
||||
}
|
||||
.content{
|
||||
.bd{
|
||||
display: flex;
|
||||
width: 100%;
|
||||
justify-content: space-between;
|
||||
margin-top: 20rpx;
|
||||
text{
|
||||
color: #666;
|
||||
}
|
||||
}
|
||||
}
|
||||
.ckdj{
|
||||
width: 100%;
|
||||
height: 84rpx;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 50rpx;
|
||||
line-height: 84rpx;
|
||||
text-align: center;
|
||||
margin-top: 50rpx;
|
||||
background-color: #42ca4d;
|
||||
color: #fff;
|
||||
}
|
||||
.fhsy{
|
||||
width: 100%;
|
||||
height: 84rpx;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 50rpx;
|
||||
line-height: 84rpx;
|
||||
text-align: center;
|
||||
margin-top: 50rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
|
@ -1,8 +1,8 @@
|
|||
<template>
|
||||
<view class="repaymentbox">
|
||||
<view class="repaymenttext">
|
||||
<a href="javascript:;" :class="index == 0 ? 'active' : ''" :v-model="index" @click="btnhk">待还款</a>
|
||||
<a href="javascript:;" :class="index == 1 ? 'active' : ''" :v-model="index" @click="btnjq">已结清</a>
|
||||
<a href="javascript:;" :class="index == 0 ? 'active' : ''" v-model="index" @click="btnhk">待还款</a>
|
||||
<a href="javascript:;" :class="index == 1 ? 'active' : ''" v-model="index" @click="btnjq">已结清</a>
|
||||
</view>
|
||||
<view class="repaymentlist" v-for="(item,index) in binglist" :key="index">
|
||||
<view class="lt">
|
||||
|
@ -14,7 +14,9 @@
|
|||
</view>
|
||||
<view class="xuhuan">
|
||||
<text>须还金额:</text><text>¥{{item.repaymentAmount}}</text>
|
||||
<view class="yuqi">{{item.repaymentStatus = 'Pending'? '待还款' : 'Partial' ? '部分还款' : 'Paid' ? '已还款' : '逾期'}}</view>
|
||||
<view class="yuqi">
|
||||
{{item.repaymentStatus == 'Pending'? '待还款' : 'Partial' ? '部分还款' : 'Paid' ? '已还款' : '逾期'}}</view>
|
||||
<!-- 'Pending'? '待还款' : 'Partial' ? '部分还款' : 'Paid' ? '已还款' : '逾期' -->
|
||||
</view>
|
||||
</view>
|
||||
<view class="rt">
|
||||
|
@ -25,39 +27,41 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import {getreceivable} from '@/api/api.js'
|
||||
import {
|
||||
getreceivable
|
||||
} from '@/api/api.js'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
index: 0,
|
||||
binglist:[],
|
||||
title:'还款'
|
||||
binglist: [],
|
||||
title: '还款'
|
||||
}
|
||||
},
|
||||
onLoad() {
|
||||
this.getData()
|
||||
this.getData()
|
||||
},
|
||||
methods: {
|
||||
btnhk() {
|
||||
this.index = 0
|
||||
this.title = '还款'
|
||||
this.getData()
|
||||
this.getData()
|
||||
},
|
||||
btnjq() {
|
||||
this.index = 1
|
||||
this.title = '已结清'
|
||||
this.getData()
|
||||
this.getData()
|
||||
},
|
||||
// 请求分期还款
|
||||
getData:function(){
|
||||
getData: function() {
|
||||
let data = {
|
||||
uid:this.$store.getters.uid,
|
||||
type:this.index
|
||||
uid: this.$store.getters.uid,
|
||||
type: this.index
|
||||
}
|
||||
getreceivable(data).then(res => {
|
||||
this.binglist = res.data
|
||||
})
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
@ -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 {
|
||||
|
|
|
@ -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('用户点击取消');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"appid": "wxb74514b47a2f29d4",
|
||||
"appid": "wx46c3a73d8c4f7051", //wx46c3a73d8c4f7051 wxb74514b47a2f29d4
|
||||
"compileType": "miniprogram",
|
||||
"libVersion": "3.3.1",
|
||||
"packOptions": {
|
||||
|
|
BIN
static/images/succeed.png
Normal file
BIN
static/images/succeed.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.1 KiB |
BIN
static/images/success.png
Normal file
BIN
static/images/success.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.4 KiB |
Loading…
Reference in New Issue
Block a user