diff --git a/rc-busness/ajax/getData.js b/rc-busness/ajax/getData.js index 319db10f..6e30dfdc 100644 --- a/rc-busness/ajax/getData.js +++ b/rc-busness/ajax/getData.js @@ -154,6 +154,17 @@ export const userLongin = (mobile, pet,address) => { } return fetch('member?type=get', data, 'POST' ) } + /** + * 登录和注册 + */ +export const userregOrLogin = (mobile) => { + var data = { + id:'', + mobile:mobile, + } + return fetch('regOrLogin?phoneNumber='+ mobile , data, 'POST' ) +} + //注册 export const useredit = (mobile, pet,address) => { diff --git a/rc-busness/assets/css/product-list.less b/rc-busness/assets/css/product-list.less index 7bcabaeb..5f257f68 100644 --- a/rc-busness/assets/css/product-list.less +++ b/rc-busness/assets/css/product-list.less @@ -5,6 +5,7 @@ ul li ol li em strong i { list-style: none; font-style: normal; } + .rc-main { //rc-main start margin-top:.23rem; diff --git a/rc-busness/assets/css/producted.less b/rc-busness/assets/css/producted.less index 730a0bef..256f7df2 100644 --- a/rc-busness/assets/css/producted.less +++ b/rc-busness/assets/css/producted.less @@ -10,6 +10,7 @@ overflow-y: auto; } } + .ts-tag-list { display: inline-flex; flex-wrap: wrap; @@ -115,6 +116,14 @@ } // 手机端 @media screen and (max-width:768px) { + .uservideo{ + width: 100%; + height: 100%; + video{ + width: 100%; + height: 100%; + } + } .ts-ecprice{ font-size:.625rem; } diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index 8aa6d15c..03801599 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -15,7 +15,12 @@ rc-border-colour--brand4 " > -
+
+ +
+
-
+
立即购买
@@ -274,7 +279,9 @@ 加入购物车 立即购买
- +
+ 立即购买 +
@@ -304,6 +311,7 @@ export default { let newlist = []; let curItem = {}; let chufang = {}; + let videolist=[]; let productAttachmentList = []; let userlistmenu = []; isRxGoods = (isRxGoods == '1'?true:false); @@ -318,7 +326,6 @@ export default { let data = await oncequery(mainProductCode); let outputObj = {}; if (data) { - console.log(data); chufang=data; outputObj = data; outputObj.productName = data.name; @@ -340,6 +347,7 @@ export default { let data = await goodsmessage(singleCode); if (data && data.data.length>0) { newlist.push(data.data[0]); + if(data.data[0].leftAllotment>0 && !stopLeftAllotmentChecking) { activeIndexa = stopIndex; curItem = data.data[0]; @@ -350,6 +358,8 @@ export default { } if(curItem.productAttachmentList != undefined) productAttachmentList = curItem.productAttachmentList; + let list=[]; + if(curItem.productName == undefined) curItem = newlist[0]; userbuy = true; @@ -370,6 +380,7 @@ export default { curItem, newlist, chufang, + videolist, productAttachmentList, userbuy } @@ -380,6 +391,9 @@ export default { userimage: require("../../assets/image/unused.png"), gotop: false, dialogInfo1: false, + videolist:[], + videoimg:'', + videoshow: false, name: [], userlist: [], drawlist: [], //用户可以领取的优惠券 @@ -452,6 +466,19 @@ export default { if (this.usermessage !== "" || this.usermessage.data !== undefined) { this.usermessage = this.$store.state.userInfo; this.productCode = this.$route.query.productCode; + //video显示 + this.productAttachmentList.map(element=>{ + if(element.attachmentPath.substring(element.attachmentPath.lastIndexOf(".")+1)=='mp4'){ + this.videolist=element.attachmentPath; + } + }) + this.videoimg=this.productAttachmentList[0].attachmentPath; + if(this.videolist.length>0){ + this.videoshow=true + }else{ + this.videoshow=false; + } + /* let stype = this.$route.query.stype; let isRxGoods = this.$route.query.isRxGoods; @@ -511,7 +538,6 @@ export default { this.newlist = data.data; } this.productAttachmentList = this.newlist[0].productAttachmentList; - this.userlistmenu = this.newlist[0].productAttachmentList; let changemess = JSON.stringify(this.userlistmenu); this.changemessage({ data: changemess }); diff --git a/rc-busness/pages/userlogin/login.vue b/rc-busness/pages/userlogin/login.vue index 37cdda96..dd302b96 100644 --- a/rc-busness/pages/userlogin/login.vue +++ b/rc-busness/pages/userlogin/login.vue @@ -75,10 +75,10 @@
@@ -86,18 +86,18 @@
--> -
+
-import { userLongin,sendMsg,vadatnmsg } from "../../ajax/getData"; +import { userLongin,sendMsg,vadatnmsg,userregOrLogin,inserdiscount } from "../../ajax/getData"; import { mapMutations } from "vuex"; import Myheader from "~/components/header.vue"; //引用头部公共组件 export default { @@ -152,6 +152,7 @@ export default { layerMSg: "手机格式不对", tel: "", password: "", + userdata:{}, allcheck:false, activeIndex: 0, tamp:'', @@ -171,9 +172,11 @@ export default { loading: false, usertitle: true, ifpassword: false, + verification:'',//验证码数据 + userislogin:[],//登录成功数据 checked: false, - inRank: false, - inRanka: false, + isRank: false, + isRanka: false, usercheckbox:false, swiperData: [ @@ -221,20 +224,45 @@ export default { // console.log(this.inRank); // }, methods: { + ...mapMutations(["changeClod","checkIsLogin"]), //全选 checkBoxa(e,order){ - let checked=e.target.checked; - console.log(checked) - + let checked=e.target.checked; + console.log(e.target.checked); + // this.isRank=e.target.checked; + // this.isRanka=e.target.checked; + if(order==3){ + this.allcheck=checked; + this.isRank=this.allcheck; + this.isRanka=this.allcheck; + }else if(order==2){ + this.isRank=e.target.checked; + } + else if(order==1){ + this.isRanka=e.target.checked; + } + console.log(this.isRank,this.isRanka); + if(this.isRanka==true && this.isRank==true){ + this.allcheck=true; + }else{ + this.allcheck=false; + } + // console.log(this.isRanka,this.isRank); + this.usercheckbox=this.allcheck; }, - - checkBox(e,order){ - console.log(e.target.checked) - this.usercheckbox=e.target.checked; - this.inRank= this.usercheckbox; - + //获取用户领取的优惠券 + async reglogin() { + let data = await getConfig(memberId, couponId); + let msg = '领取成功'; + if (data) { + if(data.code!='0') + msg = data.msg; + this.$message({ + type: "warning", + message: msg, + }); + } }, - ...mapMutations(["changeClod"]), //获取验证码 async usermsg() { //console.log("-----"); @@ -248,14 +276,35 @@ export default { }, + //添加优惠券 + async serdiscount (mobile,couponId) { + let data = await inserdiscount(mobile,couponId); + if(data){ + console.log(data); + } + //console.log(data); + }, + //发送验证码数据 async vadmsg() { //console.log("-----"); - let data = await vadatnmsg(this.sms,this.hash,this.tamp); + let data = await vadatnmsg(this.sms,this.hash,this.tamp); if(data){ return data; } + }, + //登录成功数据 + async userlogin() { + //console.log("-----"); + let data= await userregOrLogin(this.tel); + if(data){ + this.userislogin=data; + console.log(this.userislogin); + } + }, + + onClickHander(e) { console.log(e); }, @@ -293,11 +342,8 @@ export default { return } else{ - - let time = 60; let timer; - timer = setInterval(() => { time--; if (time === 0) { @@ -327,45 +373,75 @@ export default { }); return } - if(this.usercheckbox==false){ - //console.log('----'); + if(this.usercheckbox==false){ this.$message({ type: 'warning', - message: '请先同意隐私声明和账号使用协议' + message: '请先勾选相关协议' }); + return + } + if(this.usercheckbox==false){ + //console.log('----'); if (!/^[1][3,4,5,7,8][0-9]{9}$/.test(this.tel) || this.tel === "") { this.$message({ type: 'warning', message: '手机号码输入有误' }); + this.$message({ + type: 'warning', + message: '请先同意隐私声明和账号使用协议' + }); return - } } else{ - let data=await this.vadmsg(); + console.log('===') + let data=await this.vadmsg(); if(data.code=="1") { - data = await userLongin(this.tel); - if(data.msg=='SUCCESS'){ - this.$message({ + data = await userregOrLogin(this.tel); + console.log(data); + let token=JSON.stringify(data); + this.changeClod({ cloud: token }); + this.checkIsLogin(); + if(data.type==1){ + if(data.data.memberName===undefined){ + this.$message({ type: 'warning', - message: '登录成功' + message: '欢迎回来' }); + console.log('-----') + } + else{ + this.$message({ + type: 'warning', + message: '欢迎回来'+data.data.memberName + }); + } + }else if(data.type==2){ + this.$message({ + type: 'warning', + message: '恭喜注册成功' + }); + let couponId='0000000123'; + this.serdiscount(this.tel,couponId); + setTimeout(() => { + this.serdiscount(this.tel,"0000000140"); + }, 100); + setTimeout(() => { + this.serdiscount(this.tel,"0000000122"); + }, 500); + } this.$router.push({ path: "/", }); - let token=JSON.stringify(data); - this.changeClod({ cloud: token }); - return; - } - } - this.$message({ + }else{ + this.$message({ type: 'warning', - message: data.msg + message: data.msg, }); - return + } }}, }, };