diff --git a/rc-busness/assets/css/addaddress.less b/rc-busness/assets/css/addaddress.less index c7f602c0..e5ace5db 100644 --- a/rc-busness/assets/css/addaddress.less +++ b/rc-busness/assets/css/addaddress.less @@ -52,6 +52,9 @@ display: none; } } + input { + padding-left: 16px; + } } diff --git a/rc-busness/assets/css/openaddress.less b/rc-busness/assets/css/openaddress.less index 6cd9ae5d..cfd8a9ea 100644 --- a/rc-busness/assets/css/openaddress.less +++ b/rc-busness/assets/css/openaddress.less @@ -104,7 +104,7 @@ margin:0 auto; } } img{ - width: 43px; + width: 28px; } .rc-foot{ display: flex; @@ -195,7 +195,7 @@ display: none; } } img{ - width: 43px; + width: 28px; } .rc-foot{ display: flex; diff --git a/rc-busness/assets/css/resentation.less b/rc-busness/assets/css/resentation.less new file mode 100644 index 00000000..f0e761b0 --- /dev/null +++ b/rc-busness/assets/css/resentation.less @@ -0,0 +1,69 @@ +.ts-resentation { + .ts-banner-swiper-container { + img { + width: 100%; + height: auto; + object-fit: contain; + } + } + .ts-product-list{ + position:relative; + li{ + border:none; + } + h2{ + word-break: break-all; + } + .rc-column { + box-sizing: border-box; + span { + height:auto; + &:first-child{ + height:5.625rem; + } + } + } + .desc { + width:13rem; + height:auto; + margin-left:auto; + margin-right:auto; + word-break: keep-all; + } + .swiper-slide { + padding-left:1rem; + padding-right:1rem; + } + } + /deep/.swiper-button-prev, /deep/.swiper-button-next { + color:#000; + &:after{ + font-size:1rem; + } + } + .ts-carousel-indicator{ + bottom:0; + /deep/.swiper-pagination-bullet{ + margin-left:.5rem; + } + /deep/.swiper-pagination-bullet-active{ + background:#E2001A; + } + &.center{ + width:100%; + text-align: center; + } + } +} + +@media screen and (max-width:768px) { + .ts-resentation { + .ts-product-list{ + .desc { + } + h2{ + font-size:1.375rem; + } + } + } +} \ No newline at end of file diff --git a/rc-busness/config/env-data.js b/rc-busness/config/env-data.js index 0643ef69..7dd43b3a 100644 --- a/rc-busness/config/env-data.js +++ b/rc-busness/config/env-data.js @@ -109,32 +109,86 @@ let devData={ ], }, ], - amature:[ - { - title: "中型幼犬离乳期全价奶糕", - productimage: "/images/dogfoot.png", - detail: "中心犬离乳期专属 高易再水合颗粒 帮助增强保护健康成长", - productCode:'17220400', - price: "¥263", - productList: [ - { - productCode: "17220400,17221000,1722040002,17220400F03", - }, - ], - }, - { - title: "皇家离乳期幼猫全价奶糕", - productimage: "/images/catfoot.png", - detail: "幼猫成长专属 支持幼猫自身保护力 为快速生长提供足够能量", - price: "¥189", - productCode:'20010200', - productList: [ - { - productCode: "20010200,20011000,20010040", - }, - ], - }, - ] + doggie: + { + 'dog':[ + { + title: "皇家小型幼犬离乳期全价奶糕", + productimage: "/images/doggie/dog-1.png", + detail: "小型幼犬离乳期专属 有助激发自身免疫力 顺利度过离乳期", + ecPrice: "¥80", + productCode:'16220100', + productList: [ + { + productCode: "16220100,16220300,16221000,1622010002,1622030002,16220100F03,16220300F03", + }, + ], + }, + { + title: "皇家中型幼犬离乳期全价奶糕", + productimage: "/images/doggie/dog-2.png", + detail: "中型犬离乳期专属 高易再水合颗粒 帮助增强保护健康成长", + productCode:'17220400', + price: "¥263", + productList: [ + { + productCode: "17220400,17221000,1722040002,17220400F03", + }, + ], + }, + { + title: "皇家大型幼犬离乳期全价奶糕", + productimage: "/images/doggie/dog-3.png", + detail: "大型犬离乳期专属 有助激发自身免疫力 顺利度过离乳期", + productCode:'18220400', + price: "¥254", + productList: [ + { + productCode: "18220400,18221500,1822040002,18220400F03", + }, + ], + }, + ], + 'cat':[ + { + title: "皇家离乳期幼猫全价奶糕", + productimage: "/images/doggie/cat-1.png", + detail: "幼猫成长专属 支持幼猫自身保护力 为快速生长提供足够能量", + price: "¥189", + productCode:'20010200', + productList: [ + { + productCode: "20010200,20011000,20010040", + }, + ], + }, + { + title: "皇家幼猫全价粮", + productimage: "/images/doggie/cat-2.png", + detail: "帮助支持自身保护力 高易消化呵护娇嫩肠胃 定制配比助力健康发育", + ecPrice: "¥146", + productCode:'2003004003', + productList: [ + { + productCode: "2003004003", + }, + ], + }, + { + title: "皇家绝育呵护幼猫全价粮", + productimage: "/images/doggie/cat-3.png", + detail: "有助维护泌尿系统健康 量身打造精准营养 量身定制专属颗粒", + ecPrice: "¥114", + productCode:'2036004003', + productList: [ + { + productCode: "2036004003,20360200", + }, + ], + } + ] + } + }; //Production data @@ -249,32 +303,85 @@ let prdData={ ], }, ], - amature:[ - { - title: "中型幼犬离乳期全价奶糕", - productimage: "/images/dogfoot.png", - detail: "中心犬离乳期专属 高易再水合颗粒 帮助增强保护健康成长", - ecPrice: "¥263", - productCode:'17220400', - productList: [ - { - productCode: "17220400,17220100,17221000,1722040002", - }, - ], - }, - { - title: "皇家离乳期幼猫全价奶糕", - productimage: "/images/catfoot.png", - detail: "幼猫成长专属 支持幼猫自身保护力 为快速生长提供足够能量", - ecPrice: "¥189", - productCode:'20010200', - productList: [ - { - productCode: "20010200,2001020002,20010200F03,2001004003", - }, - ], - }, - ] + doggie: + { + 'dog':[ + { + title: "皇家小型幼犬离乳期全价奶糕", + productimage: "/images/doggie/dog-1.png", + detail: "小型幼犬离乳期专属 有助激发自身免疫力 顺利度过离乳期", + ecPrice: "¥80", + productCode:'16220100', + productList: [ + { + productCode: "16220100,16220300,16221000,1622010002,1622030002,16220100F03,16220300F03", + }, + ], + }, + { + title: "皇家中型幼犬离乳期全价奶糕", + productimage: "/images/doggie/dog-2.png", + detail: "中型幼犬离乳期专属 高易再水合颗粒 帮助增强保护健康成长", + ecPrice: "¥263", + productCode:'17220400', + productList: [ + { + productCode: "17220400,17220100,17221000,1722040002", + }, + ], + }, + { + title: "皇家大型幼犬离乳期全价奶糕", + productimage: "/images/doggie/dog-3.png", + detail: "大型犬离乳期专属 有助激发自身免疫力 顺利度过离乳期", + productCode:'18220400', + price: "¥254", + productList: [ + { + productCode: "18220400,18221500,1822040002,18220400F03", + }, + ], + } + ], + 'cat':[ + { + title: "皇家离乳期幼猫全价奶糕", + productimage: "/images/doggie/cat-1.png", + detail: "幼猫成长专属 支持幼猫自身保护力 为快速生长提供足够能量", + ecPrice: "¥189", + productCode:'20010200', + productList: [ + { + productCode: "20010200,2001020002,20010200F03,2001004003", + }, + ], + }, + { + title: "皇家幼猫全价粮", + productimage: "/images/doggie/cat-2.png", + detail: "帮助支持自身保护力 高易消化呵护娇嫩肠胃 定制配比助力健康发育", + ecPrice: "¥146", + productCode:'2003004003', + productList: [ + { + productCode: "2003004003", + }, + ], + }, + { + title: "皇家绝育呵护幼猫全价粮", + productimage: "/images/doggie/cat-3.png", + detail: "有助维护泌尿系统健康 量身打造精准营养 量身定制专属颗粒", + ecPrice: "¥114", + productCode:'2036004003', + productList: [ + { + productCode: "2036004003,20360200", + }, + ], + }, + ] + } }; //Production data end let data = { diff --git a/rc-busness/nuxt.config.js b/rc-busness/nuxt.config.js index 9ee49b7f..1bc45c67 100644 --- a/rc-busness/nuxt.config.js +++ b/rc-busness/nuxt.config.js @@ -2,8 +2,8 @@ const trackingScript = 'var dataLayer = window.dataLayer = window.dataLayer || [ const assetsUrl = 'var assetsUrl="/royalcanin-cdn-assets-new/css_js/";var isInitialized=false;'; export default { env: { - //NODE_ENV: 'development' - NODE_ENV: 'production' + NODE_ENV: 'development' + //NODE_ENV: 'production' }, // Global page headers: https://go.nuxtjs.dev/config-head head: { @@ -100,4 +100,4 @@ export default { // } // }, -} +} \ No newline at end of file diff --git a/rc-busness/package.json b/rc-busness/package.json index d92fce52..0ba14800 100644 --- a/rc-busness/package.json +++ b/rc-busness/package.json @@ -31,7 +31,6 @@ "vuex-persistedstate": "^4.1.0" }, "devDependencies": { - "@vant/area-data": "^1.1.5", "qrcodejs2": "^0.0.2", "webpack": "^4.46.0" } diff --git a/rc-busness/pages/myorder/usertion.vue b/rc-busness/pages/myorder/usertion.vue index 2df60d1e..88ea5fc7 100644 --- a/rc-busness/pages/myorder/usertion.vue +++ b/rc-busness/pages/myorder/usertion.vue @@ -283,6 +283,13 @@ export default { if (this.payorsucess == "立即支付") { this.getwei(item); } else { + _hmt.push([ + "_trackCustomEvent", + "order_repay", + { + "status":"fail", + } + ]) this.$router.push({ path: "/productdetails/producted", query: { @@ -333,7 +340,13 @@ export default { userinformation: this.addressUserName + " " + this.addressPhoneNumber, wxPay:data.msg }; - + _hmt.push([ + "_trackCustomEvent", + "order_repay", + { + "status":"success", + } + ]) this.$router.push({ path: "/personal/userpay", query: { @@ -343,6 +356,13 @@ export default { }, }); } else { + _hmt.push([ + "_trackCustomEvent", + "order_repay", + { + "status":"fail - " + this.orderNumber, + } + ]) this.$message({ type: "error", message: "订单数据错误,请联系客服进行处理", diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue index 46566de4..9021a659 100644 --- a/rc-busness/pages/personal/useraddress.vue +++ b/rc-busness/pages/personal/useraddress.vue @@ -480,6 +480,13 @@ export default { this.showPaytypeWarning = !this.paytypeWarning.result; if(this.paytypeWarning.result) { if(item.status==0){ + _hmt.push([ + "_trackCustomEvent", + "order_repay", + { + "status":"success", + } + ]) this.getwei(item); }else{ this.$router.push({ @@ -490,6 +497,14 @@ export default { }, }); } + } else { + _hmt.push([ + "_trackCustomEvent", + "order_repay", + { + "status":"fail", + } + ]) } }, usertwo() { diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index 44434f2a..eb7b8d16 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -108,8 +108,8 @@ {{ curItem.categoryName }} -
- 立即购买 +
+ 立即购买
@@ -293,6 +293,7 @@ import FixRight from "~/components/fixed-right.vue"; import unlogin from "~/components/unlogin.vue"; import Myfooter from "~/components/rc-footer.vue"; import { mapMutations } from "vuex"; +import util from "@/ajax/util"; const settings = require("@/config"); import { goodsmessage, @@ -378,6 +379,7 @@ export default { }, data() { return { + util, tableLabelTest: [], userimage: require("../../assets/image/unused.png"), gotop: false, @@ -454,8 +456,16 @@ export default { mounted() { this.checkIsLogin(); // console.log(this.curItem); + if(this.isRxGoods) { + let isMobile = this.util.isMobile(); + this.curItem.goodUrl = JSON.parse(this.curItem.goodUrl); + if(isMobile) + this.curItem.curGoodUrl = this.curItem.goodUrl.mobile; + else + this.curItem.curGoodUrl = this.curItem.goodUrl.pc; + } + this.usermessage = this.$store.state.userInfo; if (this.usermessage !== "" || this.usermessage.data !== undefined) { - this.usermessage = this.$store.state.userInfo; this.productCode = this.$route.query.productCode; _hmt.push([ "_trackCustomEvent", @@ -703,8 +713,8 @@ export default { } }, userget() { - let user = localStorage.getItem("userInfo"); - if (user == undefined || user == null || user == "") { + let user = this.$store.state.userInfo; + if (!user) { this.dialogInfo2 = true; return; } else { diff --git a/rc-busness/pages/resentation/doggie.vue b/rc-busness/pages/resentation/doggie.vue new file mode 100644 index 00000000..5d07b845 --- /dev/null +++ b/rc-busness/pages/resentation/doggie.vue @@ -0,0 +1,239 @@ + + + + + \ No newline at end of file diff --git a/rc-busness/static/images/doggie/cat-1.png b/rc-busness/static/images/doggie/cat-1.png new file mode 100644 index 00000000..c2109224 Binary files /dev/null and b/rc-busness/static/images/doggie/cat-1.png differ diff --git a/rc-busness/static/images/doggie/cat-2.png b/rc-busness/static/images/doggie/cat-2.png new file mode 100644 index 00000000..ca6a8c69 Binary files /dev/null and b/rc-busness/static/images/doggie/cat-2.png differ diff --git a/rc-busness/static/images/doggie/cat-3.png b/rc-busness/static/images/doggie/cat-3.png new file mode 100644 index 00000000..53f430fb Binary files /dev/null and b/rc-busness/static/images/doggie/cat-3.png differ diff --git a/rc-busness/static/images/doggie/dog-1.png b/rc-busness/static/images/doggie/dog-1.png new file mode 100644 index 00000000..868341c2 Binary files /dev/null and b/rc-busness/static/images/doggie/dog-1.png differ diff --git a/rc-busness/static/images/doggie/dog-2.png b/rc-busness/static/images/doggie/dog-2.png new file mode 100644 index 00000000..d768d925 Binary files /dev/null and b/rc-busness/static/images/doggie/dog-2.png differ diff --git a/rc-busness/static/images/doggie/dog-3.png b/rc-busness/static/images/doggie/dog-3.png new file mode 100644 index 00000000..b9137a35 Binary files /dev/null and b/rc-busness/static/images/doggie/dog-3.png differ