chuangte/easypay-app
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
3321822538@qq.com 2024-01-22 14:30:38 +08:00
parent 1f8cdbb270
commit f1c58f8ddb
17 changed files with 1177 additions and 679 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/api.js
View File

@ -357,4 +357,11 @@ export function getinstallment(data) {
return request.get('order/getPreInstallmentBill', data, { return request.get('order/getPreInstallmentBill', data, {
noAuth: true noAuth: true
}); });
} }
// 查询签约是否成功
// export function getqytrue(data) {
// return request.get('order/getSignResult/',data,{
// noAuth: true
// })
// }

21
api/order.js
View File

@ -140,6 +140,19 @@ export function orderTake(uni) {
id: uni id: uni
}, {}, 1); }, {}, 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); return request.get('pay/queryPayResult?orderNo=' + data);
} }
/**
* 签约查询
* @param object data
*/
export function getqianyue(data) {
return request.get('order/getSignResult/' + data);
}
/** /**
* 支付宝查询支付结果 * 支付宝查询支付结果
* @param object data * @param object data

7
config/app.js
View File

@ -1,14 +1,15 @@
//移动端商城API //移动端商城API
// let domain = 'http://117.50.163.143:20410' // 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 = { module.exports = {
// 请求域名 格式： https://您的域名 // 请求域名 格式： https://您的域名
// #ifdef MP || APP-PLUS // #ifdef MP || APP-PLUS
// HTTP_REQUEST_URL:'', // HTTP_REQUEST_URL:'',
HTTP_REQUEST_URL: domain, HTTP_REQUEST_URL: domain,
// H5商城地址 // 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 // #endif
// #ifdef H5 // #ifdef H5
HTTP_REQUEST_URL:domain, HTTP_REQUEST_URL:domain,

4
manifest.json
View File

@ -1,6 +1,6 @@
{ {
"name" : "先享后付", "name" : "先享后付",
"appid" : "wx46c3a73d8c4f7051", //wxb74514b47a2f29d4 wx46c3a73d8c4f7051 __UNI__EB8A7B "appid" : "__UNI__C7D69AA", //wxb74514b47a2f29d4 wx46c3a73d8c4f7051 __UNI__EB8A7B
"description" : "crmeb商城", "description" : "crmeb商城",
"versionName" : "2.1", "versionName" : "2.1",
"versionCode" : 2, "versionCode" : 2,
@ -201,7 +201,7 @@
}, },
"router" : { "router" : {
"mode" : "history", "mode" : "history",
"base" : "" "base" : "./"
}, },
"domain" : "", "domain" : "",
"sdkConfigs" : { "sdkConfigs" : {

29
pages.json
View File

@ -605,6 +605,19 @@
} }
} }
}, },
{
"path": "inbound/index",
"style": {
"navigationBarTitleText": "签署",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{ {
"path": "promoter_rank/index", "path": "promoter_rank/index",
"style": { "style": {
@ -648,7 +661,21 @@
{ {
"path": "pay_success/index", "path": "pay_success/index",
"style": { "style": {
"navigationBarTitleText": "支付成功", "navigationBarTitleText": "申请成功",
"navigationStyle": "custom",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {
"type": "default"
}
// #endif
}
}
},
{
"path": "signin/index",
"style": {
"navigationBarTitleText": "签约成功",
"navigationStyle": "custom", "navigationStyle": "custom",
"app-plus": { "app-plus": {
// #ifdef APP-PLUS // #ifdef APP-PLUS

10
pages/goods_details/index.vue
View File

@ -230,7 +230,7 @@
form-type="submit"></button></form> form-type="submit"></button></form>
<form @submit="goBuy" report-submit="true"><button class="buy bnts" <form @submit="goBuy" report-submit="true"><button class="buy bnts"
form-type="submit">先享后付</button> form-type="submit">先享后付</button>
</form> </form>
</view> </view>
</block> </block>
<view class="bnt bntVideo acea-row skeleton-rect" <view class="bnt bntVideo acea-row skeleton-rect"
@ -2072,7 +2072,7 @@
} }
.product-con .footer { .product-con .footer {
padding: 0 20rpx 0 30rpx; padding: 0 40rpx 0 40rpx;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
@ -2081,8 +2081,8 @@
z-index: 277; z-index: 277;
border-top: 1rpx solid #f0f0f0; border-top: 1rpx solid #f0f0f0;
height: 100rpx; height: 100rpx;
height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ height: calc(120rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/ height: calc(120rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
} }
.product-con .footer .item { .product-con .footer .item {
@ -2120,7 +2120,7 @@
} }
.product-con .footer .bnt .bnts { .product-con .footer .bnt .bnts {
width: 222rpx; width: 444rpx;
text-align: center; text-align: center;
line-height: 76rpx; line-height: 76rpx;
color: #fff; color: #fff;

106
pages/order_details/index.vue
View File

@ -18,14 +18,18 @@
<view v-if="isGoodsReturn==false" class="pad30"> <view v-if="isGoodsReturn==false" class="pad30">
<view class='nav'> <view class='nav'>
<view class='navCon acea-row row-between-wrapper'> <view class='navCon acea-row row-between-wrapper'>
<view :class="!orderInfo.paid ? 'on':''">待付款</view> <view :class="orderInfo.status == 6 ? 'on':''">待审核</view>
<view :class="orderInfo.status == 7 ? 'on':''">待签约</view>
<view :class="orderInfo.paid && orderInfo.status == 0 ? 'on':''"> <view :class="orderInfo.paid && orderInfo.status == 0 ? 'on':''">
{{orderInfo.shippingType==1 ? '待发货':'待核销'}}</view> {{orderInfo.shippingType==1 ? '待发货':'待核销'}}</view>
<view :class="orderInfo.status == 1 ? 'on':''" v-if="orderInfo.shippingType == 1">待收货</view> <!-- <view :class="orderInfo.status == 2 ? 'on':''">待收货</view> -->
<view :class="orderInfo.status == 2 ? 'on':''">待评价</view> <view :class="orderInfo.status == 3 ? 'on':''">待评价</view>
<view :class="orderInfo.status == 3 ? 'on':''">已完成</view> <view :class="orderInfo.status == 4 ? 'on':'' || orderInfo.status == -4 ? 'on':''">已完成</view>
</view> </view>
<view class='progress acea-row row-between-wrapper'> <view class='progress acea-row row-between-wrapper'>
<view class='iconfont' <view class='iconfont'
:class='(!orderInfo.paid ? "icon-webicon318":"icon-yuandianxiao") + " " + ( orderInfo.paid ? "font_color":"")'> :class='(!orderInfo.paid ? "icon-webicon318":"icon-yuandianxiao") + " " + ( orderInfo.paid ? "font_color":"")'>
</view> </view>
@ -39,6 +43,8 @@
:class='(orderInfo.status == 1 ? "icon-webicon318":"icon-yuandianxiao") + " " +(orderInfo.status >= 1 ? "font_color":"")' :class='(orderInfo.status == 1 ? "icon-webicon318":"icon-yuandianxiao") + " " +(orderInfo.status >= 1 ? "font_color":"")'
v-if="orderInfo.shippingType == 1"></view> v-if="orderInfo.shippingType == 1"></view>
<view class='line' :class='orderInfo.status > 1 ? "bg_color":""'></view> <view class='line' :class='orderInfo.status > 1 ? "bg_color":""'></view>
<view class='iconfont' <view class='iconfont'
:class='(orderInfo.status == 2 ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 2 ? "font_color":"")'> :class='(orderInfo.status == 2 ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 2 ? "font_color":"")'>
</view> </view>
@ -120,7 +126,13 @@
</div> </div>
<!-- #endif --> <!-- #endif -->
</view> </view>
<!-- 加载logo -->
<view class="logobox" v-show="logoflag">
<image class="logoicon" :src="logoicon">
</image>
</view>
<view class="pad30"> <view class="pad30">
<!-- <view class='nav refund' v-if="orderInfo.refundStatus>0"> <!-- <view class='nav refund' v-if="orderInfo.refundStatus>0">
<view class="title"> <view class="title">
@ -251,18 +263,20 @@
</view> </view>
<view style='height:120rpx;'></view> <view style='height:120rpx;'></view>
<view class='footer acea-row row-right row-middle' v-if="isGoodsReturn==false"> <view class='footer acea-row row-right row-middle' v-if="isGoodsReturn==false">
<view class="qs-btn" v-if="!orderInfo.paid" @click.stop="cancelOrder">取消订单</view> <!-- <view class="qs-btn" v-if="!orderInfo.paid" @click.stop="cancelOrder">取消订单</view> -->
<view class='bnt bg_color' v-if="!orderInfo.paid" @tap='pay_open(orderInfo.orderId)'>立即付款</view> <view class='bnt bg_color' @click="btnback">返回</view>
<view class='bnt bg_color' v-if="orderInfo.status == 7" @tap='lijiqys(orderInfo.orderId,orderInfo.id)'>立即签约</view>
<navigator hover-class="none" :url="'/pages/users/goods_return/index?orderId='+orderInfo.orderId" <navigator hover-class="none" :url="'/pages/users/goods_return/index?orderId='+orderInfo.orderId"
class='bnt cancel' v-else-if="orderInfo.paid === true && orderInfo.refundStatus === 0 && orderInfo.type!==1">申请退款 class='bnt cancel' v-else-if="orderInfo.status == 4">申请退款
</navigator> </navigator>
<view class='bnt bg_color' v-if="orderInfo.combinationId > 0" @tap='goJoinPink'>查看拼团</view>
<!-- <view class='bnt bg_color' v-if="orderInfo.combinationId > 0" @tap='goJoinPink'>查看拼团</view>
<navigator class='bnt cancel' v-if="orderInfo.deliveryType == 'express' && orderInfo.status >0" <navigator class='bnt cancel' v-if="orderInfo.deliveryType == 'express' && orderInfo.status >0"
hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.orderId">查看物流 hover-class='none' :url="'/pages/users/goods_logistics/index?orderId='+ orderInfo.orderId">查看物流
</navigator> </navigator> -->
<view class='bnt bg_color' v-if="orderInfo.status==1" @tap='confirmOrder'>确认收货</view> <view class='bnt bg_color' v-if="orderInfo.status==4" @tap='confirmOrder'>确认收货</view>
<view class='bnt cancel' v-if="orderInfo.status==3" @tap='delOrder'>删除订单</view> <!-- <view class='bnt cancel' v-if="orderInfo.status==3" @tap='delOrder'>删除订单</view> -->
<view class='bnt bg_color' v-if="orderInfo.status==3 && orderInfo.type!==1 && againStatus !== 1 " @tap='goOrderConfirm'>再次购买</view> <view class='bnt bg_color' v-if="orderInfo.status==4" @tap='goOrderConfirm'>再次购买</view>
</view> </view>
</view> </view>
</view> </view>
@ -276,7 +290,8 @@
orderTake, orderTake,
orderDel, orderDel,
orderCancel, orderCancel,
qrcodeApi qrcodeApi,
getnowqy
} from '@/api/order.js'; } from '@/api/order.js';
import payment from '@/components/payment'; import payment from '@/components/payment';
import orderGoods from "@/components/orderGoods"; import orderGoods from "@/components/orderGoods";
@ -299,6 +314,7 @@
codeImg: '', codeImg: '',
qrcodeSize: 100, qrcodeSize: 100,
order_id: '', 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, evaluate: 0,
cartInfo: [], //购物车产品 cartInfo: [], //购物车产品
orderInfo: { orderInfo: {
@ -347,6 +363,8 @@
isShow:true, isShow:true,
theme:app.globalData.theme, theme:app.globalData.theme,
bgColor:'#e93323', bgColor:'#e93323',
logoflag: false,
https: '',
chatConfig:{ chatConfig:{
consumer_hotline:'', consumer_hotline:'',
telephone_service_switch:'0' telephone_service_switch:'0'
@ -403,6 +421,33 @@
// #endif // #endif
}, },
methods: { 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() { onClickService() {
if(this.chatConfig.telephone_service_switch === '1'){ if(this.chatConfig.telephone_service_switch === '1'){
uni.makePhoneCall({ uni.makePhoneCall({
@ -505,7 +550,6 @@
that.$set(that, 'system_store', res.data.systemStore); that.$set(that, 'system_store', res.data.systemStore);
that.$set(that, 'id', res.data.id); that.$set(that, 'id', res.data.id);
that.$set(that, 'cartInfo', res.data.orderInfoList); that.$set(that, 'cartInfo', res.data.orderInfoList);
console.log(this.orderInfo)
if (res.data.refundStatus != 0) { if (res.data.refundStatus != 0) {
that.isGoodsReturn = true; that.isGoodsReturn = true;
}; };
@ -695,6 +739,38 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
page {
position: relative;
}
.logobox {
width: 100%;
height: 100vh;
background-color: red;
position: fixed;
top: 0;
left: 0;
opacity: .5;
padding-top: 40%;
box-sizing: border-box;
background-color: rgb(223, 223, 223);
text-align: center;
z-index: 1;
}
.logoicon {
width: 260rpx;
height: 200rpx;
z-index: 99;
position: absolute;
top: 50%;
left: 50%;
transform: translateX(-50%);
}
.qs-btn { .qs-btn {
width: auto; width: auto;
height: 60rpx; height: 60rpx;

5
pages/user/index.vue
View File

@ -93,7 +93,8 @@
<view class="user-menus" style="margin-top: 20rpx;" @click.native="bindEdit('userMenus')"> <view class="user-menus" style="margin-top: 20rpx;" @click.native="bindEdit('userMenus')">
<view class="menu-title">我的服务</view> <view class="menu-title">我的服务</view>
<view class="list-box"> <view class="list-box">
<block v-for="(item,index) in MyMenus" :key="index"> <block v-for="(item,index) in MyMenus" :key="index"
v-if="item.id == 1622 || item.id == 1625|| item.id == 1626 || item.id == 1627|| item.id == 1628|| item.id == 1630|| item.id == 1631|| item.id == 1632|| item.id == 1634">
<view class="item" @click="menusTap(item.url)" <view class="item" @click="menusTap(item.url)"
v-if="!(item.url =='/pages/service/index' || (item.url =='/pages/users/user_spread_user/index' && !userInfo.isPromoter))"> v-if="!(item.url =='/pages/service/index' || (item.url =='/pages/users/user_spread_user/index' && !userInfo.isPromoter))">
<image :src="item.pic"></image> <image :src="item.pic"></image>
@ -358,7 +359,7 @@
that.orderMenu.forEach((item, index) => { that.orderMenu.forEach((item, index) => {
switch (item.title) { switch (item.title) {
case '审核中': case '审核中':
item.num = res.data.unPaidCount item.num = res.data.notAuditCount
break break
case '待发货': case '待发货':
item.num = res.data.unShippedCount item.num = res.data.unShippedCount

37
pages/users/inbound/index.vue Normal file
View File

@ -0,0 +1,37 @@
<template>
<view class="">
<web-view :src="https" @message="handleGetMessage"></web-view>
</view>
</template>
<script>
export default {
data() {
return {
https:''
}
},
onShow() {
},
onLoad(option) {
this.https = decodeURIComponent(option.https)
// console.log(option.http)
},
methods: {
handleGetMessage:function(e){
console.log(e)
if(e.detail.data[0].result == 'success'){
uni.navigateTo({
url:'/pages/users/signin/index'
})
}
}
}
}
</script>
<style>
</style>

12
pages/users/installment/index.vue
View File

@ -36,7 +36,7 @@
</view> </view>
</view> </view>
<view class="edu"> <view class="edu">
<text>￥6680</text> <text>￥{{sum}}</text>
<view class="wz"> <view class="wz">
销售金额 销售金额
</view> </view>
@ -45,13 +45,13 @@
<!-- 分期方式 --> <!-- 分期方式 -->
<view class="repayment"> <view class="repayment">
<view class="gap"> <view class="gap">
<text class="title">分期方式</text> <text class="gapwz">间隔：30天</text> <text class="title">分期方式</text> <text class="gapwz">间隔：{{fenqiobj.cycle}}天</text>
</view> </view>
<view class="qishu"> <view class="qishu">
<text>期数</text> <text>租期</text> <text>每期租金</text> <text>期数</text> <text>租期</text> <text>每期租金</text>
</view> </view>
<view class="date" style="margin-top: 40rpx;" v-for="(item,index) in installmentlist" :key="index"> <view class="date" style="margin-top: 40rpx;" v-for="(item,index) in installmentlist" :key="index">
<text>第{{item.installmentNumber}}期</text> <text>间隔：30天</text> <text> {{item.repaymentAmount}}</text> <text>第{{item.installmentNumber}}期</text> <text>间隔：{{fenqiobj.cycle}}天</text> <text> {{item.repaymentAmount}}</text>
</view> </view>
</view> </view>
@ -71,12 +71,15 @@
hireshou: '', //首期租金 hireshou: '', //首期租金
sum:0, sum:0,
num:0, //总租期 num:0, //总租期
fenqiobj:{}
} }
}, },
onLoad(option) { onLoad(option) {
this.fenqiobj = JSON.parse((option.fenqiobj))
this.cart = JSON.parse(option.cart) this.cart = JSON.parse(option.cart)
this.installmentlist = JSON.parse(option.list) this.installmentlist = JSON.parse(option.list)
this.hireshou = this.installmentlist[0].repaymentAmount this.hireshou = this.installmentlist[0].repaymentAmount
}, },
methods: { methods: {
@ -91,8 +94,9 @@
// 计算总金额 // 计算总金额
this.installmentlist.forEach((item, index) => { this.installmentlist.forEach((item, index) => {
this.num++ this.num++
this.sum += parseFloat(item.repaymentAmount) this.sum += parseFloat(item.repaymentAmount)
}) })
this.sum = parseFloat(this.sum).toFixed(2)
} }
} }
</script> </script>

47
pages/users/order_confirm/index.vue
View File

@ -155,7 +155,7 @@
</a> </a>
<view class="planjh"> <view class="planjh">
<text>首付金额</text> <text>首付金额</text>
<view class="datejt"><text class="detewzs">￥{{fenqiobj.downPaymentAmount}}</text></view> <view class="datejt"><text class="detewzs">￥{{downPaymentAmount}}</text></view>
</view> </view>
<view class="planjh"> <view class="planjh">
<text>还款周期(间隔)</text> <text>还款周期(间隔)</text>
@ -171,7 +171,7 @@
</view> </view>
<view class="planjh"> <view class="planjh">
<text>合计付款</text> <text>合计付款</text>
<view class="datejt"><text class="detewzs">￥{{fenqiobj.totalAmount}}</text></view> <view class="datejt"><text class="detewzs">￥{{totalAmount}}</text></view>
</view> </view>
<!-- 支付方式 --> <!-- 支付方式 -->
<!-- <view>支付方式</view> <!-- <view>支付方式</view>
@ -395,8 +395,11 @@
shopmey: 0, shopmey: 0,
orderNo: '', orderNo: '',
sfxx: '未完成', sfxx: '未完成',
fenqiobj: {} ,//分期还款信息 fenqiobj: {}, //分期还款信息
installmentobj:{} installmentobj: {},
downPaymentAmount: 0,
totalAmount: 0
}; };
}, },
computed: { computed: {
@ -407,7 +410,7 @@
markNum = 150 - this.mark.length markNum = 150 - this.mark.length
return markNum return markNum
} }
} },
}, },
watch: { watch: {
isLogin: { isLogin: {
@ -443,7 +446,7 @@
} else { } else {
toLogin(); toLogin();
} }
// this.installmentid = JSON.parse(localStorage.getItem('installments')).id // this.installmentid = JSON.parse(localStorage.getItem('installments')).id
// this.fenqiname = JSON.parse(localStorage.getItem('installments')).name // this.fenqiname = JSON.parse(localStorage.getItem('installments')).name
this.installmentobj = JSON.parse(this.$Cache.get('installments')) this.installmentobj = JSON.parse(this.$Cache.get('installments'))
@ -454,8 +457,8 @@
*/ */
onShow: function() { onShow: function() {
// console.log(this.$Cache.get('improvescode')) // console.log(this.$Cache.get('improvescode'))
if(this.$Cache.get('improvescode') == '操作成功'){ if (this.$Cache.get('improvescode') == '操作成功') {
this.sfxx = '已完成' this.sfxx = '已完成'
} }
let _this = this let _this = this
// wx.getLaunchOptionsSync // wx.getLaunchOptionsSync
@ -468,8 +471,12 @@
// 清除监听 // 清除监听
uni.$off('handClick'); uni.$off('handClick');
}) })
}, },
methods: { methods: {
// 页面加载请求分期计划 // 页面加载请求分期计划
getinstallmentpost: function() { getinstallmentpost: function() {
let data = { let data = {
@ -479,16 +486,18 @@
} }
getinstallment(data).then(res => { getinstallment(data).then(res => {
this.fenqiobj = res.data this.fenqiobj = res.data
this.downPaymentAmount = res.data.downPaymentAmount
this.totalAmount = res.data.totalAmount
this.installmentarr = res.data.userInstallmentBills this.installmentarr = res.data.userInstallmentBills
this.downPaymentAmount = parseFloat(this.downPaymentAmount).toFixed(2)
this.totalAmount = parseFloat(this.totalAmount).toFixed(2)
}) })
}, },
// 跳转到分期计划 // 跳转到分期计划
btnment() { btnment() {
uni.navigateTo({ uni.navigateTo({
url: '/pages/users/installment/index?list=' + JSON.stringify(this.installmentarr) + '&cart=' + url: '/pages/users/installment/index?list=' + JSON.stringify(this.installmentarr) + '&cart=' +
JSON.stringify(this.cartInfo) JSON.stringify(this.cartInfo) + '&fenqiobj=' + JSON.stringify(this.fenqiobj)
}) })
}, },
// 点击跳转到完善信息页面 // 点击跳转到完善信息页面
@ -742,6 +751,7 @@
onCreate(data) { onCreate(data) {
let that = this; let that = this;
orderCreate(data).then(res => { orderCreate(data).then(res => {
this.$Cache.set('ordernobh', res.data.orderNo)
that.getOrderPay(res.data.orderNo, '支付成功'); that.getOrderPay(res.data.orderNo, '支付成功');
}).catch(err => { }).catch(err => {
uni.hideLoading(); uni.hideLoading();
@ -1061,6 +1071,9 @@
// 点击选中 // 点击选中
btncheaced() { btncheaced() {
// uni.navigateTo({
// url:'/pages/users/signin/index'
// })
if (this.checkeds) { if (this.checkeds) {
this.checkeds = false this.checkeds = false
} else { } else {
@ -1071,7 +1084,7 @@
SubOrder(e) { SubOrder(e) {
let that = this, let that = this,
data = {}; data = {};
var aqq = /^[1-9][0-9]{4,10}@qq.com$/ var aqq = /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/
if (this.emitext == '') { if (this.emitext == '') {
return this.$util.Tips({ return this.$util.Tips({
title: '邮箱不能为空' title: '邮箱不能为空'
@ -1102,7 +1115,7 @@
shippingType: that.$util.$h.Add(that.shippingType, 1), shippingType: that.$util.$h.Add(that.shippingType, 1),
payChannel: that.payChannel, payChannel: that.payChannel,
uid: this.$store.getters.uid, uid: this.$store.getters.uid,
systemInstallmentsComboId:this.installmentobj.id, systemInstallmentsComboId: this.installmentobj.id,
type: 2, type: 2,
}; };
if (data.payType == 'yue' && parseFloat(that.userInfo.nowMoney) < parseFloat(that.totalPrice)) if (data.payType == 'yue' && parseFloat(that.userInfo.nowMoney) < parseFloat(that.totalPrice))
@ -1127,14 +1140,10 @@
let day = now.getDate(); // 获取日期 let day = now.getDate(); // 获取日期
let shi = now.toLocaleTimeString(); // 获取本地时间字符串 let shi = now.toLocaleTimeString(); // 获取本地时间字符串
this.timeString = year + '-' + month + '-' + day + ' ' + shi this.timeString = year + '-' + month + '-' + day + ' ' + shi
this.shopobj.shopmey = this.shopmey this.shopobj.shopmey = this.shopmey
this.shopobj.date = this.timeString this.shopobj.date = this.timeString
this.shopobj.preOrderNo = this.preOrderNo this.shopobj.orderNo = this.preOrderNo
uni.navigateTo({ uni.navigateTo({
url: '/pages/users/pay_success/index?shopobj=' + JSON.stringify(this.shopobj) url: '/pages/users/pay_success/index?shopobj=' + JSON.stringify(this.shopobj)
}) })

79
pages/users/order_improves/index.vue
View File

@ -82,7 +82,38 @@
<view class="name"> <view class="name">
<text>联系人手机</text> <input type="text" v-model="teladd" @blur="telinpadd" placeholder="请输入联系人手机" /> <text>联系人手机</text> <input type="text" v-model="teladd" @blur="telinpadd" placeholder="请输入联系人手机" />
</view> </view>
<view class="addname" v-if="flags">
<a href="javascript:;" @click="btnadd">
<view class="add">+</view>
<text>继续添加(有助于提高审核成功率)</text>
</a>
</view>
</view> </view>
<!-- 4 -->
<view class="emergency_contact" v-if="flaglxrs">
<view class="name" @click="openPopupadd('bottomadd')">
<view class="jinj">紧急联系人</view>
<view class="lianx"><text>{{lxrmorenadds}}</text> <uni-view data-v-064d693c=""
class="iconfont icon-jiantou"></uni-view></view>
</view>
<view class="name">
<text>联系人姓名</text> <input type="text" v-model="realNameadds" @blur="realNameinpadds"
placeholder="请输入联系人姓名" />
</view>
<view class="name">
<text>联系人手机</text> <input type="text" v-model="teladds" @blur="telinpadds" placeholder="请输入联系人手机" />
</view>
<view class="addname" v-if="flaga">
<a href="javascript:;" @click="btnadds">
<view class="add">+</view>
<text>继续添加(有助于提高审核成功率)</text>
</a>
</view>
</view>
<!-- 常用邮箱 --> <!-- 常用邮箱 -->
<view class="cye_mail"> <view class="cye_mail">
<view class="email"> <view class="email">
@ -150,10 +181,15 @@
shenfenpic: '', //身份证正面的base64格式 shenfenpic: '', //身份证正面的base64格式
shenfenpics: '', //身份证反面的base64格式 shenfenpics: '', //身份证反面的base64格式
flaglxr:false, flaglxr:false,
flaglxrs:false,
flags:true, flags:true,
lxrmorenadd:'请选择您与联系人的关系', lxrmorenadd:'请选择您与联系人的关系',
lxrmorenadds:'请选择您与联系人的关系',
teladd:'', teladd:'',
realNameadd:'' teladds:'',
realNameadd:'',
realNameadds:'',
flaga:false
} }
}, },
@ -236,6 +272,36 @@
}); });
} }
}, },
// 4
realNameinpadds(){
let that = this
let namepatten = /^[\u4e00-\u9fa5a-zA-Z\s\-]+$/
if (this.realNameadds == '') {
return that.$util.Tips({
title: '姓名不能为空'
});
} else if (namepatten.test(this.realNameadds)) {
} else {
return that.$util.Tips({
title: '请填写正确的姓名'
});
}
},
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: '请填写正确的手机号'
});
}
},
// 判断身份证 // 判断身份证
idcardinp() { 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)$/ 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)$/
@ -330,7 +396,7 @@
}, },
// 判断邮箱 // 判断邮箱
emitextinp() { emitextinp() {
let aqq = /^[1-9][0-9]{4,10}@qq.com$/ let aqq = /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/
if (this.emitext == '') { if (this.emitext == '') {
return this.$util.Tips({ return this.$util.Tips({
title: '常用邮箱不能为空' title: '常用邮箱不能为空'
@ -347,7 +413,7 @@
let namepatten = /^[\u4e00-\u9fa5a-zA-Z\s\-]+$/ //姓名正则 let namepatten = /^[\u4e00-\u9fa5a-zA-Z\s\-]+$/ //姓名正则
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)$/ //身份证正则 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)$/ //身份证正则
let photopatten = /^1[3456789]\d{9}$/ //手机号正则 let photopatten = /^1[3456789]\d{9}$/ //手机号正则
let aqq = /^[1-9][0-9]{4,10}@qq.com$/ //邮箱正则 let aqq = /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/ //邮箱正则
if (this.realName == '') { if (this.realName == '') {
return this.$util.Tips({ return this.$util.Tips({
title: '姓名不能为空' title: '姓名不能为空'
@ -468,7 +534,14 @@
btnadd() { btnadd() {
this.flaglxr = true this.flaglxr = true
this.flags = false this.flags = false
this.flaga = true
}, },
// 点击继续添加联系人
btnadds() {
this.flaga = false
this.flaglxrs = true
},

1324
pages/users/order_list/index.vue
View File

File diff suppressed because it is too large Load Diff

8
pages/users/pay_success/index.vue
View File

@ -7,7 +7,7 @@
</view> </view>
<view class="content"> <view class="content">
<view class="bd"> <view class="bd">
<view class="">订单编号</view> <text>{{shopobj.preOrderNo.length > 30 ? shopobj.preOrderNo.slice(0, 30) + '...' : shopobj.preOrderNo}}</text> <view class="">订单编号</view> <text>{{ordermo}}</text>
</view> </view>
<view class="bd"> <view class="bd">
<view class="">下单时间</view> <text>{{shopobj.date}}</text> <view class="">下单时间</view> <text>{{shopobj.date}}</text>
@ -29,12 +29,16 @@
export default { export default {
data() { data() {
return { return {
shopobj:{} shopobj:{},
ordermo:''
} }
}, },
onLoad(option) { onLoad(option) {
this.shopobj = JSON.parse(option.shopobj) this.shopobj = JSON.parse(option.shopobj)
}, },
onShow() {
this.ordermo = this.$Cache.get('ordernobh')
},
methods: { methods: {
}, },

7
pages/users/repayment/index.vue
View File

@ -40,6 +40,7 @@
}, },
onLoad() { onLoad() {
this.getData() this.getData()
// console.log(this.$Cache.get('orderno'))
}, },
methods: { methods: {
btnhk() { btnhk() {
@ -55,7 +56,7 @@
// 请求分期还款 // 请求分期还款
getData: function() { getData: function() {
let data = { let data = {
uid: this.$store.getters.uid, uid:this.$Cache.get('ordernobh'),
type: this.index type: this.index
} }
getreceivable(data).then(res => { getreceivable(data).then(res => {
@ -86,8 +87,8 @@
background-color: #fff; background-color: #fff;
padding-left: 36rpx; padding-left: 36rpx;
box-sizing: border-box; box-sizing: border-box;
padding-top: 108rpx; padding-top: 30rpx;
padding-bottom: 16rpx; padding-bottom: 20rpx;
display: flex; display: flex;
a { a {

149
pages/users/signin/index.vue Normal file
View File

@ -0,0 +1,149 @@
<template>
<view class="Pay_success">
<view class="successbox">
<image v-show="flag" src="../../../static/images/success.png" mode=""></image>
<view class="title">
签约 <text>{{text}}</text>
</view>
<view class="content" v-show="flag">
<view class="bd">
<view class="">订单编号</view> <text>{{orderNo}}</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> -->
<text class="text" v-show="flag">恭喜签约成功,您的宝贝将在一小时内发货</text>
</view>
<view class="" v-show="flag">
<navigator url="../../../pages/users/order_list/index" class="ckdj">查看订单</navigator>
<navigator url="../../../pages/index/index" open-type="switchTab" class="fhsy">返回首页</navigator>
</view>
</view>
</view>
</template>
<script>
import {
getqianyue
} from '@/api/order.js'
export default {
data() {
return {
shopobj: {},
orderNo: '',
id: '',
signStatus: '', //签约状态
flag: false,
text: '失败'
}
},
onLoad(option) {
this.id = this.$Cache.get('qyids')
this.orderNo = option.orderId
// this.shopobj = JSON.parse(option.shopobj)
this.getnews(this.id)
},
onShow() {
this.getnews(this.id)
},
methods: {
getnews(id) {
getqianyue(id).then(res => {
console.log(res, 11)
this.signStatus = 2
if (this.signStatus == 2) {
this.flag = true
this.text = '成功'
}
})
},
},
onReady() {
// 定时器
}
}
</script>
<style lang="less">
.Pay_success {
width: 100%;
margin-top: 200rpx;
background-color: #fff;
padding-bottom: 80rpx;
height: 100vh;
.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;
}
}
.text {
display: block;
color: #666;
margin-top: 40rpx;
}
}
.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>

2
pages/users/wechat_login/index.vue
View File

@ -74,7 +74,7 @@
data() { data() {
return { return {
isUp: false, // 绑定手机号手动输入弹窗 isUp: false, // 绑定手机号手动输入弹窗
phone: '', phone: '',
statusBarHeight: statusBarHeight, statusBarHeight: statusBarHeight,
isHome: false, isHome: false,
isPhoneBox: false, //授权手机号弹窗 isPhoneBox: false, //授权手机号弹窗