diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index 731e59d4..4ddce0ae 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -205,7 +205,13 @@ picture { white-space: normal; color: #E2001A; } - + .desc { + height:3.8rem; + white-space: break-spaces; + word-break: keep-all; + margin:1rem auto; + line-height:1.9rem; + } i { font-style: normal; font-size: 1.125rem; diff --git a/rc-busness/config/async/env.js b/rc-busness/config/async/env.js index 8ff9739b..8479749d 100644 --- a/rc-busness/config/async/env.js +++ b/rc-busness/config/async/env.js @@ -9,7 +9,7 @@ let baseUrl = 'http://47.96.75.242:10086/royalcanin/royalcanin/' if (process.env.NODE_ENV === 'development') { baseUrl = 'http://47.96.75.242:10086/royalcanin/royalcanin/'; } else if (process.env.NODE_ENV === 'production') { - baseUrl = 'https://shop.royalcanin.com.cn/royalcanin/royalcanin/royalcanin/'; + baseUrl = '/royalcanin/royalcanin/royalcanin/'; } export { baseUrl, diff --git a/rc-busness/config/env-data.js b/rc-busness/config/env-data.js new file mode 100644 index 00000000..e2a89aa1 --- /dev/null +++ b/rc-busness/config/env-data.js @@ -0,0 +1,281 @@ +let devData={ + catlistvideo:[ + { + title: "主食级猫湿粮", + video: "/images/cat/one.mp4", + catimage: "/images/cat/one.jpg", + productimage: "/images/cat/star-1.png", + detail: "为10柔软细腻慕斯 适合离乳期幼猫舔食", + price: "¥372", + productList: [ + { + productCode: "80240008F24", + }, + ], + }, + { + title: "幼猫成长专属", + video: "/images/cat/two.mp4", + catimage: "/images/cat/two.jpg", + productimage: "/images/cat/star-2.png", + detail: "支持幼猫自身保护力 为快速生长提供足够能量", + price: "¥33", + productList: [ + { + productCode: "20030040", + }, + ], + }, + { + title: "室内成猫专属", + video: "/images/cat/three.mp4", + catimage: "/images/cat/three.jpg", + productimage: "/images/cat/star-3.png", + detail: "高易消化蛋白 减少粪便量和异味", + price: "¥157", + productList: [ + { + productCode: "21100200", + }, + ], + }, + { + title: "英短成猫专属", + video: "/images/cat/four.mp4", + catimage: "/images/cat/four.jpg", + productimage: "/images/cat/star-4.png", + detail: "增强肌肉质量 支持骨骼与关节健康", + price: "¥402", + productList: [ + { + productCode: "23040450", + }, + ], + } + ], + doglistvideo: [ + { + title: "主食级狗湿粮", + video: "/images/dog/one.mp4", + catimage: "/images/dog/one.jpg", + productimage: "/images/dog/star-1.png", + detail: "柔软细腻慕斯 适合离乳期幼犬舔食", + price: "¥359", + productList: [ + { + productCode: "81220020F12", + }, + ], + }, + { + title: "贵宾成犬专属", + video: "/images/dog/two.mp4", + catimage: "/images/dog/two.jpg", + productimage: "/images/dog/star-2.png", + detail: "护肤靓毛 理想体态", + price: "¥562", + productList: [ + { + productCode: "14200300", + }, + ], + }, + { + title: "小型犬成犬专属", + video: "/images/dog/three.mp4", + catimage: "/images/dog/three.jpg", + productimage: "/images/dog/star-3.png", + detail: "亮泽被毛 呵护牙齿", + price: "¥57", + productList: [ + { + productCode: "16020080", + }, + ], + }, + { + title: "离乳期全价奶糕", + video: "/images/dog/four.mp4", + catimage: "/images/dog/four.jpg", + productimage: "/images/dog/star-4.png", + detail: "高易再水合颗粒 帮助增强保护健康成长", + price: "¥263", + productList: [ + { + productCode: "17220400", + }, + ], + }, + ], + 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", + }, + ], + }, + ] + }; + +//Production data +let prdData={ + catlistvideo:[ + { + title: "主食级猫湿粮", + video: "/images/cat/one.mp4", + catimage: "/images/cat/one.jpg", + productimage: "/images/cat/star-1.png", + detail: "为10柔软细腻慕斯 适合离乳期幼猫舔食", + price: "¥77", + productList: [ + { + productCode: "80240008F24", + }, + ], + }, + { + title: "幼猫成长专属", + video: "/images/cat/two.mp4", + catimage: "/images/cat/two.jpg", + productimage: "/images/cat/star-2.png", + detail: "支持幼猫自身保护力 为快速生长提供足够能量", + price: "¥146", + productList: [ + { + productCode: "20030200,2003004003", + }, + ], + }, + { + title: "室内成猫专属", + video: "/images/cat/three.mp4", + catimage: "/images/cat/three.jpg", + productimage: "/images/cat/star-3.png", + detail: "高易消化蛋白 减少粪便量和异味", + price: "¥140", + productList: [ + { + productCode: "21100200,2110020002", + }, + ], + }, + { + title: "英短成猫专属", + video: "/images/cat/four.mp4", + catimage: "/images/cat/four.jpg", + productimage: "/images/cat/star-4.png", + detail: "增强肌肉质量 支持骨骼与关节健康", + price: "¥183", + productList: [ + { + productCode: "23040200,2304004003,2304020002,23040450,23041000", + }, + ], + } + ], + doglistvideo: [ + { + title: "主食级狗湿粮", + video: "/images/dog/one.mp4", + catimage: "/images/dog/one.jpg", + productimage: "/images/dog/star-1.png", + detail: "柔软细腻慕斯 适合离乳期幼犬舔食", + price: "¥78", + productList: [ + { + productCode: "81220020F03,81220020F06,81220020F12", + }, + ], + }, + { + title: "贵宾成犬专属", + video: "/images/dog/two.mp4", + catimage: "/images/dog/two.jpg", + productimage: "/images/dog/star-2.png", + detail: "护肤靓毛 理想体态", + price: "¥241", + productList: [ + { + productCode: "14560300,1456030002,14560750", + }, + ], + }, + { + title: "小型犬成犬专属", + video: "/images/dog/three.mp4", + catimage: "/images/dog/three.jpg", + productimage: "/images/dog/star-3.png", + detail: "亮泽被毛 呵护牙齿", + price: "¥121", + productList: [ + { + productCode: "10030200,10030800,1003020002", + }, + ], + }, + { + title: "离乳期全价奶糕", + video: "/images/dog/four.mp4", + catimage: "/images/dog/four.jpg", + productimage: "/images/dog/star-4.png", + detail: "高易再水合颗粒 帮助增强保护健康成长", + price: "¥88", + productList: [ + { + productCode: "16220100,16220300,16221000,1622010002,1622030002,16220100F03,16220300F03", + }, + ], + }, + ], + amature:[ + { + title: "中型幼犬离乳期全价奶糕", + productimage: "/images/dogfoot.png", + detail: "中心犬离乳期专属 高易再水合颗粒 帮助增强保护健康成长", + ecPrice: "¥263", + productCode:'17220400', + productList: [ + { + productCode: "17220400,17221000,1722040002,17220400F03", + }, + ], + }, + { + title: "皇家离乳期幼猫全价奶糕", + productimage: "/images/catfoot.png", + detail: "幼猫成长专属 支持幼猫自身保护力 为快速生长提供足够能量", + ecPrice: "¥189", + productCode:'20010200', + productList: [ + { + productCode: "20010200,20011000,20010040", + }, + ], + }, + ] + }; +//Production data end +let data = { + 'development':devData, + 'production':prdData +}; + +export default data; \ No newline at end of file diff --git a/rc-busness/pages/index.vue b/rc-busness/pages/index.vue index fb27a3b2..5aacad61 100644 --- a/rc-busness/pages/index.vue +++ b/rc-busness/pages/index.vue @@ -1032,7 +1032,7 @@ --> - +
@@ -1048,6 +1048,7 @@ import FixRight from "~/components/fixed-right.vue"; import Myfooter from "~/components/rc-footer.vue"; import unlogin from "~/components/unlogin.vue"; import { mapMutations } from "vuex"; +import envData from "~/config/env-data.js"; import { userquery, postCourseId, @@ -1066,6 +1067,7 @@ export default { dataLoaded: true, usermargin: { marginTop: "0" }, useraindex: 0, + envData, indexacindex:0, mobileVideoPlaying: false, usertitle: "明星猫粮", @@ -1257,6 +1259,7 @@ export default { ], catlistvideo: [ + ], doglistvideo: [ @@ -1311,7 +1314,7 @@ export default { // console.log("1"); // } if (this.realIndex == 2) { - console.log(vm.userdata.data.id) + // setTimeout(() => { // var option = { // customer: { @@ -1391,128 +1394,13 @@ export default { created() { vm = this; let curEnv = process.env.NODE_ENV; - let envVariable = { - 'development':{ - catlistvideo:[ - { - title: "主食级猫湿粮", - video: "/images/cat/one.mp4", - catimage: "/images/cat/one.jpg", - productimage: "/images/cat/star-1.png", - detail: "为10柔软细腻慕斯 适合离乳期幼猫舔食", - price: "¥372", - productList: [ - { - productCode: "80240008F24", - }, - ], - }, - { - title: "幼猫成长专属", - video: "/images/cat/two.mp4", - catimage: "/images/cat/two.jpg", - productimage: "/images/cat/star-2.png", - detail: "支持幼猫自身保护力 为快速生长提供足够能量", - price: "¥33", - productList: [ - { - productCode: "20030040", - }, - ], - }, - { - title: "室内成猫专属", - video: "/images/cat/three.mp4", - catimage: "/images/cat/three.jpg", - productimage: "/images/cat/star-3.png", - detail: "高易消化蛋白 减少粪便量和异味", - price: "¥157", - productList: [ - { - productCode: "21100200", - }, - ], - }, - { - title: "英短成猫专属", - video: "/images/cat/four.mp4", - catimage: "/images/cat/four.jpg", - productimage: "/images/cat/star-4.png", - detail: "增强肌肉质量 支持骨骼与关节健康", - price: "¥402", - productList: [ - { - productCode: "23040450", - }, - ], - } - ], - doglistvideo: [ - { - title: "主食级狗湿粮", - video: "/images/dog/one.mp4", - catimage: "/images/dog/one.jpg", - productimage: "/images/dog/star-1.png", - detail: "柔软细腻慕斯 适合离乳期幼犬舔食", - price: "¥359", - productList: [ - { - productCode: "81220020F12", - }, - ], - }, - { - title: "贵宾成犬专属", - video: "/images/dog/two.mp4", - catimage: "/images/dog/two.jpg", - productimage: "/images/dog/star-2.png", - detail: "护肤靓毛 理想体态", - price: "¥562", - productList: [ - { - productCode: "14200300", - }, - ], - }, - { - title: "小型犬成犬专属", - video: "/images/dog/three.mp4", - catimage: "/images/dog/three.jpg", - productimage: "/images/dog/star-3.png", - detail: "亮泽被毛 呵护牙齿", - price: "¥57", - productList: [ - { - productCode: "16020080", - }, - ], - }, - { - title: "离乳期全价奶糕", - video: "/images/dog/four.mp4", - catimage: "/images/dog/four.jpg", - productimage: "/images/dog/star-4.png", - detail: "高易再水合颗粒 帮助增强保护健康成长", - price: "¥263", - productList: [ - { - productCode: "17220400", - }, - ], - }, - ] - }, - 'production':{} - } - this.catlistvideo = envVariable[curEnv].catlistvideo; - this.doglistvideo = envVariable[curEnv].doglistvideo; + this.catlistvideo = envData[curEnv].catlistvideo; + this.doglistvideo = envData[curEnv].doglistvideo; }, watch: {}, mounted() { - console.log(process.env.NODE_ENV,' mounted'); this.checkIsLogin(); - this.userdata = this.$store.state.userInfo; - console.log(this.userdata); + const that = this; this.ifAdoid(); @@ -1535,29 +1423,10 @@ export default { window.removeEventListener("scroll", this.scrollToTop); }, methods: { + ...mapMutations(["checkIsLogin"]), diaoqi(){ - setTimeout(() => { - var option = { - customer: { - id: "", - name: "", - email: "", - mobile: "", - memberId: vm.userdata.data.id, - }, - }; - dis_livchat(option); - _hmt.push([ - "_trackCustomEvent", - "sol_consult", - { - "page":this.$route.path, - "shop_head_banner": 1, - } - ]) - }, 500); + this.$refs['fixRightComponent'].lianxi({title:'营养专家'}); }, - ...mapMutations(["checkIsLogin"]), playMobileVideo(item) { let videoPath = item.video; let player = this.$refs["mobile-video-player"]; diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index 214c12c9..fd956bf6 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -1,781 +1,781 @@ - - - - - \ No newline at end of file diff --git a/rc-busness/pages/resentation/resentation.vue b/rc-busness/pages/resentation/resentation.vue new file mode 100644 index 00000000..9b6aff63 --- /dev/null +++ b/rc-busness/pages/resentation/resentation.vue @@ -0,0 +1,130 @@ + + + + + \ No newline at end of file diff --git a/rc-busness/static/images/catfoot.png b/rc-busness/static/images/catfoot.png new file mode 100644 index 00000000..8527b1e1 Binary files /dev/null and b/rc-busness/static/images/catfoot.png differ diff --git a/rc-busness/static/images/dogfoot.png b/rc-busness/static/images/dogfoot.png new file mode 100644 index 00000000..17f358a4 Binary files /dev/null and b/rc-busness/static/images/dogfoot.png differ diff --git a/rc-busness/static/images/rc-phone.png b/rc-busness/static/images/rc-phone.png new file mode 100644 index 00000000..ef5b625f Binary files /dev/null and b/rc-busness/static/images/rc-phone.png differ diff --git a/rc-busness/static/images/userbanner.png b/rc-busness/static/images/userbanner.png new file mode 100644 index 00000000..7a17b7b8 Binary files /dev/null and b/rc-busness/static/images/userbanner.png differ