Skip to content

J
jd-vx-app
Commit a97350dd authored by 肖健's avatar 肖健
Browse files
Options

高德api key改为接口获取，删除未使用的支付相关页面

parent 68a06d53
Hide whitespace changes
Inline Side-by-side
Showing with 141 additions and 100 deletions
pages.json
View file @ a97350dd
......@@ -182,7 +182,7 @@
"style": {
"navigationBarTitleText": "搜索商品"
}
},
}/*,
{
"path": "pages/shop/pay",
"style": {
......@@ -194,7 +194,7 @@
"style": {
"navigationBarTitleText": "支付成功"
}
}
}*/
]
},
{
......@@ -218,7 +218,7 @@
"navigationBarTitleText": "编辑地址"
}
},
{
/*{
"path": "pages/personal/myOrder",
"style": {
"navigationBarTitleText": "我的订单"
......@@ -235,19 +235,19 @@
"style": {
"navigationBarTitleText": "订单详情"
}
},
},*/
{
"path": "pages/personal/carTime",
"style": {
"navigationBarTitleText": "查看物流"
}
},
{
"path": "pages/personal/pull",
"style": {
"navigationBarTitleText": "申请退款"
}
},
// {
// "path": "pages/personal/pull",
// "style": {
// "navigationBarTitleText": "申请退款"
// }
// },
{
"path": "pages/personal/userInfo",
"style": {
......@@ -272,12 +272,12 @@
"navigationBarTitleText": "常见问题"
}
},
{
/*{
"path": "pages/personal/refundOk",
"style": {
"navigationBarTitleText": "退款成功"
"navigationBarTitleText": "退款成功"
}
},
},*/
{
"path": "pages/personal/instructions",
"style": {
......
pagesA/pages/index/getCarCode.vue
View file @ a97350dd
......@@ -4,7 +4,7 @@
-->
<template>
<view class="appCotent">
<div class="getCarCode">
<!-- <div class="getCarCode">
<div class="get__content">
<div class="content__code">
......@@ -32,9 +32,9 @@
<div class="list">
<div class="list__item" v-for="(vo,inx) in mallList" :key="inx">
<image :src="vo.mainImgUrl" class="list__img"></image>
<!-- <div class="list__img">
&lt;!&ndash; <div class="list__img">
<image :src="vo.img" />
</div> -->
</div> &ndash;&gt;
<div class="list__money">
<view class="tag">
包邮
......@@ -66,13 +66,13 @@
</view>
<!-- <u-number-box v-model="mallSelectMap[vo.id]" :min="0" @change="selectMall">
&lt;!&ndash; <u-number-box v-model="mallSelectMap[vo.id]" :min="0" @change="selectMall">
</u-number-box> -->
<!-- <div class="list__add" @click="add">
</u-number-box> &ndash;&gt;
&lt;!&ndash; <div class="list__add" @click="add">
<image src="@/static/index/get-car-code2.png" />
</div> -->
</div> &ndash;&gt;
</div>
</div>
<u-gap bgColor="transparent" height="160"></u-gap>
......@@ -115,7 +115,7 @@
立即支付
</div>
</div>
</div>
</div>-->
</view>
</template>
......@@ -123,7 +123,7 @@
export default {
data() {
return {
nums: 0,
/*nums: 0,
show: false,
addressShow: false,
content: "地址不能为空",
......@@ -169,11 +169,11 @@
countMoney: 0,
mallMoney: 0,
mallSelectMap: {},
carNo: '',
carNo: '',*/
}
},
methods: {
pay() {
/*pay() {
if (!this.addressId) {
uni.showToast({
title: '请添加一个收货地址',
......@@ -380,21 +380,21 @@
this.mallSelectMap[vo.id] -= 1
this.countMoney -= vo.currentPrice
}
},
},*/
},
onShow() {
this.getAddressList()
/*this.getAddressList()
this.getMoveCode()
this.getMallList()
this.getMallList()*/
},
onLoad(option) {
this.carNo = option.carNo
/*this.carNo = option.carNo*/
},
};
</script>
<style lang="scss" scoped>
.getCarCode {
/*.getCarCode {
/deep/ .u-modal__content__text {
text-align: center !important;
}
......@@ -787,10 +787,10 @@
height: 22px;
background-color: #FF0000;
border-radius: 50%;
/* #ifndef APP-NVUE */
!* #ifndef APP-NVUE *!
display: flex;
/* #endif */
!* #endif *!
justify-content: center;
align-items: center;
}
}*/
</style>
pagesB/pages/move-car/oneMoveCar.vue
View file @ a97350dd
......@@ -135,9 +135,24 @@
list5: [],
current: 0,
carouselFlag:false,
gaodeKey: '',
}
},
methods: {
async getGaodeKey() {
let that = this
await that.$http.request({
url:'/system/config/configKey/gaode.key',
method:'get',
data:{},
isFactory:false,
}).then(res => {
that.gaodeKey = res.data.msg
// 在页面加载的时候去判断用户有没有授权地理位置，没授权的话引导用户去设置页手动授权
that.getAuthorize()
})
},
closeCarouselFlag() {
this.carouselFlag = false
},
......@@ -381,9 +396,8 @@
longitude +
',' +
latitude +
'&key=c1a7dbdc7b2b9d5cf9a139a2372adc5b&radius=1000&extensions=all',
'&key=' + that.gaodeKey + '&radius=1000&extensions=all',
success(res) {
console.log(res);
if (res.statusCode === 200) {
if (res.data.status === '1') {
let addressInfo = res.data
......@@ -424,9 +438,8 @@
}
},
onLoad(e) {
// 在页面加载的时候去判断用户有没有授权地理位置，没授权的话引导用户去设置页手动授权
this.getAuthorize()
console.log(e)
this.getGaodeKey()
if (e.scene) {
//获取二维码携带的参数
//扫码后得到的参数
......
pagesC/pages/shop/pay.vue
View file @ a97350dd
......@@ -4,7 +4,7 @@
-->
<template>
<view class="appCotent">
<div class="pay">
<!--<div class="pay">
<div class="address" v-if="addressShow" @click="goAddress">
<div class="address__left">
<div class="right__title">
......@@ -67,7 +67,7 @@
立即支付
</div>
</div>
</div>
</div>-->
</view>
</template>
......@@ -75,7 +75,7 @@
export default {
data () {
return {
//商品id
/* //商品id
id: '',
//商品详情
mallInfo: {},
......@@ -95,11 +95,11 @@ export default {
showAddress: false,
createOrder: {},
orderSubmit: {},
addressShow: false,
addressShow: false,*/
}
},
methods: {
pay() {
/*pay() {
this.createOrder = {
addressId: this.addressId,
commodityList: [{
......@@ -224,20 +224,20 @@ export default {
uni.navigateTo({
url: '/pagesD/pages/personal/addAddress'
});
},
},*/
},
onLoad(option) {
this.id = option.id
// this.id = option.id
},
onShow() {
this.getMallInfo()
this.getAddressList()
/* this.getMallInfo()
this.getAddressList()*/
},
}
</script>
<style lang="scss" scoped>
.pay {
/*.pay {
padding-top: 40rpx;
.add__address {
......@@ -488,5 +488,5 @@ export default {
}
}
}
}*/
</style>
pagesC/pages/shop/payOk.vue
View file @ a97350dd
......@@ -4,7 +4,7 @@
-->
<template>
<view class="appCotent">
<div class="payOk">
<!-- <div class="payOk">
<div class="ok__icon">
<image src="@/static/shop/pay-ok1.png" />
</div>
......@@ -14,7 +14,7 @@
<div @click="viewId">查看订单</div>
<div @click="goGhome">返回首页</div>
</div>
</div>
</div>-->
</view>
</template>
......@@ -26,7 +26,7 @@ export default {
}
},
methods: {
viewId() {
/*viewId() {
uni.navigateTo({
url: '/pagesD/pages/personal/myOrder'
})
......@@ -35,13 +35,13 @@ export default {
uni.navigateTo({
url: '/pages/main'
})
}
}*/
},
}
</script>
<style lang="scss" scoped>
.payOk {
/*.payOk {
text-align: center;
padding-top: 80rpx;
......@@ -100,5 +100,5 @@ export default {
color: #999999;
}
}
}
}*/
</style>
pagesD/pages/personal/addAddress.vue
View file @ a97350dd
......@@ -18,7 +18,7 @@
</u-form-item>
<u-form-item label="收货地址:" prop="addressInfo.address" borderBottom ref="item1">
<u--input v-model="model1.addressInfo.address" placeholder="点击选择收货地址" border="none"></u--input>
<span @click.stop="getAuthorize">
<span @click.stop="getGaodeKey">
<span class="app__gps">
<image src="@/static/my/gps.png">
</span>
......@@ -96,13 +96,27 @@
trigger: ["blur", "change"],
},
},
type: null
type: null,
gaodeKey: '',
};
},
onLoad(e) {
this.type = e.type
},
methods: {
async getGaodeKey() {
let that = this
await that.$http.request({
url:'/system/config/configKey/gaode.key',
method:'get',
data:{},
isFactory:false,
}).then(res => {
that.gaodeKey = res.data.msg
that.getAuthorize()
})
},
goBack() {
if (this.type == "myAddress") {
let pages = getCurrentPages();
......@@ -200,7 +214,7 @@
longitude +
',' +
latitude +
'&key=c1a7dbdc7b2b9d5cf9a139a2372adc5b&radius=1000&extensions=all',
'&key=' + that.gaodeKey +'&radius=1000&extensions=all',
success(res) {
//console.log(res);
if (res.statusCode === 200) {
......
pagesD/pages/personal/editAddress.vue
View file @ a97350dd
......@@ -17,7 +17,7 @@
</u-form-item>
<u-form-item label="收货地址:" prop="addressInfo.address" borderBottom ref="item1">
<u--input v-model="model1.addressInfo.address" placeholder="点击选择收货地址" border="none"></u--input>
<span @click.stop="getAuthorize">
<span @click.stop="getGaodeKey">
<span class="app__gps">
<image src="@/static/my/gps.png">
</span>
......@@ -95,9 +95,23 @@ export default {
},
//收货地址id
id: '',
gaodeKey: '',
};
},
methods: {
async getGaodeKey() {
let that = this
await that.$http.request({
url:'/system/config/configKey/gaode.key',
method:'get',
data:{},
isFactory:false,
}).then(res => {
that.gaodeKey = res.data.msg
that.getAuthorize()
})
},
goBack() {
uni.navigateBack({
delta: 1
......@@ -224,7 +238,7 @@ export default {
longitude +
',' +
latitude +
'&key=c1a7dbdc7b2b9d5cf9a139a2372adc5b&radius=1000&extensions=all',
'&key=' + that.gaodeKey +'&radius=1000&extensions=all',
success(res) {
//console.log(res);
if (res.statusCode === 200) {
......
pagesD/pages/personal/myJdOrder.vue
View file @ a97350dd
<template>
<!-- 我的订单 -->
<view class="my-jd-order">
<view class="box">
<!-- <view class="box">
<text>订单信息请前往京东查看</text>
<view class="btn">
前往京东查看
</view>
</view>
</view>-->
</view>
</template>
......@@ -14,7 +14,7 @@
</script>
<style lang="scss" scoped>
.my-jd-order{
/*.my-jd-order{
width:100%;height:100vh;
display: flex;
align-items: center;
......@@ -38,5 +38,5 @@
background: linear-gradient(to right, #E2241B , #E14A1B);
}
}
}
}*/
</style>
\ No newline at end of file
pagesD/pages/personal/myOrder.vue
View file @ a97350dd
......@@ -4,7 +4,7 @@
-->
<template>
<view class="appCotent">
<div class="myOrder">
<!-- <div class="myOrder">
<u-tabs :current='current' :list="list4" lineWidth="30" @change="changeVal" lineColor="#f56c6c" :activeStyle="{
color: 'rgba(241, 37, 27, 1)',
fontSize: '32rpx',
......@@ -151,7 +151,7 @@
</div>
</scroll-list>
</div>
</div>-->
</view>
</template>
......@@ -159,7 +159,7 @@
export default {
data() {
return {
list: [],
/* list: [],
option: {
size: 10,
auto: true
......@@ -183,16 +183,16 @@ export default {
orderList: [],
showDelModal: false,
deleteId: '',
delTitle: '确认删除该纪录吗？',
delTitle: '确认删除该纪录吗？',*/
}
},
onLoad: function (e) {
this.$nextTick(() => {
/*this.$nextTick(() => {
this.current = Number(e.current) || 0
})
})*/
},
methods: {
// 刷新刷剧
/* // 刷新刷剧
async refresh(paging) {
// 刷新成功 参数对象{list: 当前列表,total: 数据总长度(后端查询的total)}
await this.getOrderList()
......@@ -361,7 +361,7 @@ export default {
}
});
},
},*/
},
onShow() {
//this.load()
......@@ -370,7 +370,7 @@ export default {
</script>
<style lang="scss" scoped>
.myOrder {
/*.myOrder {
uni-view {
background: #fff;
}
......@@ -526,5 +526,5 @@ export default {
}
}
}
}
}*/
</style>
pagesD/pages/personal/orderDetail.vue
View file @ a97350dd
......@@ -4,7 +4,7 @@
-->
<template>
<view class="appCotent">
<div class="orderDetail">
<!--<div class="orderDetail">
<div class="order__car">
<div>
<image src="@/static/my/car.png" />
......@@ -27,7 +27,7 @@
{{orderInfo.address}}&emsp;{{orderInfo.detailInfo}}
</div>
<div class="right__phone">
<!-- <span>默认</span> -->
&lt;!&ndash; <span>默认</span> &ndash;&gt;
<span>{{orderInfo.userName}}</span>
<span>{{orderInfo.telNumber}}</span>
</div>
......@@ -85,7 +85,7 @@
</div>
</div>
</div>
</div>
</div>-->
</view>
</template>
......@@ -93,14 +93,14 @@
export default {
data(){
return {
//订单id
/*//订单id
orderId: '',
//订单详情
orderInfo: {},
orderInfo: {},*/
}
},
methods: {
viewCar() {
/* viewCar() {
uni.navigateTo({
url: '/pagesD/pages/personal/carTime?orderId=' + this.orderId
})
......@@ -117,19 +117,19 @@ export default {
this.orderInfo = res.data.data
}
})
},
},*/
},
onLoad(e) {
this.orderId = e.orderId
// this.orderId = e.orderId
},
onShow() {
this.getOrderInfo()
// this.getOrderInfo()
},
}
</script>
<style lang="scss" scoped>
.orderDetail {
/*.orderDetail {
padding: 40rpx 0rpx;
.order__car {
......@@ -360,5 +360,5 @@ export default {
}
}
}
}
}*/
</style>
pagesD/pages/personal/refundOk.vue
View file @ a97350dd
......@@ -4,7 +4,7 @@
-->
<template>
<view class="appCotent">
<div class="payOk">
<!-- <div class="payOk">
<div class="ok__icon">
<image src="@/static/shop/pay-ok1.png" />
</div>
......@@ -14,7 +14,7 @@
<div @click="viewId">查看订单</div>
<div @click="goGhome">返回首页</div>
</div>
</div>
</div>-->
</view>
</template>
......@@ -26,7 +26,7 @@ export default {
}
},
methods: {
viewId() {
/*viewId() {
uni.navigateTo({
url: '/pagesD/pages/personal/myOrder'
})
......@@ -35,13 +35,13 @@ export default {
uni.navigateTo({
url: '/pages/main'
})
}
}*/
},
}
</script>
<style lang="scss" scoped>
.payOk {
/*.payOk {
text-align: center;
padding-top: 80rpx;
......@@ -100,5 +100,5 @@ export default {
color: #999999;
}
}
}
}*/
</style>
pagespage.json
View file @ a97350dd
......@@ -150,7 +150,7 @@
"style": {
"navigationBarTitleText": "搜索商品"
}
},
}/*,
{
"path": "pages/shop/pay",
"style": {
......@@ -162,7 +162,7 @@
"style": {
"navigationBarTitleText": "支付成功"
}
}
}*/
]
},
{
......@@ -194,7 +194,7 @@
"navigationBarTitleText": "编辑地址"
}
},
{
/*{
"path": "pages/personal/myOrder",
"style": {
"navigationBarTitleText": "我的订单"
......@@ -205,19 +205,19 @@
"style": {
"navigationBarTitleText": "订单详情"
}
},
},*/
{
"path": "pages/personal/carTime",
"style": {
"navigationBarTitleText": "查看物流"
}
},
{
"path": "pages/personal/pull",
"style": {
"navigationBarTitleText": "申请退款"
}
},
// {
// "path": "pages/personal/pull",
// "style": {
// "navigationBarTitleText": "申请退款"
// }
// },
{
"path": "pages/personal/userInfo",
"style": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment