diff --git a/src/api/shop.ts b/src/api/shop.ts index 35cc06a..5dd38e4 100644 --- a/src/api/shop.ts +++ b/src/api/shop.ts @@ -25,6 +25,15 @@ export function storeInfo(id: string) { }) } +//开店帮分类内容列表 +export function storemainList(data: any) { + return request.http({ + url: '/api/huiqitong/store/list', + method: 'GET', + data + }) +} + //金融帮信息列表 export function financeList(data: any) { return request.http({ diff --git a/src/pages/index/active/activeDetail.vue b/src/pages/index/active/activeDetail.vue index 23e3655..b59b388 100644 --- a/src/pages/index/active/activeDetail.vue +++ b/src/pages/index/active/activeDetail.vue @@ -1,24 +1,24 @@ + \ No newline at end of file diff --git a/src/pages/index/bnbdetail.vue b/src/pages/index/bnbdetail.vue index 811e12a..088d602 100644 --- a/src/pages/index/bnbdetail.vue +++ b/src/pages/index/bnbdetail.vue @@ -8,7 +8,7 @@ {{ titleData.title }} - + {{ titleData.create_time }} @@ -23,6 +23,7 @@ import { ReportDetail } from '@/api/shop' +import uvparse from '@/uni_modules/uv-parse/components/uv-parse/uv-parse.vue' const titleData = ref([]) diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index a17e55e..2ec339a 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -1,76 +1,80 @@ + .container { + background-color: #f1f3f9; + height: calc(100vh - 182rpx); + padding-bottom: 90rpx; + + :deep(.u-navbar__content__left__text) { + font-family: Source Han Sans; + font-size: 24rpx; + font-weight: 300; + line-height: normal; + display: flex; + align-items: flex-end; + letter-spacing: normal; + color: #333333; + } + + :deep(.u-navbar__content__title) { + font-family: Source Han Sans; + font-size: 36rpx; + font-weight: 500; + line-height: normal; + display: flex; + align-items: flex-end; + letter-spacing: normal; + color: #333333; + } + } + + .indicator { + @include flex(row); + margin-top: 40rpx; + justify-content: center; + + &__dot { + height: 16rpx; + width: 16rpx; + border-radius: 200rpx; + background-color: rgba(0, 127, 255, 0.4); + margin: 0 10rpx; + transition: background-color 0.3s; + } + + .indicator__dotactive { + background-color: #007FFF; + } + } + + .box { + margin-top: -140rpx; + position: relative; + border-radius: 85rpx 85rpx 0 0; + background-color: #f1f3f9; + padding: 30rpx 24rpx 0 24rpx; + + .zuanti { + width: 100%; + height: 160rpx; + border-radius: 134rpx; + margin-top: 30rpx; + } + + .scroll-view_H { + margin-top: 30rpx; + white-space: nowrap; + width: 100%; + + .hdCard { + display: inline-block; + width: 248rpx; + height: 340rpx; + border-radius: 16rpx; + background: #ffffff; + margin-right: 20rpx; + + .img { + border-radius: 16rpx 16rpx 0 0; + width: 100%; + height: 196rpx; + } + + .message { + .title { + margin-left: 16rpx; + margin-top: 8rpx; + font-family: Source Han Sans; + font-size: 26rpx; + font-weight: 350; + /* 文本/正文 */ + color: #1d2129; + max-width: 180rpx; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + .time { + margin-left: 16rpx; + margin-top: 20rpx; + font-family: Source Han Sans; + font-size: 20rpx; + font-weight: 300; + color: #666666; + max-width: 180rpx; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + .splace { + margin-left: 16rpx; + margin-top: 8rpx; + font-family: Source Han Sans; + font-size: 20rpx; + font-weight: 300; + color: #666666; + max-width: 222rpx; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + } + } + } + + .smallshop { + margin-top: 40rpx; + width: 100%; + padding: 3%; + box-sizing: border-box; + height: 366rpx; + border-radius: 24rpx; + background-color: #ffffff; + + .xdb { + font-family: Source Han Sans; + font-size: 30rpx; + font-weight: 500; + line-height: normal; + display: flex; + align-items: center; + letter-spacing: normal; + color: #333333; + } + + .bangCart { + margin-top: 30rpx; + gap: 4%; + display: flex; + flex-wrap: wrap; + + .bangone1 { + flex: 1 1 45%; + height: 108rpx; + border-radius: 24rpx; + box-sizing: border-box; + border: 0.4rpx solid #007fff; + background: #edf5ff; + display: flex; + justify-content: space-around; + align-items: center; + } + + .bangone2 { + flex: 1 1 45%; + height: 108rpx; + border-radius: 24rpx; + box-sizing: border-box; + border: 0.4rpx solid #ff2228; + background: #fff1f3; + display: flex; + justify-content: space-around; + align-items: center; + } + + .bangone3 { + margin-top: 20rpx; + flex: 1 1 45%; + height: 108rpx; + border-radius: 24rpx; + box-sizing: border-box; + border: 0.4rpx solid #fd8702; + background: #ffe7ce; + display: flex; + justify-content: space-around; + align-items: center; + } + + .bangone4 { + margin-top: 20rpx; + flex: 1 1 45%; + height: 108rpx; + border-radius: 24rpx; + box-sizing: border-box; + border: 0.4rpx solid #08b4bd; + background: #e5feff; + display: flex; + justify-content: space-around; + align-items: center; + } + + .btext { + margin-left: 32rpx; + font-family: Source Han Sans; + font-size: 30rpx; + font-weight: 350; + line-height: normal; + text-align: center; + letter-spacing: normal; + /* 文本/正文 */ + color: #1a1a1a; + } + } + } + + .buttonCard { + margin-top: 40rpx; + width: 100%; + height: 192rpx; + border-radius: 24rpx; + background-color: #ffffff; + display: flex; + justify-content: center; + align-items: center; + gap: 64rpx; + + .but { + display: grid; + justify-items: center; + + .butext { + font-family: Source Han Sans; + font-size: 28rpx; + font-weight: 350; + line-height: normal; + letter-spacing: normal; + /* 文本/正文 */ + color: #1a1a1a; + margin-top: 8rpx; + } + } + } + + .hylist { + width: 100%; + display: grid; + justify-content: center; + + .hyCard { + border: 2rpx solid #f1f3f9; + margin-top: 24rpx; + width: 100%; + border-radius: 24rpx; + background: #ffffff; + display: flex; + align-items: center; + justify-content: space-between; + box-sizing: border-box; + padding: 20rpx 28rpx; + + .left { + display: flex; + align-items: center; + box-sizing: border-box; + + .textpart { + margin-left: 32rpx; + display: grid; + justify-content: left; + + .namepart { + display: flex; + align-items: center; + box-sizing: border-box; + + .name { + font-family: Source Han Sans; + font-size: 24rpx; + font-weight: 350; + line-height: 150%; + letter-spacing: normal; + /* 外部/Neutral/Black */ + color: #0c092a; + } + + .biaoq { + padding: 10rpx; + height: 28rpx; + border-radius: 0rpx 4rpx 20rpx 0rpx; + margin-left: 16rpx; + font-family: YouSheBiaoTiHei; + font-size: 24rpx; + font-weight: normal; + display: flex; + align-items: center; + letter-spacing: normal; + color: #ffffff; + text-shadow: 0rpx 4rpx 4rpx rgba(0, 0, 0, 0.2); + } + } + + .company { + margin-top: 12rpx; + font-family: Source Han Sans; + font-size: 24rpx; + font-weight: 300; + line-height: 150%; + letter-spacing: normal; + /* 外部/Neutral/Grey 2 */ + color: #858494; + } + } + } + } + } + } + + .tjback { + margin-top: 40rpx; + background: #ffffff; + border-radius: 24rpx; + padding: 20rpx 30rpx; + box-sizing: border-box; + width: 100%; + } + + .titlebox { + margin-top: 20rpx; + width: 100%; + display: inline-flex; + justify-content: space-between; + align-items: center; + + .left { + display: flex; + align-items: center; + + .text { + margin-left: 8rpx; + font-family: Source Han Sans; + font-size: 30rpx; + font-weight: 500; + line-height: normal; + display: flex; + align-items: center; + letter-spacing: normal; + color: #333333; + } + } + + .more { + font-family: Source Han Sans; + font-size: 22rpx; + font-weight: 300; + line-height: normal; + text-align: right; + display: flex; + align-items: center; + letter-spacing: normal; + color: #007fff; + } + } + + .xzs1 { + width: 298rpx; + height: 148rpx; + position: fixed; + background-image: url(@/static/img/xzs.png); + background-size: 100% 100%; + font-size: 32rpx; + color: #ffffff; + padding: 0 0 20rpx 90rpx; + display: flex; + align-items: center; + justify-content: center; + // top: 70%; + } + + .xzs { + width: 80rpx; + // position: fixed; + // right: -24rpx; + // top: 70%; + } + + .showtitle { + position: relative; + top: -102rpx; + left: -137rpx; + height: 100rpx; + background-image: url(@/static/img/aiback.png); + background-size: 100% 100%; + background-repeat: no-repeat; + padding: 20rpx 20rpx 36rpx 30rpx; + ; + display: flex; + align-items: center; + justify-content: center; + + .tit { + white-space: nowrap; + color: #2563eb; + font-size: 28rpx; + display: flex; + } + } + .warp { + width: 90%; + margin-left: 5%; + margin-top: 70%; + background: #FFFFFF; + padding: 80rpx 58rpx 60rpx 58rpx; + border-radius: 48rpx; + display: grid; + justify-items: center; + box-sizing: border-box; + .tite { + font-family: Source Han Sans; + font-size: 52rpx; + font-weight: bold; + color: rgba(29, 29, 29, 0.95); + } + .txtt { + font-family: Source Han Sans; + font-size: 28rpx; + font-weight: normal; + color: #828282; + margin-top: 20rpx; + } + .butttx { + margin-top: 30rpx; + width: 100%; + background: #007FFF; + padding: 32rpx 192rpx; + border-radius: 16rpx; + box-sizing: border-box; + font-family: Source Han Sans; + font-size: 32rpx; + font-weight: bold; + color: #FFFFFF; + display: flex; + align-items: center; + justify-content: center; + } + } + \ No newline at end of file diff --git a/src/pages/index/shoppage/annualReport.vue b/src/pages/index/shoppage/annualReport.vue index 91476ea..04e3a1d 100644 --- a/src/pages/index/shoppage/annualReport.vue +++ b/src/pages/index/shoppage/annualReport.vue @@ -7,7 +7,7 @@ - + {{ item.title }} diff --git a/src/pages/index/shoppage/interactiveZone.vue b/src/pages/index/shoppage/interactiveZone.vue index d773d62..ce37c54 100644 --- a/src/pages/index/shoppage/interactiveZone.vue +++ b/src/pages/index/shoppage/interactiveZone.vue @@ -84,14 +84,20 @@ const list1 = reactive([ { name: '企业帮', id: 4 + }, + { + name: '法律帮', + id: 5 } ]) -const typeid = ref(1) +const typeid = ref(0) +const typename = ref('') // 定义方法 const click = async (item) => { page.value = 1 typeid.value = item.id + typename.value = item.name datalist.value = [] await getpostsList() } @@ -124,7 +130,7 @@ const scrolltolower = async () => { const goxzhdzq = () => { uni.navigateTo({ - url: '/pages/index/shoppage/makeAssistance' + url: '/pages/index/shoppage/makeAssistance?id='+typeid.value+'&name='+typename.value }) } @@ -170,11 +176,24 @@ const pldzClick = (postid, like, id) => { } onLoad(async (e) => { + typeid.value = list1[e.tabid].id + typename.value = list1[e.tabid].name current.value = e.tabid page.value = 1 datalist.value = [] await getpostsList() - console.log(userStore.cometype) +}) +onShow(async()=> { + if(datalist.value.length !== 0) { + page.value = 1 + datalist.value = [] + await postsList({ page: page.value, limit: limit.value, type_id: typeid.value }).then((res) => { + if (res.code === 1) { + datalist.value = [...datalist.value, ...res.data.data] + } + }) + } + }) diff --git a/src/pages/index/shoppage/jrbDetail.vue b/src/pages/index/shoppage/jrbDetail.vue index aa1c186..a08e41f 100644 --- a/src/pages/index/shoppage/jrbDetail.vue +++ b/src/pages/index/shoppage/jrbDetail.vue @@ -6,7 +6,7 @@ 产品说明 - + 联系方式 @@ -26,6 +26,7 @@ import { onLoad } from '@dcloudio/uni-app' import { ref } from 'vue' import { financeInfo } from '@/api/shop' +import uvparse from '@/uni_modules/uv-parse/components/uv-parse/uv-parse.vue' const baseurl = ref(import.meta.env.VITE_APP_BASE_URL + '/') diff --git a/src/pages/index/shoppage/makeAssistance.vue b/src/pages/index/shoppage/makeAssistance.vue index 94f76a0..bc36e96 100644 --- a/src/pages/index/shoppage/makeAssistance.vue +++ b/src/pages/index/shoppage/makeAssistance.vue @@ -44,7 +44,7 @@ import { addPosts } from '@/api/shop' const list = ref([ { - name: '小店帮', + name: '开店帮', id: 1 }, { @@ -58,6 +58,10 @@ const list = ref([ { name: '企业帮', id: 4 + }, + { + name: '法律帮', + id: 5 } ]) @@ -93,6 +97,12 @@ const submit = () => { }) } } + +onLoad((e)=> { + console.log(e); + xzid.value = e.id + xzvalue.value = e.name +}) \ No newline at end of file diff --git a/src/pages/index/shoppage/shophelpDetail.vue b/src/pages/index/shoppage/shophelpDetail.vue index eb7f090..463c01f 100644 --- a/src/pages/index/shoppage/shophelpDetail.vue +++ b/src/pages/index/shoppage/shophelpDetail.vue @@ -14,7 +14,7 @@ 内容详情 - + @@ -22,6 +22,7 @@ import { onLoad } from '@dcloudio/uni-app' import { ref } from 'vue' import { storeInfo } from '@/api/shop' +import uvparse from '@/uni_modules/uv-parse/components/uv-parse/uv-parse.vue' const xdbData = ref({}) diff --git a/src/pages/index/ztdetail.vue b/src/pages/index/ztdetail.vue index 9453f20..0afbf58 100644 --- a/src/pages/index/ztdetail.vue +++ b/src/pages/index/ztdetail.vue @@ -8,7 +8,7 @@ {{ titleData.title }} - + {{ titleData.create_time }} @@ -29,6 +29,7 @@ specialListInfo, bannerInfo } from '@/api/index' +import uvparse from '@/uni_modules/uv-parse/components/uv-parse/uv-parse.vue' const titleData = ref([]) diff --git a/src/pages/learningCenter/index.vue b/src/pages/learningCenter/index.vue index d682d85..bcfadc8 100644 --- a/src/pages/learningCenter/index.vue +++ b/src/pages/learningCenter/index.vue @@ -48,7 +48,7 @@ @clear="clear" shape="square" placeholder="请输入搜索内容" - placeholder-color="#088cff" + placeholder-color="#A9D4FF" v-model="keyword" search-icon="/static/img/search.png" search-icon-size="14" diff --git a/src/static/img/nianb.png b/src/static/img/nianb.png index e8cc6a0..4df3be5 100644 Binary files a/src/static/img/nianb.png and b/src/static/img/nianb.png differ diff --git a/src/uni_modules/uv-parse/changelog.md b/src/uni_modules/uv-parse/changelog.md new file mode 100644 index 0000000..4575e07 --- /dev/null +++ b/src/uni_modules/uv-parse/changelog.md @@ -0,0 +1,13 @@ +## 1.0.4(2023-07-17) +1. 优化文档 +2. 优化其他 +## 1.0.3(2023-06-19) +1. 修复nvue模式下不显示的BUG +## 1.0.2(2023-06-02) +1. 修复可能存在的BUG +2. 优化 +## 1.0.1(2023-05-16) +1. 优化组件依赖,修改后无需全局引入,组件导入即可使用 +2. 优化部分功能 +## 1.0.0(2023-05-10) +uv-parse 富文本解析器 diff --git a/src/uni_modules/uv-parse/components/uv-parse/node/node.vue b/src/uni_modules/uv-parse/components/uv-parse/node/node.vue new file mode 100644 index 0000000..5857077 --- /dev/null +++ b/src/uni_modules/uv-parse/components/uv-parse/node/node.vue @@ -0,0 +1,576 @@ +