Merge branch 'master' of http://101.126.146.73:3000/root/allLikeMall into khy-two
This commit is contained in:
commit
8ba9076b98
@ -15,14 +15,14 @@
|
||||
<div class="c">店主诚意推荐品质商品</div>
|
||||
<div class="b">
|
||||
<!-- GO! -->
|
||||
<img src="https://zysc.fjptzykj.com:3000/shangcheng/40a7582be7aeb5a6047415ab3a6728439a2798a4752ffcc1c063d66a534aa630.png"
|
||||
<img src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/40a7582be7aeb5a6047415ab3a6728439a2798a4752ffcc1c063d66a534aa630.png"
|
||||
class="img"/>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="r">
|
||||
<img
|
||||
src="https://zysc.fjptzykj.com:3000/shangcheng/c80faeeeb2d6dadcdbe7e6d1a4caa06869b94301612cdf157414a10559b38267.png"
|
||||
src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/c80faeeeb2d6dadcdbe7e6d1a4caa06869b94301612cdf157414a10559b38267.png"
|
||||
class="img"/>
|
||||
</div>
|
||||
</div>
|
||||
@ -38,13 +38,13 @@
|
||||
<div class="b">
|
||||
<!-- GO! -->
|
||||
<img
|
||||
src="https://zysc.fjptzykj.com:3000/shangcheng/5c72fc99989bf0a7e59b57f519c76c9a98cb20478384e20b1b934aa8f80cc598.png"
|
||||
src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/5c72fc99989bf0a7e59b57f519c76c9a98cb20478384e20b1b934aa8f80cc598.png"
|
||||
class="img"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="r">
|
||||
<img
|
||||
src="https://zysc.fjptzykj.com:3000/shangcheng/904fd4848fde8025ccc17693662efd5b7bf5ec3f2656ecc7de407c8c46f910b2.png"
|
||||
src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/904fd4848fde8025ccc17693662efd5b7bf5ec3f2656ecc7de407c8c46f910b2.png"
|
||||
class="img"/>
|
||||
</div>
|
||||
</div>
|
||||
@ -60,13 +60,13 @@
|
||||
<div class="b">
|
||||
<!-- GO! -->
|
||||
<img
|
||||
src="https://zysc.fjptzykj.com:3000/shangcheng/ebb2fc0512d1bd6a6d21a2c07f6603bfd2ea6f7e23377eb4cd8118d89d666589.png"
|
||||
src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/ebb2fc0512d1bd6a6d21a2c07f6603bfd2ea6f7e23377eb4cd8118d89d666589.png"
|
||||
class="img"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="r">
|
||||
<img
|
||||
src="https://zysc.fjptzykj.com:3000/shangcheng/7c71cbf2c757418302ea9ef2952893c24e1d46c4cc35a821f56be0f315bcabb0.png"
|
||||
src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/7c71cbf2c757418302ea9ef2952893c24e1d46c4cc35a821f56be0f315bcabb0.png"
|
||||
class="img"/>
|
||||
</div>
|
||||
</div>
|
||||
@ -82,13 +82,13 @@
|
||||
<div class="b">
|
||||
<!-- GO! -->
|
||||
<img
|
||||
src="https://zysc.fjptzykj.com:3000/shangcheng/aac8baa7a6feb9ee3459d1cf75ba9a7e8bacb5d93c88ac95c1b0ecd29b847f96.png"
|
||||
src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/aac8baa7a6feb9ee3459d1cf75ba9a7e8bacb5d93c88ac95c1b0ecd29b847f96.png"
|
||||
class="img"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="r">
|
||||
<img
|
||||
src="https://zysc.fjptzykj.com:3000/shangcheng/8a61c35d82702c61f97ef3db43a8d6755b2eca3d78a22dbaa55851e815e96a23.png"
|
||||
src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/8a61c35d82702c61f97ef3db43a8d6755b2eca3d78a22dbaa55851e815e96a23.png"
|
||||
class="img" />
|
||||
</div>
|
||||
</div>
|
||||
@ -124,7 +124,7 @@ defineProps<{ property: MenuGridProperty }>()
|
||||
font-size: 17px;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
|
||||
.sub {
|
||||
background: rgba(248, 79, 43);
|
||||
color: white;
|
||||
@ -134,14 +134,14 @@ defineProps<{ property: MenuGridProperty }>()
|
||||
font-size: 13px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.new-list {
|
||||
// width: 100%;
|
||||
margin-right:10px;
|
||||
.item {
|
||||
float: left;
|
||||
width: 50%;
|
||||
|
||||
|
||||
.nei {
|
||||
margin: 10px;
|
||||
margin-right:0;
|
||||
@ -150,20 +150,20 @@ defineProps<{ property: MenuGridProperty }>()
|
||||
border-radius: 10px;
|
||||
padding: 8px 10px;
|
||||
display: flex;
|
||||
|
||||
|
||||
.l {
|
||||
width: 50%;
|
||||
|
||||
|
||||
.t {
|
||||
// font-size: 17px;
|
||||
}
|
||||
|
||||
|
||||
.c {
|
||||
color: rgba(153, 153, 153);
|
||||
font-size: 12px;
|
||||
margin: 3px 0;
|
||||
}
|
||||
|
||||
|
||||
.b {
|
||||
// display: flex;
|
||||
// align-items: center;
|
||||
@ -175,27 +175,27 @@ defineProps<{ property: MenuGridProperty }>()
|
||||
// font-weight: 700;
|
||||
// padding: 0px 9px;
|
||||
// font-style: oblique;
|
||||
|
||||
|
||||
.img {
|
||||
width: 76%;
|
||||
height: 20px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.r {
|
||||
width: 49%;
|
||||
|
||||
|
||||
.img {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
</style>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<el-scrollbar class="z-1 min-h-30px" wrap-class="w-full" ref="containerRef">
|
||||
|
||||
|
||||
<div class="component">
|
||||
<div style="padding: 0px; border-radius: 0px; overflow: hidden;">
|
||||
<div class="min-h-42px flex flex-col">
|
||||
@ -8,7 +8,7 @@
|
||||
<div class="flex flex-1 flex-row items-center gap-8px">
|
||||
<div class="wh">
|
||||
<img class="new-text1"
|
||||
src="https://zysc.fjptzykj.com:3000/shangcheng/2f2be070c60ceb9466af937ff9dd8917ad2ee02f774dbac48fbb9e73bfc688d0.png" />
|
||||
src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/2f2be070c60ceb9466af937ff9dd8917ad2ee02f774dbac48fbb9e73bfc688d0.png" />
|
||||
<span class="new-text">拼团活动</span>
|
||||
</div>
|
||||
<span class="text-16px" style="color: rgb(187, 187, 187);">92人拼团成功</span>
|
||||
@ -160,12 +160,12 @@ onMounted(() => {
|
||||
padding:0 0;
|
||||
// width:42%;
|
||||
}
|
||||
|
||||
|
||||
:deep(.el-scrollbar__view) {
|
||||
background-color: white;
|
||||
border-radius: 12px;
|
||||
}
|
||||
|
||||
|
||||
.wh {
|
||||
position: relative;
|
||||
padding-right: 10px;
|
||||
@ -175,10 +175,10 @@ onMounted(() => {
|
||||
width:30px;
|
||||
}
|
||||
.new-text{
|
||||
font-weight: 700;
|
||||
font-weight: 700;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.wh::after {
|
||||
position: absolute;
|
||||
content: "";
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
<div class="flex flex-1 flex-row items-center gap-8px">
|
||||
<div class="wh">
|
||||
<img class="new-text1"
|
||||
src="https://zysc.fjptzykj.com:3000/shangcheng/cb995c399d784c08e27d8f56b0a63ace2d13af3a1ee6aba5a2da71868dc4cf00.png" />
|
||||
src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/cb995c399d784c08e27d8f56b0a63ace2d13af3a1ee6aba5a2da71868dc4cf00.png" />
|
||||
<span class="new-text">限时秒杀</span>
|
||||
</div>
|
||||
<div style="color: rgba(255, 51, 35, 1); font-size:15px;" class="title-text">
|
||||
@ -31,7 +31,7 @@
|
||||
gridTemplateColumns,
|
||||
}" style="padding:0 10px;">
|
||||
<!-- 商品 -->
|
||||
<!--
|
||||
<!--
|
||||
:style="{
|
||||
borderTopLeftRadius: `${property.borderRadiusTop}px`,
|
||||
borderTopRightRadius: `${property.borderRadiusTop}px`,
|
||||
@ -195,4 +195,4 @@
|
||||
border-right: 1px solid #ababab;
|
||||
transform: translateY(-50%);
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
||||
@ -44,7 +44,7 @@
|
||||
</div>
|
||||
|
||||
<div class="new-bottom">
|
||||
<img src="https://zysc.fjptzykj.com:3000/shangcheng/64776e2edc3c2f15295e7c3976ba301e08f9170f99a2e845d8f33bd65179b177.png"
|
||||
<img src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/64776e2edc3c2f15295e7c3976ba301e08f9170f99a2e845d8f33bd65179b177.png"
|
||||
alt="" />
|
||||
<div class="btn">
|
||||
立即开通
|
||||
@ -112,4 +112,4 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<!-- <el-image src="https://shopro.sheepjs.com/admin/static/images/shop/decorate/orderCardStyle.png" /> -->
|
||||
<el-image src=" https://zysc.fjptzykj.com:3000/shangcheng/0ba158a1a2de7d39c6cec22cfe54736237438f63893b09c7453b5b5e3482f826.png" />
|
||||
<el-image src=" https://zysc.fjptzykj.com/admin-api/infra/file/25/get/0ba158a1a2de7d39c6cec22cfe54736237438f63893b09c7453b5b5e3482f826.png" />
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { UserOrderProperty } from './config'
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
<div class="cz" @click="cz">重置</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="mainBottom">
|
||||
<div class='item' :class="currItem == 1 ? 'on': ''" @click="clickItem(1)">
|
||||
<img class="img" src="https://zysc.fjptzykj.com:3000/shangcheng/921278a710b8035ac2e4fd40a08f64e3652c5130c08c633b7e136714d57c1001.jpg" />
|
||||
<img class="img" src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/921278a710b8035ac2e4fd40a08f64e3652c5130c08c633b7e136714d57c1001.jpg" />
|
||||
<div class="text">样式1</div>
|
||||
</div>
|
||||
<div class='item' :class="currItem == 2 ? 'on': ''" @click="clickItem(2)">
|
||||
<img class="img" src="https://zysc.fjptzykj.com:3000/shangcheng/909ef630cff7cdc957962ae782ee9a882c86c35732140b1c9e013341fa559126.jpg" />
|
||||
<img class="img" src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/909ef630cff7cdc957962ae782ee9a882c86c35732140b1c9e013341fa559126.jpg" />
|
||||
<div class="text">样式2</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -28,20 +28,20 @@
|
||||
import { toNumber } from 'lodash-es'
|
||||
const message = useMessage() // 消息弹窗
|
||||
const currItem = ref();
|
||||
|
||||
|
||||
function clickItem (val){
|
||||
currItem.value = val;
|
||||
}
|
||||
|
||||
|
||||
function cz (val){
|
||||
currItem.value = 1;
|
||||
}
|
||||
|
||||
|
||||
function save (){
|
||||
setProjuctClass(currItem.value);
|
||||
// console.log("请求接口还没有写啊！！！！快让后端提供啊")
|
||||
}
|
||||
|
||||
|
||||
// 设置商品分类
|
||||
const setProjuctClass = async (id) => {
|
||||
const res = await DiyTemplateApi.setDiyProjuctClass(id);
|
||||
@ -50,7 +50,7 @@
|
||||
message.success('保存成功')
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// 获取商品分类
|
||||
const getProjuctClass = async () => {
|
||||
const res = await DiyTemplateApi.getDiyProjuctClass();
|
||||
@ -121,4 +121,4 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
||||
@ -34,24 +34,24 @@
|
||||
<div class="mainBottom">
|
||||
<div class='item' v-show="currItem== ''">
|
||||
<img class="img"
|
||||
src="https://zysc.fjptzykj.com:3000/shangcheng/f973a0a4648d476a25b14a29250356d065507a1b9134b6303d7acd0b2d2d9cc7.jpg"/>
|
||||
src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/f973a0a4648d476a25b14a29250356d065507a1b9134b6303d7acd0b2d2d9cc7.jpg"/>
|
||||
</div>
|
||||
|
||||
|
||||
<div class='item' v-show="currItem== 'blue'">
|
||||
<img class="img"
|
||||
src="https://zysc.fjptzykj.com:3000/shangcheng/f2c0e04f8491b618d691eb95c3df2f89ba565134cacc9b4e39ff96caa4d1cec0.jpg" />
|
||||
src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/f2c0e04f8491b618d691eb95c3df2f89ba565134cacc9b4e39ff96caa4d1cec0.jpg" />
|
||||
</div>
|
||||
<div class='item' v-show="currItem== 'lv'">
|
||||
<img class="img"
|
||||
src="https://zysc.fjptzykj.com:3000/shangcheng/1ba06619f3f87677b51dd735b03e0378da352abbe47b188dd43c58262ed47cca.jpg" />
|
||||
src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/1ba06619f3f87677b51dd735b03e0378da352abbe47b188dd43c58262ed47cca.jpg" />
|
||||
</div>
|
||||
<div class='item' v-show="currItem== 'pink'">
|
||||
<img class="img"
|
||||
src="https://zysc.fjptzykj.com:3000/shangcheng/13fd006f8883b492db10df8f1d03347b88c8836e68a603db874fd68bc01c7a71.jpg" />
|
||||
src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/13fd006f8883b492db10df8f1d03347b88c8836e68a603db874fd68bc01c7a71.jpg" />
|
||||
</div>
|
||||
<div class='item' v-show="currItem== 'orange'">
|
||||
<img class="img"
|
||||
src="https://zysc.fjptzykj.com:3000/shangcheng/da61c583680494e23a31f39acbb0246cf1d439080ceb53d85dc564da2c1ecfe9.jpg" />
|
||||
src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/da61c583680494e23a31f39acbb0246cf1d439080ceb53d85dc564da2c1ecfe9.jpg" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -91,7 +91,7 @@
|
||||
}
|
||||
// console.log("请求接口还没有写啊！！！！快让后端提供啊")
|
||||
}
|
||||
|
||||
|
||||
// 设置主题风格
|
||||
const setZtClass = async (id) => {
|
||||
const res = await DiyTemplateApi.setDiyZtClass(id);
|
||||
@ -100,7 +100,7 @@
|
||||
message.success('保存成功')
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// 获取商品分类
|
||||
const getZtClass = async () => {
|
||||
const res = await DiyTemplateApi.getDiyZtClass();
|
||||
@ -174,12 +174,12 @@
|
||||
background:rgb(28, 165, 233);
|
||||
}
|
||||
.ti{
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
.mainBottom {
|
||||
|
||||
|
||||
display: flex;
|
||||
|
||||
.item {
|
||||
@ -212,4 +212,4 @@
|
||||
}
|
||||
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
||||
@ -4,12 +4,12 @@
|
||||
<span style="display: flex;">
|
||||
<el-avatar
|
||||
style="border: 1px solid #f8f9ee;"
|
||||
src="https://zysc.fjptzykj.com:3000/shangcheng/29e07b7973621a1a9679744e18f2b4efd1fd50d857fe594879e813d67be3e2db.png"
|
||||
src="https://zysc.fjptzykj.com/admin-api/infra/file/25/get/29e07b7973621a1a9679744e18f2b4efd1fd50d857fe594879e813d67be3e2db.png"
|
||||
/>
|
||||
<span style="margin-left:5px;margin-top: 9px;">Marvin</span>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
|
||||
<el-divider style="border-color: #f5f5f5;margin-top: 15px;margin-bottom:15px;" />
|
||||
<div>
|
||||
<span style="color: #5d5d59;font-size: 13px ;">手机号</span><span style="margin-left: 47px;font-size: 14px ;">暂无</span>
|
||||
@ -21,7 +21,7 @@
|
||||
<span style="color: #5d5d59;font-size: 13px ;">用户标签</span><span style="margin-left: 33px;font-size: 14px ;">小客户</span>
|
||||
</div>
|
||||
<el-divider style="border-color: #f5f5f5;margin-top: 15px;margin-bottom:15px;" />
|
||||
|
||||
|
||||
<div>
|
||||
<span style="color: #5d5d59;font-size: 13px ;">用户等级</span><span style="margin-left: 35px;font-size: 14px ;">暂无</span>
|
||||
</div>
|
||||
@ -46,17 +46,17 @@
|
||||
|
||||
<script >
|
||||
import * as UserApi from '@/api/member/user'
|
||||
|
||||
|
||||
|
||||
|
||||
// const user = ref<UserApi.UserVO>({} as UserApi.UserVO)
|
||||
|
||||
|
||||
|
||||
|
||||
// const getUserId = async (id: string) => {
|
||||
// user.value = await UserApi.getUserInfo(id)
|
||||
// }
|
||||
// defineExpose({ getUserId })
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
<style>
|
||||
</style>
|
||||
</style>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user