Branch_chensl #113

Merged
root merged 3 commits from Branch_chensl into master 2024-11-11 10:11:26 +08:00
5 changed files with 139 additions and 37 deletions

View File

@ -56,3 +56,32 @@ export const getDiyTemplateProperty = async (id: number) => {
export const updateDiyTemplateProperty = async (data: DiyTemplateVO) => { export const updateDiyTemplateProperty = async (data: DiyTemplateVO) => {
return await request.put({ url: `/promotion/diy-template/update-property`, data }) return await request.put({ url: `/promotion/diy-template/update-property`, data })
} }
// 设置商品分类接口
export const setDiyProjuctClass = async (id) => {
return await request.get({
url: `/system/dict-data/diy-template-goods?id=` + id
})
}
// 获取商品分类接口
export const getDiyProjuctClass = async () => {
return await request.get({
url: `/system/dict-data/getGoods`
})
}
// 设置主题风格
export const setDiyZtClass = async (id) => {
return await request.get({
url: `/system/dict-data/diy-template-theme?id=` + id
})
}
// 获取主题风格
export const getDiyZtClass = async () => {
return await request.get({
url: `/system/dict-data/getTheme`
})
}

View File

@ -65,11 +65,11 @@ export const APP_LINK_GROUP_LIST = [
name: '商品搜索', name: '商品搜索',
path: '/pages/index/search' path: '/pages/index/search'
}, },
{ // {
name: '自定义页面', // name: '自定义页面',
path: '/pages/index/page', // path: '/pages/index/page',
type: APP_LINK_TYPE_ENUM.DIY_PAGE_DETAIL // type: APP_LINK_TYPE_ENUM.DIY_PAGE_DETAIL
}, // },
{ {
name: '客服', name: '客服',
path: '/pages/chat/index' path: '/pages/chat/index'
@ -78,13 +78,25 @@ export const APP_LINK_GROUP_LIST = [
name: '系统设置', name: '系统设置',
path: '/pages/public/setting' path: '/pages/public/setting'
}, },
{ // {
name: '常见问题', // name: '常见问题',
path: '/pages/public/faq' // path: '/pages/public/faq'
}, // },
{ {
name: '积分商城', name: '积分商城',
path: '/pages/public/faq' path: '/pages/index/page?id=3'
},
{
name:'我的积分',
path:'/pages/user/wallet/score'
},
{
name:'兑换记录',
path:'/pages/activity/point/exchange_list'
},
{
name:'积分商品列表',
path:'/pages/activity/point/exchange_listall?id=3'
} }
] ]
}, },
@ -111,11 +123,11 @@ export const APP_LINK_GROUP_LIST = [
path: '/pages/goods/seckill', path: '/pages/goods/seckill',
type: APP_LINK_TYPE_ENUM.PRODUCT_DETAIL_SECKILL type: APP_LINK_TYPE_ENUM.PRODUCT_DETAIL_SECKILL
}, },
{ // {
name: '促销列表', // name: '促销列表',
path: '/pages/goods/sales', // path: '/pages/goods/sales',
type: APP_LINK_TYPE_ENUM.PRODUCT_DETAIL_SECKILL // type: APP_LINK_TYPE_ENUM.PRODUCT_DETAIL_SECKILL
}, // },
{ {
name: '门店管理', name: '门店管理',
path: '/pages/user/goods_details_store/index', path: '/pages/user/goods_details_store/index',
@ -195,11 +207,12 @@ export const APP_LINK_GROUP_LIST = [
{ {
name: '充值记录', name: '充值记录',
path: '/pages/pay/recharge-log' path: '/pages/pay/recharge-log'
},
{
name: '核销记录',
path: '/pages/pay/recharge-log'
} }
// ,
// {
// name: '核销记录',
// path: '/pages/pay/recharge-log'
// }
] ]
}, },
{ {
@ -248,6 +261,18 @@ export const APP_LINK_GROUP_LIST = [
{ {
name: '会员中心', name: '会员中心',
path: '/pages/user/user_vip/index' path: '/pages/user/user_vip/index'
},
{
name:'付费会员',
path:'/pages/user/user_vip/list'
},
{
name:'预约中心',
path:'/pages/subscribe/subscribe'
},
{
name:'预约记录',
path:'pages/reservation_record/reservation_record'
} }
] ]
} }

View File

@ -69,10 +69,10 @@
</draggable> </draggable>
</el-scrollbar> </el-scrollbar>
<!-- 手机底部导航 --> <!-- 手机底部导航 -->
<div v-if="showTabBar" :class="['editor-design-bottom', 'component', 'cursor-pointer!']"> <!-- <div v-if="showTabBar" :class="['editor-design-bottom', 'component', 'cursor-pointer!']">
<ComponentContainer :component="tabBarComponent" :show-toolbar="false" <ComponentContainer :component="tabBarComponent" :show-toolbar="false"
:active="selectedComponent?.id === tabBarComponent.id" @click="handleTabBarSelected" /> :active="selectedComponent?.id === tabBarComponent.id" @click="handleTabBarSelected" />
</div> </div> -->
<!-- 固定布局的组件 操作按钮区 --> <!-- 固定布局的组件 操作按钮区 -->
<div class="fixed-component-action-group"> <div class="fixed-component-action-group">
<el-tag v-if="showPageConfig" size="large" <el-tag v-if="showPageConfig" size="large"

View File

