diff --git a/rc-busness/ajax/getData.js b/rc-busness/ajax/getData.js index f1324f3a..8207ca71 100644 --- a/rc-busness/ajax/getData.js +++ b/rc-busness/ajax/getData.js @@ -208,17 +208,22 @@ export const userquery = (stype, ) => { return fetch('goods?petType='+stype, data, 'POST' ) } //处方信息 -export const userque = (goodsName, curPage,curRow) => { +export const userque = (goodsName, petType, curPage,curRow) => { if(!curPage) curPage=1; if(!curRow) curRow=10; - let queryTail='page='+curPage+'&rows='+curRow; + let queryTail='&page='+curPage+'&rows='+curRow; + let query='?0'; if(goodsName) - queryTail = '?goodsName='+goodsName; + query += '&goodsName='+goodsName; + if(petType!==undefined && petType!=='') { + query += '&petType='+petType; + } + query += queryTail; var data = { } - return fetch('goods'+queryTail, data, 'POST' ) + return fetch('goods'+query, data, 'POST' ) } diff --git a/rc-busness/config/env-data.js b/rc-busness/config/env-data.js index 8aa06cf6..0643ef69 100644 --- a/rc-busness/config/env-data.js +++ b/rc-busness/config/env-data.js @@ -1,4 +1,6 @@ let devData={ + newGuestCoupon:['0000000123','0000000140','0000000122'], + rxGoodsFilter:[{tagName:'体重管理',tagValue:'体重'},{tagName:'提升活力',tagValue:'活力'},{tagName:'泌尿道',tagValue:'泌尿'},{tagName:'消化道',tagValue:'消化'},{tagName:'皮肤',tagValue:'皮肤'}], catlistvideo:[ { title: "主食级猫湿粮", @@ -137,6 +139,8 @@ let devData={ //Production data let prdData={ + newGuestCoupon:['0000000123','0000000140','0000000122','HJXRL20210827'], + rxGoodsFilter:[{tagName:'体重管理',tagValue:'体重'},{tagName:'提升活力',tagValue:'活力'},{tagName:'泌尿道',tagValue:'泌尿'},{tagName:'消化道',tagValue:'消化'},{tagName:'皮肤',tagValue:'皮肤'}], catlistvideo:[ { title: "主食级猫湿粮", diff --git a/rc-busness/pages/index.vue b/rc-busness/pages/index.vue index bade979d..cf50c3db 100644 --- a/rc-busness/pages/index.vue +++ b/rc-busness/pages/index.vue @@ -1413,25 +1413,32 @@ export default { }, watch: {}, mounted() { - this.checkIsLogin(); + let popupMessage = this.$route.query.msg; + if(popupMessage) { + this.$message({ + type: 'success', + message: popupMessage, + }); + } + this.checkIsLogin(); - const that = this; + const that = this; - this.ifAdoid(); - this.usermessage = JSON.parse(localStorage.getItem("userInfo")); - if (this.usermessage == null || this.usermessage == undefined) { - this.userunlogin = true; - } - window.addEventListener("scroll", this.handleScroll, true); - this.userchufang(); //查询处方粮商品信息 + this.ifAdoid(); + this.usermessage = JSON.parse(localStorage.getItem("userInfo")); + if (this.usermessage == null || this.usermessage == undefined) { + this.userunlogin = true; + } + window.addEventListener("scroll", this.handleScroll, true); + this.userchufang(); //查询处方粮商品信息 - this.catmessage(); //查询猫的信息 - this.catclickGan(); - this.catclickShi(); + this.catmessage(); //查询猫的信息 + this.catclickGan(); + this.catclickShi(); - this.dogmessage(); //查询狗的信息 - this.userdogShi(); - this.userdogGan(); + this.dogmessage(); //查询狗的信息 + this.userdogShi(); + this.userdogGan(); }, destroyed() { window.removeEventListener("scroll", this.scrollToTop); @@ -1856,7 +1863,7 @@ export default { if (!item) item = this.discounchufang[0].title; this.dataLoaded = false; let list = []; - let data = await userque(item, 1, 8); + let data = await userque(item, '', 1, 8); if (data) { list = data.slice(0, 8); this.processinformation = list; diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue index 870ef892..88466d22 100644 --- a/rc-busness/pages/personal/settlement.vue +++ b/rc-busness/pages/personal/settlement.vue @@ -376,7 +376,7 @@ export default { userget(){ let user = this.$store.state.userInfo; if (user) { - this.userdraw(user.data.mobile); + //this.userdraw(user.data.mobile); this.dialogInfo1 = true; } else { this.$router.push({ @@ -392,7 +392,7 @@ export default { let valDateFromTime=0; let valDateToTime=0; let dateChecked=true; - + let avaliableCouponNum = 0; if (data) { this.drawlist=[]; for(let itemInCart of this.goldmedal) { @@ -423,10 +423,14 @@ export default { if(dateChecked && myCoupon.activityId != 10 && myCoupon.status == 0 && (!myCoupon.productCodes || myCoupon.productCodes.indexOf(itemInCart.productCode)>-1)) { data.data.splice(tmpIndex,1); _self.drawlist.push(myCoupon); + avaliableCouponNum++; } tmpIndex++; } } + if(avaliableCouponNum > 0) { + this.curCoupon.couponName = '有 '+avaliableCouponNum+' 张优惠券可以使用'; + } } }, pickCoupon(item){ @@ -537,8 +541,6 @@ export default { addressDetailInfo: orderAddress[0].detailAddress, }, }; - console.log(this.curCoupon,item.productCode,this.discountedProductCode); - debugger; if(this.curCoupon.couponId && item.productCode == this.discountedProductCode) { oneProduct.couponId = this.curCoupon.couponId; oneProduct.couponTypeId = this.curCoupon.couponTypeId; @@ -634,13 +636,17 @@ export default { "_trackCustomEvent", "placing_order", { - "product_id_":item.productCode, - "product_name_": item.productName, - "product_quantity_" : item.buyCount, - "product_amount_" : item.buyCount*item.productPrice, + "product_id":item.productCode, + "product_name": item.productName, + "product_quantity" : item.buyCount, + "product_amount" : item.buyCount*item.productPrice, } ]) }); + let user = this.$store.state.userInfo; + if(user) { + this.userdraw(user.data.mobile); + } // this.addressstype = this.$route.query.stype; // this.orderNumber = this.$route.query.orderNumber; // this.canceldanhao(this.orderNumber); diff --git a/rc-busness/pages/personal/userpay.vue b/rc-busness/pages/personal/userpay.vue index 11c4c97c..5746e85d 100644 --- a/rc-busness/pages/personal/userpay.vue +++ b/rc-busness/pages/personal/userpay.vue @@ -180,7 +180,7 @@ export default { "payment", { "payType" : payType, - "product_amount_" : this.userPayData.userprice, + "product_amount" : this.userPayData.userprice, } ]) }, @@ -241,7 +241,7 @@ export default { "payment_finished", { "payType" : 'native', - "product_amount_" : this.userPayData.userprice, + "product_amount" : this.userPayData.userprice, } ]) } else if (res.fail) { diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index bb126e16..44434f2a 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -114,14 +114,14 @@
- 商品价格： - ￥{{ curItem.ecPrice }} - ￥{{ curItem.rsp }} - - - 购买该商品你将获得{{curItem.basePoint}}积分 - + 商品价格： + ￥{{ curItem.ecPrice }} + ￥{{ curItem.rsp }} + + + 购买该商品你将获得{{curItem.basePoint}}积分 +
@@ -461,9 +461,9 @@ export default { "_trackCustomEvent", "product_visit", { - "product_id_":this.curItem.productCode, - "product_category_":this.curItem.categoryName, - "product_name_": this.curItem.productName, + "product_id":this.curItem.productCode, + "product_category":this.curItem.categoryName, + "product_name": this.curItem.productName, } ]) } @@ -479,11 +479,11 @@ export default { "_trackCustomEvent", "get_coupon", { - "product_id_":this.curItem.productCode, - "product_category_":this.curItem.categoryName, - "product_name_": this.curItem.productName, - "product_quantity_" : this.sales_num, - "product_amount_" : this.sales_num*this.curItem.ecPrice, + "product_id":this.curItem.productCode, + "product_category":this.curItem.categoryName, + "product_name": this.curItem.productName, + "product_quantity" : this.sales_num, + "product_amount" : this.sales_num*this.curItem.ecPrice, } ]) if (this.usermessage.data !== "" || this.usermessage.data !== undefined) { @@ -656,11 +656,11 @@ export default { "_trackCustomEvent", "add_to_cart", { - "product_id_":this.curItem.productCode, - "product_category_":this.curItem.categoryName, - "product_name_": this.curItem.productName, - "product_quantity_" : this.sales_num, - "product_amount_" : this.sales_num*this.curItem.ecPrice, + "product_id":this.curItem.productCode, + "product_category":this.curItem.categoryName, + "product_name": this.curItem.productName, + "product_quantity" : this.sales_num, + "product_amount" : this.sales_num*this.curItem.ecPrice, } ]) } @@ -685,11 +685,11 @@ export default { "_trackCustomEvent", "add_to_cart", { - "product_id_":this.curItem.productCode, - "product_category_":this.curItem.categoryName, - "product_name_": this.curItem.productName, - "product_quantity_" : this.sales_num, - "product_amount_" : this.sales_num*this.curItem.ecPrice, + "product_id":this.curItem.productCode, + "product_category":this.curItem.categoryName, + "product_name": this.curItem.productName, + "product_quantity" : this.sales_num, + "product_amount" : this.sales_num*this.curItem.ecPrice, } ]) diff --git a/rc-busness/pages/productdetails/productlist.vue b/rc-busness/pages/productdetails/productlist.vue index d11951f8..4dde4374 100644 --- a/rc-busness/pages/productdetails/productlist.vue +++ b/rc-busness/pages/productdetails/productlist.vue @@ -39,8 +39,8 @@ -
-
+
+

