Skip to content

H
h5-ci-test
提交 c686fe33 作者: 龚洪江
操作

功能：新全国网点

上级 ff204d48
正在显示 包含 80 行增加 和 189 行删除
api/index.js
// 测试服务器 // 测试服务器
const baseURL = 'https://testapi.sharefly.mmcuav.cn/' // const baseURL = 'https://testapi.sharefly.mmcuav.cn/'
// const baseURL = 'https://jytestapi.sharefly.mmcuav.cn/'
// const baseURL = 'https://uav.hnjcloud.cn/jyapi/'
const baseURL = 'https://iuav.mmcuav.cn'
// 正式服 // 正式服
// const baseURL = "https://csfapi.mmcuav.cn/" // const baseURL = "https://csfapi.mmcuav.cn/"
const api = { const api = {
getWebSitList:'systemservlet/website/getWebsiteList', getWebSitList:'/release/website/getWebsiteList',
flyerDotList:'systemservlet/website/flyer/bitmap' , flyerDotList:'/release/website/flyer/bitmap' ,
deviceDotList:'systemservlet/website/uav/bitmap' , deviceDotList:'/release/website/uav/bitmap'
//海外需求搜集
insertClientInfo:'systemservlet/overseasMailClient/insertClientInfo'
} }
export { export {
api, api,
baseURL, baseURL,
} }
\ No newline at end of file
manifest.json
...@@ -72,12 +72,12 @@ ...@@ -72,12 +72,12 @@
"h5" : { "h5" : {
"template" : "", "template" : "",
"router" : { "router" : {
"base" : "/h5/", "base" : "/network/",
"mode" : "hash" "mode" : "hash"
}, },
"title" : "MMC-云享飞", "title" : "MMC-云享飞",
"devServer" : { "devServer" : {
"https" : false "https" : true
} }
} }
} }
node_modules/.yarn-integrity
...@@ -6,11 +6,49 @@ ...@@ -6,11 +6,49 @@
"flags": [], "flags": [],
"linkedModules": [], "linkedModules": [],
"topLevelPatterns": [ "topLevelPatterns": [
"antd-mobile@^5.20.0",
"weixin-js-sdk@^1.6.0" "weixin-js-sdk@^1.6.0"
], ],
"lockfileEntries": { "lockfileEntries": {
"@babel/runtime@^7.18.0": "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.9.tgz#b4fcfce55db3d2e5e080d2490f608a3b9f407f4a",
"@babel/runtime@^7.18.3": "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.9.tgz#b4fcfce55db3d2e5e080d2490f608a3b9f407f4a",
"@floating-ui/core@^0.7.3": "https://registry.yarnpkg.com/@floating-ui/core/-/core-0.7.3.tgz#d274116678ffae87f6b60e90f88cc4083eefab86",
"@floating-ui/dom@^0.5.2": "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-0.5.4.tgz#4eae73f78bcd4bd553ae2ade30e6f1f9c73fe3f1",
"@react-spring/animated@~9.5.2": "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.5.2.tgz#42785b4f369d9715e9ee32c04b78483e7bb85489",
"@react-spring/core@~9.5.2": "https://registry.yarnpkg.com/@react-spring/core/-/core-9.5.2.tgz#c8450783ce87a82d3f9ab21e2650e42922398ff7",
"@react-spring/rafz@~9.5.2": "https://registry.yarnpkg.com/@react-spring/rafz/-/rafz-9.5.2.tgz#1264d5df09717cf46d55055da2c55ff84f59073f",
"@react-spring/shared@~9.5.2": "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.5.2.tgz#e0a252e06daa3927964460fef05d8092e7d78ffc",
"@react-spring/types@~9.5.2": "https://registry.yarnpkg.com/@react-spring/types/-/types-9.5.2.tgz#cce1b03afbafb23edfb9cd8c517cc7462abffb65",
"@react-spring/web@^9.4.5": "https://registry.yarnpkg.com/@react-spring/web/-/web-9.5.2.tgz#762ee6b3c8fea40281e1298f5cf1c0515ad6a794",
"@types/js-cookie@^2.x.x": "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-2.2.7.tgz#226a9e31680835a6188e887f3988e60c04d3f6a3",
"@use-gesture/core@10.2.17": "https://registry.yarnpkg.com/@use-gesture/core/-/core-10.2.17.tgz#dc78913cd5d105217c3f1d1c16a32ad6426a00ba",
"@use-gesture/react@10.2.17": "https://registry.yarnpkg.com/@use-gesture/react/-/react-10.2.17.tgz#00bc413da42a358dd3f9173c0631b54522e76614",
"ahooks-v3-count@^1.0.0": "https://registry.yarnpkg.com/ahooks-v3-count/-/ahooks-v3-count-1.0.0.tgz#ddeb392e009ad6e748905b3cbf63a9fd8262ca80",
"ahooks@^3.5.2": "https://registry.yarnpkg.com/ahooks/-/ahooks-3.7.0.tgz#e143ad3f1f1a05387c30031bf5634c9e9fa05d87",
"antd-mobile-icons@^0.3.0": "https://registry.yarnpkg.com/antd-mobile-icons/-/antd-mobile-icons-0.3.0.tgz#9b29e4588a62370909061f10ff0579aabb0b32a9",
"antd-mobile-v5-count@^1.0.1": "https://registry.yarnpkg.com/antd-mobile-v5-count/-/antd-mobile-v5-count-1.0.1.tgz#85f20c46d1635c24e856bcf5ad55e8c98e44a523",
"antd-mobile@^5.20.0": "https://registry.yarnpkg.com/antd-mobile/-/antd-mobile-5.20.0.tgz#8b800f1426367c497a9a8d00aa5f6b29374f11fe",
"async-validator@^4.1.0": "https://registry.yarnpkg.com/async-validator/-/async-validator-4.2.5.tgz#c96ea3332a521699d0afaaceed510a54656c6339",
"big.js@^6.2.1": "https://registry.yarnpkg.com/big.js/-/big.js-6.2.1.tgz#7205ce763efb17c2e41f26f121c420c6a7c2744f",
"classnames@^2.3.1": "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e",
"dayjs@^1.11.4": "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.4.tgz#3b3c10ca378140d8917e06ebc13a4922af4f433e",
"dayjs@^1.9.1": "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.4.tgz#3b3c10ca378140d8917e06ebc13a4922af4f433e",
"intersection-observer@^0.12.0": "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.12.2.tgz#4a45349cc0cd91916682b1f44c28d7ec737dc375",
"js-cookie@^2.x.x": "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8",
"lodash@^4.17.21": "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c",
"rc-field-form@~1.27.0": "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.27.1.tgz#11d61ccb43679e71fdbbff0d821326202554df84",
"rc-util@^5.8.0": "https://registry.yarnpkg.com/rc-util/-/rc-util-5.23.0.tgz#a583b1ec3e1832a80eced7a700a494af0b590743",
"react-is@^16.12.0": "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4",
"react-is@^17.0.2": "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0",
"regenerator-runtime@^0.13.4": "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52",
"resize-observer-polyfill@^1.5.1": "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464",
"screenfull@^5.0.0": "https://registry.yarnpkg.com/screenfull/-/screenfull-5.2.0.tgz#6533d524d30621fc1283b9692146f3f13a93d1ba",
"shallowequal@^1.1.0": "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8",
"staged-components@^1.1.3": "https://registry.yarnpkg.com/staged-components/-/staged-components-1.1.3.tgz#bb5a396df2d9b48fbc31841a59f53437ed8b8ac6",
"tslib@^2.4.0": "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3",
"use-sync-external-store@^1.1.0": "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a",
"weixin-js-sdk@^1.6.0": "https://registry.yarnpkg.com/weixin-js-sdk/-/weixin-js-sdk-1.6.0.tgz#ff50484d8118ce1208f11248cf4a1c0831577514" "weixin-js-sdk@^1.6.0": "https://registry.yarnpkg.com/weixin-js-sdk/-/weixin-js-sdk-1.6.0.tgz#ff50484d8118ce1208f11248cf4a1c0831577514"
}, },
"files": [], "files": [],
"artifacts": {} "artifacts": {}
} }
\ No newline at end of file
pages.json
{ {
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{ {
"path" : "pages/network/index",
"style" :
{
"navigationBarTitleText": "全国网点",
"enablePullDownRefresh": false
}
},
{
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
"navigationBarTitleText": "全国网点" "navigationBarTitleText": "全国网点"
...@@ -14,7 +23,9 @@ ...@@ -14,7 +23,9 @@
// "enablePullDownRefresh": true // "enablePullDownRefresh": true
} }
} }
],
],
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app", "navigationBarTitleText": "uni-app",
......
pages/index/index.vue
<template> <template>
<view class="websit-node-wrap"> <view class="websit-node-wrap">
<view class="map-content" id="map"></view> <view class="map-content" id="map"></view>
<!-- <view class="propvice-wrap"> <!-- <view class="websit-node-head-wrap" @click="toAddWebsit">
<view class="provice-title">{{ location.province }}</view>
<img src="@/assets/image/bot-arrow.png" alt="" />
</view> -->
<view class="websit-node-head-wrap">
<image src="../../static/images/map-tip.png" mode="widthFix" class="img-1"></image> <image src="../../static/images/map-tip.png" mode="widthFix" class="img-1"></image>
<!-- <view class=" animate__animated animate__tada animate__infinite animate__delay-1s btn-img" style="background:red"></view> --> <image src="../../static/images/go.png" mode="widthFix" class=" animate__heartBeat btn-img" ></image>
<image src="../../static/images/go.png" mode="widthFix" class=" animate__heartBeat btn-img" @click="toAddWebsit"></image> </view> -->
</view>
<view class="websit-node-list-wrap" > <view class="websit-node-list-wrap" >
<view class="ios-wrap"> <view class="ios-wrap">
<view class="head-tip"></view> <view class="head-tip"></view>
<!-- <view class="title">服务网点</view> -->
<view class="tip-tap-wrap"> <view class="tip-tap-wrap">
<view v-for="(item, index) in tipList" :key="index" :class="{ <view v-for="(item, index) in tipList" :key="index" :class="{
'tip-item': true, 'tip-item': true,
...@@ -55,23 +49,6 @@ ...@@ -55,23 +49,6 @@
</view> </view>
</view> </view>
</view> </view>
<!-- <view class="current-status-wrap">
<img src="@/assets/image/websit-icon.png" />
<view class="current-status">
<view class="swiper-no-swiping">
<swiper :options="swiperOptions">
<swiper-slide v-for="(item, index ) in cityList" :key="index">
<view class="swiper-slide">
{{ item }}网点{{ labelList[RandomNum(0, 2)] }}
</view>
</swiper-slide>
</swiper>
</view>
</view>
</view> -->
<!-- <view class="footer-option">
<button class="btn" @click="toAddWebsit">我也想加盟</button>
</view> -->
</view> </view>
</template> </template>
...@@ -95,7 +72,7 @@ ...@@ -95,7 +72,7 @@
nation: "中国", nation: "中国",
nation_code: "156", nation_code: "156",
province: "广东省", province: "广东省",
}, },
isHeight:false, isHeight:false,
websitHeight:0 websitHeight:0
...@@ -114,21 +91,10 @@ ...@@ -114,21 +91,10 @@
}, },
filters:{ filters:{
getPhoneStr(value){ getPhoneStr(value){
let str=String(value) let str=String(value)
return str.substring(0,3)+'****'+str.substring(str.length-4,str.length) return str.substring(0,3)+'****'+str.substring(str.length-4,str.length)
} }
}, },
onPageScroll(e) {
// console.log('滚动事件--->',e)
// let height= uni.getSystemInfoSync().screenHeight
// console.log('高度-->',height)
// if(height-e.scrollTop<=200){
// this.isHeight=true
// this.websitHeight=height-200
// }else{
// this.isHeight=false
// }
},
onReachBottom() { onReachBottom() {
if (this.currentTipIndex != 0) { if (this.currentTipIndex != 0) {
console.log('触底了-->') console.log('触底了-->')
...@@ -173,28 +139,6 @@ ...@@ -173,28 +139,6 @@
map: null, map: null,
markers: [], markers: [],
websitList: [], websitList: [],
// swiperOptions: {
// autoplay: {
// delay: 2000,
// stopOnLastSlide: false,
// disableOnInteraction: false,
// },
// loop: true,
// direction: "vertical",
// initialSlide: 0,
// speed: 1000,
// },
// cityList: [
// "深圳市",
// "南宁市",
// "桂林市",
// "上海市",
// "南京市",
// "哈尔滨市",
// "贵阳市",
// "乌鲁木齐市",
// ],
// labelList: ["已加盟", "筹备中", "提交意向"],
tipList: [{ tipList: [{
label: "服务网点(512)", label: "服务网点(512)",
val: 1 val: 1
...@@ -258,8 +202,8 @@ ...@@ -258,8 +202,8 @@
}, },
setMassMarks() { setMassMarks() {
let styleList = [{ let styleList = [{
url: 'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/image/servicepot.png', // 图标地址 url: 'https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/d6bb818d-ba14-4f69-8e6e-a87620cd5f3f.png', // 图标地址
size: new AMap.Size(40, 40), // 图标大小 size: new AMap.Size(30, 30), // 图标大小
anchor: new AMap.Pixel(20, 20), // 图标显示位置偏移量，基准点为图标左上角 anchor: new AMap.Pixel(20, 20), // 图标显示位置偏移量，基准点为图标左上角
}, },
{ {
...@@ -305,11 +249,6 @@ ...@@ -305,11 +249,6 @@
}, []); }, []);
let webList = nodeList.filter((item) => item.range <= 1000); let webList = nodeList.filter((item) => item.range <= 1000);
this.websitList = webList.sort((a, b) => a.range - b.range); this.websitList = webList.sort((a, b) => a.range - b.range);
// var reg = /.+?(省|市)/g;
// this.websitList.reduce((pre,cur)=>{
// let arr= cur.dizhi.match(reg)
// console.log('地址数据-->',arr)
// },[])
this.markers = nodeList.map((item, index) => { this.markers = nodeList.map((item, index) => {
return { return {
id: index, id: index,
...@@ -408,7 +347,7 @@ ...@@ -408,7 +347,7 @@
let list = res.result.list let list = res.result.list
this.websitList = this.websitList.concat(list) this.websitList = this.websitList.concat(list)
} }
} }
}, },
RandomNum(minNum, maxNum) { RandomNum(minNum, maxNum) {
...@@ -422,7 +361,7 @@ ...@@ -422,7 +361,7 @@
.websit-node-wrap { .websit-node-wrap {
position: relative; position: relative;
height: 100vh; height: 100vh;
.websit-node-list-wrap { .websit-node-list-wrap {
position: absolute; position: absolute;
left: 0; left: 0;
...@@ -446,11 +385,9 @@ ...@@ -446,11 +385,9 @@
.tip-tap-wrap { .tip-tap-wrap {
display: flex; display: flex;
align-items: center; align-items: center;
// justify-content: space-between;
margin-top: 30rpx; margin-top: 30rpx;
.tip-item { .tip-item {
// width: 5.5rem;
flex: 1; flex: 1;
height: 68rpx; height: 68rpx;
background: #e9e9ec; background: #e9e9ec;
...@@ -478,15 +415,6 @@ ...@@ -478,15 +415,6 @@
color: #ffffff; color: #ffffff;
} }
} }
// .title {
// font-size: 0.94rem;
// font-weight: bold;
// color: #1f1f1f;
// margin-left: 3px;
// margin-top: 13px;
// }
.websit-item-wrap { .websit-item-wrap {
margin-top: 40rpx; margin-top: 40rpx;
...@@ -521,7 +449,7 @@ ...@@ -521,7 +449,7 @@
margin-left: 16rpx; margin-left: 16rpx;
} }
} }
.meta { .meta {
width: 100%; width: 100%;
margin-top: 20rpx; margin-top: 20rpx;
...@@ -571,7 +499,6 @@ ...@@ -571,7 +499,6 @@
} }
} }
.websit-node-list-height{ .websit-node-list-height{
// height: 800rpx;
position: fixed; position: fixed;
top: 200rpx; top: 200rpx;
bottom: 0; bottom: 0;
...@@ -583,8 +510,7 @@ ...@@ -583,8 +510,7 @@
top: 10px; top: 10px;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
width: 90%; width: 660rpx;
.img-1 { .img-1 {
width: 100%; width: 100%;
} }
...@@ -594,12 +520,10 @@ ...@@ -594,12 +520,10 @@
} }
.btn-img { .btn-img {
width: 84rpx; width: 12%;
position: absolute; position: absolute;
top: 30%; top: 28%;
right: 48rpx; right: 48rpx;
// transform: translateY(-50%);
// vertical-align: middle;
} }
} }
} }
...@@ -611,84 +535,4 @@ ...@@ -611,84 +535,4 @@
top: 0; top: 0;
left: 0; left: 0;
} }
// .footer-option {
// position: fixed;
// width: 100%;
// bottom: 0;
// top: calc(100vh - 7.31rem);
// height: 7.31rem;
// padding: 17px 0 0 0;
// box-sizing: border-box;
// background: #f9f9f9;
// z-index: 99999;
// border-radius: 18px 18px 0px 0px;
// text-align: center;
// .btn {
// font-size: 18px;
// font-weight: 500;
// color: #ffffff;
// width: 90%;
// height: 46px;
// background: linear-gradient(270deg, #1966fe 0%, #188bfe 100%);
// border-radius: 8px;
// line-height: 46px;
// border: none;
// }
// }
// .current-status-wrap {
// display: flex;
// position: absolute;
// top: 51%;
// left: 38px;
// img {
// width: 43px;
// height: 43px;
// position: absolute;
// top: 0;
// left: -25px;
// }
// .swiper-container {
// height: 40px;
// }
// .current-status {
// height: 40px;
// line-height: 40px;
// padding: 0 10px 0 23px;
// background: #e8f0ff;
// box-shadow: 0px 1px 4px 0px rgba(204, 204, 204, 0.5);
// border-radius: 8px;
// font-size: 13px;
// font-weight: 500;
// color: #274b9f;
// }
// }
// .propvice-wrap {
// height: 32px;
// background: #ffffff;
// border-radius: 16px;
// border: 1px solid #d4d4d4;
// position: fixed;
// padding: 0 19px;
// top: 10px;
// left: 50%;
// display: flex;
// align-items: center;
// transform: translateX(-50%);
// .propvice-title {
// font-size: 14px;
// font-weight: 400;
// color: #757575;
// }
// img {
// width: 12px;
// height: 13px;
// margin-left: 5px;
// }
// }
</style> </style>
static/images/map-tip.png
static/images/map-tip.png

30.8 KB | W: | H:

static/images/map-tip.png

24.7 KB | W: | H:

static/images/map-tip.png
static/images/map-tip.png
static/images/map-tip.png
static/images/map-tip.png
  • 2-up
  • Swipe
  • Onion skin
unpackage/dist/build/h5/index.html
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>MMC-云享飞</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)')) <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>全国网点</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.01804949.js></script><script src=/h5/static/js/index.d6f34fd5.js></script></body></html> document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/network/static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/network/static/js/chunk-vendors.83a83b2c.js></script><script src=/network/static/js/index.43aaad94.js></script></body></html>
\ No newline at end of file
yarn.lock
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# yarn lockfile v1 # yarn lockfile v1
weixin-js-sdk@^1.6.0: "weixin-js-sdk@^1.6.0":
version "1.6.0" "integrity" "sha512-3IYQH7aalJGFJrwdT3epvTdR1MboMiH7vIZ5BRL2eYOJ12BNah7csoMkmSZzkq1+l92sSq29XdTCVjCJoK2sBQ=="
resolved "https://registry.yarnpkg.com/weixin-js-sdk/-/weixin-js-sdk-1.6.0.tgz#ff50484d8118ce1208f11248cf4a1c0831577514" "resolved" "https://registry.npmjs.org/weixin-js-sdk/-/weixin-js-sdk-1.6.0.tgz"
integrity sha512-3IYQH7aalJGFJrwdT3epvTdR1MboMiH7vIZ5BRL2eYOJ12BNah7csoMkmSZzkq1+l92sSq29XdTCVjCJoK2sBQ== "version" "1.6.0"
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论