@ -23,12 +23,11 @@
<script setup lang="ts"> <script setup lang="ts">
// TODO @ decorate index.vue // TODO @ decorate index.vue
import * as DiyTemplateApi from '@/api/mall/promotion/diy/template' import * as DiyTemplateApi from '@/api/mall/promotion/diy/template'
import * as DiyPageApi from '@/api/mall/promotion/diy/page'
import { useTagsdivStore } from '@/store/modules/tagsdiv' import { useTagsdivStore } from '@/store/modules/tagsdiv'
import { DiyComponentLibrary, PAGE_LIBS } from '@/components/DiyEditor/util' // DIY DiyEditor import { DiyComponentLibrary, PAGE_LIBS } from '@/components/DiyEditor/util' // DIY DiyEditor
import { toNumber } from 'lodash-es' import { toNumber } from 'lodash-es'
const message = useMessage() //
const currItem = ref(1); const currItem = ref();
function clickItem (val){ function clickItem (val){
currItem.value = val; currItem.value = val;
@ -39,9 +38,25 @@
} }
function save (){ function save (){
// currItem.value = val; setProjuctClass(currItem.value);
console.log("请求接口还没有写啊!!!!快让后端提供啊") // console.log("")
} }
//
const setProjuctClass = async (id) => {
const res = await DiyTemplateApi.setDiyProjuctClass(id);
console.log(res, "sssss");
if(res){
message.success('保存成功')
}
}
//
const getProjuctClass = async () => {
const res = await DiyTemplateApi.getDiyProjuctClass();
currItem.value = res
}
getProjuctClass()
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

View File

@ -10,21 +10,30 @@
<div class="ztfg"> <div class="ztfg">
<div class='top'> <div class='top'>
<div class="item" :class="currItem== 1 ? 'on': ''" @click="clickItem(1)"> <div class="item" :class="currItem== '' ? 'on': ''" @click="clickItem('')">
<div class="le" style="background: rgb(233, 52, 34);"></div>
<div class="ri">红色</div>
</div>
<div class="item" :class="currItem== 'blue' ? 'on': ''" @click="clickItem('blue')">
<div class="le"></div> <div class="le"></div>
<div class="ri">天空蓝</div> <div class="ri">天空蓝</div>
</div> </div>
<div class="item" :class="currItem== 2 ? 'on': ''" @click="clickItem(2)"> <div class="item" :class="currItem== 'lv' ? 'on': ''" @click="clickItem('lv')">
<div class="le" style="background:rgb(66, 202, 77);"></div> <div class="le" style="background:rgb(66, 202, 77);"></div>
<div class="ri">生鲜绿</div> <div class="ri">生鲜绿</div>
</div> </div>
</div> </div>
<div class="mainBottom"> <div class="mainBottom">
<div class='item' v-show="currItem== 1"> <div class='item' v-show="currItem== ''">
<img class="img"
src="https://zysc.fjptzykj.com:3000/shangcheng/667bbed3e719df73217b10d743eb880c1719cb294b6f50a81f78f597fdbcf351.png" style="width:300px;" />
</div>
<div class='item' v-show="currItem== 'blue'">
<img class="img" <img class="img"
src="https://zysc.fjptzykj.com:3000/shangcheng/4bffe9f0cee9605262a579ee45156c9e37a16e2a24035a0e49b8a4433075f793.jpg" /> src="https://zysc.fjptzykj.com:3000/shangcheng/4bffe9f0cee9605262a579ee45156c9e37a16e2a24035a0e49b8a4433075f793.jpg" />
</div> </div>
<div class='item' v-show="currItem== 2"> <div class='item' v-show="currItem== 'lv'">
<img class="img" <img class="img"
src="https://zysc.fjptzykj.com:3000/shangcheng/0d0a7ab210afb5cee674e402ca3ec197a30523687acbec2e8e5f16fb52075e9b.jpg" /> src="https://zysc.fjptzykj.com:3000/shangcheng/0d0a7ab210afb5cee674e402ca3ec197a30523687acbec2e8e5f16fb52075e9b.jpg" />
</div> </div>
@ -39,21 +48,45 @@
import { useTagsdivStore } from '@/store/modules/tagsdiv' import { useTagsdivStore } from '@/store/modules/tagsdiv'
import { DiyComponentLibrary, PAGE_LIBS } from '@/components/DiyEditor/util' // DIY DiyEditor import { DiyComponentLibrary, PAGE_LIBS } from '@/components/DiyEditor/util' // DIY DiyEditor
import { toNumber } from 'lodash-es' import { toNumber } from 'lodash-es'
const message = useMessage() //
const currItem = ref(1); const currItem = ref('blue');
function clickItem(val) { function clickItem(val) {
currItem.value = val; currItem.value = val;
} }
function cz(val) { function cz(val) {
currItem.value = 1; currItem.value = 'blue';
} }
function save() { function save() {
const val = '';
// currItem.value = val; // currItem.value = val;
console.log("请求接口还没有写啊!!!!快让后端提供啊") if(currItem.value == 'lv'){
setZtClass('lv')
}else if(currItem.value == 'blue'){
setZtClass('blue')
}else{
setZtClass('')
} }
// console.log("")
}
//
const setZtClass = async (id) => {
const res = await DiyTemplateApi.setDiyZtClass(id);
console.log(res, "sssss");
if(res || res == ''){
message.success('保存成功')
}
}
//
const getZtClass = async () => {
const res = await DiyTemplateApi.getDiyZtClass();
currItem.value = res
}
getZtClass()
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>