年龄:

-
-
+
+

功能:

-
-
+
+

品种:

+
+
+

功能:

+
    +
  1. + {{ item.tagName }} +
    2. +
+
@@ -313,12 +327,14 @@ import Myheader from "~/components/header.vue"; import MyFooter from '~/components/rc-footer.vue' import FixRight from "~/components/fixed-right.vue"; import tabs from "~/components/tabs.vue"; +import envData from "~/config/env-data.js"; import { userstype, biaome, biaomessage, searchchanpin, - userquery + userquery, + userque } from "../../ajax/getData"; export default { data() { @@ -328,6 +344,8 @@ export default { path:'/productdetails/productlist/', } ], + envData, + rxFilters:[], value: "", isLoading: false, userstype: [], @@ -507,13 +525,10 @@ export default { _self.chooseDefaultOptions(); //_self.usetmessage(); }); - /* - if (stype !== "" && stype !== undefined) { - this.onmessage(stype);//Wont happen - } else { - this.usetmessage(); - } - */ + //Handling RxGoods filter + let curEnv = process.env.NODE_ENV; + this.rxFilters = envData[curEnv].rxGoodsFilter; + //Handling RxGoods filter end }, methods: { async usersearch(stype, usertype) { @@ -598,7 +613,7 @@ export default { async usetmessage() { this.isLoading = true; - let data = await biaome(this.activeIndex1, "", 1, 10); + let data = await biaome(this.activeIndex1, "", 1, 20); if (data) { this.rccontair = data; this.isLoading = false; @@ -606,12 +621,21 @@ export default { }, async onmessage(stype) { this.isLoading = true; - let data = await biaomessage(stype, "", 1, 10); + let data = await biaomessage(stype, "", 1, 20); if (data) { this.rccontair = data; this.isLoading = false; } }, + async getRxGoodsByFunc(functionName) { + this.isLoading = true; + let petType = this.activeIndex1; + let data = await userque(functionName, petType, 1, 20); + if (data) { + this.rccontair = data; + this.isLoading = false; + } + }, chooseDefaultOptions(){ let tagStatus = this.routeParams.tagStatus; let categoryName = this.routeParams.categoryName; @@ -713,8 +737,24 @@ export default { else { this.prefecture[this.rxGoodsIndexPointer].checked=false; this.inRxGoods=false; + for(let tmp of this.rxFilters) { + tmp.checked = false; + } } }, + selectFilter(item) { + for(let tmp of this.rxFilters) { + if(item.tagValue == tmp.tagValue) { + item.checked = !item.checked; + } else { + tmp.checked = false; + } + } + if(item.checked) + this.getRxGoodsByFunc(item.tagValue); + else + this.getRxGoodsByFunc(); + }, resetAllOptions(){ let _self = this; let categoriesSelectionEles=this.prefecture; @@ -725,6 +765,7 @@ export default { allSelectionEles.forEach(function(tmp,index){ tmp.checked=false; }); + this.checkRxGoods(false); this.userserachlist = [ { categoryName: [], //专区 diff --git a/rc-busness/pages/resentation/resentation.vue b/rc-busness/pages/resentation/resentation.vue index 9b6aff63..2d3182b8 100644 --- a/rc-busness/pages/resentation/resentation.vue +++ b/rc-busness/pages/resentation/resentation.vue @@ -22,7 +22,7 @@ :key="index" class="rc-margin-top--md" > -

{{ index==1?'明星犬粮':'明星猫粮' }}

+

{{ index==1?'明星猫粮':'明星犬粮' }}

点击查看立即购买
diff --git a/rc-busness/pages/userlogin/login.vue b/rc-busness/pages/userlogin/login.vue index dd302b96..e1f39cab 100644 --- a/rc-busness/pages/userlogin/login.vue +++ b/rc-busness/pages/userlogin/login.vue @@ -144,47 +144,49 @@