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
正在显示 包含 132 行增加 和 56 行删除
.github/workflows/develop.yml
...@@ -18,6 +18,7 @@ env: ...@@ -18,6 +18,7 @@ env:
ACR_EE_TAG: ${{ github.sha }} ACR_EE_TAG: ${{ github.sha }}
JAVA_VERSION: '8' JAVA_VERSION: '8'
GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/h5.git GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/h5.git
PROFILES_ACTIVE: development
permissions: permissions:
contents: read contents: read
...@@ -57,7 +58,7 @@ jobs: ...@@ -57,7 +58,7 @@ jobs:
- name: Build and push image to ACR EE - name: Build and push image to ACR EE
run: | 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" docker push "$ACR_EE_REGISTRY/$ACR_EE_NAMESPACE/$ACR_EE_IMAGE:$TAG"
- name: Kustomize Set Image - name: Kustomize Set Image
...@@ -72,7 +73,7 @@ jobs: ...@@ -72,7 +73,7 @@ jobs:
git config user.email "Chuck@users.noreply.github.com" git config user.email "Chuck@users.noreply.github.com"
git remote set-url origin "$GITLAB_URL" git remote set-url origin "$GITLAB_URL"
git commit -am "Update Image Tag" git commit -am "Update Image Tag"
git tag -a $TAG -m "日常迭代" git tag -a $TAG -m "日常迭代"
git push origin develop --tags git push origin develop --tags
- name: Send Error Notification by WeChat - name: Send Error Notification by WeChat
...@@ -82,9 +83,9 @@ jobs: ...@@ -82,9 +83,9 @@ jobs:
{ {
"msgtype": "markdown", "msgtype": "markdown",
"markdown": { "markdown": {
"content": "### GitHub构建并推送镜像失败 \n "content": "### `GitHub构建并推送镜像失败` \n
> - 提交人: ${{github.actor}} \n > - 提交人: ${{github.actor}} \n
> - 提交信息: ${{github.event.head_commit.message}} \n > - 提交信息: ${{github.event.head_commit.message}} \n
> - 提交到仓库: ${{github.repository}} \n > - 提交到仓库: ${{github.repository}} \n
> - 提交到分支: ${{github.ref}} \n 请修复错误后重新提交..." > - 提交到分支: ${{github.ref}} \n 请修复错误后重新提交..."
}' }'
\ No newline at end of file
.github/workflows/master.yml
...@@ -18,6 +18,7 @@ env: ...@@ -18,6 +18,7 @@ env:
ACR_EE_TAG: ${{ github.sha }} ACR_EE_TAG: ${{ github.sha }}
JAVA_VERSION: '8' JAVA_VERSION: '8'
GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/h5.git GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/h5.git
PROFILES_ACTIVE: production
permissions: permissions:
contents: read contents: read
...@@ -57,7 +58,7 @@ jobs: ...@@ -57,7 +58,7 @@ jobs:
- name: Build and push image to ACR EE - name: Build and push image to ACR EE
run: | 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" docker push "$ACR_EE_REGISTRY/$ACR_EE_NAMESPACE/$ACR_EE_IMAGE:$TAG"
- name: Kustomize Set Image - name: Kustomize Set Image
...@@ -71,8 +72,8 @@ jobs: ...@@ -71,8 +72,8 @@ jobs:
git config user.name "Chuck" git config user.name "Chuck"
git config user.email "Chuck@users.noreply.github.com" git config user.email "Chuck@users.noreply.github.com"
git remote set-url origin "$GITLAB_URL" git remote set-url origin "$GITLAB_URL"
git commit -am "Update Image Tag" git commit -am "Update Image Tag"
git tag -a $TAG -m "日常迭代" git tag -a $TAG -m "日常迭代"
git push origin master --tags git push origin master --tags
- name: Send Error Notification by WeChat - name: Send Error Notification by WeChat
...@@ -82,9 +83,9 @@ jobs: ...@@ -82,9 +83,9 @@ jobs:
{ {
"msgtype": "markdown", "msgtype": "markdown",
"markdown": { "markdown": {
"content": "### GitHub构建并推送镜像失败 \n "content": "### `GitHub构建并推送镜像失败` \n
> - 提交人: ${{github.actor}} \n > - 提交人: ${{github.actor}} \n
> - 提交信息: ${{github.event.head_commit.message}} \n > - 提交信息: ${{github.event.head_commit.message}} \n
> - 提交到仓库: ${{github.repository}} \n > - 提交到仓库: ${{github.repository}} \n
> - 提交到分支: ${{github.ref}} \n 请修复错误后重新提交..." > - 提交到分支: ${{github.ref}} \n 请修复错误后重新提交..."
}' }'
\ No newline at end of file
kustomization/overlays/dev/kustomization.yaml
...@@ -13,4 +13,4 @@ patches: ...@@ -13,4 +13,4 @@ patches:
images: images:
- name: REGISTRY/NAMESPACE/IMAGE:TAG - name: REGISTRY/NAMESPACE/IMAGE:TAG
newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/h5 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< ...@@ -73,3 +73,39 @@ export type cooperationServiceBitmap = InterListFunction<
score: number 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 { import {
BackEndLoginType, BackEndLoginType,
cooperationServiceBitmap, cooperationServiceBitmap,
getSecondDistrictInfo getSecondDistrictInfo,
listCompanyInfoByCoopIdType
} from '@/api/interface/common' } from '@/api/interface/common'
import request from '../request' import request from '../request'
...@@ -17,4 +18,8 @@ export default class CommonAPI { ...@@ -17,4 +18,8 @@ export default class CommonAPI {
// 服务商网点数据 // 服务商网点数据
static cooperationServiceBitmap: cooperationServiceBitmap = (params) => static cooperationServiceBitmap: cooperationServiceBitmap = (params) =>
request.get('/userapp/cooperation/service/bitmap', params) request.get('/userapp/cooperation/service/bitmap', params)
// 合作商家列表-根据合作标签id获取
static listCompanyInfoByCoopId: listCompanyInfoByCoopIdType = (params) =>
request.get('/userapp/cooperation/listCompanyInfoByCoopId', params)
} }
src/manifest.json
{ {
"name": "hello", "name" : "hello",
"appid": "__UNI__4DCD124", "appid" : "__UNI__4DCD124",
"description": "", "description" : "",
"versionName": "1.0.0", "versionName" : "1.0.0",
"versionCode": "100", "versionCode" : "100",
"transformPx": false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus": { "app-plus" : {
"usingComponents": true, "usingComponents" : true,
"nvueStyleCompiler": "uni-app", "nvueStyleCompiler" : "uni-app",
"compilerVersion": 3, "compilerVersion" : 3,
"splashscreen": { "splashscreen" : {
"alwaysShowBeforeRender": true, "alwaysShowBeforeRender" : true,
"waiting": true, "waiting" : true,
"autoclose": true, "autoclose" : true,
"delay": 0 "delay" : 0
}, },
/* 模块配置 */ /* 模块配置 */
"modules": {}, "modules" : {},
/* 应用发布信息 */ /* 应用发布信息 */
"distribute": { "distribute" : {
/* android打包配置 */ /* android打包配置 */
"android": { "android" : {
"permissions": [ "permissions" : [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
...@@ -41,38 +41,45 @@ ...@@ -41,38 +41,45 @@
] ]
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios": {}, "ios" : {},
/* SDK配置 */ /* SDK配置 */
"sdkConfigs": {} "sdkConfigs" : {}
} }
}, },
/* 快应用特有相关 */ /* 快应用特有相关 */
"quickapp": {}, "quickapp" : {},
/* 小程序特有相关 */ /* 小程序特有相关 */
"mp-weixin": { "mp-weixin" : {
"appid": "wx435a39e391de2067", "appid" : "wx435a39e391de2067",
"setting": { "setting" : {
"urlCheck": false "urlCheck" : false
}, },
"usingComponents": true "usingComponents" : true
}, },
"mp-alipay": { "mp-alipay" : {
"usingComponents": true "usingComponents" : true
}, },
"mp-baidu": { "mp-baidu" : {
"usingComponents": true "usingComponents" : true
}, },
"mp-toutiao": { "mp-toutiao" : {
"usingComponents": true "usingComponents" : true
}, },
"uniStatistics": { "uniStatistics" : {
"enable": false "enable" : false
}, },
"vueVersion": "3", "vueVersion" : "3",
"h5" : { "h5" : {
"router" : { "router" : {
"mode" : "hash", "mode" : "hash",
"base" : "/network/" "base" : "/network/"
} },
} "sdkConfigs" : {
"maps" : {
"qqmap" : {
"key" : "FT6BZ-2PBRK-MDRJH-ATZY5-7FO5J-WMBJE"
}
}
}
}
} }
src/pages.json
...@@ -4,7 +4,14 @@ ...@@ -4,7 +4,14 @@
{ {
"path": "pages/index/index", "path": "pages/index/index",
"style": { "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>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论