diff --git a/rc-busness/ajax/util.js b/rc-busness/ajax/util.js index eca95534..9be51c9c 100644 --- a/rc-busness/ajax/util.js +++ b/rc-busness/ajax/util.js @@ -33,6 +33,22 @@ let util = { } else { return 2; } + }, + checkPaytypeValidated($paytype) { + if(isWx && $paytype == 1) { + //return 3; + return true; + } else if(isWx && $paytype!=1) { + return false; + } + + if(!isMobile && $paytype == 1) { + //Desktop, use native pay + return true; + } else if(isMobile && $paytype == 2) { + return true; + } + return false; } } export default util; \ No newline at end of file diff --git a/rc-busness/pages/index.vue b/rc-busness/pages/index.vue index 264b56d6..77977c08 100644 --- a/rc-busness/pages/index.vue +++ b/rc-busness/pages/index.vue @@ -1070,6 +1070,7 @@ export default { mobileVideoPlaying: false, usertitle: "明星猫粮", dogtitle: "明星犬粮", + userdata:'999999', processinformation: [], catshi: [], userindex: 0, @@ -1413,7 +1414,6 @@ export default { // console.log("1"); // } if (this.realIndex == 2) { - console.log(vm.userdata.data.id) // setTimeout(() => { // var option = { // customer: { @@ -1496,7 +1496,11 @@ export default { watch: {}, mounted() { this.checkIsLogin(); - this.userdata = this.$store.state.userInfo; + if(this.$store.state.userInfo===undefined){ + this.userdata=' ' + }else{ + this.userdata = this.$store.state.userInfo.data.id; + } console.log(this.userdata); const that = this; @@ -1521,19 +1525,17 @@ export default { }, methods: { diaoqi(){ - console.log('----'); - setTimeout(() => { + var option = { customer: { id: "", name: "", email: "", mobile: "", - memberId: vm.userdata.data.id, + memberId: this.userdata, }, }; dis_livchat(option); - }, 500); }, ...mapMutations(["checkIsLogin"]), playMobileVideo(item) { diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue index 8b02832b..956a4e5a 100644 --- a/rc-busness/pages/personal/useraddress.vue +++ b/rc-busness/pages/personal/useraddress.vue @@ -140,10 +140,12 @@ import Myheader from "~/components/header.vue"; import MyFooter from '~/components/rc-footer.vue'; import tabs from "~/components/tabs.vue"; -import { customerorders, userindent, canceldanhao,generateOrderWX } from "../../ajax/getData"; +import util from "@/ajax/util"; +import { customerorders, userindent, canceldanhao, repayOrde } from "../../ajax/getData"; export default { data() { return { + util, crumbs:[ { path:'/personal/mypersonal/', @@ -346,28 +348,39 @@ export default { }, - //订单立即支付 - async getwei(item) { - console.log(item); - let postData = []; - let userPayData = { - userprice: item.salesAmount, - orderId:item.orderNumber, - userinformation:item.addressUserName + - " " + - item.phoneNumber, - wxPay: "weixin://wxpay/bizpayurl?pr=4RJbokxzz", - }; - this.$router.push({ - path: "/personal/userpay", - query: { - userData:item.orderNumber, - stype:1, - userPayData: JSON.stringify(userPayData), - }, - }); - }, + //订单立即支付 + async getwei(item) { + let data = await this.repayOrde(item.orderNumber); + if(data.code==1) { + let userPayData = { + userprice: item.usersalesAmount, + orderId: item.orderNumber, + userinformation: item.addressUserName + " " + item.addressPhoneNumber, + wxPay:data.msg + }; + this.$router.push({ + path: "/personal/userpay", + query: { + userData: item.orderNumber, + stype: 1, + userPayData: JSON.stringify(userPayData), + }, + }); + } else { + this.$message({ + type: "error", + message: "订单数据错误,请联系客服进行处理", + }); + } + }, + async repayOrde(ordernumber) { + let payType = this.util.pickPaytype(); + let res = await repayOrde(ordernumber, payType); + if (res) { + return res; + } + }, usertiaozhuan(item){ this.$router.push({ path: "/myorder/usertion", diff --git a/rc-busness/pages/personal/userpay.vue b/rc-busness/pages/personal/userpay.vue index a48b1c32..00a0e599 100644 --- a/rc-busness/pages/personal/userpay.vue +++ b/rc-busness/pages/personal/userpay.vue @@ -94,7 +94,9 @@
-
+
+ +
@@ -112,6 +114,7 @@ export default { data() { return { util, + h5payRedirectUrl:'', activeIndex: 0, paymentTimer:undefined, isSucess: false, @@ -176,6 +179,7 @@ export default { goPayH5() { let isMobile = this.util.isMobile(); if(this.userPayData.wxPay && isMobile) { + //this.$refs["h5SubmitForm"].action="http://47.96.75.242:10086/royalcanin/royalcanin/redirectUrlWXH5"; this.$refs["h5SubmitForm"].action=this.userPayData.wxPay; this.$refs["h5SubmitForm"].submit(); //window.location.href=this.userPayData.wxPay;; diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index 7680ffb9..5f92ae55 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -15,11 +15,11 @@ rc-border-colour--brand4 " > -
- -
+
+ +
-
- 适用年龄: - {{ curItem.tagUsedAge }} -
-
- 所属分类: - {{ curItem.categoryName }} - -
-
+
+ 适用年龄: + {{ curItem.tagUsedAge }} +
+
+ 所属分类: + {{ curItem.categoryName }} +
+
立即购买
- - +
商品价格: ¥{{ curItem.ecPrice }} - ¥{{ curItem.rsp }} + ¥{{ curItem.rsp }} + + 购买该商品你将获得{{ curItem.basePoint }}积分 - - 购买该商品你将获得{{curItem.basePoint}}积分 - - +
@@ -150,12 +146,22 @@
商品规格:
-
- - {{ item.specifications }} - -
-