Skip to content

飞
飞鹤小程序
Commit 3eaf072d authored by 王炽's avatar 王炽
Browse files
Options

Merge branch 'dev' of http://gitlab2.dui88.com/sparkprojects/20250528_FHQ1 into dev

parents abed3204 7393e457
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 64 deletions
.DS_Store
View file @ 3eaf072d
No preview for this file type
api/request.js
View file @ 3eaf072d
......@@ -15,7 +15,8 @@ const {
// request.js
// 通常可以吧 baseUrl 单独放在一个 js 文件了
const baseUrl = "http://172.16.224.178:7777/pmall";
// const baseUrl = "http://172.16.224.178:7777/pmall";
const baseUrl = "https://momclub-uat.feihe.com/pmall";
const request = (options = {}) => {
// 在这里可以对请求头进行一些设置
......
main.js
View file @ 3eaf072d
......@@ -2,7 +2,8 @@ import App from "./App";
// import apiRequest from "@/api/request.js";
import * as Pinia from 'pinia';
const BASE_URL = 'https://duiba.oss-cn-hangzhou.aliyuncs.com/fh/';
// const BASE_URL = 'https://duiba.oss-cn-hangzhou.aliyuncs.com/fh/';
const BASE_URL = 'https://firmus-member-test-1253290912.cos.ap-beijing.myqcloud.com/xmh-mini-program/';
// #ifndef VUE3
import Vue from "vue";
......
mock/brand.js
View file @ 3eaf072d
......@@ -58,7 +58,7 @@ export const brandObj = {
"contentImg": "0-1",
"contentImgLen": 20,
"shareTitle": "星飞帆经典 3段",
"shareImg": "brandpage/products/share/0/0_1.png",
"shareImg": "brandpage/products/share/0/0_1.jpg",
},
{
"bgUrl": "brandpage/pic_0_2.png",
......@@ -70,7 +70,7 @@ export const brandObj = {
"contentImg": "0-2",
"contentImgLen": 25,
"shareTitle": "星飞帆卓睿 3段",
"shareImg": "brandpage/products/share/0/0_2.png",
"shareImg": "brandpage/products/share/0/0_2.jpg",
},
{
"bgUrl": "brandpage/pic_0_3.png",
......@@ -82,7 +82,7 @@ export const brandObj = {
"contentImg": "0-3",
"contentImgLen": 28,
"shareTitle": "星飞帆卓耀 3段",
"shareImg": "brandpage/products/share/0/0_3.png",
"shareImg": "brandpage/products/share/0/0_3.jpg",
},
{
"bgUrl": "brandpage/pic_0_4.png",
......@@ -94,7 +94,7 @@ export const brandObj = {
"contentImg": "0-4",
"contentImgLen": 15,
"shareTitle": "爱本跃动蛋白营养粉",
"shareImg": "brandpage/products/share/0/0_4.png",
"shareImg": "brandpage/products/share/0/0_4.jpg",
},
{
"bgUrl": "brandpage/pic_0_5.png",
......@@ -106,7 +106,7 @@ export const brandObj = {
"contentImg": "0-5",
"contentImgLen": 15,
"shareTitle": "高钙奶酪泡芙脆",
"shareImg": "brandpage/products/share/0/0_5.png",
"shareImg": "brandpage/products/share/0/0_5.jpg",
},
{
"bgUrl": "brandpage/pic_0_6.png",
......@@ -118,7 +118,7 @@ export const brandObj = {
"contentImg": "0-6",
"contentImgLen": 5,
"shareTitle": "北纬47度黄糯玉米",
"shareImg": "brandpage/products/share/0/0_6.png",
"shareImg": "brandpage/products/share/0/0_6.jpg",
}
],
[
......@@ -132,7 +132,7 @@ export const brandObj = {
"contentImg": "1-1",
"contentImgLen": 20,
"shareTitle": "星飞帆经典 3段",
"shareImg": "brandpage/products/share/1/1_1.png",
"shareImg": "brandpage/products/share/1/1_1.jpg",
},
{
"bgUrl": "brandpage/pic_1_2.png",
......@@ -144,7 +144,7 @@ export const brandObj = {
"contentImg": "1-2",
"contentImgLen": 25,
"shareTitle": "星飞帆卓睿 3段",
"shareImg": "brandpage/products/share/1/1_2.png",
"shareImg": "brandpage/products/share/1/1_2.jpg",
},
{
"bgUrl": "brandpage/pic_1_3.png",
......@@ -156,7 +156,7 @@ export const brandObj = {
"contentImg": "1-3",
"contentImgLen": 28,
"shareTitle": "星飞帆卓耀 3段",
"shareImg": "brandpage/products/share/1/1_3.png",
"shareImg": "brandpage/products/share/1/1_3.jpg",
},
{
"bgUrl": "brandpage/pic_1_4.png",
......@@ -168,7 +168,7 @@ export const brandObj = {
"contentImg": "1-4",
"contentImgLen": 20,
"shareTitle": "星飞帆卓睿A2奶源",
"shareImg": "brandpage/products/share/1/1_4.png",
"shareImg": "brandpage/products/share/1/1_4.jpg",
},
{
"bgUrl": "brandpage/pic_1_5.png",
......@@ -180,7 +180,7 @@ export const brandObj = {
"contentImg": "1-5",
"contentImgLen": 28,
"shareTitle": "臻稚卓蓓 3段",
"shareImg": "brandpage/products/share/1/1_5.png",
"shareImg": "brandpage/products/share/1/1_5.jpg",
},
{
"bgUrl": "brandpage/pic_1_6.png",
......@@ -192,7 +192,7 @@ export const brandObj = {
"contentImg": "1-6",
"contentImgLen": 20,
"shareTitle": "臻爱倍护 3段",
"shareImg": "brandpage/products/share/1/1_6.png",
"shareImg": "brandpage/products/share/1/1_6.jpg",
}
],
[
......@@ -206,7 +206,7 @@ export const brandObj = {
"contentImg": "2-1",
"contentImgLen": 20,
"shareTitle": "爱本跃动蛋白营养粉",
"shareImg": "brandpage/products/share/2/2_1.png",
"shareImg": "brandpage/products/share/2/2_1.jpg",
},
{
"bgUrl": "brandpage/pic_2_2.png",
......@@ -218,7 +218,7 @@ export const brandObj = {
"contentImg": "2-2",
"contentImgLen": 15,
"shareTitle": "爱本牛初乳",
"shareImg": "brandpage/products/share/2/2_2.png",
"shareImg": "brandpage/products/share/2/2_2.jpg",
},
{
"bgUrl": "brandpage/pic_2_3.png",
......@@ -230,7 +230,7 @@ export const brandObj = {
"contentImg": "2-3",
"contentImgLen": 15,
"shareTitle": "爱本每日蛋白营养糊",
"shareImg": "brandpage/products/share/2/2_3.png",
"shareImg": "brandpage/products/share/2/2_3.jpg",
},
{
"bgUrl": "brandpage/pic_2_4.png",
......@@ -242,7 +242,7 @@ export const brandObj = {
"contentImg": "2-4",
"contentImgLen": 10,
"shareTitle": "爱本纤纤益生菌羽衣甘蓝蛋白粉",
"shareImg": "brandpage/products/share/2/2_4.png",
"shareImg": "brandpage/products/share/2/2_4.jpg",
},
{
"bgUrl": "brandpage/pic_2_5.png",
......@@ -254,7 +254,7 @@ export const brandObj = {
"contentImg": "2-5",
"contentImgLen": 10,
"shareTitle": "爱本参芝初乳肽",
"shareImg": "brandpage/products/share/2/2_5.png",
"shareImg": "brandpage/products/share/2/2_5.jpg",
},
{
"bgUrl": "brandpage/pic_2_6.png",
......@@ -266,7 +266,7 @@ export const brandObj = {
"contentImg": "2-6",
"contentImgLen": 15,
"shareTitle": "爱本悦眠功能粉",
"shareImg": "brandpage/products/share/2/2_6.png",
"shareImg": "brandpage/products/share/2/2_6.jpg",
}
],
[
......@@ -280,7 +280,7 @@ export const brandObj = {
"contentImg": "3-1",
"contentImgLen": 10,
"shareTitle": "爱上吃菜乳酪",
"shareImg": "brandpage/products/share/3/3_1.png"
"shareImg": "brandpage/products/share/3/3_1.jpg"
},
{
"bgUrl": "brandpage/pic_3_2.png",
......@@ -292,7 +292,7 @@ export const brandObj = {
"contentImg": "3-2",
"contentImgLen": 15,
"shareTitle": "高钙奶酪泡芙脆",
"shareImg": "brandpage/products/share/3/3_2.png",
"shareImg": "brandpage/products/share/3/3_2.jpg",
},
{
"bgUrl": "brandpage/pic_3_3.png",
......@@ -304,7 +304,7 @@ export const brandObj = {
"contentImg": "3-3",
"contentImgLen": 10,
"shareTitle": "高纤黑巧乳酪",
"shareImg": "brandpage/products/share/3/3_3.png",
"shareImg": "brandpage/products/share/3/3_3.jpg",
},
{
"bgUrl": "brandpage/pic_3_4.png",
......@@ -316,7 +316,7 @@ export const brandObj = {
"contentImg": "3-4",
"contentImgLen": 15,
"shareTitle": "超新星水果奶酪",
"shareImg": "brandpage/products/share/3/3_4.png",
"shareImg": "brandpage/products/share/3/3_4.jpg",
},
{
"bgUrl": "brandpage/pic_3_5.png",
......@@ -328,7 +328,7 @@ export const brandObj = {
"contentImg": "3-5",
"contentImgLen": 10,
"shareTitle": "厚切流心芝士片",
"shareImg": "brandpage/products/share/3/3_5.png",
"shareImg": "brandpage/products/share/3/3_5.jpg",
},
{
"bgUrl": "brandpage/pic_3_6.png",
......@@ -340,7 +340,7 @@ export const brandObj = {
"contentImg": "3-6",
"contentImgLen": 10,
"shareTitle": "嚼奶粉乳酪",
"shareImg": "brandpage/products/share/3/3_6.png",
"shareImg": "brandpage/products/share/3/3_6.jpg",
}
],
[
......@@ -354,7 +354,7 @@ export const brandObj = {
"contentImg": "4-1",
"contentImgLen": 5,
"shareTitle": "北纬47度白甜糯玉米",
"shareImg": "brandpage/products/share/4/4_1.png",
"shareImg": "brandpage/products/share/4/4_1.jpg",
},
{
"bgUrl": "brandpage/pic_4_2.png",
......@@ -366,7 +366,7 @@ export const brandObj = {
"contentImg": "4-2",
"contentImgLen": 5,
"shareTitle": "北纬47度黄糯玉米",
"shareImg": "brandpage/products/share/4/4_2.png",
"shareImg": "brandpage/products/share/4/4_2.jpg",
},
{
"bgUrl": "brandpage/pic_4_3.png",
......@@ -378,7 +378,7 @@ export const brandObj = {
"contentImg": "4-3",
"contentImgLen": 5,
"shareTitle": "北纬47度低GI水果玉米粒袋装",
"shareImg": "brandpage/products/share/4/4_3.png",
"shareImg": "brandpage/products/share/4/4_3.jpg",
},
{
"bgUrl": "brandpage/pic_4_4.png",
......@@ -390,7 +390,7 @@ export const brandObj = {
"contentImg": "4-4",
"contentImgLen": 5,
"shareTitle": "北纬47度东北烧烤味玉米段",
"shareImg": "brandpage/products/share/4/4_4.png",
"shareImg": "brandpage/products/share/4/4_4.jpg",
},
{
"bgUrl": "brandpage/pic_4_5.png",
......@@ -402,7 +402,7 @@ export const brandObj = {
"contentImg": "4-5",
"contentImgLen": 10,
"shareTitle": "N47°植物酵素乳",
"shareImg": "brandpage/products/share/4/4_5.png",
"shareImg": "brandpage/products/share/4/4_5.jpg",
},
{
"bgUrl": "brandpage/pic_4_6.png",
......@@ -414,7 +414,7 @@ export const brandObj = {
"contentImg": "4-6",
"contentImgLen": 8,
"shareTitle": "N47°水果玉米汁",
"shareImg": "brandpage/products/share/4/4_6.png",
"shareImg": "brandpage/products/share/4/4_6.jpg",
}
]
],
......
mock/node_brand.js
View file @ 3eaf072d
......@@ -58,7 +58,7 @@ const brandObj = {
"contentImg": "0-1",
"contentImgLen": 20,
"shareTitle": "星飞帆经典 3段",
"shareImg": "brandpage/products/share/0/0_1.png",
"shareImg": "brandpage/products/share/0/0_1.jpg",
},
{
"bgUrl": "brandpage/pic_0_2.png",
......@@ -70,7 +70,7 @@ const brandObj = {
"contentImg": "0-2",
"contentImgLen": 25,
"shareTitle": "星飞帆卓睿 3段",
"shareImg": "brandpage/products/share/0/0_2.png",
"shareImg": "brandpage/products/share/0/0_2.jpg",
},
{
"bgUrl": "brandpage/pic_0_3.png",
......@@ -82,7 +82,7 @@ const brandObj = {
"contentImg": "0-3",
"contentImgLen": 28,
"shareTitle": "星飞帆卓耀 3段",
"shareImg": "brandpage/products/share/0/0_3.png",
"shareImg": "brandpage/products/share/0/0_3.jpg",
},
{
"bgUrl": "brandpage/pic_0_4.png",
......@@ -94,7 +94,7 @@ const brandObj = {
"contentImg": "0-4",
"contentImgLen": 15,
"shareTitle": "爱本跃动蛋白营养粉",
"shareImg": "brandpage/products/share/0/0_4.png",
"shareImg": "brandpage/products/share/0/0_4.jpg",
},
{
"bgUrl": "brandpage/pic_0_5.png",
......@@ -106,7 +106,7 @@ const brandObj = {
"contentImg": "0-5",
"contentImgLen": 15,
"shareTitle": "高钙奶酪泡芙脆",
"shareImg": "brandpage/products/share/0/0_5.png",
"shareImg": "brandpage/products/share/0/0_5.jpg",
},
{
"bgUrl": "brandpage/pic_0_6.png",
......@@ -118,7 +118,7 @@ const brandObj = {
"contentImg": "0-6",
"contentImgLen": 5,
"shareTitle": "北纬47度黄糯玉米",
"shareImg": "brandpage/products/share/0/0_6.png",
"shareImg": "brandpage/products/share/0/0_6.jpg",
}
],
[
......@@ -132,7 +132,7 @@ const brandObj = {
"contentImg": "1-1",
"contentImgLen": 20,
"shareTitle": "星飞帆经典 3段",
"shareImg": "brandpage/products/share/1/1_1.png",
"shareImg": "brandpage/products/share/1/1_1.jpg",
},
{
"bgUrl": "brandpage/pic_1_2.png",
......@@ -144,7 +144,7 @@ const brandObj = {
"contentImg": "1-2",
"contentImgLen": 25,
"shareTitle": "星飞帆卓睿 3段",
"shareImg": "brandpage/products/share/1/1_2.png",
"shareImg": "brandpage/products/share/1/1_2.jpg",
},
{
"bgUrl": "brandpage/pic_1_3.png",
......@@ -156,7 +156,7 @@ const brandObj = {
"contentImg": "1-3",
"contentImgLen": 28,
"shareTitle": "星飞帆卓耀 3段",
"shareImg": "brandpage/products/share/1/1_3.png",
"shareImg": "brandpage/products/share/1/1_3.jpg",
},
{
"bgUrl": "brandpage/pic_1_4.png",
......@@ -168,7 +168,7 @@ const brandObj = {
"contentImg": "1-4",
"contentImgLen": 20,
"shareTitle": "星飞帆卓睿A2奶源",
"shareImg": "brandpage/products/share/1/1_4.png",
"shareImg": "brandpage/products/share/1/1_4.jpg",
},
{
"bgUrl": "brandpage/pic_1_5.png",
......@@ -180,7 +180,7 @@ const brandObj = {
"contentImg": "1-5",
"contentImgLen": 28,
"shareTitle": "臻稚卓蓓 3段",
"shareImg": "brandpage/products/share/1/1_5.png",
"shareImg": "brandpage/products/share/1/1_5.jpg",
},
{
"bgUrl": "brandpage/pic_1_6.png",
......@@ -192,7 +192,7 @@ const brandObj = {
"contentImg": "1-6",
"contentImgLen": 20,
"shareTitle": "臻爱倍护 3段",
"shareImg": "brandpage/products/share/1/1_6.png",
"shareImg": "brandpage/products/share/1/1_6.jpg",
}
],
[
......@@ -206,7 +206,7 @@ const brandObj = {
"contentImg": "2-1",
"contentImgLen": 20,
"shareTitle": "爱本跃动蛋白营养粉",
"shareImg": "brandpage/products/share/2/2_1.png",
"shareImg": "brandpage/products/share/2/2_1.jpg",
},
{
"bgUrl": "brandpage/pic_2_2.png",
......@@ -218,7 +218,7 @@ const brandObj = {
"contentImg": "2-2",
"contentImgLen": 15,
"shareTitle": "爱本牛初乳",
"shareImg": "brandpage/products/share/2/2_2.png",
"shareImg": "brandpage/products/share/2/2_2.jpg",
},
{
"bgUrl": "brandpage/pic_2_3.png",
......@@ -230,7 +230,7 @@ const brandObj = {
"contentImg": "2-3",
"contentImgLen": 15,
"shareTitle": "爱本每日蛋白营养糊",
"shareImg": "brandpage/products/share/2/2_3.png",
"shareImg": "brandpage/products/share/2/2_3.jpg",
},
{
"bgUrl": "brandpage/pic_2_4.png",
......@@ -242,7 +242,7 @@ const brandObj = {
"contentImg": "2-4",
"contentImgLen": 10,
"shareTitle": "爱本纤纤益生菌羽衣甘蓝蛋白粉",
"shareImg": "brandpage/products/share/2/2_4.png",
"shareImg": "brandpage/products/share/2/2_4.jpg",
},
{
"bgUrl": "brandpage/pic_2_5.png",
......@@ -254,7 +254,7 @@ const brandObj = {
"contentImg": "2-5",
"contentImgLen": 10,
"shareTitle": "爱本参芝初乳肽",
"shareImg": "brandpage/products/share/2/2_5.png",
"shareImg": "brandpage/products/share/2/2_5.jpg",
},
{
"bgUrl": "brandpage/pic_2_6.png",
......@@ -266,7 +266,7 @@ const brandObj = {
"contentImg": "2-6",
"contentImgLen": 15,
"shareTitle": "爱本悦眠功能粉",
"shareImg": "brandpage/products/share/2/2_6.png",
"shareImg": "brandpage/products/share/2/2_6.jpg",
}
],
[
......@@ -280,7 +280,7 @@ const brandObj = {
"contentImg": "3-1",
"contentImgLen": 10,
"shareTitle": "爱上吃菜乳酪",
"shareImg": "brandpage/products/share/3/3_1.png"
"shareImg": "brandpage/products/share/3/3_1.jpg"
},
{
"bgUrl": "brandpage/pic_3_2.png",
......@@ -292,7 +292,7 @@ const brandObj = {
"contentImg": "3-2",
"contentImgLen": 15,
"shareTitle": "高钙奶酪泡芙脆",
"shareImg": "brandpage/products/share/3/3_2.png",
"shareImg": "brandpage/products/share/3/3_2.jpg",
},
{
"bgUrl": "brandpage/pic_3_3.png",
......@@ -304,7 +304,7 @@ const brandObj = {
"contentImg": "3-3",
"contentImgLen": 10,
"shareTitle": "高纤黑巧乳酪",
"shareImg": "brandpage/products/share/3/3_3.png",
"shareImg": "brandpage/products/share/3/3_3.jpg",
},
{
"bgUrl": "brandpage/pic_3_4.png",
......@@ -316,7 +316,7 @@ const brandObj = {
"contentImg": "3-4",
"contentImgLen": 15,
"shareTitle": "超新星水果奶酪",
"shareImg": "brandpage/products/share/3/3_4.png",
"shareImg": "brandpage/products/share/3/3_4.jpg",
},
{
"bgUrl": "brandpage/pic_3_5.png",
......@@ -328,7 +328,7 @@ const brandObj = {
"contentImg": "3-5",
"contentImgLen": 10,
"shareTitle": "厚切流心芝士片",
"shareImg": "brandpage/products/share/3/3_5.png",
"shareImg": "brandpage/products/share/3/3_5.jpg",
},
{
"bgUrl": "brandpage/pic_3_6.png",
......@@ -340,7 +340,7 @@ const brandObj = {
"contentImg": "3-6",
"contentImgLen": 10,
"shareTitle": "嚼奶粉乳酪",
"shareImg": "brandpage/products/share/3/3_6.png",
"shareImg": "brandpage/products/share/3/3_6.jpg",
}
],
[
......@@ -354,7 +354,7 @@ const brandObj = {
"contentImg": "4-1",
"contentImgLen": 5,
"shareTitle": "北纬47度白甜糯玉米",
"shareImg": "brandpage/products/share/4/4_1.png",
"shareImg": "brandpage/products/share/4/4_1.jpg",
},
{
"bgUrl": "brandpage/pic_4_2.png",
......@@ -366,7 +366,7 @@ const brandObj = {
"contentImg": "4-2",
"contentImgLen": 5,
"shareTitle": "北纬47度黄糯玉米",
"shareImg": "brandpage/products/share/4/4_2.png",
"shareImg": "brandpage/products/share/4/4_2.jpg",
},
{
"bgUrl": "brandpage/pic_4_3.png",
......@@ -378,7 +378,7 @@ const brandObj = {
"contentImg": "4-3",
"contentImgLen": 5,
"shareTitle": "北纬47度低GI水果玉米粒袋装",
"shareImg": "brandpage/products/share/4/4_3.png",
"shareImg": "brandpage/products/share/4/4_3.jpg",
},
{
"bgUrl": "brandpage/pic_4_4.png",
......@@ -390,7 +390,7 @@ const brandObj = {
"contentImg": "4-4",
"contentImgLen": 5,
"shareTitle": "北纬47度东北烧烤味玉米段",
"shareImg": "brandpage/products/share/4/4_4.png",
"shareImg": "brandpage/products/share/4/4_4.jpg",
},
{
"bgUrl": "brandpage/pic_4_5.png",
......@@ -402,7 +402,7 @@ const brandObj = {
"contentImg": "4-5",
"contentImgLen": 10,
"shareTitle": "N47°植物酵素乳",
"shareImg": "brandpage/products/share/4/4_5.png",
"shareImg": "brandpage/products/share/4/4_5.jpg",
},
{
"bgUrl": "brandpage/pic_4_6.png",
......@@ -414,7 +414,7 @@ const brandObj = {
"contentImg": "4-6",
"contentImgLen": 8,
"shareTitle": "N47°水果玉米汁",
"shareImg": "brandpage/products/share/4/4_6.png",
"shareImg": "brandpage/products/share/4/4_6.jpg",
}
]
],
......
pages/product/product.vue
View file @ 3eaf072d
......@@ -37,7 +37,9 @@ export default {
this.contentImg = contentImg;
this.contentImgLen = contentImgLen;
this.shareTitle = shareTitle;
this.shareImg = this.$baseUrl + shareImg;
this.shareImg = this.$baseUrl + shareImg;
// this.shareImg = "https://yun.duiba.com//fh/"+shareImg;
console.log("this.shareImg:", this.shareImg);
......
pages/search/search.vue
View file @ 3eaf072d
......@@ -42,7 +42,7 @@
<view v-if="step !== 1 && tabIndex === 'content'" class="bgbox">
<view class="cardbox">
<view @tap="jumpLink(item.link)" class="card" v-for="(item, index) in resultList[tabIndex]" :key="index">
<image class="pic" :src="$baseUrl + item.img"></image>
<image mode="aspectFill" class="pic" :src="$baseUrl + item.img"></image>
<view class="desc">
{{ item.desc }}
</view>
......@@ -264,6 +264,7 @@ export default {
.pic {
width: 343rpx;
height: 343rpx;
border-radius: 32rpx;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment