This commit is contained in:
parent
530a4a3dbe
commit
4a0c34c295
|
@ -151,7 +151,7 @@
|
||||||
"quickapp" : {},
|
"quickapp" : {},
|
||||||
/* 小程序特有相关 */
|
/* 小程序特有相关 */
|
||||||
"mp-weixin" : {
|
"mp-weixin" : {
|
||||||
"appid" : "wx5fb1cc8edb3f8baa",
|
"appid" : "wx95e45e4fc390dd98",
|
||||||
"setting" : {
|
"setting" : {
|
||||||
"urlCheck" : false,
|
"urlCheck" : false,
|
||||||
"minified" : true,
|
"minified" : true,
|
||||||
|
|
18
pages.json
18
pages.json
|
@ -985,13 +985,13 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
,
|
// ,
|
||||||
"plugins": {
|
// "plugins": {
|
||||||
"live-player-plugin": {
|
// "live-player-plugin": {
|
||||||
"version": "1.3.2",
|
// "version": "1.3.2",
|
||||||
"provider": "wx2b03c6e691cd7370"
|
// "provider": "wx95e45e4fc390dd98"
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"root": "pages/chat",
|
"root": "pages/chat",
|
||||||
|
@ -1347,8 +1347,10 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"easycom" : {
|
"easycom" : {
|
||||||
|
"custom": {
|
||||||
"^u-(.*)" : "@/uni_modules/uview-ui/components/u-$1/u-$1.vue",
|
"^u-(.*)" : "@/uni_modules/uview-ui/components/u-$1/u-$1.vue",
|
||||||
"^uv-(.*)" : "@climblee/uv-ui/components/uv-$1/uv-$1.vue"
|
"^uv-(.*)" : "@/uni_modules/uv-ui/components/uv-$1/uv-$1.vue"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"globalStyle": {
|
"globalStyle": {
|
||||||
"navigationBarTextStyle": "black",
|
"navigationBarTextStyle": "black",
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
<view class="tab-sao iconfont icon-saoma" @tap='handleBorcode'></view>
|
<view class="tab-sao iconfont icon-saoma" @tap='handleBorcode'></view>
|
||||||
</view>
|
</view>
|
||||||
<view class="content-map" >
|
<view class="content-map" >
|
||||||
<map class="map" :latitude="latitude" :longitude="longitude" :markers="[{'id':1,'latitude':latitude,'longitude':longitude,'iconPath':'/static/images/location.png',width:24,height:24 }]" :show-location="true"></map>
|
<map class="map" :latitude="latitude" :longitude="longitude" :markers="markers" :show-location="true"></map>
|
||||||
</view>
|
</view>
|
||||||
<view class="content-type">
|
<view class="content-type">
|
||||||
<!-- <cover-image src="../annex/static/vipBg.png" style="position: absolute;
|
<!-- <cover-image src="../annex/static/vipBg.png" style="position: absolute;
|
||||||
|
@ -94,6 +94,7 @@
|
||||||
latitude: '',
|
latitude: '',
|
||||||
longitude: '',
|
longitude: '',
|
||||||
city:'请点击获取定位',
|
city:'请点击获取定位',
|
||||||
|
markers:[{'id':1,'latitude':latitude,'longitude':longitude,'iconPath':'/static/images/location.png',width:24,height:24 }]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLoad(){
|
onLoad(){
|
||||||
|
|
|
@ -244,7 +244,7 @@ export default {
|
||||||
}
|
}
|
||||||
.grade {
|
.grade {
|
||||||
color: #fe8c16;
|
color: #fe8c16;
|
||||||
& > :first-child {
|
:first-child {
|
||||||
margin-right: 8rpx;
|
margin-right: 8rpx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -260,12 +260,12 @@ export default {
|
||||||
.iconfont {
|
.iconfont {
|
||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
}
|
}
|
||||||
& > :first-child {
|
:first-child {
|
||||||
max-width: 320rpx;
|
max-width: 320rpx;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
& > :first-child {
|
:first-child {
|
||||||
margin-right: 8rpx;
|
margin-right: 8rpx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,7 +50,7 @@
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
copyTBL(url) {
|
copyTBL(url) {
|
||||||
let copeData = `登录地址:${this.resData.login_url} 商户账号:${this.resData.phone}`
|
let copeData = `登录地址:${this.resData.login_url} 商户账号:${this.resData.mer_account}`
|
||||||
// #ifdef MP || APP-PLUS
|
// #ifdef MP || APP-PLUS
|
||||||
uni.setClipboardData({
|
uni.setClipboardData({
|
||||||
data: copeData,
|
data: copeData,
|
||||||
|
|
Loading…
Reference in New Issue