Skip to content

H
h5
提交 1cb707d4 作者: ZhangLingKun
操作

Merge branch 'develop' 

# Conflicts:
#	.github/workflows/develop.yml
#	.github/workflows/master.yml
#	kustomization/overlays/dev/kustomization.yaml
#	src/api/interface/common.ts
#	src/api/modules/common.ts
#	src/manifest.json
#	src/pages.json
#	src/pages/index/comp/network-list/index.vue
#	src/pages/index/index.vue
上级 3ca9c9f4 07671bbe
正在显示 包含 462 行增加 和 134 行删除
.github/workflows/develop.yml
......@@ -18,6 +18,7 @@ env:
ACR_EE_TAG: ${{ github.sha }}
JAVA_VERSION: '8'
GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/h5.git
PROFILES_ACTIVE: development
permissions:
contents: read
......@@ -57,7 +58,7 @@ jobs:
- name: Build and push image to ACR EE
run: |
docker build -t "$ACR_EE_REGISTRY/$ACR_EE_NAMESPACE/$ACR_EE_IMAGE:$TAG" .
docker build --build-arg PROFILES_ACTIVE=$PROFILES_ACTIVE -t "$ACR_EE_REGISTRY/$ACR_EE_NAMESPACE/$ACR_EE_IMAGE:$TAG" .
docker push "$ACR_EE_REGISTRY/$ACR_EE_NAMESPACE/$ACR_EE_IMAGE:$TAG"
- name: Kustomize Set Image
......@@ -72,7 +73,7 @@ jobs:
git config user.email "Chuck@users.noreply.github.com"
git remote set-url origin "$GITLAB_URL"
git commit -am "Update Image Tag"
git tag -a $TAG -m "日常迭代"
git tag -a $TAG -m "日常迭代"
git push origin develop --tags
- name: Send Error Notification by WeChat
......@@ -82,9 +83,9 @@ jobs:
{
"msgtype": "markdown",
"markdown": {
"content": "### GitHub构建并推送镜像失败 \n
"content": "### `GitHub构建并推送镜像失败` \n
> - 提交人: ${{github.actor}} \n
> - 提交信息: ${{github.event.head_commit.message}} \n
> - 提交到仓库: ${{github.repository}} \n
> - 提交到分支: ${{github.ref}} \n 请修复错误后重新提交..."
}'
\ No newline at end of file
}'
.github/workflows/master.yml
......@@ -18,6 +18,7 @@ env:
ACR_EE_TAG: ${{ github.sha }}
JAVA_VERSION: '8'
GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/h5.git
PROFILES_ACTIVE: production
permissions:
contents: read
......@@ -57,7 +58,7 @@ jobs:
- name: Build and push image to ACR EE
run: |
docker build -t "$ACR_EE_REGISTRY/$ACR_EE_NAMESPACE/$ACR_EE_IMAGE:$TAG" .
docker build --build-arg PROFILES_ACTIVE=$PROFILES_ACTIVE -t "$ACR_EE_REGISTRY/$ACR_EE_NAMESPACE/$ACR_EE_IMAGE:$TAG" .
docker push "$ACR_EE_REGISTRY/$ACR_EE_NAMESPACE/$ACR_EE_IMAGE:$TAG"
- name: Kustomize Set Image
......@@ -71,8 +72,8 @@ jobs:
git config user.name "Chuck"
git config user.email "Chuck@users.noreply.github.com"
git remote set-url origin "$GITLAB_URL"
git commit -am "Update Image Tag"
git tag -a $TAG -m "日常迭代"
git commit -am "Update Image Tag"
git tag -a $TAG -m "日常迭代"
git push origin master --tags
- name: Send Error Notification by WeChat
......@@ -82,9 +83,9 @@ jobs:
{
"msgtype": "markdown",
"markdown": {
"content": "### GitHub构建并推送镜像失败 \n
"content": "### `GitHub构建并推送镜像失败` \n
> - 提交人: ${{github.actor}} \n
> - 提交信息: ${{github.event.head_commit.message}} \n
> - 提交到仓库: ${{github.repository}} \n
> - 提交到分支: ${{github.ref}} \n 请修复错误后重新提交..."
}'
\ No newline at end of file
}'
kustomization/overlays/dev/kustomization.yaml
......@@ -13,4 +13,4 @@ patches:
images:
- name: REGISTRY/NAMESPACE/IMAGE:TAG
newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/h5
newTag: 8e56771ed5b17a545929c21f73e6d777b7ea0dc9
newTag: 3175a8651e572996521c6080b93b52d8cb884367
src/api/interface/common.ts
......@@ -73,3 +73,39 @@ export type cooperationServiceBitmap = InterListFunction<
score: number
}
>
// 合作商家列表-根据合作标签id获取
export type listCompanyInfoByCoopIdType = InterListFunction<
{
coopId: number
lat: number
lon: number
pageNo: number
pageSize: number
},
{
address: string
brandLogo: string
brandName: string
companyName: string
companyType: number
companyUserName: string
content: string
creditCode: string
fullName: string
id: number
lat: number
leader: number
licenseImg: string
lon: number
phoneNum: number
remark: string
score: string
userAccountId: number
backImg: string
city: string
distance: number
district: string
province: string
backUserAccountId: number
}
>
src/api/modules/common.ts
import {
BackEndLoginType,
cooperationServiceBitmap,
getSecondDistrictInfo
getSecondDistrictInfo,
listCompanyInfoByCoopIdType
} from '@/api/interface/common'
import request from '../request'
......@@ -17,4 +18,8 @@ export default class CommonAPI {
// 服务商网点数据
static cooperationServiceBitmap: cooperationServiceBitmap = (params) =>
request.get('/userapp/cooperation/service/bitmap', params)
// 合作商家列表-根据合作标签id获取
static listCompanyInfoByCoopId: listCompanyInfoByCoopIdType = (params) =>
request.get('/userapp/cooperation/listCompanyInfoByCoopId', params)
}
src/manifest.json
{
"name": "hello",
"appid": "__UNI__4DCD124",
"description": "",
"versionName": "1.0.0",
"versionCode": "100",
"transformPx": false,
"name" : "hello",
"appid" : "__UNI__4DCD124",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
"transformPx" : false,
/* 5+App特有相关 */
"app-plus": {
"usingComponents": true,
"nvueStyleCompiler": "uni-app",
"compilerVersion": 3,
"splashscreen": {
"alwaysShowBeforeRender": true,
"waiting": true,
"autoclose": true,
"delay": 0
"app-plus" : {
"usingComponents" : true,
"nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3,
"splashscreen" : {
"alwaysShowBeforeRender" : true,
"waiting" : true,
"autoclose" : true,
"delay" : 0
},
/* 模块配置 */
"modules": {},
"modules" : {},
/* 应用发布信息 */
"distribute": {
"distribute" : {
/* android打包配置 */
"android": {
"permissions": [
"android" : {
"permissions" : [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
......@@ -41,38 +41,45 @@
]
},
/* ios打包配置 */
"ios": {},
"ios" : {},
/* SDK配置 */
"sdkConfigs": {}
"sdkConfigs" : {}
}
},
/* 快应用特有相关 */
"quickapp": {},
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin": {
"appid": "wx435a39e391de2067",
"setting": {
"urlCheck": false
"mp-weixin" : {
"appid" : "wx435a39e391de2067",
"setting" : {
"urlCheck" : false
},
"usingComponents": true
"usingComponents" : true
},
"mp-alipay": {
"usingComponents": true
"mp-alipay" : {
"usingComponents" : true
},
"mp-baidu": {
"usingComponents": true
"mp-baidu" : {
"usingComponents" : true
},
"mp-toutiao": {
"usingComponents": true
"mp-toutiao" : {
"usingComponents" : true
},
"uniStatistics": {
"enable": false
"uniStatistics" : {
"enable" : false
},
"vueVersion": "3",
"h5" : {
"router" : {
"mode" : "hash",
"base" : "/network/"
}
}
"vueVersion" : "3",
"h5" : {
"router" : {
"mode" : "hash",
"base" : "/network/"
},
"sdkConfigs" : {
"maps" : {
"qqmap" : {
"key" : "FT6BZ-2PBRK-MDRJH-ATZY5-7FO5J-WMBJE"
}
}
}
}
}
src/pages.json
......@@ -4,7 +4,14 @@
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "全国网点"
"navigationBarTitleText": "",
"navigationStyle": "custom"
}
},
{
"path": "pages/electronic-contracting/index",
"style": {
"navigationBarTitleText": ""
}
}
],
......
src/pages/electronic-contracting/index.vue 0 → 100644
<script setup lang="ts"></script>
<template>
<view class="electronic-contracting">
<image
src="http://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/36396951-5948-430e-9a34-9cc8694d8408.png"
mode="widthFix"
/>
</view>
</template>
<style scoped lang="scss">
.electronic-contracting {
height: 100vh;
image {
height: 100%;
width: 100%;
vertical-align: top;
}
}
</style>
src/pages/index/index.vue
<template>
<view class="network-map-warp">
<view id="map-content" class="map-content"></view>
<view class="network-total">
<image
class="icon"
src="https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/popup-network-point.png"
></image>
<view>服务商158家</view>
<view id="map-content" :class="[isclick ? 'map-content-click' : 'map-content']"></view>
<!-- 位置图标 -->
<view
:class="isclick ? 'network-location-click' : 'network-location'"
@click="backCurrentLocation"
>
<image src="../../static/img/mylocation.png" mode="widthFix" />
<text>我的位置</text>
</view>
<view class="network-location">
<u-icon
size="24"
name="https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/map-marker-location.png"
></u-icon>
<!-- 列表图标 -->
<view
:class="['network-list-click', isclick ? 'network-list-show' : '']"
@click="showNetWorkList"
>
<image src="../../static/img/listicon.png" mode="widthFix" />
<text>列表</text>
</view>
<!-- 入驻飞享云 -->
<view v-if="!isclick" class="network-enter">
<view class="network-enter-super">
<image src="../../static/img/supermen.png" mode="widthFix" />
</view>
<view class="network-enter-text">
<image src="../../static/img/join.png" mode="widthFix" />
<text>享受免费流量扶持3个月</text>
</view>
<view class="network-enter-willjoin" @click="toJoinPage">
<image src="../../static/img/will_join.png" mode="widthFix" />
</view>
</view>
<!--切换网点类型-->
<view class="network-type">
<view v-if="!isclick" class="network-type">
<view
v-for="(i, j) in networkTypeList"
:key="j"
......@@ -26,26 +42,24 @@
{{ i.name }}
</view>
</view>
<!--网点搜索-->
<network-select />
<!--网点列表-->
<network-list v-if="networkList.length !== 0" :list="networkList" @on-select="handleSelect" />
<network-list
v-if="networkList.length !== 0"
:list="networkList"
:isclick="isclick"
@on-select="handleSelect"
/>
<view v-else class="network-none">空空如也</view>
<!--底部操作-->
<network-footer />
</view>
</template>
<script>
import weChatSDK from 'z-weixin-ts'
import { CommonAPI } from '@/api'
import NetworkSelect from './comp/network-select/index.vue'
import NetworkList from './comp/network-list/index.vue'
import NetworkFooter from './comp/network-footer/index.vue'
export default {
components: {
NetworkSelect,
NetworkList,
NetworkFooter
NetworkList
},
data() {
return {
......@@ -82,12 +96,12 @@ export default {
const { pageNo, pageSize } = this.pagination
const { lat, lng } = this.location
const { tagId } = this.networkTypeList[this.currentTypeIndex]
const res = await CommonAPI.cooperationServiceBitmap({
const res = await CommonAPI.listCompanyInfoByCoopId({
pageNo,
pageSize,
lat,
lon: lng,
type: tagId
coopId: tagId
})
if (res && res.code === '200') {
this.networkList = res.result.list || []
......@@ -103,12 +117,26 @@ export default {
// 网点点击事件
handleSelect(e) {
this.setCenterPoint(e)
// console.log('网点点击事件 --->', e)
},
// 显示网点列表
showNetWorkList() {
this.isclick = false
},
// 跳转加盟
toJoinPage() {
weChatSDK.miniProgram.navigateTo({
url: '/page-identity/identity-list/index'
})
},
// 当前位置
backCurrentLocation() {
this.map.setCenter([this.location.lng, this.location.lat])
}
}
}
</script>
<script module="ModuleInstance" lang="renderjs">
import weChatSDK from 'z-weixin-ts'
/* eslint-disable */
export default {
data() {
......@@ -117,10 +145,11 @@ export default {
layer: null,
parkList: [],
markers: [],
isclick:false,
icon: {
type: 'image',
image: 'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/b0364bd1-f193-4b93-ac9f-cfb6e2624d6b.png',
size: [30, 30],
size: [32, 32],
anchor: 'bottom-center',
},
};
......@@ -189,10 +218,12 @@ export default {
position: element.position,
icon: this.icon,
});
console.log('labelMarker',labelMarker)
this.markers.push(labelMarker);
labelMarker.on('click', (e) => {
// 给marker绑定事件
console.log('执行了--->',e)
this.openInfo({...element,...this.networkList[index]});
this.isclick = true
});
});
......@@ -209,17 +240,21 @@ export default {
},
// 在指定位置打开信息窗体
openInfo(obj) {
const starStr = `${new Array(obj.score || 0).fill('⭐').join('')}
<span style="filter:grayscale(1)">${new Array( 5 - obj.score || 0).fill('⭐').join('')}</span>`
const contentStr = obj.content.replace(/;|；/g, `<div />`)
// console.log('点击到此处 --->',contentStr)
// 构建信息窗体中显示的内容
const domStr = `
<div class="map-open-info">
<div class="park-name">${obj.name || '-'}</div>
<div class="content">网点位置：${obj.address || '-'}</div>
<div class="content">${contentStr || ''}</div>
<div class="content">服务评分：${starStr}</div>
<div class="info-left">
<div class="park-name">
${obj.companyName || '-'}
</div>
<div class="location">
<span class="location-info"> ${this.networkTypeList[this.currentTypeIndex].name} | 距你${obj.distance}km </span>
</div>
</div>
<div class="info-right">
<span class="navigate-bg"></span>
<span class="navigate">导航</span>
</div>
</div>
`;
const infoWindow = new AMap.InfoWindow({
......@@ -228,14 +263,15 @@ export default {
content: domStr, // 使用默认信息窗体框样式，显示信息内容
});
infoWindow.open(this.map, obj.position);
// const button = document.querySelector('.map-open-info .button');
// button.onclick = () => {
// uni.navigateTo({
// url: `/pages/statisticsAdminSingle/index?sysParkId=${obj.sysParkId}`,
// });
// this.$ownerInstance.callMethod('goDetails', {sysParkId:obj.sysParkId})
// }
const navigate = document.querySelector('.navigate');
navigate.onclick = () => {
uni.openLocation({
latitude: obj.lat,
longitude: obj.lon,
name: obj.companyName,
address: obj.address
})
}
},
removeAllOverlay() {
// 清除地图上所有添加的覆盖物
......@@ -248,10 +284,10 @@ export default {
},
// 设置中心点
setCenterPoint(e){
console.log('执行到此处 --->',e)
this.map.setCenter([e.lon, e.lat])
this.openInfo({position:[e.lon, e.lat],...e});
console.log('执行到此处 --->',e)
}
},
},
};
</script>
......@@ -259,16 +295,32 @@ export default {
.network-map-warp {
height: 100%;
position: relative;
::-webkit-scrollbar {
display: none;
}
.map-content {
//height: calc(100vh - 504rpx);
height: calc(100vh - 704rpx);
height: 1052rpx;
width: 100%;
z-index: 10;
position: fixed;
top: 0;
left: 0;
}
.map-content-click {
height: 100vh;
z-index: 21;
}
.network-return {
width: 100rpx;
height: 100rpx;
position: fixed;
top: 90rpx;
left: 8rpx;
z-index: 20;
image {
width: 100%;
}
}
.network-total {
z-index: 20;
position: fixed;
......@@ -293,47 +345,146 @@ export default {
margin-right: 6rpx;
}
}
.network-location {
.network-location,
.network-location-click,//点击图标之后
.network-list-click {
position: fixed;
bottom: 804rpx;
left: 24rpx;
width: 60rpx;
height: 60rpx;
background: #ffffff;
border-radius: 8rpx;
bottom: calc(686rpx + 44rpx);
right: 26rpx;
width: 96rpx;
height: 96rpx;
background: linear-gradient(180deg, #ffffff 0%, #ffffff 100%);
border-radius: 16rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
z-index: 20;
box-shadow: 4rpx 8rpx 12rpx 0 rgba(135, 135, 135, 0.17);
border: 2rpx solid #ffffff;
image {
width: 36rpx;
height: 36rpx;
}
text {
font-size: 18rpx;
color: #6b6b6b;
line-height: 26rpx;
margin-top: 4rpx;
}
}
.network-location-click {
bottom: 470rpx;
right: 24rpx;
}
.network-list-click {
bottom: 357rpx;
display: none;
}
.network-list-show {
display: flex;
}
.network-location:active,
.network-location-click:active,
.network-list-click:active {
filter: brightness(0.86);
}
.network-location:active {
.network-list-click:active {
filter: brightness(0.86);
}
.network-enter {
position: fixed;
bottom: calc(424rpx + 44rpx);
left: 0;
width: 100%;
height: 238rpx;
border-radius: 48rpx 48rpx 0rpx 0rpx;
background: linear-gradient(180deg, #ff5c32 0%, #ff4d15 40%, #fff9f6 100%);
// box-shadow: 0rpx -10rpx 24rpx 0rpx #ffffff, inset 0rpx 2rpx 0rpx 0rpx #ffffff;
z-index: 20;
display: flex;
.network-enter-super {
padding-top: 12rpx;
margin-left: 30rpx;
image {
width: 80rpx;
height: 116rpx;
}
}
.network-enter-text {
padding-top: 20rpx;
margin-left: 12rpx;
flex: 1;
image {
width: 160rpx;
height: 42rpx;
display: block;
}
text {
display: block;
width: 318rpx;
height: 42rpx;
line-height: 42rpx;
font-size: 30rpx;
margin-top: 10rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #ffffff;
}
}
.network-enter-willjoin {
padding-top: 22rpx;
margin-left: 82rpx;
animation: scale-animation 0.638s infinite;
margin-right: 30rpx;
image {
width: 198rpx;
height: 108rpx;
}
}
}
.network-type {
position: fixed;
bottom: 730rpx;
bottom: calc(424rpx + 44rpx);
left: 0;
width: 100%;
height: 104rpx;
background: linear-gradient(180deg, rgba(255, 255, 255, 0.8) 0%, #ffffff 100%);
// box-shadow: 0rpx -8rpx 16rpx 0rpx rgba(219, 45, 0, 0.5);
border-radius: 48rpx 48rpx 0rpx 0rpx;
border-image: linear-gradient(180deg, rgba(255, 255, 255, 1), rgba(255, 255, 255, 0.2)) 2 2;
display: flex;
align-items: center;
justify-content: space-around;
z-index: 20;
.type-item {
width: 160rpx;
height: 48rpx;
background: #ffffff;
width: 128rpx;
height: 44rpx;
border-radius: 16rpx;
text-align: center;
line-height: 48rpx;
font-size: 24rpx;
text-align: left;
font-size: 32rpx;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 400;
color: #ff5b2d;
box-shadow: 4rpx 8rpx 12rpx 0 rgba(135, 135, 135, 0.17);
color: #000000;
line-height: 44rpx;
// box-shadow: 4rpx 8rpx 12rpx 0 rgba(135, 135, 135, 0.17);
}
.item-active {
background: #ff5b2d;
color: #ffffff;
line-height: 40rpx;
font-weight: 600;
color: #000000;
position: relative;
}
.item-active::after {
content: '';
display: block;
width: 56rpx;
height: 8rpx;
background: #ff5321;
border-radius: 5rpx;
position: absolute;
top: 64rpx;
left: 50%;
transform: translateX(-50%);
}
.type-item:active {
filter: brightness(0.86);
......@@ -341,15 +492,20 @@ export default {
}
.network-none {
position: fixed;
// top: calc(100vh - 704rpx + 110rpx);
bottom: 44rpx;
left: 0;
bottom: 300rpx;
width: 100%;
height: 424rpx;
line-height: 424rpx;
font-size: 22rpx;
font-weight: 400;
color: #28292b;
opacity: 0.68;
// opacity: 0.68;
text-align: center;
margin: 150rpx auto;
// margin: 150rpx auto;
background: #fff;
z-index: 20;
}
}
......@@ -365,13 +521,99 @@ export default {
opacity: 0;
}
.amap-info {
border-radius: 30rpx;
overflow: hidden;
}
.amap-info-close {
display: none;
}
.amap-info-outer {
background: none;
}
// .amap-info-contentContainer.bottom-center {
// padding-bottom: 0;
// }
.amap-info-contentContainer:hover .amap-info-outer,
.amap-menu-outer:hover {
box-shadow: 0rpx 16rpx 32rpx 0rpx rgba(151, 151, 151, 0.5);
}
.amap-info-content {
padding: 0;
width: 444rpx;
height: 106rpx;
}
.amap-info-outer {
box-shadow: 0rpx 0rpx 16rpx 0rpx rgba(151, 151, 151, 1);
}
.list-view-click {
.uni-scroll-view-content {
display: flex !important;
overflow-x: auto !important;
}
}
.map-open-info {
width: 60vw;
// width: 60vw;
display: flex;
width: 444rpx;
height: 100rpx;
// background: #fefffe;
position: relative;
.park-name {
font-size: 30rpx;
font-weight: bold;
border: 16rpx;
font-family: PingFangSC-Regular, PingFang SC;
.info-left {
flex: 1;
height: 106rpx;
background: #fefffe;
border-bottom-left-radius: 16rpx;
.park-name {
width: 288rpx;
height: 44rpx;
font-size: 32rpx;
font-weight: bold;
color: #000000;
line-height: 44rpx;
margin: 8rpx 0 4rpx 18rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.location {
.location-info {
font-size: 26rpx;
color: #8c8c8f;
line-height: 36rpx;
margin-left: 18rpx;
}
}
}
.info-right {
flex: 0 0 112rpx;
height: 106rpx;
background: linear-gradient(153deg, #405160 0%, #233240 100%);
border-radius: 0rpx 16rpx 16rpx 0rpx;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
image {
width: 32rpx;
height: 32rpx;
}
.navigate-bg {
width: 32rpx;
height: 32rpx;
display: block;
background: url(../../static/img/navigate.png) 0 0 / cover no-repeat;
}
.navigate {
height: 40rpx;
font-size: 28rpx;
font-weight: 400;
color: #ffffff;
line-height: 40rpx;
}
}
.content,
......@@ -381,7 +623,6 @@ export default {
font-size: 28rpx;
line-height: 44rpx;
}
.button {
font-size: 26rpx;
font-weight: 500;
......@@ -396,4 +637,15 @@ export default {
}
}
}
@keyframes scale-animation {
0% {
transform: scale(1);
}
50% {
transform: scale(1.1);
}
100% {
transform: scale(1);
}
}
</style>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论